Commit 4e2b9dd7 by huangjinxin

fix:处理工单放回工单池

1 parent 13a582d6
...@@ -243,9 +243,9 @@ public class OrderAssignImpl implements OrderAssign { ...@@ -243,9 +243,9 @@ public class OrderAssignImpl implements OrderAssign {
} }
entity = entityResult.getResult(); entity = entityResult.getResult();
if (req.getIsSub()){ if (req.getIsSub()) {
entity.setEngineerCodeSub(engineer.getEngineerCode()); entity.setEngineerCodeSub(engineer.getEngineerCode());
}else { } else {
entity.setEngineerCode(engineer.getEngineerCode()); entity.setEngineerCode(engineer.getEngineerCode());
entity.setEngineerName(engineer.getName()); entity.setEngineerName(engineer.getName());
entity.setEngineerPhone(engineer.getPhone()); entity.setEngineerPhone(engineer.getPhone());
...@@ -280,6 +280,9 @@ public class OrderAssignImpl implements OrderAssign { ...@@ -280,6 +280,9 @@ public class OrderAssignImpl implements OrderAssign {
Integer cutoff = CommonUtil.isCutoff(order.getExpectTimeBegin(), orgTeam.getWorkOff()); Integer cutoff = CommonUtil.isCutoff(order.getExpectTimeBegin(), orgTeam.getWorkOff());
order.setAppointmentStatus(OrderFlowEnum.INIT.name()); order.setAppointmentStatus(OrderFlowEnum.INIT.name());
order.setServiceStatus(OrderFlowEnum.INIT.name()); order.setServiceStatus(OrderFlowEnum.INIT.name());
order.setPlanStartTime(order.getExpectTimeBegin());
order.setPlanEndTime(order.getExpectTimeEnd());
order = OrderUtil.handleSubOrder(order);
if (cutoff > 0) { if (cutoff > 0) {
// cutoff更新order_request表为人工指派 // cutoff更新order_request表为人工指派
order.setAppointmentMethod(AppointmentMethodEnum.MANUAL.name()); order.setAppointmentMethod(AppointmentMethodEnum.MANUAL.name());
......
...@@ -29,6 +29,20 @@ public class OrderUtil { ...@@ -29,6 +29,20 @@ public class OrderUtil {
order.setEngineerCode(null); order.setEngineerCode(null);
return order; return order;
} }
/**
* 分处理辅助工程师数据
*
* @param order
* @return
*/
public static OrderInfoEntity handleSubOrder(OrderInfoEntity order) {
order.setSubPlanStartTime(null);
order.setSubPlanEndTime(null);
order.setSubDistance(0);
order.setSubElapsed(0);
order.setEngineerCodeSub(null);
return order;
}
/** /**
* 分单,超派,特殊时间等处理工单指派工程师,网点等数据 * 分单,超派,特殊时间等处理工单指派工程师,网点等数据
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!