From 41e833e928e235afe2023398b1d5e8d35c47ded5 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期四, 29 八月 2024 10:37:41 +0800
Subject: [PATCH] privilege
---
pms-parent/pms-global/src/main/resources/mapper/PltProductQualityInspectionItemsMapper.xml | 59 +++++++++++++++++++++++++++++++++++------------------------
1 files changed, 35 insertions(+), 24 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 e41e338..1293f66 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PltProductQualityInspectionItemsMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PltProductQualityInspectionItemsMapper.xml
@@ -8,26 +8,25 @@
<id property="id" column="id" jdbcType="BIGINT"/>
<result property="proId" column="pro_id" jdbcType="BIGINT"/>
<result property="item" column="item" jdbcType="VARCHAR"/>
+ <result property="sort" column="sort" jdbcType="INTEGER"/>
<result column="disabled" property="disabled" typeHandler="com.dy.common.mybatis.BooleanTypeHandler"/>
<result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.BooleanTypeHandler"/>
<association property="proName" column="pro_id" javaType="java.lang.Long"
- select="selectProNameById" fetchType="eager" />
+ select="com.dy.pmsGlobal.daoPlt.PltProductMapper.selectProNameById" fetchType="eager" />
</resultMap>
<sql id="Base_Column_List">
- id,pro_id,item,disabled,
+ id,pro_id,item,disabled,sort,
deleted
</sql>
- <sql id="part_Column_List">
- ${alias}.id,
- ${alias}.pro_id,
- ${alias}.item,
- ${alias}.disabled,
- ${alias}.deleted
- </sql>
- <select id="selectProNameById" parameterType="java.lang.Long" resultType="java.lang.String">
- select name proName from plt_product where id=#{id}
- </select>
+<!-- <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" />
@@ -38,18 +37,20 @@
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductQualityInspectionItems" useGeneratedKeys="true">
insert into plt_product_quality_inspection_items
<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="disabled != null">disabled,</if>
- <if test="deleted != null">deleted,</if>
+ <if test="id != null">id,</if>
+ <if test="proId != null">pro_id,</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>
</trim>
<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="disabled != null">#{disabled,jdbcType=TINYINT},</if>
- <if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
+ <if test="id != null">#{id,jdbcType=BIGINT},</if>
+ <if test="proId != null">#{proId,jdbcType=BIGINT},</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>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductQualityInspectionItems">
@@ -61,8 +62,11 @@
<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">
+ sort = #{sort,jdbcType=INTEGER},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
@@ -80,8 +84,12 @@
<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 id desc
+ order by sort desc
<trim prefix="limit " >
<if test="start != null and count != null">
#{start}, #{count}
@@ -100,6 +108,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