KimHanJin
/
YNICTE
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

추가개발0107_1

This commit is contained in:
김한진 2026-01-07 10:02:50 +09:00
parent 7fa2581b63
commit 651ae49a8d
6 changed files with 147 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
BO/Properties/PublishProfiles/FolderProfile.pubxml
View File

@ -3,6 +3,7 @@
https://go.microsoft.com/fwlink/?LinkID=208121. https://go.microsoft.com/fwlink/?LinkID=208121.
--> -->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<<<<<<< HEAD
<PropertyGroup> <PropertyGroup>
<!-- 배포 방식 지정 --> <!-- 배포 방식 지정 -->
<WebPublishMethod>FileSystem</WebPublishMethod> <WebPublishMethod>FileSystem</WebPublishMethod>
@ -14,4 +15,22 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<!-- 특정 파일/폴더 제외 --> <!-- 특정 파일/폴더 제외 -->
<ExcludeFilesFromDeployment>Controllers\*.cs;Models\*.cs;App_Data\*</ExcludeFilesFromDeployment> <ExcludeFilesFromDeployment>Controllers\*.cs;Models\*.cs;App_Data\*</ExcludeFilesFromDeployment>
</PropertyGroup> </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> </Project>

106
Dao/MyBatis/Maps/Grade.xml
View File

@ -1907,63 +1907,59 @@
<update id="grade.lectcomplete2" parameterClass="hashtable"> <update id="grade.lectcomplete2" parameterClass="hashtable">
update lect a update lect a
inner join ( inner join (
<include refid="grade.query"></include> <include refid="grade.query"></include>
) b on b.lectno=a.lectno ) b on b.lectno=a.lectno
inner join ( inner join (
select c.lectno,c.completeno,c.completetime select c.lectno,c.completeno,c.completetime
from ( from (
select t1.* 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,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)) completeno-->
,concat('제 ',t1.cyear,t1.code1,lpad(ifnull(t2.seqNo,0) + t1.rno , 6, 0), ' 호') as completeno ,concat('제 ',t1.cyear,t1.code1,lpad(ifnull(t2.seqNo,0) + t1.rno , 6, 0), ' 호') as completeno
from ( from (
select l.lectno select l.lectno
,date_format(l.edate,'%Y') cyear ,date_format(l.edate,'%Y') cyear
,pcg.cgcode code2 ,pcg.cgcode code2
,case when cm.cshape = 1 then 'F' else 'N' end code1 ,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 else cs.eend end completetime
,case when cm.cshape = 0 then now() , l.iscomplete
when cm.cshape = 1 then l.edate <!--cm.setime--> ,row_number() over(partition by date_format(l.cdt,'%Y') order by l.cdt) rno
else cs.eend end completetime from lect l
, l.iscomplete inner join cm cm on cm.cmno = l.cmno
,row_number() over(partition by date_format(l.cdt,'%Y') order by l.cdt) rno inner join pay p on p.payno = l.payno
from lect l left outer join pplog pl on pl.pplno = p.pplno
inner join cm cm on cm.cmno = l.cmno inner join cg cg on cg.cgno = cm.cgno
inner join pay p on p.payno = l.payno inner join cg pcg on pcg.cgno = cg.pcgno
left outer join pplog pl on pl.pplno = p.pplno left outer join comcode tm on tm.isuse=1 and tm.ccode = pl.typeman
inner join cg cg on cg.cgno = cm.cgno left outer join comcode te on te.isuse=1 and te.ccode = pl.typeedu
inner join cg pcg on pcg.cgno = cg.pcgno left outer join cminningscd cs on cs.cmisno = pl.cmisno
left outer join comcode tm on tm.isuse=1 and tm.ccode = pl.typeman where 1=1
left outer join comcode te on te.isuse=1 and te.ccode = pl.typeedu <isNotNull property="lectnos">and l.lectno in ($lectnos$)</isNotNull>
left outer join cminningscd cs on cs.cmisno = pl.cmisno <isNotNull property="lectno">and l.lectno =#lectno#</isNotNull>
where 1=1 ) t1
<isNotNull property="lectnos">and l.lectno in ($lectnos$)</isNotNull> left outer join (
<isNotNull property="lectno">and l.lectno =#lectno#</isNotNull> select date_format(l.edate, '%Y') cyear
) t1 ,max(substring(replace(replace(l.completeno, ' - N105 - ','N'), '호',''), -6)) seqNo
left outer join ( from lect l
select date_format(l.edate, '%Y') cyear group by date_format(l.edate, '%Y')
,max(substring(replace(replace(l.completeno, ' - N105 - ','N'), '호',''), -6)) seqNo ) t2 on t2.cyear = t1.cyear
from lect l ) c
group by date_format(l.edate, '%Y') ) c on c.lectno = a.lectno
) t2 on t2.cyear = t1.cyear inner join cm d on d.cmno = a.cmno
) c set a.udt=<include refid="sql.now"></include>,a.uno=#uno#,a.uip=#uip#
) c on c.lectno = a.lectno ,a.iscomplete=b.ispass
inner join cm d on d.cmno = a.cmno ,a.apoint=b.apoint
set a.udt=<include refid="sql.now"></include>,a.uno=#uno#,a.uip=#uip# ,a.mpoint=a.mpoint
,a.iscomplete=b.ispass ,a.fpoint=b.fpoint
,a.apoint=b.apoint ,a.spoint=b.spoint
,a.mpoint=a.mpoint ,a.dpoint=b.dpoint
,a.fpoint=b.fpoint ,a.tpoint=b.apoint+b.mpoint+b.fpoint+b.spoint+b.dpoint
,a.spoint=b.spoint ,a.completetime = case when b.ispass = 1 then c.completetime else null end
,a.dpoint=b.dpoint ,a.completeno = c.completeno
,a.tpoint=b.apoint+b.mpoint+b.fpoint+b.spoint+b.dpoint where a.status=1 and a.ischanged=0 and a.lectno = c.lectno and ifnull(a.iscomplete, 0) &lt;> 1
,a.completetime = case when b.ispass = 1 then c.completetime else null end <isNotNull property="cmno">and a.cmno = #cmno#</isNotNull>
,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="lectno">and a.lectno = #lectno#</isNotNull>
<isNotNull property="cmnos">and a.cmno in ($cmnos$)</isNotNull> <isNotNull property="cmnos">and a.cmno in ($cmnos$)</isNotNull>
<isNotNull property="lectnos">and a.lectno in ($lectnos$)</isNotNull> <isNotNull property="lectnos">and a.lectno in ($lectnos$)</isNotNull>

106
Dao/bin/Debug/MyBatis/Maps/Grade.xml
View File

@ -1907,63 +1907,59 @@
<update id="grade.lectcomplete2" parameterClass="hashtable"> <update id="grade.lectcomplete2" parameterClass="hashtable">
update lect a update lect a
inner join ( inner join (
<include refid="grade.query"></include> <include refid="grade.query"></include>
) b on b.lectno=a.lectno ) b on b.lectno=a.lectno
inner join ( inner join (
select c.lectno,c.completeno,c.completetime select c.lectno,c.completeno,c.completetime
from ( from (
select t1.* 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,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)) completeno-->
,concat('제 ',t1.cyear,t1.code1,lpad(ifnull(t2.seqNo,0) + t1.rno , 6, 0), ' 호') as completeno ,concat('제 ',t1.cyear,t1.code1,lpad(ifnull(t2.seqNo,0) + t1.rno , 6, 0), ' 호') as completeno
from ( from (
select l.lectno select l.lectno
,date_format(l.edate,'%Y') cyear ,date_format(l.edate,'%Y') cyear
,pcg.cgcode code2 ,pcg.cgcode code2
,case when cm.cshape = 1 then 'F' else 'N' end code1 ,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 else cs.eend end completetime
,case when cm.cshape = 0 then now() , l.iscomplete
when cm.cshape = 1 then l.edate <!--cm.setime--> ,row_number() over(partition by date_format(l.cdt,'%Y') order by l.cdt) rno
else cs.eend end completetime from lect l
, l.iscomplete inner join cm cm on cm.cmno = l.cmno
,row_number() over(partition by date_format(l.cdt,'%Y') order by l.cdt) rno inner join pay p on p.payno = l.payno
from lect l left outer join pplog pl on pl.pplno = p.pplno
inner join cm cm on cm.cmno = l.cmno inner join cg cg on cg.cgno = cm.cgno
inner join pay p on p.payno = l.payno inner join cg pcg on pcg.cgno = cg.pcgno
left outer join pplog pl on pl.pplno = p.pplno left outer join comcode tm on tm.isuse=1 and tm.ccode = pl.typeman
inner join cg cg on cg.cgno = cm.cgno left outer join comcode te on te.isuse=1 and te.ccode = pl.typeedu
inner join cg pcg on pcg.cgno = cg.pcgno left outer join cminningscd cs on cs.cmisno = pl.cmisno
left outer join comcode tm on tm.isuse=1 and tm.ccode = pl.typeman where 1=1
left outer join comcode te on te.isuse=1 and te.ccode = pl.typeedu <isNotNull property="lectnos">and l.lectno in ($lectnos$)</isNotNull>
left outer join cminningscd cs on cs.cmisno = pl.cmisno <isNotNull property="lectno">and l.lectno =#lectno#</isNotNull>
where 1=1 ) t1
<isNotNull property="lectnos">and l.lectno in ($lectnos$)</isNotNull> left outer join (
<isNotNull property="lectno">and l.lectno =#lectno#</isNotNull> select date_format(l.edate, '%Y') cyear
) t1 ,max(substring(replace(replace(l.completeno, ' - N105 - ','N'), '호',''), -6)) seqNo
left outer join ( from lect l
select date_format(l.edate, '%Y') cyear group by date_format(l.edate, '%Y')
,max(substring(replace(replace(l.completeno, ' - N105 - ','N'), '호',''), -6)) seqNo ) t2 on t2.cyear = t1.cyear
from lect l ) c
group by date_format(l.edate, '%Y') ) c on c.lectno = a.lectno
) t2 on t2.cyear = t1.cyear inner join cm d on d.cmno = a.cmno
) c set a.udt=<include refid="sql.now"></include>,a.uno=#uno#,a.uip=#uip#
) c on c.lectno = a.lectno ,a.iscomplete=b.ispass
inner join cm d on d.cmno = a.cmno ,a.apoint=b.apoint
set a.udt=<include refid="sql.now"></include>,a.uno=#uno#,a.uip=#uip# ,a.mpoint=a.mpoint
,a.iscomplete=b.ispass ,a.fpoint=b.fpoint
,a.apoint=b.apoint ,a.spoint=b.spoint
,a.mpoint=a.mpoint ,a.dpoint=b.dpoint
,a.fpoint=b.fpoint ,a.tpoint=b.apoint+b.mpoint+b.fpoint+b.spoint+b.dpoint
,a.spoint=b.spoint ,a.completetime = case when b.ispass = 1 then c.completetime else null end
,a.dpoint=b.dpoint ,a.completeno = c.completeno
,a.tpoint=b.apoint+b.mpoint+b.fpoint+b.spoint+b.dpoint where a.status=1 and a.ischanged=0 and a.lectno = c.lectno and ifnull(a.iscomplete, 0) &lt;> 1
,a.completetime = case when b.ispass = 1 then c.completetime else null end <isNotNull property="cmno">and a.cmno = #cmno#</isNotNull>
,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="lectno">and a.lectno = #lectno#</isNotNull>
<isNotNull property="cmnos">and a.cmno in ($cmnos$)</isNotNull> <isNotNull property="cmnos">and a.cmno in ($cmnos$)</isNotNull>
<isNotNull property="lectnos">and a.lectno in ($lectnos$)</isNotNull> <isNotNull property="lectnos">and a.lectno in ($lectnos$)</isNotNull>

6
FO/FO.csproj.user
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Staging|Any CPU</LastActiveSolutionConfig>
<ProjectView>ProjectFiles</ProjectView> <ProjectView>ProjectFiles</ProjectView>
<UseIISExpress>false</UseIISExpress> <UseIISExpress>false</UseIISExpress>
<Use64BitIISExpress /> <Use64BitIISExpress />
@ -10,7 +10,11 @@
<IISExpressWindowsAuthentication /> <IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode /> <IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile /> <UseGlobalApplicationHostFile />
<<<<<<< HEAD
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
=======
<NameOfLastUsedPublishProfile>D:\Project\git\git_YNICTE\FO\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
>>>>>>> a30ad53 (추가개발0107_1)
</PropertyGroup> </PropertyGroup>
<ProjectExtensions> <ProjectExtensions>
<VisualStudio> <VisualStudio>

19
FO/Properties/PublishProfiles/FolderProfile.pubxml
View File

@ -3,6 +3,7 @@
https://go.microsoft.com/fwlink/?LinkID=208121. https://go.microsoft.com/fwlink/?LinkID=208121.
--> -->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<<<<<<< HEAD
<PropertyGroup> <PropertyGroup>
<!-- 배포 방식 지정 --> <!-- 배포 방식 지정 -->
<WebPublishMethod>FileSystem</WebPublishMethod> <WebPublishMethod>FileSystem</WebPublishMethod>
@ -14,4 +15,22 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<!-- 특정 파일/폴더 제외 --> <!-- 특정 파일/폴더 제외 -->
<ExcludeFilesFromDeployment>Controllers\*.cs;Models\*.cs;App_Data\*</ExcludeFilesFromDeployment> <ExcludeFilesFromDeployment>Controllers\*.cs;Models\*.cs;App_Data\*</ExcludeFilesFromDeployment>
</PropertyGroup> </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> </Project>

4
LMS_YNICTE.sln
View File

@ -45,8 +45,8 @@ Global
{707F0AAA-F7B7-414D-B763-33DE10980702}.Debug|Any CPU.Build.0 = Debug|Any CPU {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.ActiveCfg = Release|Any CPU
{707F0AAA-F7B7-414D-B763-33DE10980702}.Release|Any CPU.Build.0 = 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.ActiveCfg = Staging|Any CPU
{707F0AAA-F7B7-414D-B763-33DE10980702}.Web.Staging.config|Any CPU.Build.0 = 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 {748E363F-863F-4CAA-BB9B-B3BE3BE7607E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU