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 | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 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 771f6fa..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,16 +48,16 @@
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="startDate != null">
and delivery_date <![CDATA[ > ]]> #{startDate,jdbcType=VARCHAR}
@@ -66,7 +66,7 @@
and delivery_date <![CDATA[ < ]]> #{endDate,jdbcType=VARCHAR}
</if>
<if test="status != null">
- status = #{status,jdbcType=TINYINT} and
+ and status = #{status,jdbcType=TINYINT}
</if>
</trim>
order by id desc
@@ -83,16 +83,16 @@
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="startDate != null">
and delivery_date <![CDATA[ > ]]> #{startDate,jdbcType=VARCHAR}
@@ -101,7 +101,7 @@
and delivery_date <![CDATA[ < ]]> #{endDate,jdbcType=VARCHAR}
</if>
<if test="status != null">
- status = #{status,jdbcType=TINYINT} and
+ and status = #{status,jdbcType=TINYINT}
</if>
</trim>
</select>
@@ -112,16 +112,16 @@
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="startDate != null">
and delivery_date <![CDATA[ > ]]> #{startDate,jdbcType=VARCHAR}
@@ -130,7 +130,7 @@
and delivery_date <![CDATA[ < ]]> #{endDate,jdbcType=VARCHAR}
</if>
<if test="status != null">
- status = #{status,jdbcType=TINYINT} and
+ and status = #{status,jdbcType=TINYINT}
</if>
</trim>
order by id desc
--
Gitblit v1.8.0