diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/common/ProcessProjectAssessCommon.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/common/ProcessProjectAssessCommon.java index 886d9428..fb24270f 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/common/ProcessProjectAssessCommon.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/common/ProcessProjectAssessCommon.java @@ -7,6 +7,7 @@ package com.jero.modules.activiti.process.projectassess.common; public class ProcessProjectAssessCommon { public static final String STANDARDS_ENGINEER = "standardsEngineer"; public static final String MANAGER_LEADER_LIST = "managerLeaderList"; + public static final String MODULE_OWNER = "moduleOwner"; public static final String MODULE_OWNER_LIST = "moduleOwnerList"; public static final String MODULE_OWNER_LIST_SIZE = "moduleOwnerListSize"; public static final String DESIGN_ENGINEER_LIST = "designEngineerList"; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java index 4f9b6abf..9902a092 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java @@ -34,6 +34,7 @@ import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAsse import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; import com.jero.modules.activiti.process.projectassess.vo.ProcessProjectAssessVO; +import com.jero.modules.activiti.process.projectstandard.common.ProcessProjectStandardCommon; import com.jero.modules.activiti.service.ProcessAllService; import com.jero.modules.activiti.service.ProcessApprovalRecordService; import com.jero.modules.activiti.util.ThreadLocalUtil; @@ -444,8 +445,13 @@ public class ProcessProjectAssessService extends ServiceImpl processInfoVO, ProcessDTO processDTO, boolean pass) { + String businessId = processInfoVO.getBusinessId(); + ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord(); + String originUserId = processApprovalRecord.getOriginUserId(); + String userId = CurrentUserUtil.getId(); Task task = processDTO.getTask(); String executionId = task.getExecutionId(); + String formKey = task.getFormKey(); ProcessProjectAssessVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); List processProjectAssessTermList = businessInfoDTO.getProcessProjectAssessTermList(); List allTermUserList = new ArrayList<>(); @@ -453,6 +459,7 @@ public class ProcessProjectAssessService extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ProcessProjectAssessTermUser::getAssessmentId, businessId); + wrapper.eq(ProcessProjectAssessTermUser::getModuleOwner, originUserId); + wrapper.eq(ProcessProjectAssessTermUser::getParentExecutionId, formKey); + List termUserList = processProjectAssessTermUserService.list(wrapper); + List updateTermUserList = new ArrayList<>(); + for (ProcessProjectAssessTermUser processProjectAssessTermUser : termUserList) { + ProcessProjectAssessTermUser termUser = new ProcessProjectAssessTermUser(); + termUser.setId(processProjectAssessTermUser.getId()); + termUser.setModuleOwner(userId); + updateTermUserList.add(termUser); + } + processProjectAssessTermUserService.updateBatchById(updateTermUserList); + List userIdList = new ArrayList<>(); + userIdList.add(userId); + processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.MKFZRFF, userIdList); + processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.MKFZRSP, userIdList); + } } private void gbmzgjldspApprove(ProcessInfoVO processInfoVO, ProcessDTO processDTO, boolean pass) { + ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord(); + String originUserId = processApprovalRecord.getOriginUserId(); + String userId = CurrentUserUtil.getId(); + String businessId = processInfoVO.getBusinessId(); Task task = processDTO.getTask(); String executionId = task.getExecutionId(); ProcessProjectAssessVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); @@ -475,13 +505,14 @@ public class ProcessProjectAssessService extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(ProcessProjectAssessTermUser::getAssessmentId, assessmentId); wrapper.eq(ProcessProjectAssessTermUser::getResponsibleUnitLeader, originUserId); @@ -498,12 +529,32 @@ public class ProcessProjectAssessService extends ServiceImpl wrapper1 = new LambdaQueryWrapper<>(); + wrapper1.eq(ProcessProjectAssessTermUser::getAssessmentId, businessId); + wrapper1.eq(ProcessProjectAssessTermUser::getResponsibleUnitLeader, originUserId); + List termUserList = processProjectAssessTermUserService.list(wrapper1); + List updateTermUserList = new ArrayList<>(); + for (ProcessProjectAssessTermUser processProjectAssessTermUser : termUserList) { + ProcessProjectAssessTermUser termUser = new ProcessProjectAssessTermUser(); + termUser.setId(processProjectAssessTermUser.getId()); + termUser.setResponsibleUnitLeader(userId); + updateTermUserList.add(termUser); + } + processProjectAssessTermUserService.updateBatchById(updateTermUserList); + List userIdList = new ArrayList<>(); + userIdList.add(userId); + processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.GBMZGJLDXF, userIdList); + processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.GBMZGJLDSP, userIdList); + } } - + //模块负责人修改 private void mkfzrxgApprove(ProcessInfoVO processInfoVO, ProcessDTO processDTO, boolean pass) { String assessmentId = processInfoVO.getBusinessId(); ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord(); String originUserId = processApprovalRecord.getOriginUserId(); + String userId = CurrentUserUtil.getId(); + String businessId = processInfoVO.getBusinessId(); Task task = processDTO.getTask(); String executionId = task.getExecutionId(); String formKey = task.getFormKey(); @@ -515,6 +566,7 @@ public class ProcessProjectAssessService extends ServiceImpl wrapper1 = new LambdaQueryWrapper<>(); + wrapper1.eq(ProcessProjectAssessTermUser::getAssessmentId, businessId); + wrapper1.eq(ProcessProjectAssessTermUser::getModuleOwner, originUserId); + wrapper1.eq(ProcessProjectAssessTermUser::getParentExecutionId, formKey); + List termUserList = processProjectAssessTermUserService.list(wrapper1); + List updateTermUserList = new ArrayList<>(); + for (ProcessProjectAssessTermUser processProjectAssessTermUser : termUserList) { + ProcessProjectAssessTermUser termUser = new ProcessProjectAssessTermUser(); + termUser.setId(processProjectAssessTermUser.getId()); + termUser.setModuleOwner(userId); + updateTermUserList.add(termUser); + } + processProjectAssessTermUserService.updateBatchById(updateTermUserList); + List userIdList = new ArrayList<>(); + userIdList.add(userId); + processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.MKFZRFF, userIdList); + processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.MKFZRSP, userIdList); + } } @@ -712,6 +784,7 @@ public class ProcessProjectAssessService extends ServiceImpl userIdList = new ArrayList<>(); + userIdList.add(userId); + processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.GBMZGJLDXF, userIdList); + processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.GBMZGJLDSP, userIdList); + } } //模块负责人分发 @@ -780,6 +859,7 @@ public class ProcessProjectAssessService extends ServiceImpl userIdList = new ArrayList<>(); + userIdList.add(userId); + processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.MKFZRFF, userIdList); + processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.MKFZRSP, userIdList); + } } //设计工程师评估 @@ -859,6 +945,7 @@ public class ProcessProjectAssessService extends ServiceImpl variables = new HashMap<>(); + variables.put(ProcessProjectAssessCommon.MODULE_OWNER, processProjectAssessTermList.get(0).getModuleOwner()); + taskService.complete(taskId,variables); ThreadLocalUtil.remove(); + + if (!Objects.equals(userId,originUserId)){ + List userIdList = new ArrayList<>(); + userIdList.add(userId); + processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.SJGCSPG, userIdList); + } } 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 34d5dcb8..b585f966 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 @@ -19,11 +19,13 @@ import com.jero.modules.activiti.process.fb.dto.BasicTaskInfoDTO; 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.projectnotmet.common.ProcessProjectNotMetCommon; 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.mapper.ProcessProjectNotMetMapper; import com.jero.modules.activiti.process.projectnotmet.vo.ProcessProjectNotMetVO; +import com.jero.modules.activiti.process.projectstandard.common.ProcessProjectStandardCommon; import com.jero.modules.activiti.service.ProcessAllService; import com.jero.modules.activiti.service.ProcessApprovalRecordService; import com.jero.modules.laws.common.util.CurrentUserUtil; @@ -204,6 +206,9 @@ public class ProcessProjectNotMetService extends ServiceImpl processInfoVO, ProcessDTO processDTO, boolean pass) { + ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord(); + String originUserId = processApprovalRecord.getOriginUserId(); + String userId = CurrentUserUtil.getId(); // 完成任务 Map variables = new HashMap<>(); if (!pass){ @@ -216,6 +221,7 @@ public class ProcessProjectNotMetService extends ServiceImpl userIdList = new ArrayList<>(); + userIdList.add(userId); + processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectNotMetCommon.ZGJLDSP, userIdList); + } } private void fggcsspApprove(ProcessInfoVO processInfoVO, ProcessDTO processDTO, boolean pass, ProcessAll processAll) { + ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord(); + String originUserId = processApprovalRecord.getOriginUserId(); + String userId = CurrentUserUtil.getId(); // 完成任务 Map variables = new HashMap<>(); if (!pass){ @@ -261,7 +275,11 @@ public class ProcessProjectNotMetService extends ServiceImpl userIdList = new ArrayList<>(); + userIdList.add(userId); + processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectNotMetCommon.FGGCSSP, userIdList); } } @@ -277,6 +295,8 @@ public class ProcessProjectNotMetService extends ServiceImpl processProjectNotMetLinks = businessInfoDTO.getProcessProjectNotMetLinks(); @@ -285,7 +305,7 @@ public class ProcessProjectNotMetService extends ServiceImpl userIdList = new ArrayList<>(); + userIdList.add(userId); + processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectNotMetCommon.SJGCSSCZGCL, userIdList); + } } public void saveToDraft(ProcessInfoVO processInfoVO) { diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/common/ProcessProjectStandardCommon.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/common/ProcessProjectStandardCommon.java index ac3e6d96..337cf505 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/common/ProcessProjectStandardCommon.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/common/ProcessProjectStandardCommon.java @@ -11,6 +11,7 @@ public class ProcessProjectStandardCommon { public static final String MANAGER_LEADER_LIST = "managerLeaderList"; public static final String MANAGER_LEADER_LIST_SIZE = "managerLeaderListSize"; public static final String MODULE_OWNER_LIST = "moduleOwnerList"; + public static final String MODULE_OWNER = "moduleOwner"; public static final String MODULE_OWNER_LIST_SIZE = "moduleOwnerListSize"; public static final String DESIGN_ENGINEER_LIST = "designEngineerList"; public static final String DESIGN_ENGINEER_LIST_SIZE = "designEngineerListSize"; @@ -26,6 +27,7 @@ public class ProcessProjectStandardCommon { public static final String FGGCSFQ = "fggcsfq"; //部所主管级领导下发 public static final String BSZGJLDXF_ = "bszgjldxf_"; + public static final String BSZGJLDXF_1 = "bszgjldxf_1"; //模块责任人分发 public static final String MKZRRFF_ = "mkzrrff_"; public static final String MKZRRFF_1 = "mkzrrff_1"; @@ -44,6 +46,7 @@ public class ProcessProjectStandardCommon { public static final String MKZRRSP_1 = "mkzrrsp_1"; //部所主管级领导审批 public static final String BSZGJLDSP_ = "bszgjldsp_"; + public static final String BSZGJLDSP_1 = "bszgjldsp_1"; //法规工程师审批 public static final String FGGCSSP = "fggcssp"; //设计工程师补充工作令编号 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 39f890ae..caf220ee 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 @@ -447,6 +447,10 @@ public class ProcessProjectStandardService extends ServiceImpl processInfoVO, ProcessDTO processDTO, boolean pass) { + String businessId = processInfoVO.getBusinessId(); + ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord(); + String originUserId = processApprovalRecord.getOriginUserId(); + String userId = CurrentUserUtil.getId(); Task task = processDTO.getTask(); String parentExecutionId = task.getFormKey(); //查询表单 @@ -464,12 +468,35 @@ public class ProcessProjectStandardService extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ProcessProjectStandardTermUser::getProcessId, businessId); + wrapper.eq(ProcessProjectStandardTermUser::getModuleOwner, originUserId); + wrapper.eq(ProcessProjectStandardTermUser::getParentExecutionId, parentExecutionId); + List termUserList = termUserService.list(wrapper); + List updateTermUserList = new ArrayList<>(); + for (ProcessProjectStandardTermUser termUser : termUserList) { + ProcessProjectStandardTermUser update = new ProcessProjectStandardTermUser(); + update.setModuleOwner(userId); + update.setId(termUser.getId()); + updateTermUserList.add(update); + } + termUserService.updateBatchById(updateTermUserList); + List userIdList = new ArrayList<>(); + userIdList.add(userId); + processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.BSZGJLDXF_1, userIdList); + processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.BSZGJLDSP_1, userIdList); + } + } //部所主管级领导审批 private void bszgjldspApprove(ProcessInfoVO processInfoVO, ProcessDTO processDTO, boolean pass) { String businessId = processInfoVO.getBusinessId(); ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord(); String originUserId = processApprovalRecord.getOriginUserId(); + String userId = CurrentUserUtil.getId(); Task task = processDTO.getTask(); String executionId = task.getExecutionId(); //查询表单 @@ -487,7 +514,7 @@ public class ProcessProjectStandardService extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ProcessProjectStandardTermUser::getProcessId, businessId); + wrapper.eq(ProcessProjectStandardTermUser::getResponsibleUnitLeader, originUserId); + List termUserList = termUserService.list(wrapper); + List updateTermUserList = new ArrayList<>(); + for (ProcessProjectStandardTermUser termUser : termUserList) { + ProcessProjectStandardTermUser update = new ProcessProjectStandardTermUser(); + termUser.setResponsibleUnitLeader(userId); + update.setId(termUser.getId()); + updateTermUserList.add(update); + } + termUserService.updateBatchById(updateTermUserList); + List userIdList = new ArrayList<>(); + userIdList.add(userId); + processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.BSZGJLDXF_1, userIdList); + processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.BSZGJLDSP_1, userIdList); + } } //法规工程师审批 @@ -544,6 +591,7 @@ public class ProcessProjectStandardService extends ServiceImpl userIdList = new ArrayList<>(); + userIdList.add(userId); + processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.FGGCSSP, userIdList); + } } //部所主管级领导下发 @@ -694,6 +747,7 @@ public class ProcessProjectStandardService extends ServiceImpl updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.eq(ProcessProjectStandardTermUser::getId,termUserId); + updateWrapper.set(ProcessProjectStandardTermUser::getResponsibleUnitLeader, userId); if (StringUtils.isNotBlank(notInvolved)){ updateWrapper.set(ProcessProjectStandardTermUser::getNotInvolved,notInvolved); updateWrapper.set(ProcessProjectStandardTermUser::getAssessResults, AssessCommon.NOT_INVOLVED); @@ -733,6 +788,12 @@ public class ProcessProjectStandardService extends ServiceImpl userIdList = new ArrayList<>(); + userIdList.add(userId); + processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.BSZGJLDXF_1, userIdList); + processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.BSZGJLDSP_1, userIdList); + } ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID,executionId); // 完成任务 String taskId = processDTO.getTaskId(); @@ -750,6 +811,7 @@ public class ProcessProjectStandardService extends ServiceImpl updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.eq(ProcessProjectStandardTermUser::getId,termUserId); + updateWrapper.set(ProcessProjectStandardTermUser::getModuleOwner, userId); //如果是不涉及就更新 if (StringUtils.isNotBlank(notInvolved)){ updateWrapper.set(ProcessProjectStandardTermUser::getNotInvolved,notInvolved); @@ -801,6 +864,7 @@ public class ProcessProjectStandardService extends ServiceImpl userIdList = new ArrayList<>(); + userIdList.add(userId); + processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.MKZRRFF_1, userIdList); + processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.MKZRRSP_1, userIdList); + } ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID,executionId); // 完成任务 String taskId = processDTO.getTaskId(); @@ -831,15 +901,18 @@ public class ProcessProjectStandardService extends ServiceImpl termList = businessInfoDTO.getProcessProjectStandardTermList(); + String moduleOwnerId = termList.get(0).getModuleOwner(); List udpateTermUserList = new ArrayList<>(); for (ProcessProjectStandardTerm term : termList) { ProcessProjectStandardTermUser termUser = new ProcessProjectStandardTermUser(); termUser.setId(term.getTermUserId()); + termUser.setDesignEngineer(userId); termUser.setAssessResults(term.getAssessResults()); termUser.setIsRelate(term.getIsRelate()); termUser.setModelSeries(term.getModelSeries()); @@ -849,10 +922,15 @@ public class ProcessProjectStandardService extends ServiceImpl userIdList = new ArrayList<>(); + userIdList.add(userId); + processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.SJGCSPG_1, userIdList); + } // 完成任务 String taskId = processDTO.getTaskId(); Map variables = new HashMap<>(); - //variables.put(ProcessProjectStandardCommon.MANAGER_LEADER_LIST, moduleOwnerIds); + variables.put(ProcessProjectStandardCommon.MODULE_OWNER, moduleOwnerId); taskService.complete(taskId,variables); ThreadLocalUtil.remove(); }