Merge branch 'feature_mvp616_wangl' into 'develop'

修改

See merge request !46

project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/DispatchServiceImpl.java

@@ -88,8 +88,17 @@ public class DispatchServiceImpl implements DispatchService {
 		return Result.success(res);
 		return Result.success(res);
 	}
 	}
 
 
+	@Transactional
 	@Override
 	@Override
 	public Result<?> getDispatchEngineerOrderList(String levelType, List<String> levelIds, String date) {
 	public Result<?> getDispatchEngineerOrderList(String levelType, List<String> levelIds, String date) {
+		// 获取groupIds
+		List<String> groupIds = this.queryOrgGroupIds(levelType, levelIds);
+
+		// 获取engineerCodes
+		List<String> engineerCodes = this.queryEngineerCodes(groupIds);
+
+		List<String> orderIds = this.queryOrderAppointmentOrderIds(engineerCodes, date);
+
 		return null;
 		return null;
 	}
 	}
 
 
@@ -114,15 +123,16 @@ public class DispatchServiceImpl implements DispatchService {
 		return orderRequestMPDao.selectList(lqw);
 		return orderRequestMPDao.selectList(lqw);
 	}
 	}
 
 
-	private List<OrderAppointment> queryOrderAppointments(List<String> engineerCodes, String date) {
+	private List<String> queryOrderAppointmentOrderIds(List<String> engineerCodes, String date) {
 		// 获取工程师服务单列表
 		// 获取工程师服务单列表
+		List<String> orderIds = new ArrayList<>();
+
 		LambdaQueryWrapper<OrderAppointment> lqw = new LambdaQueryWrapper<>();
 		LambdaQueryWrapper<OrderAppointment> lqw = new LambdaQueryWrapper<>();
 		lqw.in(OrderAppointment::getEngineerCode, engineerCodes);
 		lqw.in(OrderAppointment::getEngineerCode, engineerCodes);
-		lqw.eq(OrderAppointment::getStatus, "预指派");
 		lqw.ge(OrderAppointment::getExpectTime, this.DateString2Timestamp(date, "00:00:00"));
 		lqw.ge(OrderAppointment::getExpectTime, this.DateString2Timestamp(date, "00:00:00"));
 		lqw.le(OrderAppointment::getExpectTime, this.DateString2Timestamp(date, "23:59:59"));
 		lqw.le(OrderAppointment::getExpectTime, this.DateString2Timestamp(date, "23:59:59"));
-		orderAppointmentMPDao.selectList(lqw);
-		return null;
+		lqw.select(OrderAppointment::getOrderId);
+		return orderAppointmentMPDao.selectList(lqw).stream().map(OrderAppointment::getOrderId).collect(Collectors.toList());
 	}
 	}
 
 
 	private List<String> queryEngineerCodes(List<String> groupIds) {
 	private List<String> queryEngineerCodes(List<String> groupIds) {