diff --git a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/impl/LawsCustomCompareInfoServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/impl/LawsCustomCompareInfoServiceImpl.java index 88bb934a..60b6bb30 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/impl/LawsCustomCompareInfoServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/impl/LawsCustomCompareInfoServiceImpl.java @@ -77,6 +77,7 @@ public class LawsCustomCompareInfoServiceImpl extends ServiceImpl qw - .like("standard_number", standardVO.getStandardNumberOrName()) + .like(STANDARD_NUMBER, standardVO.getStandardNumberOrName()) .or() .like("standard_name", standardVO.getStandardNumberOrName())); } @@ -146,9 +147,9 @@ public class LawsCustomCompareInfoServiceImpl extends ServiceImpl 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.apply(StringUtils.isNotBlank(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 compareItemDicItem = sysDictItemList.stream() - .filter(v -> LawsCustomCompareCommon.INVENTORY_TYPE_1.equals(v.getItemValue())) + .filter(v -> LawsCustomCompareCommon.INVENTORY_TYPE_2.equals(v.getItemValue())) .findFirst(); - featureDicItem.ifPresent(v -> map.put(v.getItemText(), feature)); - compareItemDicItem.ifPresent(v -> map.put(v.getItemText(), compareItem)); + if (featureDicItem.isPresent()){ + map.put(featureDicItem.get().getItemText(), feature); + }else { + map.put("特点", new ArrayList()); + } + + if (compareItemDicItem.isPresent()){ + map.put(compareItemDicItem.get().getItemText(), compareItem); + }else { + map.put("对比项", new ArrayList()); + } return map; }