Merge branch 'dev_engineer_dynamics0728' into 'develop'

修改为order_info表

See merge request !298

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

@@ -21,10 +21,7 @@ import java.util.stream.Stream;
 public class EngineerTimelineServiceImpl implements EngineerTimelineService {
 public class EngineerTimelineServiceImpl implements EngineerTimelineService {
 
 
 	@Autowired
 	@Autowired
-	private EngineerTimelineMPDao engineerTimelineMPDao;
-
-	@Autowired
-	private OrderAppointmentMPDao orderAppointmentMPDao;
+	private OrderInfoMPDao orderInfoMPDao;
 
 
 	@Autowired
 	@Autowired
 	private EngineerInfoMPDao engineerInfoMPDao;
 	private EngineerInfoMPDao engineerInfoMPDao;
@@ -51,10 +48,10 @@ public class EngineerTimelineServiceImpl implements EngineerTimelineService {
 		EngineerInfo engineerInfo = engineerInfoMPDao.getByEngineerCode(engineerCode);
 		EngineerInfo engineerInfo = engineerInfoMPDao.getByEngineerCode(engineerCode);
 
 
 		// 获取工程师date日的订单数据
 		// 获取工程师date日的订单数据
-		List<OrderAppointment> orders = orderAppointmentMPDao.selectByEngineerCodeAndDt(engineerCode, localDate);
+		List<OrderInfo> orders = this.selectEngineerOrders(engineerCode, localDate);
 
 
 		// 获取工程师已完成的timeline数据
 		// 获取工程师已完成的timeline数据
-		List<String> orderIds = orders.stream().map(OrderAppointment::getOrderId).collect(Collectors.toList());
+		List<String> orderIds = orders.stream().map(OrderInfo::getOrderId).collect(Collectors.toList());
 		List<OrderEvent> timelines = this.engineerTimelines(orderIds, date);
 		List<OrderEvent> timelines = this.engineerTimelines(orderIds, date);
 
 
 		// 获取客户地址
 		// 获取客户地址
@@ -73,6 +70,14 @@ public class EngineerTimelineServiceImpl implements EngineerTimelineService {
 		return Result.success(res);
 		return Result.success(res);
 	}
 	}
 
 
+	private List<OrderInfo> selectEngineerOrders(String engineerCode, LocalDate dt){
+		LambdaQueryWrapper<OrderInfo> lqw = new LambdaQueryWrapper<>();
+		lqw.eq(OrderInfo::getDt, dt);
+		lqw.eq(OrderInfo::getEngineerCode, engineerCode);
+		lqw.ne(OrderInfo::getOrderStatus, "CANCEL");
+		return orderInfoMPDao.selectList(lqw);
+	}
+
 	private List<OrderEvent> engineerTimelines(List<String> orderIds, String date){
 	private List<OrderEvent> engineerTimelines(List<String> orderIds, String date){
 		// 获取工程师timeline
 		// 获取工程师timeline
 		List<String> events = Stream.of("分站取还配件", "已出发", "加单").collect(Collectors.toList());
 		List<String> events = Stream.of("分站取还配件", "已出发", "加单").collect(Collectors.toList());