fix

sop-business/src/main/java/com/qmth/sop/business/service/impl/QualityAnalyseServiceImpl.java

@@ -38,27 +38,27 @@ public class QualityAnalyseServiceImpl extends ServiceImpl<QualityAnalyseMapper,
         List<Map<String, Object>> influence = this.baseMapper.influence(serviceUnitId);
         Map<String, Map<String, Object>> result = new HashMap<>();
         if (group.equals(QualityAnalyseGroupEnum.INFLUENCE_REGION)) {
-            influence.stream().collect(Collectors.groupingBy(map -> map.get("region_name"))).forEach((k, v) -> {
+            influence.stream().filter(map->map.get("region_name")!=null).collect(Collectors.groupingBy(map -> map.get("region_name"))).forEach((k, v) -> {
                 Map<String, Object> map = new HashMap<>();
-                v.stream().collect(Collectors.groupingBy(map1 -> map1.get("Influence_degree"))).forEach((k1, v1) -> map.put(k1.toString(), v1.size()));
+                v.stream().filter(map1->map1.get("Influence_degree")!=null).collect(Collectors.groupingBy(map1 -> map1.get("Influence_degree"))).forEach((k1, v1) -> map.put(k1.toString(), v1.size()));
                 result.put(k.toString(), map);
             });
         } else if (group.equals(QualityAnalyseGroupEnum.INFLUENCE_SUPPLIER)) {
-            influence.stream().collect(Collectors.groupingBy(map -> map.get("Influence_degree"))).forEach((k, v) -> {
+            influence.stream().filter(map->map.get("Influence_degree")!=null).collect(Collectors.groupingBy(map -> map.get("Influence_degree"))).forEach((k, v) -> {
                 Map<String, Object> map = new HashMap<>();
-                v.stream().collect(Collectors.groupingBy(map1 -> map1.get("supplier"))).forEach((k1, v1) -> map.put(k1.toString(), v1.size()));
+                v.stream().filter(map1->map1.get("supplier")!=null).collect(Collectors.groupingBy(map1 -> map1.get("supplier"))).forEach((k1, v1) -> map.put(k1.toString(), v1.size()));
                 result.put(k.toString(), map);
             });
         } else if (group.equals(QualityAnalyseGroupEnum.REASON_REGION)) {
-            influence.stream().collect(Collectors.groupingBy(map -> map.get("region_name"))).forEach((k, v) -> {
+            influence.stream().filter(map->map.get("region_name")!=null).collect(Collectors.groupingBy(map -> map.get("region_name"))).forEach((k, v) -> {
                 Map<String, Object> map = new HashMap<>();
-                v.stream().collect(Collectors.groupingBy(map1 -> map1.get("reason"))).forEach((k1, v1) -> map.put(k1.toString(), v1.size()));
+                v.stream().filter(map1->map1.get("reason")!=null).collect(Collectors.groupingBy(map1 -> map1.get("reason"))).forEach((k1, v1) -> map.put(k1.toString(), v1.size()));
                 result.put(k.toString(), map);
             });
         } else if (group.equals(QualityAnalyseGroupEnum.REASON_SUPPLIER)) {
-            influence.stream().collect(Collectors.groupingBy(map -> map.get("reason"))).forEach((k, v) -> {
+            influence.stream().filter(map->map.get("reason")!=null).collect(Collectors.groupingBy(map -> map.get("reason"))).forEach((k, v) -> {
                 Map<String, Object> map = new HashMap<>();
-                v.stream().collect(Collectors.groupingBy(map1 -> map1.get("supplier"))).forEach((k1, v1) -> map.put(k1.toString(), v1.size()));
+                v.stream().filter(map1->map1.get("supplier")!=null).collect(Collectors.groupingBy(map1 -> map1.get("supplier"))).forEach((k1, v1) -> map.put(k1.toString(), v1.size()));
                 result.put(k.toString(), map);
             });
         }
@@ -70,9 +70,9 @@ public class QualityAnalyseServiceImpl extends ServiceImpl<QualityAnalyseMapper,
     public Map<String, Object> pie(Long serviceUnitId) {
         List<Map<String, Object>> pie = this.baseMapper.pie(serviceUnitId, null);
         Map<String, Object> result = new HashMap<>();
-        pie.stream().collect(Collectors.groupingBy(map -> map.get("Influence_degree"))).forEach((k, v) -> {
+        pie.stream().filter(map1->map1.get("Influence_degree")!=null).collect(Collectors.groupingBy(map -> map.get("Influence_degree"))).forEach((k, v) -> {
 
-            result.put(k.toString(),v.stream().mapToLong(map1-> (long) map1.get("count")).sum());
+            result.put(k.toString(),v.stream().filter(map1->map1.get("count")!=null).mapToLong(map1-> (long) map1.get("count")).sum());
 
         });
         return result;
@@ -84,27 +84,27 @@ public class QualityAnalyseServiceImpl extends ServiceImpl<QualityAnalyseMapper,
 
         List<Map<String, Object>> radar = this.baseMapper.radar(serviceUnitId, null);;
         Map<String, Map<String, Object>> result = new HashMap<>();
-        radar.stream().collect(Collectors.groupingBy(map -> map.get("reason"))).forEach((k, v) -> {
+        radar.stream().filter(map1->map1.get("reason")!=null).collect(Collectors.groupingBy(map -> map.get("reason"))).forEach((k, v) -> {
             Map<String, Object> map = new HashMap<>();
-            map.put(k.toString(),v.stream().mapToLong(map1-> (long) map1.get("count")).sum());
+            map.put(k.toString(),v.stream().filter(map1->map1.get("count")!=null).mapToLong(map1-> (long) map1.get("count")).sum());
             result.put("all", map);
         });
 
 
         if (group.equals(QualityAnalyseGroupEnum.REASON_REGION)) {
 
-            radar.stream().collect(Collectors.groupingBy(map -> map.get("region_name"))).forEach((k, v) -> {
+            radar.stream().filter(map1->map1.get("region_name")!=null).collect(Collectors.groupingBy(map -> map.get("region_name"))).forEach((k, v) -> {
                 Map<String, Object> z = new HashMap<>();
-                v.stream().collect(Collectors.groupingBy(map2 -> map2.get("reason"))).forEach((k1, v1) -> {
-                    z.put(k1.toString(),v1.stream().mapToLong(map1-> (long) map1.get("count")).sum());
+                v.stream().filter(map1->map1.get("reason")!=null).collect(Collectors.groupingBy(map2 -> map2.get("reason"))).forEach((k1, v1) -> {
+                    z.put(k1.toString(),v1.stream().filter(map1->map1.get("count")!=null).mapToLong(map1-> (long) map1.get("count")).sum());
                 });
                 result.put(k.toString(), z);
             });
         } else if (group.equals(QualityAnalyseGroupEnum.REASON_SUPPLIER)) {
-            radar.stream().collect(Collectors.groupingBy(map -> map.get("supplier"))).forEach((k, v) -> {
+            radar.stream().filter(map1->map1.get("supplier")!=null).collect(Collectors.groupingBy(map -> map.get("supplier"))).forEach((k, v) -> {
                 Map<String, Object> z = new HashMap<>();
-                v.stream().collect(Collectors.groupingBy(map2 -> map2.get("reason"))).forEach((k1, v1) -> {
-                    z.put(k1.toString(),v1.stream().mapToLong(map1-> (long) map1.get("count")).sum());
+                v.stream().filter(map1->map1.get("reason")!=null).collect(Collectors.groupingBy(map2 -> map2.get("reason"))).forEach((k1, v1) -> {
+                    z.put(k1.toString(),v1.stream().filter(map1->map1.get("count")!=null).mapToLong(map1-> (long) map1.get("count")).sum());
                 });
                 result.put(k.toString(), z);
             });