潘钊 / bsth_control · Commits

Commit 2ea4eec346d9fd8b42f3490a48b5479e64b03915

Authored by 廖磊
1 parent c4a16dd5
build: skipped

0113

Inline Side-by-side
Showing 2 changed files with 1 additions and 2 deletions
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
  View file @2ea4eec
... ... @@ -74,7 +74,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository<ScheduleRealI
74 74 @Query(value="select count(jName) from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 and sflj != 0")
75 75 int findLjbc(String jName,String clZbh,String lpName);
76 76  
77   - @Query(value="SELECT c.company,r.request_code,FROM_UNIXTIME(r.timestamp/1000,'%Y-%m-%d %T'),c.inside_code FROM bsth_v_report_80 r LEFT JOIN bsth_c_cars c ON c.equipment_code = r.device_id where FROM_UNIXTIME(r.timestamp/1000,'%Y-%m-%d') = ?2 and r.line_id = ?1 and c.inside_code = ?3",nativeQuery=true)
  77 + @Query(value="SELECT c.company,r.request_code,FROM_UNIXTIME(r.timestamp/1000,'%Y-%m-%d %T'),c.inside_code FROM bsth_v_report_80 r LEFT JOIN bsth_c_cars c ON c.equipment_code = r.device_id where FROM_UNIXTIME(r.timestamp/1000,'%Y-%m-%d') = ?2 and r.line_id = ?1 and c.inside_code like %?3%",nativeQuery=true)
78 78 List<Object[]> account(String line,String date,String code);
79 79  
80 80 @Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDate >= str_to_date(?2,'%Y-%m-%d') "
... ...
src/main/resources/static/pages/report/message/message.html
  View file @2ea4eec
... ... @@ -195,7 +195,6 @@
195 195 params[index] = $(this).text();
196 196 });
197 197 jName = params[1];
198   - console.log(jName);
199 198 line = $("#line").val();
200 199 date = $("#date").val();
201 200 $get('/realSchedule/historyMessage',{line:line,date:date,code:jName,type:"query"},function(result){
... ...