异常状态、审核状态多选

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dto/OrderQueryDTO.java

@@ -4,13 +4,11 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
@@ -107,7 +105,7 @@ public class OrderQueryDTO {
     private Integer status;
 
     @ApiModelProperty(value = "订单异常状态(字典 order_abnormal_state)")
-    private Integer abnormalState;
+    private List<Integer> abnormalState;
 
     @ApiModelProperty(value = "订单入仓状态(字典 order_warehouse_in_status)")
     private Integer inWarehouseState;
@@ -493,7 +491,7 @@ public class OrderQueryDTO {
     private Boolean isNeat;
 
     @ApiModelProperty(value = "审核类型(字典 order_approval_type) 0 为正常")
-    private Integer auditType;
+    private List<Integer> auditType;
 
     @ApiModelProperty(value = "审核结果")
     private String auditResult;
@@ -549,8 +547,22 @@ public class OrderQueryDTO {
                 this.status = 5;
                 this.transportId = 3; // 空运待出查询，只查空运的订单
                 this.airShipment = 1;
-                this.auditType = 0;
-                this.abnormalState = 0;
+                //this.auditType = 0;
+                if(CollectionUtils.isEmpty(auditType)){
+                    this.auditType= new ArrayList<>();
+                    this.auditType.add(0);
+                }else {
+                    this.auditType.add(0);
+                }
+
+                //this.abnormalState = 0;
+                if(CollectionUtils.isEmpty(abnormalState)){
+                    this.abnormalState = new ArrayList<>();
+                    this.abnormalState.add(0) ;
+                }else {
+                    this.abnormalState.add(0) ;
+                }
+
                 break;
             case 10502:
                 // 空运可出
@@ -574,8 +586,21 @@ public class OrderQueryDTO {
                     // 兼容空运已入仓的可出、备货中、已备货，且无异常无审批，海运的已入仓无异常无审批
                     this.airShipment = 20;
                 }
-                this.auditType = 0;
-                this.abnormalState = 0;
+                //this.auditType = 0;
+                if(CollectionUtils.isEmpty(auditType)){
+                    this.auditType = new ArrayList<>();
+                    this.auditType.add(0) ;
+                }else {
+                    this.auditType.add(0) ;
+                }
+                //this.abnormalState = 0;
+
+                if(CollectionUtils.isEmpty(abnormalState)){
+                    this.abnormalState = new ArrayList<>();
+                    this.abnormalState.add(0) ;
+                }else {
+                    this.abnormalState.add(0) ;
+                }
                 break;
             case 132411:
                 // 空运已出货