From 59478e6b937532b9051bd07400159786d1b8d2ea Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 28 七月 2023 20:47:09 +0800
Subject: [PATCH] 1

---
 src/main/java/com/yssh/service/WarningAnalyseService.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/yssh/service/WarningAnalyseService.java b/src/main/java/com/yssh/service/WarningAnalyseService.java
index 4f174d9..15f7a0d 100644
--- a/src/main/java/com/yssh/service/WarningAnalyseService.java
+++ b/src/main/java/com/yssh/service/WarningAnalyseService.java
@@ -329,7 +329,6 @@
 
     public List<Qxsh> selectMonthTop10() {
         String time = DateUtils.getYyyyMm(new Date());
-
         List<Qxsh> list = qxshMapper.selectMonthTop10(time + "%");
 
         return list;
@@ -381,6 +380,9 @@
             Report report = Report.calcReport(wd, suYuan, suMax);
             report.setLastVal(lastVal);
 
+            SuYuan700 su = suYuanMapper.selectSuYuan46ById(suYuanId, qxsh.getTime().substring(0, 4) + "-" + qxsh.getTime().substring(4, 6) + "-" + qxsh.getTime().substring(6, 8) + " " + qxsh.getTime().substring(8, 10) + ":00:00");
+            report.setSu(su);
+
             list.add(report);
         }
 

--
Gitblit v1.9.3