260320_01_ENH: Data Export에 날짜 범위 조회 추가, Data Export시 두번째 시트에 변수가이드 나오게 수정
This commit is contained in:
@@ -11,6 +11,7 @@ using System.Net;
|
||||
using System.Text;
|
||||
using System.Text.RegularExpressions;
|
||||
using System.Web;
|
||||
using REPORT_API_ver6.Models;
|
||||
|
||||
namespace REPORT_API_ver6.Services
|
||||
{
|
||||
@@ -493,6 +494,35 @@ namespace REPORT_API_ver6.Services
|
||||
|
||||
return excelPackage.GetAsByteArray();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// DataTable을 Excel로 변환
|
||||
/// </summary>
|
||||
/// <param name="excelTable">변환할 DataTable</param>
|
||||
/// <param name="sheetName">만들 Sheet Name / 기본값 : Sheet1</param>
|
||||
/// <returns>Excel파일</returns>
|
||||
public static byte[] DataTableToExcel(List<DataTabelToExcelSheet> excelDataList)
|
||||
{
|
||||
ExcelPackage excelPackage = new ExcelPackage();
|
||||
|
||||
int i = 1;
|
||||
foreach(DataTabelToExcelSheet excelData in excelDataList)
|
||||
{
|
||||
|
||||
if (String.IsNullOrEmpty(excelData.SheetName))
|
||||
{
|
||||
excelData.SheetName = "Sheet" + i;
|
||||
}
|
||||
|
||||
ExcelWorksheet worksheet = excelPackage.Workbook.Worksheets.Add(excelData.SheetName);
|
||||
worksheet.Cells["A1"].LoadFromDataTable(excelData.ExcelData, true);
|
||||
|
||||
i++;
|
||||
}
|
||||
|
||||
|
||||
return excelPackage.GetAsByteArray();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// DataTable을 CSV로 변환
|
||||
|
||||
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user