ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 未符合项跟踪流程 联调

Browse Source
This commit is contained in:
lijiarao
2023-12-25 10:34:22 +08:00
parent f83a31c742
commit 115dccc74d
2 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/common/ProcessProjectNotMetCommon.java
+1 -1
View File
@@ -7,7 +7,7 @@ package com.jero.modules.activiti.process.projectnotmet.common;
public class ProcessProjectNotMetCommon { public class ProcessProjectNotMetCommon {
public static final String STANDARDS_ENGINEER = "standardsEngineer"; public static final String STANDARDS_ENGINEER = "standardsEngineer";
public static final String MANAGER_LEADER = "managerLeader"; public static final String MANAGER_LEADER = "managerLeader";
public static final String DESIGN_ENGINEER_LIST = "designEngineerList"; public static final String DESIGN_ENGINEER = "designEngineer";
/** /**
*法规工程师发起整改 *法规工程师发起整改
*/ */
laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java
+12 -16
View File
@@ -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.service.IProcessHandleService;
import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; 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.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.common.ProcessProjectNotMetCommon;
import com.jero.modules.activiti.process.projectnotmet.entity.ProcessProjectNotMet; import com.jero.modules.activiti.process.projectnotmet.entity.ProcessProjectNotMet;
import com.jero.modules.activiti.process.projectnotmet.entity.ProcessProjectNotMetLink; import com.jero.modules.activiti.process.projectnotmet.entity.ProcessProjectNotMetLink;
@@ -113,25 +109,24 @@ public class ProcessProjectNotMetService extends ServiceImpl<ProcessProjectNotMe
processInfoVO.setBusinessId(processProjectNotMetId); processInfoVO.setBusinessId(processProjectNotMetId);
//保存关联标准表 //保存关联标准表
List<ProcessProjectNotMetLink> processProjectNotMetLinks = businessInfoDTO.getProcessProjectNotMetLinks(); List<ProcessProjectNotMetLink> processProjectNotMetLinks = businessInfoDTO.getProcessProjectNotMetLinks();
processProjectNotMetLinks.forEach(item -> item.setProcessId(processProjectNotMetId)); processProjectNotMetLinks.forEach(item -> {
item.setProcessId(processProjectNotMetId);
item.setId(null);
}
);
processProjectNotMetLinkService.saveBatch(processProjectNotMetLinks); processProjectNotMetLinkService.saveBatch(processProjectNotMetLinks);
//保存标准分发的设计工程师 //保存标准分发的设计工程师
Map<String, Object> userInfoMap = processInfoVO.getUserInfoMap(); Map<String, Object> userInfoMap = processInfoVO.getUserInfoMap();
String designEngineers = (String) userInfoMap.get(ProcessProjectNotMetCommon.DESIGN_ENGINEER_LIST); String designEngineers = (String) userInfoMap.get(ProcessProjectNotMetCommon.DESIGN_ENGINEER);
String[] designEngineersSplit = designEngineers.split(",");
List<ProcessProjectNotMetUser> processProjectNotMetUsers = new ArrayList<>(); List<ProcessProjectNotMetUser> processProjectNotMetUsers = new ArrayList<>();
for (ProcessProjectNotMetLink processProjectNotMetLink : processProjectNotMetLinks) { for (ProcessProjectNotMetLink processProjectNotMetLink : processProjectNotMetLinks) {
String notMetLinkId = processProjectNotMetLink.getId(); String notMetLinkId = processProjectNotMetLink.getId();
for (String designEngineerId : designEngineersSplit) { ProcessProjectNotMetUser processProjectNotMetUser = new ProcessProjectNotMetUser();
ProcessProjectNotMetUser processProjectNotMetUser = new ProcessProjectNotMetUser();
processProjectNotMetUser.setProcessId(processProjectNotMetId);
processProjectNotMetUser.setLinkId(notMetLinkId);
processProjectNotMetUser.setEngineerId(designEngineerId);
processProjectNotMetUsers.add(processProjectNotMetUser);
}
processProjectNotMetUser.setProcessId(processProjectNotMetId);
processProjectNotMetUser.setLinkId(notMetLinkId);
//processProjectNotMetUser.setEngineerId(designEngineerId);
processProjectNotMetUsers.add(processProjectNotMetUser);
} }
processProjectNotMetUserService.saveBatch(processProjectNotMetUsers); processProjectNotMetUserService.saveBatch(processProjectNotMetUsers);
//启动流程 //启动流程
@@ -139,6 +134,7 @@ public class ProcessProjectNotMetService extends ServiceImpl<ProcessProjectNotMe
basicProcessInfoDTO.setProcessDefinitionId(processHandleService.getDefinitionIdByKey(ProcessDefinitionKey.PROJECT_NOT_MET)); // 流程定义id basicProcessInfoDTO.setProcessDefinitionId(processHandleService.getDefinitionIdByKey(ProcessDefinitionKey.PROJECT_NOT_MET)); // 流程定义id
basicProcessInfoDTO.setProcessType(ProcessTypeEnum.PROJECT_NOT_MET.getValue()); // 流程类型 basicProcessInfoDTO.setProcessType(ProcessTypeEnum.PROJECT_NOT_MET.getValue()); // 流程类型
userInfoMap.put(ProcessProjectNotMetCommon.STANDARDS_ENGINEER, CurrentUserUtil.getId()); userInfoMap.put(ProcessProjectNotMetCommon.STANDARDS_ENGINEER, CurrentUserUtil.getId());
userInfoMap.put(ProcessProjectNotMetCommon.DESIGN_ENGINEER, processProjectNotMetUsers.get(0).getEngineerId());
//userInfoMap.put(ProcessProjectNotMetCommon.MANAGER_LEADER, distinctAllResponsibleUnitLeaderListJoin); //userInfoMap.put(ProcessProjectNotMetCommon.MANAGER_LEADER, distinctAllResponsibleUnitLeaderListJoin);
//processInfoVO.setUserInfoMap(userInfoMap); //processInfoVO.setUserInfoMap(userInfoMap);
processHandleService.startProcess(processInfoVO); processHandleService.startProcess(processInfoVO);