QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 20240913

Browse Source 
# Conflicts:
#	laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
This commit is contained in:
梁琦涛
2024-09-13 21:10:13 +08:00
parent baa7f35623 d9a099f92d
commit 358acbafc7
5 changed files with 99728 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java
+9 -6
View File
@@ -961,12 +961,15 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
throw new JeroBootException("The list cannot import data！");
}
}
List<ProcessStandardInterpretClause> processStandardInterpretClauseList =
standardInterpretDTO.getProcessStandardInterpretClauseList();
if(!CollectionUtils.isEmpty(processStandardInterpretClauseList)){
standardInterpretDTO.setProcessStandardInterpretClauseSublistList(
JSON.parseArray(JSON.toJSONString(processStandardInterpretClauseList),
ProcessStandardInterpretClauseSublist.class));
if(CollectionUtils.isEmpty(standardInterpretDTO.getProcessStandardInterpretClauseSublistList())){
List<ProcessStandardInterpretClause> processStandardInterpretClauseList =
standardInterpretDTO.getProcessStandardInterpretClauseList();
if(!CollectionUtils.isEmpty(processStandardInterpretClauseList)){
standardInterpretDTO.setProcessStandardInterpretClauseSublistList(
JSON.parseArray(JSON.toJSONString(processStandardInterpretClauseList),
ProcessStandardInterpretClauseSublist.class));
}
}
List<ProcessStandardInterpretClauseSublist> processStandardInterpretClauseSublistList =
standardInterpretDTO.getProcessStandardInterpretClauseSublistList();
laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
+5 -4
View File
@@ -1334,11 +1334,12 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
}
});
List<LawsNodeRelation> lawsNodeRelationListAll = lawsNodeRelationService.list(query);
if (!CollectionUtils.isEmpty(lawsNodeRelationListAll)) {
String ids = lawsNodeRelationListAll.stream().map(LawsNodeRelation::getUniqueRelationFlag)
.collect(Collectors.joining(","));
selectionBoxVO.setIds(ids);
if(CollectionUtils.isEmpty(lawsNodeRelationListAll)){
return new Page<>();
}
String ids = lawsNodeRelationListAll.stream().map(LawsNodeRelation::getUniqueRelationFlag)
.collect(Collectors.joining(","));
selectionBoxVO.setIds(ids);
} else {
return new Page<>();
}
laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java
+13 -4
View File
@@ -1487,10 +1487,19 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
if (StringUtils.isNotBlank(splitFileInfo.getStandardSystem())){
List<String> list = Arrays.asList(splitFileInfo.getStandardSystem().split(","));
List<LawsTreeNode> lawsTreeNodeList = lawsTreeNodeService.listByIds(list);
List<LawsNodeRelation> lawsNodeRelationList = lawsNodeRelationService.list(new LambdaQueryWrapper<LawsNodeRelation>()
.in(LawsNodeRelation::getNodeId, lawsTreeNodeList.stream().map(LawsTreeNode::getId)
.collect(Collectors.toList())));
if (lawsNodeRelationList.isEmpty()){
if(CollectionUtils.isEmpty(lawsTreeNodeList)){
return new Page<>();
}
List<String> nodeCode = lawsTreeNodeList.stream().map(LawsTreeNode::getNodeCode).collect(Collectors.toList());
LambdaQueryWrapper<LawsNodeRelation> query = new LambdaQueryWrapper<>();
for (int i = 0; i < nodeCode.size(); i++) {
query.likeRight(LawsNodeRelation::getNodeCode, nodeCode.get(i));
if(i != nodeCode.size() - 1){
query.or();
}
}
List<LawsNodeRelation> lawsNodeRelationList = lawsNodeRelationService.list(query);
if (CollectionUtils.isEmpty(lawsNodeRelationList)){
return new Page<>();
}
List<String> idList = lawsNodeRelationList.stream().map(LawsNodeRelation::getUniqueRelationFlag).collect(Collectors.toList());