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

<기능개선> 

1. PMS NO : 추가개발건 진행 및 5756건(시작일자를 교육종료일로 변경)
2. (주요)작업내용 
(1) Base/Controller/ACommon.cs
(2) Base/Controller/ACommonCRoom.cs
(3) Base/Controller/AOCommon.cs
(4) Base/Controller/FOCommon.cs
(5) BO/Content/homeDepth2.htm
(6) BO/Controllers/cmController.cs
(7) BO/Controllers/croomController.cs
(8) BO/Views/user/ur.cshtml ( 5756건 처리)
(9) Dao/MyBatis/Maps/Common.xml
(10) Dao/MyBatis/Maps/Lect.xml ( 5756건 처리)
(11) FO/Controllers/CourseController.cs
(12) FO/Views/Home/Index.cshtml
This commit is contained in:
jity7777 2022-04-19 07:54:01 +00:00
parent 73d2c1b5de
commit 8a37b5269e
12 changed files with 134 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

146
BO/Content/homeDepth2.htm
View File

@ -5,10 +5,10 @@
<div> <div>
<div> <div>
<ul> <ul>
<li id="liman01"><a href="javascript: schIpt('2', '48', '설계시공기술인'); ">설계시공기술인</a></li> <li id="liman1"><a href="javascript: schIpt('2', '25', '설계시공기술인'); ">설계시공기술인</a></li>
<li id="liman03"><a href="javascript: schIpt('2', '50', '발주청기술인'); ">발주청기술인</a></li> <li id="liman4"><a href="javascript: schIpt('2', '28', '건설사업관리기술인'); ">건설사업관리기술인</a></li>
<li id="liman04"><a href="javascript: schIpt('2', '51', '건설사업관리기술인'); ">건설사업관리기술인</a></li> <li id="liman2"><a href="javascript: schIpt('2', '26', '품질관리기술인'); ">품질관리기술인</a></li>
<li id="liman02"><a href="javascript: schIpt('2', '49', '품질관리기술인'); ">품질관리기술인</a></li> <li id="liman3"><a href="javascript: schIpt('2', '27', '발주청기술인'); ">발주청기술인</a></li>
</ul> </ul>
</div> </div>
</div> </div>
@ -21,13 +21,13 @@
<div> <div>
<div> <div>
<ul> <ul>
<li id="liedu01"><a href="javascript: schIpt('3', '52', '기본교육'); ">기본교육</a></li> <li id="liedu1"><a href="javascript: schIpt('3', '29', '기본교육'); ">기본교육</a></li>
<li id="liedu02"><a href="javascript: schIpt('3', '53', '최초교육'); ">최초교육</a></li> <li id="liedu2"><a href="javascript: schIpt('3', '30', '최초교육'); ">최초교육</a></li>
<li id="liedu07"><a href="javascript: schIpt('3', '58', '승급교육'); ">승급교육</a></li> <li id="liedu7"><a href="javascript: schIpt('3', '35', '승급교육'); ">승급교육</a></li>
<li id="liedu03"><a href="javascript: schIpt('3', '54', '계속교육'); ">계속교육</a></li> <li id="liedu3"><a href="javascript: schIpt('3', '31', '계속교육'); ">계속교육</a></li>
<li id="liedu04"><a href="javascript: schIpt('3', '55', '안전관리계속교육(16시간)'); ">안전관리계속교육(16시간)</a></li> <li id="liedu4"><a href="javascript: schIpt('3', '32', '안전관리계속교육(16시간)'); ">안전관리계속교육(16시간)</a></li>
<li id="liedu05"><a href="javascript: schIpt('3', '56', 'PQ가점교육'); ">PQ가점교육</a></li> <li id="liedu5"><a href="javascript: schIpt('3', '33', 'PQ가점교육'); ">PQ가점교육</a></li>
<li id="liedu06"><a href="javascript: schIpt('3', '57', '기타교육'); ">기타교육</a></li> <li id="liedu6"><a href="javascript: schIpt('3', '34', '기타교육'); ">기타교육</a></li>
</ul> </ul>
</div> </div>
</div> </div>
@ -40,10 +40,10 @@
<div> <div>
<div> <div>
<ul> <ul>
<li id="ligrade01"><a href="javascript: schIpt('4', '59', '초급'); ">초급</a></li> <li id="ligrade1"><a href="javascript: schIpt('4', '36', '초급'); ">초급</a></li>
<li id="ligrade02"><a href="javascript: schIpt('4', '60', '중급'); ">중급</a></li> <li id="ligrade2"><a href="javascript: schIpt('4', '37', '중급'); ">중급</a></li>
<li id="ligrade03"><a href="javascript: schIpt('4', '61', '고급'); ">고급</a></li> <li id="ligrade3"><a href="javascript: schIpt('4', '38', '고급'); ">고급</a></li>
<li id="ligrade04"><a href="javascript: schIpt('4', '62', '특급'); ">특급</a></li> <li id="ligrade4"><a href="javascript: schIpt('4', '39', '특급'); ">특급</a></li>
</ul> </ul>
</div> </div>
</div> </div>
@ -56,17 +56,17 @@
<div> <div>
<div> <div>
<ul> <ul>
<li id="lijob63" name="typejob" data="토목"><a href="javascript: schIpt('5', '63', '토목'); " >토목</a></li> <li id="lijob40" name="typejob" data="토목"><a href="javascript: schIpt('5', '40', '토목'); " >토목</a></li>
<li id="lijob64" name="typejob" data="건축"><a href="javascript: schIpt('5', '64', '건축'); " >건축</a></li> <li id="lijob41" name="typejob" data="건축"><a href="javascript: schIpt('5', '41', '건축'); " >건축</a></li>
<li id="lijob65" name="typejob" data="기계"><a href="javascript: schIpt('5', '65', '기계'); " >기계</a></li> <li id="lijob42" name="typejob" data="기계"><a href="javascript: schIpt('5', '42', '기계'); " >기계</a></li>
<li id="lijob66" name="typejob" data="조경"><a href="javascript: schIpt('5', '66', '조경'); " >조경</a></li> <li id="lijob43" name="typejob" data="조경"><a href="javascript: schIpt('5', '43', '조경'); " >조경</a></li>
<li id="lijob67" name="typejob" data="환경"><a href="javascript: schIpt('5', '67', '환경'); " >환경</a></li> <li id="lijob44" name="typejob" data="환경"><a href="javascript: schIpt('5', '44', '환경'); " >환경</a></li>
<li id="lijob68" name="typejob" data="광업"><a href="javascript: schIpt('5', '68', '광업'); " >광업</a></li> <li id="lijob45" name="typejob" data="광업"><a href="javascript: schIpt('5', '45', '광업'); " >광업</a></li>
<li id="lijob69" name="typejob" data="안전관리"><a href="javascript: schIpt('5', '69', '안전관리'); " >안전관리</a></li> <li id="lijob46" name="typejob" data="안전관리"><a href="javascript: schIpt('5', '46', '안전관리'); " >안전관리</a></li>
<li id="lijob70" name="typejob" data="도시교통"><a href="javascript: schIpt('5', '70', '도시교통'); " >도시교통</a></li> <li id="lijob47" name="typejob" data="도시교통"><a href="javascript: schIpt('5', '47', '도시교통'); " >도시교통</a></li>
<li id="lijob71" name="typejob" data="전기전자"><a href="javascript: schIpt('5', '71', '전기전자'); " >전기전자</a></li> <li id="lijob48" name="typejob" data="전기전자"><a href="javascript: schIpt('5', '48', '전기전자'); " >전기전자</a></li>
<li id="lijob72" name="typejob" data="건설지원"><a href="javascript: schIpt('5', '72', '건설지원'); " >건설지원</a></li> <li id="lijob49" name="typejob" data="건설지원"><a href="javascript: schIpt('5', '49', '건설지원'); " >건설지원</a></li>
<li id="lijob83" name="typejob" data="품질관리"><a href="javascript: schIpt('5', '83', '품질관리'); " >품질관리</a></li> <li id="lijob57" name="typejob" data="품질관리"><a href="javascript: schIpt('5', '57', '품질관리'); " >품질관리</a></li>
</ul> </ul>
</div> </div>
</div> </div>
@ -79,53 +79,53 @@
<div> <div>
<div> <div>
<ul> <ul>
<li id="lijob64"><a href="javascript: schIpt('6', '118', '건축구조'); ">건축구조</a></li> <li id="lijob41"><a href="javascript: schIpt('6', '70', '건축구조'); ">건축구조</a></li>
<li id="lijob64"><a href="javascript: schIpt('6', '119', '건축기계설비'); ">건축기계설비</a></li> <li id="lijob41"><a href="javascript: schIpt('6', '71', '건축기계설비'); ">건축기계설비</a></li>
<li id="lijob64"><a href="javascript: schIpt('6', '120', '건축시공'); ">건축시공</a></li> <li id="lijob41"><a href="javascript: schIpt('6', '72', '건축시공'); ">건축시공</a></li>
<li id="lijob64"><a href="javascript: schIpt('6', '121', '실내건축'); ">실내건축</a></li> <li id="lijob41"><a href="javascript: schIpt('6', '73', '실내건축'); ">실내건축</a></li>
<li id="lijob64"><a href="javascript: schIpt('6', '122', '건축품질관리'); ">건축품질관리</a></li> <li id="lijob41"><a href="javascript: schIpt('6', '74', '건축품질관리'); ">건축품질관리</a></li>
<li id="lijob64"><a href="javascript: schIpt('6', '123', '건축계획․설계'); ">건축계획․설계</a></li> <li id="lijob41"><a href="javascript: schIpt('6', '75', '건축계획․설계'); ">건축계획․설계</a></li>
<li id="lijob65"><a href="javascript: schIpt('6', '124', '공조냉동및설비'); ">공조냉동및설비</a></li> <li id="lijob42"><a href="javascript: schIpt('6', '76', '공조냉동및설비'); ">공조냉동및설비</a></li>
<li id="lijob65"><a href="javascript: schIpt('6', '125', '용접'); ">용접</a></li> <li id="lijob42"><a href="javascript: schIpt('6', '77', '용접'); ">용접</a></li>
<li id="lijob65"><a href="javascript: schIpt('6', '126', '건설기계'); ">건설기계</a></li> <li id="lijob42"><a href="javascript: schIpt('6', '78', '건설기계'); ">건설기계</a></li>
<li id="lijob65"><a href="javascript: schIpt('6', '127', '승강기'); ">승강기</a></li> <li id="lijob42"><a href="javascript: schIpt('6', '79', '승강기'); ">승강기</a></li>
<li id="lijob65"><a href="javascript: schIpt('6', '128', '일반기계'); ">일반기계</a></li> <li id="lijob42"><a href="javascript: schIpt('6', '80', '일반기계'); ">일반기계</a></li>
<li id="lijob66"><a href="javascript: schIpt('6', '129', '조경계획'); ">조경계획</a></li> <li id="lijob43"><a href="javascript: schIpt('6', '81', '조경계획'); ">조경계획</a></li>
<li id="lijob66"><a href="javascript: schIpt('6', '130', '조경시공관리'); ">조경시공관리</a></li> <li id="lijob43"><a href="javascript: schIpt('6', '82', '조경시공관리'); ">조경시공관리</a></li>
<li id="lijob63"><a href="javascript: schIpt('6', '106', '토질·지질'); ">토질·지질</a></li> <li id="lijob40"><a href="javascript: schIpt('6', '58', '토질·지질'); ">토질·지질</a></li>
<li id="lijob63"><a href="javascript: schIpt('6', '107', '토목구조'); ">토목구조</a></li> <li id="lijob40"><a href="javascript: schIpt('6', '59', '토목구조'); ">토목구조</a></li>
<li id="lijob63"><a href="javascript: schIpt('6', '108', '항만및해안'); ">항만및해안</a></li> <li id="lijob40"><a href="javascript: schIpt('6', '60', '항만및해안'); ">항만및해안</a></li>
<li id="lijob63"><a href="javascript: schIpt('6', '109', '도로및공항'); ">도로및공항</a></li> <li id="lijob40"><a href="javascript: schIpt('6', '61', '도로및공항'); ">도로및공항</a></li>
<li id="lijob63"><a href="javascript: schIpt('6', '110', '철도·삭도'); ">철도·삭도</a></li> <li id="lijob40"><a href="javascript: schIpt('6', '62', '철도·삭도'); ">철도·삭도</a></li>
<li id="lijob63"><a href="javascript: schIpt('6', '111', '수자원개발'); ">수자원개발</a></li> <li id="lijob40"><a href="javascript: schIpt('6', '63', '수자원개발'); ">수자원개발</a></li>
<li id="lijob63"><a href="javascript: schIpt('6', '112', '상하수도'); ">상하수도</a></li> <li id="lijob40"><a href="javascript: schIpt('6', '64', '상하수도'); ">상하수도</a></li>
<li id="lijob63"><a href="javascript: schIpt('6', '113', '농어업토목'); ">농어업토목</a></li> <li id="lijob40"><a href="javascript: schIpt('6', '65', '농어업토목'); ">농어업토목</a></li>
<li id="lijob63"><a href="javascript: schIpt('6', '114', '토목시공'); ">토목시공</a></li> <li id="lijob40"><a href="javascript: schIpt('6', '66', '토목시공'); ">토목시공</a></li>
<li id="lijob63"><a href="javascript: schIpt('6', '115', '토목품질관리'); ">토목품질관리</a></li> <li id="lijob40"><a href="javascript: schIpt('6', '67', '토목품질관리'); ">토목품질관리</a></li>
<li id="lijob63"><a href="javascript: schIpt('6', '116', '측량및지형공간정보'); ">측량및지형공간정보</a></li> <li id="lijob40"><a href="javascript: schIpt('6', '68', '측량및지형공간정보'); ">측량및지형공간정보</a></li>
<li id="lijob63"><a href="javascript: schIpt('6', '117', '지적'); ">지적</a></li> <li id="lijob40"><a href="javascript: schIpt('6', '69', '지적'); ">지적</a></li>
<li id="lijob67"><a href="javascript: schIpt('6', '131', '대기관리'); ">대기관리</a></li> <li id="lijob45"><a href="javascript: schIpt('6', '83', '화약류관리'); ">화약류관리</a></li>
<li id="lijob68"><a href="javascript: schIpt('6', '138', '화약류관리'); ">화약류관리</a></li> <li id="lijob44"><a href="javascript: schIpt('6', '85', '대기관리'); ">대기관리</a></li>
<li id="lijob69"><a href="javascript: schIpt('6', '140', '건설안전'); ">건설안전</a></li> <li id="lijob46"><a href="javascript: schIpt('6', '92', '건설안전'); ">건설안전</a></li>
<li id="lijob70"><a href="javascript: schIpt('6', '145', '교통'); ">교통</a></li> <li id="lijob47"><a href="javascript: schIpt('6', '97', '교통'); ">교통</a></li>
<li id="lijob71"><a href="javascript: schIpt('6', '146', '철도신호'); ">철도신호</a></li> <li id="lijob48"><a href="javascript: schIpt('6', '98', '철도신호'); ">철도신호</a></li>
<li id="lijob72"><a href="javascript: schIpt('6', '149', '건설 마케팅'); ">건설 마케팅</a></li> <li id="lijob49"><a href="javascript: schIpt('6', '101', '건설 마케팅'); ">건설 마케팅</a></li>
<li id="lijob67"><a href="javascript: schIpt('6', '132', '수질관리'); ">수질관리</a></li> <li id="lijob45"><a href="javascript: schIpt('6', '84', '광산보안'); ">광산보안</a></li>
<li id="lijob68"><a href="javascript: schIpt('6', '139', '광산보안'); ">광산보안</a></li> <li id="lijob44"><a href="javascript: schIpt('6', '86', '수질관리'); ">수질관리</a></li>
<li id="lijob69"><a href="javascript: schIpt('6', '141', '소방'); ">소방</a></li> <li id="lijob46"><a href="javascript: schIpt('6', '93', '소방'); ">소방</a></li>
<li id="lijob70"><a href="javascript: schIpt('6', '144', '도시계획'); ">도시계획</a></li> <li id="lijob47"><a href="javascript: schIpt('6', '96', '도시계획'); ">도시계획</a></li>
<li id="lijob71"><a href="javascript: schIpt('6', '147', '건축전기설비'); ">건축전기설비</a></li> <li id="lijob48"><a href="javascript: schIpt('6', '99', '건축전기설비'); ">건축전기설비</a></li>
<li id="lijob72"><a href="javascript: schIpt('6', '150', '건설 정보 처리'); ">건설 정보 처리</a></li> <li id="lijob49"><a href="javascript: schIpt('6', '102', '건설 정보 처리'); ">건설 정보 처리</a></li>
<li id="lijob67"><a href="javascript: schIpt('6', '133', '소음진동'); ">소음진동</a></li> <li id="lijob44"><a href="javascript: schIpt('6', '87', '소음진동'); ">소음진동</a></li>
<li id="lijob69"><a href="javascript: schIpt('6', '142', '가스'); ">가스</a></li> <li id="lijob46"><a href="javascript: schIpt('6', '94', '가스'); ">가스</a></li>
<li id="lijob71"><a href="javascript: schIpt('6', '148', '산업계측제어'); ">산업계측제어</a></li> <li id="lijob48"><a href="javascript: schIpt('6', '100', '산업계측제어'); ">산업계측제어</a></li>
<li id="lijob72"><a href="javascript: schIpt('6', '151', '건설 금융․재무'); ">건설 금융․재무</a></li> <li id="lijob49"><a href="javascript: schIpt('6', '103', '건설 금융․재무'); ">건설 금융․재무</a></li>
<li id="lijob67"><a href="javascript: schIpt('6', '134', '폐기물처리'); ">폐기물처리</a></li> <li id="lijob44"><a href="javascript: schIpt('6', '88', '폐기물처리'); ">폐기물처리</a></li>
<li id="lijob69"><a href="javascript: schIpt('6', '143', '비파괴검사'); ">비파괴검사</a></li> <li id="lijob46"><a href="javascript: schIpt('6', '95', '비파괴검사'); ">비파괴검사</a></li>
<li id="lijob72"><a href="javascript: schIpt('6', '152', '건설 기획'); ">건설 기획</a></li> <li id="lijob49"><a href="javascript: schIpt('6', '104', '건설 기획'); ">건설 기획</a></li>
<li id="lijob67"><a href="javascript: schIpt('6', '135', '자연환경'); ">자연환경</a></li> <li id="lijob44"><a href="javascript: schIpt('6', '89', '자연환경'); ">자연환경</a></li>
<li id="lijob67"><a href="javascript: schIpt('6', '136', '토양환경'); ">토양환경</a></li> <li id="lijob44"><a href="javascript: schIpt('6', '90', '토양환경'); ">토양환경</a></li>
<li id="lijob67"><a href="javascript: schIpt('6', '137', '해양'); ">해양</a></li> <li id="lijob44"><a href="javascript: schIpt('6', '91', '해양'); ">해양</a></li>
</ul> </ul>
</div> </div>
</div> </div>

2
BO/Controllers/cmController.cs
View File

@ -149,7 +149,7 @@ namespace NP.BO.Controllers
vm.CGs = Dao.Get<CG>("cm.cgs", new System.Collections.Hashtable() { { "istop", 1 }, { "isdel", 0 }, { "isuse", 1 } }); vm.CGs = Dao.Get<CG>("cm.cgs", new System.Collections.Hashtable() { { "istop", 1 }, { "isdel", 0 }, { "isuse", 1 } });
} }
vm.Assigns = Dao.Get<Assign>("users.assigns", new System.Collections.Hashtable() { { "status", 1 }, { "ismain", 1 } }); vm.Assigns = Dao.Get<Assign>("users.assigns", new System.Collections.Hashtable() { { "status", 1 }, { "ismain", 1 } });
vm.ComCodes = GetComCodes("cert,certgrade,job,typeman,typeedu,typegrade,typejob,studyplace,typejob63,typejob64,typejob65,typejob66,typejob67,typejob68,typejob69,typejob70,typejob71,typejob72,typejob83,typejob40,typejob41,typejob42,typejob43,typejob44,typejob45,typejob46,typejob47,typejob48,typejob49,typejob57"); vm.ComCodes = GetComCodes("cert,certgrade,job,typeman,typeedu,typegrade,typejob,studyplace,typejob40,typejob41,typejob42,typejob43,typejob44,typejob45,typejob46,typejob47,typejob48,typejob49,typejob57");
vm.userauths = Dao.Get<NP.Model.UserAuth>("sys.menu.auths",new System.Collections.Hashtable() { {"isadminprof", 1 } }); vm.userauths = Dao.Get<NP.Model.UserAuth>("sys.menu.auths",new System.Collections.Hashtable() { {"isadminprof", 1 } });
return View("cmreg", vm); return View("cmreg", vm);
} }

8
BO/Controllers/croomController.cs
View File

@ -15,7 +15,7 @@ namespace NP.BO.Controllers
{ {
public ActionResult lectreg(NP.Model.VMCM vm) public ActionResult lectreg(NP.Model.VMCM vm)
{ {
ViewBag.JobTypeItems = "typejob63,typejob64,typejob65,typejob66,typejob67,typejob68,typejob69,typejob70,typejob71,typejob72,typejob83,typejob40,typejob41,typejob42,typejob43,typejob44,typejob45,typejob46,typejob47,typejob48,typejob49,typejob57"; ViewBag.JobTypeItems = "typejob40,typejob41,typejob42,typejob43,typejob44,typejob45,typejob46,typejob47,typejob48,typejob49,typejob57";
vm.ComCodes = GetComCodes("typeman,typeedu,typegrade,typejob,studyplace," + ViewBag.JobTypeItems); vm.ComCodes = GetComCodes("typeman,typeedu,typegrade,typejob,studyplace," + ViewBag.JobTypeItems);
vm.IsAdmin = SUserInfo.IsAdmin; vm.IsAdmin = SUserInfo.IsAdmin;
vm.IsSiteAdmin = SUserInfo.IsSiteAdmin; vm.IsSiteAdmin = SUserInfo.IsSiteAdmin;
@ -204,7 +204,7 @@ namespace NP.BO.Controllers
vm.Lects = Dao.Get<Lect>("lect.lects", ht); vm.Lects = Dao.Get<Lect>("lect.lects", ht);
} }
ViewBag.JobTypeItems = "typejob63,typejob64,typejob65,typejob66,typejob67,typejob68,typejob69,typejob70,typejob71,typejob72,typejob83,typejob40,typejob41,typejob42,typejob43,typejob44,typejob45,typejob46,typejob47,typejob48,typejob49,typejob57"; ViewBag.JobTypeItems = "typejob40,typejob41,typejob42,typejob43,typejob44,typejob45,typejob46,typejob47,typejob48,typejob49,typejob57";
vm.ComCodes = GetComCodes("typeman,typeedu,typegrade,typejob," + ViewBag.JobTypeItems); vm.ComCodes = GetComCodes("typeman,typeedu,typegrade,typejob," + ViewBag.JobTypeItems);
return View(vm); return View(vm);
} }
@ -910,7 +910,7 @@ namespace NP.BO.Controllers
vm.Pay = Dao.Get<Pay>("cr.pay1", vm.payno).First(); vm.Pay = Dao.Get<Pay>("cr.pay1", vm.payno).First();
vm.PayItems = Dao.Get<PayItem>("cr.pay2", vm.payno); vm.PayItems = Dao.Get<PayItem>("cr.pay2", vm.payno);
vm.Lect = Dao.Get<Lect>("lect.lects", new System.Collections.Hashtable() { { "payno", vm.payno } }).FirstOrDefault(); vm.Lect = Dao.Get<Lect>("lect.lects", new System.Collections.Hashtable() { { "payno", vm.payno } }).FirstOrDefault();
ViewBag.JobTypeItems = "typejob63,typejob64,typejob65,typejob66,typejob67,typejob68,typejob69,typejob70,typejob71,typejob72,typejob83,typejob40,typejob41,typejob42,typejob43,typejob44,typejob45,typejob46,typejob47,typejob48,typejob49,typejob57"; ViewBag.JobTypeItems = "typejob40,typejob41,typejob42,typejob43,typejob44,typejob45,typejob46,typejob47,typejob48,typejob49,typejob57";
vm.ComCodes = GetComCodes("typeman,typeedu,typegrade,typejob,studyplace," + ViewBag.JobTypeItems); vm.ComCodes = GetComCodes("typeman,typeedu,typegrade,typejob,studyplace," + ViewBag.JobTypeItems);
@ -1247,7 +1247,7 @@ namespace NP.BO.Controllers
{ {
vm.Completions = InitM<Completion>(); vm.Completions = InitM<Completion>();
vm.CGs = Dao.Get<CG>("cm.cgs", new System.Collections.Hashtable() { { "isuse", 1 }, { "isdel", 0 } }); vm.CGs = Dao.Get<CG>("cm.cgs", new System.Collections.Hashtable() { { "isuse", 1 }, { "isdel", 0 } });
ViewBag.JobTypeItems = "typejob63,typejob64,typejob65,typejob66,typejob67,typejob68,typejob69,typejob70,typejob71,typejob72,typejob83,typejob40,typejob41,typejob42,typejob43,typejob44,typejob45,typejob46,typejob47,typejob48,typejob49,typejob57"; ViewBag.JobTypeItems = "typejob40,typejob41,typejob42,typejob43,typejob44,typejob45,typejob46,typejob47,typejob48,typejob49,typejob57";
vm.ComCodes = GetComCodes("typeman,typeedu,typegrade,typejob,studyplace," + ViewBag.JobTypeItems); vm.ComCodes = GetComCodes("typeman,typeedu,typegrade,typejob,studyplace," + ViewBag.JobTypeItems);
var ht = SetHash(vm); var ht = SetHash(vm);

38
BO/Views/user/ur.cshtml
View File

@ -258,7 +258,8 @@
<th>교육유형</th> <th>교육유형</th>
<th>강좌명(분반)</th> <th>강좌명(분반)</th>
<th>신청구분</th> <th>신청구분</th>
<th>신청일</th> @*<th>신청일</th>*@
<th>교육종료일</th>
<th>결제여부</th> <th>결제여부</th>
<th>수료여부</th> <th>수료여부</th>
<th>교육일정</th> <th>교육일정</th>
@ -277,19 +278,28 @@
// 강좌 설정에서 설정한 교육장 // 강좌 설정에서 설정한 교육장
eduLocName = item.studyplace; eduLocName = item.studyplace;
} }
<tr> <tr>
<td>@item.rnorvt</td> <td>@item.rnorvt</td>
<td>@item.tmname</td> <td>@item.tmname</td>
@*<td>@item.cgname</td>*@ @*<td>@item.cgname</td>*@
<td>@eduLocName</td> <td>@eduLocName</td>
<td>@item.cshapename</td> <td>@item.cshapename</td>
<td>@item.cnameclassno</td> <td>@item.cnameclassno</td>
<td>@item.isrebatename</td> <td>@item.isrebatename</td>
<td>@item.cdtymd</td> @*<td>@item.cdtymd</td>*@
<td class="link text-center" style="cursor:pointer"><a href="#" onclick="gopay(0, @item.payno, @item.userno)">@item.pstatusname</a></td> @if (item.edate == null)
<td>@item.iscompletename</td> {
<td class="link text-center"><a href="#" onclick="javascript: openScd(@item.cmno,@item.lectno,@item.cmisno);">[변경]</a></td> <td>2021-12-31</td>
</tr> }
else
{
<td>@(Convert.ToDateTime(item.edate).ToShortDateString())</td>
}
<td class="link text-center" style="cursor:pointer"><a href="#" onclick="gopay(0, @item.payno, @item.userno)">@item.pstatusname</a></td>
<td>@item.iscompletename</td>
<td class="link text-center"><a href="#" onclick="javascript: openScd(@item.cmno,@item.lectno,@item.cmisno);">[변경]</a></td>
</tr>
} }
</tbody> </tbody>
</table> </table>

11
Base/Controller/ACommon.cs
View File

@ -587,17 +587,6 @@ namespace NP.Base.Controllers
,{ "typeedu", 2} ,{ "typeedu", 2}
,{ "typegrade", 3} ,{ "typegrade", 3}
,{ "typejob", 4} ,{ "typejob", 4}
,{ "typejob63", 5}
,{ "typejob64", 5}
,{ "typejob65", 5}
,{ "typejob66", 5}
,{ "typejob67", 5}
,{ "typejob68", 5}
,{ "typejob69", 5}
,{ "typejob70", 5}
,{ "typejob71", 5}
,{ "typejob72", 5}
,{ "typejob83", 5}
,{ "typejob40", 5} ,{ "typejob40", 5}
,{ "typejob41", 5} ,{ "typejob41", 5}

2
Base/Controller/ACommonCRoom.cs
View File

@ -1801,7 +1801,7 @@ namespace NP.Base.Controllers
[HttpPost] [HttpPost]
public JsonResult Completion(Int64 lectno) public JsonResult Completion(Int64 lectno)
{ {
string jobTypeItems = "typejob63,typejob64,typejob65,typejob66,typejob67,typejob68,typejob69,typejob70,typejob71,typejob72,typejob83,typejob40,typejob41,typejob42,typejob43,typejob44,typejob45,typejob46,typejob47,typejob48,typejob49,typejob57"; string jobTypeItems = "typejob40,typejob41,typejob42,typejob43,typejob44,typejob45,typejob46,typejob47,typejob48,typejob49,typejob57";
var comCodes = GetComCodes("typeman,typeedu,typegrade,typejob,studyplace," + jobTypeItems); var comCodes = GetComCodes("typeman,typeedu,typegrade,typejob,studyplace," + jobTypeItems);
var completion = Dao.Get<Completion>("cr.completions", new Hashtable() { { "lectno", lectno } }).First(); var completion = Dao.Get<Completion>("cr.completions", new Hashtable() { { "lectno", lectno } }).First();
completion.typeeduName = comCodes.Where(w => w.ccode == completion.typeedu).FirstOrDefault()?.cname; completion.typeeduName = comCodes.Where(w => w.ccode == completion.typeedu).FirstOrDefault()?.cname;

1
Base/Controller/AOCommon.cs
View File

@ -206,6 +206,7 @@ namespace NP.Base.Controllers
} }
//} //}
} }
[HttpPost] [HttpPost]
public JsonResult DisableAccount(string loginid) public JsonResult DisableAccount(string loginid)
{ {

26
Base/Controller/FOCommon.cs
View File

@ -540,14 +540,17 @@ namespace NP.Base.Controllers
[HttpPost] [HttpPost]
public JsonResult GetCheckLectIs(string man, string cgcode, string edu, string grade, int cmno) public JsonResult GetCheckLectIs(string man, string cgcode, string edu, string grade, int cmno)
{ {
// 29:기본교육 ,30:최초교육 ,31:계속교육 ,32:안전관리계속교육(16시간) ,33:PQ가점교육 ,34:기타교육 ,35:승급교육
// 36:초급 ,37:중급 ,38:고급 ,39:특급
int result = 0; // 0 이면 수강 가능, 그외 수강 불가 int result = 0; // 0 이면 수강 가능, 그외 수강 불가
int userno = SUserInfo.UserNo; int userno = SUserInfo.UserNo;
string[] cgcodes = { "103", "104", "105" }; string[] cgcodes = { "103", "104", "105" };
string[] edus = { "53", "54", "58", "59", "60" }; // 최초교육, 계속교육, 승급교육 string[] edus = { "30", "31", "35" }; // 최초교육, 계속교육, 승급교육
// 등급 59: 초급, 60: 중급, 61: 고급, 62: 특급
if (man == "51" && cgcodes.Contains(cgcode) && edus.Contains(edu)) // man == 28 : 건설사업관리기술인(typeman)
if (man == "28" && cgcodes.Contains(cgcode) && edus.Contains(edu))
{ {
if (edu == "54" && (cgcode == "103" || cgcode == "104") && (grade == "59" || grade == "60")) // 계속교육, (103 or 104), (초급 or 중급) if (edu == "31" && (cgcode == "103" || cgcode == "104") && (grade == "36" || grade == "37")) // 계속교육, (103 or 104), (초급 or 중급)
{ {
result = 1; // 신청불가 result = 1; // 신청불가
} }
@ -555,15 +558,15 @@ namespace NP.Base.Controllers
{ {
int rst = 0; int rst = 0;
if (edu == "53" && cgcode == "105") // 최초교육 , 105 if (edu == "30" && cgcode == "105") // 최초교육 , 105
{ {
rst = 0; // 신청가능 rst = 0; // 신청가능
} }
else if (edu == "54" && cgcode == "105" && (grade == "59" || grade == "60")) // 계속교육, 105, (초급 or 중급) else if (edu == "31" && cgcode == "105" && (grade == "36" || grade == "37")) // 계속교육, 105, (초급 or 중급)
{ {
rst = 0; // 신청가능 rst = 0; // 신청가능
} }
else if (edu == "58" && (cgcode == "103" || cgcode == "104" || cgcode == "105") && (grade == "59" || grade == "60")) // 승급교육, (103 or 104 or 105), (초급 or 중급) else if (edu == "35" && (cgcode == "103" || cgcode == "104" || cgcode == "105") && (grade == "36" || grade == "37")) // 승급교육, (103 or 104 or 105), (초급 or 중급)
{ {
rst = 0; // 신청가능 rst = 0; // 신청가능
} }
@ -579,14 +582,19 @@ from lect t1
inner join pplog t5 on t1.cmno= t5.cmno and t1.userno = t5.userno and t4.pplno = t5.pplno inner join pplog t5 on t1.cmno= t5.cmno and t1.userno = t5.userno and t4.pplno = t5.pplno
where t1.status = 1 and t4.pstatus= 1 where t1.status = 1 and t4.pstatus= 1
and t3.cgcode = 103 -- and t1.userno=82 -- 82,5,31 and t3.cgcode = 103 -- and t1.userno=82 -- 82,5,31
// 29:기본교육 ,30:최초교육 ,31:계속교육 ,32:안전관리계속교육(16시간) ,33:PQ가점교육 ,34:기타교육 ,35:승급교육
// 36:초급 ,37:중급 ,38:고급 ,39:특급
*/ */
if((edu == "54" || edu == "58") && (grade == "61" || grade == "62")) // 계속교육, 승급교육 && 고급, 특급 if ((edu == "31" || edu == "35") && (grade == "38" || grade == "39")) // 계속교육, 승급교육 && 고급, 특급
{ {
var lectCount = Dao.Get<int>("lect.count.user2", new Hashtable() { { "userno", userno }, { "cgcode", cgcode }, { "edu", edu }, { "grade", grade } }); var lectCount = Dao.Get<int>("lect.count.user2", new Hashtable() { { "userno", userno }, { "cgcode", cgcode }, { "edu", edu }, { "grade", grade } });
rst = lectCount.First(); rst = lectCount.First();
} }
else if((cgcode == "103" || cgcode == "104") && edu == "53") else if((cgcode == "103" || cgcode == "104") && edu == "30") // 최초
{ {
var lectCount = Dao.Get<int>("lect.count.user3", new Hashtable() { { "userno", userno } }); var lectCount = Dao.Get<int>("lect.count.user3", new Hashtable() { { "userno", userno } });
rst = lectCount.First(); rst = lectCount.First();

4
Dao/MyBatis/Maps/Common.xml
View File

@ -480,8 +480,8 @@
<selectKey type="post" property="authno" resultClass="long">SELECT LAST_INSERT_ID()</selectKey> <selectKey type="post" property="authno" resultClass="long">SELECT LAST_INSERT_ID()</selectKey>
</insert> </insert>
<insert id="common.smsauth2" parameterClass="smsauth"> <insert id="common.smsauth2" parameterClass="smsauth">
insert into smsauth(latime,lakey,userno) insert into smsauth(latime,lakey,userno, lectno)
values(now(),#lakey#,#userno#); values(now(),#lakey#,#userno#, 0);
<selectKey type="post" property="authno" resultClass="long">SELECT LAST_INSERT_ID()</selectKey> <selectKey type="post" property="authno" resultClass="long">SELECT LAST_INSERT_ID()</selectKey>
</insert> </insert>
<select id ="common.sms.chk" parameterClass="hashtable" resultClass="data"> <select id ="common.sms.chk" parameterClass="hashtable" resultClass="data">

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

@ -74,6 +74,7 @@
, b.cshape, ifnull(e.scdtype, 1) as scdtype , b.cshape, ifnull(e.scdtype, 1) as scdtype
, (case when e.scdtype is null then h.cname else g.cname end ) as studyplace , (case when e.scdtype is null then h.cname else g.cname end ) as studyplace
, (case when b.cshape=0 then '온라인' when b.cshape=1 then '교육장교육' else '온라인교육' end) cshapename , (case when b.cshape=0 then '온라인' when b.cshape=1 then '교육장교육' else '온라인교육' end) cshapename
, a.edate
from lect a from lect a
left outer join payitem pi on pi.pino=a.pino left outer join payitem pi on pi.pino=a.pino
inner join cm b on b.cmno=a.cmno inner join cm b on b.cmno=a.cmno
@ -1973,16 +1974,17 @@
inner join cg t3 on t2.cgno= t3.cgno inner join cg t3 on t2.cgno= t3.cgno
inner join pay t4 on t1.payno = t4.payno inner join pay t4 on t1.payno = t4.payno
inner join pplog t5 on t1.cmno= t5.cmno and t1.userno = t5.userno and t4.pplno = t5.pplno inner join pplog t5 on t1.cmno= t5.cmno and t1.userno = t5.userno and t4.pplno = t5.pplno
where t1.status = 1 and t4.pstatus= 1 and t5.typeman = 51 where t1.status = 1 and t4.pstatus= 1 and t5.typeman = 28
<isNotNull property="userno">and t1.userno = #userno#</isNotNull> <isNotNull property="userno">and t1.userno = #userno#</isNotNull>
<isNotEmpty property="edu"> <isNotEmpty property="edu">
<isNotEqual property="edu" compareValue="53">and t5.typegrade in (61,62)</isNotEqual> <isNotEqual property="edu" compareValue="30">and t5.typegrade in (38,39)</isNotEqual>
</isNotEmpty> </isNotEmpty>
<isNotEmpty property="cgcode"> <isNotEmpty property="cgcode">
<isNotEqual property="cgcode" compareValue="105">and t3.cgcode in (103,104)</isNotEqual> <isNotEqual property="cgcode" compareValue="105">and t3.cgcode in (103,104)</isNotEqual>
<Equal property="cgcode" compareValue="105">and t3.cgcode = 105</Equal> <Equal property="cgcode" compareValue="105">and t3.cgcode = 105</Equal>
</isNotEmpty> </isNotEmpty>
</select> </select>
<select id="lect.count.user2" parameterClass="hashtable" resultClass="int"> <select id="lect.count.user2" parameterClass="hashtable" resultClass="int">
select count(t1.lectno) <!--t5.typegrade, t5.typeman, t5.typeedu, t3.cgcode, t1.lectno, t1.userno--> select count(t1.lectno) <!--t5.typegrade, t5.typeman, t5.typeedu, t3.cgcode, t1.lectno, t1.userno-->
from lect t1 from lect t1
@ -1991,7 +1993,7 @@
inner join pay t4 on t1.payno = t4.payno inner join pay t4 on t1.payno = t4.payno
inner join pplog t5 on t1.cmno= t5.cmno and t1.userno = t5.userno and t4.pplno = t5.pplno inner join pplog t5 on t1.cmno= t5.cmno and t1.userno = t5.userno and t4.pplno = t5.pplno
where t1.status = 1 and t4.pstatus= 1 and t3.cgcode in (103,104,105) and t5.typegrade = #grade# and t5.typeedu = #edu# where t1.status = 1 and t4.pstatus= 1 and t3.cgcode in (103,104,105) and t5.typegrade = #grade# and t5.typeedu = #edu#
and t1.userno = #userno# and t5.typeman = 51 and t1.userno = #userno# and t5.typeman = 28
</select> </select>
<select id="lect.count.user3" parameterClass="hashtable" resultClass="int"> <select id="lect.count.user3" parameterClass="hashtable" resultClass="int">
@ -2001,8 +2003,8 @@
inner join cg t3 on t2.cgno= t3.cgno inner join cg t3 on t2.cgno= t3.cgno
inner join pay t4 on t1.payno = t4.payno inner join pay t4 on t1.payno = t4.payno
inner join pplog t5 on t1.cmno= t5.cmno and t1.userno = t5.userno and t4.pplno = t5.pplno inner join pplog t5 on t1.cmno= t5.cmno and t1.userno = t5.userno and t4.pplno = t5.pplno
where t1.status = 1 and t4.pstatus= 1 and t3.cgcode in (103,104) and t5.typeedu = 53 where t1.status = 1 and t4.pstatus= 1 and t3.cgcode in (103,104) and t5.typeedu = 30
and t1.userno = #userno# and t5.typeman = 51 and t1.userno = #userno# and t5.typeman = 28
</select> </select>
</statements> </statements>
</sqlMap> </sqlMap>

2
FO/Controllers/CourseController.cs
View File

@ -1049,7 +1049,7 @@ namespace NP.FO.Controllers
} }
vm.CM = Dao.Get<CM>("cm.cms", new System.Collections.Hashtable() { { "cmno", vm.PPLog.cmno } }).First(); vm.CM = Dao.Get<CM>("cm.cms", new System.Collections.Hashtable() { { "cmno", vm.PPLog.cmno } }).First();
vm.User = Dao.Get<Users>("users.users", new System.Collections.Hashtable() { { "userno", SUserInfo.UserNo } }).First(); vm.User = Dao.Get<Users>("users.users", new System.Collections.Hashtable() { { "userno", SUserInfo.UserNo } }).First();
vm.ComCodes = GetComCodes("typeman,typejob,studyplace,typejob63,typejob64,typejob65,typejob66,typejob67,typejob68,typejob69,typejob70,typejob71,typejob72,typejob83,typejob40,typejob41,typejob42,typejob43,typejob44,typejob45,typejob46,typejob47,typejob48,typejob49,typejob57"); vm.ComCodes = GetComCodes("typeman,typejob,studyplace,typejob40,typejob41,typejob42,typejob43,typejob44,typejob45,typejob46,typejob47,typejob48,typejob49,typejob57");
vm.ComCodes2 = GetComCodes("typeman"); vm.ComCodes2 = GetComCodes("typeman");
vm.ComCodes3 = GetComCodes("typeedu"); vm.ComCodes3 = GetComCodes("typeedu");
vm.ComCodes4 = GetComCodes("typegrade"); vm.ComCodes4 = GetComCodes("typegrade");

4
FO/Views/Home/Index.cshtml
View File

@ -295,13 +295,15 @@
$("#stringval6").val($("#sch5").val()); $("#stringval6").val($("#sch5").val());
$("#stringval7").val($("#sch6").val()); $("#stringval7").val($("#sch6").val());
if ($("#stringval").val() == "0") { if ($("#stringval").val() == "0") {
if ($("#stringval2").val() == "") { msg("교육유형을 입력하세요."); $("#stringval2").focus(); return; } if ($("#stringval2").val() == "") { msg("교육유형을 입력하세요."); $("#stringval2").focus(); return; }
if ($("#stringval3").val() == "") { msg("기술인분류를 입력하세요."); $("#stringval3").focus(); return; } if ($("#stringval3").val() == "") { msg("기술인분류를 입력하세요."); $("#stringval3").focus(); return; }
if ($("#stringval4").val() == "") { msg("교육목적을 입력하세요."); $("#stringval4").focus(); return; } if ($("#stringval4").val() == "") { msg("교육목적을 입력하세요."); $("#stringval4").focus(); return; }
if ($("#stringval5").val() == "") { msg("등급을 입력하세요."); $("#stringval5").focus(); return; } if ($("#stringval5").val() == "") { msg("등급을 입력하세요."); $("#stringval5").focus(); return; }
if ($("#stringval6").val() == "") { msg("직무분야를 입력하세요."); $("#stringval6").focus(); return; } if ($("#stringval6").val() == "") { msg("직무분야를 입력하세요."); $("#stringval6").focus(); return; }
if ($("#stringval7").val() == "" && $("#msSel6 div").css("display") != 'none') { msg("전문분야를 입력하세요."); $("#stringval6").focus(); return; } if ($("#stringval7").val() == "" && $("#msSel6 div").css("display") != 'none' && $("#stringval6").val() != "57") { msg("전문분야를 입력하세요."); $("#stringval6").focus(); return; }
} }
else if ($("#stringval").val() == "1") { else if ($("#stringval").val() == "1") {
if ($("#stringval2").val() == "") { msg("교육유형을 입력하세요."); $("#stringval2").focus(); return; } if ($("#stringval2").val() == "") { msg("교육유형을 입력하세요."); $("#stringval2").focus(); return; }