From 072017a12d6a49baa6c186ecaf10755ae9f9f91f Mon Sep 17 00:00:00 2001
From: tq <1916474859@qq,com>
Date: Thu, 13 Jun 2024 17:26:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Service/Ammeter/EmeterEnergyChangeService.cs | 8 +++++---
 Service/Ammeter/EmeterEnergyService.cs       | 6 ++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Service/Ammeter/EmeterEnergyChangeService.cs b/Service/Ammeter/EmeterEnergyChangeService.cs
index 5df5a23..c794f96 100644
--- a/Service/Ammeter/EmeterEnergyChangeService.cs
+++ b/Service/Ammeter/EmeterEnergyChangeService.cs
@@ -45,9 +45,10 @@ public class EmeterEnergyChangeService : BaseServices<EmeterEnergyChange>
     SELECT 
         d.`code`,
         d.`UploadTime`,
-        CASE 
-            WHEN d.`Count` = 1 THEN d.`MaxValue` - d.`PreviousMaxValue`
-            ELSE d.`MaxValue` - d.`MinValue`
+        CASE
+            WHEN d.`Count` > 1 THEN d.`MaxValue` - d.`MinValue`
+            WHEN d.`Count` = 1 AND d.`PreviousMaxValue` IS NOT NULL THEN d.`MaxValue` - d.`PreviousMaxValue`
+            ELSE 0
         END AS `DailyValue`
     FROM 
         previous_day_max d
@@ -65,6 +66,7 @@ ORDER BY
     `UploadTime`;
 
 
+
     ";
 
         List<EmeterEnergyChange> emeterEnergies = await _emeterEnergyChangeRep.SqlQueryable(sql);
diff --git a/Service/Ammeter/EmeterEnergyService.cs b/Service/Ammeter/EmeterEnergyService.cs
index 31b043b..134fbfa 100644
--- a/Service/Ammeter/EmeterEnergyService.cs
+++ b/Service/Ammeter/EmeterEnergyService.cs
@@ -50,8 +50,9 @@ public class EmeterEnergyService : BaseServices<EmeterEnergy>
         d.`code`,
         d.`UploadTime`,
         CASE 
-            WHEN d.`Count` = 1 THEN d.`MaxValue` - d.`PreviousMaxValue`
-            ELSE d.`MaxValue` - d.`MinValue`
+            WHEN d.`Count` > 1 THEN d.`MaxValue` - d.`MinValue`
+            WHEN d.`Count` = 1 AND d.`PreviousMaxValue` IS NOT NULL THEN d.`MaxValue` - d.`PreviousMaxValue`
+            ELSE 0
         END AS `DailyValue`
     FROM 
         previous_day_max d
@@ -69,6 +70,7 @@ ORDER BY
     `UploadTime`;
 
 
+
     ";
         List<EmeterEnergy> emeterEnergies = await this.BaseDal.SqlQueryable(sql);
         return emeterEnergies;