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

2

This commit is contained in:
김한진 2025-12-19 09:56:45 +09:00
parent b0e257feb2
commit 335ee2bd51
8 changed files with 2126 additions and 272 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

551
BO/Logs/log.txt
View File

File diff suppressed because one or more lines are too long

549
BO/Logs/query.txt
View File

File diff suppressed because one or more lines are too long

673
Base/Controller/FOCommon.cs
View File

File diff suppressed because it is too large Load Diff

71
Dao/MyBatis/Maps/CM.xml
View File

@ -2035,28 +2035,28 @@
<select id="cm.cminningscds.applyedu.lectno" parameterClass="hashtable" resultClass="cminningscd"> <select id="cm.cminningscds.applyedu.lectno" parameterClass="hashtable" resultClass="cminningscd">
select select
a.cmisno,a.cmino,a.estart,a.eend,a.quota,a.cdt,a.udt,a.studyplace,a.studyplacename,a.startmonth,a.comment a.cmisno,a.cmino,a.estart,a.eend,a.quota,a.cdt,a.udt,a.studyplace,a.studyplacename,a.startmonth,a.comment
,a.studyplace, a.studyplacename,a.remainPeople ,a.studyplace, a.studyplacename,a.remainPeople
,a.isselected, a.cmno,a.pcmno,a.cgcode ,a.isselected, a.cmno,a.pcmno,a.cgcode
<!--211220.통합테스트목록(644) 이미지난 교육종료일 변경불가--> <!--211220.통합테스트목록(644) 이미지난 교육종료일 변경불가-->
,case when a.estart &lt; date_add(date_format(now() ,'%Y-%m-%d 00:00:00'),interval -1 second) ,case when a.estart &lt; date_add(date_format(now() ,'%Y-%m-%d 00:00:00'),interval -1 second)
<!--20220803 <!--20220803
or a.remainPeople &lt;= 0 --> or a.remainPeople &lt;= 0 -->
then 0 else 1 end isend then 0 else 1 end isend
from from
( (
select a.cmisno,a.cmino,a.estart,a.eend,a.quota,a.cdt,a.udt,month(a.estart) startmonth select a.cmisno,a.cmino,a.estart,a.eend,a.quota,a.cdt,a.udt,month(a.estart) startmonth
,(a.quota - (select count(z.lectno) cnt from lect z where a.cmisno = z.cmisno and z.status in (1,2) and z.ischanged=0)) remainPeople ,(a.quota - (select count(z.lectno) cnt from lect z where a.cmisno = z.cmisno and z.status in (1,2) and z.ischanged=0)) remainPeople
,a.studyplace, e.cname studyplacename ,a.studyplace, e.cname studyplacename
,case when f.cmisno = a.cmisno then 1 else 0 end isselected, d.cmno,d.pcmno,cg.cgcode ,case when f.cmisno = a.cmisno then 1 else 0 end isselected, d.cmno,d.pcmno,cg.cgcode
,a.comment ,a.comment
from cminningscd a from cminningscd a
left outer join cminning c on c.cmino = a.cmino left outer join cminning c on c.cmino = a.cmino
left outer join cm d on d.cmno = c.cmno left outer join cm d on d.cmno = c.cmno
left outer join cg cg on d.cgno = cg.cgno left outer join cg cg on d.cgno = cg.cgno
left outer join comcode e on e.ccode = a.studyplace left outer join comcode e on e.ccode = a.studyplace
left outer join lect f on f.lectno = #lectno# left outer join lect f on f.lectno = #lectno#
where DATE_ADD(f.sdate, INTERVAL 1 YEAR) > a.estart where DATE_ADD(f.sdate, INTERVAL 1 YEAR) > a.estart
<isNotNull property="cmno" prepend="and">c.cmno=#cmno#</isNotNull> <isNotNull property="cmno" prepend="and">c.cmno=#cmno#</isNotNull>
)a )a
<dynamic prepend="where"> <dynamic prepend="where">
@ -2232,5 +2232,36 @@
<isNotNull property="year">and year(a.sstime)=#year#</isNotNull> <isNotNull property="year">and year(a.sstime)=#year#</isNotNull>
order by a.sstime,a.setime order by a.sstime,a.setime
</select> </select>
<select id="cm.cminningscds.applyedu.my" parameterClass="hashtable" resultClass="cminningscd">
select
a.cmisno,a.cmino,a.estart,a.eend,a.quota,a.cdt,a.udt,a.studyplace,a.studyplacename,a.startmonth,a.comment
,a.studyplace, a.studyplacename,a.remainPeople
,a.isselected, a.cmno,a.pcmno,a.cgcode
<!--211220.통합테스트목록(644) 이미지난 교육종료일 변경불가-->
,case WHEN a.estart &gt; date_add(date_format(now(), '%Y-%m-%d 00:00:00'), interval - 1 second)
<!--20220803
or a.remainPeople &lt;= 0 -->
then 0 else 1 end isend
from
(
select a.cmisno,a.cmino,a.estart,a.eend,a.quota,a.cdt,a.udt,month(a.estart) startmonth
,(a.quota - (select count(z.lectno) cnt from lect z where a.cmisno = z.cmisno and z.status in (1,2) and z.ischanged=0)) remainPeople
,a.studyplace, e.cname studyplacename
,case when f.cmisno = a.cmisno then 1 else 0 end isselected, d.cmno,d.pcmno,cg.cgcode
,a.comment
,f.sdate
from cminningscd a
left outer join cminning c on c.cmino = a.cmino
left outer join cm d on d.cmno = c.cmno
left outer join cg cg on d.cgno = cg.cgno
left outer join comcode e on e.ccode = a.studyplace
left outer join lect f on f.lectno = #lectno#
where DATE_ADD(f.sdate, INTERVAL 1 YEAR) &gt; a.estart
<isNotNull property="cmno" prepend="and">c.cmno=#cmno#</isNotNull>
)a
WHERE a.estart &gt; date_add(date_format(a.sdate, '%Y-%m-%d 00:00:00'), interval + 2 DAY)
order by isend desc,a.estart
</select>
</statements> </statements>
</sqlMap> </sqlMap>

2
Dao/MyBatis/Maps/Lect.xml
View File

@ -2887,7 +2887,7 @@
ON b.payno = e.PAYNO ON b.payno = e.PAYNO
INNER JOIN pplog f INNER JOIN pplog f
ON b.USERNO = e.USERNO AND b.CMNO = f.CMNO AND e.PPLNO = f.PPLNO ON b.USERNO = e.USERNO AND b.CMNO = f.CMNO AND e.PPLNO = f.PPLNO
WHERE b.STATUS = 1 WHERE b.STATUS IN(1, 2, 3)
AND (e.PSTATUS = 1 OR e.PSTATUS = 22) AND (e.PSTATUS = 1 OR e.PSTATUS = 22)
AND b.USERNO = #uno#; AND b.USERNO = #uno#;
]]> ]]>

6
FO/Controllers/CourseController.cs
View File

@ -876,15 +876,15 @@ namespace NP.FO.Controllers
ViewBag.IsMain = true; ViewBag.IsMain = true;
#region + (사용중) ViewBag.rslt 신청 제약 조건 #region + (사용중) ViewBag.rslt 신청 제약 조건
//var fOCommonController = new Base.Controllers.FOCommonController(); var fOCommonController = new Base.Controllers.FOCommonController();
//fOCommonController.Dao = new Dao.CommonDao(); fOCommonController.Dao = new Dao.CommonDao();
//ViewBag.rslt = fOCommonController.CheckUserLect(vm.stringval3, vm.stringval21, vm.stringval4, vm.stringval5, int.Parse(vm.stringval17), int.Parse(vm.stringval18), SUserInfo.UserNo); //ViewBag.rslt = fOCommonController.CheckUserLect(vm.stringval3, vm.stringval21, vm.stringval4, vm.stringval5, int.Parse(vm.stringval17), int.Parse(vm.stringval18), SUserInfo.UserNo);
#endregion #endregion
#region + 2025-09 (스마트검색 개발 건 미사용으로 주석처리, 필요시 복원) #region + 2025-09 (스마트검색 개발 건 미사용으로 주석처리, 필요시 복원)
var result = new KeyValuePair<int, string>(); var result = new KeyValuePair<int, string>();
result = CheckUserLectInfo( result = fOCommonController.CheckUserLectInfo(
cmno: Convert.ToInt16(vm.stringval17), cmno: Convert.ToInt16(vm.stringval17),
pcmno: Convert.ToInt16(vm.stringval18), pcmno: Convert.ToInt16(vm.stringval18),
userno: SUserInfo.UserNo, userno: SUserInfo.UserNo,

2
FO/FO.csproj.user
View File

@ -2,7 +2,7 @@
<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>Debug|Any CPU</LastActiveSolutionConfig>
<ProjectView>ShowAllFiles</ProjectView> <ProjectView>ProjectFiles</ProjectView>
<UseIISExpress>false</UseIISExpress> <UseIISExpress>false</UseIISExpress>
<Use64BitIISExpress /> <Use64BitIISExpress />
<IISExpressSSLPort /> <IISExpressSSLPort />

492
FO/Logs/query.txt
View File

File diff suppressed because one or more lines are too long