From f62bd3dcd09eef66682a2e181dc6c9ac846ef472 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 22 Jan 2024 10:02:38 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=B3=95=E8=A7=84=E5=90=88=E8=A7=84?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=20=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E5=B8=88=E9=80=9A=E8=BF=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ProcessProjectStandardService.java  | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java
index 73e09f65..a7f444ff 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java
@@ -542,7 +542,7 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
             String designEngineer = term.getDesignEngineer();
             term1.setId(termId);
             term1.setAssessResults(assessResults);
-            term1.setDescription(designEngineer);
+            term1.setDesignEngineer(designEngineer);
             if (!pass){
                 continue;
             }
@@ -586,19 +586,24 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
         String taskId = processDTO.getTaskId();
         Map<String, Object> variables = new HashMap<>();
         variables.put(ProcessProjectStandardCommon.PASS, pass);
-        if (!pass){
+        List<String> designEngineerList;
+        if (pass){
+            designEngineerList = updateTermList.stream()
+                    .map(ProcessProjectStandardTerm::getDesignEngineer)
+                    .distinct()
+                    .collect(Collectors.toList());
+        }else {
             LambdaQueryWrapper<ProcessProjectStandardTermUser> wrapper1 = new LambdaQueryWrapper<>();
             wrapper1.eq(ProcessProjectStandardTermUser::getProcessId, businessId);
             wrapper1.isNotNull(ProcessProjectStandardTermUser::getResponsibleUnitLeader);
             List<ProcessProjectStandardTermUser> termUserList = termUserService.list(wrapper1);
-            List<String> designEngineerList = termUserList.stream()
+            designEngineerList = termUserList.stream()
                     .map(ProcessProjectStandardTermUser::getResponsibleUnitLeader)
                     .distinct()
                     .collect(Collectors.toList());
-            variables.put(ProcessProjectStandardCommon.DESIGN_ENGINEER_LIST, designEngineerList);
-            variables.put(ProcessProjectStandardCommon.DESIGN_ENGINEER_LIST_SIZE, designEngineerList.size());
         }
-
+        variables.put(ProcessProjectStandardCommon.DESIGN_ENGINEER_LIST, designEngineerList);
+        variables.put(ProcessProjectStandardCommon.DESIGN_ENGINEER_LIST_SIZE, designEngineerList.size());
         taskService.complete(taskId, variables);
         if (pass){
             //发送消息