修改

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

@@ -92,10 +92,8 @@ public class ScheduleServiceImpl implements ScheduleService {
 			// 技术员指派单列表
 			// 技术员指派单列表
 			Map<String, List<OrderInfo>> engineerOrders = new HashMap<>();
 			Map<String, List<OrderInfo>> engineerOrders = new HashMap<>();
 			if (ListUtils.isNotEmpty(orders)) {
 			if (ListUtils.isNotEmpty(orders)) {
-				List<String> orderRequestIds = orders.stream().map(OrderInfo::getOrderId).collect(Collectors.toList());
-				List<OrderInfo> orderAppointments = orderInfoMPDao.selectByDtAndOrderIds(date, orderRequestIds);
-				orderAppointments.sort(Comparator.comparing(OrderInfo::getEngineerCode));
-				engineerOrders = orderAppointments.stream().collect(Collectors.groupingBy(OrderInfo::getEngineerCode));
+				orders.sort(Comparator.comparing(OrderInfo::getEngineerCode));
+				engineerOrders = orders.stream().collect(Collectors.groupingBy(OrderInfo::getEngineerCode));
 			}
 			}
 
 
 			// 获取team技术员列表
 			// 获取team技术员列表
@@ -106,21 +104,14 @@ public class ScheduleServiceImpl implements ScheduleService {
 
 
 			List<ScheduleOverviewResp.Item> children = new ArrayList<>();
 			List<ScheduleOverviewResp.Item> children = new ArrayList<>();
 			for (Map.Entry<String, List<EngineerInfo>> entry : engineers.entrySet()) {
 			for (Map.Entry<String, List<EngineerInfo>> entry : engineers.entrySet()) {
-
 				ScheduleOverviewResp.Item child = new ScheduleOverviewResp.Item();
 				ScheduleOverviewResp.Item child = new ScheduleOverviewResp.Item();
 
 
 				//技术员信息
 				//技术员信息
 				String engineerCode = entry.getKey();
 				String engineerCode = entry.getKey();
 				EngineerInfo engineerInfo = entry.getValue().get(0);
 				EngineerInfo engineerInfo = entry.getValue().get(0);
 
 
-				List<String> orderIds = engineerOrders.getOrDefault(engineerCode, new ArrayList<>()).stream().map(OrderInfo::getOrderId).collect(Collectors.toList());
-
-				List<OrderInfo> orders2 = new ArrayList<>();
-				for (OrderInfo o : orders) {
-					if (orderIds.contains(o.getOrderId())) {
-						orders2.add(o);
-					}
-				}
+				// 获取技术员已经指派的订单列表
+				List<OrderInfo> orders2 =  engineerOrders.getOrDefault(engineerCode, new ArrayList<>());
 
 
 				child.setName(engineerInfo.getName());
 				child.setName(engineerInfo.getName());
 				child.setValue(engineerCode);
 				child.setValue(engineerCode);