潘钊 / bsth_control · Commits

Commit 5a1ad71969d9143b9aa2a1423e28ade0ade31131

Authored by 廖磊
1 parent 2664aaee

调度日报去掉子任务换车

Inline Side-by-side
Showing 2 changed files with 10 additions and 3 deletions
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
  View file @5a1ad71
@@ -146,7 +146,14 @@ public interface ScheduleRealInfoRepository extends BaseRepository<ScheduleRealI @@ -146,7 +146,14 @@ public interface ScheduleRealInfoRepository extends BaseRepository<ScheduleRealI
146 @Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm =?1 and s.scheduleDateStr = ?2 order by s.lpName, s.realExecDate,s.fcsj") 146 @Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm =?1 and s.scheduleDateStr = ?2 order by s.lpName, s.realExecDate,s.fcsj")
147 List<ScheduleRealInfo> scheduleByDateAndLineQp(String line,String date); 147 List<ScheduleRealInfo> scheduleByDateAndLineQp(String line,String date);
148 148
149 - 149 + @EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
  150 + @Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm =?1 and s.scheduleDateStr = ?2 and s.ccService=0 order by s.lpName, s.realExecDate,s.fcsj")
  151 + List<ScheduleRealInfo> scheduleDdrb(String line,String date);
  152 +
  153 + @EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
  154 + @Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDateStr= ?2 order by s.xlDir,s.realExecDate,s.fcsj, s.lpName")
  155 + List<ScheduleRealInfo> scheduleDdrb2(String line,String date);
  156 +
150 @EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH) 157 @EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
151 @Query(value="select DISTINCT s from ScheduleRealInfo s where gsBm like %?1% and fgsBm like %?2% and s.scheduleDateStr = ?3 order by s.xlDir,s.realExecDate,s.fcsj, s.lpName") 158 @Query(value="select DISTINCT s from ScheduleRealInfo s where gsBm like %?1% and fgsBm like %?2% and s.scheduleDateStr = ?3 order by s.xlDir,s.realExecDate,s.fcsj, s.lpName")
152 List<ScheduleRealInfo> scheduleByDateAndLineByGs_(String gsdm,String fgsdm,String date); 159 List<ScheduleRealInfo> scheduleByDateAndLineByGs_(String gsdm,String fgsdm,String date);
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @5a1ad71
@@ -2727,7 +2727,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -2727,7 +2727,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2727 String zdsjActual = ""; 2727 String zdsjActual = "";
2728 String zdsj1 = ""; 2728 String zdsj1 = "";
2729 String zdsjActual1 = ""; 2729 String zdsjActual1 = "";
2730 - List<ScheduleRealInfo> listInfo = scheduleRealInfoRepository.scheduleByDateAndLineQp(line, date); 2730 + List<ScheduleRealInfo> listInfo = scheduleRealInfoRepository.scheduleDdrb(line, date);
2731 for (int i = 0; i < listInfo.size(); i++) { 2731 for (int i = 0; i < listInfo.size(); i++) {
2732 ScheduleRealInfo t = listInfo.get(i); 2732 ScheduleRealInfo t = listInfo.get(i);
2733 if (!lpName.equals(t.getLpName())) { 2733 if (!lpName.equals(t.getLpName())) {
@@ -2747,7 +2747,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -2747,7 +2747,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2747 list.add(t); 2747 list.add(t);
2748 } 2748 }
2749 2749
2750 - List<ScheduleRealInfo> listInfo2 = scheduleRealInfoRepository.scheduleByDateAndLineQp2(line, date); 2750 + List<ScheduleRealInfo> listInfo2 = scheduleRealInfoRepository.scheduleDdrb2(line, date);
2751 List<ScheduleRealInfo> xList = new ArrayList<ScheduleRealInfo>(); 2751 List<ScheduleRealInfo> xList = new ArrayList<ScheduleRealInfo>();
2752 List<ScheduleRealInfo> yList = new ArrayList<ScheduleRealInfo>(); 2752 List<ScheduleRealInfo> yList = new ArrayList<ScheduleRealInfo>();
2753 List<ScheduleRealInfo> zList = new ArrayList<ScheduleRealInfo>(); 2753 List<ScheduleRealInfo> zList = new ArrayList<ScheduleRealInfo>();