This commit is contained in:
parent
4a1c5c0d64
commit
794136f3f3
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
<include refid="sql.pagedynamic"></include>
|
||||
order by a.rno
|
||||
|
|
|
|||
|
|
@ -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; }
|
||||
|
|
|
|||
Loading…
Reference in New Issue