Commit 9f74cf12 by wangli

修改

1 parent db9963a0
......@@ -38,7 +38,6 @@ public class OrderAssignCheck {
@Autowired
EngineerBusinessMPDao engineerBusinessMPDao;
@Data
public class Result {
private Boolean canAssign;
......@@ -61,9 +60,7 @@ public class OrderAssignCheck {
public Result orderAssignCheck(String orderId, String engineerCode) {
log.info("begin orderAssignCheck:orderId={}, engineerCode={}", orderId, engineerCode);
log.info(">>>>>>>>:orderRequestMpDao:{}, is null :{}", orderRequestMPDao, orderRequestMPDao == null);
OrderRequest order = orderRequestMPDao.getByOrderId(orderId);
log.info(">>>>>>>:order:{}, order is null:{}", order, order == null);
double curX = Double.parseDouble(order.getX());
double curY = Double.parseDouble(order.getY());
......@@ -122,6 +119,10 @@ public class OrderAssignCheck {
}
orderIds.add(o.getOrderId());
}
if(orderIds.isEmpty()){
return orderSegments;
}
Map<String, List<OrderAppointment>> m = appointments.stream().collect(Collectors.groupingBy(OrderAppointment::getOrderId));
List<OrderRequest> orderRequests = orderRequestMPDao.selectByOrderIds(orderIds);
for(OrderRequest o: orderRequests) {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!