From bad900c3b91180e5287402f0088cab499b53030f Mon Sep 17 00:00:00 2001
From: hyunho <hyunho  @example.com>
Date: Tue, 16 Mar 2021 07:29:36 +0000
Subject: [PATCH]

---
 BO/Controllers/croomController.cs | 10 ++++++++
 BO/Views/croom/lectcms.cshtml     | 38 +++++++++++++++++++------------
 Dao/MyBatis/Maps/Lect.xml         | 11 ++++++++-
 Model/CM.cs                       | 13 +++++++++++
 4 files changed, 56 insertions(+), 16 deletions(-)

diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs
index 4032670..0483142 100644
--- a/BO/Controllers/croomController.cs
+++ b/BO/Controllers/croomController.cs
@@ -20,6 +20,12 @@ namespace NP.BO.Controllers
         }
         public ActionResult lectcms(VMCM vm)
         {
+            if (!IsPost())
+            {
+                vm.stringval5 = DateTime.Now.AddMonths(-2).ToString("yyyy-MM-01");
+                vm.stringval6 = Convert.ToDateTime(vm.stringval5).AddMonths(3).AddSeconds(-1).ToString("yyyy-MM-dd");
+            }
+
             var ht = SetHash(vm, false);
             if (string.IsNullOrEmpty(vm.stringval))
             {
@@ -30,9 +36,13 @@ namespace NP.BO.Controllers
             ht.Add("cshape", vm.stringval3);
             ht.Add("cnamelike", vm.stringval4);
             ht.Add("islect", "1");
+            ht.Add("sstime", vm.stringval5);
+            ht.Add("setime", vm.stringval6);
+            ht.Add("isallday", "1");
             vm.CMs = Dao.Get<CM>("lect.cms", ht);
             vm.pagetotalcount = GetCount(vm.CMs.FirstOrDefault());
             vm.Terms = Dao.Get<Term>("cm.term.ys", new System.Collections.Hashtable() { });
+
             return View(vm);
         }
 
diff --git a/BO/Views/croom/lectcms.cshtml b/BO/Views/croom/lectcms.cshtml
index f2352f0..c9d5eb2 100644
--- a/BO/Views/croom/lectcms.cshtml
+++ b/BO/Views/croom/lectcms.cshtml
@@ -20,6 +20,8 @@
                         }
                     </select>
                     @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":-유형선택;0:온라인;1:오프라인;2:혼합" }, { "name", "stringval3" }, { "selected", Model.stringval3 } })
+                    <br /><br />
+                    교육기간 @Html.Partial("./Partial/Date", string.IsNullOrEmpty(Model.stringval5) ? (DateTime?)null : Convert.ToDateTime(Model.stringval5), new ViewDataDictionary { { "name", "stringval5" } }) ~ @Html.Partial("./Partial/Date", string.IsNullOrEmpty(Model.stringval6) ? (DateTime?)null : Convert.ToDateTime(Model.stringval6), new ViewDataDictionary { { "name", "stringval6" } })
                     @Html.Partial("./Partial/Text", Model.stringval4, Helpers.DicText(new NP.Model.TextDic() { Name = "stringval4", Value = Model.stringval4, PH = "강좌명을 입력하세요.", CssClass = "ff" }))
                     @Html.Partial("./Partial/Button", new NP.Model.Button() { Special = "search" })
                 </div>
@@ -41,28 +43,34 @@
                         <th>유형</th>
                         <th>강좌명</th>
                         <th>신청기간</th>
+                        <th>교육기간</th>
+                        <th>교육장소</th>
                         <th>제한인원</th>
                         <th>수강인원</th>
-                        <th>대기인원 [승인/입금/결제]</th>
+                        @*<th>대기인원 [승인/입금/결제]</th>*@
+                        <th>대기인원</th>
                         @*<th>(전체신청인원/완료/입금대기/결제대기)</th>*@
                     </tr>
                 </thead>
                 <tbody class="data" id="tbody1">
                     @foreach (var d in Model.CMs)
                     {
-                    <tr>
-                        <td>@d.rnorvt</td>
-                        <td>@d.cmno</td>
-                        <td>@d.tmname</td>
-                        <td>@d.cgname</td>
-                        <td>@d.cshapename</td>
-                        <td class="link"><a href="#" onclick="reg(@(d.cmno))">@d.cnameclassno</a></td>
-                        <td>@d.rsrename</td>
-                        <td>@d.quotastr</td>
-                        <td>@d.countsuccess</td>
-                        <td>@d.countstanbyaccept / @d.countstanbypay / @d.countstanbydraw</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>*@
-                    </tr>
+                        <tr>
+                            <td>@d.rnorvt</td>
+                            <td>@d.cmno</td>
+                            <td>@d.tmname</td>
+                            <td>@d.cgname</td>
+                            <td>@d.cshapename</td>
+                            <td class="link"><a href="#" onclick="reg(@(d.cmno))">@d.cnameclassno</a></td>
+                            <td>@d.rsrename</td>
+                            <td>@d.ssrename</td>
+                            <td>@(d.cshape != 0 ? d.studyplacename : "-")</td>
+                            <td>@d.quotastr</td>
+                            <td>@d.countsuccess</td>
+                            @*<td>@d.countstanbyaccept / @d.countstanbypay / @d.countstanbydraw</td>*@
+                            <td>@d.countstanbyacceptstr</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>*@
+                        </tr>
                     }
                 </tbody>
             </table>
@@ -75,7 +83,7 @@
 </form>
 
 @section scriptsHeader{
-    
+    @Html.Partial("./Partial/ScriptDate")
 }
 @section scripts{
     <script>
diff --git a/Dao/MyBatis/Maps/Lect.xml b/Dao/MyBatis/Maps/Lect.xml
index 0e31033..151e238 100644
--- a/Dao/MyBatis/Maps/Lect.xml
+++ b/Dao/MyBatis/Maps/Lect.xml
@@ -90,7 +90,7 @@
         </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,a.countstanbyaccept,b.studydays
+          a.cmno,c.tyear,c.tseq,d.cgname,b.quota,b.cshape,b.cname,b.classno,b.rstime,b.retime,b.sstime,b.setime,a.countlect,a.countstandby,a.rno,a.pagetotalcount,a.countnoresult,a.countfail,a.countcomplete,a.countsuccess,a.countstanbypay,a.countstanbydraw,a.countstanbyaccept,b.studydays,code.cname studyplacename
           from (
             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 (
@@ -126,6 +126,14 @@
                         <isNotNull property="tyear" prepend="and">a.tyear=#tyear#</isNotNull>
                         <isNotNull property="tmno" prepend="and">a.tmno=#tmno#</isNotNull>
                         <isNotNull property="islect" prepend="and" >b.isdel=0  and (u.status in (1,99) or u.status is null)</isNotNull>
+                        <isNotNull property="isallday" prepend="and">
+                          date_format(b.retime,'%Y%m%d') = '20991231'
+                          or 
+                          (
+                            date_format(b.sstime,'%Y%m%d') &gt;= date_format(#sstime#,'%Y%m%d')
+                            and date_format(b.setime,'%Y%m%d') &lt;= date_format(#setime#,'%Y%m%d')
+                          )  
+                        </isNotNull>
                     </dynamic>
                     group by b.cmno
                     <isNotNull property="nocomplete">having sum(d.iscomplete) &lt; 1</isNotNull>
@@ -138,6 +146,7 @@
             inner join cm b on b.cmno=a.cmno
             inner join term c on c.tmno=b.tmno
             inner join cg d on d.cgno=b.cgno
+            left join comcode code on code.cgroup = 'studyplace' and code.ccode = b.studyplace
             order by a.rno
         </select>
 
diff --git a/Model/CM.cs b/Model/CM.cs
index 39e6a53..f29a0ee 100644
--- a/Model/CM.cs
+++ b/Model/CM.cs
@@ -426,9 +426,22 @@ namespace NP.Model
         /// </summary>
         public Int64? fgnocm { get; set; }
         public int countsuccess { get; set; }
+        public String countsuccessstr {
+            get
+            {
+                return countsuccess + "명";
+            }
+        }
         public int countstanbypay { get; set; }
         public int countstanbydraw { get; set; }
         public int countstanbyaccept { get; set; }
+        public String countstanbyacceptstr
+        {
+            get
+            {
+                return countstanbyaccept + "명";
+            }
+        }
 
         /// <summary>
         /// 기술인분류