简化代码

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

@@ -73,7 +73,7 @@ public class ScheduleServiceImpl implements ScheduleService {
 			List<OrgTeamEngineer> teamEngineers = this.queryOrgTeamEngineers(t.getTeamId());
 
 			// 获取技术员列表
-			List<EngineerInfo> engineerInfoList = this.queryEngineerInfoByGroupId(t.getGroupId());
+			List<EngineerInfo> engineerInfoList = engineerInfoMPDao.selectByGroupId(t.getGroupId());
 			Map<String, List<EngineerInfo>> engineers = engineerInfoList.stream().collect(Collectors.groupingBy(EngineerInfo::getEngineerCode));
 
 			// 获取技术员对应的订单
@@ -150,22 +150,22 @@ public class ScheduleServiceImpl implements ScheduleService {
 		List<OrderAppointment> empty = new ArrayList<>();
 		Integer countPending = statusGroup.getOrDefault("ASSIGNED", empty).size() + statusGroup.getOrDefault("CONTACTED", empty).size() + statusGroup.getOrDefault("DEPARTED", empty).size();
 
-		List<ScheduleEngineerOverviewResp.Dynamic> dynamics = new ArrayList<>();
-		dynamics.add(this.packDynamic("姓名", engineer.getName()));
-		dynamics.add(this.packDynamic("日期", date));
-		dynamics.add(this.packDynamic("状态", "上班"));
-		dynamics.add(this.packDynamic("待服务", Integer.toString(countPending)));
-		dynamics.add(this.packDynamic("服务中", Integer.toString(statusGroup.getOrDefault("STARTED", empty).size())));
-		dynamics.add(this.packDynamic("已完成", Integer.toString(statusGroup.getOrDefault("FINISHED", empty).size())));
-		dynamics.add(this.packDynamic("已取消", Integer.toString(statusGroup.getOrDefault("CANCELED", empty).size())));
-		dynamics.add(this.packDynamic("已改约", Integer.toString(statusGroup.getOrDefault("RESCHEDULED", empty).size())));
-		dynamics.add(this.packDynamic("预计总耗时", "6小时"));
-		dynamics.add(this.packDynamic("公里数", "42公里"));
-		dynamics.add(this.packDynamic("工作时间", "08:00-18:00"));
-		dynamics.add(this.packDynamic("交通工具", "电动车"));
+		List<LabelValueDTO> dynamics = new ArrayList<>();
+		dynamics.add(new LabelValueDTO("姓名", engineer.getName()));
+		dynamics.add(new LabelValueDTO("日期", date));
+		dynamics.add(new LabelValueDTO("状态", "上班"));
+		dynamics.add(new LabelValueDTO("待服务", Integer.toString(countPending)));
+		dynamics.add(new LabelValueDTO("服务中", Integer.toString(statusGroup.getOrDefault("STARTED", empty).size())));
+		dynamics.add(new LabelValueDTO("已完成", Integer.toString(statusGroup.getOrDefault("FINISHED", empty).size())));
+		dynamics.add(new LabelValueDTO("已取消", Integer.toString(statusGroup.getOrDefault("CANCELED", empty).size())));
+		dynamics.add(new LabelValueDTO("已改约", Integer.toString(statusGroup.getOrDefault("RESCHEDULED", empty).size())));
+		dynamics.add(new LabelValueDTO("预计总耗时", "6小时"));
+		dynamics.add(new LabelValueDTO("公里数", "42公里"));
+		dynamics.add(new LabelValueDTO("工作时间", "08:00-18:00"));
+		dynamics.add(new LabelValueDTO("交通工具", "电动车"));
 
 		List<String> orderIds = orderAppointments.stream().map(OrderAppointment::getOrderId).collect(Collectors.toList());
-		List<OrderRequest> orderRequests = this.queryOrderRequestByOrderIds(orderIds);
+		List<OrderRequest> orderRequests = orderRequestMPDao.selectByOrderIds(orderIds);
 		List<ScheduleEngineerOverviewResp.Order> orders = new ArrayList<>();
 		for (OrderRequest o : orderRequests) {
 			ScheduleEngineerOverviewResp.Order item = new ScheduleEngineerOverviewResp.Order();
@@ -186,7 +186,7 @@ public class ScheduleServiceImpl implements ScheduleService {
 		}
 
 		String groupName = "";
-		OrgGroup group = this.queryOrgGroupInfo(engineer.getGroupId());
+		OrgGroup group = orgGroupMPDao.getByGroupId(engineer.getGroupId());
 		if (group != null) {
 			groupName = group.getGroupName();
 		}
@@ -234,12 +234,6 @@ public class ScheduleServiceImpl implements ScheduleService {
 		return orderRequestMPDao.selectList(lqw);
 	}
 
-	private List<OrderRequest> queryOrderRequestByOrderIds(List<String> orderIds) {
-		LambdaQueryWrapper<OrderRequest> lqw = new LambdaQueryWrapper<>();
-		lqw.in(OrderRequest::getOrderId, orderIds);
-		return orderRequestMPDao.selectList(lqw);
-	}
-
 	private List<OrderAppointment> queryOrderAppointments(List<String> orderIds, String date) {
 		LambdaQueryWrapper<OrderAppointment> lqw = new LambdaQueryWrapper<>();
 		lqw.in(OrderAppointment::getOrderId, orderIds);
@@ -256,24 +250,6 @@ public class ScheduleServiceImpl implements ScheduleService {
 		return orderAppointmentMPDao.selectList(lqw);
 	}
 
-	private List<EngineerInfo> queryEngineerInfoByGroupId(String groupId) {
-		LambdaQueryWrapper<EngineerInfo> lqw = new LambdaQueryWrapper<>();
-		lqw.eq(EngineerInfo::getGroupId, groupId);
-		return engineerInfoMPDao.selectList(lqw);
-	}
-
-	private EngineerInfo queryEngineerInfo(String engineerCode) {
-		LambdaQueryWrapper<EngineerInfo> lqw = new LambdaQueryWrapper<>();
-		lqw.eq(EngineerInfo::getEngineerCode, engineerCode);
-		return engineerInfoMPDao.selectOne(lqw);
-	}
-
-	private OrgGroup queryOrgGroupInfo(String groupId) {
-		LambdaQueryWrapper<OrgGroup> lqw = new LambdaQueryWrapper<>();
-		lqw.eq(OrgGroup::getGroupId, groupId);
-		return orgGroupMPDao.selectOne(lqw);
-	}
-
 	private ScheduleOverviewResp.OrderSum getTeamOrderSum(List<OrderRequest> orders) {
 
 		ScheduleOverviewResp.OrderSum s = new ScheduleOverviewResp.OrderSum();
@@ -288,11 +264,4 @@ public class ScheduleServiceImpl implements ScheduleService {
 		s.setCleanNum(cc.getOrDefault("清洗", emtpy).size());
 		return s;
 	}
-
-	private ScheduleEngineerOverviewResp.Dynamic packDynamic(String label, String value) {
-		ScheduleEngineerOverviewResp.Dynamic item = new ScheduleEngineerOverviewResp.Dynamic();
-		item.setLabel(label);
-		item.setValue(value);
-		return item;
-	}
 }