From 20b88f9a4fca59bcc9ed5a662589884464dcc10d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Wed, 28 May 2025 12:00:07 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E7=94=B1=E4=BA=8Eylbs?=
 =?UTF-8?q?=E7=BC=BA=E5=A4=B1=E5=AF=BC=E8=87=B4=E7=9C=8B=E6=9D=BF=E4=B8=8E?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=9F=E8=AE=A1=E7=BB=93=E6=9E=9C=E4=B8=8D?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4=E7=9A=84=E9=97=AE=E9=A2=98=202.=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E9=9B=B6=E4=BB=B6=E9=85=8D=E5=A5=97=E8=A1=A8=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E8=8C=83=E5=9B=B4=E6=9F=A5=E8=AF=A2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dsic/gj_erp/controller/kban/SCKbanController.java    | 5 +++--
 src/main/resources/mappers/jcsj/DmWlqdMapper.xml             | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/dsic/gj_erp/controller/kban/SCKbanController.java b/src/main/java/com/dsic/gj_erp/controller/kban/SCKbanController.java
index cc36bb9..9656b28 100644
--- a/src/main/java/com/dsic/gj_erp/controller/kban/SCKbanController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/kban/SCKbanController.java
@@ -31,8 +31,9 @@ public class SCKbanController {
         String end=DateUtil.endOfMonth(date).offsetNew(DateField.DAY_OF_YEAR,1).toString("yyyy/MM/dd");
         List<DmYdjh> between = service.list(Wrappers.<DmYdjh>lambdaQuery()
                 .select(DmYdjh::getKw,DmYdjh::getQgfkrq,DmYdjh::getZyq1,DmYdjh::getBcshzl,DmYdjh::getQgjhrq)
-                .between(DmYdjh::getQgfkrq, begin, end)
-                .or(it->it.between(DmYdjh::getQgjhrq,begin,end))
+                        .eq(DmYdjh::getYlbs,"N").and(it->
+                                it.between(DmYdjh::getQgfkrq, begin, end).or().between(DmYdjh::getQgjhrq,begin,end)
+                        )
         );
         return new ResultBean<>(JSONArray.toJSONString(between));
     }
diff --git a/src/main/resources/mappers/jcsj/DmWlqdMapper.xml b/src/main/resources/mappers/jcsj/DmWlqdMapper.xml
index dba2dc3..9e78a48 100644
--- a/src/main/resources/mappers/jcsj/DmWlqdMapper.xml
+++ b/src/main/resources/mappers/jcsj/DmWlqdMapper.xml
@@ -127,10 +127,10 @@
             and   DM_WLQD.dc_pl=#{dcpl}
         </if>
         <if test=" dcpl!=null and dcpl!='' and dcpl1!=null and dcpl1!=''">
-            and   DM_WLQD.dc_pl>=#{dcpl} and  DM_WLQD.dc_pl&lt;#{dcpl1}
+            and   DM_WLQD.dc_pl>=#{dcpl} and  DM_WLQD.dc_pl&lt;=#{dcpl1}
         </if>
         <if test=" (dcpl==null or dcpl=='') and dcpl1!=null and dcpl1!=''">
-            and DM_WLQD.dc_pl&lt;#{dcpl1}
+            and DM_WLQD.dc_pl&lt;=#{dcpl1}
         </if>
         <if test=" dcch!=null and dcch!=''">
             and   DM_WLQD.DC_CH=#{dcch}