修改

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

@@ -82,7 +82,7 @@ public class EngineerTimelineServiceImpl implements EngineerTimelineService {
 
 
 		CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder();
 		CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder();
 		CriteriaQuery<OrderEventEntity> criteriaQuery = criteriaBuilder.createQuery(OrderEventEntity.class);
 		CriteriaQuery<OrderEventEntity> criteriaQuery = criteriaBuilder.createQuery(OrderEventEntity.class);
-		Root<OrderEvent> root = criteriaQuery.from(OrderEvent.class);
+		Root<OrderEventEntity> root = criteriaQuery.from(OrderEventEntity.class);
 
 
 		List<Predicate> predicates = new ArrayList<>();
 		List<Predicate> predicates = new ArrayList<>();
 
 

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

@@ -200,10 +200,7 @@ public class OrderServiceDetailImpl implements OrderServiceDetail {
 		if (egCodes.isEmpty()) {
 		if (egCodes.isEmpty()) {
 			return map;
 			return map;
 		}
 		}
-		LambdaQueryWrapper<EngineerInfo> lqw = new LambdaQueryWrapper<>();
-		lqw.in(EngineerInfo::getEngineerCode, egCodes);
 		List<EngineerInfoEntity> rows = engineerInfoDao.findByEngineerCodeIn(egCodes);;
 		List<EngineerInfoEntity> rows = engineerInfoDao.findByEngineerCodeIn(egCodes);;
-
 		for (EngineerInfoEntity row : rows) {
 		for (EngineerInfoEntity row : rows) {
 			map.put(row.getEngineerCode(), row);
 			map.put(row.getEngineerCode(), row);
 		}
 		}