调度历史消息sql查询车辆改为非必选；行车路单展示氢能源车耗能

娄高锋
1 parent 3fc3dfb3
Showing 2 changed files with 5 additions and 5 deletions
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/resources/static/pages/forms/statement/waybill.html
@@ -50,7 +50,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select d.device_id,d.sender,d.txt_content,d.timestamp,d.line_code, "
 			+ " d.reply46,d.reply47 from "
-			+ " bsth_v_directive_60 d where d.line_code=?1 and d.device_id=?2 "
+			+ " bsth_v_directive_60 d where d.line_code=?1 and d.device_id like %?2% "
 			+ " and d.timestamp >=?3 and d.timestamp <=?4 ",nativeQuery=true)
 	List<Object[]> historyMessage(String line,String code,long d,long t);
@@ -440,7 +440,7 @@
           <td colspan="14">路别:{{xlName}}   路牌:{{lpName}}   车号:{{clZbh}}({{plate}})   出场时间:{{fcsjActual}}   到达站名:{{zdzName}}   当班调派:{{dbdp}}   日期:{{scheduleDate}}</td>
       </tr>
       <tr>
-		{{if type==0}}  
+		{{if type==0 && hyd!=1}}  
           <td colspan="2">出场存油 {{ccyl}}升</td>
           <td colspan="2">加注量 {{jzl}}升</td>
           <td colspan="2">进场存油 {{jcyl}}升</td>
@@ -465,11 +465,11 @@
       </tr>
 	  {{if hyd==1}}
 		<tr>
-		  <td colspan="2">出场存氢 {{czql}}%</td>
+		  <td colspan="2">出场存氢 {{czcl}}%</td>
           <td colspan="2">充氢量 {{jql}}方</td>
-          <td colspan="2">进场存氢 {{jzql}}%</td>
+          <td colspan="2">进场存氢 {{jzcl}}%</td>
           <td colspan="4">加注机油 &nbsp;升</td>
-          <td colspan="4">本日耗氢 {{hq}}方</td>
+          <td colspan="4">本日耗氢 {{hn}}方</td>
 		</tr>
 	  {{/if}}
       <tr>