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 <= now() and a.retime >= now()
and a.pcmno=#cmno#
and a.studyplace=#studyplace#
) 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
@if (Model.CM.cshape == 0)
{
- @(Model.CM.tseq)기 @(Model.CM.rsrename) (@(Model.CM.rsretimeToDay)일) @Model.CM.cname
+ @(Model.CM.tseq)기 @(Model.CM.ssrename) (@(Model.CM.ssretimeToDay)일) @Model.CM.cname
}
else if (Model.CM.cshape == 1)
{
- @(Model.CM.tseq)기 [@(Model.CM.studyplacename) 교육장] @Model.CM.rsrename (@(Model.CM.rsretimeToDay)일) @Model.CM.cname | @(Model.CM.infee)원
+ @(Model.CM.tseq)기 [@(Model.CM.studyplacename) 교육장] @Model.CM.ssrename (@(Model.CM.ssretimeToDay)일) @Model.CM.cname | @(Model.CM.infee)원
}
else if (Model.CM.cshape == 2)
{
- @(Model.CM.tseq)기 @(Model.CM.rsrename) (@(Model.CM.rsretimeToDay)일) @Model.CM.cname | @(Model.CM.infee)원 ※ 집체교육 선택 필수
+ @(Model.CM.tseq)기 @(Model.CM.ssrename) (@(Model.CM.ssretimeToDay)일) @Model.CM.cname | @(Model.CM.infee)원 ※ 집체교육 선택 필수
}
@*@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 @@
@if (Model.CM.cshape == 0)
{
- @(Model.CM.tseq)기 @(Model.CM.rsrename) (@(Model.CM.rsretimeToDay)일) @Model.CM.cname | 원
+ @(Model.CM.tseq)기 @(Model.CM.ssrename) (@(Model.CM.ssretimeToDay)일) @Model.CM.cname | 원
}
else if (Model.CM.cshape == 1)
{
- @(Model.CM.tseq)기 [@(Model.CM.studyplacename) 교육장] @Model.CM.rsrename (@(Model.CM.rsretimeToDay)일) @Model.CM.cname | 원
+ @(Model.CM.tseq)기 [@(Model.CM.studyplacename) 교육장] @Model.CM.ssrename (@(Model.CM.ssretimeToDay)일) @Model.CM.cname | 원
}
else if (Model.CM.cshape == 2)
{
- @(Model.CM.tseq)기 @(Model.CM.rsrename) (@(Model.CM.rsretimeToDay)일) @Model.CM.cname | 원 ※ 집체교육 선택 필수
+ @(Model.CM.tseq)기 @(Model.CM.ssrename) (@(Model.CM.ssretimeToDay)일) @Model.CM.cname | 원 ※ 집체교육 선택 필수
}
@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 @@
@if (Model.CM.cshape == 0)
{
- @(Model.CM.tseq)기 @(Model.CM.rsrename) (@(Model.CM.rsretimeToDay)일) @Model.CM.cname | @(Model.CM.infee)원
+ @(Model.CM.tseq)기 @(Model.CM.ssrename) (@(Model.CM.ssretimeToDay)일) @Model.CM.cname | @(Model.CM.infee)원
}
else if (Model.CM.cshape == 1)
{
- @(Model.CM.tseq)기 [@(Model.CM.studyplacename) 교육장] @Model.CM.rsrename (@(Model.CM.rsretimeToDay)일) @Model.CM.cname | @(Model.CM.infee)원
+ @(Model.CM.tseq)기 [@(Model.CM.studyplacename) 교육장] @Model.CM.ssrename (@(Model.CM.ssretimeToDay)일) @Model.CM.cname | @(Model.CM.infee)원
}
else if (Model.CM.cshape == 2)
{
- @(Model.CM.tseq)기 @(Model.CM.rsrename) (@(Model.CM.rsretimeToDay)일) @Model.CM.cname | @(Model.CM.infee)원 ※ 집체교육 선택 필수
+ @(Model.CM.tseq)기 @(Model.CM.ssrename) (@(Model.CM.ssretimeToDay)일) @Model.CM.cname | @(Model.CM.infee)원 ※ 집체교육 선택 필수
}