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/PltProductMapper.xml | 147 ++++++++++++++++++++++++++-----------------------
1 files changed, 78 insertions(+), 69 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/mapper/PltProductMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PltProductMapper.xml
index 0714a04..5c5f0f6 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PltProductMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PltProductMapper.xml
@@ -5,6 +5,7 @@
<!--@mbg.generated-->
<!--@Table plt_product-->
<id column="id" jdbcType="BIGINT" property="id" />
+ <result column="code" jdbcType="VARCHAR" property="code" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="type" jdbcType="VARCHAR" property="type" />
<result column="image" jdbcType="BIGINT" property="image" />
@@ -13,15 +14,20 @@
<result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.BooleanTypeHandler"/>
<result column="dt" jdbcType="TIMESTAMP" property="dt" />
<result column="remark" jdbcType="VARCHAR" property="remark" />
+ </resultMap>
+
+ <resultMap id="BaseResultMap2" type="com.dy.pmsGlobal.pojoPlt.PltProduct" extends="BaseResultMap">
<collection property="params" ofType="com.dy.pmsGlobal.pojoPlt.PltProductParams" fetchType="eager" select="selectParams" column="id" />
<collection property="processDocuments" ofType="com.dy.pmsGlobal.pojoPlt.PltProductFile" fetchType="eager" select="selectDocuments" column="id"/>
<collection property="userManual" ofType="com.dy.pmsGlobal.pojoPlt.PltProductFile" fetchType="eager" select="selectUserManual" column="id" />
<collection property="materials" ofType="com.dy.pmsGlobal.pojoPlt.PltProductFile" fetchType="eager" select="selectMaterials" column="id"/>
</resultMap>
-
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, `name`, `type`, image, director, d_mobile,deleted, dt, remark
+ id, code,`name`, `type`, image, director, d_mobile,deleted, dt, remark
+ </sql>
+ <sql id="Join_Column_List">
+ ${alias}.id,${alias}.code, ${alias}.`name`, ${alias}.`type`, ${alias}.image, ${alias}.director, ${alias}.d_mobile,${alias}.deleted, ${alias}.dt, ${alias}.remark
</sql>
<select id="selectParams" resultMap="com.dy.pmsGlobal.daoPlt.PltProParamsMapper.BaseResultMap">
select *
@@ -44,7 +50,7 @@
where pro_id = #{proId,jdbcType=BIGINT} and file_type = '03'
</select>
- <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+ <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap2">
<!--@mbg.generated-->
select
<include refid="Base_Column_List" />
@@ -52,63 +58,72 @@
where id = #{id,jdbcType=BIGINT}
</select>
- <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPlt.PltProduct" useGeneratedKeys="true">
- <!--@mbg.generated-->
- insert into plt_product (`name`, `type`, image,
- director, d_mobile,deleted, dt,
- remark)
- values (#{name,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, #{image,jdbcType=BIGINT},
- #{director,jdbcType=BIGINT}, #{dMobile,jdbcType=VARCHAR},#{deleted,jdbcType=TINYINT}, #{dt,jdbcType=TIMESTAMP},
- #{remark,jdbcType=VARCHAR})
- </insert>
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPlt.PltProduct" useGeneratedKeys="true">
<!--@mbg.generated-->
insert into plt_product
<trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="name != null">
- `name`,
- </if>
- <if test="type != null">
- `type`,
- </if>
- <if test="image != null">
- image,
- </if>
- <if test="director != null">
- director,
- </if>
- <if test="dMobile != null">
- d_mobile,
- </if>
- <if test="dt != null">
- dt,
- </if>
- <if test="remark != null">
- remark,
- </if>
+ <if test="id != null">
+ id,
+ </if>
+ <if test="code != null">
+ `code`,
+ </if>
+ <if test="name != null">
+ `name`,
+ </if>
+ <if test="type != null">
+ `type`,
+ </if>
+ <if test="image != null">
+ image,
+ </if>
+ <if test="director != null">
+ director,
+ </if>
+ <if test="dMobile != null">
+ d_mobile,
+ </if>
+ <if test="deleted != null">
+ deleted,
+ </if>
+ <if test="dt != null">
+ dt,
+ </if>
+ <if test="remark != null">
+ remark,
+ </if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="name != null">
- #{name,jdbcType=VARCHAR},
- </if>
- <if test="type != null">
- #{type,jdbcType=VARCHAR},
- </if>
- <if test="image != null">
- #{image,jdbcType=BIGINT},
- </if>
- <if test="director != null">
- #{director,jdbcType=BIGINT},
- </if>
- <if test="dMobile != null">
- #{dMobile,jdbcType=VARCHAR},
- </if>
- <if test="dt != null">
- #{dt,jdbcType=TIMESTAMP},
- </if>
- <if test="remark != null">
- #{remark,jdbcType=VARCHAR},
- </if>
+ <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="type != null">
+ #{type,jdbcType=VARCHAR},
+ </if>
+ <if test="image != null">
+ #{image,jdbcType=BIGINT},
+ </if>
+ <if test="director != null">
+ #{director,jdbcType=BIGINT},
+ </if>
+ <if test="dMobile != null">
+ #{dMobile,jdbcType=VARCHAR},
+ </if>
+ <if test="deleted != null">
+ #{deleted,jdbcType=VARCHAR },
+ </if>
+ <if test="dt != null">
+ #{dt,jdbcType=TIMESTAMP},
+ </if>
+ <if test="remark != null">
+ #{remark,jdbcType=VARCHAR},
+ </if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPlt.PltProduct">
@@ -139,27 +154,13 @@
</set>
where id = #{id,jdbcType=BIGINT}
</update>
- <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoPlt.PltProduct">
- <!--@mbg.generated-->
- update plt_product
- set `name` = #{name,jdbcType=VARCHAR},
- `type` = #{type,jdbcType=VARCHAR},
- image = #{image,jdbcType=BIGINT},
- director = #{director,jdbcType=BIGINT},
- d_mobile = #{dMobile,jdbcType=VARCHAR},
- dt = #{dt,jdbcType=TIMESTAMP},
- remark = #{remark,jdbcType=VARCHAR}
- where id = #{id,jdbcType=BIGINT}
- </update>
<update id="deleteLogicById" parameterType="java.lang.Long">
update plt_product set deleted = 1
where id = #{id}
</update>
- <sql id="Join_Column_List">
- ${alias}.id, ${alias}.`name`, ${alias}.`type`, ${alias}.image, ${alias}.director, ${alias}.d_mobile,${alias}.deleted, ${alias}.dt, ${alias}.remark
- </sql>
+
<select id="selectSome" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
@@ -193,7 +194,15 @@
<include refid="Base_Column_List" />
from plt_product p
where p.deleted!=1
+ <trim prefix="and " suffixOverrides="and">
+ <if test="type != null and type != ''">
+ p.type = #{type,jdbcType=VARCHAR} and
+ </if>
+ </trim>
order by id desc
</select>
+ <select id="selectMaxCode" resultType="java.lang.String">
+ select max(code) from plt_product
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0