From 939d5f3d5e17e5ca0bfeec9c23c7c926b4cb1684 Mon Sep 17 00:00:00 2001 From: Fancy <Fancy.fx@outlook.com> Date: 星期二, 10 九月 2024 15:47:33 +0800 Subject: [PATCH] plan rate --- pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) diff --git a/pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml index 305b859..850cd9b 100644 --- a/pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml +++ b/pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml @@ -21,6 +21,9 @@ <resultMap id="BaseResultMap2" type="com.dy.pmsGlobal.pojoPr.PrOrder" extends="BaseResultMap"> <collection property="items" ofType="com.dy.pmsGlobal.pojoPr.PrOrderItem" fetchType="eager" select="com.dy.pmsGlobal.daoPr.PrOrderItemMapper.selectItems" column="id" /> </resultMap> + <resultMap id="BaseResultMap3" type="com.dy.pmsGlobal.pojoPr.PrOrder" extends="BaseResultMap"> + <collection property="items" ofType="com.dy.pmsGlobal.pojoPr.PrOrderItem" fetchType="eager" select="com.dy.pmsGlobal.daoPr.PrOrderItemMapper.selectDistinctPro" column="id" /> + </resultMap> <sql id="Base_Column_List"> id,`name`,customer_name,project_name, director,d_mobile,delivery_date, @@ -38,7 +41,7 @@ </select> <select id="exists" resultType="java.lang.Boolean"> select count(1) from pr_order where name = #{name} - <if test="id != null and id !=''"> + <if test="id != null"> and id != #{id} </if> </select> @@ -107,7 +110,8 @@ </if> </trim> </select> - <select id="selectAll" resultMap="BaseResultMap2"> + <!--涓嬫媺鑿滃崟璁㈠崟--> + <select id="selectAll" resultType="com.dy.pmsGlobal.pojoPr.PrOrder"> select <include refid="Base_Column_List" /> from pr_order p @@ -148,7 +152,7 @@ <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPr.PrOrder" useGeneratedKeys="true"> insert into pr_order <trim prefix="(" suffix=")" suffixOverrides=","> - <if test="id != null and id !=''">id,</if> + <if test="id != null">id,</if> <if test="name != null and name !=''">name,</if> <if test="customerName!= null and customerName !=''">customer_name,</if> <if test="projectName!= null and projectName !=''">project_name,</if> @@ -157,12 +161,12 @@ <if test="deliveryDate!= null and deliveryDate !=''">delivery_date,</if> <if test="status != null">status,</if> <if test="creator != null and creator !=''">creator,</if> - <if test="dt != null and dt !=''">dt,</if> - <if test="deleted != null and deleted !=''">deleted,</if> + <if test="dt != null">dt,</if> + <if test="deleted != null">deleted,</if> <if test="remark != null and remark !=''">remark,</if> </trim> <trim prefix="values (" suffix=")" suffixOverrides=","> - <if test="id != null and id !=''">#{id,jdbcType=BIGINT},</if> + <if test="id != null">#{id,jdbcType=BIGINT},</if> <if test="name != null and name !=''">#{name,jdbcType=VARCHAR},</if> <if test="customerName!= null and customerName !=''">#{customerName,jdbcType=VARCHAR},</if> <if test="projectName!= null and projectName !=''">#{projectName,jdbcType=VARCHAR},</if> @@ -171,8 +175,8 @@ <if test="deliveryDate!= null and deliveryDate !=''">#{deliveryDate,jdbcType=VARCHAR},</if> <if test="status != null">#{status,jdbcType=TINYINT},</if> <if test="creator != null and creator !=''">#{creator,jdbcType=VARCHAR},</if> - <if test="dt != null and dt !=''">#{dt,jdbcType=TIMESTAMP},</if> - <if test="deleted != null and deleted !=''">#{deleted,jdbcType=TINYINT},</if> + <if test="dt != null">#{dt,jdbcType=TIMESTAMP},</if> + <if test="deleted != null">#{deleted,jdbcType=TINYINT},</if> <if test="remark != null and remark !=''">#{remark,jdbcType=VARCHAR},</if> </trim> </insert> @@ -203,10 +207,10 @@ <if test="creator != null and creator !=''"> creator = #{creator,jdbcType=VARCHAR}, </if> - <if test="dt != null and dt !=''"> + <if test="dt != null"> dt = #{dt,jdbcType=TIMESTAMP}, </if> - <if test="deleted != null and deleted !=''"> + <if test="deleted != null"> deleted = #{deleted,jdbcType=TINYINT}, </if> <if test="remark != null and remark !=''"> -- Gitblit v1.8.0