潘钊 / bsth_control · Commits

Commit d823ec738acb4a2e05a536b28e58d102d47fe3ae

Authored by 娄高锋
1 parent 70bfd609
build: skipped

统计日报实际班次要加上临加班次（需求来源于金毅伟）

Inline Side-by-side
Showing 2 changed files with 27 additions and 12 deletions
src/main/java/com/bsth/service/calc/impl/CalcWaybillServiceImpl.java
  View file @d823ec7
@@ -821,6 +821,9 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl<CalcWaybill, Integer @@ -821,6 +821,9 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl<CalcWaybill, Integer
821 821
822 List<Map<String, Object>> mapList = new ArrayList<Map<String, Object>>(); 822 List<Map<String, Object>> mapList = new ArrayList<Map<String, Object>>();
823 for(CalcStatistics c : resList){ 823 for(CalcStatistics c : resList){
  824 + c.setSjbcq(c.getSjbcq() + c.getLjbcq()); //这里实际班次要加上临加班次（需求来源于金毅伟）
  825 + c.setSjbcz(c.getSjbcz() + c.getLjbcz());
  826 + c.setSjbcw(c.getSjbcw() + c.getLjbcw());
824 Map<String, Object> m = new HashMap<String, Object>(); 827 Map<String, Object> m = new HashMap<String, Object>();
825 m.put("fgsName", c.getFgsName()); 828 m.put("fgsName", c.getFgsName());
826 m.put("xlName", c.getXlName()); 829 m.put("xlName", c.getXlName());
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @d823ec7
@@ -2800,15 +2800,21 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -2800,15 +2800,21 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2800 map.put("ssgl_other", Arith.add(Arith.add(ssgl_pc, ssgl_by), Arith.add(ssgl_cj, ssgl_qt))); 2800 map.put("ssgl_other", Arith.add(Arith.add(ssgl_pc, ssgl_by), Arith.add(ssgl_cj, ssgl_qt)));
2801 map.put("ssbc", culateService.culateLbbc(list)); 2801 map.put("ssbc", culateService.culateLbbc(list));
2802 map.put("ljgl", ljgl); 2802 map.put("ljgl", ljgl);
  2803 + int sjbc = culateService.culateSjbc(lists, "");
  2804 + int sjbc_m = culateService.culateSjbc(lists, "zgf");
  2805 + int sjbc_a = culateService.culateSjbc(lists, "wgf");
  2806 + int ljbc = culateService.culateLjbc(lists, "");
  2807 + int ljbc_m = culateService.culateLjbc(lists, "zgf");
  2808 + int ljbc_a = culateService.culateLjbc(lists, "wgf");
2803 map.put("jhbc", culateService.culateJhbc(list, "")); 2809 map.put("jhbc", culateService.culateJhbc(list, ""));
2804 map.put("jhbc_m", culateService.culateJhbc(list, "zgf")); 2810 map.put("jhbc_m", culateService.culateJhbc(list, "zgf"));
2805 map.put("jhbc_a", culateService.culateJhbc(list, "wgf")); 2811 map.put("jhbc_a", culateService.culateJhbc(list, "wgf"));
2806 - map.put("sjbc", culateService.culateSjbc(lists, ""));  
2807 - map.put("sjbc_m", culateService.culateSjbc(lists, "zgf"));  
2808 - map.put("sjbc_a", culateService.culateSjbc(lists, "wgf"));  
2809 - map.put("ljbc", culateService.culateLjbc(lists, ""));  
2810 - map.put("ljbc_m", culateService.culateLjbc(lists, "zgf"));  
2811 - map.put("ljbc_a", culateService.culateLjbc(lists, "wgf")); 2812 + map.put("sjbc", sjbc + ljbc);
  2813 + map.put("sjbc_m", sjbc_m + ljbc_m);
  2814 + map.put("sjbc_a", sjbc_a + ljbc_a);
  2815 + map.put("ljbc", ljbc);
  2816 + map.put("ljbc_m", ljbc_m);
  2817 + map.put("ljbc_a", ljbc_a);
2812 map.put("fzbc", culateService.culateFzbc(lists, "")); 2818 map.put("fzbc", culateService.culateFzbc(lists, ""));
2813 map.put("fzbc_m", culateService.culateFzbc(lists, "zgf")); 2819 map.put("fzbc_m", culateService.culateFzbc(lists, "zgf"));
2814 map.put("fzbc_a", culateService.culateFzbc(lists, "wgf")); 2820 map.put("fzbc_a", culateService.culateFzbc(lists, "wgf"));
@@ -2941,17 +2947,23 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -2941,17 +2947,23 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2941 double ssgl_qt = culateService.culateCJLC(list, "其他"); 2947 double ssgl_qt = culateService.culateCJLC(list, "其他");
2942 map.put("ssgl_other", Arith.add(Arith.add(ssgl_pc, ssgl_by), Arith.add(ssgl_cj, ssgl_qt))); 2948 map.put("ssgl_other", Arith.add(Arith.add(ssgl_pc, ssgl_by), Arith.add(ssgl_cj, ssgl_qt)));
2943 2949
  2950 + int sjbc = culateService.culateSjbc(list_s, "");
  2951 + int sjbc_m = culateService.culateSjbc(list_s, "zgf");
  2952 + int sjbc_a = culateService.culateSjbc(list_s, "wgf");
  2953 + int ljbc = culateService.culateLjbc(list_s, "");
  2954 + int ljbc_m = culateService.culateLjbc(list_s, "zgf");
  2955 + int ljbc_a = culateService.culateLjbc(list_s, "wgf");
2944 map.put("ssbc", culateService.culateLbbc(list)); 2956 map.put("ssbc", culateService.culateLbbc(list));
2945 map.put("ljgl", ljgl); 2957 map.put("ljgl", ljgl);
2946 map.put("jhbc", culateService.culateJhbc(list, "")); 2958 map.put("jhbc", culateService.culateJhbc(list, ""));
2947 map.put("jhbc_m", culateService.culateJhbc(list, "zgf")); 2959 map.put("jhbc_m", culateService.culateJhbc(list, "zgf"));
2948 map.put("jhbc_a", culateService.culateJhbc(list, "wgf")); 2960 map.put("jhbc_a", culateService.culateJhbc(list, "wgf"));
2949 - map.put("sjbc", culateService.culateSjbc(list_s, ""));  
2950 - map.put("sjbc_m", culateService.culateSjbc(list_s, "zgf"));  
2951 - map.put("sjbc_a", culateService.culateSjbc(list_s, "wgf"));  
2952 - map.put("ljbc", culateService.culateLjbc(list_s, ""));  
2953 - map.put("ljbc_m", culateService.culateLjbc(list_s, "zgf"));  
2954 - map.put("ljbc_a", culateService.culateLjbc(list_s, "wgf")); 2961 + map.put("sjbc", sjbc + ljbc);
  2962 + map.put("sjbc_m", sjbc_m + ljbc_m);
  2963 + map.put("sjbc_a", sjbc_a + ljbc_a);
  2964 + map.put("ljbc", ljbc);
  2965 + map.put("ljbc_m", ljbc_m);
  2966 + map.put("ljbc_a", ljbc_a);
2955 map.put("fzbc", culateService.culateFzbc(list_s, "")); 2967 map.put("fzbc", culateService.culateFzbc(list_s, ""));
2956 map.put("fzbc_m", culateService.culateFzbc(list_s, "zgf")); 2968 map.put("fzbc_m", culateService.culateFzbc(list_s, "zgf"));
2957 map.put("fzbc_a", culateService.culateFzbc(list_s, "wgf")); 2969 map.put("fzbc_a", culateService.culateFzbc(list_s, "wgf"));