潘钊 / bsth_control · Commits

Commit fb922cb1524539d0516a95814040ef32d8235e4e

Authored by 廖磊
1 parent de20530f
build: skipped

统计日报 其他类型

Inline Side-by-side
Showing 1 changed file with 11 additions and 2 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @fb922cb
@@ -2532,7 +2532,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf @@ -2532,7 +2532,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf
2532 map.put("ssgl_kx", culateService.culateCJLC(list, "客稀")); 2532 map.put("ssgl_kx", culateService.culateCJLC(list, "客稀"));
2533 map.put("ssgl_qh", culateService.culateCJLC(list, "气候")); 2533 map.put("ssgl_qh", culateService.culateCJLC(list, "气候"));
2534 map.put("ssgl_yw", culateService.culateCJLC(list, "援外")); 2534 map.put("ssgl_yw", culateService.culateCJLC(list, "援外"));
2535 - map.put("ssgl_other", culateService.culateCJLC(list, "其他")); 2535 + double ssgl_pc=culateService.culateCJLC(list, "配车");
  2536 + double ssgl_by=culateService.culateCJLC(list, "保养");
  2537 + double ssgl_cj=culateService.culateCJLC(list, "抽减");
  2538 + double ssgl_qt=culateService.culateCJLC(list, "其他");
  2539 + map.put("ssgl_other", Arith.add(Arith.add(ssgl_pc, ssgl_by),Arith.add(ssgl_cj, ssgl_qt)));
2536 map.put("ssbc", culateService.culateLbbc(list)); 2540 map.put("ssbc", culateService.culateLbbc(list));
2537 map.put("ljgl", ljgl); 2541 map.put("ljgl", ljgl);
2538 map.put("jhbc", culateService.culateJhbc(list,"")); 2542 map.put("jhbc", culateService.culateJhbc(list,""));
@@ -2648,7 +2652,12 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf @@ -2648,7 +2652,12 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf
2648 map.put("ssgl_kx", culateService.culateCJLC(list, "客稀")); 2652 map.put("ssgl_kx", culateService.culateCJLC(list, "客稀"));
2649 map.put("ssgl_qh", culateService.culateCJLC(list, "气候")); 2653 map.put("ssgl_qh", culateService.culateCJLC(list, "气候"));
2650 map.put("ssgl_yw", culateService.culateCJLC(list, "援外")); 2654 map.put("ssgl_yw", culateService.culateCJLC(list, "援外"));
2651 - map.put("ssgl_other", culateService.culateCJLC(list, "其他")); 2655 + double ssgl_pc=culateService.culateCJLC(list, "配车");
  2656 + double ssgl_by=culateService.culateCJLC(list, "保养");
  2657 + double ssgl_cj=culateService.culateCJLC(list, "抽减");
  2658 + double ssgl_qt=culateService.culateCJLC(list, "其他");
  2659 + map.put("ssgl_other", Arith.add(Arith.add(ssgl_pc, ssgl_by),Arith.add(ssgl_cj, ssgl_qt)));
  2660 +
2652 map.put("ssbc", culateService.culateLbbc(list)); 2661 map.put("ssbc", culateService.culateLbbc(list));
2653 map.put("ljgl", ljgl); 2662 map.put("ljgl", ljgl);
2654 map.put("jhbc", culateService.culateJhbc(list,"")); 2663 map.put("jhbc", culateService.culateJhbc(list,""));