fix

sop-business/src/main/java/com/qmth/sop/business/service/SopAnalyseService.java

@@ -16,7 +16,7 @@ public interface SopAnalyseService extends IService<TBSopInfo> {
 
     List<Map<String, Object>> processing(Long serviceId, SopAnalyseGroupEnum group, SopAnalyseSortEnum sort);
 
-    Map<Object, Map<Object, List<Map<String, Object>>>> trend(Long serviceId);
+    Map<Object, List<Map<String, Object>>> trend(Long serviceId);
 
     List<Map<String, Object>> attendance(Long serviceId, SopAnalyseGroupEnum group);
 }

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

@@ -154,12 +154,12 @@ public class SopAnalyseServiceImpl extends ServiceImpl<SopAnalyseMapper, TBSopIn
      * 供应商近一周预警数的均值走势。
      */
     @Override
-    public Map<Object, Map<Object, List<Map<String, Object>>>> trend(Long serviceId) {
+    public Map<Object, List<Map<String, Object>>> trend(Long serviceId) {
         List<Map<String, Object>> list = this.baseMapper.trend(serviceId);
-        Map<Object, List<Map<String, Object>>> collect1 = list.stream().collect(Collectors.groupingBy(map -> map.get("click_date")));
-        Map<Object, Map<Object, List<Map<String, Object>>>> collect = new HashMap<>();
-        collect1.forEach((k, v) -> collect.put(k,v.stream().filter(map -> map.get("supplier") != null).collect(Collectors.groupingBy(map1 -> map1.get("supplier")))));
-        return collect;
+//        Map<Object, List<Map<String, Object>>> collect1 = list.stream().collect(Collectors.groupingBy(map -> map.get("click_date")));
+//        Map<Object, Map<Object, List<Map<String, Object>>>> collect = new HashMap<>();
+//        collect1.forEach((k, v) -> collect.put(k,v.stream().filter(map -> map.get("supplier") != null).collect(Collectors.groupingBy(map1 -> map1.get("supplier")))));
+        return list.stream().filter(map -> map.get("supplier") != null).collect(Collectors.groupingBy(map1 -> map1.get("supplier")));
 
     }