From 363383cf6266286ce1bd31a78dc01fdaca2de3de Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 10 三月 2025 14:55:58 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/src/main/resources/mapper/pp/Report.xml |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/pp/Report.xml b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
index 23aecd1..80d492d 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -999,8 +999,8 @@
                  LEFT JOIN damage_details AS dd ON dd.reporting_work_id = rw.reporting_work_id
             AND dd.order_number = ogd.order_number
             AND dd.technology_number = ogd.technology_number
-        WHERE date(rw.reporting_work_time) >= #{dates[0]}
-          and date(rw.reporting_work_time) &lt;= #{dates[1]}
+        WHERE rw.reporting_work_time >= #{dates[0]}
+          and rw.reporting_work_time &lt;= #{dates[1]}
           AND dd.available = 0
         GROUP BY dd.id
     </select>
@@ -1978,7 +1978,7 @@
         WHERE
             rw.reporting_work_time >= #{selectTime1}
           AND rw.reporting_work_time &lt;  #{selectTime2}
-          AND dd.available = 0;
+          AND dd.available = 0
         <if test="damageReportDTO.orderId != null and damageReportDTO.orderId != ''">
             and o.order_id regexp #{damageReportDTO.orderId}
         </if>

--
Gitblit v1.8.0