diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmCzplpNewServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmCzplpNewServiceImpl.java index bd3aa17..7ce9193 100644 --- a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmCzplpNewServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmCzplpNewServiceImpl.java @@ -60,7 +60,11 @@ public class DmCzplpNewServiceImpl extends ServiceImpl list, String project, String isupload, HttpServletRequest req) { Map returnMap = new HashMap(); List pls = list.stream().filter(f -> StringUtils.isNotBlank(f.getDcPL())).map(PlExcel::getDcPL).collect(Collectors.toList()); - List fdList = this.list(new QueryWrapper().in("dc_pl", pls).eq("dc_ch",list.get(0).getDcCh())); + List collect = pls.stream().map(s -> { + return String.format("%03d",Integer.parseInt(s)); + }).collect(Collectors.toList()); + + List fdList = this.list(new QueryWrapper().in("dc_pl", collect).eq("dc_ch",list.get(0).getDcCh())); // if(fdList.size()>0){ // // 是否覆盖之前导入的数据 // if(!isupload.equals("01")){ @@ -76,9 +80,10 @@ public class DmCzplpNewServiceImpl extends ServiceImpl stringObjectMap = BeanUtil.beanToMap(plExcel); + plExcel.setDcPL(String.format("%03d",Integer.parseInt(plExcel.getDcPL()))); DmCzplpNew dmCzplpNewOld = fdList.stream().filter(fst -> plExcel.getDcPL().equals(fst.getDcPl())).findFirst().orElse(null); // 把批量补0 - plExcel.setDcPL(String.format("%03d",Integer.parseInt(plExcel.getDcPL()))); + if (null != dmCzplpNewOld) { this.remove(new QueryWrapper().eq("dc_pl", plExcel.getDcPL()).eq("dc_ch",plExcel.getDcCh())); for (int i = 1; i and isnull(dm_ydjh_lj.pkdr,'')='' - and ISNULL(dm_ydjh_lj.p,'')='Y' + and ISNULL(dm_ydjh_lj.pkdr,'')='Y'