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#, )),HEX(AES_ENCRYPT(#telno#, )),#fgno#,) - 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) < now() and (case when l.edate is null then c.setime else l.edate end) > 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 - 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 < and a.edate > ) 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 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 where a.userno=#userno# and a.status=1 and a.ischanged=0 and a.sdate < and a.edate > ) 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) { [학습]@d.strval (@(d.intval3)반) - if(d.intval10 == 0) - { - @(d.intval2)차시 - @d.time.ToString("MM/dd") 00:00 ~ @d.time2.ToString("MM/dd") 23:59 - - } + @(d.intval2)차시 + @d.time.ToString("MM/dd") 00:00 ~ @d.time2.ToString("MM/dd") 23:59 } else if (d.intval == 2) { [출석]@d.strval (@(d.intval3)반) - if(d.intval10 == 0) - { - @(d.intval2)차시 - 일시: @d.strval3 - } + @(d.intval2)차시 + 일시: @d.strval3 } else if (d.intval == 3) {
@d.time.ToString("MM/dd") 00:00 ~ @d.time2.ToString("MM/dd") 23:59
일시: @d.strval3