From 767d19d8759fc5b505107f025294bd392d08dc48 Mon Sep 17 00:00:00 2001
From: lch <lch  @example.com>
Date: Tue, 13 Jul 2021 00:57:50 +0000
Subject: [PATCH] =?UTF-8?q?=EA=B0=95=EC=9D=98=EC=8B=A4>=ED=8F=89=EA=B0=80>?=
 =?UTF-8?q?=EA=B3=BC=EC=A0=9C=EC=A0=9C=EC=B6=9C=20:=20"(=EC=98=A4=EB=A5=98?=
 =?UTF-8?q?)=20=EA=B3=BC=EC=A0=9C=20=EB=93=B1=EB=A1=9D=20=EC=8B=9C=20?=
 =?UTF-8?q?=EC=9A=B4=EC=98=81=EC=9E=90=EC=97=90=EA=B2=8C=20=EB=AC=B8?=
 =?UTF-8?q?=EC=9D=98=ED=95=B4=EC=A3=BC=EC=84=B8=EC=9A=94=20=EC=B6=9C?=
 =?UTF-8?q?=EB=A0=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ID: teststudent5
강좌: 교육기간 ~7/1
초기값: 교육기간 ~7/1 로 설정 및 수강신청
교육생 교육기간 변경 : 교육운영>수강신청>교육생정보
변경일자: ~7/30
현상 : 변경된 날짜 7/30까지 시험 제출이 가능하도록 변경"
---
 Dao/MyBatis/Maps/CRoom.xml              | 8 ++++----
 FO/Views/CRoom/EstimationSubject.cshtml | 4 ++--
 Model/CM.cs                             | 8 ++++++++
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/Dao/MyBatis/Maps/CRoom.xml b/Dao/MyBatis/Maps/CRoom.xml
index 32a000e..004fbbb 100644
--- a/Dao/MyBatis/Maps/CRoom.xml
+++ b/Dao/MyBatis/Maps/CRoom.xml
@@ -613,7 +613,7 @@
             where a.lectno=#lectno# and a.exno=#exno# and a.eend is null
         </update>
         <select id="cr.lectsd" parameterClass="hashtable" resultClass="lectsd">
-            select a.lectno,a.attrate,a.cmno
+            select a.lectno,a.attrate,a.cmno,a.sdate,a.edate
             ,b.sdno,b.sdname,b.sddesc,b.fgno sdfgno,b.sdcondition
             ,a.sdate sstime,a.edate setime
             ,d.checktime,d.cpoint,d.feedb,d.fgno,d.atext
@@ -625,8 +625,8 @@
         </select>
         <update id="cr.lectsd.save" parameterClass="lectsd">
             update lectsd a
-            inner join lect b on b.lectno=a.lectno and b.userno=#userno#
-            inner join cm c on c.cmno=b.cmno and c.sstime &lt; now() and c.setime &gt; now()
+            inner join lect b on b.lectno=a.lectno and b.userno=#userno# and b.sdate &lt; now() and b.edate &gt; now()
+            inner join cm c on c.cmno=b.cmno 
             set a.udt=now(),a.uno=#uno#,a.uip=#uip#
             ,a.fgno=#fgno#,a.atext=#atext#
             ,a.submittime=now(),submitip=#uip#
@@ -636,7 +636,7 @@
             select a.lectno,a.sdno,#atext#,#fgno#,0,now(),#uip#,<include refid="sql.inv"></include>
             from (select #lectno# lectno,#userno# userno,#sdno# sdno) a
             inner join lect b on b.lectno=a.lectno and b.userno=a.userno
-            inner join cm c on c.cmno=b.cmno and c.sstime &lt; now() and c.setime &gt; now()
+            inner join cm c on c.cmno=b.cmno and b.sdate &lt; now() and b.edate &gt; now()
             left outer join lectsd d on d.lectno=a.lectno and d.sdno=a.sdno
             where d.lectno is null;
         </update>
diff --git a/FO/Views/CRoom/EstimationSubject.cshtml b/FO/Views/CRoom/EstimationSubject.cshtml
index af4edf6..f097aa7 100644
--- a/FO/Views/CRoom/EstimationSubject.cshtml
+++ b/FO/Views/CRoom/EstimationSubject.cshtml
@@ -18,7 +18,7 @@
                 </tr>
                 <tr>
                     <th>제출시간</th>
-                    <td>@Model.LectSD.sstime.ToString("yy-MM-dd") 00:00 ~ @Model.LectSD.setime.ToString("yy-MM-dd") 23:59</td>
+                    <td>수강 종료일 (@Model.LectSD.edate.Value.ToString("yyyy-MM-dd")) 이내</td>
                 </tr>
                 <tr>
                     <td colspan="2">
@@ -61,7 +61,7 @@
                 </tbody>
             </table>
             <ul class="lctBtn col1">
-                @if (Model.LectSD.sstime < DateTime.Now && Model.LectSD.setime > DateTime.Now && Model.LectSD.checktime == null)
+                @if (Model.LectSD.sdate < DateTime.Now && Model.LectSD.edate > DateTime.Now && Model.LectSD.checktime == null)
                 {
                     <li><a href="#" class="bk sm" onclick="save()">제출</a></li>
                 }
diff --git a/Model/CM.cs b/Model/CM.cs
index f9144cd..34b6169 100644
--- a/Model/CM.cs
+++ b/Model/CM.cs
@@ -3384,6 +3384,14 @@ namespace NP.Model
         }
         public String lectnos { get; set; }     
         public Int64 bno { get; set; }
+        /// <summary>
+        /// 온라인강좌 수강시작일
+        /// </summary>
+        public DateTime? sdate { get; set; }
+        /// <summary>
+        /// 온라인강좌 수강종료일
+        /// </summary>
+        public DateTime? edate { get; set; }
     }
     /// <summary>
     /// 토론글