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 | 140 +++++++++++++++++++++++++++++-----------------
1 files changed, 89 insertions(+), 51 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 c922b71..30ed650 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PltStationMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PltStationMapper.xml
@@ -5,81 +5,82 @@
<mapper namespace="com.dy.pmsGlobal.daoPlt.PltStationMapper">
<resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoPlt.PltStation">
- <id property="id" column="id" jdbcType="BIGINT"/>
- <result property="code" column="code" jdbcType="VARCHAR"/>
- <result property="name" column="name" jdbcType="VARCHAR"/>
- <result property="remark" column="remark" jdbcType="VARCHAR"/>
- <result property="dt" column="dt" jdbcType="TIMESTAMP"/>
- <result property="deleted" column="deleted" jdbcType="TINYINT"/>
+ <id property="id" column="id" jdbcType="BIGINT"/>
+ <result property="lineId" column="line_id" jdbcType="BIGINT"/>
+ <result property="code" column="code" jdbcType="VARCHAR"/>
+ <result property="name" column="name" jdbcType="VARCHAR"/>
+ <result property="remark" column="remark" jdbcType="VARCHAR"/>
+ <result property="dt" column="dt" jdbcType="TIMESTAMP"/>
+ <result column="disabled" property="disabled" typeHandler="com.dy.common.mybatis.BooleanTypeHandler"/>
+ <result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.BooleanTypeHandler"/>
+ <association property="lineName" column="line_id" javaType="java.lang.Long"
+ select="selectLineNameById" fetchType="eager" />
</resultMap>
<sql id="Base_Column_List">
- id,code,name,
+ id,line_id,code,name,disabled,
remark,dt,deleted
</sql>
-
+ <select id="selectLineNameById" parameterType="java.lang.Long" resultType="String">
+ select name from plt_production_line where id = #{lineId}
+ </select>
+ <select id="selectNameByStationId" parameterType="java.lang.Long" resultType="String">
+ select name from plt_station where id = #{id}
+ </select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from plt_station
- where id = #{id,jdbcType=BIGINT}
+ where id = #{id,jdbcType=BIGINT} and deleted!=1
</select>
-
- <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
- delete from plt_station
- where id = #{id,jdbcType=BIGINT}
- </delete>
- <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPlt.PltStation" useGeneratedKeys="true">
- insert into plt_station
- ( id,code,name
- ,remark,deleted
- )
- values (#{id,jdbcType=BIGINT},#{code,jdbcType=VARCHAR},#{name,jdbcType=VARCHAR}
- ,#{remark,jdbcType=VARCHAR},#{deleted,jdbcType=TINYINT}
- )
- </insert>
+ <select id="selectByName" parameterType="java.lang.String" resultMap="BaseResultMap">
+ select
+ <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 into plt_station
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
- <if test="code != null">code,</if>
- <if test="name != null">name,</if>
- <if test="remark != null">remark,</if>
+ <if test="lineId != null">line_id,</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="code != null">#{code,jdbcType=VARCHAR},</if>
- <if test="name != null">#{name,jdbcType=VARCHAR},</if>
- <if test="remark != null">#{remark,jdbcType=VARCHAR},</if>
+ <if test="lineId != null">#{lineId,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>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPlt.PltStation">
update plt_station
<set>
- <if test="code != null">
- code = #{code,jdbcType=VARCHAR},
- </if>
- <if test="name != null">
- name = #{name,jdbcType=VARCHAR},
- </if>
- <if test="remark != null">
- remark = #{remark,jdbcType=VARCHAR},
- </if>
- <if test="deleted != null">
- deleted = #{deleted,jdbcType=TINYINT},
- </if>
+ <if test="code != null and code !=''">
+ code = #{code,jdbcType=VARCHAR},
+ </if>
+ <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 and remark !=''">
+ remark = #{remark,jdbcType=VARCHAR},
+ </if>
+ <if test="disabled != null">
+ disabled = #{disabled,jdbcType=TINYINT},
+ </if>
+ <if test="deleted != null">
+ deleted = #{deleted,jdbcType=TINYINT},
+ </if>
</set>
- where id = #{id,jdbcType=BIGINT}
- </update>
- <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoPlt.PltStation">
- update plt_station
- set
- code = #{code,jdbcType=VARCHAR},
- name = #{name,jdbcType=VARCHAR},
- remark = #{remark,jdbcType=VARCHAR},
- deleted = #{deleted,jdbcType=TINYINT}
where id = #{id,jdbcType=BIGINT}
</update>
@@ -95,12 +96,36 @@
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}
</if>
</trim>
+ </select>
+
+ <select id="selectStationList" resultMap="BaseResultMap">
+ select
+ <include refid="Base_Column_List" />
+ from plt_station where deleted!=1
+ <trim prefix="and" suffixOverrides="and">
+ <if test="id != null">
+ 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">
+ disabled = #{disabled,jdbcType=TINYINT} and
+ </if>
+ <if test="lineId != null">
+ line_id = #{lineId,jdbcType=BIGINT} and
+ </if>
+ </trim>
+ order by id desc
</select>
<select id="selectSomeCount" resultType="java.lang.Long">
@@ -123,6 +148,19 @@
</if>
</trim>
</select>
+ <select id="selectAll" resultMap="BaseResultMap">
+ select
+ <include refid="Base_Column_List" />
+ 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