jay.chang/ibms-MCUT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FE API] 修改各盤總盤報表 匯出功能

Browse Source
This commit is contained in:
keke 2023-09-07 14:18:39 +08:00
parent 18746d5a42
commit 25559996ab
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
FrontendWebApi/ApiControllers/HydroMeterController.cs
View File

@ -841,6 +841,7 @@ namespace FrontendWebApi.ApiControllers
bool total_flag = false; bool total_flag = false;
if (input.Mode == HydroMeterInputSearchMode.Custom) if (input.Mode == HydroMeterInputSearchMode.Custom)
{ {
input.Mode = HydroMeterInputSearchMode.All;
result_for_sum = ElectricListEachTotal(input).Result.Value.Data.ToList(); result_for_sum = ElectricListEachTotal(input).Result.Value.Data.ToList();
flag = false; flag = false;
total_flag = true; total_flag = true;
@ -1038,11 +1039,16 @@ namespace FrontendWebApi.ApiControllers
{ {
flag = false; flag = false;
} }
if (r.device_full_name == "綜合大樓總盤")
{
continue;
}
string buildingName = r.building_name; string buildingName = r.building_name;
string floorTag = r.floor_tag; string floorTag = r.floor_tag;
string deviceFullName = r.device_full_name; string deviceFullName = r.device_full_name;
columnIndex = 0; columnIndex = 0;
// 這兩個盤不納入該棟總計
if (last_device == "電機館分盤" || last_device == "薄膜分盤") if (last_device == "電機館分盤" || last_device == "薄膜分盤")
{ {
flag = false; flag = false;