From 2047b6b16708818fdb296468cccd824424534174 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Fri, 19 Sep 2025 17:36:38 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E5=B9=B3=E6=9D=BF=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E7=AE=A1=E7=90=86=E6=B5=8B=E8=AF=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sch_manage/service/dao/mapper/SchBaseTaskMapper.java   | 2 +-
 .../sch_manage/service/dao/mapper/SchBaseTaskMapper.xml    | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBaseTaskMapper.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBaseTaskMapper.java
index 6b70dff..27028e6 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBaseTaskMapper.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBaseTaskMapper.java
@@ -42,7 +42,7 @@ public interface SchBaseTaskMapper extends BaseMapper<SchBaseTask> {
      *                  end_time: 结束时间
      * }
      */
-    List<JSONObject> queryPdaHistoryTask(JSONObject whereJson);
+    List<JSONObject> queryPdaHistoryTask(@Param("param") JSONObject whereJson);
 
     /**
      * 获取载具任务
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBaseTaskMapper.xml b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBaseTaskMapper.xml
index ce4654e..daad1c3 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBaseTaskMapper.xml
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBaseTaskMapper.xml
@@ -99,7 +99,8 @@
     <select id="queryPdaHistoryTask" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
             task.*,
-            config.config_name
+            config.config_name,
+            SUBSTR(task.create_time,1,10) AS task_time
         FROM
             sch_base_task task
             INNER JOIN sch_base_taskconfig config ON task.config_code = config.config_code
@@ -116,12 +117,12 @@
 
             <if test="param.start_time != null and param.start_time != ''">
                 AND
-                task.create_time > #{param.start_time}
+                SUBSTR(task.create_time,1,10) >= #{param.start_time}
             </if>
 
             <if test="param.end_time != null and param.end_time != ''">
                 AND
-                #{param.end_time} > task.create_time
+                #{param.end_time} >= SUBSTR(task.create_time,1,10)
             </if>
         </where>
     </select>