From d13419abc4d39d9434582968c274f206c42370c4 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Mon, 15 Jul 2024 16:30:53 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20scc=E4=B8=BB=E6=B5=81=E7=A8=8B=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E8=8A=82=E7=82=B9=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...essStandardComplianceCheckServiceImpl.java | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

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 2d5c6b33..90754283 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
@@ -213,7 +213,6 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
                 LambdaUpdateWrapper<ProcessStandardComplianceCheckDetail> updateWrapper = new LambdaUpdateWrapper<>();
                 updateWrapper.in(ProcessStandardComplianceCheckDetail::getId, ids);
                 updateWrapper.set(ProcessStandardComplianceCheckDetail::getDesignEngineer, null);
-                updateWrapper.set(ProcessStandardComplianceCheckDetail::getProcessInstanceId, null);
                 sccDetailService.update(updateWrapper);
                 runtimeService.setVariable(processInstanceId, PASS, false);
                 break;
@@ -313,6 +312,11 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
                 runtimeService.setVariable(processInstanceId, DISTRIBUTE, distributeFlag);
                 runtimeService.setVariable(processInstanceId, UNALLOCATED_QUANTITY, unallocatedQuantity);
                 break;
+            case DESIGNER_ENGINEER_EVALUATION:
+                sccDetailService.updateBatchById(detailInfoList);
+                break;
+            case MAIN_CHECK_USER_COLLECT:
+                break;
         }
         // 审批节点
         actFlowCommonService.completeTask(taskId, curUserId);
@@ -354,11 +358,14 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
         detailQueryWrapper.eq(ProcessStandardComplianceCheckDetail::getCheckId, scc.getId());
         List<ProcessStandardComplianceCheckDetail> detailList = sccDetailService.list(detailQueryWrapper);
         String xmlNodeId = record.getNodeId();
+        processSccVO.setStandardInfo(scc);
         // 设置流程信息
         switch (xmlNodeId) {
             case STANDARD_ENGINEER_START:
             case DEPT_USER_DISTRIBUTE:
-                processSccVO.setStandardInfo(scc);
+            case MAIN_CHECK_USER_COLLECT:
+            case COUNTERSIGN:
+            case MANAGER_APPROVAL:
                 processSccVO.setDetailInfoList(detailList);
                 break;
             case MAIN_CHECK_USER_DISTRIBUTE:
@@ -368,11 +375,12 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
                         StrUtil.isBlank(detail.getDesignEngineer())).collect(Collectors.toList());
                 processSccVO.setDetailInfoList(detailList);
                 break;
-            case MAIN_CHECK_USER_COLLECT:
-                break;
-            case COUNTERSIGN:
-                break;
-            case MANAGER_APPROVAL:
+            case DESIGNER_ENGINEER_EVALUATION:
+            case MAIN_CHECK_USER_APPROVAL:
+                detailList = detailList.stream()
+                        .filter(detail -> processInstanceId.equals(detail.getProcessInstanceId()))
+                        .collect(Collectors.toList());
+                processSccVO.setDetailInfoList(detailList);
                 break;
         }
         result.setBusinessInfoDTO(processSccVO);