From 0bd3125739c0d8bded4f7bd405fd99f1723df964 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 30 五月 2025 15:51:49 +0800
Subject: [PATCH] 不同服务器配置文件备份
---
pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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..045a50a 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 ))
@@ -115,7 +122,7 @@
delete from sta_device_production_log
where id = #{id,jdbcType=BIGINT}
</delete>
- <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog" useGeneratedKeys="true">
+ <insert id="insert" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog">
insert into sta_device_production_log
( id,device_no,work_id
,repair_id,plan_id,station_id
@@ -132,7 +139,7 @@
,#{outTime,jdbcType=TIMESTAMP},#{updatedBy,jdbcType=BIGINT},#{memo,jdbcType=VARCHAR}, #{number,jdbcType=INTEGER}
)
</insert>
- <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog" useGeneratedKeys="true">
+ <insert id="insertSelective" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog">
insert into sta_device_production_log
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
--
Gitblit v1.8.0