Merge remote-tracking branch 'origin/master'

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/contractRegistration/domain/ContractFilePaper.java

@@ -7,6 +7,7 @@ import com.jeeplus.core.domain.BaseEntity;
 import com.jeeplus.test.workContract.service.dto.WorkAttachmentDto;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -43,6 +44,9 @@ public class ContractFilePaper extends BaseEntity {
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
     private String filedData;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date createDate;
     /**
      * 案卷号
      */

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/contractRegistration/mapper/ContractFilePaperMapper.java

@@ -25,7 +25,7 @@ public interface ContractFilePaperMapper extends BaseMapper<ContractFilePaper> {
 
     List<WorkAttachment> findList(@Param("id") String id);
 
-    Integer findIsExit(@Param("id") String id, @Param("name")String name);
+    Integer findIsExit(@Param("id") String id, @Param("contractInfoId") String contractInfoId, @Param("name")String name);
 
     /**
      * 根据attachmentId删除上传文件信息

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/contractRegistration/mapper/xml/ContractFilePaperMapper.xml

@@ -25,7 +25,7 @@
 			work_attachment
 		WHERE
 			del_flag = 0
-			AND attachment_id = #{id}
+			AND attachment_id in (#{id}, #{contractInfoId})
 			AND attachment_name = #{name}
     </select>
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/contractRegistration/mapper/xml/ContractInfoMapper.xml

@@ -29,6 +29,7 @@
         SELECT
         DISTINCT a.id,
 			c.`name` AS create_by,
+			c.`name` AS createName,
 			c.`id` AS createId,
 			a.create_date,
 			a.update_by,

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/contractRegistration/service/ContractFilePaperService.java

@@ -85,7 +85,7 @@ public class ContractFilePaperService {
         mapper.updateById(file);
         List<WorkAttachmentDto> list = filePaper.getContractProperList();
         if (CollectionUtils.isNotEmpty(list)) {
-            updateFiles(list, userDTO, file.getId());
+            updateFiles(list, userDTO, file.getId(),filePaper.getContractInfoId());
         }else {
             //删除文件信息
             mapper.deleteFileInfo(file.getId());
@@ -123,7 +123,7 @@ public class ContractFilePaperService {
      * @param id 关联id
      */
     @Transactional(rollbackFor = Exception.class)
-    public void updateFiles(List<WorkAttachmentDto> list, UserDTO userDTO, String id) {
+    public void updateFiles(List<WorkAttachmentDto> list, UserDTO userDTO, String id,String contractInfoId) {
         int j = 1;
         String names = new String();
         //表中存在，但是传过来不存在，说明已删除，表中数据也要删除
@@ -142,7 +142,7 @@ public class ContractFilePaperService {
         //保存信息
         for (WorkAttachmentDto dto : list) {
             //判断是否存在
-            Integer isExit = mapper.findIsExit(id, dto.getName());
+            Integer isExit = mapper.findIsExit(id, contractInfoId, dto.getName());
             if (isExit == 0) {
                 WorkAttachment i = new WorkAttachment();
                 //包含了url、size、name

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/contractRegistration/service/dto/CwWorkContractBorrowDto.java

@@ -33,6 +33,9 @@ public class CwWorkContractBorrowDto extends BaseDTO {
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date borrowRetData;
 
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date createDate;
+
     private String remarks;
 
     private String borrowType;

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/program/configuration/projectList/mapper/xml/ProjectListMapper.xml

@@ -145,6 +145,7 @@
             LEFT JOIN program_audit pa2 ON pa2.program_id = a.id and pa2.audit_level = '2' and pa2.del_flag = '0'
             LEFT JOIN program_audit pa3 ON pa3.program_id = a.id and pa3.audit_level = '3' and pa3.del_flag = '0'
             LEFT JOIN program_archive pa ON pa.program_id = a.id and pa.del_flag = '0'
+            left join program_members pm on a.id = pm.project_id
             LEFT JOIN proofread_issued d ON a.id = d.project_id
             ${ew.customSqlSegment}
             ORDER BY a.update_date DESC