From 732b40515d87a1780a5986227513d507076ca5eb Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期二, 27 八月 2024 13:56:10 +0800
Subject: [PATCH] fix order search
---
pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml | 168 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 101 insertions(+), 67 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 8b32de7..2ec9da4 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml
@@ -71,7 +71,7 @@
node_id,work_type,dt,status,
start_time,end_time,assistants
</sql>
- <sql id="part_Column_List">
+ <sql id="part_Column_List"><![CDATA[
${alias}.id,
${alias}.user_id,
${alias}.line_id,
@@ -85,7 +85,7 @@
${alias}.start_time,
${alias}.end_time,
${alias}.assistants
- </sql>
+ ]]></sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
@@ -93,29 +93,29 @@
where id = #{id,jdbcType=BIGINT}
</select>
- <select id="selectByUserAndStation" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List"/>
- from plt_station where status ==1
- <trim prefix="and" suffixOverrides="and">
- <if test="id != null and id !=''">
- id = #{id,jdbcType=BIGINT} and
- </if>
- <if test="code != null and code !=''">
- code = #{code,jdbcType=VARCHAR} and
- </if>
- <if test="name != null and name !=''">
- name like concat('%', #{name}, '%') and
- </if>
- <if test="disabled != null and disabled !=''">
- disabled = #{disabled,jdbcType=TINYINT} and
- </if>
- <if test="lineId != null and lineId !=''">
- line_id = #{lineId,jdbcType=BIGINT} and
- </if>
- </trim>
- order by id desc
- </select>
+<!-- <select id="selectByUserAndStation" resultMap="BaseResultMap">-->
+<!-- select-->
+<!-- <include refid="Base_Column_List"/>-->
+<!-- from plt_station where status =1-->
+<!-- <trim prefix="and" suffixOverrides="and">-->
+<!-- <if test="id != null and id !=''">-->
+<!-- id = #{id,jdbcType=BIGINT} and-->
+<!-- </if>-->
+<!-- <if test="code != null and code !=''">-->
+<!-- code = #{code,jdbcType=VARCHAR} and-->
+<!-- </if>-->
+<!-- <if test="name != null and name !=''">-->
+<!-- name like concat('%', #{name}, '%') and-->
+<!-- </if>-->
+<!-- <if test="disabled != null and disabled !=''">-->
+<!-- disabled = #{disabled,jdbcType=TINYINT} and-->
+<!-- </if>-->
+<!-- <if test="lineId != null and lineId !=''">-->
+<!-- line_id = #{lineId,jdbcType=BIGINT} and-->
+<!-- </if>-->
+<!-- </trim>-->
+<!-- order by id desc-->
+<!-- </select>-->
<select id="selectList" resultMap="BaseResultMap">
select
@@ -144,10 +144,10 @@
and status = #{status,jdbcType=TINYINT}
</if>
<if test="startTime != null and startTime !=''">
- and start_time = #{startTime,jdbcType=TIMESTAMP},
+ and start_time = #{startTime,jdbcType=TIMESTAMP}
</if>
<if test="endTime != null and endTime !=''">
- and end_time = #{endTime,jdbcType=TIMESTAMP},
+ and end_time = #{endTime,jdbcType=TIMESTAMP}
</if>
<if test="assistants != null and assistants !=''">
and assistants = #{assistants,jdbcType=VARCHAR}
@@ -190,7 +190,7 @@
and p.name like concat('%', #{planName}, '%')
</if>
<if test="processName != null and processName != '' ">
- and pp.name like concat('%', #{processName}, '%')
+ and ppp.name like concat('%', #{processName}, '%')
</if>
<if test="nodeName != null and nodeName != '' ">
and n.content like concat('%', #{nodeName}, '%')
@@ -297,7 +297,41 @@
</if>
</where>
</select>
-
+ <select id="existsEntity" resultMap="BaseResultMap">
+ select
+ <include refid="Base_Column_List"/>
+ from sta_assembly_work_last
+ where user_id = #{userId,jdbcType=BIGINT}
+ and station_id = #{stationId,jdbcType=BIGINT}
+ <choose>
+ <when test="planId != null and planId !=''">
+ and plan_id = #{planId,jdbcType=BIGINT}
+ </when>
+ <otherwise>
+ and plan_id is null
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="processId != null and processId !=''">
+ and process_id = #{processId,jdbcType=BIGINT}
+ </when>
+ <otherwise>
+ and process_id is null
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="nodeId != null and nodeId !=''">
+ and node_id = #{nodeId,jdbcType=BIGINT}
+ </when>
+ <otherwise>
+ and node_id is null
+ </otherwise>
+ </choose>
+ and work_type = #{workType,jdbcType=TINYINT}
+ <if test="id != null and id !=''">
+ and id != #{id,jdbcType=BIGINT}
+ </if>
+ </select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete
from sta_assembly_work_last
@@ -320,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