修改

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

@@ -210,9 +210,9 @@ public class OrderCreateServiceImpl implements OrderCreateService {
             OrderAssignCheck.Result checkResult = null;
             log.info("=== 准备调用指派，候选的技术员列表: {}", matchEngineerCodes);
             for (String engineerCode : matchEngineerCodes) {
-                checkResult = orderAssignCheck.orderAssignCheck(entity.getOrderId(), engineerCode);
+                checkResult = orderAssignCheck.orderAssignCheck(entity.getOrderId(), entity.getDt(), engineerCode);
                 log.info("orderAssignCheck ===> orderId[{}]engineerCode[{}] ==> result[{}]", entity.getOrderId(), engineerCode, checkResult);
-                if (checkResult.getCanAssign()) {
+                if (checkResult.getIndex() < 0) {
                     assignEngineerCode = engineerCode;
                     break;
                 }
@@ -221,16 +221,18 @@ public class OrderCreateServiceImpl implements OrderCreateService {
             // 虚拟指派
             if (StringUtils.isNotBlank(assignEngineerCode)) {
                 // 修改当前工单
+                OrderAssignCheck.OrderNode insertNode = checkResult.getCurOrderNode();
+
                 entity.setEngineerCode(assignEngineerCode);
                 EngineerInfoEntity engineerInfo = engineerInfoDao.getByEngineerCode(assignEngineerCode);
                 entity.setEngineerName(engineerInfo.getName());
                 entity.setEngineerPhone(engineerInfo.getPhone());
                 entity.setAppointmentStatus("PRE");
                 entity.setDispatcher("AUTO_NOW");
-                entity.setPlanStartTime(checkResult.getStart());
-                entity.setPlanEndTime(checkResult.getEnd());
-                entity.setArriveDistance(checkResult.getDistanceAddition());
-                entity.setArriveElapsed(checkResult.getMinuteAddition());
+                entity.setPlanStartTime(insertNode.getPlanStartTime());
+                entity.setPlanEndTime(insertNode.getPlanEndTime());
+                entity.setArriveDistance(checkResult.getAdditionDistance());
+                entity.setArriveElapsed(checkResult.getAdditionElapsed());
                 orderInfoDao.save(entity);
 
                 // 如果影响到原有工单，修改原有工单