From 55cb4daf506ad8f3c637f6e3d9bc7df41e538b2e Mon Sep 17 00:00:00 2001
From: liuxm <liuxm@fescotech.com>
Date: 星期二, 21 五月 2024 09:14:38 +0800
Subject: [PATCH] 产品和工站导出;不合格原因报废原因添加排序和与产品的关联;
---
pms-parent/pms-global/src/main/resources/mapper/PltProductScrappingReasonMapper.xml | 52 ++++++++++++++++++++++++++++------------------------
1 files changed, 28 insertions(+), 24 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/mapper/PltProductScrappingReasonMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PltProductScrappingReasonMapper.xml
index 8a0dbca..e8f1818 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PltProductScrappingReasonMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PltProductScrappingReasonMapper.xml
@@ -7,21 +7,29 @@
<resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoPlt.PltProductScrappingReason">
<id property="id" column="id" jdbcType="BIGINT"/>
<result property="reason" column="reason" jdbcType="VARCHAR"/>
+ <result property="proId" column="pro_id" jdbcType="BIGINT"/>
+ <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" />
</resultMap>
<sql id="Base_Column_List">
id,reason,disabled,
- deleted
+ deleted,pro_id,sort
</sql>
<sql id="part_Column_List">
${alias}.id,
${alias}.reason,
+ ${alias}.pro_id,
+ ${alias}.sort,
${alias}.deleted,
${alias}.disabled
</sql>
-
+ <select id="selectProNameById" parameterType="java.lang.Long" resultType="java.lang.String">
+ select name proName from plt_product where id=#{id}
+ </select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
@@ -33,24 +41,22 @@
delete from plt_product_scrapping_reason
where id = #{id,jdbcType=BIGINT}
</delete>
- <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductScrappingReason" useGeneratedKeys="true">
- insert into plt_product_scrapping_reason
- ( id,pro_id,reason
- ,deleted)
- values (#{id,jdbcType=BIGINT},#{proId,jdbcType=BIGINT},#{reason,jdbcType=VARCHAR}
- ,#{deleted,jdbcType=TINYINT})
- </insert>
+
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductScrappingReason" useGeneratedKeys="true">
insert into plt_product_scrapping_reason
<trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">id,</if>
- <if test="reason != null">reason,</if>
- <if test="deleted != null">deleted,</if>
+ <if test="id != null">id,</if>
+ <if test="reason != null">reason,</if>
+ <if test="proId != null">pro_id,</if>
+ <if test="sort != null">sort,</if>
+ <if test="deleted != null">deleted,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="id != null">#{id,jdbcType=BIGINT},</if>
- <if test="reason != null">#{reason,jdbcType=VARCHAR},</if>
- <if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
+ <if test="id != null">#{id,jdbcType=BIGINT},</if>
+ <if test="reason != null">#{reason,jdbcType=VARCHAR},</if>
+ <if test="proId != null">#{proId,jdbcType=VARCHAR},</if>
+ <if test="sort != null">#{sort,jdbcType=VARCHAR},</if>
+ <if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductScrappingReason">
@@ -58,6 +64,12 @@
<set>
<if test="reason != null">
reason = #{reason,jdbcType=VARCHAR},
+ </if>
+ <if test="proId != null">
+ pro_id = #{proId,jdbcType=VARCHAR},
+ </if>
+ <if test="sort != null">
+ sort = #{sort,jdbcType=VARCHAR},
</if>
<if test="disabled != null">
disabled = #{disabled,jdbcType=TINYINT},
@@ -68,14 +80,6 @@
</set>
where id = #{id,jdbcType=BIGINT}
</update>
-<!-- <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductScrappingReason">-->
-<!-- update plt_product_scrapping_reason-->
-<!-- set -->
-<!-- pro_id = #{proId,jdbcType=BIGINT},-->
-<!-- reason = #{reason,jdbcType=VARCHAR},-->
-<!-- deleted = #{deleted,jdbcType=TINYINT}-->
-<!-- where id = #{id,jdbcType=BIGINT} -->
-<!-- </update>-->
<select id="selectSome" resultMap="BaseResultMap">
select
@@ -89,7 +93,7 @@
t.reason like concat('%', #{reason}, '%') and
</if>
</trim>
- order by id desc
+ order by sort desc
<trim prefix="limit " >
<if test="start != null and count != null">
#{start}, #{count}
--
Gitblit v1.8.0