fix

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

@@ -33,14 +33,14 @@ public class SopAnalyseServiceImpl extends ServiceImpl<SopAnalyseMapper, TBSopIn
         List<Map<String, Object>> list = this.baseMapper.overview(serviceId);
         List<Map<String, Object>> result = new ArrayList<>();
         if (group.equals(SopAnalyseGroupEnum.REGION)) {
-            list.stream().collect(Collectors.groupingBy(map -> map.get("region_name"))).forEach((k, v) -> {
+            list.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<>();
                 map.put("region_name", k);
                 processOverviewData(v, map);
                 result.add(map);
             });
         } else if (group.equals(SopAnalyseGroupEnum.SUPPLIER)) {
-            list.stream().collect(Collectors.groupingBy(map -> map.get("supplier"))).forEach((k, v) -> {
+            list.stream().filter(map -> map.get("supplier")!=null).collect(Collectors.groupingBy(map -> map.get("supplier"))).forEach((k, v) -> {
                 Map<String, Object> map = new HashMap<>();
                 map.put("supplier", k);
                 processOverviewData(v, map);
@@ -90,7 +90,7 @@ public class SopAnalyseServiceImpl extends ServiceImpl<SopAnalyseMapper, TBSopIn
         List<Map<String, Object>> result = new ArrayList<>();
         List<Map<String, Object>> list = this.baseMapper.overview(serviceId);
         if (group.equals(SopAnalyseGroupEnum.CRM)) {
-            list.stream().collect(Collectors.groupingBy(map -> map.get("name"))).forEach((k, v) -> {
+            list.stream().filter(map->map.get("name")!=null).collect(Collectors.groupingBy(map -> map.get("name"))).forEach((k, v) -> {
                 Map<String, Object> map = new HashMap<>();
                 map.put("crmName", k);
                 //大区
@@ -99,14 +99,14 @@ public class SopAnalyseServiceImpl extends ServiceImpl<SopAnalyseMapper, TBSopIn
                 result.add(map);
             });
         } else if (group.equals(SopAnalyseGroupEnum.REGION)) {
-            list.stream().collect(Collectors.groupingBy(map -> map.get("region_name"))).forEach((k, v) -> {
+            list.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<>();
                 map.put("region_name", k);
                 processing(v, map);
                 result.add(map);
             });
         } else if (group.equals(SopAnalyseGroupEnum.SUPPLIER)) {
-            list.stream().collect(Collectors.groupingBy(map -> map.get("supplier"))).forEach((k, v) -> {
+            list.stream().filter(map->map.get("supplier")!=null).collect(Collectors.groupingBy(map -> map.get("supplier"))).forEach((k, v) -> {
                 Map<String, Object> map = new HashMap<>();
                 map.put("supplier", k);
                 //大区
@@ -173,7 +173,7 @@ public class SopAnalyseServiceImpl extends ServiceImpl<SopAnalyseMapper, TBSopIn
         List<Map<String, Object>> result = new ArrayList<>();
         List<Map<String, Object>> attendance = this.baseMapper.attendance(serviceId);
         if (group.equals(SopAnalyseGroupEnum.CRM)) {
-            attendance.stream().collect(Collectors.groupingBy(map -> map.get("name"))).forEach((k, v) -> {
+            attendance.stream().filter(map -> map.get("name")!=null).collect(Collectors.groupingBy(map -> map.get("name"))).forEach((k, v) -> {
 
                 v.stream().filter(map -> map.get("dname")!=null).collect(Collectors.groupingBy(map -> map.get("dname"))).forEach((x,y)->{
                     Map<String, Object> map = new HashMap<>();
@@ -187,7 +187,7 @@ public class SopAnalyseServiceImpl extends ServiceImpl<SopAnalyseMapper, TBSopIn
 
 
         } else if (group.equals(SopAnalyseGroupEnum.REGION)) {
-            attendance.stream().collect(Collectors.groupingBy(map -> map.get("region_name"))).forEach((k, v) -> {
+            attendance.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<>();
                 map.put("region_name", k);
                 map.put("real_name", v.get(0).get("real_name"));
@@ -198,7 +198,7 @@ public class SopAnalyseServiceImpl extends ServiceImpl<SopAnalyseMapper, TBSopIn
             });
 
         } else if (group.equals(SopAnalyseGroupEnum.SUPPLIER)) {
-            attendance.stream().collect(Collectors.groupingBy(map -> map.get("supplier"))).forEach((k, v) -> {
+            attendance.stream().filter(map -> map.get("supplier")!=null).collect(Collectors.groupingBy(map -> map.get("supplier"))).forEach((k, v) -> {
                 Map<String, Object> map = new HashMap<>();
                 map.put("supplier", k);
                 long total = v.stream().filter(map1 -> map1.get("id") != null).count();

sop-business/src/main/resources/mapper/SopAnalyseMapper.xml

@@ -53,7 +53,7 @@
             <if test="serviceId != null and serviceId != ''">
                and  s.service_id= #{serviceId}
             </if>
-            and r.region_name is not null and su.NAME is not null
+
         </where>
     </select>
     <select id="trend" resultType="java.util.Map">
@@ -134,7 +134,7 @@
         left join t_b_ding_apply d on d.sop_no=s.sop_no
         left join sys_user du on du.id=d.create_id
         <where>
-            and r.region_name is not null and su.NAME is not null
+
             <if test="serviceId != null and serviceId != ''">
                 and  s.service_id= #{serviceId}
             </if>