추가개발0107_1

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>

Dao/MyBatis/Maps/Grade.xml

@@ -1921,11 +1921,8 @@
                             ,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
+                            ,case when te.cremark = '1' then te.refcode when tm.cremark in ('1','2','3','4') then tm.refcode else '05' end code3
-        when tm.cremark in ('1','2','3','4') then tm.refcode
+                            ,case when cm.cshape = 0 then now() when cm.cshape = 1 then l.edate <!--cm.setime-->
-        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
@@ -1961,7 +1958,6 @@
                 ,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>

Dao/bin/Debug/MyBatis/Maps/Grade.xml

@@ -1921,11 +1921,8 @@
                             ,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
+                            ,case when te.cremark = '1' then te.refcode when tm.cremark in ('1','2','3','4') then tm.refcode else '05' end code3
-        when tm.cremark in ('1','2','3','4') then tm.refcode
+                            ,case when cm.cshape = 0 then now() when cm.cshape = 1 then l.edate <!--cm.setime-->
-        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
@@ -1961,7 +1958,6 @@
                 ,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>

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>

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>

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.ActiveCfg = Staging|Any CPU
-		{707F0AAA-F7B7-414D-B763-33DE10980702}.Staging|Any CPU.Build.0 = Debug|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