From 77e54aec65693683bc2b9ac50e08df6a06c53493 Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期三, 22 四月 2026 17:03:38 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
index bd14d54..4fe7d28 100644
--- a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
@@ -16,29 +16,29 @@
 
     @Select("select \n" +
             "Min(wm.io_time) as node,\n" +
-            "isnull(count(1), 0) as val\n" +
+            "IFNULL(count(1), 0) as val\n" +
             "from asr_wrk_mast_log wm\n" +
             "where wm.wrk_sts = 5 \n" +
             "and (wm.io_type = 1 OR wm.io_type = 54)\n" +
-            "and datediff(d, wm.io_time, getdate())<=7 \n" +
-            "group by datediff(day,wm.io_time,getdate())\n" +
+            "and TIMESTAMPDIFF(DAY, wm.io_time, NOW())<=7 \n" +
+            "group by TIMESTAMPDIFF(DAY, wm.io_time, NOW())\n" +
             "order by Min(wm.io_time) asc\n")
     List<Map<String, Object>> queryPakinRep();
 
     @Select("select\n" +
             "Min(wm.io_time) as node,\n" +
-            "isnull(count(1), 0) as val\n" +
+            "IFNULL(count(1), 0) as val\n" +
             "from asr_wrk_mast_log wm\n" +
             "where 1=1\n" +
             "and ((wm.wrk_sts = 15 AND wm.io_type = 101) OR (wm.wrk_sts = 14 AND wm.io_type = 103))\n" +
-            "and datediff(d, wm.io_time, getdate())<=7\n" +
-            "group by datediff(day,wm.io_time,getdate())\n" +
+            "and TIMESTAMPDIFF(DAY, wm.io_time, NOW())<=7\n" +
+            "group by TIMESTAMPDIFF(DAY, wm.io_time, NOW())\n" +
             "order by Min(wm.io_time) asc")
     List<Map<String, Object>> queryPakOutRep();
 
     //鏇茬嚎鍥�
     @Select("select ymd,SUM(sto_qty) inqty,SUM(ret_qty) outqty from asr_sta_inout_view "
-            + "where ymd>CONVERT(char(10), DATEADD(DAY,-12,GETDATE()), 120) group by ymd order by ymd")
+            + "where ymd>DATE_FORMAT(DATE_ADD(NOW(), INTERVAL -12 DAY), '%Y-%m-%d') group by ymd order by ymd")
     public List<WorkChartAxis> getChartAxis();
 
     @Select("select * from asr_loc_use_view")

--
Gitblit v1.9.1