From 0c344672f37e54d6e9402ec3c47ef2e5a6f6195d Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 18 Jul 2024 11:04:10 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20scc=E6=B5=81=E7=A8=8B=E4=BC=9A=E7=AD=BE?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E9=A9=B3=E5=9B=9E=E5=90=8E=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/service/ActFlowCommonService.java  | 23 ++++++++++++
 ...essStandardComplianceCheckServiceImpl.java | 36 ++++---------------
 2 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java
index 0cc405a7..462eab8f 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java
@@ -36,6 +36,8 @@ import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.*;
+import java.util.function.Consumer;
+import java.util.function.Function;
 
 @Slf4j
 @Service
@@ -152,6 +154,27 @@ public class ActFlowCommonService {
         return processApprovalRecordService.getByTaskId(taskId);
     }
 
+    public void setListAttribute(String instanceId, String variableName, Consumer<List<String>> setter, Function<Object, List<String>> converter) {
+        Object value = runtimeService.getVariable(instanceId, variableName);
+        if (value != null) {
+            setter.accept(converter.apply(value));
+        }
+    }
+
+    public void setStringAttribute(String instanceId, String variableName, Consumer<String> setter, Function<Object, String> converter) {
+        Object value = runtimeService.getVariable(instanceId, variableName);
+        if (value != null) {
+            setter.accept(converter.apply(value));
+        }
+    }
+
+    public void setStringBooleanAttribute(String instanceId, String variableName, Consumer<String> setter, Function<Object, String> converter) {
+        Object value = runtimeService.getVariable(instanceId, variableName);
+        if (value != null) {
+            setter.accept(converter.apply(value));
+        }
+    }
+
     /**
      * 完成提交任务
      */
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 6b91b827..a3eb88dd 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
@@ -52,8 +52,6 @@ import javax.annotation.Resource;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.*;
-import java.util.function.Consumer;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import static com.jero.modules.activiti.common.ActivitiCommon.*;
@@ -223,11 +221,6 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
             case SENIOR_MANAGER_APPROVAL:
                 runtimeService.setVariable(processInstanceId, PASS, pass);
                 break;
-        }
-        // TODO 转办修改流程变量逻辑
-        switch (xmlNodeId) {
-
-
         }
         // 保存快照
         processHandleService.saveToSnapshot(processInfoVO, curUserId);
@@ -457,29 +450,12 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
     }
 
     private void handleDataVariables(ProcessStandardComplianceCheck scc, String mainInstanceId) {
-        Object distributeFlag = runtimeService.getVariable(mainInstanceId, DISTRIBUTE);
-        if (distributeFlag != null) {
-            scc.setDistributeFlag((boolean)distributeFlag ? YesOrNoEnum.YES.getValue() : YesOrNoEnum.NO.getValue());
-        }
-        setStringAttribute(mainInstanceId, DEPT_USER, scc::setDeptUser, Object::toString);
-        setStringAttribute(mainInstanceId, MAIN_CHECK_USER, scc::setMainCheckUser, Object::toString);
-//        setListAttribute(mainInstanceId, COUNTERSIGN_USER_LIST, v -> scc.setCountersignUser(String.join(",", (List<String>) v)), v -> (List<String>) v);
-//        setListAttribute(mainInstanceId, MANAGER, scc::setManager, Object::toString);
-//        setListAttribute(mainInstanceId, SENIOR_MANAGER, scc::setSeniorManager, Object::toString);
-    }
-
-    private void setListAttribute(String instanceId, String variableName, Consumer<List<String>> setter, Function<Object, List<String>> converter) {
-        Object value = runtimeService.getVariable(instanceId, variableName);
-        if (value != null) {
-            setter.accept(converter.apply(value));
-        }
-    }
-
-    private void setStringAttribute(String instanceId, String variableName, Consumer<String> setter, Function<Object, String> converter) {
-        Object value = runtimeService.getVariable(instanceId, variableName);
-        if (value != null) {
-            setter.accept(converter.apply(value));
-        }
+        actFlowCommonService.setStringBooleanAttribute(mainInstanceId, DISTRIBUTE, scc::setDistributeFlag, value -> (boolean) value ? YesOrNoEnum.YES.getValue() : YesOrNoEnum.NO.getValue());
+        actFlowCommonService.setStringAttribute(mainInstanceId, DEPT_USER, scc::setDeptUser, Object::toString);
+        actFlowCommonService.setStringAttribute(mainInstanceId, MAIN_CHECK_USER, scc::setMainCheckUser, Object::toString);
+        actFlowCommonService.setListAttribute(mainInstanceId, COUNTERSIGN_USER_LIST, v -> scc.setCountersignUser(String.join(",", v)), v -> (List<String>) v);
+        actFlowCommonService.setListAttribute(mainInstanceId, MANAGER_LIST, v -> scc.setManager(String.join(",", v)), v -> (List<String>) v);
+        actFlowCommonService.setListAttribute(mainInstanceId, SENIOR_MANAGER_LIST, v -> scc.setSeniorManager(String.join(",", v)), v -> (List<String>) v);
     }
 
     private void setDesignerEngineerEvaluationHandleData(ProcessSccVO processSccVO, String mainInstanceId, String processInstanceId) {