潘钊 / bsth_control · Commits

Commit 4215f195e4f0b13d3ddbd39ee04dc26b665f037c

Authored by 娄高锋
1 parent 3c3bb6c2

update

Inline Side-by-side
Showing 2 changed files with 60 additions and 30 deletions
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
  View file @4215f19
@@ -1569,7 +1569,7 @@ public class BusIntervalServiceImpl implements BusIntervalService { @@ -1569,7 +1569,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
1569 1569
1570 jhbc++; 1570 jhbc++;
1571 jhlc += lc; 1571 jhlc += lc;
1572 - if(schedule.getStatus() == 2){ 1572 + if(schedule.getStatus() != -1){
1573 sjbc++; 1573 sjbc++;
1574 sjlc += lc; 1574 sjlc += lc;
1575 } else if(schedule.getStatus() == -1){ 1575 } else if(schedule.getStatus() == -1){
@@ -1622,37 +1622,37 @@ public class BusIntervalServiceImpl implements BusIntervalService { @@ -1622,37 +1622,37 @@ public class BusIntervalServiceImpl implements BusIntervalService {
1622 tempMap.put("lcbfb", df.format(jhlc>0?(double)sjlc/jhlc*100:0)+"%"); 1622 tempMap.put("lcbfb", df.format(jhlc>0?(double)sjlc/jhlc*100:0)+"%");
1623 tempMap.put("lzbc", lzbc); 1623 tempMap.put("lzbc", lzbc);
1624 tempMap.put("lzlc", lzlc); 1624 tempMap.put("lzlc", lzlc);
1625 - tempMap.put("lzbfb", df.format(jhlc>0?(double)lzlc/jhlc*100:0)+"%"); 1625 + tempMap.put("lzbfb", df.format(jhlc>0?(double)lzbc/jhbc*100:0)+"%");
1626 tempMap.put("dmbc", dmbc); 1626 tempMap.put("dmbc", dmbc);
1627 tempMap.put("dmlc", dmlc); 1627 tempMap.put("dmlc", dmlc);
1628 - tempMap.put("dmbfb", df.format(jhlc>0?(double)dmlc/jhlc*100:0)+"%"); 1628 + tempMap.put("dmbfb", df.format(jhlc>0?(double)dmbc/jhbc*100:0)+"%");
1629 tempMap.put("gzbc", gzbc); 1629 tempMap.put("gzbc", gzbc);
1630 tempMap.put("gzlc", gzlc); 1630 tempMap.put("gzlc", gzlc);
1631 - tempMap.put("gzbfb", df.format(jhlc>0?(double)gzlc/jhlc*100:0)+"%"); 1631 + tempMap.put("gzbfb", df.format(jhlc>0?(double)gzbc/jhbc*100:0)+"%");
1632 tempMap.put("jfbc", jfbc); 1632 tempMap.put("jfbc", jfbc);
1633 tempMap.put("jflc", jflc); 1633 tempMap.put("jflc", jflc);
1634 - tempMap.put("jfbfb", df.format(jhlc>0?(double)jflc/jhlc*100:0)+"%"); 1634 + tempMap.put("jfbfb", df.format(jhlc>0?(double)jfbc/jhbc*100:0)+"%");
1635 tempMap.put("zsbc", zsbc); 1635 tempMap.put("zsbc", zsbc);
1636 tempMap.put("zslc", zslc); 1636 tempMap.put("zslc", zslc);
1637 - tempMap.put("zsbfb", df.format(jhlc>0?(double)zslc/jhlc*100:0)+"%"); 1637 + tempMap.put("zsbfb", df.format(jhlc>0?(double)zsbc/jhbc*100:0)+"%");
1638 tempMap.put("qrbc", qrbc); 1638 tempMap.put("qrbc", qrbc);
1639 tempMap.put("qrlc", qrlc); 1639 tempMap.put("qrlc", qrlc);
1640 - tempMap.put("qrbfb", df.format(jhlc>0?(double)qrlc/jhlc*100:0)+"%"); 1640 + tempMap.put("qrbfb", df.format(jhlc>0?(double)qrbc/jhbc*100:0)+"%");
1641 tempMap.put("qcbc", qcbc); 1641 tempMap.put("qcbc", qcbc);
1642 tempMap.put("qclc", qclc); 1642 tempMap.put("qclc", qclc);
1643 - tempMap.put("qcbfb", df.format(jhlc>0?(double)qclc/jhlc*100:0)+"%"); 1643 + tempMap.put("qcbfb", df.format(jhlc>0?(double)qcbc/jhbc*100:0)+"%");
1644 tempMap.put("kxbc", kxbc); 1644 tempMap.put("kxbc", kxbc);
1645 tempMap.put("kxlc", kxlc); 1645 tempMap.put("kxlc", kxlc);
1646 - tempMap.put("kxbfb", df.format(jhlc>0?(double)kxlc/jhlc*100:0)+"%"); 1646 + tempMap.put("kxbfb", df.format(jhlc>0?(double)kxbc/jhbc*100:0)+"%");
1647 tempMap.put("qhbc", qhbc); 1647 tempMap.put("qhbc", qhbc);
1648 tempMap.put("qhlc", qhlc); 1648 tempMap.put("qhlc", qhlc);
1649 - tempMap.put("qhbfb", df.format(jhlc>0?(double)qhlc/jhlc*100:0)+"%"); 1649 + tempMap.put("qhbfb", df.format(jhlc>0?(double)qhbc/jhbc*100:0)+"%");
1650 tempMap.put("wybc", wybc); 1650 tempMap.put("wybc", wybc);
1651 tempMap.put("wylc", wylc); 1651 tempMap.put("wylc", wylc);
1652 - tempMap.put("wybfb", df.format(jhlc>0?(double)wylc/jhlc*100:0)+"%"); 1652 + tempMap.put("wybfb", df.format(jhlc>0?(double)wybc/jhbc*100:0)+"%");
1653 tempMap.put("qtbc", qtbc); 1653 tempMap.put("qtbc", qtbc);
1654 tempMap.put("qtlc", qtlc); 1654 tempMap.put("qtlc", qtlc);
1655 - tempMap.put("qtbfb", df.format(jhlc>0?(double)qtlc/jhlc*100:0)+"%"); 1655 + tempMap.put("qtbfb", df.format(jhlc>0?(double)qtbc/jhbc*100:0)+"%");
1656 1656
1657 resList.add(tempMap); 1657 resList.add(tempMap);
1658 } 1658 }
src/main/resources/static/pages/forms/statement/firstAndLastBus.html
  View file @4215f19
@@ -207,7 +207,6 @@ @@ -207,7 +207,6 @@
207 params['company'] = company; 207 params['company'] = company;
208 params['subCompany'] = subCompany; 208 params['subCompany'] = subCompany;
209 params['line'] = line; 209 params['line'] = line;
210 - params['line'] = line;  
211 params['date'] = date; 210 params['date'] = date;
212 params['type'] = "query"; 211 params['type'] = "query";
213 $(".hidden").removeClass("hidden"); 212 $(".hidden").removeClass("hidden");
@@ -225,11 +224,14 @@ @@ -225,11 +224,14 @@
225 } 224 }
226 225
227 $("#export").on("click",function(){ 226 $("#export").on("click",function(){
  227 + if($("#date").val() == null || $("#date").val().trim().length == 0){
  228 + layer.msg("请选择时间！");
  229 + return;
  230 + }
228 var params = {}; 231 var params = {};
229 params['company'] = company; 232 params['company'] = company;
230 params['subCompany'] = subCompany; 233 params['subCompany'] = subCompany;
231 params['line'] = line; 234 params['line'] = line;
232 - params['line'] = line;  
233 params['date'] = date; 235 params['date'] = date;
234 params['type'] = "export"; 236 params['type'] = "export";
235 $get('/pcpc/firstAndLastBus', params, function(result){ 237 $get('/pcpc/firstAndLastBus', params, function(result){
@@ -248,22 +250,50 @@ @@ -248,22 +250,50 @@
248 <td>{{obj.company}}</td> 250 <td>{{obj.company}}</td>
249 <td>{{obj.subCompany}}</td> 251 <td>{{obj.subCompany}}</td>
250 <td>{{obj.line}}</td> 252 <td>{{obj.line}}</td>
251 - <td>{{obj.qdzFirst0}}</td>  
252 - <td>{{obj.jhfcFirst0}}</td>  
253 - <td>{{obj.sjfcFirst0}}</td>  
254 - <td>{{obj.delayFirst0}}</td>  
255 - <td>{{obj.qdzLast0}}</td>  
256 - <td>{{obj.jhfcLast0}}</td>  
257 - <td>{{obj.sjfcLast0}}</td>  
258 - <td>{{obj.delayLast0}}</td>  
259 - <td>{{obj.qdzFirst1}}</td>  
260 - <td>{{obj.jhfcFirst1}}</td>  
261 - <td>{{obj.sjfcFirst1}}</td>  
262 - <td>{{obj.delayFirst1}}</td>  
263 - <td>{{obj.qdzLast1}}</td>  
264 - <td>{{obj.jhfcLast1}}</td>  
265 - <td>{{obj.sjfcLast1}}</td>  
266 - <td>{{obj.delayLast1}}</td> 253 + {{if obj.delayFirst0 != '/' && obj.delayFirst0 != '0'}}
  254 + <td style="background-color: #FF9999">{{obj.qdzFirst0}}</td>
  255 + <td style="background-color: #FF9999">{{obj.jhfcFirst0}}</td>
  256 + <td style="background-color: #FF9999">{{obj.sjfcFirst0}}</td>
  257 + <td style="background-color: #FF9999">{{obj.delayFirst0}}</td>
  258 + {{else}}
  259 + <td>{{obj.qdzFirst0}}</td>
  260 + <td>{{obj.jhfcFirst0}}</td>
  261 + <td>{{obj.sjfcFirst0}}</td>
  262 + <td>{{obj.delayFirst0}}</td>
  263 + {{/if}}
  264 + {{if obj.delayLast0 != '/' && obj.delayLast0 != '0'}}
  265 + <td style="background-color: #FF9999">{{obj.qdzLast0}}</td>
  266 + <td style="background-color: #FF9999">{{obj.jhfcLast0}}</td>
  267 + <td style="background-color: #FF9999">{{obj.sjfcLast0}}</td>
  268 + <td style="background-color: #FF9999">{{obj.delayLast0}}</td>
  269 + {{else}}
  270 + <td>{{obj.qdzLast0}}</td>
  271 + <td>{{obj.jhfcLast0}}</td>
  272 + <td>{{obj.sjfcLast0}}</td>
  273 + <td>{{obj.delayLast0}}</td>
  274 + {{/if}}
  275 + {{if obj.delayFirst1 != '/' && obj.delayFirst1 != '0'}}
  276 + <td style="background-color: #FF9999">{{obj.qdzFirst1}}</td>
  277 + <td style="background-color: #FF9999">{{obj.jhfcFirst1}}</td>
  278 + <td style="background-color: #FF9999">{{obj.sjfcFirst1}}</td>
  279 + <td style="background-color: #FF9999">{{obj.delayFirst1}}</td>
  280 + {{else}}
  281 + <td>{{obj.qdzFirst1}}</td>
  282 + <td>{{obj.jhfcFirst1}}</td>
  283 + <td>{{obj.sjfcFirst1}}</td>
  284 + <td>{{obj.delayFirst1}}</td>
  285 + {{/if}}
  286 + {{if obj.delayLast1 != '/' && obj.delayLast1 != '0'}}
  287 + <td style="background-color: #FF9999">{{obj.qdzLast1}}</td>
  288 + <td style="background-color: #FF9999">{{obj.jhfcLast1}}</td>
  289 + <td style="background-color: #FF9999">{{obj.sjfcLast1}}</td>
  290 + <td style="background-color: #FF9999">{{obj.delayLast1}}</td>
  291 + {{else}}
  292 + <td>{{obj.qdzLast1}}</td>
  293 + <td>{{obj.jhfcLast1}}</td>
  294 + <td>{{obj.sjfcLast1}}</td>
  295 + <td>{{obj.delayLast1}}</td>
  296 + {{/if}}
267 </tr> 297 </tr>
268 {{/each}} 298 {{/each}}
269 {{if list.length == 0}} 299 {{if list.length == 0}}