diff --git a/src/main/java/com/dsic/gj_erp/jszb/control/JszbController.java b/src/main/java/com/dsic/gj_erp/jszb/control/JszbController.java index 3334a31..a7f5f61 100644 --- a/src/main/java/com/dsic/gj_erp/jszb/control/JszbController.java +++ b/src/main/java/com/dsic/gj_erp/jszb/control/JszbController.java @@ -22,6 +22,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.stream.Collectors; +import java.util.stream.Stream; @RestController @RequestMapping("jszb") @@ -120,7 +122,10 @@ public class JszbController { // } // updateList.add(one); // }); - + List collect = updateList.stream() + .filter(item -> "2205".equals(item.getFd())) + .collect(Collectors.toList()); + System.out.printf(collect.toString()); flowInfoService.saveOrUpdateBatch(updateList); } diff --git a/src/main/java/com/dsic/gj_erp/jszb/excel/ExcelFlowInfoListener.java b/src/main/java/com/dsic/gj_erp/jszb/excel/ExcelFlowInfoListener.java index 2385229..2340a30 100644 --- a/src/main/java/com/dsic/gj_erp/jszb/excel/ExcelFlowInfoListener.java +++ b/src/main/java/com/dsic/gj_erp/jszb/excel/ExcelFlowInfoListener.java @@ -26,14 +26,14 @@ public class ExcelFlowInfoListener extends AnalysisEventListener { @Override public void invoke(PartFlowInfo excelDemo, AnalysisContext analysisContext) { - String partName=excelDemo.getPartName0()!=null?excelDemo.getPartName0():excelDemo.getPartName(); - if (map.containsKey(partName)){ - String error= StrUtil.format("存在重复数据,检查修改后单独导入即可,零件编号:{},已过滤该行",partName); - this.errors.add(error); - return; - } - - map.put(partName,excelDemo); +// String partName=excelDemo.getPartName0()!=null?excelDemo.getPartName0():excelDemo.getPartName(); +// if (map.containsKey(partName)){ +// String error= StrUtil.format("存在重复数据,检查修改后单独导入即可,零件编号:{},已过滤该行",partName); +// this.errors.add(error); +// return; +// } +// +// map.put(partName,excelDemo); objectList.add(excelDemo); }