Merge branch 'develop' of https://zhangguoping@gitlab.dituhui.com/bsh/project/pr…

…oject.git into develop

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/DispatchEngineerOrderListResp.java

@@ -42,16 +42,14 @@ public class DispatchEngineerOrderListResp {
 		private String phone;
 		private String expectTimeDesc;
 		private String source;
-		private String appointmentStatus;
+		private String dispatcher;
 		private String appointmentType;
-		private String createTime;
+		private String appointmentStatus;
+		private String serviceStatus;
 		private String orderStatus;
 		private String orderStatusDesc;
+		private String createTime;
 		private String groupTag;
 		private Integer groupWeight;
-		private String intentionTime; // 待删除 TODO
-		private String customerName; // 待删除 TODO
-		private String category;  // 待删除 TODO
-		private String remark; // 待删除 TODO
 	}
 }

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

@@ -31,14 +31,13 @@ public class DispatchOrderListResp {
 		private String phone;
 		private String expectTimeDesc;
 		private String source;
-		private String appointmentStatus;
 		private String appointmentType;
+		private String dispatcher;
+		private String appointmentStatus;
+		private String orderStatus;
+		private String serviceStatus;
 		private String createTime;
 		private String groupTag;
 		private Integer groupWeight;
-		private String intentionTime; // 待删除 TODO
-		private String customerName; // 待删除 TODO
-		private String category;  // 待删除 TODO
-		private String remark; // 待删除 TODO
 	}
 }

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/dto/OrderServiceList.java

@@ -24,8 +24,11 @@ public class OrderServiceList {
 	private String orgBranchName;
 	private Integer engineerNum;
 	private String engineerNames;
+	private String dispatcher;
 	private String appointmentTime;
-	private String appointmentStatus;
 	private String appointmentType;
+	private String appointmentStatus;
+	private String orderStatus;
+	private String serviceStatus;
 	private String createTime;
 }

project-order/src/main/java/com/dituhui/pea/order/entity/OrderInfo.java

@@ -41,8 +41,9 @@ public class OrderInfo {
 	private String orgTeamId;
 	private Integer priority;
 	private String tags;
-	private String appointmentStatus;
 	private String appointmentMethod;
+	private String appointmentStatus;
+	private String dispatcher;
 	private String orderStatus;
 	private String serviceStatus;
 	private String engineerCode;

project-order/src/main/java/com/dituhui/pea/order/enums/AppointmentStatus.java

+package com.dituhui.pea.order.enums;
+
+public enum AppointmentStatus {
+	INTI("待指派"),
+	PRE("预指派"),
+	CONFIRM("确认指派");
+
+	private final String description;
+
+	AppointmentStatus(String description){
+		this.description = description;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public static String getEnumName(AppointmentStatus appointmentStatus){
+		return appointmentStatus.toString();
+	}
+}

project-order/src/main/java/com/dituhui/pea/order/enums/OrderStatus.java

+package com.dituhui.pea.order.enums;
+
+public enum OrderStatus {
+	NORMAL("正常"),
+	CANCELED("已取消"),
+	RESCHEDULED("已改约");
+
+	private final String description;
+	OrderStatus(String description){
+		this.description = description;
+	};
+
+	public String getDescription() {
+		return description;
+	}
+
+	public static String getEnumName(OrderStatus orderStatus){
+		return orderStatus.toString();
+	}
+}

project-order/src/main/java/com/dituhui/pea/order/enums/ServiceStatus.java

+package com.dituhui.pea.order.enums;
+
+public enum ServiceStatus {
+	INIT("待服务"),
+	PENDING("待服务"),
+	CONTACTED("已排期"),
+	STARTED("已开始"),
+	FINISHED("已完成"),
+	UNFINISHED("已上门未完成");
+
+	private final String description;
+
+	ServiceStatus(String description) {
+		this.description = description;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public static String getEnumName(ServiceStatus serviceStatus){
+		return serviceStatus.toString();
+	}
+}

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

@@ -12,6 +12,7 @@ import com.dituhui.pea.order.dto.DispatchEngineerOrderListResp;
 import com.dituhui.pea.order.dto.DispatchOrderListReq;
 import com.dituhui.pea.order.dto.DispatchOrderListResp;
 import com.dituhui.pea.order.entity.*;
+import com.dituhui.pea.order.enums.OrderStatus;
 import com.dituhui.pea.order.service.DispatchService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -97,8 +98,11 @@ public class DispatchServiceImpl implements DispatchService {
 			item.setPhone(o.getPhone());
 			item.setExpectTimeDesc(o.getExpectTimeDesc());
 			item.setSource(o.getSource());
-			item.setAppointmentStatus(o.getAppointmentStatus());
+			item.setDispatcher(o.getDispatcher());
 			item.setAppointmentType(o.getAppointmentMethod());
+			item.setAppointmentStatus(o.getAppointmentStatus());
+			item.setOrderStatus(o.getOrderStatus());
+			item.setServiceStatus(o.getServiceStatus());
 			item.setCreateTime(TimeUtils.IsoTimestamp2DateTime(o.getCreateTime()));
 
 			String[] tags = gt.getGroupTag(o).split("#");
@@ -194,10 +198,12 @@ public class DispatchServiceImpl implements DispatchService {
 				item.setExpectTimeDesc(String.format("%s/%s", time, timeSlot));
 
 				item.setSource(o.getSource());
-				item.setAppointmentStatus(o.getAppointmentStatus());
+				item.setDispatcher(o.getDispatcher());
 				item.setAppointmentType(o.getAppointmentMethod());
-				item.setOrderStatus(o.getOrderStatus()); // 预约单状态
-				item.setOrderStatusDesc(o.getOrderStatus()); // 预约单状态描述, TODO
+				item.setAppointmentStatus(o.getAppointmentStatus());
+				item.setOrderStatus(o.getOrderStatus()); // 订单状态
+				item.setServiceStatus(o.getServiceStatus());
+				item.setOrderStatusDesc(OrderStatus.valueOf(o.getOrderStatus()).getDescription());
 				item.setCreateTime(TimeUtils.IsoTimestamp2DateTime(o.getCreateTime()));
 
 				items.add(item);

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);

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

@@ -132,8 +132,11 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
 			record.setExpectTimeBegin(TimeUtils.IsoTimestamp2DateTime(o.getExpectTimeBegin()));
 			record.setExpectTimeEnd(TimeUtils.IsoTimestamp2DateTime(o.getExpectTimeEnd()));
 			record.setExpectTimeDesc(o.getExpectTimeDesc());
-			record.setAppointmentStatus(o.getAppointmentStatus());
 			record.setAppointmentType(o.getAppointmentMethod());
+			record.setAppointmentStatus(o.getAppointmentStatus());
+			record.setOrderStatus(o.getOrderStatus());
+			record.setServiceStatus(o.getServiceStatus());
+			record.setDispatcher(o.getDispatcher());
 			record.setCreateTime(TimeUtils.IsoTimestamp2DateTime(o.getCreateTime()));
 
 			content.add(record);