签章流程调整

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/controller/CwProjectReportController.java

@@ -116,6 +116,33 @@ public class CwProjectReportController {
                     i.setAuditUserIdsRev(flowTaskService.getTaskAuditUsers(i.getRevTaskId()));  // 获取数据审核人
                 }
             }
+            // 签章
+            if (StringUtils.isNotBlank(i.getSignatureType())) {
+                // 电子章
+                if ("1".equals(i.getSignatureType())) {
+                    if (StringUtils.isNotBlank(i.getSignTaskId1()) && StringUtils.isNotBlank(i.getStatus1())) {
+                        if ("2".equals(i.getStatus1())) { // “审核中”的数据要获取数据审核人
+                            i.setAuditUserIdsSign1(flowTaskService.getTaskAuditUsers(i.getSignTaskId1()));  // 获取数据审核人
+                        }
+                    }
+                }
+                // 公章+执业章
+                if ("2".equals(i.getSignatureType())) {
+                    if (StringUtils.isNotBlank(i.getSignTaskId2()) && StringUtils.isNotBlank(i.getStatus2())) {
+                        if ("2".equals(i.getStatus2())) { // “审核中”的数据要获取数据审核人
+                            i.setAuditUserIdsSign2(flowTaskService.getTaskAuditUsers(i.getSignTaskId2()));  // 获取数据审核人
+                        }
+                    }
+                }
+                // 实体章
+                if ("3".equals(i.getSignatureType())) {
+                    if (StringUtils.isNotBlank(i.getSignTaskId3()) && StringUtils.isNotBlank(i.getStatus3())) {
+                        if ("2".equals(i.getStatus3())) { // “审核中”的数据要获取数据审核人
+                            i.setAuditUserIdsSign3(flowTaskService.getTaskAuditUsers(i.getSignTaskId3()));  // 获取数据审核人
+                        }
+                    }
+                }
+            }
         });
         return ResponseEntity.ok (result);
     }

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

@@ -431,8 +431,37 @@ public class CwProjectReportData extends BaseDTO {
     private String revTaskId;
 
     /**
+     * 签章-电子章  流程taskId
+     */
+    private String signTaskId1;
+
+    /**
+     * 签章-公章+执业章  流程taskId
+     */
+    private String signTaskId2;
+
+    /**
+     * 签章-实体章  流程taskId
+     */
+    private String signTaskId3;
+
+    /**
      * 数据审核人  报告复核
      */
-    @TableField(exist = false)
     private List<String> auditUserIdsRev;
+
+    /**
+     * 数据审核人  签章-电子章
+     */
+    private List<String> auditUserIdsSign1;
+
+    /**
+     * 数据审核人  签章-公章+执业章
+     */
+    private List<String> auditUserIdsSign2;
+
+    /**
+     * 数据审核人  签章-实体章
+     */
+    private List<String> auditUserIdsSign3;
 }

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

@@ -83,16 +83,24 @@
         cw_rev.proc_ins_id as procInsId3,
         new_line.report_no as reportNo,
         cwcb.name as servedUnitName,
-        art.ID_ as rev_task_id
+        art.ID_ as rev_task_id,
+        art1.ID_ as sign_task_id1,
+        art2.ID_ as sign_task_id2,
+        art3.ID_ as sign_task_id3
         FROM cw_project_report a
         left join cw_project_records b on a.project_id = b.id
         LEFT JOIN sys_office c on a.office_id = c.id
         LEFT JOIN sys_user d on a.create_by = d.id
         LEFT JOIN sys_user e on b.project_master_id = e.id
         LEFT JOIN sys_user f on b.real_header = f.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 act_ru_task art1 ON cw_prs1.proc_ins_id = art1.PROC_INST_ID_
+        left join act_ru_task art2 ON cw_prs2.proc_ins_id = art2.PROC_INST_ID_
+        left join act_ru_task art3 ON cw_prs3.proc_ins_id = art3.PROC_INST_ID_
+
         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'
         left join act_ru_task art ON cw_rev.proc_ins_id = art.PROC_INST_ID_