Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS

FrontendWebApi/ApiControllers/LightScheduleController.cs

@@ -136,9 +136,9 @@ namespace FrontendWebApi.ApiControllers
                         };
                         ScheduleDevices.Add(ScheduleDevice);
                     }
-                    opeInput.parameter = JsonConvert.SerializeObject(saveSchedule);
                     await backendRepository.AddMutiByCustomTable(ScheduleDevices, "schedule_device");
                     saveSchedule.light_schedule_guid = newguid.ToString();
+                    opeInput.parameter = JsonConvert.SerializeObject(saveSchedule);
                     await InsertOperation(opeInput);
                 }
                 else
@@ -184,7 +184,7 @@ namespace FrontendWebApi.ApiControllers
                     // 兩邊設備 guid 排序後比較
                     saveSchedule.devicelist.Sort();
                     targetScheduleDevice.Sort();
-                    if (saveSchedule.devicelist != targetScheduleDevice) {
+                    if (!saveSchedule.devicelist.SequenceEqual(targetScheduleDevice)) {
                         saveSchedule.changeNames.Add("設備變更");
                     }
 

FrontendWebApi/Models/Operation.cs

@@ -168,5 +168,13 @@ namespace FrontendWebApi.Models
         public string building_tag{ get; set; }
         public short operation_type { get; set; }
     }
-   
+    public class OperationLogExportInput { 
+        public bool isNiagara { get; set; }
+        
+        public string exportOpeTypeName { get; set; }
+
+        public PageResult<OperationLogInput> listInput { get; set; }
+        public List<OperationLogOutput> exportList { get; set; }
+    }
+
 }

FrontendWebApi/Models/Share.cs

@@ -294,5 +294,7 @@ namespace FrontendWebApi.Models
     public class PageResult<T> : BasePageResult
     {
         public T data { get; set; }
+
+        public bool isEnable { get; set; }
     }
 }