Merge branch 'dev_engineer_dynamics0728' into 'develop'

修改

See merge request !299

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

@@ -74,6 +74,7 @@ public class EngineerTimelineServiceImpl implements EngineerTimelineService {
 		LambdaQueryWrapper<OrderInfo> lqw = new LambdaQueryWrapper<>();
 		LambdaQueryWrapper<OrderInfo> lqw = new LambdaQueryWrapper<>();
 		lqw.eq(OrderInfo::getDt, dt);
 		lqw.eq(OrderInfo::getDt, dt);
 		lqw.eq(OrderInfo::getEngineerCode, engineerCode);
 		lqw.eq(OrderInfo::getEngineerCode, engineerCode);
+		lqw.ne(OrderInfo::getAppointmentStatus, "INIT");
 		lqw.ne(OrderInfo::getOrderStatus, "CANCEL");
 		lqw.ne(OrderInfo::getOrderStatus, "CANCEL");
 		return orderInfoMPDao.selectList(lqw);
 		return orderInfoMPDao.selectList(lqw);
 	}
 	}
@@ -127,7 +128,7 @@ public class EngineerTimelineServiceImpl implements EngineerTimelineService {
 	}
 	}
 
 
 
 
-	private List<EngineerTimelineResp.DynamicItem> packItems(List<OrderEvent> timelines, List<OrderAppointment> orders, HashMap<String, String> locations, String warehouseLocation) {
+	private List<EngineerTimelineResp.DynamicItem> packItems(List<OrderEvent> timelines, List<OrderInfo> orders, HashMap<String, String> locations, String warehouseLocation) {
 
 
 		int index = 0;
 		int index = 0;
 		String order_id, title, type, text, location;
 		String order_id, title, type, text, location;
@@ -166,15 +167,15 @@ public class EngineerTimelineServiceImpl implements EngineerTimelineService {
 			s.add(t.getOrderId() + t.getSuborderId());
 			s.add(t.getOrderId() + t.getSuborderId());
 		}
 		}
 
 
-		for(OrderAppointment o: orders){
-			order_id = o.getOrderId() + o.getSuborderId();
+		for(OrderInfo o: orders){
+			order_id = o.getOrderId() + o.getSubId();
 			if (s.contains(order_id)) {
 			if (s.contains(order_id)) {
 				continue;
 				continue;
 			}
 			}
 			index += 1;
 			index += 1;
 			EngineerTimelineResp.DynamicItem item = new EngineerTimelineResp.DynamicItem();
 			EngineerTimelineResp.DynamicItem item = new EngineerTimelineResp.DynamicItem();
 			item.setTitle(String.format("第%d单出发", index));
 			item.setTitle(String.format("第%d单出发", index));
-			item.setTime(TimeUtils.IsoTimestamp2DateTime(o.getExpectStartTime()));
+			item.setTime(TimeUtils.IsoTimestamp2DateTime(o.getPlanStartTime()));
 			item.setStatus(0);
 			item.setStatus(0);
 			item.setText(String.format("%d", index));
 			item.setText(String.format("%d", index));
 			item.setLocation(locations.get(o.getOrderId()));
 			item.setLocation(locations.get(o.getOrderId()));