From 115dccc74d35fc5bd7ffce937458cf5c1abee272 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 25 Dec 2023 10:34:22 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?=
 =?UTF-8?q?=E8=B7=9F=E8=B8=AA=E6=B5=81=E7=A8=8B=20=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/ProcessProjectNotMetCommon.java    |  2 +-
 .../service/ProcessProjectNotMetService.java  | 28 ++++++++-----------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/common/ProcessProjectNotMetCommon.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/common/ProcessProjectNotMetCommon.java
index 16a448e6..5609837b 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/common/ProcessProjectNotMetCommon.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/common/ProcessProjectNotMetCommon.java
@@ -7,7 +7,7 @@ package com.jero.modules.activiti.process.projectnotmet.common;
 public class ProcessProjectNotMetCommon {
     public static final String STANDARDS_ENGINEER = "standardsEngineer";
     public static final String MANAGER_LEADER = "managerLeader";
-    public static final String DESIGN_ENGINEER_LIST = "designEngineerList";
+    public static final String DESIGN_ENGINEER = "designEngineer";
     /**
      *法规工程师发起整改
      */
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java
index 3bbb4be7..46e6c457 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java
@@ -15,10 +15,6 @@ import com.jero.modules.activiti.process.fb.dto.ProcessDTO;
 import com.jero.modules.activiti.process.fb.service.IProcessHandleService;
 import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
 import com.jero.modules.activiti.process.projectassess.common.ProcessProjectAssessCommon;
-import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssess;
-import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssessTerm;
-import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssessTermUser;
-import com.jero.modules.activiti.process.projectassess.vo.ProcessProjectAssessVO;
 import com.jero.modules.activiti.process.projectnotmet.common.ProcessProjectNotMetCommon;
 import com.jero.modules.activiti.process.projectnotmet.entity.ProcessProjectNotMet;
 import com.jero.modules.activiti.process.projectnotmet.entity.ProcessProjectNotMetLink;
@@ -113,25 +109,24 @@ public class ProcessProjectNotMetService extends ServiceImpl<ProcessProjectNotMe
         processInfoVO.setBusinessId(processProjectNotMetId);
         //保存关联标准表
         List<ProcessProjectNotMetLink> processProjectNotMetLinks = businessInfoDTO.getProcessProjectNotMetLinks();
-        processProjectNotMetLinks.forEach(item -> item.setProcessId(processProjectNotMetId));
+        processProjectNotMetLinks.forEach(item -> {
+                    item.setProcessId(processProjectNotMetId);
+                    item.setId(null);
+                }
+        );
         processProjectNotMetLinkService.saveBatch(processProjectNotMetLinks);
         //保存标准分发的设计工程师
         Map<String, Object> userInfoMap = processInfoVO.getUserInfoMap();
-        String designEngineers = (String) userInfoMap.get(ProcessProjectNotMetCommon.DESIGN_ENGINEER_LIST);
-        String[] designEngineersSplit = designEngineers.split(",");
+        String designEngineers = (String) userInfoMap.get(ProcessProjectNotMetCommon.DESIGN_ENGINEER);
         List<ProcessProjectNotMetUser> processProjectNotMetUsers = new ArrayList<>();
         for (ProcessProjectNotMetLink processProjectNotMetLink : processProjectNotMetLinks) {
             String notMetLinkId = processProjectNotMetLink.getId();
-            for (String designEngineerId : designEngineersSplit) {
-                ProcessProjectNotMetUser processProjectNotMetUser = new ProcessProjectNotMetUser();
-
-                processProjectNotMetUser.setProcessId(processProjectNotMetId);
-                processProjectNotMetUser.setLinkId(notMetLinkId);
-                processProjectNotMetUser.setEngineerId(designEngineerId);
-                processProjectNotMetUsers.add(processProjectNotMetUser);
-
-            }
+            ProcessProjectNotMetUser processProjectNotMetUser = new ProcessProjectNotMetUser();
 
+            processProjectNotMetUser.setProcessId(processProjectNotMetId);
+            processProjectNotMetUser.setLinkId(notMetLinkId);
+            //processProjectNotMetUser.setEngineerId(designEngineerId);
+            processProjectNotMetUsers.add(processProjectNotMetUser);
         }
         processProjectNotMetUserService.saveBatch(processProjectNotMetUsers);
         //启动流程
@@ -139,6 +134,7 @@ public class ProcessProjectNotMetService extends ServiceImpl<ProcessProjectNotMe
         basicProcessInfoDTO.setProcessDefinitionId(processHandleService.getDefinitionIdByKey(ProcessDefinitionKey.PROJECT_NOT_MET)); // 流程定义id
         basicProcessInfoDTO.setProcessType(ProcessTypeEnum.PROJECT_NOT_MET.getValue()); // 流程类型
         userInfoMap.put(ProcessProjectNotMetCommon.STANDARDS_ENGINEER, CurrentUserUtil.getId());
+        userInfoMap.put(ProcessProjectNotMetCommon.DESIGN_ENGINEER, processProjectNotMetUsers.get(0).getEngineerId());
         //userInfoMap.put(ProcessProjectNotMetCommon.MANAGER_LEADER, distinctAllResponsibleUnitLeaderListJoin);
         //processInfoVO.setUserInfoMap(userInfoMap);
         processHandleService.startProcess(processInfoVO);