复核及签章流程

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/domain/CwProjectReport.java

@@ -26,6 +26,8 @@ public class CwProjectReport extends BaseEntity {
      */
     @TableField(exist = false)
     private String reportSponsor;
+    @TableField(exist = false)
+    private String procInsReview;
 
     private String id;
 

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/domain/CwProjectReportData.java

@@ -21,6 +21,13 @@ import java.util.List;
 public class CwProjectReportData extends BaseDTO {
 
     /**
+     * 区分新旧数据
+     */
+    private String newType;
+    @TableField(exist = false)
+    private String procInsReview;
+
+    /**
      * 报告主办人
      */
     private String reportSponsor;

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/domain/CwProjectReview.java

@@ -122,4 +122,9 @@ public class CwProjectReview extends BaseEntity {
     private String computerNo;
 
     private String reviewBy;
+
+    /**
+     * 区分新旧数据
+     */
+    private String newType;
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/mapper/xml/CwProjectReportMapper.xml

@@ -83,6 +83,7 @@
         cw_prs3.id as sid3,
         ifnull(cw_rev.review_status,'0') as reviewStatus,
         cw_rev.proc_ins_id as procInsId3,
+        cw_rev.new_type as newType,
         new_line.report_no as reportNo,
         cwcb.name as servedUnitName,
         art.ID_ as rev_task_id,
@@ -721,38 +722,40 @@
 
     <select id="getById" resultType="com.jeeplus.finance.projectReport.domain.CwProjectReport">
         SELECT
-            id,
-            remarks,
-            document_no,
-            project_id,
-            office_id,
-            signature_annotator1,
-            signature_annotator2,
-            signature_type,
-            proc_ins_id,
-            process_definition_id,
-            STATUS,
-            signature_contract_id,
-            real_create,
-            audit_fees,
-            business_type,
-            audit_business_type,
-            register_address,
-            business_location,
-            security_business,
-            industry,
-            business_objects,
-            create_time,
-            create_by_id,
-            update_time,
-            update_by_id,
-            del_flag,
-            tenant_id
+            a.id,
+            a.remarks,
+            a.document_no,
+            a.project_id,
+            a.office_id,
+            a.signature_annotator1,
+            a.signature_annotator2,
+            a.signature_type,
+            a.proc_ins_id,
+            a.process_definition_id,
+            a.STATUS,
+            a.signature_contract_id,
+            a.real_create,
+            a.audit_fees,
+            a.business_type,
+            a.audit_business_type,
+            a.register_address,
+            a.business_location,
+            a.security_business,
+            a.industry,
+            a.business_objects,
+            a.create_time,
+            a.create_by_id,
+            a.update_time,
+            a.update_by_id,
+            a.del_flag,
+            a.tenant_id,
+            re.proc_ins_id as procInsReview
         FROM
-            cw_project_report
+            cw_project_report a
+            left join cw_project_report_review re on a.id = re.report_id
         WHERE
-            id = #{id}
-            AND del_flag = 0
+            a.id = #{id}
+            AND a.del_flag = 0
     </select>
 
     <select id="getReportByReportNo" resultType="com.jeeplus.finance.projectReport.domain.CwProjectReport">

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/mapper/xml/CwProjectReportReviewMapper.xml

@@ -61,7 +61,8 @@
             update_time,
             update_by_id,
             del_flag,
-            tenant_id
+            tenant_id,
+            new_type
         FROM
             cw_project_report_review
         WHERE

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/service/CwProjectReportReviewService.java

@@ -286,7 +286,7 @@ public class CwProjectReportReviewService extends ServiceImpl<CwProjectReportRev
                     }
                     infoMapper.updateByReportId(reportData.getId(),infoData.getReportNumber(),infoData.getReportNo());
                 }
-                if ("三级复核".equals(currentTask)) {
+                if ("三级复核".equals(currentTask) || "三级复核及签章".equals(currentTask)) {
                     review.setReviewStatus("5");
                 }
             }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/service/CwProjectReportService.java

@@ -146,6 +146,7 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
             CwProjectReport report = reportMapper.getById(reportData.getId());
             if (report != null){
                 reportData.setCreateBy(reportData.getCreateBy());
+                reportData.setProcInsReview(report.getProcInsReview());
                 return update(reportData);
             }
         }
@@ -179,6 +180,8 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
         infoData.setUpdateTime(new Date());
         infoMapper.updateCwProjectInfoDataById(infoData);
 
+        createSignatureContractId(reportData);
+
         //对上传的文件数据进行持久化操作
         List<ProjectReportWorkAttachmentDTO> cwFileInfoList = report.getCwFileInfoList();
         List<WorkAttachmentInfo> cwFileInfoList2 = report.getCwFileInfoList2();
@@ -196,19 +199,13 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
             map.put("currentToken",TokenProvider.getCurrentToken ( ));
             SpringUtil.getBean ( IWorkAttachmentApi.class ).saveOrUpdateFileList(map);
 
-        } else if (CollectionUtils.isNotEmpty(cwFileInfoList)) {
-            updateFiles(cwFileInfoList, userDTO, report.getId());
-        } else {
-            //删除所有的文件信息
-            List<String> ids = attachmentMapper.getIdByAttachmentId(report.getId());
-            ids.forEach(id->{
-                List<String> fileId = attachmentMapper.getFileId(id);
-                fileId.forEach(fidId->{
-                    attachmentMapper.deleteById(fidId);
-                });
-                SpringUtil.getBean ( IWorkAttachmentApi.class ).deleteById(id);
-//                ossServiceMapper.deleteById(id);
-            });
+        }
+
+        if (null != cwFileInfoList && cwFileInfoList.size()>0 ) {
+
+            updateSignatureFiles(cwFileInfoList, userDTO, report.getId());
+
+
         }
 
         return report.getId();
@@ -362,7 +359,7 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
         if ( null !=report.getCwFileInfoList()){
             fileInfoList = report.getCwFileInfoList();
         }
-//        ossServiceMapper.delete(new QueryWrapper<WorkAttachmentInfo>().lambda().eq(WorkAttachmentInfo::getAttachmentId, report.getId()));
+
         AtomicInteger j = new AtomicInteger(1);
         if (fileInfoList != null){
             fileInfoList.forEach(item -> {
@@ -2418,16 +2415,14 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
         }
         //查询保存的附件信息
         List<WorkAttachmentInfo> infoList = reportMapper.findFileList(id);
-        if (org.flowable.editor.language.json.converter.util.CollectionUtils.isNotEmpty(infoList)) {
+        if (CollectionUtils.isNotEmpty(infoList)) {
             for (WorkAttachmentInfo i : infoList) {
                 if (!names.contains(i.getUrl())) {
-//                    ossServiceMapper.deleteById(i.getId());
                     SpringUtil.getBean ( IWorkAttachmentApi.class ).deleteById(i.getId());
                     List<String> fileId = attachmentMapper.getFileId(i.getId());
                     fileId.forEach(fid->{
                         attachmentMapper.deleteById(fid);
                     });
-
                 }
             }
         }
@@ -2470,8 +2465,6 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
                 attachmentMapper.insert(reportFile);
                 j++;
             } else {
-//                CwProjectReportFile reportFile = new CwProjectReportFile();
-//                BeanUtils.copyProperties(dto, reportFile);
                 attachmentMapper.updateFileInfo(dto);
             }
         }