From 591e3b8a10ed15023f3ad9e5a72a887ef89b0bb2 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期一, 26 八月 2024 20:47:46 +0800
Subject: [PATCH] 修改判空方式
---
pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml | 92 +++++++++++++++++++++++-----------------------
1 files changed, 46 insertions(+), 46 deletions(-)
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 4bcae20..2ec9da4 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml
@@ -198,10 +198,10 @@
<if test="lineName != null and lineName != '' ">
and ll.name like concat('%', #{lineName}, '%')
</if>
- <if test="startTime != null">
+ <if test="startTime != null and startTime !=''">
and l.start_time <![CDATA[ > ]]> #{startTime}
</if>
- <if test="endTime != null">
+ <if test="endTime != null and endTime !=''">
and l.start_time <![CDATA[ < ]]> #{endTime}
</if>
<if test="userId != null and userId !=''">
@@ -265,10 +265,10 @@
<if test="lineName != null and lineName != '' ">
and ll.name like concat('%', #{lineName}, '%')
</if>
- <if test="startTime != null">
+ <if test="startTime != null and startTime !=''">
and l.start_time <![CDATA[ > ]]> #{startTime,jdbcType=TIMESTAMP}
</if>
- <if test="endTime != null">
+ <if test="endTime != null and endTime !=''">
and l.start_time <![CDATA[ < ]]> #{endTime,jdbcType=TIMESTAMP}
</if>
<if test="userId != null and userId !=''">
@@ -304,7 +304,7 @@
where user_id = #{userId,jdbcType=BIGINT}
and station_id = #{stationId,jdbcType=BIGINT}
<choose>
- <when test="planId != null">
+ <when test="planId != null and planId !=''">
and plan_id = #{planId,jdbcType=BIGINT}
</when>
<otherwise>
@@ -312,7 +312,7 @@
</otherwise>
</choose>
<choose>
- <when test="processId != null">
+ <when test="processId != null and processId !=''">
and process_id = #{processId,jdbcType=BIGINT}
</when>
<otherwise>
@@ -320,7 +320,7 @@
</otherwise>
</choose>
<choose>
- <when test="nodeId != null">
+ <when test="nodeId != null and nodeId !=''">
and node_id = #{nodeId,jdbcType=BIGINT}
</when>
<otherwise>
@@ -328,7 +328,7 @@
</otherwise>
</choose>
and work_type = #{workType,jdbcType=TINYINT}
- <if test="id != null">
+ <if test="id != null and id !=''">
and id != #{id,jdbcType=BIGINT}
</if>
</select>
@@ -354,73 +354,73 @@
parameterType="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast" useGeneratedKeys="true">
insert into sta_assembly_work_last
<trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">id,</if>
- <if test="userId != null">user_id,</if>
- <if test="lineId != null">line_id,</if>
- <if test="stationId != null">station_id,</if>
- <if test="planId != null">plan_id,</if>
- <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">dt,</if>
- <if test="status != null">status,</if>
- <if test="startTime != null">start_time,</if>
- <if test="endTime != null">end_time,</if>
- <if test="assistants != null">assistants,</if>
+ <if test="id != null and id !=''">id,</if>
+ <if test="userId != null and userId !=''">user_id,</if>
+ <if test="lineId != null and lineId !=''">line_id,</if>
+ <if test="stationId != null and stationId !=''">station_id,</if>
+ <if test="planId != null and planId !=''">plan_id,</if>
+ <if test="processId!= null and processId !=''">process_id,</if>
+ <if test="nodeId!= null and nodeId !=''">node_id,</if>
+ <if test="workType!= null and workType !=''">work_Type,</if>
+ <if test="dt != null and dt !=''">dt,</if>
+ <if test="status != null and status !=''">status,</if>
+ <if test="startTime != null and startTime !=''">start_time,</if>
+ <if test="endTime != null and endTime !=''">end_time,</if>
+ <if test="assistants != null and assistants !=''">assistants,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="id != null">#{id,jdbcType=BIGINT},</if>
- <if test="userId != null">#{userId,jdbcType=BIGINT},</if>
- <if test="lineId != null">#{lineId,jdbcType=BIGINT},</if>
- <if test="stationId != null">#{stationId,jdbcType=BIGINT},</if>
- <if test="planId != null">#{planId,jdbcType=BIGINT},</if>
- <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">#{dt,jdbcType=TIMESTAMP},</if>
- <if test="status != null">#{status,jdbcType=TINYINT},</if>
- <if test="startTime != null">#{startTime,jdbcType=TIMESTAMP},</if>
- <if test="endTime != null">#{endTime,jdbcType=TIMESTAMP},</if>
- <if test="assistants != null">#{assistants,jdbcType=VARCHAR},</if>
+ <if test="id != null and id !=''">#{id,jdbcType=BIGINT},</if>
+ <if test="userId != null and userId !=''">#{userId,jdbcType=BIGINT},</if>
+ <if test="lineId != null and lineId !=''">#{lineId,jdbcType=BIGINT},</if>
+ <if test="stationId != null and stationId !=''">#{stationId,jdbcType=BIGINT},</if>
+ <if test="planId != null and planId !=''">#{planId,jdbcType=BIGINT},</if>
+ <if test="processId!= null and processId !=''">#{processId,jdbcType=BIGINT},</if>
+ <if test="nodeId!= null and nodeId !=''">#{nodeId,jdbcType=BIGINT},</if>
+ <if test="workType!= null and workType !=''">#{workType,jdbcType=TINYINT},</if>
+ <if test="dt != null and dt !=''">#{dt,jdbcType=TIMESTAMP},</if>
+ <if test="status != null and status !=''">#{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="assistants != null and assistants !=''">#{assistants,jdbcType=VARCHAR},</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast">
update sta_assembly_work_last
<set>
- <if test="userId != null">
+ <if test="userId != null and userId !=''">
user_id = #{userId,jdbcType=BIGINT},
</if>
- <if test="lineId != null">
+ <if test="lineId != null and lineId !=''">
line_id = #{lineId,jdbcType=BIGINT},
</if>
- <if test="stationId != null">
+ <if test="stationId != null and stationId !=''">
station_id = #{stationId,jdbcType=BIGINT},
</if>
- <if test="planId != null">
+ <if test="planId != null and planId !=''">
plan_id = #{planId,jdbcType=BIGINT},
</if>
- <if test="processId != null">
+ <if test="processId!= null and processId !=''">
process_id = #{processId,jdbcType=BIGINT},
</if>
- <if test="nodeId != null">
+ <if test="nodeId!= null and nodeId !=''">
node_id = #{nodeId,jdbcType=BIGINT},
</if>
- <if test="workType != null">
+ <if test="workType!= null and workType !=''">
work_type = #{workType,jdbcType=TINYINT},
</if>
- <if test="dt != null">
+ <if test="dt != null and dt !=''">
dt = #{dt,jdbcType=TIMESTAMP},
</if>
- <if test="status != null">
+ <if test="status != null and status !=''">
status = #{status,jdbcType=TINYINT},
</if>
- <if test="startTime != null">
+ <if test="startTime != null and startTime !=''">
start_time = #{startTime,jdbcType=TIMESTAMP},
</if>
- <if test="endTime != null">
+ <if test="endTime != null and endTime !=''">
end_time = #{endTime,jdbcType=TIMESTAMP},
</if>
- <if test="assistants != null">
+ <if test="assistants != null and assistants !=''">
assistants = #{assistants,jdbcType=VARCHAR},
</if>
</set>
--
Gitblit v1.8.0