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

fix(标准法规入库流程): 80930

Browse Source
This commit is contained in:
yjz
2024-01-23 16:58:53 +08:00
parent 128fd7b2cf
commit 2d73011e25
1 changed files with 11 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/fb/service/impl/ProcessFbEntryChangeServiceImpl.java
+11 -4
View File
@@ -455,16 +455,23 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
return; return;
} }
List<String> idList = list.stream().map(ProcessFbEntryChange::getId).collect(Collectors.toList()); List<String> idList = list.stream().map(ProcessFbEntryChange::getId).collect(Collectors.toList());
int count = processAllService.count( List<ProcessAll> processAllList = processAllService.list(
new LambdaQueryWrapper<ProcessAll>() new LambdaQueryWrapper<ProcessAll>()
.in(ProcessAll::getProjectId, idList) .in(ProcessAll::getProjectId, idList)
.eq(ProcessAll::getPrcStatus, "1")); .eq(ProcessAll::getPrcStatus, "1"));
int size = processDraftService.count(new LambdaQueryWrapper<ProcessDraft>() List<ProcessDraft> processDraftList = processDraftService.list(new LambdaQueryWrapper<ProcessDraft>()
.in(ProcessDraft::getProjectId, idList) .in(ProcessDraft::getProjectId, idList)
.and(qw -> qw.ne(ProcessDraft::getSaveSource, "3") .and(qw -> qw.ne(ProcessDraft::getSaveSource, "3")
.or().isNull(ProcessDraft::getSaveSource))); .or().isNull(ProcessDraft::getSaveSource)));
if (count > 0 || size > 0) { if (!processAllList.isEmpty() || !processDraftList.isEmpty()) {
throw new JeroBootException("标准编号在标准法规变更流程进行中，不可删除！"); List<String> processAllProjectIds = processAllList.stream().map(ProcessAll::getProjectId).collect(Collectors.toList());
List<String> processDraftProjectIds = processDraftList.stream().map(ProcessDraft::getProjectId).collect(Collectors.toList());
processAllProjectIds.addAll(processDraftProjectIds);
processAllProjectIds = processDraftProjectIds.stream().distinct().collect(Collectors.toList());
List<String> finalProcessAllProjectIds = processAllProjectIds;
String standardNumbers = list.stream().filter(v -> finalProcessAllProjectIds.contains(v.getId()))
.map(ProcessFbEntryChange::getStandardNumber).collect(Collectors.joining(","));
throw new JeroBootException("标准编号为：" + standardNumbers +"在标准法规变更流程进行中，不可删除！");
} }
} }