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

fix: 80491 企标制修订流程（主起草人上传会议纪要）--校对人(其他起草人) 没有带出

Browse Source
This commit is contained in:
mzaxd
2024-01-30 16:31:46 +08:00
parent f4b8a5e28b
commit ade8374fd5
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
+13 -2
View File
@@ -129,8 +129,15 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
String processInstanceId = processInstance.getId(); String processInstanceId = processInstance.getId();
// 保存数据 // 保存数据
data.setProcessInstanceId(processInstanceId); data.setProcessInstanceId(processInstanceId);
data.getOtherDraftUserVOS().forEach(o -> o.setFinishFlag(YesOrNoEnum.NO.getValue())); List<OtherDraftUserVO> otherDraftUserVOS = data.getOtherDraftUserVOS();
data.setOtherDrafterUploadFileJson(data.getOtherDraftUserVOS()); if (otherDraftUserVOS != null && !otherDraftUserVOS.isEmpty()) {
data.getOtherDraftUserVOS().forEach(o -> o.setFinishFlag(YesOrNoEnum.NO.getValue()));
data.setOtherDrafterUploadFileJson(otherDraftUserVOS);
data.setProofreader(otherDraftUserVOS.stream()
.map(OtherDraftUserVO::getUser)
.distinct()
.collect(Collectors.joining(",")));
}
save(data); save(data);
// 手动设置所有流程变量 // 手动设置所有流程变量
actFlowCommonService.setProcessVariables(processInstanceId, actVariables); actFlowCommonService.setProcessVariables(processInstanceId, actVariables);
@@ -417,6 +424,10 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
taskService.setVariable(taskId, "otherDraftUserList", otherDraftUserVOS.stream().map(OtherDraftUserVO::getUser) taskService.setVariable(taskId, "otherDraftUserList", otherDraftUserVOS.stream().map(OtherDraftUserVO::getUser)
.collect(Collectors.toList())); .collect(Collectors.toList()));
otherDraftUserVOS.forEach(o -> o.setFinishFlag(YesOrNoEnum.NO.getValue())); otherDraftUserVOS.forEach(o -> o.setFinishFlag(YesOrNoEnum.NO.getValue()));
data.setProofreader(otherDraftUserVOS.stream()
.map(OtherDraftUserVO::getUser)
.distinct()
.collect(Collectors.joining(",")));
data.setOtherDraftUserVOS(otherDraftUserVOS); data.setOtherDraftUserVOS(otherDraftUserVOS);
data.setOtherDrafterUploadFileJson(otherDraftUserVOS); data.setOtherDrafterUploadFileJson(otherDraftUserVOS);
} }