修改

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/SpecialRentController.java

@@ -26,11 +26,14 @@ import com.xxfc.platform.order.pojo.order.add.AddRentVehicleDTO;
 import com.xxfc.platform.order.service.OrderRentVehicleService;
 import com.xxfc.platform.vehicle.entity.Vehicle;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import lombok.Data;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.persistence.Column;
+
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
 import static com.xxfc.platform.order.entity.SpecialRent.*;
@@ -117,6 +120,12 @@ public class SpecialRentController extends BaseController<SpecialRentBiz, Specia
         Query query = new Query(dto);
         PageDataVO<SpecialRentVO> pages = PageDataVO.pageInfo(query, () -> baseBiz.selectByWeekend(w -> {
             w.andIn(SpecialRent::getStatus, CollUtil.newArrayList(STATUS_CRT, STATUS_AUTOCNL_ORDER, STATUS_AUTOCNL_TOPAY, STATUS_AUTOCNL_PAYED));
+            if(null != dto.getStartCityCode()) {
+                w.andEqualTo(SpecialRent::getStartCityCode, dto.getStartCityCode());
+            }
+            if(null != dto.getEndCityCode()) {
+                w.andEqualTo(SpecialRent::getEndCityCode, dto.getEndCityCode());
+            }
             return w;
         }, " crt_time desc "), SpecialRentVO.class);
 
@@ -226,8 +235,18 @@ public class SpecialRentController extends BaseController<SpecialRentBiz, Specia
     @Data
     public static class QueryDTO extends PageParam {
         Integer userId;
+        /**
+         * 开始城市编码
+         */
+        @ApiModelProperty(value = "开始城市编码")
+        private Integer startCityCode;
+
+        /**
+         * 结束城市编码
+         */
+        @ApiModelProperty(value = "结束城市编码")
+        private Integer endCityCode;
     }
-
     @Data
     public static class SpecialOrderDTO extends AddRentVehicleDTO {
         Integer specialId;