From a23d90305a9405345eb56852cae91fa6a378fbf5 Mon Sep 17 00:00:00 2001
From: jiangs <373297395@qq.com>
Date: Fri, 16 Jan 2026 17:09:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=8F=E9=99=A2=E6=9D=A1=E7=A0=81=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/czlis/zycx/service/impl/ZycxServiceImpl.java     | 4 ++--
 zycx/src/main/resources/mapper/ZycxMapper.xml                 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/zycx/src/main/java/com/czlis/zycx/service/impl/ZycxServiceImpl.java b/zycx/src/main/java/com/czlis/zycx/service/impl/ZycxServiceImpl.java
index 9f95720..eac8b58 100644
--- a/zycx/src/main/java/com/czlis/zycx/service/impl/ZycxServiceImpl.java
+++ b/zycx/src/main/java/com/czlis/zycx/service/impl/ZycxServiceImpl.java
@@ -46,8 +46,8 @@ public class ZycxServiceImpl implements ZycxService {
     public List<Web_getBarcode> getSQDInfo(QuerySqdVO querySqdVO) {
         Web_getBarcode webGetBarcode = new Web_getBarcode();
         webGetBarcode.setKsdh(querySqdVO.getDept());
-        webGetBarcode.setSt(DateUtil.parse(querySqdVO.getSt(),"yyyy-MM-dd HH:mm:ss"));
-        webGetBarcode.setEt(DateUtil.parse(querySqdVO.getEt(),"yyyy-MM-dd HH:mm:ss"));
+        webGetBarcode.setSt(DateUtil.parse(querySqdVO.getSt() + " 00:00:00","yyyy-MM-dd HH:mm:ss"));
+        webGetBarcode.setEt(DateUtil.parse(querySqdVO.getEt() + " 23:59:59","yyyy-MM-dd HH:mm:ss"));
         webGetBarcode.setYljg(querySqdVO.getYljg());
         webGetBarcode.setBrly("3");
         webGetBarcode.setQueryType(querySqdVO.getQueryType());
diff --git a/zycx/src/main/resources/mapper/ZycxMapper.xml b/zycx/src/main/resources/mapper/ZycxMapper.xml
index ab19aca..6d3e0c1 100644
--- a/zycx/src/main/resources/mapper/ZycxMapper.xml
+++ b/zycx/src/main/resources/mapper/ZycxMapper.xml
@@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="sqh != null and sqh != ''"> and a.sqh = #{sqh}</if>
             <if test="zt != null and zt != ''"> and a.zt = #{zt}</if>
-            <if test="ksdh != null and ksdh != ''"> and a.ksdh = #{ksdh}</if>
+            <if test="ksdh != null and ksdh != ''"> and (a.ksdh = #{ksdh} or a.bz2 = #{ksdh})</if>
             <if test="brly != null and brly != ''"> and a.brly = #{brly}</if>
             <if test="yljg != null and yljg != ''"> and a.yljg = #{yljg}</if>
             <if test="st != null"><!-- 开始时间检索 -->