From b9d94bb7cb94f2a3d9cd1132520e8bbcdc0a128d Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 12 Jul 2024 16:54:30 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20scc=E6=B5=81=E7=A8=8B=E5=90=84=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E5=88=86=E5=8F=91/=E4=B8=BB=E6=8E=92=E6=9F=A5?=
 =?UTF-8?q?=E4=BA=BA=E5=88=86=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/ProcessStandardComplianceCheck.java     | 14 ++++++++++++++
 .../ProcessStandardComplianceCheckServiceImpl.java |  5 +++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheck.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheck.java
index 969e5307..d9821553 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheck.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheck.java
@@ -141,6 +141,20 @@ public class ProcessStandardComplianceCheck implements Serializable {
     @TableField(exist = false)
     private String splitFile;
 
+    /**
+     * 主排查人
+     */
+    @ApiModelProperty(value = "主排查人")
+    @TableField(exist = false)
+    private String mainCheckUser;
+
+    /**
+     * 排查任务是否下发
+     */
+    @ApiModelProperty(value = "排查任务是否下发")
+    @TableField(exist = false)
+    private String distributeFlag;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
index 8803c5f2..4fa6ed8c 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
@@ -239,11 +239,11 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
         // 更新审批表为完成，填充数据
         actFlowCommonService.updateApprovalInfo(processTask, taskId);
         String curUserId = UserUtils.getUserId();
-        Map<String, Object> userInfoMap = processInfoVO.getUserInfoMap();
+        ProcessSccVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
         switch (xmlNodeId) {
             case DEPT_USER_DISTRIBUTE:
                 // 设置主排查人
-                String mainCheckUser = userInfoMap.get(MAIN_CHECK_USER).toString();
+                String mainCheckUser = businessInfoDTO.getStandardInfo().getMainCheckUser();
                 runtimeService.setVariable(processInstanceId, MAIN_CHECK_USER, mainCheckUser);
                 break;
             case MAIN_CHECK_USER_DISTRIBUTE:
@@ -293,6 +293,7 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
         // 设置流程信息
         switch (xmlNodeId) {
             case DEPT_USER_DISTRIBUTE:
+            case MAIN_CHECK_USER_DISTRIBUTE:
                 processSccVO.setStandardInfo(scc);
                 processSccVO.setDetailInfoList(detailList);
                 break;