Merge branch 'release-fix' into dev

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/order/OrderQueryVO.java

@@ -616,6 +616,14 @@ public class OrderQueryVO {
             }
         }
     }
+    public void setStatusList(List<Integer> statusList) {
+        this.asStatusList = statusList;
+        if (CollectionUtil.isNotEmpty(this.asStatusList)) {
+            for (Integer asStatus : asStatusList) {
+                combinedStateList(asStatus, this.transportId);
+            }
+        }
+    }
 
     public void setTransportId(Integer transportId) {
         this.transportId = transportId;
@@ -725,7 +733,7 @@ public class OrderQueryVO {
                 this.airShipmentList.add(1);
                 this.auditTypeList.add(0);
                 this.abnormalStateList.add(0);
-                this.transportId = 3; // 空运待出查询，只查空运的订单
+//                this.transportId = 3; // 空运待出查询，只查空运的订单
                 break;
             case 10502:
                 // 空运可出
@@ -737,7 +745,7 @@ public class OrderQueryVO {
                 }
                 this.statusList.add(5);
                 this.airShipmentList.add(12);
-                this.transportId = 3; // 空运待出查询，只查空运的订单
+//                this.transportId = 3; // 空运待出查询，只查空运的订单
                 break;
             case 10503:
                 // 空运已备货
@@ -749,7 +757,7 @@ public class OrderQueryVO {
                 }
                 this.statusList.add(5);
                 this.airShipmentList.add(4);
-                this.transportId = 3; // 空运待出查询，只查空运的订单
+//                this.transportId = 3; // 空运待出查询，只查空运的订单
                 break;
             case 10504:
                 // 待排单
@@ -825,6 +833,11 @@ public class OrderQueryVO {
                 this.shipmentStateList.add(428);
                 this.transportId = 3; // 空运待出查询，只查空运的订单
                 break;
+            default:
+                if (Objects.isNull(this.statusList)){
+                    this.statusList = new ArrayList<>();
+                    this.statusList.add(asStatus);
+                }
         }
     }
 

yudao-module-order/yudao-module-order-core/src/main/resources/mapper/order/OrderMapper.xml

@@ -2642,7 +2642,7 @@
                             or o.`cargo_control_status` = 1 AND (select count(1) from ecw_order_cargo_control_pick ccp2 where ccp2.order_id = o.order_id and ccp2.status = 1) > 0
                         </when>
                         <otherwise>
-                            or o.`cargo_control_status` = #{query.cargoControlStatus}
+                            or o.`cargo_control_status` = #{cargoControlStatus}
                         </otherwise>
                     </choose>
                 </foreach>