From 1fd3565c51c19a944bb948c8cbf5a4e0591e03cd Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Fri, 14 Jun 2024 15:14:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E6=97=B6=E9=97=B4=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/material/PurchaseCheckInfoMapper.xml  | 7 ++++---
 .../mapper/material/PurchaseCheckServiceCenterMapper.xml   | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml
index 9255e219..7f7c9d94 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml
@@ -25,7 +25,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectPurchaseCheckInfoList" parameterType="com.bonus.sgzb.material.domain.PurchaseCheckInfo" resultMap="PurchaseCheckInfoResult">
         select pci.id,pci.task_id, pci.purchase_time, pci.arrival_time, pci.purchaser, pci.create_by, pci.create_time,
         pci.update_by,
-        pci.update_time, pci.remark, pci.company_id ,dict.id purchasingId,dict.name purchasingStatus,tk.code,su.nick_name
+        pci.update_time, pci.remark, pci.company_id ,dict.id purchasingId,dict.name
+        purchasingStatus,tk.code,su.nick_name
         purchaserName,tk.task_status taskStatus
         from purchase_check_info pci
         left join tm_task tk on pci.task_id = tk.task_id
@@ -50,8 +51,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             )
         </if>
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-            AND ((pci.purchase_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59'))
-        or (pci.arrival_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59')))
+            AND (pci.purchase_time BETWEEN #{startTime} AND #{endTime}
+            or pci.arrival_time BETWEEN #{startTime} AND #{endTime})
         </if>
         GROUP BY pcd.task_id
         order by pci.create_time desc
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckServiceCenterMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckServiceCenterMapper.xml
index f999f385..70e2b614 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckServiceCenterMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckServiceCenterMapper.xml
@@ -294,8 +294,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             )
         </if>
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-            AND ((pci.purchase_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59'))
-            or (pci.arrival_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59')))
+            AND (pci.purchase_time BETWEEN #{startTime} AND #{endTime}
+            or pci.arrival_time BETWEEN #{startTime} AND #{endTime})
         </if>
         GROUP BY pcd.task_id
         order by pci.id desc