From 58aad75319b6c25c5c1140de751b93e95fbb1c54 Mon Sep 17 00:00:00 2001
From: keke <oogff07@gmail.com>
Date: Mon, 28 Aug 2023 10:09:12 +0800
Subject: [PATCH] =?UTF-8?q?[FE=20API]=20=E5=90=84=E5=88=86=E8=A1=A8?=
 =?UTF-8?q?=E6=9F=A5=E8=A9=A2=E9=80=9A=E8=83=BD=20=E5=88=9D=E6=AD=A5?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ApiControllers/HydroMeterController.cs     | 18 ++++++++++++++++--
 FrontendWebApi/Models/HydroMeter.cs            |  9 +++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/FrontendWebApi/ApiControllers/HydroMeterController.cs b/FrontendWebApi/ApiControllers/HydroMeterController.cs
index 83cd651..1ece3d9 100644
--- a/FrontendWebApi/ApiControllers/HydroMeterController.cs
+++ b/FrontendWebApi/ApiControllers/HydroMeterController.cs
@@ -999,6 +999,20 @@ namespace FrontendWebApi.ApiControllers
         [Route("api/ElectricList_keke")]
         public async Task<ActionResult<ApiResult<List<HydroMeterOutput>>>> ElectricList_keke([FromBody] HydroMeterInput input)
         {
+
+            //switch (input.Mode)
+            //{
+            //    case HydroMeterInputSearchMode.All:
+            //        break;
+
+            //    case HydroMeterInputSearchMode.Custom: break;
+
+            //    default: 
+                    
+            //        break;
+                    
+            //}   
+
             ApiResult<List<HydroMeterOutput>> apiResult = new ApiResult<List<HydroMeterOutput>>(jwt_str);
             if (!jwtlife)
             {
@@ -1031,8 +1045,8 @@ namespace FrontendWebApi.ApiControllers
                 //Console.WriteLine(previousYear.ToString("yyyy-MM")); // 2022-08
                 //Console.WriteLine(previousMonth.ToString("yyyy-MM")); // 2023-07
 
-                var startTime = start.ToString("yyyy-MM"); // 查詢月份的去年 (去年同月)
-                var endTime = end.ToString("yyyy-MM"); // 查詢月份的上個月
+                var startTime = start.ToString("yyyy-MM") + "-01"; // 查詢月份的去年 (去年同月)
+                var endTime = end.ToString("yyyy-MM") + "-01"; // 查詢月份的上個月
                 var lastYear = previousYear.ToString("yyyy-MM");
                 var lastMonth = previousMonth.ToString("yyyy-MM");
                 var searchTime = input.startTime; // 欲查詢的月份
diff --git a/FrontendWebApi/Models/HydroMeter.cs b/FrontendWebApi/Models/HydroMeter.cs
index c65051a..7422efe 100644
--- a/FrontendWebApi/Models/HydroMeter.cs
+++ b/FrontendWebApi/Models/HydroMeter.cs
@@ -16,6 +16,15 @@ namespace FrontendWebApi.Models
         public string startTime { get; set; }
         public string endTime { get; set; }
         public decimal? price { get; set; }
+
+        public HydroMeterInputSearchMode Mode { get; set; } = HydroMeterInputSearchMode.All;
+
+    }
+
+    
+    public enum HydroMeterInputSearchMode: int { 
+        All = 0,
+        Custom = 1,
     }
 
     public class HydroMeterOutput