mybatisplus to jpa

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

@@ -27,16 +27,22 @@ public class ScheduleServiceImpl implements ScheduleService {
 	private OrderInfoMPDao orderInfoMPDao;
 	private OrderInfoMPDao orderInfoMPDao;
 
 
 	@Autowired
 	@Autowired
+	private OrderInfoDao orderInfoDao;
+
+	@Autowired
 	private OrgTeamMPDao orgTeamMPDao;
 	private OrgTeamMPDao orgTeamMPDao;
 
 
 	@Autowired
 	@Autowired
-	private OrgTeamEngineerMPDao orgTeamEngineerMPDao;
+	private OrgTeamEngineerDao orgTeamEngineerDao;
 
 
 	@Autowired
 	@Autowired
 	private OrgGroupMPDao orgGroupMPDao;
 	private OrgGroupMPDao orgGroupMPDao;
 
 
 	@Autowired
 	@Autowired
-	private EngineerInfoMPDao engineerInfoMPDao;
+	private OrgGroupDao orgGroupDao;
+
+	@Autowired
+	private EngineerInfoDao engineerInfoDao;
 
 
 	@Autowired
 	@Autowired
 	private SkillInfoMPDao skillInfoMPDao;
 	private SkillInfoMPDao skillInfoMPDao;
@@ -97,21 +103,22 @@ public class ScheduleServiceImpl implements ScheduleService {
 			}
 			}
 
 
 			// 获取team技术员列表
 			// 获取team技术员列表
-			List<OrgTeamEngineer> teamEngineers = this.queryOrgTeamEngineers(t.getTeamId());
-			List<String> engineerCodes = teamEngineers.stream().map(OrgTeamEngineer::getEngineerCode).collect(Collectors.toList());
-			List<EngineerInfo> engineerInfoList = engineerInfoMPDao.selectByEngineerCodes(engineerCodes);
-			Map<String, List<EngineerInfo>> engineers = engineerInfoList.stream().collect(Collectors.groupingBy(EngineerInfo::getEngineerCode));
+			List<OrgTeamEngineerEntity> teamEngineers = orgTeamEngineerDao.findAllByTeamId(t.getTeamId());
+			List<String> engineerCodes = teamEngineers.stream().map(OrgTeamEngineerEntity::getEngineerCode).collect(Collectors.toList());
+			List<EngineerInfoEntity> engineerInfoList = engineerInfoDao.findByEngineerCodeIn(engineerCodes);
+			Map<String, List<EngineerInfoEntity>> engineers = engineerInfoList.stream().collect(
+					Collectors.groupingBy(EngineerInfoEntity::getEngineerCode));
 
 
 			List<ScheduleOverviewResp.Item> children = new ArrayList<>();
 			List<ScheduleOverviewResp.Item> children = new ArrayList<>();
-			for (Map.Entry<String, List<EngineerInfo>> entry : engineers.entrySet()) {
+			for (Map.Entry<String, List<EngineerInfoEntity>> entry : engineers.entrySet()) {
 				ScheduleOverviewResp.Item child = new ScheduleOverviewResp.Item();
 				ScheduleOverviewResp.Item child = new ScheduleOverviewResp.Item();
 
 
 				//技术员信息
 				//技术员信息
 				String engineerCode = entry.getKey();
 				String engineerCode = entry.getKey();
-				EngineerInfo engineerInfo = entry.getValue().get(0);
+				EngineerInfoEntity engineerInfo = entry.getValue().get(0);
 
 
 				// 获取技术员已经指派的订单列表
 				// 获取技术员已经指派的订单列表
-				List<OrderInfo> orders2 =  engineerOrders.getOrDefault(engineerCode, new ArrayList<>());
+				List<OrderInfo> orders2 = engineerOrders.getOrDefault(engineerCode, new ArrayList<>());
 
 
 				child.setName(engineerInfo.getName());
 				child.setName(engineerInfo.getName());
 				child.setValue(engineerCode);
 				child.setValue(engineerCode);
@@ -144,28 +151,27 @@ public class ScheduleServiceImpl implements ScheduleService {
 	public Result<?> getScheduleEngineerOverview(LocalDate date, String engineerCode) throws BusinessException {
 	public Result<?> getScheduleEngineerOverview(LocalDate date, String engineerCode) throws BusinessException {
 		// 获取技术员已排班概况
 		// 获取技术员已排班概况
 
 
-		EngineerInfo engineer = engineerInfoMPDao.getByEngineerCode(engineerCode);
+		EngineerInfoEntity engineer = engineerInfoDao.getByEngineerCode(engineerCode);
 		if (engineer == null) {
 		if (engineer == null) {
 			throw new BusinessException("分销员不存在");
 			throw new BusinessException("分销员不存在");
 		}
 		}
 		List<LabelValueDTO> emptyTips = new ArrayList<>();
 		List<LabelValueDTO> emptyTips = new ArrayList<>();
 
 
-		LambdaQueryWrapper<OrderInfo> lqw = new LambdaQueryWrapper<>();
-		lqw.eq(OrderInfo::getDt, date).eq(OrderInfo::getEngineerCode, engineerCode).in(OrderInfo::getAppointmentStatus, List.of("PRE", "CONFIRM"));
-		List<OrderInfo> orderAppointments = orderInfoMPDao.selectList(lqw);
+		List<OrderInfoEntity> orderAppointments = orderInfoDao.findByEngineerCodeAndDtAndAppointmentStatusIn(
+				engineerCode, date, List.of("PRE", "CONFIRM"));
 		List<TimeLineDTO> timelines = new ArrayList<>();
 		List<TimeLineDTO> timelines = new ArrayList<>();
-		for (OrderInfo o : orderAppointments) {
+		for (OrderInfoEntity o : orderAppointments) {
 			TimeLineDTO item = new TimeLineDTO();
 			TimeLineDTO item = new TimeLineDTO();
 			item.setOrderId(o.getOrderId());
 			item.setOrderId(o.getOrderId());
 			item.setAppointmentStatus(o.getAppointmentStatus());
 			item.setAppointmentStatus(o.getAppointmentStatus());
-			item.setStartTime(TimeUtils.IsoTimestamp2DateTime(o.getPlanStartTime()));
-			item.setEndTime(TimeUtils.IsoTimestamp2DateTime(o.getPlanEndTime()));
+			item.setStartTime(TimeUtils.IsoLocalDateTime2String(o.getPlanStartTime()));
+			item.setEndTime(TimeUtils.IsoLocalDateTime2String(o.getPlanEndTime()));
 			item.setTips(emptyTips);
 			item.setTips(emptyTips);
 			timelines.add(item);
 			timelines.add(item);
 		}
 		}
 
 
-		Map<String, List<OrderInfo>> statusGroup = orderAppointments.stream().collect(Collectors.groupingBy(OrderInfo::getServiceStatus));
-		List<OrderInfo> empty = new ArrayList<>();
+		Map<String, List<OrderInfoEntity>> statusGroup = orderAppointments.stream().collect(Collectors.groupingBy(OrderInfoEntity::getServiceStatus));
+		List<OrderInfoEntity> empty = new ArrayList<>();
 		Integer countPending = statusGroup.getOrDefault("INIT", empty).size() + statusGroup.getOrDefault("CONTACTED", empty).size() + statusGroup.getOrDefault("PENDING", empty).size();
 		Integer countPending = statusGroup.getOrDefault("INIT", empty).size() + statusGroup.getOrDefault("CONTACTED", empty).size() + statusGroup.getOrDefault("PENDING", empty).size();
 
 
 		List<LabelValueDTO> dynamics = new ArrayList<>();
 		List<LabelValueDTO> dynamics = new ArrayList<>();
@@ -182,13 +188,13 @@ public class ScheduleServiceImpl implements ScheduleService {
 		dynamics.add(new LabelValueDTO("工作时间", "08:00-18:00"));
 		dynamics.add(new LabelValueDTO("工作时间", "08:00-18:00"));
 		dynamics.add(new LabelValueDTO("交通工具", "电动车"));
 		dynamics.add(new LabelValueDTO("交通工具", "电动车"));
 
 
-		List<String> orderIds = orderAppointments.stream().map(OrderInfo::getOrderId).collect(Collectors.toList());
-		List<OrderInfo> orderRequests = new ArrayList<>();
+		List<String> orderIds = orderAppointments.stream().map(OrderInfoEntity::getOrderId).collect(Collectors.toList());
+		List<OrderInfoEntity> orderRequests = new ArrayList<>();
 		if (orderIds != null && !orderIds.isEmpty()) {
 		if (orderIds != null && !orderIds.isEmpty()) {
-			orderRequests = orderInfoMPDao.selectByDtAndOrderIds(date, orderIds);
+			orderRequests = orderInfoDao.findAllByDtAndOrderIdIn(date, orderIds);
 		}
 		}
 		List<ScheduleEngineerOverviewResp.Order> orders = new ArrayList<>();
 		List<ScheduleEngineerOverviewResp.Order> orders = new ArrayList<>();
-		for (OrderInfo o : orderRequests) {
+		for (OrderInfoEntity o : orderRequests) {
 			ScheduleEngineerOverviewResp.Order item = new ScheduleEngineerOverviewResp.Order();
 			ScheduleEngineerOverviewResp.Order item = new ScheduleEngineerOverviewResp.Order();
 			item.setOrderId(o.getOrderId());
 			item.setOrderId(o.getOrderId());
 			item.setLocation(String.format("%s,%s", o.getX(), o.getY()));
 			item.setLocation(String.format("%s,%s", o.getX(), o.getY()));
@@ -207,7 +213,7 @@ public class ScheduleServiceImpl implements ScheduleService {
 		}
 		}
 
 
 		String groupName = "";
 		String groupName = "";
-		OrgGroup group = orgGroupMPDao.getByGroupId(engineer.getGroupId());
+		OrgGroupEntity group = orgGroupDao.getByGroupId(engineer.getGroupId());
 		if (group != null) {
 		if (group != null) {
 			groupName = group.getGroupName();
 			groupName = group.getGroupName();
 		}
 		}
@@ -240,13 +246,6 @@ public class ScheduleServiceImpl implements ScheduleService {
 		return pg;
 		return pg;
 	}
 	}
 
 
-	private List<OrgTeamEngineer> queryOrgTeamEngineers(String teamId) {
-		LambdaQueryWrapper<OrgTeamEngineer> lqw = new LambdaQueryWrapper<>();
-		lqw.eq(OrgTeamEngineer::getTeamId, teamId);
-		lqw.eq(OrgTeamEngineer::getStatus, 1);
-		return orgTeamEngineerMPDao.selectList(lqw);
-	}
-
 	private List<OrderInfo> queryOrderRequests(String teamId, LocalDate date) {
 	private List<OrderInfo> queryOrderRequests(String teamId, LocalDate date) {
 		LambdaQueryWrapper<OrderInfo> lqw = new LambdaQueryWrapper<>();
 		LambdaQueryWrapper<OrderInfo> lqw = new LambdaQueryWrapper<>();
 		lqw.eq(OrderInfo::getDt, date);
 		lqw.eq(OrderInfo::getDt, date);