diff --git a/BO/Views/croom/pay.cshtml b/BO/Views/croom/pay.cshtml index e0edd4b..21b9793 100644 --- a/BO/Views/croom/pay.cshtml +++ b/BO/Views/croom/pay.cshtml @@ -140,6 +140,8 @@ 입금금액
(환불금액) 신청/승인일 입금일 + 진도율 + 수료여부 상태 @@ -165,6 +167,8 @@ @(d.pstatus == 1 ? d.payamt.ToString("#,0") : "0")
(@(d.refundamt.ToString("#,0")))
@d.cdtymd @(d.payoktime == null ? "" : d.payoktime.Value.ToString("yy-MM-dd")) + @d.attrate + @d.completename @d.pstatusname2 } diff --git a/Dao/MyBatis/Maps/CRoom.xml b/Dao/MyBatis/Maps/CRoom.xml index f54d45f..f2b174c 100644 --- a/Dao/MyBatis/Maps/CRoom.xml +++ b/Dao/MyBatis/Maps/CRoom.xml @@ -810,7 +810,7 @@ ,cast(AES_DECRYPT(UNHEX(u.mobile), 'np123@!' ) as char) as mobile ,ua.asname,ua.isjoin ,cm.cshape,cm.sstime,cm.setime,cm.studyplace - ,le.sdate,le.edate,le.iscomplete + ,le.sdate,le.edate,le.iscomplete,le.attrate,le.iscomplete ,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,CAST(AES_DECRYPT(UNHEX(ppl.rbankacc), ) AS char) 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 diff --git a/Model/Pay.cs b/Model/Pay.cs index 2964eeb..2e5aeff 100644 --- a/Model/Pay.cs +++ b/Model/Pay.cs @@ -605,6 +605,8 @@ namespace NP.Model return iscomplete == null ? "미수료" : iscomplete == 0 ? "미수료" : "수료"; } } + public int attrate { get; set; } + } ///