Skip to content

yangxiujun / paidan_demo

Go to a project
Commit 33bcfac4 by 刘鑫
Options

Merge branch 'develop' of https://gitlab.dituhui.com/bsh/project/project into develop

2 parents 83c93760 16fedfb1
Inline Side-by-side
Showing with 13 additions and 1 deletions
project-order/src/main/java/com/dituhui/pea/order/dto/DispatchEngineerOrderListResp.java
...@@ -53,6 +53,9 @@ public class DispatchEngineerOrderListResp { ...@@ -53,6 +53,9 @@ public class DispatchEngineerOrderListResp {
private String groupTag; private String groupTag;
private Integer groupWeight; private Integer groupWeight;
private String expectTimeBegin;
private String expectTimeEnd;
/** /**
* 一家多单id，有则多条订单关联，没有则不是一家多单 * 一家多单id，有则多条订单关联，没有则不是一家多单
*/ */
......
project-order/src/main/java/com/dituhui/pea/order/dto/DispatchOrderListResp.java
...@@ -41,6 +41,9 @@ public class DispatchOrderListResp { ...@@ -41,6 +41,9 @@ public class DispatchOrderListResp {
private String groupTag; private String groupTag;
private Integer groupWeight; private Integer groupWeight;
private String expectTimeBegin;
private String expectTimeEnd;
/** /**
* 一家多单id，有则多条订单关联，没有则不是一家多单 * 一家多单id，有则多条订单关联，没有则不是一家多单
*/ */
......
project-order/src/main/java/com/dituhui/pea/order/service/impl/DispatchServiceImpl.java
...@@ -130,6 +130,8 @@ public class DispatchServiceImpl implements DispatchService { ...@@ -130,6 +130,8 @@ public class DispatchServiceImpl implements DispatchService {
item.setOrderStatus(o.getOrderStatus()); item.setOrderStatus(o.getOrderStatus());
item.setServiceStatus(o.getServiceStatus()); item.setServiceStatus(o.getServiceStatus());
item.setCreateTime(TimeUtils.IsoLocalDateTime2String(o.getCreateTime())); item.setCreateTime(TimeUtils.IsoLocalDateTime2String(o.getCreateTime()));
item.setExpectTimeBegin(TimeUtils.IsoLocalDateTime2String(o.getExpectTimeBegin()));
item.setExpectTimeEnd(TimeUtils.IsoLocalDateTime2String(o.getExpectTimeEnd()));
String[] tags = gt.getGroupTag(o).split("#"); String[] tags = gt.getGroupTag(o).split("#");
item.setGroupTag(tags[0]); // 设置tag名称 item.setGroupTag(tags[0]); // 设置tag名称
...@@ -303,6 +305,8 @@ public class DispatchServiceImpl implements DispatchService { ...@@ -303,6 +305,8 @@ public class DispatchServiceImpl implements DispatchService {
item.setServiceStatus(OrderUtil.handleServiceStatus(o)); item.setServiceStatus(OrderUtil.handleServiceStatus(o));
item.setOrderStatusDesc(OrderStatusEnum.valueOf(o.getOrderStatus()).getDescription()); item.setOrderStatusDesc(OrderStatusEnum.valueOf(o.getOrderStatus()).getDescription());
item.setCreateTime(TimeUtils.IsoLocalDateTime2String(o.getCreateTime())); item.setCreateTime(TimeUtils.IsoLocalDateTime2String(o.getCreateTime()));
item.setExpectTimeBegin(TimeUtils.IsoLocalDateTime2String(o.getExpectTimeBegin()));
item.setExpectTimeEnd(TimeUtils.IsoLocalDateTime2String(o.getExpectTimeEnd()));
item.setMultipleOrders(o.getMultipleOrders()); item.setMultipleOrders(o.getMultipleOrders());
item.setIsMultiple(o.getIsMultiple()); item.setIsMultiple(o.getIsMultiple());
...@@ -475,6 +479,8 @@ public class DispatchServiceImpl implements DispatchService { ...@@ -475,6 +479,8 @@ public class DispatchServiceImpl implements DispatchService {
item.setOrderStatus(o.getOrderStatus()); item.setOrderStatus(o.getOrderStatus());
item.setServiceStatus(o.getServiceStatus()); item.setServiceStatus(o.getServiceStatus());
item.setCreateTime(TimeUtils.IsoLocalDateTime2String(o.getCreateTime())); item.setCreateTime(TimeUtils.IsoLocalDateTime2String(o.getCreateTime()));
item.setExpectTimeBegin(TimeUtils.IsoLocalDateTime2String(o.getExpectTimeBegin()));
item.setExpectTimeEnd(TimeUtils.IsoLocalDateTime2String(o.getExpectTimeEnd()));
item.setMultipleOrders(o.getMultipleOrders()); item.setMultipleOrders(o.getMultipleOrders());
item.setIsMultiple(o.getIsMultiple()); item.setIsMultiple(o.getIsMultiple());
......
project-order/src/main/java/com/dituhui/pea/order/service/impl/ScheduleServiceImpl.java
...@@ -117,7 +117,7 @@ public class ScheduleServiceImpl implements ScheduleService { ...@@ -117,7 +117,7 @@ public class ScheduleServiceImpl implements ScheduleService {
team.setLevel("team"); team.setLevel("team");
// 获取改team订单列表 // 获取改team订单列表
List<OrderInfoEntity> orders = orderInfoDao.findByDtAndOrgTeamIdAndAppointmentStatusIn(date, t.getTeamId(), List.of(OrderFlowEnum.INIT.name(), OrderFlowEnum.PRE.name(), OrderFlowEnum.CONFIRM.name())); List<OrderInfoEntity> orders = orderInfoDao.findByDtAndOrgTeamIdAndAppointmentStatusIn(date, t.getTeamId(), List.of(OrderFlowEnum.PRE.name(), OrderFlowEnum.CONFIRM.name()));
team.setOrder(this.getTeamOrderSum(orders, skillMapping)); team.setOrder(this.getTeamOrderSum(orders, skillMapping));
// 技术员指派单列表 // 技术员指派单列表
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!