Commit 24104b9a by huangjinxin

fix:1:工程师工单列表标签处理

2:工程师交通工具返回
1 parent 9b164c12
...@@ -93,5 +93,12 @@ public class DispatchEngineerOrderListResp { ...@@ -93,5 +93,12 @@ public class DispatchEngineerOrderListResp {
* 是否是特殊时间段,0否 1是 默认0 * 是否是特殊时间段,0否 1是 默认0
*/ */
private Integer isSpecialTime; private Integer isSpecialTime;
/**
* 是否是cutoff,0否 1是 默认0
*/
private Integer isCutoff = 0;
private String beanTags;
} }
} }
...@@ -109,6 +109,11 @@ public class OrderServiceList { ...@@ -109,6 +109,11 @@ public class OrderServiceList {
private String planEndTime; private String planEndTime;
/** /**
* 交通工具:1汽车;2电动车;3自行车;4步行 默认是汽车
*/
private String vehicle;
/**
* 常规出发地,1配件仓,2家庭住址,3工作地址 默认工作地址 * 常规出发地,1配件仓,2家庭住址,3工作地址 默认工作地址
*/ */
private Integer departure; private Integer departure;
......
...@@ -304,6 +304,8 @@ public class DispatchServiceImpl implements DispatchService { ...@@ -304,6 +304,8 @@ public class DispatchServiceImpl implements DispatchService {
item.setTranscend(o.getTranscend()); item.setTranscend(o.getTranscend());
item.setBeanPriority(o.getBeanPriority()); item.setBeanPriority(o.getBeanPriority());
item.setIsSpecialTime(o.getIsSpecialTime()); item.setIsSpecialTime(o.getIsSpecialTime());
item.setIsCutoff(o.getIsCutoff());
item.setBeanTags(o.getBeanTags());
if (isContinue && StringUtils.isNotEmpty(o.getMultipleOrders())) { if (isContinue && StringUtils.isNotEmpty(o.getMultipleOrders())) {
List<OrderInfoEntity> byMultipleOrders = orderInfoDao.findByMultipleOrdersAndOrderIdNot(o.getMultipleOrders(), o.getOrderId()); List<OrderInfoEntity> byMultipleOrders = orderInfoDao.findByMultipleOrdersAndOrderIdNot(o.getMultipleOrders(), o.getOrderId());
List<DispatchEngineerOrderListResp.OrderInfo> multipleItems = new ArrayList<>(); List<DispatchEngineerOrderListResp.OrderInfo> multipleItems = new ArrayList<>();
......
...@@ -139,6 +139,7 @@ public class OrderServiceListServiceImpl implements OrderServiceListService { ...@@ -139,6 +139,7 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
record.setDepartureX(businessEntity.getX()); record.setDepartureX(businessEntity.getX());
record.setDepartureY(businessEntity.getY()); record.setDepartureY(businessEntity.getY());
record.setDeparture(businessEntity.getDeparture()); record.setDeparture(businessEntity.getDeparture());
record.setVehicle(businessEntity.getVehicle());
} }
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!