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

update 标准法规-查询

Browse Source
This commit is contained in:
liao
2023-09-25 17:37:39 +08:00
parent 3857353467
commit 69b6479032
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
+8
View File
@@ -269,6 +269,10 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
Map<String, Object> resultMap = new LinkedHashMap<>(); Map<String, Object> resultMap = new LinkedHashMap<>();
String id = (String) initMap.get("id"); String id = (String) initMap.get("id");
String standardNumber = (String) initMap.get(FieldCommon.STANDARD_NUMBER); String standardNumber = (String) initMap.get(FieldCommon.STANDARD_NUMBER);
if (StringUtils.isBlank(standardNumber)) {
ManyStandardSelectionBox singleStandard = getSingleStandard(null, id);
standardNumber = singleStandard.getStandardNumber();
}
for (Map.Entry<String, Object> entryMap : initMap.entrySet()) { for (Map.Entry<String, Object> entryMap : initMap.entrySet()) {
String key = entryMap.getKey(); String key = entryMap.getKey();
String value = ""; String value = "";
@@ -389,6 +393,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
List<String> dictIdList = dictTag.stream().map(LawsTag::getDictId).collect(Collectors.toList()); List<String> dictIdList = dictTag.stream().map(LawsTag::getDictId).collect(Collectors.toList());
LambdaQueryWrapper<SysDictItem> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysDictItem> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(SysDictItem::getDictId, dictIdList); queryWrapper.in(SysDictItem::getDictId, dictIdList);
queryWrapper.orderByDesc(SysDictItem::getId);
dictItemList = sysDictItemService.list(queryWrapper); dictItemList = sysDictItemService.list(queryWrapper);
} }
return dictItemList; return dictItemList;
@@ -707,6 +712,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
List<String> valueList = Arrays.asList(value.split(",")); List<String> valueList = Arrays.asList(value.split(","));
LambdaQueryWrapper<OSSFile> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<OSSFile> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(OSSFile::getId, valueList); queryWrapper.in(OSSFile::getId, valueList);
queryWrapper.orderByDesc(OSSFile::getId);
List<OSSFile> fileList = ossFileService.list(queryWrapper); List<OSSFile> fileList = ossFileService.list(queryWrapper);
value = StringUtils.join(fileList.stream() value = StringUtils.join(fileList.stream()
.map(OSSFile::getFileName).collect(Collectors.toList()), ","); .map(OSSFile::getFileName).collect(Collectors.toList()), ",");
@@ -718,6 +724,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
List<String> valueList = Arrays.asList(value.split(",")); List<String> valueList = Arrays.asList(value.split(","));
LambdaQueryWrapper<LawsTreeNode> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<LawsTreeNode> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(LawsTreeNode::getId, valueList); queryWrapper.in(LawsTreeNode::getId, valueList);
queryWrapper.orderByDesc(LawsTreeNode::getId);
List<LawsTreeNode> nodeList = lawsTreeNodeService.list(queryWrapper); List<LawsTreeNode> nodeList = lawsTreeNodeService.list(queryWrapper);
value = StringUtils.join(nodeList.stream() value = StringUtils.join(nodeList.stream()
.map(LawsTreeNode::getNodeName).collect(Collectors.toList()), ","); .map(LawsTreeNode::getNodeName).collect(Collectors.toList()), ",");
@@ -736,6 +743,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
LambdaQueryWrapper<SysDictItem> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysDictItem> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SysDictItem::getDictId, lawsTag.getDictId()); queryWrapper.eq(SysDictItem::getDictId, lawsTag.getDictId());
queryWrapper.in(SysDictItem::getItemValue, valueList); queryWrapper.in(SysDictItem::getItemValue, valueList);
queryWrapper.orderByDesc(SysDictItem::getId);
List<SysDictItem> dictList = sysDictItemService.list(queryWrapper); List<SysDictItem> dictList = sysDictItemService.list(queryWrapper);
value = StringUtils.join(dictList.stream() value = StringUtils.join(dictList.stream()
.map(SysDictItem::getItemText).collect(Collectors.toList()), ","); .map(SysDictItem::getItemText).collect(Collectors.toList()), ",");