Merge branch 'dev_assign' into 'develop'

修改

See merge request !186

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

@@ -170,6 +170,7 @@ public class OrderAssignImpl implements OrderAssign {
 		if (order == null){
 		if (order == null){
 			throw new BusinessException("订单不存在");
 			throw new BusinessException("订单不存在");
 		}
 		}
+
 		// 更新order_request表为未指派
 		// 更新order_request表为未指派
 		LambdaUpdateWrapper<OrderRequest> orderWrapper = new LambdaUpdateWrapper<>();
 		LambdaUpdateWrapper<OrderRequest> orderWrapper = new LambdaUpdateWrapper<>();
 		orderWrapper.set(OrderRequest::getAppointmentStatus, "NOT_ASSIGNED");
 		orderWrapper.set(OrderRequest::getAppointmentStatus, "NOT_ASSIGNED");
@@ -189,8 +190,8 @@ public class OrderAssignImpl implements OrderAssign {
 		oe.setEvent("放回工单池");
 		oe.setEvent("放回工单池");
 		oe.setOperator("123"); // 操作员ID TODO-用户系统
 		oe.setOperator("123"); // 操作员ID TODO-用户系统
 		oe.setOperatorName("测试用户"); // 操作员姓名 TODO-用户系统
 		oe.setOperatorName("测试用户"); // 操作员姓名 TODO-用户系统
-		oe.setOperator("PEA");
-		oe.setDescription("");
+		oe.setSource("PEA");
+		oe.setDescription("返回工单池");
 		oe.setMemo("");
 		oe.setMemo("");
 		oe.setCreateTime(new Timestamp(System.currentTimeMillis()));
 		oe.setCreateTime(new Timestamp(System.currentTimeMillis()));
 		orderEventMPDao.insert(oe);
 		orderEventMPDao.insert(oe);