价格列表查询条件优化

yudao-module-depository/yudao-module-depository-core/src/main/java/cn/iocoder/yudao/module/depository/vo/warehouseLine/WarehouseLineQueryVO.java

@@ -21,8 +21,14 @@ public class WarehouseLineQueryVO {
     @ApiModelProperty(value = "运输方式")
     private Integer transportType;
 
+    @ApiModelProperty(value = "目的地城市id")
+    private List<Long> destCityId;
+
     @ApiModelProperty(value = "目的国家id")
-    private Long destCountryId;
+    private List<Long> destCountryId;
+
+    @ApiModelProperty(value = "目的仓")
+    private List<Long> destWarehouseId;
 
     @ApiModelProperty(value = "出货渠道ID,空运才有，海运可以为空")
     private Long channelId;

yudao-module-depository/yudao-module-depository-core/src/main/resources/mapper/warehouse/WarehouseLineMapper.xml

@@ -123,12 +123,32 @@
             </foreach>
         </if>
 
-        <if test="query.transportType != null">
-            AND line.transport_type = #{query.transportType}
+        <!--目的地-->
+        <if test="query.destCityId != null and query.destCityId.size()>0 ">
+            and destwarehouse.`shi` in
+            <foreach item='destCity' index='index' collection='query.destCityId' open='(' separator=',' close=')'>
+                #{destCity}
+            </foreach>
+        </if>
+
+        <!--目的国-->
+        <if test="query.destCountryId != null and query.destCountryId.size()>0 ">
+            and destwarehouse.`guojia` in
+            <foreach item='destCountry' index='index' collection='query.destCountryId' open='(' separator=',' close=')'>
+                #{destCountry}
+            </foreach>
         </if>
 
-        <if test="query.destCountryId != null">
-            AND destwarehouse.guojia = #{query.destCountryId}
+        <!--目的仓-->
+        <if test="query.destWarehouseId != null and query.destWarehouseId.size()>0 ">
+            AND line.dest_warehouse_id IN
+            <foreach item='destWarehouse' index='index' collection='query.destWarehouseId' open='(' separator=',' close=')'>
+                #{destWarehouse}
+            </foreach>
+        </if>
+
+        <if test="query.transportType != null">
+            AND line.transport_type = #{query.transportType}
         </if>
 
         <if test="query.channelId != null">