From 898454a2c5a0ac2a56b1c2ffe004803a77c4a9b9 Mon Sep 17 00:00:00 2001 From: hyunho Date: Tue, 15 Dec 2020 00:37:16 +0000 Subject: [PATCH] --- Dao/MyBatis/Maps/Lect.xml | 6 +++--- FO/Views/My/Index.cshtml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dao/MyBatis/Maps/Lect.xml b/Dao/MyBatis/Maps/Lect.xml index 2bbceac..d44fb3e 100644 --- a/Dao/MyBatis/Maps/Lect.xml +++ b/Dao/MyBatis/Maps/Lect.xml @@ -985,12 +985,12 @@ ,c.rstime time,c.retime time2 ,row_number() over(order by c.retime) rno from payitem a - inner join pay b on b.payno=a.payno and b.pstatus in (1,21,22,51) and b.rstatus < 2 + inner join pay b on b.payno=a.payno and b.pstatus in (1,21,22,51,55) and b.rstatus < 2 inner join cm c on c.cmno=a.itemno and c.rstime < and c.retime > - inner join lect l on l.cmno=c.cmno and l.status < 5 and l.ischanged=0 and l.userno=b.userno + inner join lect l on l.cmno=c.cmno and (l.status < 5 or l.status = 6) and l.ischanged=0 and l.userno=b.userno inner join term d on d.tmno=c.tmno left outer join payrfd e on e.payno=a.payno and e.payno=a.payno and e.rstatus=0 - where a.ptype in (0,1,4) and a.userno=#userno# and a.pstatus in (1,21,22,51) and a.rstatus=0 + where a.ptype in (0,1,4) and a.userno=#userno# and a.pstatus in (1,21,22,51,55) and a.rstatus=0 order by rno ) a union all diff --git a/FO/Views/My/Index.cshtml b/FO/Views/My/Index.cshtml index 2e1e5c4..97df445 100644 --- a/FO/Views/My/Index.cshtml +++ b/FO/Views/My/Index.cshtml @@ -122,7 +122,7 @@ @d.strval
-
@(d.intval5 == 1 ? "환불요청" : d.intval4 == 1 ? "결제완료" : d.intval4 == 21 ? "결제대기" : d.intval4 == 22 ? "입금대기" : d.intval4 == 51 ? "심사중" : "")
+
@(d.intval5 == 1 ? "환불요청" : d.intval4 == 1 ? "결제완료" : d.intval4 == 21 ? "결제대기" : d.intval4 == 22 ? "입금대기" : d.intval4 == 51 ? "심사중" : d.intval4 == 55 ? "승인대기" : "")
신청기간 : @d.time.ToString("yy/MM/dd") ~ @d.time2.ToString("yy/MM/dd")