Merge branch 'develop_tzs_register_to_0715' of…

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/ZLDPStatisticsServiceImpl.java

@@ -67,9 +67,8 @@ public class ZLDPStatisticsServiceImpl {
         Map<String, Integer> dataMap = new HashMap<>();
         for(Map<String,Object> map : list){
             if(null == map.get("equipCategory") || CollectionUtils.isEmpty((JSONArray) JSONArray.parse((String) map.get("equipCategory")))){
-                String[] UnitTypeArray = ((String) map.get("unitType")).split("#");
-                for (int i = 0; i < UnitTypeArray.length; i++) {
-                    String unitTypeName = UnitTypeArray[i];
+                String[] unitTypeArray = ((String) map.get("unitType")).split("#");
+                for (String unitTypeName : unitTypeArray) {
                     if (dataMap.containsKey(unitTypeName + "null")) {
                         dataMap.put(unitTypeName + "null", dataMap.get(unitTypeName + "null") + 1);
                     } else {
@@ -78,14 +77,13 @@ public class ZLDPStatisticsServiceImpl {
                 }
             }else {
                 JSONArray equipCategoryArray = (JSONArray) JSONArray.parse((String) map.get("equipCategory"));
-                String[] UnitTypeArray = ((String) map.get("unitType")).split("#");
-                for (int i = 0; i < UnitTypeArray.length; i++) {
-                    String unitTypeName = UnitTypeArray[i];
-                    for (int j = 0; j < equipCategoryArray.size(); j++) {
-                        if (dataMap.containsKey(unitTypeName + equipCategoryArray.get(j))) {
-                            dataMap.put(unitTypeName + equipCategoryArray.get(j), dataMap.get(unitTypeName + equipCategoryArray.get(j)) + 1);
+                String[] unitTypeArray = ((String) map.get("unitType")).split("#");
+                for (String unitTypeName : unitTypeArray) {
+                    for (Object o : equipCategoryArray) {
+                        if (dataMap.containsKey(unitTypeName + o)) {
+                            dataMap.put(unitTypeName + o, dataMap.get(unitTypeName + o) + 1);
                         } else {
-                            dataMap.put(unitTypeName + equipCategoryArray.get(j), 1);
+                            dataMap.put(unitTypeName + o, 1);
                         }
                     }
                 }
@@ -151,7 +149,7 @@ public class ZLDPStatisticsServiceImpl {
         Map<String,Object> angaiweiyaliguandaoMap = new HashMap<>();
         angaiweiyaliguandaoMap.put("key","key05");
         angaiweiyaliguandaoMap.put("name","压力管道");
-        angaiweiyaliguandaoMap.put("value",dataMap.getOrDefault("安装改造维修单位9000",0));
+        angaiweiyaliguandaoMap.put("value",dataMap.getOrDefault("安装改造维修单位8000",0));
         angaiweiCompanyList.add(angaiweiyaliguandaoMap);
         //安改维起重机械
         Map<String,Object> angaiweiqizhongjixieMap = new HashMap<>();
@@ -198,6 +196,13 @@ public class ZLDPStatisticsServiceImpl {
         shejiyaliguandaoMap.put("value",dataMap.getOrDefault("设计单位8000",0));
         shejiCompanyList.add(shejiyaliguandaoMap);
         shejiMap.put("data",shejiCompanyList);
+        //无设备类型
+        Map<String,Object> shejiNullMap = new HashMap<>();
+        shejiNullMap.put("key","key09");
+        shejiNullMap.put("name","无设备类型");
+        shejiNullMap.put("value",dataMap.getOrDefault("设计单位null",0));
+        shejiCompanyList.add(shejiNullMap);
+        shejiMap.put("data",angaiweiCompanyList);
 
         //制造Map
         Map<String,Object> zhizaoMap = new HashMap<>();
@@ -216,7 +221,7 @@ public class ZLDPStatisticsServiceImpl {
         zhizaoguoluMap.put("name","锅炉");
         zhizaoguoluMap.put("value",dataMap.getOrDefault("制造单位1000",0));
         zhizaoCompanyList.add(zhizaoguoluMap);
-        //制造锅炉
+        //制造场内机动车
         Map<String,Object> zhizaojidongcheMap = new HashMap<>();
         zhizaojidongcheMap.put("key","key03");
         zhizaojidongcheMap.put("name","场内机动车");