新增实现放回工单池

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

@@ -3,6 +3,7 @@ package com.dituhui.pea.order.controller;
 import com.dituhui.pea.common.BusinessException;
 import com.dituhui.pea.common.BusinessException;
 import com.dituhui.pea.common.Result;
 import com.dituhui.pea.common.Result;
 import com.dituhui.pea.order.dto.OrderAssignReq;
 import com.dituhui.pea.order.dto.OrderAssignReq;
+import com.dituhui.pea.order.dto.OrderRevokeAssign;
 import com.dituhui.pea.order.service.OrderAssign;
 import com.dituhui.pea.order.service.OrderAssign;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
@@ -40,4 +41,16 @@ public class OrderAssignController {
 		}
 		}
 		return res;
 		return res;
 	}
 	}
+
+	@PostMapping("/order/revoke/assign")
+	public Result<?> orderRevokeAssign(@RequestBody OrderRevokeAssign req){
+		// 放回工单池
+		Result<?> res = null;
+		try{
+			res = orderAssign.orderRevokeAssign(req.getOrderId());
+		} catch (BusinessException e){
+			return Result.failed(e.getMessage());
+		}
+		return res;
+	}
 }
 }

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

@@ -9,4 +9,6 @@ public interface OrderAssign {
 
 
 	// 服务单指派-指派提交
 	// 服务单指派-指派提交
 	Result<?> orderAssign(String orderId, String engineerCode);
 	Result<?> orderAssign(String orderId, String engineerCode);
+
+	Result<?> orderRevokeAssign(String orderId);
 }
 }

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

@@ -7,12 +7,14 @@ import com.dituhui.pea.common.Result;
 import com.dituhui.pea.order.common.TimeUtils;
 import com.dituhui.pea.order.common.TimeUtils;
 import com.dituhui.pea.order.dao.EngineerInfoMPDao;
 import com.dituhui.pea.order.dao.EngineerInfoMPDao;
 import com.dituhui.pea.order.dao.OrderAppointmentMPDao;
 import com.dituhui.pea.order.dao.OrderAppointmentMPDao;
+import com.dituhui.pea.order.dao.OrderEventMPDao;
 import com.dituhui.pea.order.dao.OrderRequestMPDao;
 import com.dituhui.pea.order.dao.OrderRequestMPDao;
 import com.dituhui.pea.order.dto.LabelValueDTO;
 import com.dituhui.pea.order.dto.LabelValueDTO;
 import com.dituhui.pea.order.dto.OrderAssignRecommendResp;
 import com.dituhui.pea.order.dto.OrderAssignRecommendResp;
 import com.dituhui.pea.order.dto.TimeLineDTO;
 import com.dituhui.pea.order.dto.TimeLineDTO;
 import com.dituhui.pea.order.entity.EngineerInfo;
 import com.dituhui.pea.order.entity.EngineerInfo;
 import com.dituhui.pea.order.entity.OrderAppointment;
 import com.dituhui.pea.order.entity.OrderAppointment;
+import com.dituhui.pea.order.entity.OrderEvent;
 import com.dituhui.pea.order.entity.OrderRequest;
 import com.dituhui.pea.order.entity.OrderRequest;
 import com.dituhui.pea.order.service.CommonService;
 import com.dituhui.pea.order.service.CommonService;
 import com.dituhui.pea.order.service.OrderAssign;
 import com.dituhui.pea.order.service.OrderAssign;
@@ -44,6 +46,9 @@ public class OrderAssignImpl implements OrderAssign {
 	@Autowired
 	@Autowired
 	private CommonService commonService;
 	private CommonService commonService;
 
 
+	@Autowired
+	private OrderEventMPDao orderEventMPDao;
+
 	@Transactional
 	@Transactional
 	@Override
 	@Override
 	public Result<?> getOrderAssignRecommendEngineers(String orderId, String key, String distance, String recommend) {
 	public Result<?> getOrderAssignRecommendEngineers(String orderId, String key, String distance, String recommend) {
@@ -159,6 +164,40 @@ public class OrderAssignImpl implements OrderAssign {
 		return Result.success(null);
 		return Result.success(null);
 	}
 	}
 
 
+	@Override
+	public Result<?> orderRevokeAssign(String orderId) throws BusinessException{
+		OrderRequest order = orderRequestMPDao.getByOrderId(orderId);
+		if (order == null){
+			throw new BusinessException("订单不存在");
+		}
+		// 更新order_request表为未指派
+		LambdaUpdateWrapper<OrderRequest> orderWrapper = new LambdaUpdateWrapper<>();
+		orderWrapper.set(OrderRequest::getAppointmentStatus, "NOT_ASSIGNED");
+		orderRequestMPDao.updateById(order);
+
+		// 更新order_appointment表为未指派
+		LambdaUpdateWrapper<OrderAppointment> appWrapper = new LambdaUpdateWrapper<>();
+		appWrapper.set(OrderAppointment::getStatus, "NOT_ASSIGNED")
+				.eq(OrderAppointment::getOrderId, orderId).eq(OrderAppointment::getDt, order.getDt());
+		orderAppointmentMPDao.update(null, appWrapper);
+
+		// 登记事件
+		OrderEvent oe = new OrderEvent();
+		oe.setOrderId(orderId);
+		oe.setSuborderId("");
+		oe.setHappen(new Timestamp(System.currentTimeMillis()));
+		oe.setEvent("放回工单池");
+		oe.setOperator("123"); // 操作员ID TODO-用户系统
+		oe.setOperatorName("测试用户"); // 操作员姓名 TODO-用户系统
+		oe.setOperator("PEA");
+		oe.setDescription("");
+		oe.setMemo("");
+		oe.setCreateTime(new Timestamp(System.currentTimeMillis()));
+		orderEventMPDao.insert(oe);
+
+		return null;
+	}
+
 	private List<OrderAppointment> queryOrderAppointments(String engineerCode, String date) {
 	private List<OrderAppointment> queryOrderAppointments(String engineerCode, String date) {
 		LambdaQueryWrapper<OrderAppointment> lqw = new LambdaQueryWrapper<>();
 		LambdaQueryWrapper<OrderAppointment> lqw = new LambdaQueryWrapper<>();
 		lqw.eq(OrderAppointment::getEngineerCode, engineerCode);
 		lqw.eq(OrderAppointment::getEngineerCode, engineerCode);