签章流程调整

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectRecords/service/CwProjectRecordsService.java

@@ -148,6 +148,7 @@ public class CwProjectRecordsService extends ServiceImpl<CwProjectRecordsMapper,
             //项目编号生成
             String serialNum = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), CwProjectRecordsDTO.BIZ_CODE);
             cwProjectRecordsDTO.setProjectNumber(serialNum);
+            cwProjectRecordsDTO.setStatus("5");
         } else {
             //把原项目关联的客户联系人从客户表删除
             CwProjectRecords project = this.getById(cwProjectRecordsDTO.getId());

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/domain/CwProjectReportData.java

@@ -183,6 +183,26 @@ public class CwProjectReportData extends BaseDTO {
     private String sid2;
 
     /**
+     * 实体章流程procInsId
+     */
+    private String procInsIds3;
+
+    /**
+     * 实体章流程processDefinitionId
+     */
+    private String processDefinitionId3;
+
+    /**
+     * 实体章流程status
+     */
+    private String status3;
+
+    /**
+     * 实体章流程表id
+     */
+    private String sid3;
+
+    /**
      * 电子签章文件地址
      */
     private String signatureUrl;

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/mapper/xml/CwProjectReportMapper.xml

@@ -74,6 +74,10 @@
         cw_prs2.process_definition_id as process_definition_id2,
         cw_prs2.status as status2,
         cw_prs2.id as sid2,
+        cw_prs3.proc_ins_id as proc_ins_ids3,
+        cw_prs3.process_definition_id as process_definition_id3,
+        cw_prs3.status as status3,
+        cw_prs3.id as sid3,
         cw_rev.review_status,
         cw_rev.proc_ins_id as procInsId3,
         new_line.report_no as reportNo
@@ -84,6 +88,7 @@
         LEFT JOIN sys_user e on b.project_master_id = e.id
         LEFT JOIN cw_project_report_signature cw_prs1 on cw_prs1.report_id = a.id and cw_prs1.type = '1' and cw_prs1.del_flag = '0'
         LEFT JOIN cw_project_report_signature cw_prs2 on cw_prs2.report_id = a.id and cw_prs2.type = '2' and cw_prs2.del_flag = '0'
+        LEFT JOIN cw_project_report_signature cw_prs3 on cw_prs3.report_id = a.id and cw_prs3.type = '3' and cw_prs3.del_flag = '0'
         left join cw_project_report_new_line new_line on a.id = new_line.report_id and new_line.del_flag = '0'
         left join cw_project_report_review cw_rev on a.id = cw_rev.report_id and cw_rev.del_flag = '0'
         ${ew.customSqlSegment}
@@ -129,6 +134,10 @@
         cw_prs2.process_definition_id as process_definition_id2,
         cw_prs2.status as status2,
         cw_prs2.id as sid2,
+        cw_prs3.proc_ins_id as proc_ins_ids3,
+        cw_prs3.process_definition_id as process_definition_id3,
+        cw_prs3.status as status3,
+        cw_prs3.id as sid3,
         new_line.served_unit_id as servedUnitId,
         new_line.report_date as reportDate,
         new_line.report_type as reportType,
@@ -144,6 +153,7 @@
         LEFT JOIN sys_user e on b.project_master_id = e.id
         LEFT JOIN cw_project_report_signature cw_prs1 on cw_prs1.report_id = a.id and cw_prs1.type = '1' and cw_prs1.del_flag = '0'
         LEFT JOIN cw_project_report_signature cw_prs2 on cw_prs2.report_id = a.id and cw_prs2.type = '2' and cw_prs2.del_flag = '0'
+        LEFT JOIN cw_project_report_signature cw_prs3 on cw_prs3.report_id = a.id and cw_prs3.type = '3' and cw_prs3.del_flag = '0'
         left join cw_project_report_new_line new_line on a.id = new_line.report_id
         left join cw_project_report_review cw_re on a.id = cw_re.report_id and cw_re.del_flag = '0'
         where a.id = #{id}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/service/CwProjectReportService.java

@@ -336,6 +336,12 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
         cwProjectReportSignature2.setType("2");
         cwProjectReportSignature2.setStatus("0");
         cwProjectReportSignatureMapper.insert(cwProjectReportSignature2);
+        // 实体章流程
+        CwProjectReportSignature cwProjectReportSignature3 = new CwProjectReportSignature();
+        cwProjectReportSignature3.setReportId(report.getId());
+        cwProjectReportSignature3.setType("3");
+        cwProjectReportSignature3.setStatus("0");
+        cwProjectReportSignatureMapper.insert(cwProjectReportSignature3);
 
         return report.getId();
     }
@@ -1117,7 +1123,7 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
         cwProjectReportSignature.setId(data.getId());
         cwProjectReportSignature.setStatus(data.getStatus());
         //用于驳回后状态改变
-        if("4".equals(data.getStatus())){
+        if("4".equals(data.getStatus()) || "0".equals(data.getStatus())){
             cwProjectReportSignature.setSignatureAnnotator1Status("0");
             cwProjectReportSignature.setSignatureAnnotator2Status("0");
             cwProjectReportSignature.setSealAdminStatus("0");