Commit 5cb582904cb23a646d39b071bb4c072f10f3c95e
1 parent
18f3a942
1230
Showing
3 changed files
with
3 additions
and
3 deletions
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
| @@ -71,7 +71,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository<ScheduleRealI | @@ -71,7 +71,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository<ScheduleRealI | ||
| 71 | @Query(value="select count(jName) from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 and sflj != 0") | 71 | @Query(value="select count(jName) from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 and sflj != 0") |
| 72 | int findLjbc(String jName,String clZbh,String lpName); | 72 | int findLjbc(String jName,String clZbh,String lpName); |
| 73 | 73 | ||
| 74 | - @Query(value="SELECT c.company,r.request_code,FROM_UNIXTIME(r.timestamp/1000,'%Y-%m-%d %T') 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) | 74 | + @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 like %?1% and c.inside_code like %?3%",nativeQuery=true) |
| 75 | List<Object[]> account(String line,String date,String code); | 75 | List<Object[]> account(String line,String date,String code); |
| 76 | 76 | ||
| 77 | @Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDate >= str_to_date(?2,'%Y-%m-%d') " | 77 | @Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDate >= str_to_date(?2,'%Y-%m-%d') " |
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
| @@ -1226,7 +1226,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -1226,7 +1226,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 1226 | if(obj != null){ | 1226 | if(obj != null){ |
| 1227 | map = new HashMap<String,Object>(); | 1227 | map = new HashMap<String,Object>(); |
| 1228 | map.put("xlName", xlName); | 1228 | map.put("xlName", xlName); |
| 1229 | - map.put("clZbh", code); | 1229 | + map.put("clZbh", obj[3]); |
| 1230 | map.put("company", obj[0]); | 1230 | map.put("company", obj[0]); |
| 1231 | map.put("requestType", "0x" + Integer.toHexString(Integer.parseInt(obj[1]+"")).toUpperCase()); | 1231 | map.put("requestType", "0x" + Integer.toHexString(Integer.parseInt(obj[1]+"")).toUpperCase()); |
| 1232 | map.put("requestTime", obj[2]); | 1232 | map.put("requestTime", obj[2]); |
src/main/resources/static/pages/forms/statement/account.html
| @@ -133,7 +133,7 @@ | @@ -133,7 +133,7 @@ | ||
| 133 | 133 | ||
| 134 | $("#query").on("click",function(){ | 134 | $("#query").on("click",function(){ |
| 135 | var line = $("#line").val(); | 135 | var line = $("#line").val(); |
| 136 | - var xlName = $("#line").text(); | 136 | + var xlName = $("#select2-line-container").html(); |
| 137 | var date = $("#date").val(); | 137 | var date = $("#date").val(); |
| 138 | var code = $("#code").val(); | 138 | var code = $("#code").val(); |
| 139 | $(".hidden").removeClass("hidden"); | 139 | $(".hidden").removeClass("hidden"); |