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 processProjectNotMetLinks = businessInfoDTO.getProcessProjectNotMetLinks(); - processProjectNotMetLinks.forEach(item -> item.setProcessId(processProjectNotMetId)); + processProjectNotMetLinks.forEach(item -> { + item.setProcessId(processProjectNotMetId); + item.setId(null); + } + ); processProjectNotMetLinkService.saveBatch(processProjectNotMetLinks); //保存标准分发的设计工程师 Map 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 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