From 43cd39b24c76e5b202dfa250c19afafa9ffe3875 Mon Sep 17 00:00:00 2001
From: kdh0120 <kdh0120  @example.com>
Date: Fri, 10 Dec 2021 01:11:56 +0000
Subject: [PATCH] =?UTF-8?q?<=EA=B8=B0=EB=8A=A5=EA=B0=9C=EC=84=A0>=20?=
 =?UTF-8?q?=ED=86=B5=ED=95=A9=ED=85=8C=EC=8A=A4=ED=8A=B8=20.=20626=20?=
 =?UTF-8?q?=EA=B5=90=EC=9C=A1=EC=9D=BC=EC=A0=95=ED=9A=8C=EC=B0=A8=EC=9D=98?=
 =?UTF-8?q?=20=EA=B2=BD=EC=9A=B0=20=EB=AA=A9=EB=A1=9D=EC=B6=9C=EB=A0=A5?=
 =?UTF-8?q?=EC=A0=9C=EC=99=B8=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dao/MyBatis/Maps/Lect.xml | 26 +++++++++++++-------------
 FO/Views/My/Index.cshtml  | 15 ++++-----------
 2 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/Dao/MyBatis/Maps/Lect.xml b/Dao/MyBatis/Maps/Lect.xml
index c49c7c5..a281753 100644
--- a/Dao/MyBatis/Maps/Lect.xml
+++ b/Dao/MyBatis/Maps/Lect.xml
@@ -1274,7 +1274,7 @@
             values (#etype#,#userno#,#edate#,#esubject#,#etarget#,#ecount#,#eplace#,#ecomment#,#compname#,#ceoname#,#brno#,#addr#,#btype#,#bkind#,#manname#,HEX(AES_ENCRYPT(#email#, <include refid="sql.digest"></include>)),HEX(AES_ENCRYPT(#telno#, <include refid="sql.digest"></include>)),#fgno#,<include refid="sql.inv"></include>)
         </update>
         <select id="lect.mydata" parameterClass="int" resultClass="data">
-            select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8,a.intval9,a.intval10
+            select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8,a.intval9
                 ,a.longval,a.longval2
                 ,a.strval,a.strval2,a.strval3
                 ,a.time,a.time2
@@ -1285,7 +1285,7 @@
                 select 1 dtype
                     ,d.tyear intval,d.tseq intval2,c.cshape intval3,a.pstatus intval4,case when e.rfdno is null then 0 else 1 end intval5,a.isrebate intval6,a.itemno intval7
                     ,case when (case when l.sdate is null then c.sstime else l.sdate end) &lt; now() and (case when l.edate is null then c.setime else l.edate end) &gt; now() then 1 else 0 end intval8
-                    ,c.studydays intval9,0 intval10
+                    ,c.studydays intval9
                     ,l.lectno longval,a.payno longval2
                     ,c.cname strval,null strval2,null strval3
                     ,c.rstime time,c.retime time2
@@ -1305,7 +1305,7 @@
                 order by sortpstatus, c.retime, b.payno,a.pino
                 ) a
             union all
-            select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8,0 intval9,0 intval10
+            select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8,0 intval9
             ,a.longval,0 longval2
             ,a.strval,a.strval2,a.strval3
             ,a.time,a.time2
@@ -1333,7 +1333,7 @@
                 order by case when time2 > now() then 1 else 0 end desc ,sortedate desc, time2 desc 
             ) a
             union all
-            select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8,0 intval9,a.intval10
+            select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8,0 intval9
                 ,a.longval,0 longval2
                 ,a.strval,a.strval2,a.strval3
                 ,a.time,a.time2
@@ -1342,7 +1342,7 @@
                 ,a.rno
             from (
                 select 3 dtype
-                    ,1 intval,c.iseq intval2,b.classno intval3,0 intval4,0 intval5,0 intval6,a.cmno intval7,0 intval8,c.isscd intval10
+                    ,1 intval,c.iseq intval2,b.classno intval3,0 intval4,0 intval5,0 intval6,a.cmno intval7,0 intval8
                     ,a.lectno longval
                     ,b.cname strval,null strval2,null strval3
                     ,case when a.sdate is null then b.sstime else a.sdate end as time
@@ -1351,14 +1351,14 @@
                     ,row_number() over(order by b.setime) rno
                 from lect a
                 inner join cm b on b.cmno=a.cmno <!--and b.sstime &lt; <include refid="sql.now"></include> and b.setime &gt; <include refid="sql.now"></include>-->
-                inner join cminning c on c.cmno=b.cmno and c.isonline=1
+                inner join cminning c on c.cmno=b.cmno and c.isonline=1 and c.isscd = 0
                 left outer join lectinning d on d.lectno=a.lectno and d.cmino=c.cmino and d.istatus=2
                 where a.userno=#userno# and a.status=1 and a.ischanged=0 and d.lectno is null
                   and a.sdate &lt; <include refid="sql.now"></include> and a.edate &gt; <include refid="sql.now"></include>
             ) a
             where a.rno2=1
             union all
-            select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8,0 intval9,a.intval10
+            select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8,0 intval9
                 ,a.longval,0 longval2
                 ,a.strval,a.strval2,a.strval3
                 ,a.time,a.time2
@@ -1367,7 +1367,7 @@
                 ,a.rno
             from (
                 select 3 dtype
-                    ,2 intval,c.iseq intval2,b.classno intval3,0 intval4,0 intval5,0 intval6,a.cmno intval7,0 intval8,c.isscd intval10
+                    ,2 intval,c.iseq intval2,b.classno intval3,0 intval4,0 intval5,0 intval6,a.cmno intval7,0 intval8
                     ,a.lectno longval
                     ,b.cname strval,bc.cname strval2,concat(date_format(c.idate,'%m/%d'),' ',left(c.ist,2),':',right(c.ist,2),' ~ ',left(c.iet,2),':',right(c.iet,2)) strval3
                     ,case when a.sdate is null then b.sstime else a.sdate end as time
@@ -1377,14 +1377,14 @@
                 from lect a
                 inner join cm b on b.cmno=a.cmno <!--and b.sstime &lt; <include refid="sql.now"></include> and b.setime &gt; <include refid="sql.now"></include> and b.cshape=1-->
                 left outer join comcode bc on bc.ccode=b.studyplace
-                inner join cminning c on c.cmno=b.cmno and c.isonline=0
+                inner join cminning c on c.cmno=b.cmno and c.isonline=0 and c.isscd = 0
                 <!--left outer join lectinning d on d.lectno=a.lectno and d.cmino=c.cmino and d.istatus=2-->
                 where a.userno=#userno# and a.status=1 and a.ischanged=0 <!--and d.lectno is null-->
                   and a.sdate &lt; <include refid="sql.now"></include> and a.edate &gt; <include refid="sql.now"></include>
             ) a
             where a.rno2=1
             union all
-            select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8,0 intval9,0 intval10
+            select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8,0 intval9
                 ,a.longval,0 longval2
                 ,a.strval,a.strval2,a.strval3
                 ,a.time,a.time2
@@ -1410,7 +1410,7 @@
             ) a
             where a.rno2=1
             union all
-            select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8,0 intval9,0 intval10
+            select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8,0 intval9
                 ,a.longval,0 longval2
                 ,a.strval,a.strval2,a.strval3
                 ,a.time,a.time2
@@ -1436,7 +1436,7 @@
             ) a
             where a.rno2=1
             union all
-            select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8,0 intval9,0 intval10
+            select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8,0 intval9
                 ,a.longval,0 longval2
                 ,a.strval,a.strval2,a.strval3
                 ,a.time,a.time2
@@ -1462,7 +1462,7 @@
             ) a
             where a.rno2=1
             union all
-            select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8,0 intval9,0 intval10
+            select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8,0 intval9
                 ,a.longval,a.longval2
                 ,a.strval,a.strval2,a.strval3
                 ,a.time,a.time2
diff --git a/FO/Views/My/Index.cshtml b/FO/Views/My/Index.cshtml
index 1f294d7..6e0db3c 100644
--- a/FO/Views/My/Index.cshtml
+++ b/FO/Views/My/Index.cshtml
@@ -181,21 +181,14 @@
                                 @if (d.intval == 1)
                                 {
                                     <h5><span>[학습]</span>@d.strval (@(d.intval3)반)</h5>
-                                    if(d.intval10 == 0)
-                                    {
-                                        <h6>@(d.intval2)차시</h6>
-                                        <p>@d.time.ToString("MM/dd") 00:00 ~ <span style="color:#ff0000;">@d.time2.ToString("MM/dd") 23:59</span></p>
-
-                                    }
+                                    <h6>@(d.intval2)차시</h6>
+                                    <p>@d.time.ToString("MM/dd") 00:00 ~ <span style="color:#ff0000;">@d.time2.ToString("MM/dd") 23:59</span></p>
                                 }
                                 else if (d.intval == 2)
                                 {
                                     <h5><span>[출석]</span>@d.strval (@(d.intval3)반)</h5>
-                                    if(d.intval10 == 0)
-                                    {
-                                        <h6>@(d.intval2)차시</h6>
-                                        <p>일시: @d.strval3</p>
-                                    }
+                                    <h6>@(d.intval2)차시</h6>
+                                    <p>일시: @d.strval3</p>
                                 }
                                 else if (d.intval == 3)
                                 {