修改

src/main/java/com/steerinfo/dil/controller/StatisticalReportController.java

@@ -843,6 +843,22 @@ public class StatisticalReportController extends BaseRESTfulController {
         map7.put("chaungDongSpellingData",0);
         map7.put("zitiSpellingData",0);
         map7.put("AllSpellingData",0);
+        Map<String,Object> map8=new HashMap<>();
+        map8.put("pinZhuang",null);
+        map8.put("chongQinSpellingData",0);
+        map8.put("chengDuSpellingData",0);
+        map8.put("gongChengSpellingData",0);
+        map8.put("chaungDongSpellingData",0);
+        map8.put("zitiSpellingData",0);
+        map8.put("AllSpellingData",0);
+        Map<String,Object> map9=new HashMap<>();
+        map9.put("pinZhuang",null);
+        map9.put("chongQinSpellingData",0);
+        map9.put("chengDuSpellingData",0);
+        map9.put("gongChengSpellingData",0);
+        map9.put("chaungDongSpellingData",0);
+        map9.put("zitiSpellingData",0);
+        map9.put("AllSpellingData",0);
         //35个数据
         List<Map<String,Object>> spellingData=new LinkedList<>();
         //初始化list集合的值
@@ -853,13 +869,17 @@ public class StatisticalReportController extends BaseRESTfulController {
         spellingData.add(map5);
         spellingData.add(map6);
         spellingData.add(map7);
+        spellingData.add(map8);
+        spellingData.add(map9);
         spellingData.get(0).put("pinZhuang","一拼");
         spellingData.get(1).put("pinZhuang","二拼");
         spellingData.get(2).put("pinZhuang","三拼");
         spellingData.get(3).put("pinZhuang","四拼");
         spellingData.get(4).put("pinZhuang","五拼");
         spellingData.get(5).put("pinZhuang","六拼");
-        spellingData.get(6).put("pinZhuang","合计");
+        spellingData.get(6).put("pinZhuang","七拼");
+        spellingData.get(7).put("pinZhuang","八拼");
+        spellingData.get(8).put("pinZhuang","合计");
         for (Map<String, Object> item : report) {
 
             String areaName=""+item.get("areaName");
@@ -869,7 +889,7 @@ public class StatisticalReportController extends BaseRESTfulController {
             int speNum=Integer.parseInt(""+item.get("speNum"));
             int total=Integer.parseInt(""+item.get("total"));
             //过滤无片区、拼装不在1-6之间的数据
-            if(areaName==null || areaName.equals("") || speNum >= 7 || speNum <=0){
+            if(areaName==null || areaName.equals("") || speNum >= 9 || speNum <=0){
                 continue;
             }
             if(areaName.contains("重庆组")){
@@ -904,12 +924,12 @@ public class StatisticalReportController extends BaseRESTfulController {
             fiveData+=(int) spellingData.get(i).get("AllSpellingData");
             sixData += (int) spellingData.get(i).get("zitiSpellingData");
         }
-        spellingData.get(6).put("chongQinSpellingData",oneData);
-        spellingData.get(6).put("chengDuSpellingData",twoData);
-        spellingData.get(6).put("gongChengSpellingData",threeData);
-        spellingData.get(6).put("chaungDongSpellingData",fourData);
-        spellingData.get(6).put("zitiSpellingData",sixData);
-        spellingData.get(6).put("AllSpellingData",fiveData);
+        spellingData.get(8).put("chongQinSpellingData",oneData);
+        spellingData.get(8).put("chengDuSpellingData",twoData);
+        spellingData.get(8).put("gongChengSpellingData",threeData);
+        spellingData.get(8).put("chaungDongSpellingData",fourData);
+        spellingData.get(8).put("zitiSpellingData",sixData);
+        spellingData.get(8).put("AllSpellingData",fiveData);
         return success(spellingData);
     }