From 77c19fdea69cb4589f1b6b49d028608b16de3a2e Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期三, 21 八月 2024 10:29:20 +0800
Subject: [PATCH] fix order manage
---
pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/order/QueryVo.java | 7 +++++--
pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml | 33 +++++++++++++++++++++------------
2 files changed, 26 insertions(+), 14 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
diff --git a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/order/QueryVo.java b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/order/QueryVo.java
index 4a775dc..77e203b 100644
--- a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/order/QueryVo.java
+++ b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/order/QueryVo.java
@@ -11,7 +11,10 @@
@Builder
public class QueryVo extends QueryConditionVo {
public String name;
+ public String customerName;
+ public String projectName;
public String director;
- public String dMobile;
- public String type;
+ public String startDate;
+ public String endDate;
+ public Integer status;
}
--
Gitblit v1.8.0