Merge branch 'feature_mvp616_wangl' into 'develop'

Feature mvp616 wangl

See merge request !33

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

@@ -53,4 +53,16 @@ public class OrderServiceDetailController {
 		}
 		return res;
 	}
+
+	@GetMapping("/order/appointment/list")
+	public Result<?> getOrderTeamBlock(@RequestParam String orderId) {
+		// 工单工作队区块
+		Result<?> res = null;
+		try{
+			res = orderServiceDetail.getOrderTeamBlock(orderId);
+		} catch (BusinessException e) {
+			return Result.failed(e.getMessage());
+		}
+		return res;
+	}
 }
\ No newline at end of file

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

+package com.alibaba.cloud.integration.order.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class OrderTeamBlockResp {
+	private String orderId;
+	private List<String> block;
+}

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

@@ -8,4 +8,6 @@ public interface OrderServiceDetail {
 	Result<?> getOrderServiceDynamics(String orderId);
 
 	Result<?> getOrderAppointmentList(String orderId);
+
+	Result<?> getOrderTeamBlock(String orderId);
 }

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

@@ -6,6 +6,7 @@ import com.alibaba.cloud.integration.order.dto.*;
 import com.alibaba.cloud.integration.order.entity.*;
 import com.alibaba.cloud.integration.order.service.OrderServiceDetail;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.aspectj.weaver.ast.Or;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -136,6 +137,17 @@ public class OrderServiceDetailImpl implements OrderServiceDetail {
 		return Result.success(res);
 	}
 
+	@Transactional
+	@Override
+	public Result<?> getOrderTeamBlock(String orderId) {
+		List<String> block = new ArrayList<>();
+
+		OrderTeamBlockResp res = new OrderTeamBlockResp();
+		res.setOrderId(orderId);
+		res.setBlock(block);
+		return Result.success(res);
+	}
+
 	private OrderRequest queryOrderDetail(String orderId) {
 		// 获取服务单记录
 		LambdaQueryWrapper<OrderRequest> lqw = new LambdaQueryWrapper<>();