From 651ae49a8dbe74f1aa2dd9e3ba57c85689da494c Mon Sep 17 00:00:00 2001 From: KimHanJin Date: Wed, 7 Jan 2026 10:02:50 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B6=94=EA=B0=80=EA=B0=9C=EB=B0=9C0107=5F1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PublishProfiles/FolderProfile.pubxml | 19 ++++ Dao/MyBatis/Maps/Grade.xml | 106 +++++++++--------- Dao/bin/Debug/MyBatis/Maps/Grade.xml | 106 +++++++++--------- FO/FO.csproj.user | 6 +- .../PublishProfiles/FolderProfile.pubxml | 19 ++++ LMS_YNICTE.sln | 4 +- 6 files changed, 147 insertions(+), 113 deletions(-) diff --git a/BO/Properties/PublishProfiles/FolderProfile.pubxml b/BO/Properties/PublishProfiles/FolderProfile.pubxml index a98fb1c..6389391 100644 --- a/BO/Properties/PublishProfiles/FolderProfile.pubxml +++ b/BO/Properties/PublishProfiles/FolderProfile.pubxml @@ -3,6 +3,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. --> +<<<<<<< HEAD FileSystem @@ -14,4 +15,22 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Controllers\*.cs;Models\*.cs;App_Data\* +======= + + + FileSystem + FileSystem + C:\ProgramData\Jenkins\.jenkins\workspace\YNICTE_BO_Staging\publish\BO + true + Release + + Controllers\*.cs;Models\*.cs;App_Data\* + Staging + Any CPU + + True + False + True + +>>>>>>> a30ad53 (추가개발0107_1) \ No newline at end of file diff --git a/Dao/MyBatis/Maps/Grade.xml b/Dao/MyBatis/Maps/Grade.xml index e24679f..cff4f9e 100644 --- a/Dao/MyBatis/Maps/Grade.xml +++ b/Dao/MyBatis/Maps/Grade.xml @@ -1907,63 +1907,59 @@ update lect a inner join ( - + ) b on b.lectno=a.lectno 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 l.edate - else cs.eend end completetime - , l.iscomplete - ,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 - and l.lectno in ($lectnos$) - and l.lectno =#lectno# - ) t1 - left outer join ( - 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.edate, '%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=,a.uno=#uno#,a.uip=#uip# - ,a.iscomplete=b.ispass - ,a.apoint=b.apoint - ,a.mpoint=a.mpoint - ,a.fpoint=b.fpoint - ,a.spoint=b.spoint - ,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 = c.completeno - - where a.status=1 and a.ischanged=0 and a.lectno = c.lectno and ifnull(a.iscomplete, 0) <> 1 - and a.cmno = #cmno# + 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 l.edate + else cs.eend end completetime + , l.iscomplete + ,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 + and l.lectno in ($lectnos$) + and l.lectno =#lectno# + ) t1 + left outer join ( + 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.edate, '%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=,a.uno=#uno#,a.uip=#uip# + ,a.iscomplete=b.ispass + ,a.apoint=b.apoint + ,a.mpoint=a.mpoint + ,a.fpoint=b.fpoint + ,a.spoint=b.spoint + ,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 = c.completeno + where a.status=1 and a.ischanged=0 and a.lectno = c.lectno and ifnull(a.iscomplete, 0) <> 1 + and a.cmno = #cmno# and a.lectno = #lectno# and a.cmno in ($cmnos$) and a.lectno in ($lectnos$) diff --git a/Dao/bin/Debug/MyBatis/Maps/Grade.xml b/Dao/bin/Debug/MyBatis/Maps/Grade.xml index dd5722a..6b02407 100644 --- a/Dao/bin/Debug/MyBatis/Maps/Grade.xml +++ b/Dao/bin/Debug/MyBatis/Maps/Grade.xml @@ -1907,63 +1907,59 @@ update lect a inner join ( - + ) b on b.lectno=a.lectno 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 l.edate - else cs.eend end completetime - , l.iscomplete - ,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 - and l.lectno in ($lectnos$) - and l.lectno =#lectno# - ) t1 - left outer join ( - 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.edate, '%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=,a.uno=#uno#,a.uip=#uip# - ,a.iscomplete=b.ispass - ,a.apoint=b.apoint - ,a.mpoint=a.mpoint - ,a.fpoint=b.fpoint - ,a.spoint=b.spoint - ,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 = c.completeno - - where a.status=1 and a.ischanged=0 and a.lectno = c.lectno and ifnull(a.iscomplete, 0) <> 1 - and a.cmno = #cmno# + 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 l.edate + else cs.eend end completetime + , l.iscomplete + ,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 + and l.lectno in ($lectnos$) + and l.lectno =#lectno# + ) t1 + left outer join ( + 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.edate, '%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=,a.uno=#uno#,a.uip=#uip# + ,a.iscomplete=b.ispass + ,a.apoint=b.apoint + ,a.mpoint=a.mpoint + ,a.fpoint=b.fpoint + ,a.spoint=b.spoint + ,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 = c.completeno + where a.status=1 and a.ischanged=0 and a.lectno = c.lectno and ifnull(a.iscomplete, 0) <> 1 + and a.cmno = #cmno# and a.lectno = #lectno# and a.cmno in ($cmnos$) and a.lectno in ($lectnos$) diff --git a/FO/FO.csproj.user b/FO/FO.csproj.user index 103527b..7529c15 100644 --- a/FO/FO.csproj.user +++ b/FO/FO.csproj.user @@ -1,7 +1,7 @@  - Debug|Any CPU + Staging|Any CPU ProjectFiles false @@ -10,7 +10,11 @@ +<<<<<<< HEAD FolderProfile +======= + D:\Project\git\git_YNICTE\FO\Properties\PublishProfiles\FolderProfile.pubxml +>>>>>>> a30ad53 (추가개발0107_1) diff --git a/FO/Properties/PublishProfiles/FolderProfile.pubxml b/FO/Properties/PublishProfiles/FolderProfile.pubxml index bfa5e4a..fbcb405 100644 --- a/FO/Properties/PublishProfiles/FolderProfile.pubxml +++ b/FO/Properties/PublishProfiles/FolderProfile.pubxml @@ -3,6 +3,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. --> +<<<<<<< HEAD FileSystem @@ -14,4 +15,22 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Controllers\*.cs;Models\*.cs;App_Data\* +======= + + + FileSystem + FileSystem + C:\ProgramData\Jenkins\.jenkins\workspace\YNICTE_FO_Staging\publish\FO + true + Staging + + Controllers\*.cs;Models\*.cs;App_Data\* + Staging + Any CPU + + True + False + True + +>>>>>>> a30ad53 (추가개발0107_1) \ No newline at end of file diff --git a/LMS_YNICTE.sln b/LMS_YNICTE.sln index fa5c910..b24b5a5 100644 --- a/LMS_YNICTE.sln +++ b/LMS_YNICTE.sln @@ -45,8 +45,8 @@ Global {707F0AAA-F7B7-414D-B763-33DE10980702}.Debug|Any CPU.Build.0 = Debug|Any CPU {707F0AAA-F7B7-414D-B763-33DE10980702}.Release|Any CPU.ActiveCfg = Release|Any CPU {707F0AAA-F7B7-414D-B763-33DE10980702}.Release|Any CPU.Build.0 = Release|Any CPU - {707F0AAA-F7B7-414D-B763-33DE10980702}.Staging|Any CPU.ActiveCfg = Debug|Any CPU - {707F0AAA-F7B7-414D-B763-33DE10980702}.Staging|Any CPU.Build.0 = Debug|Any CPU + {707F0AAA-F7B7-414D-B763-33DE10980702}.Staging|Any CPU.ActiveCfg = Staging|Any CPU + {707F0AAA-F7B7-414D-B763-33DE10980702}.Staging|Any CPU.Build.0 = Staging|Any CPU {707F0AAA-F7B7-414D-B763-33DE10980702}.Web.Staging.config|Any CPU.ActiveCfg = Staging|Any CPU {707F0AAA-F7B7-414D-B763-33DE10980702}.Web.Staging.config|Any CPU.Build.0 = Staging|Any CPU {748E363F-863F-4CAA-BB9B-B3BE3BE7607E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU