From 10214dc063e8aa045a120fa57746702eb743605f Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期三, 21 八月 2024 14:59:42 +0800
Subject: [PATCH] order xml fix

---
 pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml |   58 +++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 33 insertions(+), 25 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 1736600..6fca7d9 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml
@@ -48,22 +48,25 @@
         where p.deleted!=1
         <trim prefix="and " suffixOverrides="and">
             <if test="name != null and name != ''">
-                name like concat('%', #{name}, '%') and
+                and  name like concat('%', #{name}, '%')
             </if>
             <if test="customerName != null and customerName != ''">
-                customer_name like concat('%', #{customerName}, '%') and
+                and customer_name like concat('%', #{customerName}, '%')
             </if>
             <if test="projectName != null and projectName != ''">
-                project_name like concat('%', #{projectName}, '%') and
+                and project_name like concat('%', #{projectName}, '%')
             </if>
             <if test="director != null and director != ''">
-                director like concat('%', #{director}, '%') and
+                and director like concat('%', #{director}, '%')
             </if>
-            <if test="startTime != null">
-                and out_time <![CDATA[ > ]]> #{startTime,jdbcType=TIMESTAMP}
+            <if test="startDate != null">
+                and delivery_date <![CDATA[ > ]]> #{startDate,jdbcType=VARCHAR}
             </if>
-            <if test="endTime != null">
-                and out_time <![CDATA[ < ]]> #{endTime,jdbcType=TIMESTAMP}
+            <if test="endDate != null">
+                and delivery_date <![CDATA[ < ]]> #{endDate,jdbcType=VARCHAR}
+            </if>
+            <if test="status != null">
+                and status = #{status,jdbcType=TINYINT}
             </if>
         </trim>
         order by id desc
@@ -80,22 +83,25 @@
         where p.deleted!=1
         <trim prefix="and " suffixOverrides="and">
             <if test="name != null and name != ''">
-                name like concat('%', #{name}, '%') and
+                and  name like concat('%', #{name}, '%')
             </if>
             <if test="customerName != null and customerName != ''">
-                customer_name like concat('%', #{customerName}, '%') and
+                and customer_name like concat('%', #{customerName}, '%')
             </if>
             <if test="projectName != null and projectName != ''">
-                project_name like concat('%', #{projectName}, '%') and
+                and project_name like concat('%', #{projectName}, '%')
             </if>
             <if test="director != null and director != ''">
-                director like concat('%', #{director}, '%') and
+                and director like concat('%', #{director}, '%')
             </if>
-            <if test="startTime != null">
-                and out_time <![CDATA[ > ]]> #{startTime,jdbcType=TIMESTAMP}
+            <if test="startDate != null">
+                and delivery_date <![CDATA[ > ]]> #{startDate,jdbcType=VARCHAR}
             </if>
-            <if test="endTime != null">
-                and out_time <![CDATA[ < ]]> #{endTime,jdbcType=TIMESTAMP}
+            <if test="endDate != null">
+                and delivery_date <![CDATA[ < ]]> #{endDate,jdbcType=VARCHAR}
+            </if>
+            <if test="status != null">
+                and status = #{status,jdbcType=TINYINT}
             </if>
         </trim>
     </select>
@@ -106,27 +112,29 @@
         where p.deleted!=1
         <trim prefix="and " suffixOverrides="and">
             <if test="name != null and name != ''">
-                name like concat('%', #{name}, '%') and
+                and name like concat('%', #{name}, '%')
             </if>
             <if test="customerName != null and customerName != ''">
-                customer_name like concat('%', #{customerName}, '%') and
+                and customer_name like concat('%', #{customerName}, '%')
             </if>
             <if test="projectName != null and projectName != ''">
-                project_name like concat('%', #{projectName}, '%') and
+                and project_name like concat('%', #{projectName}, '%')
             </if>
             <if test="director != null and director != ''">
-                director like concat('%', #{director}, '%') and
+                and director like concat('%', #{director}, '%')
             </if>
-            <if test="startTime != null">
-                and out_time <![CDATA[ > ]]> #{startTime,jdbcType=TIMESTAMP}
+            <if test="startDate != null">
+                and delivery_date <![CDATA[ > ]]> #{startDate,jdbcType=VARCHAR}
             </if>
-            <if test="endTime != null">
-                and out_time <![CDATA[ < ]]> #{endTime,jdbcType=TIMESTAMP}
+            <if test="endDate != null">
+                and delivery_date <![CDATA[ < ]]> #{endDate,jdbcType=VARCHAR}
+            </if>
+            <if test="status != null">
+                and status = #{status,jdbcType=TINYINT}
             </if>
         </trim>
         order by id desc
     </select>
-
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
         delete from pr_order
         where  id = #{id,jdbcType=BIGINT} 

--
Gitblit v1.8.0