fix(时间片容量): 时间片交集运算

project-order/src/main/java/com/dituhui/pea/order/common/CapacityUtils.java

@@ -213,7 +213,10 @@ public class CapacityUtils {
             TimeSliceEntity timeSlice = t.getTimmeSlice();
             TimeSliceEntity timeSlice = t.getTimmeSlice();
             LocalTime sliceStartHour = LocalTime.parse(timeSlice.getStart(), DateUtil.TIME_FORMATTER);
             LocalTime sliceStartHour = LocalTime.parse(timeSlice.getStart(), DateUtil.TIME_FORMATTER);
             LocalTime sliceEndHour = LocalTime.parse(timeSlice.getEnd(), DateUtil.TIME_FORMATTER);
             LocalTime sliceEndHour = LocalTime.parse(timeSlice.getEnd(), DateUtil.TIME_FORMATTER);
-            return !(targetStartTime.isAfter(sliceEndHour) || targetEndTime.isBefore(sliceStartHour));
+
+            LocalTime maxStart = targetStartTime.isAfter(sliceStartHour) ? targetStartTime : sliceStartHour;
+            LocalTime minEnd = targetEndTime.isAfter(sliceEndHour) ? sliceEndHour : targetEndTime;
+            return maxStart.isBefore(minEnd);
         }).collect(Collectors.toList());
         }).collect(Collectors.toList());
 
 
         CapacityQueryDTO.Segment segment = new CapacityQueryDTO.Segment();
         CapacityQueryDTO.Segment segment = new CapacityQueryDTO.Segment();

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

@@ -145,8 +145,8 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
                 .mapToInt(SkillInfoEntity::getTakeTime)
                 .mapToInt(SkillInfoEntity::getTakeTime)
                 .sum();
                 .sum();
         //查询单个工程师日期范围内的技能容量信息 后加和汇总
         //查询单个工程师日期范围内的技能容量信息 后加和汇总
-        CopyOnWriteArrayList<TimeSliceEntity> halfDayTypeTimeSlice = new CopyOnWriteArrayList<>(timeSliceDao.findByType("HALF_DAY"));
-        CopyOnWriteArrayList<TimeSliceEntity> allDayTypeTimeSlice = new CopyOnWriteArrayList<>(timeSliceDao.findByType("ALL_DAY"));
+        CopyOnWriteArrayList<TimeSliceEntity> halfDayTypeTimeSlice = new CopyOnWriteArrayList<>();//timeSliceDao.findByType("HALF_DAY"));
+        CopyOnWriteArrayList<TimeSliceEntity> allDayTypeTimeSlice = new CopyOnWriteArrayList<>();//timeSliceDao.findByType("ALL_DAY"));
         CopyOnWriteArrayList<TimeSliceEntity> timeSliceEntities = new CopyOnWriteArrayList<>(sliceTime(LocalDate.now(),
         CopyOnWriteArrayList<TimeSliceEntity> timeSliceEntities = new CopyOnWriteArrayList<>(sliceTime(LocalDate.now(),
                 LocalTime.of(8, 0),
                 LocalTime.of(8, 0),
                 LocalTime.of(18, 0)));
                 LocalTime.of(18, 0)));