KimHanJin
/
YNICTE
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

<오류개선> 

통합테스트목록 . 626
교육일정의 경우는 교율종료일 제외
This commit is contained in:
kdh0120 2021-12-09 23:51:26 +00:00
parent 47af05daa9
commit 4c4912b7ed
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Dao/MyBatis/Maps/Lect.xml
View File

@ -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>) 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> </update>
<select id="lect.mydata" parameterClass="int" resultClass="data"> <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 select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8,a.intval9,a.intval10
,a.longval,a.longval2 ,a.longval,a.longval2
,a.strval,a.strval2,a.strval3 ,a.strval,a.strval2,a.strval3
,a.time,a.time2 ,a.time,a.time2
@ -1285,7 +1285,7 @@
select 1 dtype 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 ,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 ,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 ,c.studydays intval9,0 intval10
,l.lectno longval,a.payno longval2 ,l.lectno longval,a.payno longval2
,c.cname strval,null strval2,null strval3 ,c.cname strval,null strval2,null strval3
,c.rstime time,c.retime time2 ,c.rstime time,c.retime time2
@ -1305,7 +1305,7 @@
order by sortpstatus, c.retime, b.payno,a.pino order by sortpstatus, c.retime, b.payno,a.pino
) a ) a
union all union all
select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8,0 intval9 select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8,0 intval9,0 intval10
,a.longval,0 longval2 ,a.longval,0 longval2
,a.strval,a.strval2,a.strval3 ,a.strval,a.strval2,a.strval3
,a.time,a.time2 ,a.time,a.time2
@ -1333,7 +1333,7 @@
order by case when time2 > now() then 1 else 0 end desc ,sortedate desc, time2 desc order by case when time2 > now() then 1 else 0 end desc ,sortedate desc, time2 desc
) a ) a
union all union all
select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8,0 intval9 select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8,0 intval9,a.intval10
,a.longval,0 longval2 ,a.longval,0 longval2
,a.strval,a.strval2,a.strval3 ,a.strval,a.strval2,a.strval3
,a.time,a.time2 ,a.time,a.time2
@ -1342,7 +1342,7 @@
,a.rno ,a.rno
from ( from (
select 3 dtype select 3 dtype
,1 intval,c.iseq intval2,b.classno intval3,0 intval4,0 intval5,0 intval6,a.cmno intval7,0 intval8 ,1 intval,c.iseq intval2,b.classno intval3,0 intval4,0 intval5,0 intval6,a.cmno intval7,0 intval8,c.isscd intval10
,a.lectno longval ,a.lectno longval
,b.cname strval,null strval2,null strval3 ,b.cname strval,null strval2,null strval3
,case when a.sdate is null then b.sstime else a.sdate end as time ,case when a.sdate is null then b.sstime else a.sdate end as time
@ -1358,7 +1358,7 @@
) a ) a
where a.rno2=1 where a.rno2=1
union all union all
select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8,0 intval9 select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8,0 intval9,a.intval10
,a.longval,0 longval2 ,a.longval,0 longval2
,a.strval,a.strval2,a.strval3 ,a.strval,a.strval2,a.strval3
,a.time,a.time2 ,a.time,a.time2
@ -1367,7 +1367,7 @@
,a.rno ,a.rno
from ( from (
select 3 dtype select 3 dtype
,2 intval,c.iseq intval2,b.classno intval3,0 intval4,0 intval5,0 intval6,a.cmno intval7,0 intval8 ,2 intval,c.iseq intval2,b.classno intval3,0 intval4,0 intval5,0 intval6,a.cmno intval7,0 intval8,c.isscd intval10
,a.lectno longval ,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 ,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 ,case when a.sdate is null then b.sstime else a.sdate end as time
@ -1384,7 +1384,7 @@
) a ) a
where a.rno2=1 where a.rno2=1
union all union all
select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8,0 intval9 select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8,0 intval9,0 intval10
,a.longval,0 longval2 ,a.longval,0 longval2
,a.strval,a.strval2,a.strval3 ,a.strval,a.strval2,a.strval3
,a.time,a.time2 ,a.time,a.time2
@ -1410,7 +1410,7 @@
) a ) a
where a.rno2=1 where a.rno2=1
union all union all
select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8,0 intval9 select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8,0 intval9,0 intval10
,a.longval,0 longval2 ,a.longval,0 longval2
,a.strval,a.strval2,a.strval3 ,a.strval,a.strval2,a.strval3
,a.time,a.time2 ,a.time,a.time2
@ -1436,7 +1436,7 @@
) a ) a
where a.rno2=1 where a.rno2=1
union all union all
select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8,0 intval9 select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8,0 intval9,0 intval10
,a.longval,0 longval2 ,a.longval,0 longval2
,a.strval,a.strval2,a.strval3 ,a.strval,a.strval2,a.strval3
,a.time,a.time2 ,a.time,a.time2
@ -1462,7 +1462,7 @@
) a ) a
where a.rno2=1 where a.rno2=1
union all union all
select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8,0 intval9 select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8,0 intval9,0 intval10
,a.longval,a.longval2 ,a.longval,a.longval2
,a.strval,a.strval2,a.strval3 ,a.strval,a.strval2,a.strval3
,a.time,a.time2 ,a.time,a.time2

11
FO/Views/My/Index.cshtml
View File

@ -182,13 +182,20 @@
{ {
<h5><span>[학습]</span>@d.strval (@(d.intval3)반)</h5> <h5><span>[학습]</span>@d.strval (@(d.intval3)반)</h5>
<h6>@(d.intval2)차시</h6> <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> if(d.intval10 == 0)
{
<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) else if (d.intval == 2)
{ {
<h5><span>[출석]</span>@d.strval (@(d.intval3)반)</h5> <h5><span>[출석]</span>@d.strval (@(d.intval3)반)</h5>
<h6>@(d.intval2)차시</h6> <h6>@(d.intval2)차시</h6>
<p>일시: @d.strval3</p> if(d.intval10 == 0)
{
<p>일시: @d.strval3</p>
}
} }
else if (d.intval == 3) else if (d.intval == 3)
{ {