fix(工作队): 工作队策略更新失败-----字段定义错误

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

@@ -7,7 +7,7 @@ public class BusinessTeamConfigSubmitDTO {
         /**
          * 网点指派策略
          */
-        private String assiginStrategy;
+        private String assignStrategy;
         /**
          * cutoff时间
          */

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

@@ -57,6 +57,16 @@ public interface CapacityQueryService {
      */
     CapacityQueryDTO.Segment queryEngineerCapacity(String engineerCode, LocalDate date);
 
+    /**
+     * 查询指定日期内的容量
+     *
+     * @param engineerCode 工程师编码
+     * @param startDate    开始日期
+     * @param endDate      结束日期
+     * @return 日期内工程师的容量信息
+     */
+    CapacityQueryDTO.PersonalResult queryEngineerCapacity(String engineerCode, LocalDate startDate, LocalDate endDate);
+
 
     /**
      * 查询单个工程师指定日期时间段内的的容量状态

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

@@ -218,6 +218,11 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
         return null;
     }
 
+    @Override
+    public CapacityQueryDTO.PersonalResult queryEngineerCapacity(String engineerCode, LocalDate startDate, LocalDate endDate) {
+        //
+        return null;
+    }
 
     @Override
     public CapacityQueryDTO.Segment queryEngineerCapacity(String engineerCode, CapacityQueryDTO.Service service,
@@ -345,20 +350,24 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
                 allEngineerTimeSlice.addAll(engineerTimeSlice);
             }
             //计算所有工程师半天类型容量
+            List<CapacityQueryDTO.Segment> objects = new ArrayList<>();
+            if (CollectionUtils.isNotEmpty(halfDayTypeTimeSlice)) {
                 List<CapacityQueryDTO.Segment> engineerHalfDay = CapacityUtils.getEngineerTypeDay(halfDayTypeTimeSlice,
                         allEngineerTimeSlice, currentDate, totalTakeTime);
+                objects.addAll(engineerHalfDay);
+            }
             //计算所有工程师全天天类型容量
+            if (CollectionUtils.isNotEmpty(allDayTypeTimeSlice)) {
                 List<CapacityQueryDTO.Segment> engineerAllDay = CapacityUtils.getEngineerTypeDay(allDayTypeTimeSlice,
                         allEngineerTimeSlice, currentDate, totalTakeTime);
+                objects.addAll(engineerAllDay);
+            }
             //计算所有工程师时间段类型容量
             /*List<CapacityQueryDTO.Segment> timeSliceTwoHour = CapacityUtils.getEngineerTypeDay(timeSliceEntities,
                     allEngineerTimeSlice, currentDate, totalTakeTime);*/
+            /*objects.addAll(timeSliceTwoHour);*/
             CapacityQueryDTO.Data data = new CapacityQueryDTO.Data();
             data.setDate(DateUtil.toDate(currentDate));
-            List<CapacityQueryDTO.Segment> objects = new ArrayList<>();
-            objects.addAll(engineerHalfDay);
-            objects.addAll(engineerAllDay);
-            /*objects.addAll(timeSliceTwoHour);*/
             data.setSegments(objects);
             return data;
         }