From 68692e5fe975b2e1c7e3c0d02070945a2c1899e9 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 21 五月 2025 11:47:39 +0800
Subject: [PATCH] 1、增加成用token; 2、调整工站查询排序
---
pms-parent/pms-global/src/main/resources/mapper/PltStationMapper.xml | 36 ++++++++++++++++++++++--------------
1 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/mapper/PltStationMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PltStationMapper.xml
index 159b02f..30ed650 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PltStationMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PltStationMapper.xml
@@ -43,18 +43,18 @@
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="lineId != null">line_id,</if>
- <if test="code != null">code,</if>
- <if test="name != null">name,</if>
- <if test="remark != null">remark,</if>
+ <if test="code != null and code !=''">code,</if>
+ <if test="name != null and name !=''">name,</if>
+ <if test="remark != null and remark !=''">remark,</if>
<if test="disabled != null">disabled,</if>
<if test="deleted != null">deleted,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id,jdbcType=BIGINT},</if>
<if test="lineId != null">#{lineId,jdbcType=VARCHAR},</if>
- <if test="code != null">#{code,jdbcType=VARCHAR},</if>
- <if test="name != null">#{name,jdbcType=VARCHAR},</if>
- <if test="remark != null">#{remark,jdbcType=VARCHAR},</if>
+ <if test="code != null and code !=''">#{code,jdbcType=VARCHAR},</if>
+ <if test="name != null and name !=''">#{name,jdbcType=VARCHAR},</if>
+ <if test="remark != null and remark !=''">#{remark,jdbcType=VARCHAR},</if>
<if test="disabled != null">#{disabled,jdbcType=TINYINT},</if>
<if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
</trim>
@@ -62,13 +62,16 @@
<update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPlt.PltStation">
update plt_station
<set>
- <if test="code != null">
+ <if test="code != null and code !=''">
code = #{code,jdbcType=VARCHAR},
</if>
- <if test="name != null">
+ <if test="lineId != null">
+ line_id = #{lineId,jdbcType=BIGINT},
+ </if>
+ <if test="name != null and name !=''">
name = #{name,jdbcType=VARCHAR},
</if>
- <if test="remark != null">
+ <if test="remark != null and remark !=''">
remark = #{remark,jdbcType=VARCHAR},
</if>
<if test="disabled != null">
@@ -93,7 +96,7 @@
name like concat('%', #{name}, '%')
</if>
</trim>
- order by id desc
+ order by line_id ASC, id ASC
<trim prefix="limit " >
<if test="start != null and count != null">
#{start}, #{count}
@@ -106,7 +109,7 @@
<include refid="Base_Column_List" />
from plt_station where deleted!=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 !=''">
@@ -115,10 +118,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>
@@ -148,11 +151,16 @@
<select id="selectAll" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
- from plt_station where deleted!=1
+ from plt_station
+ where deleted!=1
+ order by line_id ASC, id ASC
</select>
<select id="selectMaxCode" resultType="java.lang.String">
select max(code) from plt_station
</select>
+ <select id="selectByLineAndStatus" resultType="java.lang.Long">
+ select count(1) from plt_station where line_id = #{lineId} and disabled = #{disabled} and deleted!=1
+ </select>
<update id="deleteLogicById" parameterType="java.lang.Long">
update plt_station set deleted = 1
--
Gitblit v1.8.0