From d30a06cbbbe569725ee0bb1e9994126b2d51865c Mon Sep 17 00:00:00 2001
From: xhj <xhjzrq@163.com>
Date: Tue, 23 Jan 2024 13:37:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mappers/pgd/PgdQmjhMapper.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/mappers/pgd/PgdQmjhMapper.xml b/src/main/resources/mappers/pgd/PgdQmjhMapper.xml
index d2a21d7..9c23f21 100644
--- a/src/main/resources/mappers/pgd/PgdQmjhMapper.xml
+++ b/src/main/resources/mappers/pgd/PgdQmjhMapper.xml
@@ -136,7 +136,7 @@
         <if  test="lx=='p'.toString()">
             and isnull(dm_ydjh_lj.pkdr,'')=''
             <if test=" p!=null and p!=''">
-                and   ISNULL(dm_ydjh_lj.p,'')='Y'
+                and   ISNULL(dm_ydjh_lj.pkdr,'')='Y'
             </if>
 
         </if>

From 4dcb422d9b333e1e6e0b25f1def493792d6f669d Mon Sep 17 00:00:00 2001
From: xhj <xhjzrq@163.com>
Date: Tue, 23 Jan 2024 14:38:41 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gj_erp/service/jcsj/impl/DmCzplpNewServiceImpl.java  | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

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<DmCzplpNewMapper, DmCzplp
     public Map uploadPl(List<PlExcel> list, String project, String isupload, HttpServletRequest req) {
         Map returnMap = new HashMap();
         List<String> pls = list.stream().filter(f -> StringUtils.isNotBlank(f.getDcPL())).map(PlExcel::getDcPL).collect(Collectors.toList());
-        List<DmCzplpNew> fdList = this.list(new QueryWrapper<DmCzplpNew>().in("dc_pl", pls).eq("dc_ch",list.get(0).getDcCh()));
+        List<String> collect = pls.stream().map(s -> {
+            return String.format("%03d",Integer.parseInt(s));
+        }).collect(Collectors.toList());
+
+        List<DmCzplpNew> fdList = this.list(new QueryWrapper<DmCzplpNew>().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<DmCzplpNewMapper, DmCzplp
             int plCount = (int) map.get("plcount");
             String fds = (String) map.get("fds");
             Map<String, Object> 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<DmCzplpNew>().eq("dc_pl", plExcel.getDcPL()).eq("dc_ch",plExcel.getDcCh()));
                 for (int i = 1; i <plCount; i++) {