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/StaAssemblyWorkLastMapper.xml | 94 +++++++++++++++++++++++----------------------- 1 files changed, 47 insertions(+), 47 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 0bd9d4d..0b50a25 100644 --- a/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml +++ b/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml @@ -98,7 +98,7 @@ <!-- <include refid="Base_Column_List"/>--> <!-- from plt_station where status =1--> <!-- <trim prefix="and" suffixOverrides="and">--> -<!-- <if test="id != null and id !=''">--> +<!-- <if test="id != null">--> <!-- id = #{id,jdbcType=BIGINT} and--> <!-- </if>--> <!-- <if test="code != null and code !=''">--> @@ -107,10 +107,10 @@ <!-- <if test="name != null and name !=''">--> <!-- name like concat('%', #{name}, '%') and--> <!-- </if>--> -<!-- <if test="disabled != null and disabled !=''">--> +<!-- <if test="disabled != null">--> <!-- disabled = #{disabled,jdbcType=TINYINT} and--> <!-- </if>--> -<!-- <if test="lineId != null and lineId !=''">--> +<!-- <if test="lineId != null">--> <!-- line_id = #{lineId,jdbcType=BIGINT} and--> <!-- </if>--> <!-- </trim>--> @@ -122,25 +122,25 @@ <include refid="Base_Column_List"/> from sta_assembly_work_last <where> - <if test="userId != null and userId !=''"> + <if test="userId != null"> and user_id = #{userId,jdbcType=BIGINT} </if> - <if test="lineId != null and lineId !=''"> + <if test="lineId != null"> and line_id = #{lineId,jdbcType=BIGINT} </if> - <if test="stationId != null and stationId !=''"> + <if test="stationId != null"> and station_id = #{stationId,jdbcType=BIGINT} </if> - <if test="planId != null and planId !=''"> + <if test="planId != null"> and plan_id = #{planId,jdbcType=BIGINT} </if> - <if test="processId != null and processId !=''"> + <if test="processId != null"> and process_id = #{processId,jdbcType=BIGINT} </if> - <if test="nodeId != null and nodeId !=''"> + <if test="nodeId != null"> and node_id = #{nodeId,jdbcType=BIGINT} </if> - <if test="status != null and status !=''"> + <if test="status != null"> and status = #{status,jdbcType=TINYINT} </if> <if test="startTime != null and startTime !=''"> @@ -204,25 +204,25 @@ <if test="endTime != null and endTime !=''"> and l.start_time <![CDATA[ < ]]> #{endTime} </if> - <if test="userId != null and userId !=''"> + <if test="userId != null"> and l.user_id = #{userId,jdbcType=BIGINT} </if> - <if test="lineId != null and lineId !=''"> + <if test="lineId != null"> and l.line_id = #{lineId,jdbcType=BIGINT} </if> - <if test="stationId != null and stationId !=''"> + <if test="stationId != null"> and l.station_id = #{stationId,jdbcType=BIGINT} </if> - <if test="planId != null and planId !=''"> + <if test="planId != null"> and l.plan_id = #{planId,jdbcType=BIGINT} </if> - <if test="processId != null and processId !=''"> + <if test="processId != null"> and l.process_id = #{processId,jdbcType=BIGINT} </if> - <if test="nodeId != null and nodeId !=''"> + <if test="nodeId != null"> and l.node_id = #{nodeId,jdbcType=BIGINT} </if> - <if test="status != null and status !=''"> + <if test="status != null"> and l.status = #{status,jdbcType=TINYINT} </if> <if test="assistants != null and assistants !=''"> @@ -271,25 +271,25 @@ <if test="endTime != null and endTime !=''"> and l.start_time <![CDATA[ < ]]> #{endTime,jdbcType=TIMESTAMP} </if> - <if test="userId != null and userId !=''"> + <if test="userId != null"> and l.user_id = #{userId,jdbcType=BIGINT} </if> - <if test="lineId != null and lineId !=''"> + <if test="lineId != null"> and l.line_id = #{lineId,jdbcType=BIGINT} </if> - <if test="stationId != null and stationId !=''"> + <if test="stationId != null"> and l.station_id = #{stationId,jdbcType=BIGINT} </if> - <if test="planId != null and planId !=''"> + <if test="planId != null"> and l.plan_id = #{planId,jdbcType=BIGINT} </if> - <if test="processId != null and processId !=''"> + <if test="processId != null"> and l.process_id = #{processId,jdbcType=BIGINT} </if> - <if test="nodeId != null and nodeId !=''"> + <if test="nodeId != null"> and l.node_id = #{nodeId,jdbcType=BIGINT} </if> - <if test="status != null and status !=''"> + <if test="status != null"> and l.status = #{status,jdbcType=TINYINT} </if> <if test="assistants != null and assistants !=''"> @@ -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> @@ -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> @@ -359,14 +359,14 @@ <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="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="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="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> @@ -374,14 +374,14 @@ <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="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="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="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"> @@ -399,28 +399,28 @@ <if test="planId != null"> plan_id = #{planId,jdbcType=BIGINT}, </if> - <if test="processId != null"> + <if test="processId!= null"> process_id = #{processId,jdbcType=BIGINT}, </if> - <if test="nodeId != null"> + <if test="nodeId!= null"> node_id = #{nodeId,jdbcType=BIGINT}, </if> - <if test="workType != null"> + <if test="workType!= null"> 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"> 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