Commit c7ff22dd by Ren Ping

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

1 parent c39fd344
......@@ -117,7 +117,7 @@ public class ScheduleServiceImpl implements ScheduleService {
team.setLevel("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));
// 技术员指派单列表
......@@ -425,6 +425,7 @@ public class ScheduleServiceImpl implements ScheduleService {
wrapper.select("skill, COUNT(*) as count")
.lambda()
.eq(OrderInfo::getDt, date)
.ne(OrderInfo::getAppointmentStatus, OrderFlowEnum.CANCELED.name())
.in(levelType.equals("cluster"), OrderInfo::getOrgClusterId, levelValue)
.in(levelType.equals("branch"), OrderInfo::getOrgBranchId, levelValue)
.in(levelType.equals("group"), OrderInfo::getOrgGroupId, levelValue)
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!