From 2a0d70a900a8c11eada221e411f32cfa1491b477 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 23 Jan 2024 10:18:12 +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=E5=AE=A1=E6=89=B9=E9=80=9A=E8=BF=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProcessProjectStandardService.java        | 32 +++++++++++++++----
 1 file changed, 25 insertions(+), 7 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 ddbbc0cf..8fd3f055 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
@@ -320,6 +320,7 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
         //保存条款
         List<ProcessProjectStandardTerm> processProjectStandardTermList = businessInfoDTO.getProcessProjectStandardTermList();
         for (ProcessProjectStandardTerm term : processProjectStandardTermList) {
+            term.setId(null);
             term.setProcessId(processId);
             term.setImplementationDate(implementationDate);
         }
@@ -533,11 +534,17 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
         wrapper.eq(ProcessProjectStandardTermUser::getAssessResults, AssessCommon.NOT_COMPLIANT);
         List<ProcessProjectStandardTermUser> notCompliantList = termUserService.list(wrapper);
         Map<String, List<ProcessProjectStandardTermUser>> termIdMap = CollStreamUtil.groupByKey(notCompliantList, ProcessProjectStandardTermUser::getTermId);
+        //查询全部评估
+        wrapper.clear();
+        wrapper.eq(ProcessProjectStandardTermUser::getProcessId, businessId);
+        List<ProcessProjectStandardTermUser> allTermUserList = termUserService.list(wrapper);
+        Map<String, List<ProcessProjectStandardTermUser>> allTermIdMap = CollStreamUtil.groupByKey(allTermUserList, ProcessProjectStandardTermUser::getTermId);
         //查询表单
         ProcessProjectStandardVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
         List<ProcessProjectStandardTerm> termList = businessInfoDTO.getProcessProjectStandardTermList();
         List<String> carbonCopyPersonnelList = new ArrayList<>();
         List<ProcessProjectStandardTerm> updateTermList = new ArrayList<>();
+        List<ProcessProjectStandardTermUser> updateTermUserList = new ArrayList<>();
         Date date = new Date();
         for (ProcessProjectStandardTerm term : termList) {
             ProcessProjectStandardTerm term1 = new ProcessProjectStandardTerm();
@@ -548,13 +555,6 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
                 continue;
             }
             term1.setId(termId);
-            term1.setAssessResults(assessResults);
-            if(StringUtils.isBlank(designEngineer)){
-                designEngineer = term.getModuleOwner();
-            }
-            if(StringUtils.isBlank(designEngineer)){
-                designEngineer = term.getResponsibleUnitLeader();
-            }
             term1.setDesignEngineer(designEngineer);
             updateTermList.add(term1);
             carbonCopyPersonnelList.addAll(Arrays.asList(term.getCarbonCopyPersonnels().split(",")));
@@ -586,12 +586,30 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
                 String description = termUserList.stream().map(ProcessProjectStandardTermUser::getDescription).collect(Collectors.joining(","));
                 projectLibrary.setDescription(description);
             }
+            if (allTermIdMap.containsKey(termId)) {
+                List<ProcessProjectStandardTermUser> termUserList = allTermIdMap.get(termId);
+                for (ProcessProjectStandardTermUser termUser : termUserList) {
+                    ProcessProjectStandardTermUser updateTermUser = new ProcessProjectStandardTermUser();
+                    updateTermUser.setId(termUser.getId());
+                    String designEngineer1 = termUser.getDesignEngineer();
+                    term1.setAssessResults(assessResults);
+                    if(StringUtils.isBlank(designEngineer1)){
+                        designEngineer1 = termUser.getModuleOwner();
+                    }
+                    if(StringUtils.isBlank(designEngineer1)){
+                        designEngineer1 = termUser.getResponsibleUnitLeader();
+                    }
+                    updateTermUser.setDesignEngineer(designEngineer1);
+                    updateTermUserList.add(updateTermUser);
+                }
+            }
             //推送数据到法规项目库
             lawsSpecialProjectLibraryService.save(projectLibrary);
         }
         //更新数据
         if (pass){
             termService.updateBatchById(updateTermList);
+            termUserService.updateBatchById(updateTermUserList);
         }
         // 完成任务
         String taskId = processDTO.getTaskId();