Merge branch 'master' into Willy

SolarPower/Controllers/OperationController.cs

@@ -500,9 +500,9 @@ namespace SolarPower.Controllers
         /// </summary>
         /// <param name="post"></param>
         /// <returns></returns>
-        public async Task<ApiResult<OperationRecode>> SaveOperationRecode([FromForm] PostOperationRecode post)
+        public async Task<ApiResult<int>> SaveOperationRecode([FromForm] PostOperationRecode post)
         {
-            ApiResult<OperationRecode> apiResult = new ApiResult<OperationRecode>();
+            ApiResult<int> apiResult = new ApiResult<int>();
 
             OperationRecode operationRecode = null;
 
@@ -570,6 +570,7 @@ namespace SolarPower.Controllers
 
                     apiResult.Code = "0000";
                     apiResult.Msg = "儲存成功";
+                    apiResult.Data = id;
                     #endregion
                 }
                 else
@@ -648,6 +649,7 @@ namespace SolarPower.Controllers
 
                     apiResult.Code = "0000";
                     apiResult.Msg = "儲存成功";
+                    apiResult.Data = operationRecode.Id;
                     #endregion
                 }
             }

SolarPower/Quartz/Jobs/CalcInverter15minJob.cs

@@ -28,8 +28,8 @@ namespace SolarPower.Quartz.Jobs
                 #region step1. 找出所有電站
                 logger.LogInformation("【CalcInverter15minJob】【開始取得電站資料】");
                 var powerStations = await powerStationRepository.GetAllAsync();
-                logger.LogInformation("【CalcPowerStationJob】【取得成功電站資料】");
+                logger.LogInformation("【CalcInverter15minJob】【取得成功電站資料】");
-                logger.LogInformation("【CalcPowerStationJob】【電站資料】 - {0}", System.Text.Json.JsonSerializer.Serialize(powerStations));
+                logger.LogInformation("【CalcInverter15minJob】【電站資料】 - {0}", System.Text.Json.JsonSerializer.Serialize(powerStations));
                 #endregion
 
                 List<InverterHistory> calcInverter15mins = new List<InverterHistory>();

SolarPower/Repository/Implement/OperationRepository.cs

@@ -227,7 +227,7 @@ namespace SolarPower.Repository.Implement
                     if (filter.WorkType > 0)
                     {
                         filter.WorkType -= 1;
-                        sql += @" AND opr.WorkType = @WorkType";
+                        sql += @" AND opr.WorkType = @WorkType ORDER BY CreatedAt DESC";
                     }
                     else
                     {

SolarPower/Views/Operation/OperationRecord.cshtml

@@ -495,6 +495,7 @@
             $(".fix-div").show();
             $("#recode-form").trigger("reset");
             $("input[name=status_modal][value='" + 0 + "']").prop('checked', true); //狀態
+            $("#recode_files_div > .row").empty();
 
             $("#recode-form-modal").modal();
         }
@@ -738,6 +739,8 @@
 
                         if (myDropzone.files.length > 0) {
 
+                            selected_id = rel.data;
+
                             myDropzone.processQueue();
 
                             myDropzone.on("successmultiple", function (file, rel) {

SolarPower/appsettings.Development.json

@@ -6,7 +6,7 @@
       "Microsoft.Hosting.Lifetime": "Information"
     }
   },
-  "LoginExpireMinute": 60, //?n?J???????A???(??)
+  "LoginExpireMinute": 60, //登入到期時間，單位(分)
   "DBConfig": {
     "Server": "MVgHWzR3rGDgD57TUoFunA==",
     "port": "r4AoXMUDodcQjIzofGNCcg==",