Merge branch 'dev_bugfix_label' into 'master'

Dev bugfix label

See merge request !114

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

@@ -255,6 +255,7 @@ public class DispatchServiceImpl implements DispatchService {
 			// 更新order request表状态
 			// 更新order request表状态
 			LambdaUpdateWrapper<OrderRequest> wrapper = new LambdaUpdateWrapper<>();
 			LambdaUpdateWrapper<OrderRequest> wrapper = new LambdaUpdateWrapper<>();
 			wrapper.set(OrderRequest::getAppointmentStatus, "ASSIGNED");
 			wrapper.set(OrderRequest::getAppointmentStatus, "ASSIGNED");
+			wrapper.set(OrderRequest::getAppointmentMethod, "MANUAL");
 			wrapper.eq(OrderRequest::getOrderId, orderId);
 			wrapper.eq(OrderRequest::getOrderId, orderId);
 			orderRequestMPDao.update(null, wrapper);
 			orderRequestMPDao.update(null, wrapper);
 		}
 		}

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

@@ -133,6 +133,7 @@ public class OrderAssignImpl implements OrderAssign {
 		// 更新order_request表状态
 		// 更新order_request表状态
 		LambdaUpdateWrapper<OrderRequest> wrapper = new LambdaUpdateWrapper<>();
 		LambdaUpdateWrapper<OrderRequest> wrapper = new LambdaUpdateWrapper<>();
 		wrapper.set(OrderRequest::getAppointmentStatus, "ASSIGNED");
 		wrapper.set(OrderRequest::getAppointmentStatus, "ASSIGNED");
+		wrapper.set(OrderRequest::getAppointmentMethod, "MANUAL");
 		wrapper.eq(OrderRequest::getOrderId, orderId);
 		wrapper.eq(OrderRequest::getOrderId, orderId);
 		orderRequestMPDao.update(null, wrapper);
 		orderRequestMPDao.update(null, wrapper);
 
 

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

@@ -298,12 +298,12 @@ public class OrderServiceDetailImpl implements OrderServiceDetail {
 				}
 				}
 			}
 			}
 
 
-			items.add(this.packEngineer("技术员:", eg.getName(), "engineer"));
-			items.add(this.packEngineer("小组:", groupName, ""));
-			items.add(this.packEngineer("类型:", kind, ""));
-			items.add(this.packEngineer("性别:", eg.getGender(), ""));
-			items.add(this.packEngineer("工号:", eg.getEngineerCode(), ""));
-			items.add(this.packEngineer("手机号:", eg.getPhone(), ""));
+			items.add(this.packEngineer("技术员", eg.getName(), "engineer"));
+			items.add(this.packEngineer("小组", groupName, ""));
+			items.add(this.packEngineer("类型", kind, ""));
+			items.add(this.packEngineer("性别", eg.getGender(), ""));
+			items.add(this.packEngineer("工号", eg.getEngineerCode(), ""));
+			items.add(this.packEngineer("手机号", eg.getPhone(), ""));
 		}
 		}
 
 
 		if (egSkill != null) {
 		if (egSkill != null) {
@@ -322,16 +322,16 @@ public class OrderServiceDetailImpl implements OrderServiceDetail {
 
 
 	private List<KV> packOrderDetail(OrderRequest order) {
 	private List<KV> packOrderDetail(OrderRequest order) {
 		List<KV> items = new ArrayList<>();
 		List<KV> items = new ArrayList<>();
-		items.add(this.packOrderItem("客户姓名:", order.getName()));
-		items.add(this.packOrderItem("标签:", order.getTags()));
-		items.add(this.packOrderItem("客户电话:", order.getPhone()));
-		items.add(this.packOrderItem("设备:", order.getType()));
-		items.add(this.packOrderItem("服务:", order.getSkill()));
-		items.add(this.packOrderItem("故障描述：", order.getFaultDescribe()));
-		items.add(this.packOrderItem("备注:", order.getApplyNote()));
-		items.add(this.packOrderItem("意向时间:", ""));
-		items.add(this.packOrderItem("时间要求:", order.getExpectTimeDesc()));
-		items.add(this.packOrderItem("预约方式:", order.getSource()));
+		items.add(this.packOrderItem("客户姓名", order.getName()));
+		items.add(this.packOrderItem("标签", order.getTags()));
+		items.add(this.packOrderItem("客户电话", order.getPhone()));
+		items.add(this.packOrderItem("设备", order.getType()));
+		items.add(this.packOrderItem("服务", order.getSkill()));
+		items.add(this.packOrderItem("故障描述", order.getFaultDescribe()));
+		items.add(this.packOrderItem("备注", order.getApplyNote()));
+		items.add(this.packOrderItem("意向时间", ""));
+		items.add(this.packOrderItem("时间要求", order.getExpectTimeDesc()));
+		items.add(this.packOrderItem("预约方式", order.getSource()));
 		return items;
 		return items;
 	}
 	}