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-19 15:39:18 +08:00
parent 533325ee9e
commit e531ae4e8a
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java
+18 -4
View File
@@ -164,8 +164,6 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
break;
//模块负责人审批
case ProcessProjectAssessCommon.MKFZRSP:
//模块负责人修改
case ProcessProjectAssessCommon.MKFZRXG:
processProjectAssessTermList = processProjectAssessTermService.getByModuleOwner(assessmentId, originUserId, executionParentId);
wrapper.eq(ProcessProjectAssessTermUser::getModuleOwner, originUserId);
wrapper.eq(ProcessProjectAssessTermUser::getParentExecutionId, executionParentId);
@@ -179,6 +177,21 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
Collectors.joining(",")))
);
break;
//模块负责人修改
case ProcessProjectAssessCommon.MKFZRXG:
processProjectAssessTermList = processProjectAssessTermService.getByModuleOwner(assessmentId, originUserId, executionParentId);
wrapper.eq(ProcessProjectAssessTermUser::getModuleOwner, originUserId);
wrapper.eq(ProcessProjectAssessTermUser::getParentExecutionId, executionParentId);
processProjectAssessTermUserList = processProjectAssessTermUserService.list(wrapper);
previousNodeHandlerMap = processProjectAssessTermUserList.stream()
.collect(
Collectors.groupingBy(ProcessProjectAssessTermUser::getTermId,
Collectors.mapping(item -> {
return userNameMap.get(item.getResponsibleUnitLeader());
},
Collectors.joining(",")))
);
break;
//设计工程师评估
case ProcessProjectAssessCommon.SJGCSPG:
case ProcessProjectAssessCommon.SJGCSPG2:
@@ -674,6 +687,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord();
String originUserId = processApprovalRecord.getOriginUserId();
Task task = processDTO.getTask();
String formKey = task.getFormKey();
String executionId = task.getExecutionId();
ProcessProjectAssessVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
@@ -686,11 +700,11 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
termUser.setDescription(processProjectAssessTerm.getDescription());
termUser.setFileId(processProjectAssessTerm.getFileId());
termUser.setExpectedTime(processProjectAssessTerm.getExpectedTime());
termUser.setParentExecutionId(executionId);
termUser.setParentExecutionId(formKey);
allTermUserList.add(termUser);
}
processProjectAssessTermUserService.updateBatchById(allTermUserList);
tempCache.put(ProcessProjectAssessCommon.EXECUTION_ID,executionId);
tempCache.put(ProcessProjectAssessCommon.EXECUTION_ID,formKey);
// 完成任务
String taskId = processDTO.getTaskId();