fix：工单改约改约原因，技能耗时处理

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

@@ -238,7 +238,9 @@ public class OrderInfoServiceImpl implements OrderInfoService {
         order.setDt(expectBegin.toLocalDate());
         order.setDt(expectBegin.toLocalDate());
         order.setExpectTimeBegin(expectBegin);
         order.setExpectTimeBegin(expectBegin);
         order.setExpectTimeEnd(expectEnd);
         order.setExpectTimeEnd(expectEnd);
-        order.setExpectTimeDesc(req.getExpectDesc());
+        if (StringUtils.isNotBlank(req.getExpectDesc())) {
+            order.setExpectTimeDesc(req.getExpectDesc());
+        }
         order.setTranscend(0);
         order.setTranscend(0);
         order.setOrderStatus(OrderStatusEnum.RESCHEDULED.getCode());
         order.setOrderStatus(OrderStatusEnum.RESCHEDULED.getCode());
         order.setReschedulingReason(StringUtils.isNotBlank(req.getReschedulingReason()) ? req.getReschedulingReason() : order.getReschedulingReason());
         order.setReschedulingReason(StringUtils.isNotBlank(req.getReschedulingReason()) ? req.getReschedulingReason() : order.getReschedulingReason());
@@ -386,6 +388,14 @@ public class OrderInfoServiceImpl implements OrderInfoService {
             }
             }
         }
         }
 
 
+        // 修改技能时处理工单耗时
+        if (skillUpdate) {
+            SkillInfoEntity skillInfoEntity = skillInfoDao.getByBrandAndTypeAndSkill(order.getBrand(), order.getType(), order.getSkill());
+            if (ObjectUtil.isNull(skillInfoEntity)) {
+                return Result.failed(StatusCodeEnum.ORDER_SKILL_NOT_EXISTS);
+            }
+            order.setTakeTime(skillInfoEntity.getTakeTime());
+        }
 
 
         //处理一家多单
         //处理一家多单
         // order = handleMultipleOrders(order);
         // order = handleMultipleOrders(order);