潘钊 / bsth_control · Commits

Commit b271bb86b468312048a11a47843946b728d5cf2a

Authored by 娄高锋
1 parent 0e2c7ee5
build: skipped

青浦-纯电车日报表，导出文档添加营运班次一列；损失公里没有计算的问题（损失公里就是烂班公里）。

Inline Side-by-side
Showing 2 changed files with 5 additions and 3 deletions
src/main/java/com/bsth/service/impl/RefuelServiceImpl.java
  View file @b271bb8
... ... @@ -312,7 +312,7 @@ public class RefuelServiceImpl extends BaseServiceImpl<Refuel, Long> implements
312 312  
313 313 realMileage = add(add(sjgl, ksgl), add(jccgl, ljgl));
314 314 ksMileage = add(ksgl, jccgl);
315   -// ssMileage = "" + culateMileageService.culateLbgl(list2); //损失里程？少驶里程？
  315 + ssMileage = "" + culateMileageService.culateLbgl(list2);
316 316 jhbc = "" + culateMileageService.culateJhbc(list2, "");
317 317 sjbc = "" + culateMileageService.culateSjbc(list2, "");
318 318 bc = "" + list2.size();
... ... @@ -619,7 +619,7 @@ public class RefuelServiceImpl extends BaseServiceImpl<Refuel, Long> implements
619 619 List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
620 620 Map<String, Object> lastMap = new HashMap<String, Object>();
621 621 String realMileage_z = "0", ksMileage_z = "0", ssMileage_z = "0",
622   - jhbc_z = "0", sjbc_z = "0", bc_z = "0", cr_z = "0";
  622 + jhbc_z = "0", sjbc_z = "0", bc_z = "0", yybc_z = "0", cr_z = "0";
623 623  
624 624 List<String> sKeyList = new ArrayList<String>();
625 625 Map<String, List<ScheduleRealInfo>> sMap = new HashMap<String, List<ScheduleRealInfo>>();
... ... @@ -668,7 +668,7 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements
668 668  
669 669 realMileage = add(add(sjgl, ksgl), add(jccgl, ljgl));
670 670 ksMileage = add(ksgl, jccgl);
671   -// ssMileage = "" + culateMileageService.culateLbgl(list2); //损失里程？少驶里程？
  671 + ssMileage = "" + culateMileageService.culateLbgl(list2);
672 672 jhbc = "" + culateMileageService.culateJhbc(list2, "");
673 673 sjbc = "" + culateMileageService.culateSjbc(list2, "");
674 674 ljbc = "" + culateMileageService.culateLjbc(list2, "");
... ... @@ -689,6 +689,7 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements
689 689 jhbc_z = new BigDecimal(jhbc_z).add(new BigDecimal(jhbc)).toString();
690 690 sjbc_z = new BigDecimal(sjbc_z).add(new BigDecimal(sjbc)).toString();
691 691 bc_z = new BigDecimal(bc_z).add(new BigDecimal(bc)).toString();
  692 + yybc_z = new BigDecimal(yybc_z).add(new BigDecimal(sjbc)).add(new BigDecimal(ljbc)).toString();
692 693 cr_z = new BigDecimal(cr_z).add(new BigDecimal(cr)).toString();
693 694  
694 695 for(ScheduleRealInfo s : list2){
... ... @@ -751,6 +752,7 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements
751 752 lastMap.put("ssMileage", ssMileage_z);
752 753 lastMap.put("consume", "");
753 754 lastMap.put("bc", bc_z);
  755 + lastMap.put("yybc", yybc_z);
754 756 lastMap.put("jhbc", jhbc_z);
755 757 lastMap.put("sjbc", sjbc_z);
756 758 lastMap.put("cr", cr_z);
... ...
src/main/resources/static/pages/forms/mould/refuelDc.xls
View file @b271bb8
No preview for this file type