From d82642e04f2dd9f2dc04dd7196a1e83fcfc95913 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期二, 27 八月 2024 11:31:40 +0800
Subject: [PATCH] order status

---
 pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml |   72 ++++++++++++++++++------------------
 1 files changed, 36 insertions(+), 36 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 6bfacd5..1bbba23 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml
@@ -15,7 +15,7 @@
             <result property="status" column="status" jdbcType="TINYINT"/>
             <result property="creator" column="creator" jdbcType="VARCHAR"/>
             <result property="dt" column="dt" jdbcType="TIMESTAMP"/>
-            <result property="deleted" column="deleted" jdbcType="TINYINT"/>
+            <result column="deleted" property="deleted" typeHandler="com.dy.common.mybatis.BooleanTypeHandler" />
             <result property="remark" column="remark" jdbcType="VARCHAR"/>
     </resultMap>
     <resultMap id="BaseResultMap2" type="com.dy.pmsGlobal.pojoPr.PrOrder" extends="BaseResultMap">
@@ -38,7 +38,7 @@
     </select>
     <select id="exists" resultType="java.lang.Boolean">
         select count(1) from pr_order where name = #{name}
-        <if test="id != null">
+        <if test="id != null and id !=''">
             and id != #{id}
         </if>
     </select>
@@ -148,68 +148,68 @@
     <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">id,</if>
-                <if test="name != null">name,</if>
-                <if test="customerName != null">customer_name,</if>
-                <if test="projectName != null">project_name,</if>
-                <if test="director != null">director,</if>
-                <if test="dMobile != null">d_mobile,</if>
-                <if test="deliveryDate != null">delivery_date,</if>
-                <if test="status != null">status,</if>
-                <if test="creator != null">creator,</if>
-                <if test="dt != null">dt,</if>
-                <if test="deleted != null">deleted,</if>
-                <if test="remark != null">remark,</if>
+                <if test="id != null and id !=''">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>
+                <if test="director != null and director !=''">director,</if>
+                <if test="dMobile != null and dMobile !=''">d_mobile,</if>
+                <if test="deliveryDate!= null and deliveryDate !=''">delivery_date,</if>
+                <if test="status != null and status !=''">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="remark != null and remark !=''">remark,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-                <if test="id != null">#{id,jdbcType=BIGINT},</if>
-                <if test="name != null">#{name,jdbcType=VARCHAR},</if>
-                <if test="customerName != null">#{customerName,jdbcType=VARCHAR},</if>
-                <if test="projectName != null">#{projectName,jdbcType=VARCHAR},</if>
-                <if test="director != null">#{director,jdbcType=VARCHAR},</if>
-                <if test="dMobile != null">#{dMobile,jdbcType=VARCHAR},</if>
-                <if test="deliveryDate != null">#{deliveryDate,jdbcType=VARCHAR},</if>
-                <if test="status != null">#{status,jdbcType=TINYINT},</if>
-                <if test="creator != null">#{creator,jdbcType=VARCHAR},</if>
-                <if test="dt != null">#{dt,jdbcType=TIMESTAMP},</if>
-                <if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
-                <if test="remark != null">#{remark,jdbcType=VARCHAR},</if>
+                <if test="id != null and id !=''">#{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>
+                <if test="director != null and director !=''">#{director,jdbcType=VARCHAR},</if>
+                <if test="dMobile != null and dMobile !=''">#{dMobile,jdbcType=VARCHAR},</if>
+                <if test="deliveryDate!= null and deliveryDate !=''">#{deliveryDate,jdbcType=VARCHAR},</if>
+                <if test="status != null and status !=''">#{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="remark != null and remark !=''">#{remark,jdbcType=VARCHAR},</if>
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPr.PrOrder">
         update pr_order
         <set>
-                <if test="name != null">
+                <if test="name != null and name !=''">
                     name = #{name,jdbcType=VARCHAR},
                 </if>
-                <if test="customerName != null">
+                <if test="customerName!= null and customerName !=''">
                     customer_name = #{customerName,jdbcType=VARCHAR},
                 </if>
-                <if test="projectName != null">
+                <if test="projectName!= null and projectName !=''">
                     project_name = #{projectName,jdbcType=VARCHAR},
                 </if>
-                <if test="director != null">
+                <if test="director != null and director !=''">
                     director = #{director,jdbcType=VARCHAR},
                 </if>
-                <if test="dMobile != null">
+                <if test="dMobile != null and dMobile !=''">
                     d_mobile = #{dMobile,jdbcType=VARCHAR},
                 </if>
-                <if test="deliveryDate != null">
+                <if test="deliveryDate!= null and deliveryDate !=''">
                     delivery_date = #{deliveryDate,jdbcType=VARCHAR},
                 </if>
                 <if test="status != null">
                     status = #{status,jdbcType=TINYINT},
                 </if>
-                <if test="creator != null">
+                <if test="creator != null and creator !=''">
                     creator = #{creator,jdbcType=VARCHAR},
                 </if>
-                <if test="dt != null">
+                <if test="dt != null and dt !=''">
                     dt = #{dt,jdbcType=TIMESTAMP},
                 </if>
-                <if test="deleted != null">
+                <if test="deleted != null and deleted !=''">
                     deleted = #{deleted,jdbcType=TINYINT},
                 </if>
-                <if test="remark != null">
+                <if test="remark != null and remark !=''">
                     remark = #{remark,jdbcType=VARCHAR},
                 </if>
         </set>

--
Gitblit v1.8.0