diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs index e543c47..dcc1e86 100644 --- a/BO/Controllers/croomController.cs +++ b/BO/Controllers/croomController.cs @@ -679,13 +679,16 @@ namespace NP.BO.Controllers DateTime.Now.AddMonths(-2).ToString("yyyy-MM-dd"); if (vm.isexceldown == 1) { + foreach (var payItem in vm.PayItems) + { + payItem.studyplacename = vm.ComCodes.Where(w => w.cgroup.ToString() == "studyplace" && w.ccode == payItem.studyplace).FirstOrDefault()?.cname; + payItem.cmistudyplacename = vm.ComCodes.Where(w => w.cgroup.ToString() == "studyplace" && w.ccode == payItem.cmistudyplace).FirstOrDefault()?.cname; + } return ExportExcel( - new String[] { "결제번호", "신청자이름", "ID", "회사명", "상품구분", "상품유형","환급여부", "상품명", /*"교육일정",*/ "결제금액", "결제방법", "입금금액", "환불금액", "신청일", "입금일", "결제상태" - ,"환급은행명","환급계좌번호","환급예금주"}, - new String[] { "payno", "username", "userid", "asname", "ptypename","isrebatename", "itemname", /*"stimeymd",*/ "payamt", "pptypename", "payamt", "refundamt", "cdtymd", "payymd", "pstatusname2" - ,"rbankname","rbankacc","rbankowner"}, + new String[] { "결제번호", "신청자이름", "ID", "회사명", "상품유형", "환급여부", "상품명", "결제금액", "결제방법", "입금금액", "환불금액", "신청일", "입금일", "결제상태", "환급은행명", "환급계좌번호", "환급예금주", "교육장소", "강좌교육시작일", "강좌교육종료일", "신청교육장소", "교육신청일 " }, + new String[] { "payno", "username", "userid", "asname", "cshapename", "isrebatename", "itemname", "payamt", "pptypename", "payamt", "refundamt", "cdtymd", "payymd", "pstatusname2", "rbankname", "rbankacc", "rbankowner", "studyplacename", "sdateymd", "edateymd", "cmistudyplacename", "cmiestartymd" }, vm.PayItems, - "ProductSales_"+DateTime.Now.Year+DateTime.Now.Month+DateTime.Now.Day); + "ProductSales_" + DateTime.Now.Year + DateTime.Now.Month + DateTime.Now.Day); } return View(vm); } diff --git a/BO/Views/Shared/_Layout.cshtml b/BO/Views/Shared/_Layout.cshtml index 2bf253b..272f1a5 100644 --- a/BO/Views/Shared/_Layout.cshtml +++ b/BO/Views/Shared/_Layout.cshtml @@ -29,7 +29,11 @@ @RenderSection("scriptscdn", required: false)