From e487d886533bb60618864642b85f13957252f70d Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期三, 30 十月 2024 13:42:07 +0800
Subject: [PATCH] nologin add command list
---
pms-parent/pms-global/src/main/resources/mapper/PltProductQualityInspectionItemsMapper.xml | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/mapper/PltProductQualityInspectionItemsMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PltProductQualityInspectionItemsMapper.xml
index 9aa68fd..735e927 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PltProductQualityInspectionItemsMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PltProductQualityInspectionItemsMapper.xml
@@ -13,20 +13,22 @@
<result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.BooleanTypeHandler"/>
<association property="proName" column="pro_id" javaType="java.lang.Long"
select="com.dy.pmsGlobal.daoPlt.PltProductMapper.selectProNameById" fetchType="eager" />
+ <association property="proType" column="pro_id" javaType="java.lang.Long"
+ select="com.dy.pmsGlobal.daoPlt.PltProductMapper.selectProTypeById" fetchType="eager" />
</resultMap>
<sql id="Base_Column_List">
id,pro_id,item,disabled,sort,
deleted
</sql>
- <sql id="part_Column_List">
- ${alias}.id,
- ${alias}.pro_id,
- ${alias}.item,
- ${alias}.sort,
- ${alias}.disabled,
- ${alias}.deleted
- </sql>
+<!-- <sql id="part_Column_List">-->
+<!-- ${alias}.id,-->
+<!-- ${alias}.pro_id,-->
+<!-- ${alias}.item,-->
+<!-- ${alias}.sort,-->
+<!-- ${alias}.disabled,-->
+<!-- ${alias}.deleted-->
+<!-- </sql>-->
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
@@ -39,7 +41,7 @@
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="proId != null">pro_id,</if>
- <if test="item != null">item,</if>
+ <if test="item != null and item !=''">item,</if>
<if test="sort != null">sort,</if>
<if test="disabled != null">disabled,</if>
<if test="deleted != null">deleted,</if>
@@ -47,7 +49,7 @@
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id,jdbcType=BIGINT},</if>
<if test="proId != null">#{proId,jdbcType=BIGINT},</if>
- <if test="item != null">#{item,jdbcType=VARCHAR},</if>
+ <if test="item != null and item !=''">#{item,jdbcType=VARCHAR},</if>
<if test="sort != null">#{sort,jdbcType=INTEGER},</if>
<if test="disabled != null">#{disabled,jdbcType=TINYINT},</if>
<if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
@@ -62,7 +64,7 @@
<if test="disabled != null">
disabled = #{disabled,jdbcType=BIGINT},
</if>
- <if test="item != null">
+ <if test="item != null and item !=''">
item = #{item,jdbcType=VARCHAR},
</if>
<if test="sort != null">
@@ -84,6 +86,10 @@
<if test="item != null and item != ''">
t.item like concat('%', #{item}, '%') and
</if>
+ <if test="disabled != null">
+ t.disabled != 1 and
+ <!--FIND_IN_SET(t.disabled, #{disabled}) and-->
+ </if>
</trim>
order by sort desc
<trim prefix="limit " >
@@ -104,6 +110,9 @@
<if test="item != null and item != ''">
t.item like concat('%', #{item}, '%') and
</if>
+ <if test="disabled != null">
+ t.disabled != 1 and
+ </if>
</trim>
</select>
--
Gitblit v1.8.0