From 843c50e9c2b35196f5f4c150e33fdc6f6c2d6826 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期二, 16 七月 2024 09:34:31 +0800
Subject: [PATCH] 测试节点通过后,状态取上一节点状态,而不是默认完成
---
pms-parent/pms-global/src/main/resources/mapper/PltStationMapper.xml | 43 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 41 insertions(+), 2 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 db8786b..159b02f 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PltStationMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PltStationMapper.xml
@@ -24,13 +24,20 @@
<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>
-
+ <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=",">
@@ -94,6 +101,30 @@
</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 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="selectSomeCount" resultType="java.lang.Long">
select count(1)
from plt_station where deleted!=1
@@ -114,6 +145,14 @@
</if>
</trim>
</select>
+ <select id="selectAll" resultMap="BaseResultMap">
+ select
+ <include refid="Base_Column_List" />
+ from plt_station where deleted!=1
+ </select>
+ <select id="selectMaxCode" resultType="java.lang.String">
+ select max(code) from plt_station
+ </select>
<update id="deleteLogicById" parameterType="java.lang.Long">
update plt_station set deleted = 1
--
Gitblit v1.8.0