diff --git a/BO/Views/cm/cms.cshtml b/BO/Views/cm/cms.cshtml index 695006b..5e16335 100644 --- a/BO/Views/cm/cms.cshtml +++ b/BO/Views/cm/cms.cshtml @@ -186,7 +186,7 @@ @item.cgname @item.cshapename @item.cname (@item.classno) - @Html.Raw(item.quota == 0? "무제한": item.quota.ToString()) + @item.quotastr @Model.Datas.Where(w => w.intval == item.cmno).Select(w => w.intval2).FirstOrDefault() [복제] diff --git a/BO/Views/croom/lectcms.cshtml b/BO/Views/croom/lectcms.cshtml index 9248639..f2352f0 100644 --- a/BO/Views/croom/lectcms.cshtml +++ b/BO/Views/croom/lectcms.cshtml @@ -43,24 +43,26 @@ 신청기간 제한인원 수강인원 + 대기인원 [승인/입금/결제] @*(전체신청인원/완료/입금대기/결제대기)*@ @foreach (var d in Model.CMs) { - - @d.rnorvt - @d.cmno - @d.tmname - @d.cgname - @d.cshapename - @d.cnameclassno - @d.rsrename - @d.quotastr - @d.countsuccess - @*@string.Format("( {0} / {1} / {2} / {3} )", d.countlect.ToString("#,0"),d.countsuccess.ToString("#,0"),d.countstanbydraw.ToString("#,0"),d.countstanbypay.ToString("#,0"))*@ - + + @d.rnorvt + @d.cmno + @d.tmname + @d.cgname + @d.cshapename + @d.cnameclassno + @d.rsrename + @d.quotastr + @d.countsuccess + @d.countstanbyaccept / @d.countstanbypay / @d.countstanbydraw + @*@string.Format("( {0} / {1} / {2} / {3} )", d.countlect.ToString("#,0"),d.countsuccess.ToString("#,0"),d.countstanbydraw.ToString("#,0"),d.countstanbypay.ToString("#,0"))*@ + } diff --git a/Dao/MyBatis/Maps/Lect.xml b/Dao/MyBatis/Maps/Lect.xml index d44fb3e..915bdcf 100644 --- a/Dao/MyBatis/Maps/Lect.xml +++ b/Dao/MyBatis/Maps/Lect.xml @@ -89,33 +89,34 @@ order by b.username