260320_01_ENH: Data Export에 날짜 범위 조회 추가, Data Export시 두번째 시트에 변수가이드 나오게 수정

This commit is contained in:
2026-03-20 11:25:58 +09:00
parent 0aa5be19ef
commit cc614fe5a1
5 changed files with 96 additions and 10 deletions

View File

@@ -1918,14 +1918,36 @@ namespace REPORT_API_ver6.Services
returnTable.Rows.Add(labelRow);
j++;
}
}
}
return returnTable;
}
public byte[] makeDataAndGuidFile(PkeyInfo pkeyInfo, UserInfo userInfo, string dataType, string fileTarget, string start = "", string end = "")
{
List<DataTabelToExcelSheet> excelDataList = new List<DataTabelToExcelSheet>();
if (fileTarget.ToUpper() == "ALL" || fileTarget.ToUpper() == "DATA")
{
DataTable headerTable = getExportHeader(pkeyInfo.Pkey, pkeyInfo.isKiwi, userInfo.IsAdmin);
DataTable bodyTable = getProjectData(pkeyInfo.Pkey, "", "", start, end, pkeyInfo.isKiwi, 1,"", "", dataType);
DataTable dataTable = makeExportTable(headerTable, bodyTable);
excelDataList.Add(new DataTabelToExcelSheet(dataTable, "DATA"));
}
if (fileTarget.ToUpper() == "ALL" || fileTarget.ToUpper() == "GUIDE")
{
DataTable guideTable = makeGuideTable(pkeyInfo.Pkey, pkeyInfo.isKiwi, userInfo.IsAdmin);
excelDataList.Add(new DataTabelToExcelSheet(guideTable, "GUIDE"));
}
return Common.DataTableToExcel(excelDataList);
}
/// <summary>
/// 저장된 북마크 정보 반환
/// </summary>