diff --git a/FrontendWebApi/ApiControllers/HydroMeterController.cs b/FrontendWebApi/ApiControllers/HydroMeterController.cs index 4d1e764..044914b 100644 --- a/FrontendWebApi/ApiControllers/HydroMeterController.cs +++ b/FrontendWebApi/ApiControllers/HydroMeterController.cs @@ -829,9 +829,9 @@ namespace FrontendWebApi.ApiControllers [Route("api/ExportElectricEachTotalCompareList")] public FileResult OpeExportEachTotalCompareExcelElec([FromBody] HydroMeterInput input) { - List> result = new List>(); + List result = new List(); - result.Add(ElectricListEachTotal(input).Result.Value.Data.ToList()); + result = ElectricListEachTotal(input).Result.Value.Data.ToList(); List> docFile = new List>(); @@ -880,8 +880,8 @@ namespace FrontendWebApi.ApiControllers using (FileStream templateStream = new FileStream(".\\template\\ElectricEachTotalCompare_temp.xlsx", FileMode.Open, FileAccess.Read)) { - var templateWorkbook = new XSSFWorkbook(templateStream); - var sheet = templateWorkbook.GetSheetAt(0); // 這裡假設您要使用第一個工作表 + workbook = new XSSFWorkbook(templateStream); + var sheet = workbook.GetSheetAt(0); // 這裡假設您要使用第一個工作表 // 設定要填入資料的位置(rowIndex 和 columnIndex) int rowIndex = 4; // 假設要從第二列開始填入 @@ -892,16 +892,16 @@ namespace FrontendWebApi.ApiControllers columnIndex = 1; IRow row = sheet.GetRow(rowIndex) ?? sheet.CreateRow(rowIndex); - string buildingName = r.Select(x => x.building_name).FirstOrDefault(); - string floorTag = r.Select(x => x.floor_tag).FirstOrDefault(); - ICell cell = row.GetCell(columnIndex) ?? row.CreateCell(columnIndex); + string buildingName = r.building_name; + string floorTag = r.floor_tag; + ICell cell = row.GetCell(columnIndex++) ?? row.CreateCell(columnIndex++); cell.SetCellValue(buildingName + floorTag); cell = row.GetCell(columnIndex++) ?? row.CreateCell(columnIndex++); - string deviceFullName = r.Select(x => x.device_full_name).FirstOrDefault(); + string deviceFullName = r.device_full_name; cell.SetCellValue(deviceFullName); - foreach (var rawD in r.FirstOrDefault().rawData) + foreach (var rawD in r.rawData) { cell = row.GetCell(columnIndex++) ?? row.CreateCell(columnIndex++); cell.SetCellValue(rawD.avg_rawdata); @@ -939,7 +939,7 @@ namespace FrontendWebApi.ApiControllers ms.Flush(); ms.Seek(0, SeekOrigin.Begin); Response.Headers.Add("Access-Control-Expose-Headers", "Content-Disposition"); - return File(ms, "application/vnd.ms", @$"電表報表{System.DateTime.Now.ToString("yyyyMMddHHmm")}.xlsx"); + return File(ms, "application/vnd.ms", @$"用電差異比較表{System.DateTime.Now.ToString("yyyyMMddHHmm")}.xlsx"); } [HttpPost]