From eacd0755c762383f62d1549a03fd6b07cf32a690 Mon Sep 17 00:00:00 2001
From: ksjihd163 <ksjihd163  @example.com>
Date: Wed, 6 Jul 2022 01:34:56 +0000
Subject: [PATCH]

---
 Dao/MyBatis/Maps/Grade.xml | 157 +++++++++++++++++++------------------
 1 file changed, 79 insertions(+), 78 deletions(-)

diff --git a/Dao/MyBatis/Maps/Grade.xml b/Dao/MyBatis/Maps/Grade.xml
index 90b53b8..fbf4c01 100644
--- a/Dao/MyBatis/Maps/Grade.xml
+++ b/Dao/MyBatis/Maps/Grade.xml
@@ -359,51 +359,50 @@
             having ifnull(max(a.iscomplete),0) &lt;&gt;1
         </select>
       <update id="grade.lectcomplete.abs2" parameterClass="lect">
-                update lect l
-                inner join (
-                    select c.lectno,c.completeno,c.completetime
-                    from (
-                      select t1.*
-                      	<!--,concat('제 ',t1.cyear,' - ',t1.code1,t1.code2,t1.code3,' - ',lpad(ifnull(t2.seqNo,0)+ t1.rno , 6, 0)) completeno-->
-		                  ,concat('제 ',t1.cyear,t1.code1,lpad(ifnull(t2.seqNo,0)+ t1.rno , 6, 0)+'호') completeno
-		                          from (
-		                          select l.lectno
-		                          ,date_format(l.cdt,'%Y') cyear
-		                          ,pcg.cgcode code2
-		                          ,case when cm.cshape  = 1 then 'F' else 'N' end code1
-		                          ,case when te.cremark = '1' then te.refcode
-		                          when tm.cremark in ('1','2','3','4') then tm.refcode
-		                          else '05' end code3
-		                          ,case when cm.cshape = 0 then now()
-		                          when cm.cshape = 1 then cm.setime
-		                          else cs.eend end completetime
-		                          ,row_number() over(partition by date_format(l.cdt,'%Y') order by l.cdt) rno
-		                          from lect l
-		                          inner join cm cm on cm.cmno = l.cmno
-		                          inner join pay p on p.payno = l.payno
-		                          left outer join pplog pl on pl.pplno = p.pplno
-		                          inner join cg cg on cg.cgno = cm.cgno
-		                          inner join cg pcg on pcg.cgno = cg.pcgno
-		                          left outer join comcode tm on tm.isuse=1 and tm.ccode = pl.typeman
-		                          left outer join comcode te on te.isuse=1 and te.ccode = pl.typeedu
-		                          left outer join cminningscd cs on cs.cmisno = pl.cmisno
-		                          where l.lectno in ($lectnos$)
-		                          ) t1
-		                          left outer join (
-		                          select date_format(l.cdt, '%Y') cyear,max(substring(l.completeno, -6)) seqNo
-		                          from lect l
-		                          group by date_format(l.cdt, '%Y')
-		                          ) t2 on t2.cyear = t1.cyear
-		                          ) c
-		                          ) b
-		                          inner join cm c on c.cmno = l.cmno
-		                          set l.uno = #uno#
-		                          ,l.udt = now()
-		                          ,l.uip= #uip#
-		                          ,l.iscomplete=1
-		                          ,l.completetime=b.completetime
-		                          ,l.completeno = case when l.completeno is not null then  l.completeno  else b.completeno end
-		                          where l.lectno = b.lectno
+		  update lect l
+		  inner join (
+		  select c.lectno,c.completeno,c.completetime
+		  from (
+		  select t1.*
+		  ,concat('제 ',t1.cyear,t1.code1,lpad(ifnull(t2.seqNo,0) + t1.rno , 6, 0), ' 호')  as completeno
+		  from (
+		  select l.lectno
+		  ,date_format(l.edate,'%Y') cyear
+		  ,pcg.cgcode code2
+		  ,case when cm.cshape  = 1 then 'F' else 'N' end code1
+		  ,case when te.cremark = '1' then te.refcode
+		  when tm.cremark in ('1','2','3','4') then tm.refcode
+		  else '05' end code3
+		  ,case when cm.cshape = 0 then now()
+		  when cm.cshape = 1 then cm.setime
+		  else cs.eend end completetime
+		  ,row_number() over(partition by date_format(l.cdt,'%Y') order by l.cdt) rno
+		  from lect l
+		  inner join cm cm on cm.cmno = l.cmno
+		  inner join pay p on p.payno = l.payno
+		  left outer join pplog pl on pl.pplno = p.pplno
+		  inner join cg cg on cg.cgno = cm.cgno
+		  inner join cg pcg on pcg.cgno = cg.pcgno
+		  left outer join comcode tm on tm.isuse=1 and tm.ccode = pl.typeman
+		  left outer join comcode te on te.isuse=1 and te.ccode = pl.typeedu
+		  left outer join cminningscd cs on cs.cmisno = pl.cmisno
+		  where l.lectno in ($lectnos$)
+		  ) t1
+		  left outer join (
+		  select date_format(l.cdt, '%Y') cyear
+		  ,replace(max(substring(l.completeno, -6)), ' 호','')  seqNo
+		  from lect l
+		  group by date_format(l.cdt, '%Y')
+		  ) t2 on t2.cyear = t1.cyear
+		  ) c
+		  ) b
+		  set l.uno =  #uno#
+		  ,l.udt = now()
+		  ,l.uip=  #uip#
+		  ,l.iscomplete=1
+		  ,l.completetime=b.completetime
+		  ,l.completeno=b.completeno
+		  where l.lectno = b.lectno
 	  </update>
       <update id="grade.lectcomplete2" parameterClass="hashtable">
             update lect a
@@ -415,41 +414,43 @@
               from (
                 select t1.*
                 	<!--,concat('제 ',t1.cyear,' - ',t1.code1,t1.code2,t1.code3,' - ',lpad(ifnull(t2.seqNo,0)+ t1.rno , 6, 0)) completeno-->
-		            ,concat('제 ',t1.cyear,t1.code1,lpad(ifnull(t2.seqNo,0)+ t1.rno , 6, 0)) completeno
-		              from (
-		              select l.lectno
-		              ,date_format(l.cdt,'%Y') cyear
-		              ,pcg.cgcode code2
-		              ,case when cm.cshape  = 1 then 'F' else 'N' end code1
-		              ,case when te.cremark = '1' then te.refcode
-		              when tm.cremark in ('1','2','3','4') then tm.refcode
-		              else '05' end code3
-		              ,case when cm.cshape = 0 then now()
-		              when cm.cshape = 1 then cm.setime
-		              else cs.eend end completetime
-		              ,row_number() over(partition by date_format(l.cdt,'%Y') order by l.cdt) rno
-		              from lect l
-		              inner join cm cm on cm.cmno = l.cmno
-		              inner join pay p on p.payno = l.payno
-		              left outer join pplog pl on pl.pplno = p.pplno
-		              inner join cg cg on cg.cgno = cm.cgno
-		              inner join cg pcg on pcg.cgno = cg.pcgno
-		              left outer join comcode tm on tm.isuse=1 and tm.ccode = pl.typeman
-		              left outer join comcode te on te.isuse=1 and te.ccode = pl.typeedu
-		              left outer join cminningscd cs on cs.cmisno = pl.cmisno
-		              where 1=1
+		            <!--,concat('제 ',t1.cyear,t1.code1,lpad(ifnull(t2.seqNo,0)+ t1.rno , 6, 0)) completeno-->
+		  ,concat('제 ',t1.cyear,t1.code1,lpad(ifnull(t2.seqNo,0) + t1.rno , 6, 0), ' 호')  as completeno
+		  from (
+		  select l.lectno
+		  ,date_format(l.edate,'%Y') cyear
+		  ,pcg.cgcode code2
+		  ,case when cm.cshape  = 1 then 'F' else 'N' end code1
+		  ,case when te.cremark = '1' then te.refcode
+		  when tm.cremark in ('1','2','3','4') then tm.refcode
+		  else '05' end code3
+		  ,case when cm.cshape = 0 then now()
+		  when cm.cshape = 1 then cm.setime
+		  else cs.eend end completetime
+		  ,row_number() over(partition by date_format(l.cdt,'%Y') order by l.cdt) rno
+		  from lect l
+		  inner join cm cm on cm.cmno = l.cmno
+		  inner join pay p on p.payno = l.payno
+		  left outer join pplog pl on pl.pplno = p.pplno
+		  inner join cg cg on cg.cgno = cm.cgno
+		  inner join cg pcg on pcg.cgno = cg.pcgno
+		  left outer join comcode tm on tm.isuse=1 and tm.ccode = pl.typeman
+		  left outer join comcode te on te.isuse=1 and te.ccode = pl.typeedu
+		  left outer join cminningscd cs on cs.cmisno = pl.cmisno
+		  where 1=1
 		  <isNotNull property="lectnos">and l.lectno in ($lectnos$)</isNotNull>
                   <isNotNull property="lectno">and l.lectno =#lectno#</isNotNull>
-                  ) t1
-                  left outer join (
-                     select date_format(l.cdt, '%Y') cyear,max(substring(l.completeno, -6)) seqNo
-                     from lect l
-                     group by date_format(l.cdt, '%Y')
-                  ) t2 on t2.cyear = t1.cyear
-              ) c
-            ) c on c.lectno = a.lectno
-            inner join cm d on d.cmno = a.cmno
-            set a.udt=<include refid="sql.now"></include>,a.uno=#uno#,a.uip=#uip#
+		  ) t1
+		  left outer join (
+		  select date_format(l.cdt, '%Y') cyear
+		  ,replace(max(substring(l.completeno, -6)), ' 호','')  seqNo
+		  from lect l
+		  group by date_format(l.cdt, '%Y')
+		  ) t2 on t2.cyear = t1.cyear
+		  ) c
+		  ) c on c.lectno = a.lectno
+		  inner join cm d on d.cmno = a.cmno
+		  set a.udt=<include refid="sql.now"></include>,a.uno=#uno#,a.uip=#uip#
             ,a.iscomplete=b.ispass
             ,a.apoint=b.apoint
             ,a.mpoint=a.mpoint