BO/Views/cm/cms.cshtml

@@ -186,7 +186,7 @@
                         <td>@item.cgname</td>
                         <td>@item.cshapename</td>
                         <td class="link cname"><a href="#" onclick="reg(@item.cmno)">@item.cname (@item.classno)</a></td>
-                        <td>@Html.Raw(item.quota == 0? "무제한": item.quota.ToString())</td>
+                        <td>@item.quotastr</td>
                         <td class="link text-center"><a href="#" onclick="golect(@item.cmno)">@Model.Datas.Where(w => w.intval == item.cmno).Select(w => w.intval2).FirstOrDefault()</a></td>
                         <td class="link text-center"><a href="#" onclick="copycm(@item.cmno, '@item.cname', @item.pcgno, @item.cgno, @item.pcmno, this)">[복제]</a></td>
                     </tr>

BO/Views/croom/lectcms.cshtml

@@ -43,24 +43,26 @@
                         <th>신청기간</th>
                         <th>제한인원</th>
                         <th>수강인원</th>
+                        <th>대기인원 [승인/입금/결제]</th>
                         @*<th>(전체신청인원/완료/입금대기/결제대기)</th>*@
                     </tr>
                 </thead>
                 <tbody class="data" id="tbody1">
                     @foreach (var d in Model.CMs)
                     {
-                        <tr>
+                    <tr>
-                            <td>@d.rnorvt</td>
+                        <td>@d.rnorvt</td>
-                            <td>@d.cmno</td>
+                        <td>@d.cmno</td>
-                            <td>@d.tmname</td>
+                        <td>@d.tmname</td>
-                            <td>@d.cgname</td>
+                        <td>@d.cgname</td>
-                            <td>@d.cshapename</td>
+                        <td>@d.cshapename</td>
-                            <td class="link"><a href="#" onclick="reg(@(d.cmno))">@d.cnameclassno</a></td>
+                        <td class="link"><a href="#" onclick="reg(@(d.cmno))">@d.cnameclassno</a></td>
-                            <td>@d.rsrename</td>
+                        <td>@d.rsrename</td>
-                            <td>@d.quotastr</td>
+                        <td>@d.quotastr</td>
-                            <td>@d.countsuccess</td>
+                        <td>@d.countsuccess</td>
-                            @*<td>@string.Format("( {0} / {1} / {2} / {3} )", d.countlect.ToString("#,0"),d.countsuccess.ToString("#,0"),d.countstanbydraw.ToString("#,0"),d.countstanbypay.ToString("#,0"))</td>*@
+                        <td>@d.countstanbyaccept / @d.countstanbypay / @d.countstanbydraw</td>
-                        </tr>
+                        @*<td>@string.Format("( {0} / {1} / {2} / {3} )", d.countlect.ToString("#,0"),d.countsuccess.ToString("#,0"),d.countstanbydraw.ToString("#,0"),d.countstanbypay.ToString("#,0"))</td>*@
+                    </tr>
                     }
                 </tbody>
             </table>

Dao/MyBatis/Maps/Lect.xml

@@ -89,33 +89,34 @@
             order by b.username
         </select>
         <select id="lect.cms" parameterClass="hashtable" resultClass="cm">
-            select a.cmno,c.tyear,c.tseq,d.cgname,b.quota,b.cshape,b.cname,b.classno,b.rstime,b.retime,a.countlect,a.countstandby,a.rno,a.pagetotalcount,a.countnoresult,a.countfail,a.countcomplete,a.countsuccess,a.countstanbypay,a.countstanbydraw
+          select a.cmno,c.tyear,c.tseq,d.cgname,b.quota,b.cshape,b.cname,b.classno,b.rstime,b.retime,a.countlect,a.countstandby,a.rno,a.pagetotalcount,a.countnoresult,a.countfail,a.countcomplete,a.countsuccess,a.countstanbypay,a.countstanbydraw,a.countstanbyaccept
-            from (
+          from (
-            select a.cmno,a.countlect,a.countstandby,a.rno,a.pagetotalcount,a.countnoresult,a.countfail,a.countcomplete,a.countsuccess,a.countstanbypay,a.countstanbydraw
+          select a.cmno,a.countlect,a.countstandby,a.rno,a.pagetotalcount,a.countnoresult,a.countfail,a.countcomplete,a.countsuccess,a.countstanbypay,a.countstanbydraw,a.countstanbyaccept
-            from (
+          from (
-                    select b.cmno,count(d.lectno) countlect
+          select b.cmno,count(d.lectno) countlect
-                        ,sum(case when ifnull(d.isready,0) = 1 and d.status = 3 then 1 else 0 end) countstandby
+          ,sum(case when ifnull(d.isready,0) = 1 and d.status = 3 then 1 else 0 end) countstandby
-                        ,sum(case when d.iscomplete is null then 1 else 0 end) countnoresult
+          ,sum(case when d.iscomplete is null then 1 else 0 end) countnoresult
-                        ,sum(d.iscomplete) countcomplete
+          ,sum(d.iscomplete) countcomplete
-                        ,sum(case when d.iscomplete=0 then 1 else 0 end) countfail
+          ,sum(case when d.iscomplete=0 then 1 else 0 end) countfail
-                        ,row_number() over(order by <isNotNull property="orderby">$orderby$</isNotNull><isNull property="orderby">case when b.retime &lt; now() then 1 else 2 end,b.retime desc</isNull>) rno
+          ,row_number() over(order by <isNotNull property="orderby">$orderby$</isNotNull><isNull property="orderby">case when b.retime &lt; now() then 1 else 2 end,b.retime desc</isNull>) rno
                         ,sum(case when d.lectno is not null and p.pstatus=1 then 1 else 0 end) countsuccess
                         ,sum(case when d.lectno is not null and p.pstatus=21 then 1 else 0  end) countstanbypay
                         ,sum(case when d.lectno is not null and p.pstatus = 22 then 1 else 0 end) countstanbydraw
+                        ,sum(case when d.lectno is not null and p.pstatus = 55 then 1 else 0 end) countstanbyaccept
                         ,count(a.cdt) over() pagetotalcount
                     from term a
                     inner join cm b on b.tmno=a.tmno <isNotNull property="cshape">and b.cshape=#cshape#</isNotNull> <isNotNull property="cnamelike">and b.cname like concat('%',#cnamelike#,'%')</isNotNull>
                     inner join cg c on c.cgno=b.cgno
                     <isNotNull property="islect">
-                    left outer join lect d on d.cmno=b.cmno and d.status &lt; 5 and d.ischanged=0
+                    left outer join lect d on d.cmno=b.cmno and (d.status &lt; 5 or d.status = 6) and d.ischanged=0
                     left outer join users u on u.userno = d.userno
                     inner join payitem pi on pi.pino=d.pino
                     inner join pay p on p.payno=pi.payno
                     </isNotNull>
                     <isNull property="islect">
-                    inner join lect d on d.cmno=b.cmno <isNotNull property="status">and d.status=#status#</isNotNull> and d.status &lt; 5 and d.ischanged=0
+                    inner join lect d on d.cmno=b.cmno <isNotNull property="status">and d.status=#status#</isNotNull> and (d.status &lt; 5 or d.status = 6) and d.ischanged=0
-                    inner join payitem pi on pi.pino=d.pino
+                      inner join payitem pi on pi.pino=d.pino
-                    inner join pay p on p.payno=pi.payno
+                      inner join pay p on p.payno=pi.payno
                     </isNull>
                     <isNotNull property="profno">
                         inner join cmprof pr on pr.cmno=b.cmno and pr.userno=#profno#

Model/CM.cs

@@ -416,6 +416,7 @@ namespace NP.Model
         public int countsuccess { get; set; }
         public int countstanbypay { get; set; }
         public int countstanbydraw { get; set; }
+        public int countstanbyaccept { get; set; }
 
         /// <summary>
         /// 기술인분류