diff --git a/Dao/MyBatis/Maps/Grade.xml b/Dao/MyBatis/Maps/Grade.xml index 670983a..010348f 100644 --- a/Dao/MyBatis/Maps/Grade.xml +++ b/Dao/MyBatis/Maps/Grade.xml @@ -389,10 +389,10 @@ where l.lectno in ($lectnos$) ) t1 left outer join ( - select date_format(l.cdt, '%Y') cyear + select date_format(l.edate, '%Y') cyear ,max(substring(replace(replace(l.completeno, ' - N105 - ','N'), '호',''), -6)) seqNo from lect l - group by date_format(l.cdt, '%Y') + group by date_format(l.edate, '%Y') ) t2 on t2.cyear = t1.cyear ) c ) b @@ -442,10 +442,10 @@ and l.lectno =#lectno# ) t1 left outer join ( - select date_format(l.cdt, '%Y') cyear + select date_format(l.edate, '%Y') cyear ,max(substring(replace(replace(l.completeno, ' - N105 - ','N'), '호',''), -6)) seqNo from lect l - group by date_format(l.cdt, '%Y') + group by date_format(l.edate, '%Y') ) t2 on t2.cyear = t1.cyear ) c ) c on c.lectno = a.lectno @@ -459,7 +459,7 @@ ,a.dpoint=b.dpoint ,a.tpoint=b.apoint+b.mpoint+b.fpoint+b.spoint+b.dpoint ,a.completetime = case when b.ispass = 1 then c.completetime else null end - ,a.completeno = case when a.completeno is not null then a.completeno else case when b.ispass = 1 then c.completeno else null end end + ,a.completeno = c.completeno where a.status=1 and a.ischanged=0 and a.lectno = c.lectno and a.cmno = #cmno#