增加收发货地址搜索项

performance-api/src/main/java/com/clx/performance/param/pc/PageOrderGoodsListParam.java

@@ -33,5 +33,11 @@ public class PageOrderGoodsListParam extends PageParam {
     @ApiModelProperty(value = "用车类型： 1平台车辆 2部分平台车辆 3自有车辆")
     private Integer truckDemand;
 
+    @ApiModelProperty(value="发货地址",example = "北京")
+    private String sendAddress;
+
+    @ApiModelProperty(value="收货地址",example = "黄羊城")
+    private String receiveAddress;
+
 
 }

performance-web/src/main/java/com/clx/performance/sqlProvider/OrderChildSqlProvider.java

@@ -122,9 +122,8 @@ public class OrderChildSqlProvider {
             if (StringUtils.isNotBlank(param.getChildNo())) {WHERE("child_no = #{param.childNo}");}
             if (StringUtils.isNotBlank(param.getDriverName())) {WHERE("driver_name= #{param.driverName}");}
             if (StringUtils.isNotBlank(param.getDriverMobile())) {WHERE("driver_mobile = #{param.driverMobile}");}
-
-            if (StringUtils.isNotBlank(param.getSendAddress())) {WHERE("send_address = #{param.sendAddress}");}
-            if (StringUtils.isNotBlank(param.getReceiveAddress())) {WHERE("receive_address= #{param.receiveAddress}");}
+            if(StringUtils.isNotBlank(param.getSendAddress())){WHERE("send_address like CONCAT('%',#{param.sendAddress}) ");}
+            if(StringUtils.isNotBlank(param.getReceiveAddress())){WHERE("reveive_address like CONCAT('%',#{param.receiveAddress}) ");}
             if (Objects.nonNull(param.getStatus())) {WHERE("status = #{param.status}");}
             if (StringUtils.isNotBlank(param.getTruckNo())) {WHERE("truck_no like '%"+ param.getTruckNo() +"%'");}
 

performance-web/src/main/java/com/clx/performance/sqlProvider/OrderGoodsSqlProvider.java

@@ -82,6 +82,8 @@ public class OrderGoodsSqlProvider {
             if (StringUtils.isNotBlank(param.getOrderGoodsNo())) {
                 WHERE("a.order_goods_no = #{param.orderGoodsNo}");
             }
+            if(StringUtils.isNotBlank(param.getSendAddress())){WHERE("a.send_address_shorter like CONCAT('%',#{param.sendAddress}) ");}
+            if(StringUtils.isNotBlank(param.getReceiveAddress())){WHERE("a.reveive_address_shorter like CONCAT('%',#{param.receiveAddress}) ");}
             ORDER_BY("a.create_time desc");
         }}.toString();
         return sql;