From 40ce2548e631d4971e3fdf9f9c692857312c0b16 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期三, 21 八月 2024 10:46:25 +0800
Subject: [PATCH] add order_id in assembly
---
pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 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..5b96976 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml
@@ -59,11 +59,14 @@
<if test="director != null and director != ''">
director like concat('%', #{director}, '%') and
</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">
+ status = #{status,jdbcType=TINYINT} and
</if>
</trim>
order by id desc
@@ -91,11 +94,14 @@
<if test="director != null and director != ''">
director like concat('%', #{director}, '%') and
</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">
+ status = #{status,jdbcType=TINYINT} and
</if>
</trim>
</select>
@@ -117,11 +123,14 @@
<if test="director != null and director != ''">
director like concat('%', #{director}, '%') and
</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">
+ status = #{status,jdbcType=TINYINT} and
</if>
</trim>
order by id desc
--
Gitblit v1.8.0