FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

对比excel和数据库中的数据通过标准号

Browse Source
This commit is contained in:
zhaokaiyao@91isoft.com
2021-11-11 15:39:24 +08:00
parent f17cd2c975
commit d6ef4b4d2f
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/ExclExport.java
+2 -2
View File
@@ -78,8 +78,8 @@ public class ExclExport extends ExclErrorOut {
Set<List<String>> collect = set.stream() Set<List<String>> collect = set.stream()
.filter(item -> .filter(item ->
value.contains(item.get(0).trim()) value.contains(item.get(0).trim())
|| value.contains(item.get(1).trim()) && value.contains(item.get(1).trim())
|| value.contains(item.get(2).trim()) && value.contains(item.get(2).trim())
) )
.collect(Collectors.toSet()); .collect(Collectors.toSet());
adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java
+3 -3
View File
@@ -603,18 +603,18 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
public String isExist(MultipartFile exclFile) { public String isExist(MultipartFile exclFile) {
ExclExport exclExport = new ExclExport(); ExclExport exclExport = new ExclExport();
QueryWrapper<SarStandardsInfo> standWrapper = new QueryWrapper<>(); QueryWrapper<SarStandardsInfo> standWrapper = new QueryWrapper<>();
standWrapper.select("STAND_NAME,STAND_SORT,STAND_YEAR"); standWrapper.select("STAND_NUMBER,STAND_SORT,STAND_YEAR");
List<Map<String, Object>> maps = sarStandardsInfoService.listMaps(standWrapper); List<Map<String, Object>> maps = sarStandardsInfoService.listMaps(standWrapper);
QueryWrapper<SarBussionessStand> bussionessWrapper = new QueryWrapper<>(); QueryWrapper<SarBussionessStand> bussionessWrapper = new QueryWrapper<>();
bussionessWrapper.select("STAND_NAME,STAND_SORT,STAND_YEAR"); bussionessWrapper.select("STAND_CODE AS STAND_NUMBER,STAND_SORT,STAND_YEAR");
List<Map<String, Object>> maps1 = sarBussionessStandService.listMaps(bussionessWrapper); List<Map<String, Object>> maps1 = sarBussionessStandService.listMaps(bussionessWrapper);
HashSet<List<String>> nameSet = new HashSet<>(); HashSet<List<String>> nameSet = new HashSet<>();
maps.addAll(maps1); maps.addAll(maps1);
maps.forEach(item->{ maps.forEach(item->{
List<String> strings = new LinkedList<>(); List<String> 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_SORT").toString().trim());
strings.add(item.get("STAND_YEAR").toString().trim()); strings.add(item.get("STAND_YEAR").toString().trim());