diff --git a/BO/Views/cm/cmreg.cshtml b/BO/Views/cm/cmreg.cshtml
index 962d73c..791f57c 100644
--- a/BO/Views/cm/cmreg.cshtml
+++ b/BO/Views/cm/cmreg.cshtml
@@ -364,6 +364,23 @@
             else {
                 $("#spnaccommofee").hide();
             }
+
+            if ($("input[name='CM.cshape']:checked").val() == '1') {
+                $("#alldays").prop("disabled", true);
+            }
+            else {
+                $("#alldays").prop("disabled", false);
+            }
+
+            if ($("#alldays").is(":checked")) {
+                $("#CM_cshape1").prop("disabled", true);
+                if ($("#CM_studydays").val() == null || $("#CM_studydays").val() == "" || $("#CM_studydays").val() == 0) {
+                    $("#CM_studydays").val(15);
+                }
+            }
+            else {
+                $("#CM_cshape1").prop("disabled", false);
+            }
             $("input[name='CM.cshape']").on("change", function () {
                 if ($(this).val() == "0") {
                     $("#spnaccommofee").hide();
@@ -371,6 +388,13 @@
                 else {
                     $("#spnaccommofee").show();
                 }
+
+                if ($(this).val() == "1") {
+                    $("#alldays").prop("disabled", true);
+                }
+                else {
+                    $("#alldays").prop("disabled", false);
+                }
             });
             loadlegal($("#pcgno").val());
 
@@ -382,6 +406,7 @@
                     $("#stime2").show();
                     $("#gtime").hide();
                     setv("CM_retime", "2099-12-31");
+                    $("#CM_cshape1").prop("disabled", true);
                 } else {
                     var date = new Date();
                     setv("CM_retime", date.getFullYear() + "-" + ("0" + (date.getMonth() + 1)).slice(-2) + "-" + ("0" + date.getDate()).slice(-2));
@@ -389,8 +414,11 @@
                     $("#stime").show();
                     $("#stime2").hide();
                     $("#gtime").show();
+                    $("#CM_cshape1").prop("disabled", false);
                 }
             });
+
+          
         });
         function loadlegal(cgno) {
             capp("/acommon/cgget", { cgno: cgno }, "renderlegal");
@@ -435,6 +463,7 @@
             else if (isallday != true && @Model.CM.ismaster == 0 && check("CM_setime", null, "학습기간을 입력해주세요.")) { }
             else if (isallday != true && @Model.CM.ismaster == 0 && check("CM_gstime", null, "성적처리기간을 입력해주세요.")) { }
             else if (isallday != true && @Model.CM.ismaster == 0 && check("CM_getime", null, "성적처리기간을 입력해주세요.")) { }
+            else if (isallday == true && @Model.CM.ismaster == 0 && check("CM_studydays", null, "학습기간을 입력해주세요.")) { }
             else if (@Model.CM.ismaster == 0 && getDouble($("#CM_studytime").val()) < 1) { $("#CM_studytime").focus();  msg("학습시간은 1 ~ 999 사이의 값을 입력해주세요."); }
             else if ($("#cmprdatabox li").length < 1) { $("#cmprdatabox").parent().find("a.data-find").focus(); msg("담당자를 선택해주세요."); }
             //else if ('@Model.CM.pcgcode' == '@ViewBag.TestCode' && '@(Model.CM.cgcode)' != '@ViewBag.TestCode3' && val("CM_certcc") == "") { focus("CM_certcc"); msg("자격증을 선택해주세요.");}
diff --git a/Dao/MyBatis/Maps/CM.xml b/Dao/MyBatis/Maps/CM.xml
index 39490a5..046256f 100644
--- a/Dao/MyBatis/Maps/CM.xml
+++ b/Dao/MyBatis/Maps/CM.xml
@@ -170,7 +170,7 @@
                     <isNotNull property="iscurrent">and (date_format(a.retime,'%Y%m%d') != '20991231' and a.rstime &lt; now() and a.getime &gt; now()) or  date_format(a.retime,'%Y%m%d') = '20991231' and a.isuse=#isuse#</isNotNull>
             ) a
             <include refid="sql.pagedynamic"></include>
-            order by <isNotNull property="isindex">a.isalldays, </isNotNull>a.rno
+            order by a.rno
         </select>
         <select id="cm.cm" parameterClass="hashtable" resultClass="cm">
             select a.cmno,a.cshape,a.cname,a.classno,a.rstime,a.retime,a.sstime,a.setime,a.certcc,a.cgno,a.quota,a.studydays
@@ -1332,8 +1332,8 @@
             inner join cm b on b.cmno=#cmno#
             where a.cmno=#orgcmno#;
 
-            insert into cminningscd(cmino,estart,eend,quota,<include refid="sql.inc"></include>)
-            select c.cmino,b.estart,b.eend,b.quota,<include refid="sql.inv"></include>
+            insert into cminningscd(cmino,estart,eend,quota,studyplace,<include refid="sql.inc"></include>)
+            select c.cmino,b.estart,b.eend,b.quota,b.studyplace,<include refid="sql.inv"></include>
             from cminning a
             inner join cminningscd b on b.cmino=a.cmino
             inner join cminning c on c.cmno=#cmno# and c.isonline=0
@@ -1765,7 +1765,7 @@
         ,a.cdt,a.udt
         ,a.cmno value,a.cname text
         ,e.ccode, e.cname studyplacename
-        ,f.cnt lectcnt
+        ,(select count(l.lectno) cnt from lect l where l.cmno = a.cmno and l.status =1  and l.ischanged=0) lectcnt
         ,row_number() over(order by <isNotNull property="orderby">$orderby$</isNotNull><isNull property="orderby">a.udt desc</isNull>) rno
         ,count(a.cdt) over() pagetotalcount
         from cm a
@@ -1774,7 +1774,6 @@
         left outer join term t on t.tmno=a.tmno
         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 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>
diff --git a/Dao/MyBatis/Maps/Pay.xml b/Dao/MyBatis/Maps/Pay.xml
index a7d19a7..9e07d77 100644
--- a/Dao/MyBatis/Maps/Pay.xml
+++ b/Dao/MyBatis/Maps/Pay.xml
@@ -333,21 +333,32 @@
                 ,null,null,null,null,0
                 ,null,null,null,null,null
                 ,null,a.fgno,e.cmisno,<include refid="sql.inv"></include>
-            from payitem a
-            inner join pay b on b.payno=a.payno
-            inner join users c on c.userno=b.userno
-            left outer join assign d on d.asno=c.asno
-            left outer join pplog e on e.pplno=b.pplno
-            left outer join lect f on f.payno=a.payno and f.pino=a.pino and f.status=4 and f.isready=1
-            where a.payno=#payno# and a.ptype=0 and f.lectno is null;
+          from payitem a
+          inner join pay b on b.payno=a.payno
+          inner join users c on c.userno=b.userno
+          left outer join assign d on d.asno=c.asno
+          left outer join pplog e on e.pplno=b.pplno
+          left outer join lect f on f.payno=a.payno and f.pino=a.pino and f.status=4 and f.isready=1
+          where a.payno=#payno# and a.ptype=0 and f.lectno is null;
 
-            update lect a
-            inner join pay b on b.payno=a.payno and b.pstatus in (22,1)
-            inner join payitem c on c.payno=b.payno and c.itemno=a.cmno and c.pstatus=b.pstatus
-            set a.status=case when b.pstatus=22 then 2 else 1 end,a.uno=#uno#,a.uip=#uip#
-            where a.payno=#payno# and a.status=4;
+          update lect a
+          inner join pay b on b.payno=a.payno and b.pstatus in (22,1)
+          inner join payitem c on c.payno=b.payno and c.itemno=a.cmno and c.pstatus=b.pstatus
+          set a.status=case when b.pstatus=22 then 2 else 1 end,a.uno=#uno#,a.uip=#uip#
+          where a.payno=#payno# and a.status=4;
 
-            <!--update examuser a
+          <!--수강시작일 / 종료일 추가 2021-01-21-->
+          update lect a
+          inner join cm b on a.cmno = b.cmno
+          inner join pay c on a.payno = c.payno
+          set
+            a.sdate = case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' and b.cshape &lt;&gt; 1 then date_format(c.payoktime,'%Y-%m-%d 00:00:00')
+                      else b.sstime end,
+            a.edate = case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' and b.cshape &lt;&gt; 1 then date_format(date_add(c.payoktime,interval b.studydays day),'%Y-%m-%d 23:59:59')
+                      else b.setime end
+          where a.payno = #payno# and c.pstatus = 1
+
+          <!--update examuser a
             inner join pay b on b.isexam=1 and b.payno=#payno# and b.pstatus in (22,1)
             inner join payitem c on c.payno=b.payno and c.ptype=3 and c.itemno=a.exno and c.pstatus=b.pstatus
             set a.payno=b.payno,a.pstatus=case when b.pstatus=22 then 2 else 1 end,a.uno=#uno#,a.uip=#uip#
@@ -859,6 +870,17 @@
             update pay
             set ptype=#ptype#,payoktime=now(),pstatus=1,isunpay=3,udt=now(),uno=#uno#,uip=#uip#
             where payno=#payno# and pstatus=22 and ptype=3 and ispg=1 <!--and paylimit &lt; now()--> and isunpay is null;
+
+            <!--수강시작일 / 종료일 추가 2021-01-21-->
+            update lect a
+            inner join cm b on a.cmno = b.cmno
+            inner join pay c on a.payno = c.payno
+            set
+              a.sdate = case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' and b.cshape &lt;&gt; 1 then date_format(c.payoktime,'%Y-%m-%d 00:00:00') 
+                        else b.sstime end,
+              a.edate = case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' and b.cshape &lt;&gt; 1 then date_format(date_add(c.payoktime,interval b.studydays day),'%Y-%m-%d 23:59:59')
+                        else b.setime end
+            where a.payno = #payno# and c.pstatus = 1
         </update>
         <update id="pay.unpaymoney" parameterClass="hashtable">
             update pay
diff --git a/FO/Views/Course/ApplyComplete.cshtml b/FO/Views/Course/ApplyComplete.cshtml
index cf13593..e2c923a 100644
--- a/FO/Views/Course/ApplyComplete.cshtml
+++ b/FO/Views/Course/ApplyComplete.cshtml
@@ -2,6 +2,7 @@
 @*<div id="pageTitle">
         <h3>신청@(Model.Pay.payresult.Substring(0, 1) == "1" ? "완료" : "실패")</h3>
     </div>*@
+
 @if (Model.Pay.payresult.Substring(0, 1) != "1")
 {
     <h4 class="clsTitle">결제실패</h4>
@@ -15,38 +16,74 @@
 }
 else
 {
+    
+    var isallday = !string.IsNullOrEmpty(Model.CM.retimeymd) ? (Model.CM.retimeymd == "2099-12-31" ? true : false) : false;
     <h4 class="clsTitle">신청강좌</h4>
     <ul class="smtList mt0">
         <li>
             <ul class="smtlChk">
                 <li>
+                    @*@if (Model.CM.cshape == 0)
+                        {
+                            <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.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.ssrename) (@(Model.CM.ssretimeToDay)일) </span> @Model.CM.cname<span class='red'> | @(Model.CM.infee)원 ※ 집체교육 선택 필수</span></label></p>
+                        }*@
+
                     @if (Model.CM.cshape == 0)
                     {
-                        <p><label>@(Model.CM.tseq)기 <span class='gry'>@(Model.CM.ssrename) (@(Model.CM.ssretimeToDay)일) </span> @Model.CM.cname</label></p>
+                        if (!isallday)
+                        {
+                            <p><label>@(Model.CM.tseq)기 | <span class='gry'>@(Model.CM.ssrename) (@(Convert.ToInt32(Model.CM.ssretimeToDay) * 24)시간) </span> | @Model.CM.cname | <span class='red'>@(Model.CM.infee.ToString("#,0"))원</span></label></p>
+                        }
+                        else
+                        {
+                            <p><label>@(Model.CM.tseq)기 | <span class='gry'>신청일로부터 @(Model.CM.studydays)일 (@(Model.CM.studydays * 24)시간) </span> | @Model.CM.cname | <span class='red'>@(Model.CM.infee.ToString("#,0"))원</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.ssrename (@(Model.CM.ssretimeToDay)일) </span> @Model.CM.cname<span class='red'> | @(Model.CM.infee)원</span></label></p>
+                        if (!isallday)
+                        {
+                            <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.ToString("#,0"))원</span></label></p>
+                        }
+                        else
+                        {
+                            <p><label>@(Model.CM.tseq)기 | <span class='blu'>[@(Model.CM.studyplacename) 교육장] </span><span class='gry'>신청일로부터 @(Model.CM.studydays)일 (@(Model.CM.studydays * 24)시간) </span> | @Model.CM.cname | <span class='red'>@(Model.CM.infee.ToString("#,0"))원</span></label></p>
+                        }
                     }
                     else if (Model.CM.cshape == 2)
                     {
-                        <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 (!isallday)
+                        {
+                            <p><label>@(Model.CM.tseq)기 | <span class='gry'>@(Model.CM.ssrename) (@(Convert.ToInt32(Model.CM.ssretimeToDay) * 24)시간) </span> | @Model.CM.cname  | <span class='red'>@(Model.CM.infee.ToString("#,0"))원 ※ 집체교육 선택 필수</span></label></p>
+                        }
+                        else
+                        {
+                            <p><label>@(Model.CM.tseq)기 | <span class='gry'>신청일로부터 @(Model.CM.studydays)일 (@(Model.CM.studydays * 24)시간) </span> | @Model.CM.cname | <span class='red'>@(Model.CM.infee.ToString("#,0"))원 ※ 집체교육 선택 필수</span></label></p>
+                        }
                     }
 
                     @*@if (Model.CM.applicableCM == "정상접수")
-                    {
-                        <span class="smtlChkBtn smtlChk01">정상접수</span>
-                    }
-                    else
-                    {
-                        <span class="smtlChkBtn smtlChk02">대기접수</span>
-                    }*@
+                        {
+                            <span class="smtlChkBtn smtlChk01">정상접수</span>
+                        }
+                        else
+                        {
+                            <span class="smtlChkBtn smtlChk02">대기접수</span>
+                        }*@
                 </li>
             </ul>
             <div class="apyCost">
                 @if (Model.Pay.isaccommodation == 1)
                 {
-                <span>총 결제@(Model.Pay.isready == 1 && Model.Pay.pstatus != 1 && Model.Pay.pstatus != 22 ? "예상" : "")금액:<span class="red">@((Model.CM.infee + Model.CM.accommofee).ToString("#,0"))</span> 원 (합숙 : @(Model.CM.accommofee.ToString("#,0"))원 포함)</span>
+                    <span>총 결제@(Model.Pay.isready == 1 && Model.Pay.pstatus != 1 && Model.Pay.pstatus != 22 ? "예상" : "")금액:<span class="red">@((Model.CM.infee + Model.CM.accommofee).ToString("#,0"))</span> 원 (합숙 : @(Model.CM.accommofee.ToString("#,0"))원 포함)</span>
                 }
                 else
                 {
@@ -56,7 +93,7 @@ else
         </li>
     </ul>
     if (Model.Pay.isready == 0 || Model.Pay.pstatus == 1 || Model.Pay.pstatus == 22)
-                            {
+    {
         <h4 class="clsTitle">결제정보</h4>
         <table class="clsTable">
             <tbody>
@@ -69,7 +106,7 @@ else
                     <td>@Model.Pay.ptypename</td>
                 </tr>
                 @if (Model.Pay.ptype == 3)
-                        {
+                {
                     <tr>
                         <th>입금계좌</th>
                         <td>