Merge branch 'dev_order_detail0728' into 'develop'

Dev order detail0728

See merge request !293

project-order/src/main/java/com/dituhui/pea/order/controller/BusinessBlockController.java

@@ -45,8 +45,8 @@ public class BusinessBlockController {
 	/**
 	 * 新增服务区块
 	 *
-	 * @param layerId 图层ID
-	 * @param teamId  小队ID
+	 * @param req::layerId 图层ID
+	 * @param req::teamId  小队ID
 	 * @return
 	 */
 	@PostMapping("/business/service/block/add")
@@ -64,7 +64,7 @@ public class BusinessBlockController {
 	/**
 	 * 新增服务区块
 	 *
-	 * @param id 服务区块ID
+	 * @param req::getId 服务区块ID
 	 * @return
 	 */
 	@PostMapping("/business/service/block/remove")

project-order/src/main/java/com/dituhui/pea/order/dto/OrderServiceDetailResp.java

@@ -15,6 +15,8 @@ public class OrderServiceDetailResp {
 	private String risk;
 	private String riskDesc;
 	private String location;
+	private String orderStatus;
+	private String serviceStatus;
 	private OrderDetail reschedulingParams;
 	private List<KV> items;
 

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

@@ -68,6 +68,8 @@ public class OrderServiceDetailImpl implements OrderServiceDetail {
 		res.setStatusDesc("正常");
 		res.setStatus(order.getOrderStatus());
 		res.setAppointmentStatus(order.getAppointmentStatus());
+		res.setOrderStatus(order.getOrderStatus());
+		res.setServiceStatus(order.getServiceStatus());
 		res.setLocation(String.format("%s,%s", order.getX(), order.getY()));
 		res.setReschedulingParams(detail);
 		res.setItems(items);