潘钊 / bsth_control · Commits

Commit de27418397bd02d89f6951126d138f26677f7204

Authored by 廖磊
1 parent 1f466d89
build: skipped

大间隔修改为万班次发生率

Inline Side-by-side
Showing 4 changed files with 17 additions and 19 deletions
src/main/java/com/bsth/service/calc/impl/CalcIntervalServiceImpl.java
  View file @de27418
@@ -123,9 +123,11 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl<CalcInterval,Intege @@ -123,9 +123,11 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl<CalcInterval,Intege
123 } 123 }
124 }); 124 });
125 }else{ 125 }else{
  126 + //统计信息中需要查询所有班次
  127 +// and djg_all >0
126 String sql="select gsbm,fgsbm,xl_bm,xl_name,SUM(bcs) as bcs,MAX(id) as id,SUM(djg_all) as djgAll,SUM(djg_gf) as djgGf," 128 String sql="select gsbm,fgsbm,xl_bm,xl_name,SUM(bcs) as bcs,MAX(id) as id,SUM(djg_all) as djgAll,SUM(djg_gf) as djgGf,"
127 + "SUM(djg_dg) as djgDg,SUM(djg_zgf) as djgZgf,SUM(djg_wgf) as djgWgf,MAX(djg_time) as djgTime " 129 + "SUM(djg_dg) as djgDg,SUM(djg_zgf) as djgZgf,SUM(djg_wgf) as djgWgf,MAX(djg_time) as djgTime "
128 - + "from bsth_c_calc_interval where date>= '"+sDate+"' and date<='"+eDate+"' and level <> 'D' and djg_all >0 "; 130 + + "from bsth_c_calc_interval where date>= '"+sDate+"' and date<='"+eDate+"' and level <> 'D' ";
129 if(line.equals("")){ 131 if(line.equals("")){
130 if(fgs.equals("")){ 132 if(fgs.equals("")){
131 sql +=" and gsbm = '"+gs+"'"; 133 sql +=" and gsbm = '"+gs+"'";
@@ -150,12 +152,12 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege @@ -150,12 +152,12 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
150 m.put("id", rs.getInt("id")); 152 m.put("id", rs.getInt("id"));
151 int djgAll=rs.getInt("djgAll"); 153 int djgAll=rs.getInt("djgAll");
152 int bcs=rs.getInt("bcs"); 154 int bcs=rs.getInt("bcs");
153 - //全日发生率 （大间隔次数/全日班次数） 155 + //万班次发生率 （大间隔次数/全日班次数*10000）
154 if(bcs>0){ 156 if(bcs>0){
155 - double fsl=(djgAll*1.0)/(bcs*1.0)*100;  
156 - m.put("fsl", df.format(fsl)+"%"); 157 + double fsl=(djgAll*1.0)/(bcs*1.0)*10000;
  158 + m.put("fsl", df.format(fsl));
157 }else{ 159 }else{
158 - m.put("fsl", "0.0%"); 160 + m.put("fsl", "0.0");
159 } 161 }
160 m.put("djgAll", rs.getString("djgAll")); 162 m.put("djgAll", rs.getString("djgAll"));
161 m.put("djgGf", rs.getString("djgGf")); 163 m.put("djgGf", rs.getString("djgGf"));
@@ -243,12 +245,12 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege @@ -243,12 +245,12 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
243 m.put("djgDg", t.getDjgDg()); 245 m.put("djgDg", t.getDjgDg());
244 int djgAll=t.getDjgAll(); 246 int djgAll=t.getDjgAll();
245 int bcs=t.getBcs(); 247 int bcs=t.getBcs();
246 - //全日发生率 （大间隔次数/全日班次数） 248 + //全日发生率 （大间隔次数/全日班次数*10000） 万班次发生率
247 if(bcs>0){ 249 if(bcs>0){
248 - double fsl=(djgAll*1.0)/(bcs*1.0)*100;  
249 - m.put("fsl", df.format(fsl)+"%"); 250 + double fsl=(djgAll*1.0)/(bcs*1.0)*10000;
  251 + m.put("fsl", df.format(fsl));
250 }else{ 252 }else{
251 - m.put("fsl", "0.0%"); 253 + m.put("fsl", "0.0");
252 } 254 }
253 m.put("bcs", t.getBcs()); 255 m.put("bcs", t.getBcs());
254 m.put("djgTime", t.getDjgTime()); 256 m.put("djgTime", t.getDjgTime());
src/main/resources/static/pages/forms/mould/calcIntervalCount.xls
View file @de27418
No preview for this file type
src/main/resources/static/pages/forms/mould/calcIntervalList1.xls
View file @de27418
No preview for this file type
src/main/resources/static/pages/report/sheet/intervalCount.html
  View file @de27418
@@ -79,7 +79,7 @@ @@ -79,7 +79,7 @@
79 <td>晚高峰次数</td> 79 <td>晚高峰次数</td>
80 <td>低谷次数</td> 80 <td>低谷次数</td>
81 <td>全日班次数</td> 81 <td>全日班次数</td>
82 - <td>全日发生率</td> 82 + <td>万班次发生率</td>
83 <td>最大间隔时间</td> 83 <td>最大间隔时间</td>
84 <td>查看</td> 84 <td>查看</td>
85 </tr> 85 </tr>
@@ -125,7 +125,7 @@ @@ -125,7 +125,7 @@
125 <td>晚高峰次数</td> 125 <td>晚高峰次数</td>
126 <td>低谷次数</td> 126 <td>低谷次数</td>
127 <td>全日班次数</td> 127 <td>全日班次数</td>
128 - <td>全日发生率</td> 128 + <td>万班次发生率</td>
129 <td>最大间隔</td> 129 <td>最大间隔</td>
130 <td>查看</td> 130 <td>查看</td>
131 </tr> 131 </tr>
@@ -467,7 +467,7 @@ @@ -467,7 +467,7 @@
467 {{/each}} 467 {{/each}}
468 {{if list.length == 0}} 468 {{if list.length == 0}}
469 <tr> 469 <tr>
470 - <td colspan="10"><h6 class="muted">没有找到相关数据</h6></td> 470 + <td colspan="12"><h6 class="muted">没有找到相关数据</h6></td>
471 </tr> 471 </tr>
472 {{/if}} 472 {{/if}}
473 </script> 473 </script>
@@ -521,7 +521,7 @@ @@ -521,7 +521,7 @@
521 {{/each}} 521 {{/each}}
522 {{if list.length == 0}} 522 {{if list.length == 0}}
523 <tr> 523 <tr>
524 - <td colspan="11"><h6 class="muted">没有找到相关数据</h6></td> 524 + <td colspan="14"><h6 class="muted">没有找到相关数据</h6></td>
525 </tr> 525 </tr>
526 {{/if}} 526 {{/if}}
527 </script> 527 </script>
@@ -550,13 +550,9 @@ @@ -550,13 +550,9 @@
550 {{/each}} 550 {{/each}}
551 {{if list.length == 0}} 551 {{if list.length == 0}}
552 <tr> 552 <tr>
553 - <td colspan="7"><h6 class="muted">没有找到相关数据</h6></td>  
554 - </tr>  
555 - {{/if}}  
556 - {{if list.length == 0}}  
557 - <tr>  
558 - <td colspan="7"><h6 class="muted">没有找到相关数据</h6></td> 553 + <td colspan="11"><h6 class="muted">没有找到相关数据</h6></td>
559 </tr> 554 </tr>
560 {{/if}} 555 {{/if}}
  556 +
561 </script> 557 </script>
562 558