From 732b40515d87a1780a5986227513d507076ca5eb Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期二, 27 八月 2024 13:56:10 +0800
Subject: [PATCH] fix order search

---
 pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 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 93c87e8..305b859 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">
@@ -67,7 +67,7 @@
             <if test="endDate != null and endDate != ''">
                  delivery_date <![CDATA[ < ]]> #{endDate,jdbcType=VARCHAR} and
             </if>
-            <if test="status != null and status != ''">
+            <if test="status != null">
                  status = #{status,jdbcType=TINYINT} and
             </if>
         </trim>
@@ -102,12 +102,12 @@
             <if test="endDate != null and endDate != ''">
                  delivery_date <![CDATA[ < ]]> #{endDate,jdbcType=VARCHAR} and
             </if>
-            <if test="status != null and status != ''">
+            <if test="status != null">
                  status = #{status,jdbcType=TINYINT} and
             </if>
         </trim>
     </select>
-    <select id="selectAll" resultType="com.dy.pmsGlobal.pojoPr.PrOrder">
+    <select id="selectAll" resultMap="BaseResultMap2">
         select
         <include refid="Base_Column_List" />
         from pr_order p
@@ -131,7 +131,7 @@
             <if test="endDate != null and endDate != ''">
                  delivery_date <![CDATA[ < ]]> #{endDate,jdbcType=VARCHAR} and
             </if>
-            <if test="status != null and status != ''">
+            <if test="status != null">
                  status = #{status,jdbcType=TINYINT} and
             </if>
         </trim>
@@ -155,7 +155,7 @@
                 <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="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>
@@ -169,7 +169,7 @@
                 <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="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>
@@ -197,7 +197,7 @@
                 <if test="deliveryDate!= null and deliveryDate !=''">
                     delivery_date = #{deliveryDate,jdbcType=VARCHAR},
                 </if>
-                <if test="status != null and status !=''">
+                <if test="status != null">
                     status = #{status,jdbcType=TINYINT},
                 </if>
                 <if test="creator != null and creator !=''">

--
Gitblit v1.8.0