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/StaDeviceProductionLogMapper.xml | 104 +++++++++++++++++++++++++++++++++++++---------------
1 files changed, 74 insertions(+), 30 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 6bf8a26..461f820 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml
@@ -22,6 +22,7 @@
<result property="outTime" column="out_time" jdbcType="TIMESTAMP"/>
<result property="updatedBy" column="updated_by" jdbcType="BIGINT"/>
<result property="memo" column="memo" jdbcType="VARCHAR"/>
+ <result property="number" column="number" jdbcType="INTEGER"/>
</resultMap>
<resultMap id="joinResultMap" type="com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog" extends="BaseResultMap">
<result property="planName" column="plan_name" jdbcType="VARCHAR"/>
@@ -37,7 +38,7 @@
curr_node,node_content,device_cycle_content,
status,result,
error_msg,assistants,in_time,
- out_time,updated_by,memo
+ out_time,updated_by,memo,number
</sql>
@@ -52,12 +53,49 @@
t.* ,p.`name` plan_name,s.`name` station_name,u.`name` update_user_name
FROM
(
- select * from sta_device_production_log_past where device_no = #{deviceNo,jdbcType=VARCHAR} union
- select * from sta_device_production_log where device_no = #{deviceNo,jdbcType=VARCHAR}
+ select <include refid="Base_Column_List" /> from sta_device_production_log_past where device_no = #{deviceNo,jdbcType=VARCHAR} union
+ select <include refid="Base_Column_List" /> from sta_device_production_log where device_no = #{deviceNo,jdbcType=VARCHAR}
) 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
+ ORDER BY t.id DESC
+ </select>
+
+ <select id="selectProductLog" resultMap="joinResultMap">
+ select
+ t.* ,p.`name` plan_name,s.`name` station_name,u.`name` update_user_name
+ FROM
+ (
+ select <include refid="Base_Column_List" /> from sta_device_production_log_past
+ <where>
+ <if test="deviceNo != null and deviceNo !=''">
+ and device_no = #{deviceNo,jdbcType=VARCHAR}
+ </if>
+ <if test="startTime != null and startTime !=''">
+ and out_time <![CDATA[ > ]]> #{startTime,jdbcType=TIMESTAMP}
+ </if>
+ <if test="endTime != null and endTime !=''">
+ and out_time <![CDATA[ < ]]> #{endTime,jdbcType=TIMESTAMP}
+ </if>
+ </where>
+ union
+ select <include refid="Base_Column_List" /> from sta_device_production_log
+ <where>
+ <if test="deviceNo != null and deviceNo !=''">
+ and device_no = #{deviceNo,jdbcType=VARCHAR}
+ </if>
+ <if test="startTime != null and startTime !=''">
+ and out_time <![CDATA[ > ]]> #{startTime,jdbcType=TIMESTAMP}
+ </if>
+ <if test="endTime != null and endTime !=''">
+ and out_time <![CDATA[ < ]]> #{endTime,jdbcType=TIMESTAMP}
+ </if>
+ </where>
+ ) 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
ORDER BY t.id DESC
</select>
@@ -72,61 +110,63 @@
,curr_node,node_content,device_cycle_content
,status,result
,error_msg,assistants,in_time
- ,out_time,updated_by,memo
+ ,out_time,updated_by,memo,number
)
values (#{id,jdbcType=BIGINT},#{deviceNo,jdbcType=VARCHAR},#{workId,jdbcType=BIGINT}
,#{repairId,jdbcType=BIGINT},#{planId,jdbcType=BIGINT},#{stationId,jdbcType=BIGINT}
,#{currNode,jdbcType=BIGINT},#{nodeContent,jdbcType=VARCHAR},#{deviceCycleContent,jdbcType=VARCHAR}
,#{status,jdbcType=TINYINT},#{result,jdbcType=TINYINT}
,#{errorMsg,jdbcType=VARCHAR},#{assistants,jdbcType=VARCHAR},#{inTime,jdbcType=TIMESTAMP}
- ,#{outTime,jdbcType=TIMESTAMP},#{updatedBy,jdbcType=BIGINT},#{memo,jdbcType=VARCHAR}
+ ,#{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 into sta_device_production_log
<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="result != null">result,</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>
+ <if test="number != null">number,</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="result != null">#{result,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>
+ <if test="number != null">#{number,jdbcType=INTEGER},</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog">
update sta_device_production_log
<set>
- <if test="deviceNo != null">
+ <if test="deviceNo != null and deviceNo !=''">
device_no = #{deviceNo,jdbcType=VARCHAR},
</if>
<if test="workId != null">
@@ -144,10 +184,10 @@
<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">
@@ -156,23 +196,26 @@
<if test="result != null">
result = #{result,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>
+ <if test="number != null">
+ number = #{number,jdbcType=INTEGER},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
@@ -195,7 +238,8 @@
in_time = #{inTime,jdbcType=TIMESTAMP},
out_time = #{outTime,jdbcType=TIMESTAMP},
updated_by = #{updatedBy,jdbcType=BIGINT},
- memo = #{memo,jdbcType=VARCHAR}
+ memo = #{memo,jdbcType=VARCHAR},
+ number = #{number,jdbcType=INTEGER}
where id = #{id,jdbcType=BIGINT}
</update>
</mapper>
--
Gitblit v1.8.0