Commit 3cff7399 by 刘鑫

fix(ID1004132): 博西PEA_V1.0-改派:勾选的工程师工作日历与工单意向时间冲突时,提示语优化

1 parent c48de84e
......@@ -214,7 +214,8 @@ public class OrderAssignImpl implements OrderAssign {
@Override
public Result<?> orderAssign(OrderAssignReq req) throws BusinessException {
// 服务单指派-指派提交
OrderInfoEntity entity = orderInfoDao.getByOrderId(req.getOrderId());
String orderId = req.getOrderId();
OrderInfoEntity entity = orderInfoDao.getByOrderId(orderId);
if (entity == null) {
return Result.failed("订单不存在");
}
......@@ -234,7 +235,9 @@ public class OrderAssignImpl implements OrderAssign {
List<OrderInfoEntity> engineerOrders = orderInfoDao.findByDtAndEngineerCode(entity.getDt(), engineer.getEngineerCode());
Result<OrderInfoEntity> entityResult = orderInfoService.insterEngineerOrders(engineerOrders, entity, skill, byTeamId, engineer);
if (!entityResult.getCode().equals(ResultEnum.SUCCESS.getCode())) {
return Result.failed("当前工程师工单已满");
String desc = StatusCodeEnum.ENGINEER_IS_LEAVE_TIME.getDesc();
desc = String.format(desc, orderId, engineer.getName());
return new Result(StatusCodeEnum.ENGINEER_IS_LEAVE_TIME.getCode(), desc, null);
}
entity = entityResult.getResult();
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!