Commit 1b89bc40 by wangli

修改

1 parent 56a5f37b
......@@ -89,6 +89,7 @@ public class DispatchServiceImpl implements DispatchService {
@Transactional
@Override
public Result<?> getDispatchEngineerOrderList(String levelType, List<String> levelIds, String date) {
// 派工台技术员预约单列表
// 获取技能耗时
HashMap<String, Integer> skillTakeTime = this.querySkillTakeTime();
......@@ -107,8 +108,8 @@ public class DispatchServiceImpl implements DispatchService {
// 获取订单ID
Set<String> orderIds = new HashSet<>();
for(String k: engineerOrders.keySet()){
for(OrderAppointment o: engineerOrders.get(k)) {
for (String k : engineerOrders.keySet()) {
for (OrderAppointment o : engineerOrders.get(k)) {
orderIds.add(o.getOrderId());
}
}
......@@ -119,15 +120,9 @@ public class DispatchServiceImpl implements DispatchService {
List<DispatchEngineerOrderListResp.EngineerInfo> egs = new ArrayList<>();
for (EngineerInfo e : engineers) {
DispatchEngineerOrderListResp.EngineerInfo eg = new DispatchEngineerOrderListResp.EngineerInfo();
eg.setEngineerCode(e.getEngineerCode());
eg.setEngineerName(e.getName());
eg.setCapacity("");
eg.setCapacityStatus("");
eg.setCertificate(e.getCredentials());
// 获取技术员指派单的订单列表
List<DispatchEngineerOrderListResp.OrderInfo> items = new ArrayList<>();
for(OrderAppointment r: engineerOrders.get(e.getEngineerCode())) {
for (OrderAppointment r : engineerOrders.get(e.getEngineerCode())) {
DispatchEngineerOrderListResp.OrderInfo item = new DispatchEngineerOrderListResp.OrderInfo();
// 获取订单信息
OrderRequest o = orders.get(r.getEngineerCode()).get(0);
......@@ -153,9 +148,20 @@ public class DispatchServiceImpl implements DispatchService {
items.add(item);
}
}
return null;
DispatchEngineerOrderListResp.EngineerInfo eg = new DispatchEngineerOrderListResp.EngineerInfo();
eg.setOrders(items);
eg.setEngineerCode(e.getEngineerCode());
eg.setEngineerName(e.getName());
eg.setCapacity("");
eg.setCapacityStatus("");
eg.setCertificate(e.getCredentials());
egs.add(eg);
}
DispatchEngineerOrderListResp res = new DispatchEngineerOrderListResp();
res.setEngineers(egs);
return Result.success(res);
}
@Override
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!