fix:排班结果新增调试讲解使用

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

@@ -117,7 +117,7 @@ public class ScheduleServiceImpl implements ScheduleService {
             team.setLevel("team");
             team.setLevel("team");
 
 
             // 获取改team订单列表
             // 获取改team订单列表
-            List<OrderInfoEntity> orders = orderInfoDao.findByDtAndOrgTeamIdAndAppointmentStatusIn(date, t.getTeamId(), List.of(OrderFlowEnum.PRE.name(), OrderFlowEnum.CONFIRM.name()));
+            List<OrderInfoEntity> orders = orderInfoDao.findByDtAndOrgTeamIdAndAppointmentStatusIn(date, t.getTeamId(), List.of(OrderFlowEnum.INIT.name(), OrderFlowEnum.PRE.name(), OrderFlowEnum.CONFIRM.name()));
             team.setOrder(this.getTeamOrderSum(orders, skillMapping));
             team.setOrder(this.getTeamOrderSum(orders, skillMapping));
 
 
             // 技术员指派单列表
             // 技术员指派单列表
@@ -425,6 +425,7 @@ public class ScheduleServiceImpl implements ScheduleService {
         wrapper.select("skill, COUNT(*) as count")
         wrapper.select("skill, COUNT(*) as count")
                 .lambda()
                 .lambda()
                 .eq(OrderInfo::getDt, date)
                 .eq(OrderInfo::getDt, date)
+                .ne(OrderInfo::getAppointmentStatus, OrderFlowEnum.CANCELED.name())
                 .in(levelType.equals("cluster"), OrderInfo::getOrgClusterId, levelValue)
                 .in(levelType.equals("cluster"), OrderInfo::getOrgClusterId, levelValue)
                 .in(levelType.equals("branch"), OrderInfo::getOrgBranchId, levelValue)
                 .in(levelType.equals("branch"), OrderInfo::getOrgBranchId, levelValue)
                 .in(levelType.equals("group"), OrderInfo::getOrgGroupId, levelValue)
                 .in(levelType.equals("group"), OrderInfo::getOrgGroupId, levelValue)