Commit acca7d28 by huangjinxin

fix:甘特图查询只排除已取消工单

1 parent 9c27e4c9
......@@ -299,7 +299,6 @@ public class DispatchServiceImpl implements DispatchService {
entity.setEngineerCode(engineer.getEngineerCode());
entity.setEngineerName(engineer.getName());
entity.setEngineerPhone(engineer.getPhone());
entity.setOrderStatus(OrderStatusEnum.NORMAL.name());
entity.setAppointmentStatus(OrderFlowEnum.CONFIRM.name());
entity.setAppointmentMethod(AppointmentMethodEnum.MANUAL.name());
entity.setOrgTeamId(byTeamId.getTeamId());
......@@ -597,7 +596,7 @@ public class DispatchServiceImpl implements DispatchService {
//过滤
List<OrderInfoEntity> orders = records.stream()
.filter(r -> r.getOrderStatus().equals("NORMAL"))
.filter(r -> !r.getOrderStatus().equals(OrderStatusEnum.CANCELED))
.collect(Collectors.toList());
return orders.stream().collect(Collectors.groupingBy(OrderInfoEntity::getEngineerCode));
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!