From 794136f3f36be3b3f8e2dc455e582c486f9aa1aa Mon Sep 17 00:00:00 2001 From: kdh0120 Date: Mon, 17 May 2021 03:48:23 +0000 Subject: [PATCH] --- BO/Controllers/croomController.cs | 6 ++++-- Dao/MyBatis/Maps/CRoom.xml | 2 ++ Model/Pay.cs | 3 +++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs index 51d4a7f..0d77afc 100644 --- a/BO/Controllers/croomController.cs +++ b/BO/Controllers/croomController.cs @@ -677,8 +677,10 @@ namespace NP.BO.Controllers if (vm.isexceldown == 1) { return ExportExcel( - new String[] { "결제번호", "신청자이름", "ID", "회원구분", "회사명", "상품구분", "상품유형","환급여부", "상품명", /*"교육일정",*/ "결제금액", "결제방법", "입금금액", "환불금액", "신청일", "입금일", "결제상태"}, - new String[] { "payno", "username", "userid", "isjoinname", "asname", "ptypename","cshapename" ,"isrebatename", "itemname", /*"stimeymd",*/ "payamt", "pptypename", "payamt", "refundamt", "cdtymd", "payymd", "pstatusname2"}, + new String[] { "결제번호", "신청자이름", "ID", "회사명", "상품구분", "상품유형","환급여부", "상품명", /*"교육일정",*/ "결제금액", "결제방법", "입금금액", "환불금액", "신청일", "입금일", "결제상태" + ,"환급은행명","환급계좌번호","환급예금주"}, + new String[] { "payno", "username", "userid", "asname", "ptypename","isrebatename", "itemname", /*"stimeymd",*/ "payamt", "pptypename", "payamt", "refundamt", "cdtymd", "payymd", "pstatusname2" + ,"rbankname","rbankacc","rbankowner"}, vm.PayItems, "ProductSales_"+DateTime.Now.Year+DateTime.Now.Month+DateTime.Now.Day); } diff --git a/Dao/MyBatis/Maps/CRoom.xml b/Dao/MyBatis/Maps/CRoom.xml index d6dfabc..28540b1 100644 --- a/Dao/MyBatis/Maps/CRoom.xml +++ b/Dao/MyBatis/Maps/CRoom.xml @@ -774,6 +774,7 @@ ,cm.cshape,cm.sstime,cm.setime ,le.sdate,le.edate ,case when a.isexamready=1 then uee.exname else case pi.ptype when 2 then bk.bkname when 3 then ex.exname else cm.cname end end itemname + ,ppl.rbankname,ppl.rbankacc,ppl.rbankowner ,row_number() over(order by case when pr.rstatus=0 and pri.rfdno is not null then 0 else 1 end, case when a.isexamready=1 then ue.cdt else p.cdt end desc) rno ,count(p.payno) over() pagetotalcount from ( @@ -852,6 +853,7 @@ left outer join book bk on a.isexamready=0 and pi.ptype=2 and bk.bkno=pi.itemno left outer join exam ex on a.isexamready=0 and ex.exno=pi.itemno left outer join examuser exu on exu.exno=ex.exno and exu.userno=p.userno + left outer join pplog ppl on ppl.pplno = p.pplno ) a order by a.rno diff --git a/Model/Pay.cs b/Model/Pay.cs index 6476db1..34ae019 100644 --- a/Model/Pay.cs +++ b/Model/Pay.cs @@ -489,7 +489,10 @@ namespace NP.Model } } public String rbank { get; set; } + public String rbankname { get; set; } + public String rbankacc { get; set; } public String rbankaccnum{ get; set; } + public String rbankowner { get; set; } public String tbankuser{ get; set; } public int? infee { get; set; } public int? outfee { get; set; }