按前端查询条件改

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderException/OrderExceptionServiceImpl.java

@@ -415,19 +415,19 @@ public class OrderExceptionServiceImpl extends AbstractService<OrderExceptionMap
         queryWrapper.eqIfPresent("o.is_external_warehouse", reqVo.getIsExternalWarehouse());
         queryWrapper.eqIfPresent("o.is_cargo_control", reqVo.getIsCargoControl());
         queryWrapper.eqIfPresent("o.transport_id", reqVo.getTransportId());
-        if (null != reqVo.getOriginId() && reqVo.getOriginId().size() > 0) {
-            queryWrapper.inIfPresent("wl.start_warehouse_id", reqVo.getOriginId());
+        if (null != reqVo.getStartWarehouseIds() && reqVo.getStartWarehouseIds().size() > 0) {
+            queryWrapper.inIfPresent("wl.start_warehouse_id", reqVo.getStartWarehouseIds());
         }
 
-        if (null != reqVo.getDestinationId() && reqVo.getDestinationId().size() > 0) {
-            queryWrapper.inIfPresent("wl.dest_warehouse_id", reqVo.getDestinationId());
+        if (null != reqVo.getDestWarehouseIds() && reqVo.getDestWarehouseIds().size() > 0) {
+            queryWrapper.inIfPresent("wl.dest_warehouse_id", reqVo.getDestWarehouseIds());
         }
 
-        if (null != reqVo.getDestCityId() && reqVo.getDestCityId().size() > 0) {
-            queryWrapper.inIfPresent("eo.objective_id", reqVo.getDestCityId());
+        if (null != reqVo.getObjectiveIds() && reqVo.getObjectiveIds().size() > 0) {
+            queryWrapper.inIfPresent("eo.objective_id", reqVo.getObjectiveIds());
         }
-        if (null != reqVo.getDestCountryId() && reqVo.getDestCountryId().size() > 0) {
-            queryWrapper.inIfPresent("eo.objective_country_id", reqVo.getDestCountryId());
+        if (null != reqVo.getDestCountryIds() && reqVo.getDestCountryIds().size() > 0) {
+            queryWrapper.inIfPresent("eo.objective_country_id", reqVo.getDestCountryIds());
         }
         if (null != reqVo.getOrderExceptionType() && reqVo.getOrderExceptionType().size() > 0) {
             queryWrapper.inIfPresent("e.order_exception_type", reqVo.getOrderExceptionType());
@@ -2514,18 +2514,18 @@ public class OrderExceptionServiceImpl extends AbstractService<OrderExceptionMap
         queryWrapper.eqIfPresent("a.is_cargo_control",
                 reqVo.getIsCargoControl());
         queryWrapper.eqIfPresent("a.transport_id", reqVo.getTransportId());
-        if (null != reqVo.getOriginId() && reqVo.getOriginId().size() > 0) {
-            queryWrapper.inIfPresent("wl.start_warehouse_id", reqVo.getOriginId());
+        if (null != reqVo.getStartWarehouseIds() && reqVo.getStartWarehouseIds().size() > 0) {
+            queryWrapper.inIfPresent("wl.start_warehouse_id", reqVo.getStartWarehouseIds());
         }
-        if (null != reqVo.getDestinationId() && reqVo.getDestinationId().size() > 0) {
-            queryWrapper.inIfPresent("wl.dest_warehouse_id", reqVo.getDestinationId());
+        if (null != reqVo.getDestWarehouseIds() && reqVo.getDestWarehouseIds().size() > 0) {
+            queryWrapper.inIfPresent("wl.dest_warehouse_id", reqVo.getDestWarehouseIds());
         }
 
-        if (null != reqVo.getDestCityId() && reqVo.getDestCityId().size() > 0) {
-            queryWrapper.inIfPresent("eo.objective_id", reqVo.getDestCityId());
+        if (null != reqVo.getObjectiveIds() && reqVo.getObjectiveIds().size() > 0) {
+            queryWrapper.inIfPresent("eo.objective_id", reqVo.getObjectiveIds());
         }
-        if (null != reqVo.getDestCountryId() && reqVo.getDestCountryId().size() > 0) {
-            queryWrapper.inIfPresent("eo.objective_country_id", reqVo.getDestCountryId());
+        if (null != reqVo.getDestCountryIds() && reqVo.getDestCountryIds().size() > 0) {
+            queryWrapper.inIfPresent("eo.objective_country_id", reqVo.getDestCountryIds());
         }
 
         queryWrapper.eqIfPresent("s.order_exception_status", reqVo.getOrderExceptionStatus());
@@ -2642,17 +2642,17 @@ public class OrderExceptionServiceImpl extends AbstractService<OrderExceptionMap
         queryWrapper.eqIfPresent("a.is_external_warehouse", reqVo.getIsExternalWarehouse());
         queryWrapper.eqIfPresent("a.is_cargo_control", reqVo.getIsCargoControl());
         queryWrapper.eqIfPresent("a.transport_id", reqVo.getTransportId());
-        if (null != reqVo.getOriginId() && reqVo.getOriginId().size() > 0) {
-            queryWrapper.inIfPresent("wl.start_warehouse_id", reqVo.getOriginId());
+        if (null != reqVo.getStartWarehouseIds() && reqVo.getStartWarehouseIds().size() > 0) {
+            queryWrapper.inIfPresent("wl.start_warehouse_id", reqVo.getStartWarehouseIds());
         }
-        if (null != reqVo.getDestinationId() && reqVo.getDestinationId().size() > 0) {
-            queryWrapper.inIfPresent("wl.dest_warehouse_id", reqVo.getDestinationId());
+        if (null != reqVo.getDestWarehouseIds() && reqVo.getDestWarehouseIds().size() > 0) {
+            queryWrapper.inIfPresent("wl.dest_warehouse_id", reqVo.getDestWarehouseIds());
         }
-        if (null != reqVo.getDestCityId() && reqVo.getDestCityId().size() > 0) {
-            queryWrapper.inIfPresent("eo.objective_id", reqVo.getDestCityId());
+        if (null != reqVo.getObjectiveIds() && reqVo.getObjectiveIds().size() > 0) {
+            queryWrapper.inIfPresent("eo.objective_id", reqVo.getObjectiveIds());
         }
-        if (null != reqVo.getDestCountryId() && reqVo.getDestCountryId().size() > 0) {
-            queryWrapper.inIfPresent("eo.objective_country_id", reqVo.getDestCountryId());
+        if (null != reqVo.getDestCountryIds() && reqVo.getDestCountryIds().size() > 0) {
+            queryWrapper.inIfPresent("eo.objective_country_id", reqVo.getDestCountryIds());
         }
 
         queryWrapper.eqIfPresent("s.order_exception_status", reqVo.getOrderExceptionStatus());

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

@@ -19,10 +19,10 @@ public class OrderExceptionQueryVO {
     private Integer transportId;
 
     @ApiModelProperty(value = "始发仓")
-    private List<String> originId;
+    private List<String> startWarehouseIds;
 
     @ApiModelProperty(value = "目的仓")
-    private List<String> destinationId;
+    private List<String> destWarehouseIds;
 
     @ApiModelProperty(value = "订单id")
     private Long orderId;
@@ -108,8 +108,8 @@ public class OrderExceptionQueryVO {
     private List<Long> customerServiceIdList;
 
     @ApiModelProperty(value = "目的国")
-    private List<Long> destCountryId;
+    private List<Long> destCountryIds;
 
     @ApiModelProperty(value = "目的城市")
-    private List<Long> destCityId;
+    private List<Long> objectiveIds;
 }