潘钊 / bsth_control · Commits

Commit e843e7fcc0d10b15b624fe6763fbbe768459f4c5

Authored by 廖磊
1 parent 632a93a0

行车路单计划添加 进出场

Inline Side-by-side
Showing 1 changed file with 3 additions and 3 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @e843e7f
... ... @@ -652,7 +652,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf
652 652  
653 653 //计算里程和班次数，并放入Map里
654 654 map = new HashMap<String, Object>();
655   - map.put("jhlc", culateMieageService.culateJhgl(scheduleRealInfos));
  655 + map.put("jhlc",Arith.add(culateMieageService.culateJhgl(scheduleRealInfos),culateMieageService.culateJhJccgl(scheduleRealInfos)));
656 656 map.put("remMileage",culateMieageService.culateLbgl(lists));
657 657 map.put("addMileage", culateMieageService.culateLjgl(lists));
658 658 double yygl=Arith.add(culateMieageService.culateSjgl(lists),culateMieageService.culateLjgl(lists));
... ... @@ -1433,7 +1433,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1433 1433 double jccgl=culateService.culateJccgl(lists);
1434 1434 double ljgl=culateService.culateLjgl(lists);
1435 1435  
1436   - map.put("jhlc", culateService.culateJhgl(list)); //计划里程
  1436 + map.put("jhlc", Arith.add(culateService.culateJhgl(list),culateService.culateJhJccgl(list))); //计划里程
1437 1437 map.put("remMileage", culateService.culateLbgl(list)); //烂班公里
1438 1438 map.put("addMileage", ljgl); //临加公里
1439 1439 map.put("yygl",Arith.add(sjgl,ljgl)); //实际公里
... ... @@ -3921,7 +3921,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3921 3921  
3922 3922 //计算里程和班次数，并放入Map里
3923 3923 map = new HashMap<String, Object>();
3924   - map.put("jhlc", culateMieageService.culateJhgl(scheduleRealInfos));
  3924 + map.put("jhlc", Arith.add(culateMieageService.culateJhgl(scheduleRealInfos),culateMieageService.culateJhJccgl(scheduleRealInfos)));
3925 3925 map.put("remMileage",culateMieageService.culateLbgl(lists));
3926 3926 map.put("addMileage", culateMieageService.culateLjgl(lists));
3927 3927 double yygl=Arith.add(culateMieageService.culateSjgl(lists),culateMieageService.culateLjgl(lists));
... ...