FIX: 多技能组查询容量时 工程师需同时满足所有技能

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

@@ -143,7 +143,7 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
         }
         }
 
 
         Set<EngineerInfoEntity> allFulfillEngineer = engineerInfoDao.listBySkillGroupCode(skillGroupCodes,
         Set<EngineerInfoEntity> allFulfillEngineer = engineerInfoDao.listBySkillGroupCode(skillGroupCodes,
-                skillGroupCodes.size());
+                skillGroupCodes.size(), teamId);
         //查询同时拥有技能组代码的人员信息
         //查询同时拥有技能组代码的人员信息
 
 
         log.info("[matchCapacityData]【符合技能要求的工程师总数为：{} 个】", allFulfillEngineer.size());
         log.info("[matchCapacityData]【符合技能要求的工程师总数为：{} 个】", allFulfillEngineer.size());
@@ -155,6 +155,7 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
         //查询单个工程师日期范围内的技能容量信息 后加和汇总
         //查询单个工程师日期范围内的技能容量信息 后加和汇总
         CopyOnWriteArrayList<TimeSliceEntity> halfDayTypeTimeSlice = new CopyOnWriteArrayList<>(timeSliceDao.findByType("HALF_DAY"));
         CopyOnWriteArrayList<TimeSliceEntity> halfDayTypeTimeSlice = new CopyOnWriteArrayList<>(timeSliceDao.findByType("HALF_DAY"));
         CopyOnWriteArrayList<TimeSliceEntity> allDayTypeTimeSlice = new CopyOnWriteArrayList<>(timeSliceDao.findByType("ALL_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)));