Merge branch 'feature_mvp616_wangl' into 'develop'

修改

See merge request !80

project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/DispatchServiceImpl.java

@@ -103,7 +103,7 @@ public class DispatchServiceImpl implements DispatchService {
 		// 获取engineerCodes
 		// 获取engineerCodes
 		List<String> engineerCodes = engineers.stream().map(EngineerInfo::getEngineerCode).collect(Collectors.toList());
 		List<String> engineerCodes = engineers.stream().map(EngineerInfo::getEngineerCode).collect(Collectors.toList());
 
 
-		// 获取技术员订单ID列表HashMap<engineerCode, List<orderId>>
+		// 获取技术员已指派单列表
 		Map<String, List<OrderAppointment>> engineerOrders = this.queryEngineerOrders(engineerCodes, date);
 		Map<String, List<OrderAppointment>> engineerOrders = this.queryEngineerOrders(engineerCodes, date);
 
 
 		// 获取订单ID
 		// 获取订单ID
@@ -114,10 +114,11 @@ public class DispatchServiceImpl implements DispatchService {
 			}
 			}
 		}
 		}
 
 
-		// 获取订单列表
+		// 获取服务单/工单列表
 		Map<String, List<OrderRequest>> orders = this.queryOrderRequestByOrderIds(new ArrayList<>(orderIds)).stream().collect(
 		Map<String, List<OrderRequest>> orders = this.queryOrderRequestByOrderIds(new ArrayList<>(orderIds)).stream().collect(
 				Collectors.groupingBy(OrderRequest::getOrderId));
 				Collectors.groupingBy(OrderRequest::getOrderId));
 
 
+		// 获取技术员已指派单列表
 		List<DispatchEngineerOrderListResp.EngineerInfo> egs = new ArrayList<>();
 		List<DispatchEngineerOrderListResp.EngineerInfo> egs = new ArrayList<>();
 		for (EngineerInfo e : engineers) {
 		for (EngineerInfo e : engineers) {
 
 
@@ -126,8 +127,10 @@ public class DispatchServiceImpl implements DispatchService {
 			// 技术员已指派的订单列表
 			// 技术员已指派的订单列表
 			List<OrderAppointment> records = engineerOrders.getOrDefault(e.getEngineerCode(), List.of());
 			List<OrderAppointment> records = engineerOrders.getOrDefault(e.getEngineerCode(), List.of());
 			for (OrderAppointment r : records) {
 			for (OrderAppointment r : records) {
+
 				DispatchEngineerOrderListResp.OrderInfo item = new DispatchEngineerOrderListResp.OrderInfo();
 				DispatchEngineerOrderListResp.OrderInfo item = new DispatchEngineerOrderListResp.OrderInfo();
-				// 获取订单信息
+
+				// 获取对应的工单信息
 				OrderRequest o = orders.get(r.getOrderId()).get(0);
 				OrderRequest o = orders.get(r.getOrderId()).get(0);
 
 
 				item.setOrderId(r.getOrderId());
 				item.setOrderId(r.getOrderId());
@@ -207,7 +210,6 @@ public class DispatchServiceImpl implements DispatchService {
 		lqw.in(OrderAppointment::getEngineerCode, engineerCodes);
 		lqw.in(OrderAppointment::getEngineerCode, engineerCodes);
 		lqw.ge(OrderAppointment::getExpectTime, this.getTimestampFromDate(date, "00:00:00"));
 		lqw.ge(OrderAppointment::getExpectTime, this.getTimestampFromDate(date, "00:00:00"));
 		lqw.le(OrderAppointment::getExpectTime, this.getTimestampFromDate(date, "23:59:59"));
 		lqw.le(OrderAppointment::getExpectTime, this.getTimestampFromDate(date, "23:59:59"));
-		lqw.select(OrderAppointment::getEngineerCode, OrderAppointment::getOrderId);
 
 
 		lqw.orderByAsc(OrderAppointment::getEngineerCode);
 		lqw.orderByAsc(OrderAppointment::getEngineerCode);
 		lqw.orderByAsc(OrderAppointment::getExpectTime);
 		lqw.orderByAsc(OrderAppointment::getExpectTime);