Merge remote-tracking branch 'origin/develop' into develop

project-order/src/main/java/com/dituhui/pea/order/controller/PeaApiController.java

@@ -134,7 +134,7 @@ public class PeaApiController {
                     return service;
                     return service;
                 }).collect(Collectors.toList());
                 }).collect(Collectors.toList());
 
 
-        return capacityQueryService.matchCapacityData(convertService, reqDTO.getLocation(), startDate, endDate);
+        return capacityQueryService.matchCapacityData(reqDTO, convertService, reqDTO.getLocation(), startDate, endDate);
     }
     }
 
 
     private String fixBrand(String brand) {
     private String fixBrand(String brand) {

project-order/src/main/java/com/dituhui/pea/order/service/CapacityQueryService.java

@@ -21,7 +21,8 @@ public interface CapacityQueryService {
      * @param endDate   结束日期
      * @param endDate   结束日期
      * @return 满足对应技能工作队的容量（三种类型与分站绑定）
      * @return 满足对应技能工作队的容量（三种类型与分站绑定）
      */
      */
-    Result<CapacityQueryDTO.Result> matchCapacityData(List<CapacityQueryDTO.Service> services, Location location, LocalDate beginDate, LocalDate endDate);
+    Result<CapacityQueryDTO.Result> matchCapacityData(CapacityQueryDTO.Request request,
+                                                      List<CapacityQueryDTO.Service> services, Location location, LocalDate beginDate, LocalDate endDate);
 
 
 
 
     /**
     /**

project-order/src/main/java/com/dituhui/pea/order/service/impl/CapacityQueryServiceImpl.java

@@ -92,7 +92,8 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
     private EngineerSliceUsedCapacityDao engineerSliceUsedCapacityDao;
     private EngineerSliceUsedCapacityDao engineerSliceUsedCapacityDao;
 
 
     @Override
     @Override
-    public Result<CapacityQueryDTO.Result> matchCapacityData(List<CapacityQueryDTO.Service> services, Location location,
+    public Result<CapacityQueryDTO.Result> matchCapacityData(CapacityQueryDTO.Request request,
+                                                             List<CapacityQueryDTO.Service> services, Location location,
                                                              LocalDate beginDate, LocalDate endDate) {
                                                              LocalDate beginDate, LocalDate endDate) {
 
 
         //1：根据经纬度分单获取面
         //1：根据经纬度分单获取面
@@ -174,6 +175,7 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
         }
         }
 
 
         result.setDatas(datas);
         result.setDatas(datas);
+        result.setParams(request);
         return Result.success(result);
         return Result.success(result);
     }
     }