diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/ExclExport.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/ExclExport.java index 82d2f20c..40b9703e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/ExclExport.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/ExclExport.java @@ -78,8 +78,8 @@ public class ExclExport extends ExclErrorOut { Set> collect = set.stream() .filter(item -> value.contains(item.get(0).trim()) - || value.contains(item.get(1).trim()) - || value.contains(item.get(2).trim()) + && value.contains(item.get(1).trim()) + && value.contains(item.get(2).trim()) ) .collect(Collectors.toSet()); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java index 765ed853..6ff028c3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java @@ -603,18 +603,18 @@ public class ImportExcelServiceImpl extends ServiceImpl standWrapper = new QueryWrapper<>(); - standWrapper.select("STAND_NAME,STAND_SORT,STAND_YEAR"); + standWrapper.select("STAND_NUMBER,STAND_SORT,STAND_YEAR"); List> maps = sarStandardsInfoService.listMaps(standWrapper); QueryWrapper bussionessWrapper = new QueryWrapper<>(); - bussionessWrapper.select("STAND_NAME,STAND_SORT,STAND_YEAR"); + bussionessWrapper.select("STAND_CODE AS STAND_NUMBER,STAND_SORT,STAND_YEAR"); List> maps1 = sarBussionessStandService.listMaps(bussionessWrapper); HashSet> nameSet = new HashSet<>(); maps.addAll(maps1); maps.forEach(item->{ List strings = new LinkedList<>(); - strings.add(item.get("STAND_NAME").toString().trim()); + strings.add(item.get("STAND_NUMBER").toString().trim()); strings.add(item.get("STAND_SORT").toString().trim()); strings.add(item.get("STAND_YEAR").toString().trim());