From 890c3742d88da0fcb0a63c49d768c5d7182089a4 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com>
Date: 星期二, 10 九月 2024 15:46:22 +0800
Subject: [PATCH] 质检查询优化 状态
---
src/main/java/com/mzl/flower/dto/request/payment/DeliveryOrderInfoSpQueryDTO.java | 4 ++++
src/main/java/com/mzl/flower/dto/request/payment/DeliveryOrderStationQueryDTO.java | 4 ++++
src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java | 2 ++
src/main/resources/mapper/payment/DeliveryOrderMapper.xml | 16 ++++++++++++----
4 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/request/payment/DeliveryOrderInfoSpQueryDTO.java b/src/main/java/com/mzl/flower/dto/request/payment/DeliveryOrderInfoSpQueryDTO.java
index 0ec361d..aeee9a5 100644
--- a/src/main/java/com/mzl/flower/dto/request/payment/DeliveryOrderInfoSpQueryDTO.java
+++ b/src/main/java/com/mzl/flower/dto/request/payment/DeliveryOrderInfoSpQueryDTO.java
@@ -4,6 +4,7 @@
import lombok.Data;
import java.time.LocalDateTime;
+import java.util.List;
@Data
public class DeliveryOrderInfoSpQueryDTO {
@@ -36,4 +37,7 @@
@ApiModelProperty(hidden = true)
private LocalDateTime endDate;
+
+ @ApiModelProperty(hidden = true)
+ private List<String> statusList;
}
diff --git a/src/main/java/com/mzl/flower/dto/request/payment/DeliveryOrderStationQueryDTO.java b/src/main/java/com/mzl/flower/dto/request/payment/DeliveryOrderStationQueryDTO.java
index 842e30f..19217da 100644
--- a/src/main/java/com/mzl/flower/dto/request/payment/DeliveryOrderStationQueryDTO.java
+++ b/src/main/java/com/mzl/flower/dto/request/payment/DeliveryOrderStationQueryDTO.java
@@ -4,6 +4,7 @@
import lombok.Data;
import java.time.LocalDateTime;
+import java.util.List;
@Data
public class DeliveryOrderStationQueryDTO {
@@ -42,4 +43,7 @@
@ApiModelProperty(hidden = true)
private LocalDateTime endDate;
+
+ @ApiModelProperty(hidden = true)
+ private List<String> statusList;
}
diff --git a/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java b/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java
index ecac9e4..92f7400 100644
--- a/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java
+++ b/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java
@@ -463,6 +463,7 @@
//////////////////////////////////////////////////////////////新接口
public Page<DeliveryOrderList4CheckDTO> selectSupplierDoList4Check(Page page, DeliveryOrderStationQueryDTO dto) {
+ dto.setStatusList(splitParam(dto.getStatus()));
List<DeliveryOrderList4CheckDTO> ls = deliveryOrderMapper.selectSupplierDoList4Check(page, dto);
page.setRecords(ls);
@@ -473,6 +474,7 @@
if(dto.getSupplierId() == null){
throw new ValidationException("供应商id不能为空");
}
+ dto.setStatusList(splitParam(dto.getStatus()));
List<DeliveryOrder4CheckDTO> ls = deliveryOrderMapper.selectSupplierDoInfo4Check(page, dto);
if(ls != null && ls.size() > 0){
diff --git a/src/main/resources/mapper/payment/DeliveryOrderMapper.xml b/src/main/resources/mapper/payment/DeliveryOrderMapper.xml
index 93e2eaf..34f3909 100644
--- a/src/main/resources/mapper/payment/DeliveryOrderMapper.xml
+++ b/src/main/resources/mapper/payment/DeliveryOrderMapper.xml
@@ -101,8 +101,12 @@
<if test="condition.orderNo != null and condition.orderNo != ''">
AND q.order_no LIKE concat('%', #{condition.orderNo},'%')
</if>
- <if test="condition.status != null and condition.status != ''">
- AND q.status = #{condition.status}
+
+ <if test="condition.statusList != null and condition.statusList.size > 0">
+ AND q.status in
+ <foreach collection="condition.statusList" item="status" open="(" separator="," close=")">
+ #{status}
+ </foreach>
</if>
<if test="condition.supplierId != null">
@@ -151,8 +155,12 @@
<if test="condition.orderNo != null and condition.orderNo != ''">
AND q.order_no LIKE concat('%', #{condition.orderNo},'%')
</if>
- <if test="condition.status != null and condition.status != ''">
- AND q.status = #{condition.status}
+
+ <if test="condition.statusList != null and condition.statusList.size > 0">
+ AND q.status in
+ <foreach collection="condition.statusList" item="status" open="(" separator="," close=")">
+ #{status}
+ </foreach>
</if>
<if test="condition.warehouseId != null">
--
Gitblit v1.9.3