diff --git a/Dao/MyBatis/Maps/Lect.xml b/Dao/MyBatis/Maps/Lect.xml index 5a25a1c..8280bb8 100644 --- a/Dao/MyBatis/Maps/Lect.xml +++ b/Dao/MyBatis/Maps/Lect.xml @@ -1350,10 +1350,11 @@ ,row_number() over(partition by a.cmno order by c.iseq) rno2 ,row_number() over(order by b.setime) rno from lect a - inner join cm b on b.cmno=a.cmno and b.sstime < and b.setime > + inner join cm b on b.cmno=a.cmno inner join cminning c on c.cmno=b.cmno and c.isonline=1 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 @@ -1374,11 +1375,12 @@ ,row_number() over(partition by a.cmno order by c.iseq) rno2 ,row_number() over(order by b.setime) rno from lect a - inner join cm b on b.cmno=a.cmno and b.sstime < and b.setime > and b.cshape=1 + 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 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 @@ -1399,11 +1401,12 @@ ,row_number() over(partition by a.cmno order by c.extype,c.cdt) rno2 ,row_number() over(order by b.setime) rno from lect a - inner join cm b on b.cmno=a.cmno and b.sstime < and b.setime > + inner join cm b on b.cmno=a.cmno left outer join comcode bc on bc.ccode=b.studyplace inner join cmex c on c.cmno=b.cmno and c.isdel=0 and c.econdition <= a.attrate left outer join lectex d on d.lectno=a.lectno and d.exno=c.exno and d.eend is not null 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 @@ -1424,11 +1427,12 @@ ,row_number() over(partition by a.cmno order by c.cdt) rno2 ,row_number() over(order by b.setime) rno from lect a - inner join cm b on b.cmno=a.cmno and b.sstime < and b.setime > + inner join cm b on b.cmno=a.cmno left outer join comcode bc on bc.ccode=b.studyplace inner join cmsd c on c.sdtype=0 and c.cmno=b.cmno and c.isdel=0 and c.sdcondition <= a.attrate left outer join lectsd d on d.lectno=a.lectno and d.sdno=c.sdno and d.submittime is not null 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 @@ -1449,11 +1453,12 @@ ,row_number() over(partition by a.cmno order by c.cdt) rno2 ,row_number() over(order by b.setime) rno from lect a - inner join cm b on b.cmno=a.cmno and b.sstime < and b.setime > + inner join cm b on b.cmno=a.cmno left outer join comcode bc on bc.ccode=b.studyplace inner join cmsd c on c.sdtype=1 and c.cmno=b.cmno and c.isdel=0 and c.sdcondition <= a.attrate left outer join lectsdboard d on d.lectno=a.lectno and d.sdno=c.sdno and d.isdel=0 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