From 5b207a55bdd10f1516031f629217daac069b64fd Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期五, 30 八月 2024 11:40:31 +0800
Subject: [PATCH] 添加免登录查询所有排班接口;
---
pms-parent/pms-global/src/main/resources/mapper/StaDeviceLifeLastMapper.xml | 62 ++++++++++++++++---------------
1 files changed, 32 insertions(+), 30 deletions(-)
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 aadffd9..2aaad05 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLifeLastMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLifeLastMapper.xml
@@ -22,6 +22,7 @@
<result property="updatedBy" column="updated_by" jdbcType="BIGINT"/>
<result property="memo" column="memo" jdbcType="VARCHAR"/>
</resultMap>
+
<resultMap id="joinResultMap" type="com.dy.pmsGlobal.pojoSta.StaDeviceLifeLast" extends="BaseResultMap">
<result property="planName" column="plan_name" jdbcType="VARCHAR"/>
<result property="stationName" column="station_name" jdbcType="VARCHAR"/>
@@ -38,11 +39,12 @@
in_time,out_time,updated_by,
memo
</sql>
+
<select id="selectByDeviceNo" parameterType="java.lang.String" resultMap="joinResultMap">
select
t.* ,p.`name` plan_name,s.`name` station_name,u.`name` update_user_name
FROM
- sta_device_life t
+ sta_device_life_last t
left join pr_assembly_plan p on t.plan_id=p.id
left join plt_station s on s.id = t.station_id
left JOIN ba_user u on u.id=t.updated_by
@@ -54,12 +56,12 @@
select
<include refid="Base_Column_List" />
from sta_device_life_last
- where id = #{id,jdbcType=BIGINT}
+ where id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from sta_device_life_last
- where id = #{id,jdbcType=BIGINT}
+ where id = #{id,jdbcType=BIGINT}
</delete>
<insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLifeLast" useGeneratedKeys="true">
insert into sta_device_life_last
@@ -80,45 +82,45 @@
insert into sta_device_life_last
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
- <if test="deviceNo != null">device_no,</if>
+ <if test="deviceNo != null and deviceNo !=''">device_no,</if>
<if test="workId != null">work_id,</if>
<if test="repairId != null">repair_id,</if>
<if test="planId != null">plan_id,</if>
<if test="stationId != null">station_id,</if>
<if test="currNode != null">curr_node,</if>
- <if test="nodeContent != null">node_content,</if>
- <if test="deviceCycleContent != null">device_cycle_content,</if>
+ <if test="nodeContent != null and nodeContent !=''">node_content,</if>
+ <if test="deviceCycleContent != null and deviceCycleContent !=''">device_cycle_content,</if>
<if test="status != null">status,</if>
- <if test="errorMsg != null">error_msg,</if>
- <if test="assistants != null">assistants,</if>
- <if test="inTime != null">in_time,</if>
- <if test="outTime != null">out_time,</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="updatedBy != null">updated_by,</if>
- <if test="memo != null">memo,</if>
+ <if test="memo != null and memo !=''">memo,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id,jdbcType=BIGINT},</if>
- <if test="deviceNo != null">#{deviceNo,jdbcType=VARCHAR},</if>
+ <if test="deviceNo != null and deviceNo !=''">#{deviceNo,jdbcType=VARCHAR},</if>
<if test="workId != null">#{workId,jdbcType=BIGINT},</if>
<if test="repairId != null">#{repairId,jdbcType=BIGINT},</if>
<if test="planId != null">#{planId,jdbcType=BIGINT},</if>
<if test="stationId != null">#{stationId,jdbcType=BIGINT},</if>
<if test="currNode != null">#{currNode,jdbcType=BIGINT},</if>
- <if test="nodeContent != null">#{nodeContent,jdbcType=VARCHAR},</if>
- <if test="deviceCycleContent != null">#{deviceCycleContent,jdbcType=VARCHAR},</if>
+ <if test="nodeContent != null and nodeContent !=''">#{nodeContent,jdbcType=VARCHAR},</if>
+ <if test="deviceCycleContent != null and deviceCycleContent !=''">#{deviceCycleContent,jdbcType=VARCHAR},</if>
<if test="status != null">#{status,jdbcType=TINYINT},</if>
- <if test="errorMsg != null">#{errorMsg,jdbcType=VARCHAR},</if>
- <if test="assistants != null">#{assistants,jdbcType=VARCHAR},</if>
- <if test="inTime != null">#{inTime,jdbcType=TIMESTAMP},</if>
- <if test="outTime != null">#{outTime,jdbcType=TIMESTAMP},</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="updatedBy != null">#{updatedBy,jdbcType=BIGINT},</if>
- <if test="memo != null">#{memo,jdbcType=VARCHAR},</if>
+ <if test="memo != null and memo !=''">#{memo,jdbcType=VARCHAR},</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLifeLast">
update sta_device_life_last
<set>
- <if test="deviceNo != null">
+ <if test="deviceNo != null and deviceNo !=''">
device_no = #{deviceNo,jdbcType=VARCHAR},
</if>
<if test="workId != null">
@@ -136,39 +138,39 @@
<if test="currNode != null">
curr_node = #{currNode,jdbcType=BIGINT},
</if>
- <if test="nodeContent != null">
+ <if test="nodeContent != null and nodeContent !=''">
node_content = #{nodeContent,jdbcType=VARCHAR},
</if>
- <if test="deviceCycleContent != null">
+ <if test="deviceCycleContent != null and deviceCycleContent !=''">
device_cycle_content = #{deviceCycleContent,jdbcType=VARCHAR},
</if>
<if test="status != null">
status = #{status,jdbcType=TINYINT},
</if>
- <if test="errorMsg != null">
+ <if test="errorMsg != null and errorMsg !=''">
error_msg = #{errorMsg,jdbcType=VARCHAR},
</if>
- <if test="assistants != null">
+ <if test="assistants != null and assistants !=''">
assistants = #{assistants,jdbcType=VARCHAR},
</if>
- <if test="inTime != null">
+ <if test="inTime != null and inTime !=''">
in_time = #{inTime,jdbcType=TIMESTAMP},
</if>
- <if test="outTime != null">
+ <if test="outTime != null and outTime !=''">
out_time = #{outTime,jdbcType=TIMESTAMP},
</if>
<if test="updatedBy != null">
updated_by = #{updatedBy,jdbcType=BIGINT},
</if>
- <if test="memo != null">
+ <if test="memo != null and memo !=''">
memo = #{memo,jdbcType=VARCHAR},
</if>
</set>
- where id = #{id,jdbcType=BIGINT}
+ where id = #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLifeLast">
update sta_device_life_last
- set
+ set
device_no = #{deviceNo,jdbcType=VARCHAR},
work_id = #{workId,jdbcType=BIGINT},
repair_id = #{repairId,jdbcType=BIGINT},
@@ -184,7 +186,7 @@
out_time = #{outTime,jdbcType=TIMESTAMP},
updated_by = #{updatedBy,jdbcType=BIGINT},
memo = #{memo,jdbcType=VARCHAR}
- where id = #{id,jdbcType=BIGINT}
+ where id = #{id,jdbcType=BIGINT}
</update>
<update id="updateByDeviceNo">
update sta_device_life_last
--
Gitblit v1.8.0