From f14bfd47670e57d1d28d006464cb8ba576c8a49c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 22 五月 2025 10:26:08 +0800
Subject: [PATCH] 基于测试服务器修改配置文件

---
 pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml
index 30f80e6..a61c09f 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml
@@ -104,7 +104,14 @@
         SUBSTRING_INDEX( SUBSTRING_INDEX( u.error_msg, '锛�', b.help_topic_id + 1 ), '锛�', -1 ) AS error_msg
         FROM
         ( SELECT device_no, error_msg FROM sta_device_production_log_past  WHERE error_msg LIKE ('%涓嶅悎鏍�%')
-        UNION
+        <if test="startTime != null">
+            and out_time <![CDATA[ > ]]> #{startTime,jdbcType=TIMESTAMP}
+        </if>
+        <if test="endTime != null">
+            and out_time <![CDATA[ < ]]> #{endTime,jdbcType=TIMESTAMP}
+        </if>
+          <!-- AND out_time BETWEEN '2024-08-01 00:00:00' AND '2024-08-30 23:59:59' -->
+          UNION
         SELECT device_no, error_msg FROM sta_device_production_log  WHERE error_msg LIKE ('%涓嶅悎鏍�%')
         ) u,
         mysql.help_topic b WHERE b.help_topic_id <![CDATA[ < ]]>((( LENGTH( u.error_msg ) - LENGTH( REPLACE(u.error_msg,'锛�','') ))/3)  +  1 ))

--
Gitblit v1.8.0