From cfaeab3cb8c360855e47fd8720b533f89d8f0630 Mon Sep 17 00:00:00 2001
From: kdh0120 <kdh0120  @example.com>
Date: Fri, 3 Dec 2021 02:30:13 +0000
Subject: [PATCH] =?UTF-8?q?<=EA=B8=B0=EB=8A=A5=EA=B0=9C=EC=84=A0>=20?=
 =?UTF-8?q?=ED=86=B5=ED=95=A9=ED=85=8C=EC=8A=A4=ED=8A=B8=EB=AA=A9=EB=A1=9D?=
 =?UTF-8?q?=20.=20592=20=EB=82=B4=EC=9A=A9=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BO/Views/croom/pay.cshtml  | 4 ++++
 Dao/MyBatis/Maps/CRoom.xml | 2 +-
 Model/Pay.cs               | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

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 @@
                         <th>입금금액<br />(환불금액)</th>
                         <th>신청/승인일</th>
                         <th>입금일</th>
+                        <th>진도율</th>
+                        <th>수료여부</th>
                         <th>상태</th>
                     </tr>
                 </thead>
@@ -165,6 +167,8 @@
                             <td class="link" style="text-align: right !important;"><a href="#" onclick="gorefund(@d.payno, @d.pstatus)">@(d.pstatus == 1 ? d.payamt.ToString("#,0") : "0")<br /><span class="red">(@(d.refundamt.ToString("#,0")))</span></a></td>
                             <td>@d.cdtymd</td>
                             <td>@(d.payoktime == null ? "" : d.payoktime.Value.ToString("yy-MM-dd"))</td>
+                            <td>@d.attrate</td>
+                            <td>@d.completename</td>
                             <td class="@(d.rstatus > 0 || d.isrefundcall == 1 ? "red redback":"")">@d.pstatusname2</td>
                         </tr>
                     }
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), <include refid="sql.digest"></include>) 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; }
+
     }
 
     /// <summary>