行车路单批量导出排序

廖磊
1 parent ee3f408b
Showing 2 changed files with 3 additions and 3 deletions
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
@@ -105,7 +105,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 //	List<ScheduleRealInfo> queryListWaybill3(String jName,String clZbh,String date,String gsbm,String fgsbm);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDateStr = ?2  order by s.xlBm,s.clZbh,s.jGh,s.adjustExps,s.fcsj")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDateStr = ?2  order by s.xlBm,s.clZbh,s.jGh,s.realExecDate,s.fcsj")
 	List<ScheduleRealInfo> scheduleByDateAndLineTjrb(String line,String date);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
@@ -170,7 +170,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	List<ScheduleRealInfo> scheduleByDateAndLineQp2(String line,String date);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDateStr = ?2 and s.bcType not in ('in','out','ldks') order by s.xlBm,s.adjustExps,s.fcsj")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDateStr = ?2 and s.bcType not in ('in','out','ldks') order by s.xlBm,s.realExecDate,s.fcsj")
 	List<ScheduleRealInfo> scheduleByDateAndLine2(String line,String date);
 	//按月统计
@@ -2528,7 +2528,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		        Map<String, Object> Map = new HashMap<String, Object>();
 		        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
 //		        ScheduleRealInfo s = scheduleRealInfoRepository.scheduleById(scheduleRealInfos.get(0).getId());
-		        ScheduleRealInfo s = scheduleRealInfos.get(0);
+		        ScheduleRealInfo s = lists.get(0);
 		        String fcrq = s.getScheduleDateStr();
 		        String jsy = s.getjGh();
 		        String nbbm = s.getClZbh();