瀏覽代碼

Merge branch 'dev' of https://gitee.com/anji-plus/report into dev

qianlishi 3 年之前
父節點
當前提交
24b014a867

+ 8 - 3
report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/ReportDashboardServiceImpl.java

@@ -446,14 +446,19 @@ public class ReportDashboardServiceImpl implements ReportDashboardService, Initi
             return data;
         }
         //获取时间轴字段和解析时间颗粒度
-        chartProperties.forEach((key, value) -> {
+
+        for (Map.Entry<String, String> entry : chartProperties.entrySet()) {
+            String key = entry.getKey();
+            String value = entry.getValue();
             dto.setParticles(value);
             setTimeLineFormat(dto);
             if (StringUtils.isNotBlank(dto.getDataTimeFormat())) {
                 dto.setTimeLineFiled(key);
-                return;
+                break;
             }
-        });
+
+        }
+
 
         if (StringUtils.isBlank(dto.getDataTimeFormat())) {
             return data;