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

fix 81679 法规合规评估流程-法规工程师审批-部所主管级领导选择不涉及的数据，在这里查看不了信息

Browse Source
This commit is contained in:
lijiarao
2024-02-02 17:33:19 +08:00
parent eb54466ac2
commit 050d8355f3
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java
+11
View File
@@ -805,6 +805,8 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
ProcessProjectStandardVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); ProcessProjectStandardVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
List<ProcessProjectStandardTerm> termList = businessInfoDTO.getProcessProjectStandardTermList(); List<ProcessProjectStandardTerm> termList = businessInfoDTO.getProcessProjectStandardTermList();
Map<String, ProcessProjectStandardTerm> termUserIdMap = CollStreamUtil.toIdentityMap(termList, ProcessProjectStandardTerm::getTermUserId); Map<String, ProcessProjectStandardTerm> termUserIdMap = CollStreamUtil.toIdentityMap(termList, ProcessProjectStandardTerm::getTermUserId);
List<ProcessProjectStandardTermApproval> termApprovalList = new ArrayList<>();
List<String> moduleOwnerIds = new ArrayList<>(); List<String> moduleOwnerIds = new ArrayList<>();
for (ProcessProjectStandardTermUser termUser : termUserList) { for (ProcessProjectStandardTermUser termUser : termUserList) {
String termUserId = termUser.getId(); String termUserId = termUser.getId();
@@ -816,6 +818,14 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
if (StringUtils.isNotBlank(notInvolved)){ if (StringUtils.isNotBlank(notInvolved)){
updateWrapper.set(ProcessProjectStandardTermUser::getNotInvolved,notInvolved); updateWrapper.set(ProcessProjectStandardTermUser::getNotInvolved,notInvolved);
updateWrapper.set(ProcessProjectStandardTermUser::getAssessResults, AssessCommon.NOT_INVOLVED); updateWrapper.set(ProcessProjectStandardTermUser::getAssessResults, AssessCommon.NOT_INVOLVED);
//保存立项结果
ProcessProjectStandardTermApproval termApproval = new ProcessProjectStandardTermApproval();
termApproval.setProcessId(businessId);
termApproval.setResponsibleUnitLeader(userId);
termApproval.setTermId(term.getId());
termApproval.setAssessResults(AssessCommon.NOT_INVOLVED);
termApproval.setProjectApprovalFlag(YesOrNoEnum.NO.getValue());
termApprovalList.add(termApproval);
}else { }else {
String moduleOwner = term.getModuleOwner(); String moduleOwner = term.getModuleOwner();
if (StringUtils.isBlank(moduleOwner)){ if (StringUtils.isBlank(moduleOwner)){
@@ -829,6 +839,7 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
} }
termUserService.update(updateWrapper); termUserService.update(updateWrapper);
} }
termApprovalService.saveBatch(termApprovalList);
moduleOwnerIds = moduleOwnerIds.stream() moduleOwnerIds = moduleOwnerIds.stream()
.filter(Objects::nonNull) .filter(Objects::nonNull)
.distinct().collect(Collectors.toList()); .distinct().collect(Collectors.toList());