Commit da5ee96a by huangjinxin

fix:改约指派,改约原因展示

1 parent eba01e5e
......@@ -239,6 +239,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
order.setExpectTimeEnd(expectEnd);
order.setExpectTimeDesc(req.getExpectDesc());
order.setOrderStatus(OrderStatusEnum.RESCHEDULED.getCode());
order.setReschedulingReason(StringUtils.isNotBlank(req.getReschedulingReason()) ? req.getReschedulingReason() : order.getReschedulingReason());
boolean skillUpdate = false;
OrgGroupEntity orgGroupEntity = null;
if (StringUtils.isNotBlank(order.getOrgGroupId())) {
......@@ -304,7 +305,6 @@ public class OrderInfoServiceImpl implements OrderInfoService {
}
}
}
order.setReschedulingReason(StringUtils.isNotBlank(req.getReschedulingReason()) ? req.getReschedulingReason() : order.getReschedulingReason());
OrgGroupEntity groupEntity = orgGroupDao.getByGroupId(order.getOrgGroupId());
//是否今天
......@@ -408,7 +408,8 @@ public class OrderInfoServiceImpl implements OrderInfoService {
// 登记事件
commonService.addOrderEvent(req.getOrderId(), "", req.getOperator(), req.getOperator(), OrderEventEnum.recontracting.getEvent(),
String.format(OrderEventEnum.recontracting.getMsg(), engineerName + "-" + (ObjectUtil.isNotNull(orgTeamEntity) ? orgTeamEntity.getTeamName() : ""),
ObjectUtil.isNotNull(orgGroupEntity) ? orgGroupEntity.getGroupName() : "", req.getExpectBegin(), req.getReschedulingReason()), "");
ObjectUtil.isNotNull(orgGroupEntity) ? orgGroupEntity.getGroupName() : "", req.getExpectBegin(), req.getReschedulingReason()),
StringUtils.isNotBlank(req.getReschedulingReason()) ? "改约原因:" + req.getReschedulingReason() : "");
return Result.success(null);
}
......@@ -538,7 +539,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
*/
private OrderInfoEntity orderFendan(OrderInfoEntity order, OrderReschedule req, Location location) {
order.setServiceStatus(ServiceStatusEnum.INIT.getCode());
if (StringUtils.isBlank(req.getDescription())) {
if (StringUtils.isNotBlank(req.getDescription())) {
order.setDescription(order.getDescription());
}
//获取省市区
......@@ -570,8 +571,11 @@ public class OrderInfoServiceImpl implements OrderInfoService {
} else {
// 根据分单工作队,填写clusterId/branchId/groupId/teamId等
OrgTeamInfo teamInfo = fendanResult.getResult();
order.setOrgClusterId(teamInfo.getClusterId());
order.setOrgGroupId(teamInfo.getGroupId());
order.setOrgTeamId(teamInfo.getTeamId());
order.setAppointmentMethod(AppointmentMethodEnum.AUTO_BATCH.name());
order.setAppointmentStatus(OrderFlowEnum.INIT.name());
//处理超派,特殊时间段
// order.setIsSpecialTime(CommonUtil.isSpecial(order.getExpectTimeBegin().toLocalTime(),
// order.getExpectTimeEnd().toLocalTime(), teamInfo.getWorkOn(), teamInfo.getWorkOff()));
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!