From 4d1a30da0ec4d37694baeb129a9a21aa29c157b7 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期四, 22 八月 2024 10:19:15 +0800
Subject: [PATCH] fix order complete Rate
---
pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml | 66 ++++++++++++++++----------------
1 files changed, 33 insertions(+), 33 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 38ea656..705cb10 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml
@@ -46,27 +46,27 @@
<include refid="Base_Column_List" />
from pr_order p
where p.deleted!=1
- <trim prefix="and " suffixOverrides="and">
+ <trim prefix="and" suffixOverrides="and">
<if test="name != null and name != ''">
- and name like concat('%', #{name}, '%')
+ name like concat('%', #{name}, '%') and
</if>
<if test="customerName != null and customerName != ''">
- and customer_name like concat('%', #{customerName}, '%')
+ customer_name like concat('%', #{customerName}, '%') and
</if>
<if test="projectName != null and projectName != ''">
- and project_name like concat('%', #{projectName}, '%')
+ project_name like concat('%', #{projectName}, '%') and
</if>
<if test="director != null and director != ''">
- and director like concat('%', #{director}, '%')
+ director like concat('%', #{director}, '%') and
</if>
- <if test="startDate != null">
- and delivery_date <![CDATA[ > ]]> #{startDate,jdbcType=VARCHAR}
+ <if test="startDate != null and startDate != ''">
+ delivery_date <![CDATA[ > ]]> #{startDate,jdbcType=VARCHAR} and
</if>
- <if test="endDate != null">
- and delivery_date <![CDATA[ < ]]> #{endDate,jdbcType=VARCHAR}
+ <if test="endDate != null and endDate != ''">
+ delivery_date <![CDATA[ < ]]> #{endDate,jdbcType=VARCHAR} and
</if>
- <if test="status != null">
- and status = #{status,jdbcType=TINYINT}
+ <if test="status != null and status != ''">
+ status = #{status,jdbcType=TINYINT} and
</if>
</trim>
order by id desc
@@ -81,27 +81,27 @@
select count(1)
from pr_order p
where p.deleted!=1
- <trim prefix="and " suffixOverrides="and">
+ <trim prefix="and" suffixOverrides="and">
<if test="name != null and name != ''">
- and name like concat('%', #{name}, '%')
+ name like concat('%', #{name}, '%') and
</if>
<if test="customerName != null and customerName != ''">
- and customer_name like concat('%', #{customerName}, '%')
+ customer_name like concat('%', #{customerName}, '%') and
</if>
<if test="projectName != null and projectName != ''">
- and project_name like concat('%', #{projectName}, '%')
+ project_name like concat('%', #{projectName}, '%') and
</if>
<if test="director != null and director != ''">
- and director like concat('%', #{director}, '%')
+ director like concat('%', #{director}, '%') and
</if>
- <if test="startDate != null">
- and delivery_date <![CDATA[ > ]]> #{startDate,jdbcType=VARCHAR}
+ <if test="startDate != null and startDate != ''">
+ delivery_date <![CDATA[ > ]]> #{startDate,jdbcType=VARCHAR} and
</if>
- <if test="endDate != null">
- and delivery_date <![CDATA[ < ]]> #{endDate,jdbcType=VARCHAR}
+ <if test="endDate != null and endDate != ''">
+ delivery_date <![CDATA[ < ]]> #{endDate,jdbcType=VARCHAR} and
</if>
- <if test="status != null">
- and status = #{status,jdbcType=TINYINT}
+ <if test="status != null and status != ''">
+ status = #{status,jdbcType=TINYINT} and
</if>
</trim>
</select>
@@ -110,27 +110,27 @@
<include refid="Base_Column_List" />
from pr_order p
where p.deleted!=1
- <trim prefix="and " suffixOverrides="and">
+ <trim prefix="and" suffixOverrides="and">
<if test="name != null and name != ''">
- and name like concat('%', #{name}, '%')
+ name like concat('%', #{name}, '%') and
</if>
<if test="customerName != null and customerName != ''">
- and customer_name like concat('%', #{customerName}, '%')
+ customer_name like concat('%', #{customerName}, '%') and
</if>
<if test="projectName != null and projectName != ''">
- and project_name like concat('%', #{projectName}, '%')
+ project_name like concat('%', #{projectName}, '%') and
</if>
<if test="director != null and director != ''">
- and director like concat('%', #{director}, '%')
+ director like concat('%', #{director}, '%') and
</if>
- <if test="startDate != null">
- and delivery_date <![CDATA[ > ]]> #{startDate,jdbcType=VARCHAR}
+ <if test="startDate != null and startDate != ''">
+ delivery_date <![CDATA[ > ]]> #{startDate,jdbcType=VARCHAR} and
</if>
- <if test="endDate != null">
- and delivery_date <![CDATA[ < ]]> #{endDate,jdbcType=VARCHAR}
+ <if test="endDate != null and endDate != ''">
+ delivery_date <![CDATA[ < ]]> #{endDate,jdbcType=VARCHAR} and
</if>
- <if test="status != null">
- and status = #{status,jdbcType=TINYINT}
+ <if test="status != null and status != ''">
+ status = #{status,jdbcType=TINYINT} and
</if>
</trim>
order by id desc
--
Gitblit v1.8.0