From 5d1096754d2d394d765ff8140f41b3e864c35197 Mon Sep 17 00:00:00 2001
From: zhangqinlin <983410zql>
Date: Mon, 13 Dec 2021 19:15:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BC=81=E4=B8=9A=E7=AB=AF=E5=88=86?=
 =?UTF-8?q?=E6=A0=87=E5=A7=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/jero/data/entity/Files.java |  5 +++++
 .../mapper/xml/PayCaseCommitteeMapper.xml     |  3 ++-
 .../PayResearchProjectController.java         | 20 +++++++++++++++++++
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/Files.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/Files.java
index 83f45549..95c783aa 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/Files.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/Files.java
@@ -3,6 +3,8 @@ package com.jero.data.entity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @author zql
  * @date 2021/9/28 11:37
@@ -15,4 +17,7 @@ public class Files {
 
     @ApiModelProperty(value = "文件名")
     private java.lang.String fileName;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeMapper.xml
index b0b240e5..dffccaa8 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeMapper.xml
@@ -19,6 +19,7 @@
         <collection property="files" ofType="com.jero.data.entity.Files" javaType="java.util.List" select="listForChildren" column="{id=id,userId=userId}" >
             <result property="fileId" column="fileId"></result>
             <result property="fileName" column="fileName"></result>
+            <result property="createTime" column="createTime"></result>
         </collection>
     </resultMap>
 
@@ -26,7 +27,7 @@
         SELECT  pcc.name,pcc.id,pcc.remarks,pcc.create_by as principal ,#{userId} as userId FROM pay_case_committee pcc where pcc.id=#{id}
      </select>
       <select id="listForChildren" resultType="com.jero.data.entity.Files">
-        SELECT  ossf.id as fileId,ossf.file_name as fileName FROM pay_case_committee pcc left join pay_working_group_distribution_record pwgdr on(pcc.id=pwgdr.project_id) left join oss_file
+        SELECT  ossf.id as fileId,ossf.file_name as fileName,ossf.create_time as createTime FROM pay_case_committee pcc left join pay_working_group_distribution_record pwgdr on(pcc.id=pwgdr.project_id) left join oss_file
            ossf on(pwgdr.file_id=ossf.id) where pcc.id=#{id}
              and pwgdr.contacts_id=#{userId} group by pwgdr.id
     </select>
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayResearchProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayResearchProjectController.java
index f2d50ff3..ab4a77ce 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayResearchProjectController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayResearchProjectController.java
@@ -56,6 +56,26 @@ public class PayResearchProjectController extends JeroController<PayResearchProj
 		return Result.OK(pageList);
 	}
 
+//
+//	 /**
+//	  * 第三方在研项目
+//	  *
+//	  * @param
+//	  * @param pageNo
+//	  * @param pageSize
+//	  * @param
+//	  * @return
+//	  */
+//	 @AutoLog(value = "第三方在研项目-分页列表查询")
+//	 @ApiOperation(value="第三方在研项目-分页列表查询", notes="第三方在研项目-分页列表查询")
+//	 @GetMapping(value = "/listForThree")
+//	 public Result<?> listForThree(@RequestParam(name="abbreviation",required = true) String abbreviation,
+//									@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+//									@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+//									) {
+////		 IPage<PayResearchProject> pageList = payResearchProjectService.listForThree(pageNo,pageSize,abbreviation);
+//		 return Result.OK(pageList);
+//	 }
 	/**
 	 *   添加
 	 *