From 4afa387b237899d5f841a3070d04739772c22551 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 30 五月 2025 11:17:47 +0800
Subject: [PATCH] 规范二维码生成
---
pms-parent/pms-global/src/main/resources/mapper/PltStationMapper.xml | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 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..191a34c 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PltStationMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PltStationMapper.xml
@@ -38,7 +38,7 @@
<include refid="Base_Column_List" />
from plt_station where name = #{name,jdbcType=VARCHAR} and deleted!=1
</select>
- <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPlt.PltStation" useGeneratedKeys="true">
+ <insert id="insertSelective" parameterType="com.dy.pmsGlobal.pojoPlt.PltStation">
insert into plt_station
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
@@ -64,6 +64,9 @@
<set>
<if test="code != null">
code = #{code,jdbcType=VARCHAR},
+ </if>
+ <if test="lineId != null">
+ line_id = #{lineId,jdbcType=BIGINT},
</if>
<if test="name != null">
name = #{name,jdbcType=VARCHAR},
@@ -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