潘钊 / bsth_control · Commits

Commit 1d95f7c6dcf50f0542df34c6e00a9d2e4f96ce5d

Authored by panzhaov5
2 parents 3528f512 ab516479
build: skipped

Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control into pudong

Inline Side-by-side
Showing 2 changed files with 3 additions and 3 deletions
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
  View file @1d95f7c
... ... @@ -105,7 +105,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository<ScheduleRealI
105 105 // List<ScheduleRealInfo> queryListWaybill3(String jName,String clZbh,String date,String gsbm,String fgsbm);
106 106  
107 107 @EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
108   - @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")
  108 + @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")
109 109 List<ScheduleRealInfo> scheduleByDateAndLineTjrb(String line,String date);
110 110  
111 111 @EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
... ... @@ -170,7 +170,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
170 170 List<ScheduleRealInfo> scheduleByDateAndLineQp2(String line,String date);
171 171  
172 172 @EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
173   - @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")
  173 + @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")
174 174 List<ScheduleRealInfo> scheduleByDateAndLine2(String line,String date);
175 175  
176 176 //按月统计
... ...
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
  View file @1d95f7c
... ... @@ -2528,7 +2528,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
2528 2528 Map<String, Object> Map = new HashMap<String, Object>();
2529 2529 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
2530 2530 // ScheduleRealInfo s = scheduleRealInfoRepository.scheduleById(scheduleRealInfos.get(0).getId());
2531   - ScheduleRealInfo s = scheduleRealInfos.get(0);
  2531 + ScheduleRealInfo s = lists.get(0);
2532 2532 String fcrq = s.getScheduleDateStr();
2533 2533 String jsy = s.getjGh();
2534 2534 String nbbm = s.getClZbh();
... ...