fix：改约处理指派状态

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

@@ -336,7 +336,6 @@ public class OrderInfoServiceImpl implements OrderInfoService {
 
         String teamId = order.getOrgTeamId();
 
-        log.info("[orderReschedule] orderId:{} orderstatus: isToday:{},isBelong:{},isNetwork:{},isAssign:{}", order.getOrderId(), isToday, isBelong, isNetwork, isAssign);
         // 修改技能时处理工单耗时
         if (skillUpdate) {
             isAssign = true;
@@ -353,7 +352,8 @@ public class OrderInfoServiceImpl implements OrderInfoService {
                 }
             }
         }
-
+        log.info("[orderReschedule] orderId:{} orderstatus: isToday:{},isBelong:{},isNetwork:{},isAssign:{},skillUpdate:{}",
+                order.getOrderId(), isToday, isBelong, isNetwork, isAssign, skillUpdate);
         // 当天单变更技能直接人工指派
         if (isToday && skillUpdate) {
             if (isAssign) {
@@ -373,7 +373,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
                 order = orderFendan(order, req, location);
                 clusterId = order.getOrgClusterId();
                 branchId = order.getOrgBranchId();
-            } else if (isToday && isBelong && isAssign) {
+            } else if (isToday && isBelong) {
                 // b.已派人-改约到当天
                 //  i.自有:优先改约指派给当前工程师
                 //         (会影响该工程师当天后续工单的时
@@ -390,7 +390,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
                     service.setServiceType(order.getSkill());
                     CapacityQueryDTO.Segment capacity = capacityQueryService.queryEngineerCapacity(order.getEngineerCode(), service, order.getDt(), expectBegin.toLocalTime(), expectEnd.toLocalTime());
                     SkillInfoEntity skillInfo = skillInfoDao.getByBrandAndTypeAndSkill(order.getBrand(), order.getType(), order.getSkill());
-                    if (ObjectUtil.isNull(capacity) || capacity.getStatus() != 1 || capacity.getMaxDuration() > skillInfo.getTakeTime()) {
+                    if (ObjectUtil.isNull(capacity) || capacity.getStatus() != 1 || capacity.getMaxDuration() < skillInfo.getTakeTime()) {
                         order.setTranscend(1);
                         order = OrderUtil.handleErrorOrder(order);
                         clusterId = order.getOrgClusterId();
@@ -399,8 +399,6 @@ public class OrderInfoServiceImpl implements OrderInfoService {
                         order.setAppointmentMethod(AppointmentMethodEnum.MANUAL.name());
                         order.setAppointmentStatus(OrderFlowEnum.INIT.name());
                         sendMsg(order.getOrgBranchId(), order.getOrderId(), req.getExpectBegin());
-                    } else {
-                        order.setTranscend(1);
                     }
                 }
             } else if (!isToday && !isBelong) {
@@ -438,10 +436,10 @@ public class OrderInfoServiceImpl implements OrderInfoService {
             cutoff = CommonUtil.isCutoff(order.getExpectTimeBegin(), null);
         }
         // 当日单指派策略为人工指派，次日单动态排班自动批量
-        if (isToday || cutoff == 1) {
-            order.setAppointmentMethod(AppointmentMethodEnum.MANUAL.name());
-            order.setAppointmentStatus(OrderFlowEnum.INIT.name());
-        }
+        // if (isToday || cutoff == 1) {
+        //     order.setAppointmentMethod(AppointmentMethodEnum.MANUAL.name());
+        //     order.setAppointmentStatus(OrderFlowEnum.INIT.name());
+        // }
         order.setIsCutoff(cutoff);
         order.setIsSpecialTime(special);
         order.setOrgClusterId(clusterId);