Merge branch 'develop' of https://zhangguoping@gitlab.dituhui.com/bsh/project/pr…

…oject.git into develop

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

@@ -3,7 +3,6 @@ package com.dituhui.pea.order.controller;
 import com.dituhui.pea.common.Result;
 import com.dituhui.pea.common.Result;
 import com.dituhui.pea.order.common.jackson.DateUtil;
 import com.dituhui.pea.order.common.jackson.DateUtil;
 import com.dituhui.pea.order.common.jackson.JsonUtil;
 import com.dituhui.pea.order.common.jackson.JsonUtil;
-import com.dituhui.pea.order.dto.OrganizationTreeDTO;
 import com.dituhui.pea.order.dto.param.*;
 import com.dituhui.pea.order.dto.param.*;
 import com.dituhui.pea.order.service.EngineerCalendarService;
 import com.dituhui.pea.order.service.EngineerCalendarService;
 import com.dituhui.pea.order.service.PeaOuterAPIService;
 import com.dituhui.pea.order.service.PeaOuterAPIService;
@@ -82,7 +81,17 @@ public class PeaApiController {
     @PostMapping("/capacity/query")
     @PostMapping("/capacity/query")
     public Result<CapacityQueryDTO.Result> capacityQuery(@Validated @RequestBody CapacityQueryDTO.Request reqDTO) throws IOException {
     public Result<CapacityQueryDTO.Result> capacityQuery(@Validated @RequestBody CapacityQueryDTO.Request reqDTO) throws IOException {
         //查询日期起止参数限制为一月
         //查询日期起止参数限制为一月
-        CapacityQueryDTO.Result result = JsonUtil.parse(makeMap.get(reqDTO.getLocation().getLongitude() + "," + reqDTO.getLocation().getLatitude()), CapacityQueryDTO.Result.class).get();
+
+        ArrayList<String> strings = new ArrayList<>();
+        strings.add(half_capacity);
+        strings.add(day_capacity);
+        strings.add(half_capacity2);
+        strings.add(date_capacity);
+
+        Random random = new Random();
+        int i = random.nextInt(4);
+        CapacityQueryDTO.Result result = JsonUtil.parse(strings.get(i), CapacityQueryDTO.Result.class).get();
+
         result.setParams(reqDTO);
         result.setParams(reqDTO);
         return Result.success(result);
         return Result.success(result);
     }
     }

project-order/src/main/java/com/dituhui/pea/order/dto/param/OrderDTO.java

@@ -126,6 +126,16 @@ public class OrderDTO {
         private String description;
         private String description;
 
 
         /**
         /**
+         * 是否指定某个工程师/是否排除某个工程师 0：否 1：指定 2：排除 默认0
+         */
+            private int isAppointEngineer;
+
+        /**
+         * 指定某个工程师/排除某个工程师 codes
+         */
+        private List<String> appointEngineerCodes;
+
+        /**
          * 其他详细信息, 预留的其他详细信息，具体等BEAN提供
          * 其他详细信息, 预留的其他详细信息，具体等BEAN提供
          */
          */
         private Object extraInfo;
         private Object extraInfo;