fix(标准法规入库流程): 80930
This commit is contained in:
+11
-4
@@ -455,16 +455,23 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
|
||||
return;
|
||||
}
|
||||
List<String> idList = list.stream().map(ProcessFbEntryChange::getId).collect(Collectors.toList());
|
||||
int count = processAllService.count(
|
||||
List<ProcessAll> processAllList = processAllService.list(
|
||||
new LambdaQueryWrapper<ProcessAll>()
|
||||
.in(ProcessAll::getProjectId, idList)
|
||||
.eq(ProcessAll::getPrcStatus, "1"));
|
||||
int size = processDraftService.count(new LambdaQueryWrapper<ProcessDraft>()
|
||||
List<ProcessDraft> processDraftList = processDraftService.list(new LambdaQueryWrapper<ProcessDraft>()
|
||||
.in(ProcessDraft::getProjectId, idList)
|
||||
.and(qw -> qw.ne(ProcessDraft::getSaveSource, "3")
|
||||
.or().isNull(ProcessDraft::getSaveSource)));
|
||||
if (count > 0 || size > 0) {
|
||||
throw new JeroBootException("标准编号在标准法规变更流程进行中,不可删除!");
|
||||
if (!processAllList.isEmpty() || !processDraftList.isEmpty()) {
|
||||
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 +"在标准法规变更流程进行中,不可删除!");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user