diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs index 6aff5a5..ce76529 100644 --- a/BO/Controllers/croomController.cs +++ b/BO/Controllers/croomController.cs @@ -686,7 +686,7 @@ namespace NP.BO.Controllers } return ExportExcel( 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" }, + new String[] { "payno", "username", "userid", "asname", "cshapename", "isrebatename", "itemname", "payamt", "pptypename", "payamt", "refundamt", "cdtymd", "payymd", "pstatusname2", "rbank", "rbankaccnum", "tbankuser", "studyplacename", "sdateymd", "edateymd", "cmistudyplacename", "cmiestartymd" }, 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 965bb0e..a7eee4c 100644 --- a/Dao/MyBatis/Maps/CRoom.xml +++ b/Dao/MyBatis/Maps/CRoom.xml @@ -778,6 +778,7 @@ ,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 ,scd.estart cmiestart, scd.eend cmieeend, scd.studyplace cmistudyplace + ,pi.rbank , CAST(AES_DECRYPT(UNHEX(pi.rbankaccnum), ) AS char) rbankaccnum, pi.tbankuser from ( select 0 isexamready,p.payno,max(case when pi.ptype in (0,1,3,4) then pi.pino else 0 end) pi1,min(pi.pino) pi2,count(pi.pino) ccount from pay p