From d866a0c52c419156941801ea0008643d1c7f0e04 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Wed, 05 Jan 2022 16:18:59 +0800
Subject: [PATCH] 新建污染警报小时表定时任务

---
 screen-api/src/main/java/com/moral/api/service/impl/HistoryMonthlyServiceImpl.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/service/impl/HistoryMonthlyServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/HistoryMonthlyServiceImpl.java
index 613a00c..e227257 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/HistoryMonthlyServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/HistoryMonthlyServiceImpl.java
@@ -331,13 +331,13 @@
             result = doubleStream.sum();
         } else {
             if ("min".equals(type)) {
-                optionalDouble = doubleStream.average();
-
-            } else if ("max".equals(type)) {
                 optionalDouble = doubleStream.min();
 
-            } else if ("avg".equals(type)) {
+            } else if ("max".equals(type)) {
                 optionalDouble = doubleStream.max();
+
+            } else if ("avg".equals(type)) {
+                optionalDouble = doubleStream.average();
             }
 
             if (optionalDouble.isPresent()) {

--
Gitblit v1.8.0