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

fix(自定义对比): 清单维护列表查询问题修复

Browse Source
This commit is contained in:
yjz
2023-10-27 16:22:51 +08:00
parent 8cca1d4188
commit 1a816197f1
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/impl/LawsCustomCompareInfoServiceImpl.java
+16 -6
View File
@@ -77,6 +77,7 @@ public class LawsCustomCompareInfoServiceImpl extends ServiceImpl<LawsCustomComp
private final ILawsEnterpriseStandardService lawsEnterpriseStandardService; private final ILawsEnterpriseStandardService lawsEnterpriseStandardService;
private final ISysDictService sysDictService; private final ISysDictService sysDictService;
private final ISysDictItemService sysDictItemService; private final ISysDictItemService sysDictItemService;
public static final String STANDARD_NUMBER = "standard_number";
public LawsCustomCompareInfoServiceImpl(LawsCustomCompareInfoMapper lawsCustomCompareInfoMapper, public LawsCustomCompareInfoServiceImpl(LawsCustomCompareInfoMapper lawsCustomCompareInfoMapper,
ILawsCustomCompareInfoStandardService lawsCustomCompareInfoStandardService, ILawsCustomCompareInfoStandardService lawsCustomCompareInfoStandardService,
@@ -136,7 +137,7 @@ public class LawsCustomCompareInfoServiceImpl extends ServiceImpl<LawsCustomComp
// 标准编号/标准名称 // 标准编号/标准名称
if (StringUtils.isNotBlank(standardVO.getStandardNumberOrName())){ if (StringUtils.isNotBlank(standardVO.getStandardNumberOrName())){
queryWrapper.and(qw -> qw queryWrapper.and(qw -> qw
.like("standard_number", standardVO.getStandardNumberOrName()) .like(STANDARD_NUMBER, standardVO.getStandardNumberOrName())
.or() .or()
.like("standard_name", standardVO.getStandardNumberOrName())); .like("standard_name", standardVO.getStandardNumberOrName()));
} }
@@ -146,9 +147,9 @@ public class LawsCustomCompareInfoServiceImpl extends ServiceImpl<LawsCustomComp
} }
if(StringUtils.isNotBlank(standardVO.getStandardNumbers())){ if(StringUtils.isNotBlank(standardVO.getStandardNumbers())){
List<String> list = Arrays.asList(standardVO.getStandardNumber().split(",")); List<String> list = Arrays.asList(standardVO.getStandardNumber().split(","));
queryWrapper.in("standard_number", list); queryWrapper.in(STANDARD_NUMBER, list);
} }
queryWrapper.eq(StringUtils.isNotBlank(standardVO.getStandardNumber()), "standard_number", standardVO.getStandardNumber()); queryWrapper.eq(StringUtils.isNotBlank(standardVO.getStandardNumber()), STANDARD_NUMBER, standardVO.getStandardNumber());
queryWrapper.eq(StringUtils.isNotBlank(standardVO.getStandardState()), "standard_state", standardVO.getStandardState()); queryWrapper.eq(StringUtils.isNotBlank(standardVO.getStandardState()), "standard_state", standardVO.getStandardState());
queryWrapper.apply(StringUtils.isNotBlank(standardVO.getReleaseDateBegin()), queryWrapper.apply(StringUtils.isNotBlank(standardVO.getReleaseDateBegin()),
"date_format (create_time,'%Y-%m-%d') >= date_format ({0},'%Y-%m-%d')", standardVO.getReleaseDateBegin()) "date_format (create_time,'%Y-%m-%d') >= date_format ({0},'%Y-%m-%d')", standardVO.getReleaseDateBegin())
@@ -277,11 +278,20 @@ public class LawsCustomCompareInfoServiceImpl extends ServiceImpl<LawsCustomComp
.findFirst(); .findFirst();
Optional<SysDictItem> compareItemDicItem = sysDictItemList.stream() Optional<SysDictItem> compareItemDicItem = sysDictItemList.stream()
.filter(v -> LawsCustomCompareCommon.INVENTORY_TYPE_1.equals(v.getItemValue())) .filter(v -> LawsCustomCompareCommon.INVENTORY_TYPE_2.equals(v.getItemValue()))
.findFirst(); .findFirst();
featureDicItem.ifPresent(v -> map.put(v.getItemText(), feature)); if (featureDicItem.isPresent()){
compareItemDicItem.ifPresent(v -> map.put(v.getItemText(), compareItem)); map.put(featureDicItem.get().getItemText(), feature);
}else {
map.put("特点", new ArrayList<LawsCustomCompareInventory>());
}
if (compareItemDicItem.isPresent()){
map.put(compareItemDicItem.get().getItemText(), compareItem);
}else {
map.put("对比项", new ArrayList<LawsCustomCompareInventory>());
}
return map; return map;
} }