潘钊 / bsth_control · Commits

Commit c0455ff72d1f6dc7a5442fd9fdf59935e0926ac3

Authored by 廖磊
1 parent 325cff18

工作汇总实际班次统计

Inline Side-by-side
Showing 1 changed file with 39 additions and 27 deletions
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
  View file @c0455ff
@@ -1909,7 +1909,19 @@ public class ReportServiceImpl implements ReportService{ @@ -1909,7 +1909,19 @@ public class ReportServiceImpl implements ReportService{
1909 } 1909 }
1910 1910
1911 List<ScheduleRealInfo> sList=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(line, date); 1911 List<ScheduleRealInfo> sList=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(line, date);
1912 - Map<String, Object> newMap=culateService.culateWdbcs(sList); 1912 + List<ScheduleRealInfo> lists=new ArrayList<ScheduleRealInfo>();
  1913 + for (int i = 0; i < sList.size(); i++) {
  1914 + ScheduleRealInfo s=sList.get(i);
  1915 + Set<ChildTaskPlan> cts = s.getcTasks();
  1916 + if(cts != null && cts.size() > 0){
  1917 + lists.add(s);
  1918 + }else{
  1919 + if(s.getZdsjActual()!=null){
  1920 + lists.add(s);
  1921 + }
  1922 + }
  1923 + }
  1924 + Map<String, Object> newMap=culateService.culateWdbcs(lists);
1913 newMap.put("jhbc", culateService.culateJhbc(sList,"")); 1925 newMap.put("jhbc", culateService.culateJhbc(sList,""));
1914 newMap.put("jhbczgf", culateService.culateJhbc(sList,"zgf")); 1926 newMap.put("jhbczgf", culateService.culateJhbc(sList,"zgf"));
1915 newMap.put("jhbcwgf", culateService.culateJhbc(sList,"wgf")); 1927 newMap.put("jhbcwgf", culateService.culateJhbc(sList,"wgf"));
@@ -1917,35 +1929,35 @@ public class ReportServiceImpl implements ReportService{ @@ -1917,35 +1929,35 @@ public class ReportServiceImpl implements ReportService{
1917 newMap.put("jhglzgf", culateService.culateJhgl_(sList,"zgf")); 1929 newMap.put("jhglzgf", culateService.culateJhgl_(sList,"zgf"));
1918 newMap.put("jhglwgf", culateService.culateJhgl_(sList,"wgf")); 1930 newMap.put("jhglwgf", culateService.culateJhgl_(sList,"wgf"));
1919 1931
1920 - newMap.put("sjbc", culateService.culateSjbc(sList,""));  
1921 - newMap.put("sjbczgf", culateService.culateSjbc(sList,"zgf"));  
1922 - newMap.put("sjbcwgf", culateService.culateSjbc(sList,"wgf"));  
1923 - newMap.put("sjgl", culateService.culateSjgl(sList));  
1924 - newMap.put("sjglzgf", culateService.culateSjgl_(sList,"zgf"));  
1925 - newMap.put("sjglwgf", culateService.culateSjgl_(sList,"wgf")); 1932 + newMap.put("sjbc", culateService.culateSjbc(lists,""));
  1933 + newMap.put("sjbczgf", culateService.culateSjbc(lists,"zgf"));
  1934 + newMap.put("sjbcwgf", culateService.culateSjbc(lists,"wgf"));
  1935 + newMap.put("sjgl", culateService.culateSjgl(lists));
  1936 + newMap.put("sjglzgf", culateService.culateSjgl_(lists,"zgf"));
  1937 + newMap.put("sjglwgf", culateService.culateSjgl_(lists,"wgf"));
1926 1938
1927 - newMap.put("lbgl", culateService.culateLbgl(sList));  
1928 - newMap.put("lbbc", culateService.culateLbbc(sList));  
1929 - newMap.put("ljgl", culateService.culateLjgl(sList));  
1930 - newMap.put("ljglzgf", culateService.culateLjgl_(sList,"zgf"));  
1931 - newMap.put("ljglwgf", culateService.culateLjgl_(sList,"wgf"));  
1932 -  
1933 - newMap.put("ljbc", culateService.culateLjbc(sList,""));  
1934 - newMap.put("ksgl", culateService.culateKsgl(sList)); 1939 + newMap.put("lbgl", culateService.culateLbgl(lists));
  1940 + newMap.put("lbbc", culateService.culateLbbc(lists));
  1941 + newMap.put("ljgl", culateService.culateLjgl(lists));
  1942 + newMap.put("ljglzgf", culateService.culateLjgl_(lists,"zgf"));
  1943 + newMap.put("ljglwgf", culateService.culateLjgl_(lists,"wgf"));
  1944 +
  1945 + newMap.put("ljbc", culateService.culateLjbc(lists,""));
  1946 + newMap.put("ksgl", culateService.culateKsgl(lists));
1935 1947
1936 - newMap.put("jhfbbc",culateService.culateDtfzbc(sList, "venting", "jh", ""));  
1937 - newMap.put("jhfbbczgf",culateService.culateDtfzbc(sList, "venting", "jh", "zgf"));  
1938 - newMap.put("jhfbbcwgf",culateService.culateDtfzbc(sList, "venting", "jh", "wgf"));  
1939 - newMap.put("sjfbbc",culateService.culateDtfzbc(sList, "venting", "sj", ""));  
1940 - newMap.put("sjfbbczgf",culateService.culateDtfzbc(sList, "venting", "sj", "zgf"));  
1941 - newMap.put("sjfbbcwgf",culateService.culateDtfzbc(sList, "venting", "sj", "wgf")); 1948 + newMap.put("jhfbbc",culateService.culateDtfzbc(lists, "venting", "jh", ""));
  1949 + newMap.put("jhfbbczgf",culateService.culateDtfzbc(lists, "venting", "jh", "zgf"));
  1950 + newMap.put("jhfbbcwgf",culateService.culateDtfzbc(lists, "venting", "jh", "wgf"));
  1951 + newMap.put("sjfbbc",culateService.culateDtfzbc(lists, "venting", "sj", ""));
  1952 + newMap.put("sjfbbczgf",culateService.culateDtfzbc(lists, "venting", "sj", "zgf"));
  1953 + newMap.put("sjfbbcwgf",culateService.culateDtfzbc(lists, "venting", "sj", "wgf"));
1942 1954
1943 - newMap.put("jhdtbc",culateService.culateDtfzbc(sList, "major", "jh", ""));  
1944 - newMap.put("jhdtbczgf",culateService.culateDtfzbc(sList, "major", "jh", "zgf"));  
1945 - newMap.put("jhdtbcwgf",culateService.culateDtfzbc(sList, "major", "jh", "wgf"));  
1946 - newMap.put("sjdtbc",culateService.culateDtfzbc(sList, "major", "sj", ""));  
1947 - newMap.put("sjdtbczgf",culateService.culateDtfzbc(sList, "major", "sj", "zgf"));  
1948 - newMap.put("sjdtbcwgf",culateService.culateDtfzbc(sList, "major", "sj", "wgf")); 1955 + newMap.put("jhdtbc",culateService.culateDtfzbc(lists, "major", "jh", ""));
  1956 + newMap.put("jhdtbczgf",culateService.culateDtfzbc(lists, "major", "jh", "zgf"));
  1957 + newMap.put("jhdtbcwgf",culateService.culateDtfzbc(lists, "major", "jh", "wgf"));
  1958 + newMap.put("sjdtbc",culateService.culateDtfzbc(lists, "major", "sj", ""));
  1959 + newMap.put("sjdtbczgf",culateService.culateDtfzbc(lists, "major", "sj", "zgf"));
  1960 + newMap.put("sjdtbcwgf",culateService.culateDtfzbc(lists, "major", "sj", "wgf"));
1949 return newMap; 1961 return newMap;
1950 } 1962 }
1951 @Override 1963 @Override