diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeWelfareServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeWelfareServiceImpl.java index df66afdc38..288cfa8cc6 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeWelfareServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeWelfareServiceImpl.java @@ -292,17 +292,17 @@ public class ChangeWelfareServiceImpl extends BaseServiceImpl errorInfo.size()){ - Map groupByIdCard = list.stream().collect(Collectors.groupingBy(ChangeWelfareImportExcel::getIdCard, Collectors.counting())); - groupByIdCard.forEach((idCard,count) -> { - if (StringUtils.isNotBlank(idCard) && Integer.valueOf(count.toString()).compareTo(1) != 0){ - for (ChangeWelfareImportExcel i : list) { - if (idCard.equals(i.getIdCard()) && !i.getAddStatus()){ - errorInfo.add(getErrorInfo(i,"数据重复",i.getNum())); - i.setAddStatus(true); - } - } - } - }); +// Map groupByIdCard = list.stream().collect(Collectors.groupingBy(ChangeWelfareImportExcel::getIdCard, Collectors.counting())); +// groupByIdCard.forEach((idCard,count) -> { +// if (StringUtils.isNotBlank(idCard) && Integer.valueOf(count.toString()).compareTo(1) != 0){ +// for (ChangeWelfareImportExcel i : list) { +// if (idCard.equals(i.getIdCard()) && !i.getAddStatus()){ +// errorInfo.add(getErrorInfo(i,"数据重复",i.getNum())); +// i.setAddStatus(true); +// } +// } +// } +// }); } Map> groupByStatus = list.stream().collect(Collectors.groupingBy(ChangeWelfareImportExcel::getAddStatus)); List needInsert = groupByStatus.get(false);