Merge remote-tracking branch 'origin/develop' into develop

project-interface/src/main/java/com/dituhui/pea/enums/StatusCodeEnum.java

@@ -147,6 +147,8 @@ public enum StatusCodeEnum {
     ORDER_FINISHED("030", "订单已结束,请勿操作", false),
     ORDER_FINISHED("030", "订单已结束,请勿操作", false),
 
 
     FENDAN_IS_TRANSCEND_AND_SPECIAL("031", "分单超派和特殊时间", false),
     FENDAN_IS_TRANSCEND_AND_SPECIAL("031", "分单超派和特殊时间", false),
+
+    ENGINEER_IS_LEAVE_TIME("032", "工单（%s）指派失败！%s的工作日历在该时间段已有日程安排", false),
     ;
     ;
 
 
     /**
     /**

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

@@ -357,7 +357,7 @@ public class DispatchServiceImpl implements DispatchService {
             Result<OrderInfoEntity> entityResult = orderInfoService.insterEngineerOrders(engineerOrders, entity, skill, byTeamId, engineer);
             Result<OrderInfoEntity> entityResult = orderInfoService.insterEngineerOrders(engineerOrders, entity, skill, byTeamId, engineer);
             if (!entityResult.getCode().equals(ResultEnum.SUCCESS.getCode())) {
             if (!entityResult.getCode().equals(ResultEnum.SUCCESS.getCode())) {
                 // return Result.failed("当前工程师无法预约合适时间");
                 // return Result.failed("当前工程师无法预约合适时间");
-                errorList.add(entity.getOrderId());
+                errorList.add("单号:" + entity.getOrderId());
                 continue;
                 continue;
             }
             }
             entity = entityResult.getResult();
             entity = entityResult.getResult();
@@ -378,11 +378,9 @@ public class DispatchServiceImpl implements DispatchService {
             successList.add(entity.getOrderId());
             successList.add(entity.getOrderId());
         }
         }
         List<String> resultList = new ArrayList<>();
         List<String> resultList = new ArrayList<>();
-        if (CollectionUtils.isNotEmpty(successList)) {
-            resultList.add(String.format("%s订单指派(改派)成功", String.join(",", successList)));
-        }
         if (CollectionUtils.isNotEmpty(errorList)) {
         if (CollectionUtils.isNotEmpty(errorList)) {
-            resultList.add(String.format("%s订单指派(改派)失败,当前工程师无法预约合适时间", String.join(",", errorList)));
+            String msg = errorList.size() > 3 ? String.join(",", errorList.subList(0, 3)) + "..." : String.join(",", errorList);
+            resultList.add(String.format(StatusCodeEnum.ENGINEER_IS_LEAVE_TIME.getDesc(), msg, engineer.getName()));
         }
         }
         return Result.success(CollectionUtils.isNotEmpty(resultList) ? String.join(",", resultList) : null);
         return Result.success(CollectionUtils.isNotEmpty(resultList) ? String.join(",", resultList) : null);
     }
     }