Merge branch 'dev_order_info0725' into 'develop'

修改

See merge request !274

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

@@ -150,7 +150,9 @@ public class ScheduleServiceImpl implements ScheduleService {
 		}
 		}
 		List<LabelValueDTO> emptyTips = new ArrayList<>();
 		List<LabelValueDTO> emptyTips = new ArrayList<>();
 
 
-		List<OrderInfo> orderAppointments = orderInfoMPDao.selectByEngineerCodeAndDtAndAppointmentStatus(engineerCode, date, "CONFIRM");
+		LambdaQueryWrapper<OrderInfo> lqw = new LambdaQueryWrapper<>();
+		lqw.eq(OrderInfo::getDt, date).eq(OrderInfo::getEngineerCode, engineer).in(OrderInfo::getAppointmentStatus, List.of("PRE", "CONFIRM"));
+		List<OrderInfo> orderAppointments = orderInfoMPDao.selectList(lqw);
 		List<TimeLineDTO> timelines = new ArrayList<>();
 		List<TimeLineDTO> timelines = new ArrayList<>();
 		for (OrderInfo o : orderAppointments) {
 		for (OrderInfo o : orderAppointments) {
 			TimeLineDTO item = new TimeLineDTO();
 			TimeLineDTO item = new TimeLineDTO();