From 994e1784f49e189210e08ccc093db0cfca23fbf5 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期三, 04 九月 2024 10:50:00 +0800
Subject: [PATCH] remove time !=""
---
pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkHistoryMapper.xml | 12 +++---
pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml | 20 +++++-----
pms-parent/pms-global/src/main/resources/mapper/StaDeviceLifeMapper.xml | 12 +++---
pms-parent/pms-global/src/main/resources/mapper/StaDeviceLastMapper.xml | 24 ++++++------
pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml | 30 +++++++-------
pms-parent/pms-global/src/main/resources/mapper/StaDeviceLifeLastMapper.xml | 12 +++---
6 files changed, 55 insertions(+), 55 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkHistoryMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkHistoryMapper.xml
index d597fee..9c5390d 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkHistoryMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkHistoryMapper.xml
@@ -64,8 +64,8 @@
<if test="nodeId!= null">node_id,</if>
<if test="dt != null and dt !=''">dt,</if>
<if test="status != null">status,</if>
- <if test="startTime != null and startTime !=''">start_time,</if>
- <if test="endTime != null and endTime !=''">end_time,</if>
+ <if test="startTime != null">start_time,</if>
+ <if test="endTime != null">end_time,</if>
<if test="assistants != null and assistants !=''">assistants,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -79,8 +79,8 @@
<if test="nodeId!= null">#{nodeId,jdbcType=BIGINT},</if>
<if test="dt != null and dt !=''">#{dt,jdbcType=TIMESTAMP},</if>
<if test="status != null">#{status,jdbcType=TINYINT},</if>
- <if test="startTime != null and startTime !=''">#{startTime,jdbcType=TIMESTAMP},</if>
- <if test="endTime != null and endTime !=''">#{endTime,jdbcType=TIMESTAMP},</if>
+ <if test="startTime != null">#{startTime,jdbcType=TIMESTAMP},</if>
+ <if test="endTime != null">#{endTime,jdbcType=TIMESTAMP},</if>
<if test="assistants != null and assistants !=''">#{assistants,jdbcType=VARCHAR},</if>
</trim>
</insert>
@@ -114,10 +114,10 @@
<if test="status != null">
status = #{status,jdbcType=TINYINT},
</if>
- <if test="startTime != null and startTime !=''">
+ <if test="startTime != null">
start_time = #{startTime,jdbcType=TIMESTAMP},
</if>
- <if test="endTime != null and endTime !=''">
+ <if test="endTime != null">
end_time = #{endTime,jdbcType=TIMESTAMP},
</if>
<if test="assistants != null and assistants !=''">
diff --git a/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml
index 0b50a25..b1a7326 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml
@@ -143,10 +143,10 @@
<if test="status != null">
and status = #{status,jdbcType=TINYINT}
</if>
- <if test="startTime != null and startTime !=''">
+ <if test="startTime != null">
and start_time = #{startTime,jdbcType=TIMESTAMP}
</if>
- <if test="endTime != null and endTime !=''">
+ <if test="endTime != null">
and end_time = #{endTime,jdbcType=TIMESTAMP}
</if>
<if test="assistants != null and assistants !=''">
@@ -198,10 +198,10 @@
<if test="lineName != null and lineName != '' ">
and ll.name like concat('%', #{lineName}, '%')
</if>
- <if test="startTime != null and startTime !=''">
+ <if test="startTime != null">
and l.start_time <![CDATA[ > ]]> #{startTime}
</if>
- <if test="endTime != null and endTime !=''">
+ <if test="endTime != null">
and l.start_time <![CDATA[ < ]]> #{endTime}
</if>
<if test="userId != null">
@@ -265,10 +265,10 @@
<if test="lineName != null and lineName != '' ">
and ll.name like concat('%', #{lineName}, '%')
</if>
- <if test="startTime != null and startTime !=''">
+ <if test="startTime != null">
and l.start_time <![CDATA[ > ]]> #{startTime,jdbcType=TIMESTAMP}
</if>
- <if test="endTime != null and endTime !=''">
+ <if test="endTime != null">
and l.start_time <![CDATA[ < ]]> #{endTime,jdbcType=TIMESTAMP}
</if>
<if test="userId != null">
@@ -362,10 +362,10 @@
<if test="processId!= null">process_id,</if>
<if test="nodeId!= null">node_id,</if>
<if test="workType!= null">work_Type,</if>
- <if test="dt != null and dt !=''">dt,</if>
+ <if test="dt != null">dt,</if>
<if test="status != null">status,</if>
- <if test="startTime != null and startTime !=''">start_time,</if>
- <if test="endTime != null and endTime !=''">end_time,</if>
+ <if test="startTime != null">start_time,</if>
+ <if test="endTime != null">end_time,</if>
<if test="assistants != null and assistants !=''">assistants,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -377,10 +377,10 @@
<if test="processId!= null">#{processId,jdbcType=BIGINT},</if>
<if test="nodeId!= null">#{nodeId,jdbcType=BIGINT},</if>
<if test="workType!= null">#{workType,jdbcType=TINYINT},</if>
- <if test="dt != null and dt !=''">#{dt,jdbcType=TIMESTAMP},</if>
+ <if test="dt != null">#{dt,jdbcType=TIMESTAMP},</if>
<if test="status != null">#{status,jdbcType=TINYINT},</if>
- <if test="startTime != null and startTime !=''">#{startTime,jdbcType=TIMESTAMP},</if>
- <if test="endTime != null and endTime !=''">#{endTime,jdbcType=TIMESTAMP},</if>
+ <if test="startTime != null">#{startTime,jdbcType=TIMESTAMP},</if>
+ <if test="endTime != null">#{endTime,jdbcType=TIMESTAMP},</if>
<if test="assistants != null and assistants !=''">#{assistants,jdbcType=VARCHAR},</if>
</trim>
</insert>
@@ -408,16 +408,16 @@
<if test="workType!= null">
work_type = #{workType,jdbcType=TINYINT},
</if>
- <if test="dt != null and dt !=''">
+ <if test="dt != null">
dt = #{dt,jdbcType=TIMESTAMP},
</if>
<if test="status != null">
status = #{status,jdbcType=TINYINT},
</if>
- <if test="startTime != null and startTime !=''">
+ <if test="startTime != null">
start_time = #{startTime,jdbcType=TIMESTAMP},
</if>
- <if test="endTime != null and endTime !=''">
+ <if test="endTime != null">
end_time = #{endTime,jdbcType=TIMESTAMP},
</if>
<if test="assistants != null and assistants !=''">
diff --git a/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLastMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLastMapper.xml
index 14805e5..1138d58 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLastMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLastMapper.xml
@@ -100,10 +100,10 @@
<if test="errorMsg != null and errorMsg !=''">error_msg,</if>
<if test="assistants != null and assistants !=''">assistants,</if>
<if test="updatedBy != null">updated_by,</if>
- <if test="inTime != null and inTime !=''">in_time,</if>
- <if test="outTime != null and outTime !=''">out_time,</if>
- <if test="inLineTime != null and inLineTime !=''">in_line_time,</if>
- <if test="outLineTime != null and outLineTime !=''">out_line_time,</if>
+ <if test="inTime != null">in_time,</if>
+ <if test="outTime != null">out_time,</if>
+ <if test="inLineTime != null">in_line_time,</if>
+ <if test="outLineTime != null">out_line_time,</if>
<if test="memo != null and memo !=''">memo,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -121,10 +121,10 @@
<if test="errorMsg != null and errorMsg !=''">#{errorMsg,jdbcType=VARCHAR},</if>
<if test="assistants != null and assistants !=''">#{assistants,jdbcType=VARCHAR},</if>
<if test="updatedBy != null">#{updatedBy,jdbcType=BIGINT},</if>
- <if test="inTime != null and inTime !=''">#{inTime,jdbcType=TIMESTAMP},</if>
- <if test="outTime != null and outTime !=''">#{outTime,jdbcType=TIMESTAMP},</if>
- <if test="inLineTime != null and inLineTime !=''">#{inLineTime,jdbcType=TIMESTAMP},</if>
- <if test="outLineTime != null and outLineTime !=''">#{outLineTime,jdbcType=TIMESTAMP},</if>
+ <if test="inTime != null">#{inTime,jdbcType=TIMESTAMP},</if>
+ <if test="outTime != null">#{outTime,jdbcType=TIMESTAMP},</if>
+ <if test="inLineTime != null">#{inLineTime,jdbcType=TIMESTAMP},</if>
+ <if test="outLineTime != null">#{outLineTime,jdbcType=TIMESTAMP},</if>
<if test="memo != null and memo !=''">#{memo,jdbcType=VARCHAR},</if>
</trim>
</insert>
@@ -170,16 +170,16 @@
<if test="updatedBy != null">
updated_by = #{updatedBy,jdbcType=BIGINT},
</if>
- <if test="inTime != null and inTime !=''">
+ <if test="inTime != null">
in_time = #{inTime,jdbcType=TIMESTAMP},
</if>
- <if test="outTime != null and outTime !=''">
+ <if test="outTime != null">
out_time = #{outTime,jdbcType=TIMESTAMP},
</if>
- <if test="inLineTime != null and inLineTime !=''">
+ <if test="inLineTime != null">
in_line_time = #{inLineTime,jdbcType=TIMESTAMP},
</if>
- <if test="outLineTime != null and outLineTime !=''">
+ <if test="outLineTime != null">
out_line_time = #{outLineTime,jdbcType=TIMESTAMP},
</if>
<if test="memo != null and memo !=''">
diff --git a/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLifeLastMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLifeLastMapper.xml
index 2aaad05..519a9f8 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLifeLastMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLifeLastMapper.xml
@@ -93,8 +93,8 @@
<if test="status != null">status,</if>
<if test="errorMsg != null and errorMsg !=''">error_msg,</if>
<if test="assistants != null and assistants !=''">assistants,</if>
- <if test="inTime != null and inTime !=''">in_time,</if>
- <if test="outTime != null and outTime !=''">out_time,</if>
+ <if test="inTime != null">in_time,</if>
+ <if test="outTime != null">out_time,</if>
<if test="updatedBy != null">updated_by,</if>
<if test="memo != null and memo !=''">memo,</if>
</trim>
@@ -111,8 +111,8 @@
<if test="status != null">#{status,jdbcType=TINYINT},</if>
<if test="errorMsg != null and errorMsg !=''">#{errorMsg,jdbcType=VARCHAR},</if>
<if test="assistants != null and assistants !=''">#{assistants,jdbcType=VARCHAR},</if>
- <if test="inTime != null and inTime !=''">#{inTime,jdbcType=TIMESTAMP},</if>
- <if test="outTime != null and outTime !=''">#{outTime,jdbcType=TIMESTAMP},</if>
+ <if test="inTime != null">#{inTime,jdbcType=TIMESTAMP},</if>
+ <if test="outTime != null">#{outTime,jdbcType=TIMESTAMP},</if>
<if test="updatedBy != null">#{updatedBy,jdbcType=BIGINT},</if>
<if test="memo != null and memo !=''">#{memo,jdbcType=VARCHAR},</if>
</trim>
@@ -153,10 +153,10 @@
<if test="assistants != null and assistants !=''">
assistants = #{assistants,jdbcType=VARCHAR},
</if>
- <if test="inTime != null and inTime !=''">
+ <if test="inTime != null">
in_time = #{inTime,jdbcType=TIMESTAMP},
</if>
- <if test="outTime != null and outTime !=''">
+ <if test="outTime != null">
out_time = #{outTime,jdbcType=TIMESTAMP},
</if>
<if test="updatedBy != null">
diff --git a/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLifeMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLifeMapper.xml
index b5451ce..939f3d1 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLifeMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLifeMapper.xml
@@ -97,8 +97,8 @@
<if test="result != null">result,</if>
<if test="errorMsg != null and errorMsg !=''">error_msg,</if>
<if test="assistants != null and assistants !=''">assistants,</if>
- <if test="inTime != null and inTime !=''">in_time,</if>
- <if test="outTime != null and outTime !=''">out_time,</if>
+ <if test="inTime != null">in_time,</if>
+ <if test="outTime != null">out_time,</if>
<if test="updatedBy != null">updated_by,</if>
<if test="memo != null and memo !=''">memo,</if>
</trim>
@@ -116,8 +116,8 @@
<if test="result != null">#{result,jdbcType=TINYINT},</if>
<if test="errorMsg != null and errorMsg !=''">#{errorMsg,jdbcType=VARCHAR},</if>
<if test="assistants != null and assistants !=''">#{assistants,jdbcType=VARCHAR},</if>
- <if test="inTime != null and inTime !=''">#{inTime,jdbcType=TIMESTAMP},</if>
- <if test="outTime != null and outTime !=''">#{outTime,jdbcType=TIMESTAMP},</if>
+ <if test="inTime != null">#{inTime,jdbcType=TIMESTAMP},</if>
+ <if test="outTime != null">#{outTime,jdbcType=TIMESTAMP},</if>
<if test="updatedBy != null">#{updatedBy,jdbcType=BIGINT},</if>
<if test="memo != null and memo !=''">#{memo,jdbcType=VARCHAR},</if>
</trim>
@@ -161,10 +161,10 @@
<if test="assistants != null and assistants !=''">
assistants = #{assistants,jdbcType=VARCHAR},
</if>
- <if test="inTime != null and inTime !=''">
+ <if test="inTime != null">
in_time = #{inTime,jdbcType=TIMESTAMP},
</if>
- <if test="outTime != null and outTime !=''">
+ <if test="outTime != null">
out_time = #{outTime,jdbcType=TIMESTAMP},
</if>
<if test="updatedBy != null">
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 461f820..93a9da0 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml
@@ -72,10 +72,10 @@
<if test="deviceNo != null and deviceNo !=''">
and device_no = #{deviceNo,jdbcType=VARCHAR}
</if>
- <if test="startTime != null and startTime !=''">
+ <if test="startTime != null">
and out_time <![CDATA[ > ]]> #{startTime,jdbcType=TIMESTAMP}
</if>
- <if test="endTime != null and endTime !=''">
+ <if test="endTime != null">
and out_time <![CDATA[ < ]]> #{endTime,jdbcType=TIMESTAMP}
</if>
</where>
@@ -85,10 +85,10 @@
<if test="deviceNo != null and deviceNo !=''">
and device_no = #{deviceNo,jdbcType=VARCHAR}
</if>
- <if test="startTime != null and startTime !=''">
+ <if test="startTime != null">
and out_time <![CDATA[ > ]]> #{startTime,jdbcType=TIMESTAMP}
</if>
- <if test="endTime != null and endTime !=''">
+ <if test="endTime != null">
and out_time <![CDATA[ < ]]> #{endTime,jdbcType=TIMESTAMP}
</if>
</where>
@@ -136,8 +136,8 @@
<if test="result != null">result,</if>
<if test="errorMsg != null and errorMsg !=''">error_msg,</if>
<if test="assistants != null and assistants !=''">assistants,</if>
- <if test="inTime != null and inTime !=''">in_time,</if>
- <if test="outTime != null and outTime !=''">out_time,</if>
+ <if test="inTime != null">in_time,</if>
+ <if test="outTime != null">out_time,</if>
<if test="updatedBy != null">updated_by,</if>
<if test="memo != null and memo !=''">memo,</if>
<if test="number != null">number,</if>
@@ -156,8 +156,8 @@
<if test="result != null">#{result,jdbcType=TINYINT},</if>
<if test="errorMsg != null and errorMsg !=''">#{errorMsg,jdbcType=VARCHAR},</if>
<if test="assistants != null and assistants !=''">#{assistants,jdbcType=VARCHAR},</if>
- <if test="inTime != null and inTime !=''">#{inTime,jdbcType=TIMESTAMP},</if>
- <if test="outTime != null and outTime !=''">#{outTime,jdbcType=TIMESTAMP},</if>
+ <if test="inTime != null">#{inTime,jdbcType=TIMESTAMP},</if>
+ <if test="outTime != null">#{outTime,jdbcType=TIMESTAMP},</if>
<if test="updatedBy != null">#{updatedBy,jdbcType=BIGINT},</if>
<if test="memo != null and memo !=''">#{memo,jdbcType=VARCHAR},</if>
<if test="number != null">#{number,jdbcType=INTEGER},</if>
@@ -202,10 +202,10 @@
<if test="assistants != null and assistants !=''">
assistants = #{assistants,jdbcType=VARCHAR},
</if>
- <if test="inTime != null and inTime !=''">
+ <if test="inTime != null">
in_time = #{inTime,jdbcType=TIMESTAMP},
</if>
- <if test="outTime != null and outTime !=''">
+ <if test="outTime != null">
out_time = #{outTime,jdbcType=TIMESTAMP},
</if>
<if test="updatedBy != null">
--
Gitblit v1.8.0