潘钊 / bsth_control · Commits

Commit 20d83a04c0d1ee4e5ac43f4e536431c707f4e903

Authored by 娄高锋
1 parent 1ac53d40
build: skipped

青浦工单：燃油车日报表增加一列营运班次。

Inline Side-by-side
Showing 3 changed files with 17 additions and 5 deletions
src/main/java/com/bsth/service/impl/RefuelServiceImpl.java
  View file @20d83a0
... ... @@ -403,7 +403,7 @@ public class RefuelServiceImpl extends BaseServiceImpl<Refuel, Long> implements
403 403 outStation0_z = "0", outStation10_z = "0", oil_z = "0", addOil_z = "0",
404 404 ty_z = "0", yw_z = "0", cj_z = "0",
405 405 realMileage_z = "0", ksMileage_z = "0", ssMileage_z = "0", consume_z = "",
406   - jhbc_z = "0", sjbc_z = "0", bc_z = "0", cr_z = "0";
  406 + jhbc_z = "0", sjbc_z = "0", bc_z = "0", yybc_z = "0", cr_z = "0";
407 407  
408 408 List<String> sKeyList = new ArrayList<String>();
409 409 Map<String, List<ScheduleRealInfo>> sMap = new HashMap<String, List<ScheduleRealInfo>>();
... ... @@ -455,7 +455,7 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements
455 455 String[] split = key.split("/");
456 456  
457 457 String realMileage = "", oil = "0", addOil = "0", consume = "", cr = "";
458   - String ksMileage = "", ssMileage = "", bc = "", jhbc = "", sjbc = "";
  458 + String ksMileage = "", ssMileage = "", bc = "", jhbc = "", sjbc = "", ljbc = "";
459 459 String remarks = "";
460 460  
461 461 Double sjgl = culateMileageService.culateSjgl(list_s);
... ... @@ -468,7 +468,14 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements
468 468 ssMileage = "" + culateMileageService.culateLbgl(list2);
469 469 jhbc = "" + culateMileageService.culateJhbc(list2, "");
470 470 sjbc = "" + culateMileageService.culateSjbc(list_s, "");
471   - bc = "" + list2.size();
  471 + ljbc = "" + culateMileageService.culateLjbc(list_s, "");
  472 + int bcInt = 0;
  473 + for(ScheduleRealInfo s : list2){
  474 + if(!s.isCcService() && s.getStatus() != -1){
  475 + bcInt++;
  476 + }
  477 + }
  478 + bc = "" + bcInt;
472 479 cr = "1";
473 480  
474 481 realMileage_z = new BigDecimal(realMileage_z).add(new BigDecimal(realMileage)).toString();
... ... @@ -479,6 +486,7 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements
479 486 jhbc_z = new BigDecimal(jhbc_z).add(new BigDecimal(jhbc)).toString();
480 487 sjbc_z = new BigDecimal(sjbc_z).add(new BigDecimal(sjbc)).toString();
481 488 bc_z = new BigDecimal(bc_z).add(new BigDecimal(bc)).toString();
  489 + yybc_z = new BigDecimal(yybc_z).add(new BigDecimal(sjbc)).add(new BigDecimal(ljbc)).toString();
482 490 cr_z = new BigDecimal(cr_z).add(new BigDecimal(cr)).toString();
483 491  
484 492 for(ScheduleRealInfo s : list2){
... ... @@ -648,6 +656,7 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements
648 656 m.put("ssMileage", ssMileage);
649 657 m.put("consume", consume);
650 658 m.put("bc", bc);
  659 + m.put("yybc", Integer.valueOf(sjbc)+Integer.valueOf(ljbc));
651 660 m.put("jhbc", jhbc);
652 661 m.put("sjbc", sjbc);
653 662 m.put("ty", ""); //特约
... ... @@ -718,6 +727,7 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements
718 727 lastMap.put("ssMileage", ssMileage_z);
719 728 lastMap.put("consume", consume_z);
720 729 lastMap.put("bc", bc_z);
  730 + lastMap.put("yybc", yybc_z);
721 731 lastMap.put("jhbc", jhbc_z);
722 732 lastMap.put("sjbc", sjbc_z);
723 733 lastMap.put("ty", ty_z); //特约
... ... @@ -900,9 +910,9 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements
900 910 m.put("sjssgl", Arith.sub(ssMileage, ljgl)); // 实际损失公里（损失公里-加车公里，20250808青浦巴士工单）
901 911 m.put("consume", "");
902 912 m.put("bc", bc);
  913 + m.put("yybc", Integer.valueOf(sjbc)+Integer.valueOf(ljbc));
903 914 m.put("jhbc", jhbc);
904 915 m.put("sjbc", sjbc);
905   - m.put("yybc", Integer.valueOf(sjbc)+Integer.valueOf(ljbc));
906 916 m.put("cr", cr);
907 917 m.put("remark", remarks);
908 918  
... ...
src/main/resources/static/pages/forms/mould/refuelYc.xls
View file @20d83a0
No preview for this file type
src/main/resources/static/pages/forms/statement/refuelYc.html
  View file @20d83a0
... ... @@ -66,6 +66,7 @@
66 66 <td>空驶公里</td>
67 67 <td>损失公里</td>
68 68 <td>班次</td>
  69 + <td>营运班次</td>
69 70 <td>车日</td>
70 71 <td>备注</td>
71 72 </tr>
... ... @@ -238,6 +239,7 @@
238 239 <td>{{obj.ksMileage}}</td>
239 240 <td>{{obj.ssMileage}}</td>
240 241 <td>{{obj.bc}}</td>
  242 + <td>{{obj.yybc}}</td>
241 243 <td>{{obj.cr}}</td>
242 244 <td title="{{obj.remark}}">
243 245 {{if obj.remark !=""}}
... ... @@ -252,7 +254,7 @@
252 254 {{/each}}
253 255 {{if list.length == 0}}
254 256 <tr>
255   - <td colspan="25"><h6 class="muted">没有找到相关数据</h6></td>
  257 + <td colspan="26"><h6 class="muted">没有找到相关数据</h6></td>
256 258 </tr>
257 259 {{/if}}
258 260 </script>
259 261 \ No newline at end of file
... ...