From aa72be2accb6c816df1deead25965d8c3ddf3999 Mon Sep 17 00:00:00 2001
From: hyunho <hyunho  @example.com>
Date: Thu, 14 Jan 2021 07:19:45 +0000
Subject: [PATCH]

---
 Dao/MyBatis/Maps/CM.xml              | 2 +-
 FO/Views/Course/ApplyComplete.cshtml | 6 +++---
 FO/Views/Course/ApplyEdu.cshtml      | 6 +++---
 FO/Views/Course/ApplyPay.cshtml      | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Dao/MyBatis/Maps/CM.xml b/Dao/MyBatis/Maps/CM.xml
index 0042941..b8c2a2f 100644
--- a/Dao/MyBatis/Maps/CM.xml
+++ b/Dao/MyBatis/Maps/CM.xml
@@ -1770,7 +1770,7 @@
         left outer join cm d on a.ismaster=0 and d.cmno=a.pcmno
         left outer join comcode e on a.studyplace = e.ccode
         left outer join (select count(a.lectno) cnt from lect a where a.cmno=#cmno# and a.status =1  and a.ischanged=0) f on 1 = 1
-        where a.isdel=0
+        where a.isdel=0 and a.rstime &lt;= now() and a.retime &gt;= now()
         <isNotNull property="cmno">and a.pcmno=#cmno#</isNotNull>
         <isNotNull property="studyplace">and a.studyplace=#studyplace#</isNotNull>
         ) a
diff --git a/FO/Views/Course/ApplyComplete.cshtml b/FO/Views/Course/ApplyComplete.cshtml
index 3425919..cf13593 100644
--- a/FO/Views/Course/ApplyComplete.cshtml
+++ b/FO/Views/Course/ApplyComplete.cshtml
@@ -22,15 +22,15 @@ else
                 <li>
                     @if (Model.CM.cshape == 0)
                     {
-                        <p><label>@(Model.CM.tseq)기 <span class='gry'>@(Model.CM.rsrename) (@(Model.CM.rsretimeToDay)일) </span> @Model.CM.cname</label></p>
+                        <p><label>@(Model.CM.tseq)기 <span class='gry'>@(Model.CM.ssrename) (@(Model.CM.ssretimeToDay)일) </span> @Model.CM.cname</label></p>
                     }
                     else if (Model.CM.cshape == 1)
                     {
-                        <p><label>@(Model.CM.tseq)기 <span class='blu'>[@(Model.CM.studyplacename) 교육장] </span><span class='gry'>@Model.CM.rsrename (@(Model.CM.rsretimeToDay)일) </span> @Model.CM.cname<span class='red'> | @(Model.CM.infee)원</span></label></p>
+                        <p><label>@(Model.CM.tseq)기 <span class='blu'>[@(Model.CM.studyplacename) 교육장] </span><span class='gry'>@Model.CM.ssrename (@(Model.CM.ssretimeToDay)일) </span> @Model.CM.cname<span class='red'> | @(Model.CM.infee)원</span></label></p>
                     }
                     else if (Model.CM.cshape == 2)
                     {
-                        <p><label>@(Model.CM.tseq)기 <span class='gry'>@(Model.CM.rsrename) (@(Model.CM.rsretimeToDay)일) </span> @Model.CM.cname<span class='red'> | @(Model.CM.infee)원 ※ 집체교육 선택 필수</span></label></p>
+                        <p><label>@(Model.CM.tseq)기 <span class='gry'>@(Model.CM.ssrename) (@(Model.CM.ssretimeToDay)일) </span> @Model.CM.cname<span class='red'> | @(Model.CM.infee)원 ※ 집체교육 선택 필수</span></label></p>
                     }
 
                     @*@if (Model.CM.applicableCM == "정상접수")
diff --git a/FO/Views/Course/ApplyEdu.cshtml b/FO/Views/Course/ApplyEdu.cshtml
index 5876e55..83c3572 100644
--- a/FO/Views/Course/ApplyEdu.cshtml
+++ b/FO/Views/Course/ApplyEdu.cshtml
@@ -18,15 +18,15 @@
                 <li>
                     @if (Model.CM.cshape == 0)
                     {
-                        <p><label>@(Model.CM.tseq)기 <span class='gry'>@(Model.CM.rsrename) (@(Model.CM.rsretimeToDay)일) </span> @Model.CM.cname<span class='red'> | <span id="spninfee"></span>원</span></label></p>
+                        <p><label>@(Model.CM.tseq)기 <span class='gry'>@(Model.CM.ssrename) (@(Model.CM.ssretimeToDay)일) </span> @Model.CM.cname<span class='red'> | <span id="spninfee"></span>원</span></label></p>
                     }
                     else if (Model.CM.cshape == 1)
                     {
-                        <p><label>@(Model.CM.tseq)기 <span class='blu'>[@(Model.CM.studyplacename) 교육장] </span><span class='gry'>@Model.CM.rsrename (@(Model.CM.rsretimeToDay)일) </span> @Model.CM.cname<span class='red'> | <span id="spninfee"></span>원</span></label></p>
+                        <p><label>@(Model.CM.tseq)기 <span class='blu'>[@(Model.CM.studyplacename) 교육장] </span><span class='gry'>@Model.CM.ssrename (@(Model.CM.ssretimeToDay)일) </span> @Model.CM.cname<span class='red'> | <span id="spninfee"></span>원</span></label></p>
                     }
                     else if (Model.CM.cshape == 2)
                     {
-                        <p><label>@(Model.CM.tseq)기 <span class='gry'>@(Model.CM.rsrename) (@(Model.CM.rsretimeToDay)일) </span> @Model.CM.cname<span class='red'> | <span id="spninfee"></span>원 ※ 집체교육 선택 필수</span></label></p>
+                        <p><label>@(Model.CM.tseq)기 <span class='gry'>@(Model.CM.ssrename) (@(Model.CM.ssretimeToDay)일) </span> @Model.CM.cname<span class='red'> | <span id="spninfee"></span>원 ※ 집체교육 선택 필수</span></label></p>
                     }
 
                     @if (Model.CM.applicableCM == "정상접수")
diff --git a/FO/Views/Course/ApplyPay.cshtml b/FO/Views/Course/ApplyPay.cshtml
index 9255803..8e0d00d 100644
--- a/FO/Views/Course/ApplyPay.cshtml
+++ b/FO/Views/Course/ApplyPay.cshtml
@@ -18,15 +18,15 @@
                 <li>
                     @if (Model.CM.cshape == 0)
                     {
-                        <p><label>@(Model.CM.tseq)기 <span class='gry'>@(Model.CM.rsrename) (@(Model.CM.rsretimeToDay)일) </span> @Model.CM.cname<span class='red'> | @(Model.CM.infee)원</span></label></p>
+                        <p><label>@(Model.CM.tseq)기 <span class='gry'>@(Model.CM.ssrename) (@(Model.CM.ssretimeToDay)일) </span> @Model.CM.cname<span class='red'> | @(Model.CM.infee)원</span></label></p>
                     }
                     else if (Model.CM.cshape == 1)
                     {
-                        <p><label>@(Model.CM.tseq)기 <span class='blu'>[@(Model.CM.studyplacename) 교육장] </span><span class='gry'>@Model.CM.rsrename (@(Model.CM.rsretimeToDay)일) </span> @Model.CM.cname<span class='red'> | @(Model.CM.infee)원</span></label></p>
+                        <p><label>@(Model.CM.tseq)기 <span class='blu'>[@(Model.CM.studyplacename) 교육장] </span><span class='gry'>@Model.CM.ssrename (@(Model.CM.ssretimeToDay)일) </span> @Model.CM.cname<span class='red'> | @(Model.CM.infee)원</span></label></p>
                     }
                     else if (Model.CM.cshape == 2)
                     {
-                        <p><label>@(Model.CM.tseq)기 <span class='gry'>@(Model.CM.rsrename) (@(Model.CM.rsretimeToDay)일) </span> @Model.CM.cname<span class='red'> | @(Model.CM.infee)원 ※ 집체교육 선택 필수</span></label></p>
+                        <p><label>@(Model.CM.tseq)기 <span class='gry'>@(Model.CM.ssrename) (@(Model.CM.ssretimeToDay)일) </span> @Model.CM.cname<span class='red'> | @(Model.CM.infee)원 ※ 집체교육 선택 필수</span></label></p>
                     }
                 </li>
             </ul>