Merge branch 'feature_mvp616_wangl' into 'develop'

修改

See merge request !77

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

@@ -89,6 +89,7 @@ public class DispatchServiceImpl implements DispatchService {
 	@Transactional
 	@Transactional
 	@Override
 	@Override
 	public Result<?> getDispatchEngineerOrderList(String levelType, List<String> levelIds, String date) {
 	public Result<?> getDispatchEngineerOrderList(String levelType, List<String> levelIds, String date) {
+		// 派工台技术员预约单列表
 
 
 		// 获取技能耗时
 		// 获取技能耗时
 		HashMap<String, Integer> skillTakeTime = this.querySkillTakeTime();
 		HashMap<String, Integer> skillTakeTime = this.querySkillTakeTime();
@@ -107,8 +108,8 @@ public class DispatchServiceImpl implements DispatchService {
 
 
 		// 获取订单ID
 		// 获取订单ID
 		Set<String> orderIds = new HashSet<>();
 		Set<String> orderIds = new HashSet<>();
-		for(String k: engineerOrders.keySet()){
-			for(OrderAppointment o: engineerOrders.get(k)) {
+		for (String k : engineerOrders.keySet()) {
+			for (OrderAppointment o : engineerOrders.get(k)) {
 				orderIds.add(o.getOrderId());
 				orderIds.add(o.getOrderId());
 			}
 			}
 		}
 		}
@@ -119,15 +120,9 @@ public class DispatchServiceImpl implements DispatchService {
 
 
 		List<DispatchEngineerOrderListResp.EngineerInfo> egs = new ArrayList<>();
 		List<DispatchEngineerOrderListResp.EngineerInfo> egs = new ArrayList<>();
 		for (EngineerInfo e : engineers) {
 		for (EngineerInfo e : engineers) {
-			DispatchEngineerOrderListResp.EngineerInfo eg = new DispatchEngineerOrderListResp.EngineerInfo();
-			eg.setEngineerCode(e.getEngineerCode());
-			eg.setEngineerName(e.getName());
-			eg.setCapacity("");
-			eg.setCapacityStatus("");
-			eg.setCertificate(e.getCredentials());
-
+			// 获取技术员指派单的订单列表
 			List<DispatchEngineerOrderListResp.OrderInfo> items = new ArrayList<>();
 			List<DispatchEngineerOrderListResp.OrderInfo> items = new ArrayList<>();
-			for(OrderAppointment r: engineerOrders.get(e.getEngineerCode())) {
+			for (OrderAppointment r : engineerOrders.get(e.getEngineerCode())) {
 				DispatchEngineerOrderListResp.OrderInfo item = new DispatchEngineerOrderListResp.OrderInfo();
 				DispatchEngineerOrderListResp.OrderInfo item = new DispatchEngineerOrderListResp.OrderInfo();
 				// 获取订单信息
 				// 获取订单信息
 				OrderRequest o = orders.get(r.getEngineerCode()).get(0);
 				OrderRequest o = orders.get(r.getEngineerCode()).get(0);
@@ -153,9 +148,20 @@ public class DispatchServiceImpl implements DispatchService {
 
 
 				items.add(item);
 				items.add(item);
 			}
 			}
-		}
 
 
-		return null;
+			DispatchEngineerOrderListResp.EngineerInfo eg = new DispatchEngineerOrderListResp.EngineerInfo();
+			eg.setOrders(items);
+			eg.setEngineerCode(e.getEngineerCode());
+			eg.setEngineerName(e.getName());
+			eg.setCapacity("");
+			eg.setCapacityStatus("");
+			eg.setCertificate(e.getCredentials());
+
+			egs.add(eg);
+		}
+		DispatchEngineerOrderListResp res = new DispatchEngineerOrderListResp();
+		res.setEngineers(egs);
+		return Result.success(res);
 	}
 	}
 
 
 	@Override
 	@Override