修改

project-order/src/main/java/com/alibaba/cloud/integration/order/controller/OrderServiceDetailController.java

@@ -54,7 +54,7 @@ public class OrderServiceDetailController {
 		return res;
 		return res;
 	}
 	}
 
 
-	@GetMapping("/order/appointment/list")
+	@GetMapping("/order/team/block")
 	public Result<?> getOrderTeamBlock(@RequestParam String orderId) {
 	public Result<?> getOrderTeamBlock(@RequestParam String orderId) {
 		// 工单工作队区块
 		// 工单工作队区块
 		Result<?> res = null;
 		Result<?> res = null;

project-order/src/main/java/com/alibaba/cloud/integration/order/dto/OrderTeamBlockResp.java

@@ -7,5 +7,7 @@ import java.util.List;
 @Data
 @Data
 public class OrderTeamBlockResp {
 public class OrderTeamBlockResp {
 	private String orderId;
 	private String orderId;
+	private String location;
+	private String skill;
 	private List<String> block;
 	private List<String> block;
 }
 }

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

@@ -36,6 +36,18 @@ public class DispatchServiceImpl implements DispatchService {
 	@Override
 	@Override
 	public Result<?> getDispatchOrderList(String levelType, List<String> levelIds, String date, String groupTagId) {
 	public Result<?> getDispatchOrderList(String levelType, List<String> levelIds, String date, String groupTagId) {
 		List<OrderRequest> orders = this.queryOrderRequests(levelType, levelIds, date);
 		List<OrderRequest> orders = this.queryOrderRequests(levelType, levelIds, date);
+		for (OrderRequest o: orders) {
+			String a = String.format("%s:%s%s-%s %s:%s", o.getOrderId(),o.getSkill(), o.getType(), o.getBrand(), o.getName(), o.getAddress());
+			String intentionTime = String.format("");
+			String duration = "1";
+			String type = o.getType();
+			String category = String.format("%s-%s", o.getType(), o.getBrand());
+			String orderId ="";
+			String customerName = o.getName();
+			String remark = o.getDescription();
+			String groupTag = "紧急";
+			int groupWeight = 10;
+		}
 		return null;
 		return null;
 	}
 	}
 
 

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

@@ -142,9 +142,14 @@ public class OrderServiceDetailImpl implements OrderServiceDetail {
 	public Result<?> getOrderTeamBlock(String orderId) {
 	public Result<?> getOrderTeamBlock(String orderId) {
 		List<String> block = new ArrayList<>();
 		List<String> block = new ArrayList<>();
 
 
+		// 获取订单详情
+		OrderRequest order = this.queryOrderDetail(orderId);
+
 		OrderTeamBlockResp res = new OrderTeamBlockResp();
 		OrderTeamBlockResp res = new OrderTeamBlockResp();
 		res.setOrderId(orderId);
 		res.setOrderId(orderId);
 		res.setBlock(block);
 		res.setBlock(block);
+		res.setLocation(String.format("%s,%s", order.getX(), order.getY()));
+		res.setSkill(order.getSkill());
 		return Result.success(res);
 		return Result.success(res);
 	}
 	}