From 777b028df92fb5fb19859685e884de3606c59db2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Thu, 9 Jul 2026 14:00:35 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=B7=9F=E8=B8=AA=E8=AE=B0=E5=BD=95=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=A2=9E=E5=8A=A0=E8=BF=87=E6=BB=A4=E9=A2=84=E5=88=87?=
 =?UTF-8?q?=E6=9D=BF=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dsic/gj_erp/controller/jcsj/YdjhzzController.java  | 7 +++++--
 .../java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java     | 2 +-
 src/main/resources/mappers/jhgk/DmYdjhMapper.xml           | 3 +++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/YdjhzzController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/YdjhzzController.java
index be0e7c0..aa1816d 100644
--- a/src/main/java/com/dsic/gj_erp/controller/jcsj/YdjhzzController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/YdjhzzController.java
@@ -52,8 +52,11 @@ public class YdjhzzController {
 
     @ApiOperation(value = "查询")
     @PostMapping(value = "/getList")
-    public ResultBean getList(@RequestParam String ch,String dcpl,String dcpl1) {
-        List<Ydjhzz> list=mapper.getYdjhzz(ch,dcpl,dcpl1);
+    public ResultBean getList(@RequestParam String ch,String dcpl,String dcpl1,Boolean yqbFlag) {
+        if (yqbFlag==null){
+            yqbFlag=true;
+        }
+        List<Ydjhzz> list=mapper.getYdjhzz(ch,dcpl,dcpl1,yqbFlag);
         return new ResultBean(list);
     }
 
diff --git a/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java b/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java
index bdf9329..0f08fd1 100644
--- a/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java
+++ b/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java
@@ -89,7 +89,7 @@ public interface DmYdjhMapper extends BaseMapper<DmYdjh> {
     void updatezyq(String dcch,String dcpl);
 
     Map<String,Object> getMPSYCLJLJBP(String dcCh,String tzbh);
-    List<Ydjhzz> getYdjhzz(String ch,String dcpl,String dcpl1);
+    List<Ydjhzz> getYdjhzz(String ch,String dcpl,String dcpl1,Boolean yqbFlag);
 
     List<Ydjhzz> getYdjhzz2(String ch,String dcpl,String dcpl1,Boolean yqbFlag);
 
diff --git a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml
index f73b5c4..a423248 100644
--- a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml
+++ b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml
@@ -1565,6 +1565,9 @@ where dm_ydjh.DC_CH=#{dcch}  and dm_ydjh.dc_pl=#{dcpl}
             <if test=" (dcpl==null or dcpl=='') and dcpl1!=null and dcpl1!=''">
                 and DM_BCLQJBP.dc_pl&lt;=#{dcpl1}
             </if>
+            <if test="!yqbFlag">
+                and isnull(DM_BCLQMXP.BZ,'')=''
+            </if>
         GROUP BY DM_BCLQJBP.DC_CH,DM_BCLQJBP.DC_PL,DM_BCLQJBP.DC_FD
         ORDER BY DM_BCLQJBP.DC_CH,DM_BCLQJBP.DC_PL
     </select>