Merge branch 'dev_order_detail0728' into 'develop'

工单列表新增返回字段

See merge request !295

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