From a7fd5f303faa1eb8b24aada9e236a81b468529d7 Mon Sep 17 00:00:00 2001
From: HashMap <xiaojingye0817@gmail.com>
Date: Tue, 26 Aug 2025 17:08:12 +0800
Subject: [PATCH] =?UTF-8?q?fix(Mapper/stock):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

+ 修复了入库记录无法根据日期查询的问题
    + 通过改进SQL解决
+ 修复了物资管理无法根据日期查询的问题
     + 通过改进SQL解决
---
 .../com/zhyc/module/stock/controller/WzStockInController.java  | 1 +
 .../resources/mapper/stock/WzMaterialsManagementMapper.xml     | 3 ++-
 .../src/main/resources/mapper/stock/WzStockInMapper.xml        | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/zhyc-module/src/main/java/com/zhyc/module/stock/controller/WzStockInController.java b/zhyc-module/src/main/java/com/zhyc/module/stock/controller/WzStockInController.java
index 6705202..4eef0ae 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/stock/controller/WzStockInController.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/stock/controller/WzStockInController.java
@@ -47,6 +47,7 @@ public class WzStockInController extends BaseController
     {
         startPage();
         List<WzStockIn> list = wzStockInService.selectWzStockInList(wzStockIn);
+        logger.debug(wzStockIn.toString());
         return getDataTable(list);
     }
 
diff --git a/zhyc-module/src/main/resources/mapper/stock/WzMaterialsManagementMapper.xml b/zhyc-module/src/main/resources/mapper/stock/WzMaterialsManagementMapper.xml
index d2347c4..7caa4fd 100644
--- a/zhyc-module/src/main/resources/mapper/stock/WzMaterialsManagementMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/stock/WzMaterialsManagementMapper.xml
@@ -26,7 +26,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectWzMaterialsManagementVo"/>
         <where>  
             <if test="materialName != null  and materialName != ''"> and material_name like concat('%', #{materialName}, '%')</if>
-            <if test="params.beginProductionDate != null and params.beginProductionDate != '' and params.endProductionDate != null and params.endProductionDate != ''"> and production_date between #{params.beginProductionDate} and #{params.endProductionDate}</if>
+            <if test="params.beginProductionDate != null and params.endProductionDate != null"> and production_date between #{params.beginProductionDate} and #{params.endProductionDate}</if>
+            <if test="productionDate != null"> and production_date = #{productionDate}</if>
         </where>
     </select>
     
diff --git a/zhyc-module/src/main/resources/mapper/stock/WzStockInMapper.xml b/zhyc-module/src/main/resources/mapper/stock/WzStockInMapper.xml
index 55c5c1e..d472047 100644
--- a/zhyc-module/src/main/resources/mapper/stock/WzStockInMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/stock/WzStockInMapper.xml
@@ -41,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="businessType != null  and businessType != ''"> and business_type = #{businessType}</if>
             <if test="repositoryName != null  and repositoryName != ''"> and repository_name like concat('%', #{repositoryName}, '%')</if>
             <if test="materialName != null  and materialName != ''"> and material_name like concat('%', #{materialName}, '%')</if>
+            <if test="docDate != null"> and doc_date = #{docDate}</if>
         </where>
     </select>