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. 
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<<<<<<< HEAD
 	<PropertyGroup>
 		<!-- 배포 방식 지정 -->
 		<WebPublishMethod>FileSystem</WebPublishMethod>
@@ -14,4 +15,22 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 		<!-- 특정 파일/폴더 제외 -->
 		<ExcludeFilesFromDeployment>Controllers\*.cs;Models\*.cs;App_Data\*</ExcludeFilesFromDeployment>
 	</PropertyGroup>
+=======
+  <PropertyGroup>
+    <!-- 배포 방식 지정 -->
+    <WebPublishMethod>FileSystem</WebPublishMethod>
+    <PublishProvider>FileSystem</PublishProvider>
+    <PublishUrl>C:\ProgramData\Jenkins\.jenkins\workspace\YNICTE_BO_Staging\publish\BO</PublishUrl>
+    <DeployOnBuild>true</DeployOnBuild>
+    <Configuration>Release</Configuration>
+    <!-- 특정 파일/폴더 제외 -->
+    <ExcludeFilesFromDeployment>Controllers\*.cs;Models\*.cs;App_Data\*</ExcludeFilesFromDeployment>
+    <LastUsedBuildConfiguration>Staging</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <SiteUrlToLaunchAfterPublish />
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+    <ExcludeApp_Data>False</ExcludeApp_Data>
+    <DeleteExistingFiles>True</DeleteExistingFiles>
+  </PropertyGroup>
+>>>>>>> a30ad53 (추가개발0107_1)
 </Project>
\ 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 id="grade.lectcomplete2" parameterClass="hashtable">
             update lect a
             inner join (
-            <include refid="grade.query"></include>
+                <include refid="grade.query"></include>
             ) b on b.lectno=a.lectno
             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-->
-        ,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 <!--cm.setime-->
-        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
-        <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.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=<include refid="sql.now"></include>,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) &lt;> 1
-        <isNotNull property="cmno">and a.cmno = #cmno#</isNotNull>
+                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-->
+                        ,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 <!--cm.setime-->
+                                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
+                        <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.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=<include refid="sql.now"></include>,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) &lt;> 1
+            <isNotNull property="cmno">and a.cmno = #cmno#</isNotNull>
             <isNotNull property="lectno">and a.lectno = #lectno#</isNotNull>
             <isNotNull property="cmnos">and a.cmno in ($cmnos$)</isNotNull>
             <isNotNull property="lectnos">and a.lectno in ($lectnos$)</isNotNull>
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 id="grade.lectcomplete2" parameterClass="hashtable">
             update lect a
             inner join (
-            <include refid="grade.query"></include>
+                <include refid="grade.query"></include>
             ) b on b.lectno=a.lectno
             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-->
-        ,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 <!--cm.setime-->
-        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
-        <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.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=<include refid="sql.now"></include>,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) &lt;> 1
-        <isNotNull property="cmno">and a.cmno = #cmno#</isNotNull>
+                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-->
+                        ,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 <!--cm.setime-->
+                                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
+                        <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.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=<include refid="sql.now"></include>,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) &lt;> 1
+            <isNotNull property="cmno">and a.cmno = #cmno#</isNotNull>
             <isNotNull property="lectno">and a.lectno = #lectno#</isNotNull>
             <isNotNull property="cmnos">and a.cmno in ($cmnos$)</isNotNull>
             <isNotNull property="lectnos">and a.lectno in ($lectnos$)</isNotNull>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Staging|Any CPU</LastActiveSolutionConfig>
     <ProjectView>ProjectFiles</ProjectView>
     <UseIISExpress>false</UseIISExpress>
     <Use64BitIISExpress />
@@ -10,7 +10,11 @@
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
     <UseGlobalApplicationHostFile />
+<<<<<<< HEAD
     <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
+=======
+    <NameOfLastUsedPublishProfile>D:\Project\git\git_YNICTE\FO\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+>>>>>>> a30ad53 (추가개발0107_1)
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>
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. 
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<<<<<<< HEAD
 	<PropertyGroup>
 		<!-- 배포 방식 지정 -->
 		<WebPublishMethod>FileSystem</WebPublishMethod>
@@ -14,4 +15,22 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 		<!-- 특정 파일/폴더 제외 -->
 		<ExcludeFilesFromDeployment>Controllers\*.cs;Models\*.cs;App_Data\*</ExcludeFilesFromDeployment>
 	</PropertyGroup>
+=======
+  <PropertyGroup>
+    <!-- 배포 방식 지정 -->
+    <WebPublishMethod>FileSystem</WebPublishMethod>
+    <PublishProvider>FileSystem</PublishProvider>
+    <PublishUrl>C:\ProgramData\Jenkins\.jenkins\workspace\YNICTE_FO_Staging\publish\FO</PublishUrl>
+    <DeployOnBuild>true</DeployOnBuild>
+    <Configuration>Staging</Configuration>
+    <!-- 특정 파일/폴더 제외 -->
+    <ExcludeFilesFromDeployment>Controllers\*.cs;Models\*.cs;App_Data\*</ExcludeFilesFromDeployment>
+    <LastUsedBuildConfiguration>Staging</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <SiteUrlToLaunchAfterPublish />
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+    <ExcludeApp_Data>False</ExcludeApp_Data>
+    <DeleteExistingFiles>True</DeleteExistingFiles>
+  </PropertyGroup>
+>>>>>>> a30ad53 (추가개발0107_1)
 </Project>
\ 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