Commit 6f4b7dee48424ce36f8af9eb7c5a2d5b9293934c
Merge branch 'minhang' of 192.168.168.201:panzhaov5/bsth_control into
minhang
Showing
2 changed files
with
2 additions
and
1 deletions
src/main/java/com/bsth/controller/forms/ExportController.java
| @@ -381,6 +381,7 @@ public class ExportController { | @@ -381,6 +381,7 @@ public class ExportController { | ||
| 381 | return resList; | 381 | return resList; |
| 382 | } | 382 | } |
| 383 | 383 | ||
| 384 | + | ||
| 384 | ////营运线路名称统计表 | 385 | ////营运线路名称统计表 |
| 385 | @RequestMapping(value = "/alllineExport", method = RequestMethod.POST) | 386 | @RequestMapping(value = "/alllineExport", method = RequestMethod.POST) |
| 386 | public List<Map<String, Object>> alllineExport(@RequestParam Map<String, Object> map) { | 387 | public List<Map<String, Object>> alllineExport(@RequestParam Map<String, Object> map) { |
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
| @@ -82,7 +82,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository<ScheduleRealI | @@ -82,7 +82,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository<ScheduleRealI | ||
| 82 | @Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 and s.scheduleDate = str_to_date(?4,'%Y-%m-%d') and bcType='normal' order by bcs") | 82 | @Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 and s.scheduleDate = str_to_date(?4,'%Y-%m-%d') and bcType='normal' order by bcs") |
| 83 | List<ScheduleRealInfo> queryListWaybill2(String jName,String clZbh,String lpName,String date); | 83 | List<ScheduleRealInfo> queryListWaybill2(String jName,String clZbh,String lpName,String date); |
| 84 | 84 | ||
| 85 | - @Query(value="select s from ScheduleRealInfo s where s.jGh = ?1 and s.clZbh = ?2 and s.scheduleDate = str_to_date(?3,'%Y-%m-%d') and bcType='normal' order by bcs") | 85 | + @Query(value="select s from ScheduleRealInfo s where s.jGh = ?1 and s.clZbh = ?2 and s.scheduleDate = str_to_date(?3,'%Y-%m-%d') order by bcs") |
| 86 | List<ScheduleRealInfo> queryListWaybill3(String jName,String clZbh,String date); | 86 | List<ScheduleRealInfo> queryListWaybill3(String jName,String clZbh,String date); |
| 87 | 87 | ||
| 88 | @Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2") | 88 | @Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2") |