Merge branch 'dev_bugfix_schedue' into 'master'

修改

See merge request !144

project-order/src/main/java/com/dituhui/pea/order/service/impl/ScheduleServiceImpl.java

@@ -17,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -62,11 +63,12 @@ public class ScheduleServiceImpl implements ScheduleService {
 			List<OrderRequest> orders = this.queryOrderRequests(t.getTeamId(), date);
 			team.setOrder(this.getTeamOrderSum(orders));
 
-			List<ScheduleOverviewResp.Item> children = new ArrayList<>();
-			if (orders == null || orders.isEmpty()) {
-				team.setChildren(children);
-				teams.add(team);
-				continue;
+			// 技术员指派单列表
+			Map<String, List<OrderAppointment>> engineerOrders = new HashMap<>();
+			if (orders != null && !orders.isEmpty()) {
+				List<String> orderRequestIds = orders.stream().map(OrderRequest::getOrderId).collect(Collectors.toList());
+				List<OrderAppointment> orderAppointments = this.queryOrderAppointments(orderRequestIds, date);
+				engineerOrders = orderAppointments.stream().collect(Collectors.groupingBy(OrderAppointment::getEngineerCode));
 			}
 
 			// 获取team技术员列表
@@ -76,16 +78,15 @@ public class ScheduleServiceImpl implements ScheduleService {
 			List<EngineerInfo> engineerInfoList = engineerInfoMPDao.selectByGroupId(t.getGroupId());
 			Map<String, List<EngineerInfo>> engineers = engineerInfoList.stream().collect(Collectors.groupingBy(EngineerInfo::getEngineerCode));
 
-			// 获取技术员对应的订单
-			List<String> orderRequestIds = orders.stream().map(OrderRequest::getOrderId).collect(Collectors.toList());
-			List<OrderAppointment> orderAppointments = this.queryOrderAppointments(orderRequestIds, date);
-			Map<String, List<OrderAppointment>> engineerOrders = orderAppointments.stream().collect(Collectors.groupingBy(OrderAppointment::getEngineerCode));
+			List<ScheduleOverviewResp.Item> children = new ArrayList<>();
+			for (Map.Entry<String, List<EngineerInfo>> entry : engineers.entrySet()) {
 
-			for (Map.Entry<String, List<OrderAppointment>> entry : engineerOrders.entrySet()) {
 				ScheduleOverviewResp.Item child = new ScheduleOverviewResp.Item();
 
 				String engineerCode = entry.getKey();
-				List<String> orderIds = entry.getValue().stream().map(OrderAppointment::getOrderId).collect(Collectors.toList());
+				EngineerInfo engineerInfo = entry.getValue().get(0);
+
+				List<String> orderIds = engineerOrders.getOrDefault(engineerCode, new ArrayList<>()).stream().map(OrderAppointment::getOrderId).collect(Collectors.toList());
 
 				List<OrderRequest> orders2 = new ArrayList<>();
 				for (OrderRequest o : orders) {
@@ -94,20 +95,16 @@ public class ScheduleServiceImpl implements ScheduleService {
 					}
 				}
 
-				// 设置技术员姓名
-				List<EngineerInfo> es = engineers.get(engineerCode);
-				if (es == null || es.isEmpty()) {
-					child.setName(engineerCode);
-				} else {
-					child.setName(es.get(0).getName());
-				}
+				child.setName(engineerInfo.getName());
 				child.setValue(engineerCode);
 				child.setLevel("engineer");
 				child.setOrder(this.getTeamOrderSum(orders2));
 				child.setOrderDesc(Integer.toString(orders2.size()));
 				child.setDistanceDesc("");
+
 				children.add(child);
 			}
+
 			team.setChildren(children);
 
 			team.setOrderDesc(String.format("人均:%d", orders.size() / teamEngineers.size()));