From 69eff5aa754430ab46a005e9e3ac420762836576 Mon Sep 17 00:00:00 2001 From: jity7777 Date: Wed, 26 Apr 2023 04:32:02 +0000 Subject: [PATCH] =?UTF-8?q?<=EA=B8=B0=EB=8A=A5=EA=B0=9C=EC=84=A0>=201.=20P?= =?UTF-8?q?MS=20NO=20:=207801=202.=20(=EC=A3=BC=EC=9A=94)=EC=9E=91?= =?UTF-8?q?=EC=97=85=EB=82=B4=EC=9A=A9=20(1)=20=EC=82=AC=EC=9A=A9=EC=9E=90?= =?UTF-8?q?=20:=20=EC=95=88=EC=A0=84=EA=B4=80=EB=A6=AC=EA=B3=84=EC=86=8D(1?= =?UTF-8?q?6=EC=8B=9C=EA=B0=84)=EA=B5=90=EC=9C=A1=20=EA=B4=80=EB=A0=A8=20?= =?UTF-8?q?=ED=91=9C=EA=B8=B0=EA=B4=80=EB=A0=A8=20=EB=AC=B8=EA=B5=AC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20(2)=20=EA=B4=80=EB=A6=AC=EC=9E=90=20:=20?= =?UTF-8?q?=EA=B2=B0=EC=A0=9C=EB=AA=A9=EB=A1=9D=20=EC=B5=9C=EC=B4=88=20?= =?UTF-8?q?=ED=99=98=EB=B6=88=EC=9A=94=EC=B2=AD=EA=B1=B4=20=ED=91=9C?= =?UTF-8?q?=EA=B8=B0=20(3)=20=EC=84=B1=EC=A0=81=EC=B2=98=EB=A6=AC(?= =?UTF-8?q?=EC=A0=84=EC=B2=B4)=20:=20=EC=A7=91=ED=95=A9=EA=B5=90=EC=9C=A1?= =?UTF-8?q?=20=EA=B4=80=EB=A0=A8=20=ED=95=84=ED=84=B0=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BO/Controllers/croomController.cs | 18 ++++++++++++++++-- BO/Views/croom/gradeall.cshtml | 22 ++++++++++++++++++++++ BO/Web.config | 4 ++-- Dao/MyBatis/Maps/Grade.xml | 26 ++++++++++++++++++++++++++ FO/Views/CRoom/Index.cshtml | 2 +- FO/Views/Course/ApplyAgree.cshtml | 11 +++++++++-- FO/Views/Course/ApplyComplete.cshtml | 7 ++++++- FO/Views/Course/ApplyEdu.cshtml | 7 ++++++- FO/Views/Course/ApplyPay.cshtml | 7 ++++++- FO/Views/Course/SmartSearch.cshtml | 2 +- FO/Web.config | 4 ++-- 11 files changed, 97 insertions(+), 13 deletions(-) diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs index 0d04352..8cea2f1 100644 --- a/BO/Controllers/croomController.cs +++ b/BO/Controllers/croomController.cs @@ -627,13 +627,14 @@ namespace NP.BO.Controllers if (searchCheck) { - if (SUserInfo.UserNo != 27460 && SUserInfo.UserNo != 31049 && SUserInfo.UserNo != 110 && SUserInfo.UserNo != 163) + if (true) // SUserInfo.UserNo != 27460 && SUserInfo.UserNo != 31049 && SUserInfo.UserNo != 110 && SUserInfo.UserNo != 163 { vm.Lects = Dao.Get("grade.lectgradesToAll", new System.Collections.Hashtable() { { "cmno", vm.CM.cmno }, { "ustatus", 1 }, { "isrebate", vm.addstringval }, { "iscomplete", vm.addstringval2 }, { "cmisno", vm.addstringval3 }, { "ispasss", vm.addstringval4 }, { "ispassa", vm.addstringval5 }, { "ispassex", vm.addstringval6 }, { "usernameid", vm.addstringval7 }, { "orderby", "ua.asname,ua.asno,u.username" } }); //vm.Lects = Dao.Get("grade.lectgrades", new System.Collections.Hashtable() { { "cmno", vm.CM.cmno }, { "ustatus", 1 }, { "isrebate", vm.addstringval }, { "iscomplete", vm.addstringval2 }, { "cmisno", vm.addstringval3 }, { "ispasss", vm.addstringval4 }, { "ispassa", vm.addstringval5 }, { "ispassex", vm.addstringval6 }, { "usernameid", vm.addstringval7 }, { "orderby", "ua.asname,ua.asno,u.username" } }); } else { + // 사용안함 vm.Lects = Dao.Get("grade.lectgradesToAll2", new System.Collections.Hashtable() { { "cmno", vm.CM.cmno }, { "ustatus", 1 }, { "isrebate", vm.addstringval }, { "iscomplete", vm.addstringval2 }, { "cmisno", vm.addstringval3 }, { "ispasss", vm.addstringval4 }, { "ispassa", vm.addstringval5 }, { "ispassex", vm.addstringval6 }, { "usernameid", vm.addstringval7 }, { "orderby", "ua.asname,ua.asno,u.username" } }); } @@ -747,6 +748,17 @@ namespace NP.BO.Controllers ht.Add("edateall", vm.stringval9); ht.Add("asname", vm.stringval10); ht.Add("mobile", vm.stringval11); + ht.Add("attendance", vm.stringval13); + /* + * Dictionary attendance = new Dictionary() <= stringval13 + { + { 0, "전체"} + , { 1, "해당없음"} + , { 2, "대상자(미입력/출석)"} + , { 3, "미입력"} + , { 4, "출석"} + }; + */ if (!string.IsNullOrEmpty(vm.stringval11)) { var mobile_temp = vm.stringval11.Replace("-", ""); @@ -793,7 +805,7 @@ namespace NP.BO.Controllers //ht.Add("ustatus", 1); ht.Add("orderby", "ua.asname,ua.asno,u.username"); - if (SUserInfo.UserNo != 27460 && SUserInfo.UserNo != 31049 && SUserInfo.UserNo != 110 && SUserInfo.UserNo != 163) + if (true) // SUserInfo.UserNo != 27460 && SUserInfo.UserNo != 31049 && SUserInfo.UserNo != 110 && SUserInfo.UserNo != 163 { vm.Lects = Dao.Get("grade.lectgradesToAll", ht); @@ -818,6 +830,7 @@ namespace NP.BO.Controllers } else { + //사용안함 vm.Lects = Dao.Get("grade.lectgradesToAll2", ht); if (vm.isexceldown == 1) @@ -909,6 +922,7 @@ namespace NP.BO.Controllers if (!IsPost()) { vm.pagerowcount = 50; + vm.stringval4 = "1"; //vm.stringval = DateTime.Now.ToString("yyyy-MM-01"); //vm.stringval2 = Convert.ToDateTime(vm.stringval).AddMonths(1).AddSeconds(-1).ToString("yyyy-MM-dd"); } diff --git a/BO/Views/croom/gradeall.cshtml b/BO/Views/croom/gradeall.cshtml index afd3d3c..e9b042c 100644 --- a/BO/Views/croom/gradeall.cshtml +++ b/BO/Views/croom/gradeall.cshtml @@ -79,6 +79,28 @@ @Html.Partial("./Partial/Text", Model.stringval11, Helpers.DicText(new NP.Model.TextDic() { Name = "stringval11", Style = "width:70%; display:inline-block;", Value = Model.stringval11, CssClass = "esitem" })) + 집합교육 + + @{ + Dictionary attendance = new Dictionary() + { + { 0, "전체"} + , { 1, "해당없음"} + , { 2, "대상자(미입력/출석/결석)"} + , { 3, "미입력"} + , { 4, "출석"} + , { 5, "결석"} + }; + } +
+ +
+ diff --git a/BO/Web.config b/BO/Web.config index 9b979cd..4eec37f 100644 --- a/BO/Web.config +++ b/BO/Web.config @@ -55,8 +55,8 @@ - - + + diff --git a/Dao/MyBatis/Maps/Grade.xml b/Dao/MyBatis/Maps/Grade.xml index 618d741..6d47078 100644 --- a/Dao/MyBatis/Maps/Grade.xml +++ b/Dao/MyBatis/Maps/Grade.xml @@ -1327,6 +1327,19 @@ ua.asname like concat('%',#asname#,'%') date_format((case when c.cshape = 2 and e.eend is not null then e.eend else b.edate end),'%Y-%m-%d') = #edate# cast(AES_DECRYPT(UNHEX(u.mobile), 'np123@!' ) as char) like concat('%',#mobile#,'%') + + + + ifnull(d.isoffabs,0) = 0 + + ifnull(d.isoffabs,0) = 1 + + ifnull(d.isoffabs,0) = 1 and f.istatus is null + + ifnull(d.isoffabs,0) = 1 and ifnull(f.istatus,-1) = 2 + + ifnull(d.isoffabs,0) = 1 and ifnull(f.istatus,-1) = 0 + ) a @@ -1620,6 +1633,19 @@ a.asname like concat('%',#asname#,'%') date_format((case when a.cshape = 2 and a.eend is not null then a.eend else b.edate end),'%Y-%m-%d') = #edate# a.mobile like concat('%',#mobile#,'%') + + + + ifnull(a.isoffabs,0) = 0 + + ifnull(a.isoffabs,0) = 1 + + ifnull(a.isoffabs,0) = 1 and f.istatus is null + + ifnull(a.isoffabs,0) = 1 and ifnull(f.istatus,-1) = 2 + + ifnull(a.isoffabs,0) = 1 and ifnull(f.istatus,-1) = 0 + )a diff --git a/FO/Views/CRoom/Index.cshtml b/FO/Views/CRoom/Index.cshtml index 4027a21..22ab650 100644 --- a/FO/Views/CRoom/Index.cshtml +++ b/FO/Views/CRoom/Index.cshtml @@ -65,7 +65,7 @@ {
- @if (Model.Lect.isoffabs != null) + @if (Model.Lect.isoffabs != null && Model.Lect.typeedu != 32) {
집체교육 안내
diff --git a/FO/Views/Course/ApplyAgree.cshtml b/FO/Views/Course/ApplyAgree.cshtml index 2033f10..096ef74 100644 --- a/FO/Views/Course/ApplyAgree.cshtml +++ b/FO/Views/Course/ApplyAgree.cshtml @@ -52,7 +52,12 @@ strEduInfo += string.Format(" 교육종료일 {0} | ", Model.SelectCMInningscd.eend2); strEduInfo += string.Format("{0}시간과정 |", Model.CM.studytime); strEduInfo += string.Format(" {0}과정
", (Model.CM.isrefund == 1 ? "환급" : "비환급")); - strEduInfo += string.Format("집체교육 참석일 : {0}
", Model.SelectCMInningscd.estart.ToString("yyyy년 MM월 dd일")); + + if (Model.CM.typeedu != "32") + { + strEduInfo += string.Format("집체교육 참석일 : {0}
", Model.SelectCMInningscd.estart.ToString("yyyy년 MM월 dd일")); + } + strEduInfo += string.Format("교육비 : {0}원", Model.CM.infee.ToString("#,0")); @@ -220,11 +225,13 @@ 온라인교육은 신청일로 부터 최대 1년 이내에 수료하셔야 하며 1년 이내에 교육수료가 되지 않으면 수료 및 환불이 불가능합니다.

+ if (Model.CM.typeedu != "32") + {

집체교육(7시간)일정 관련 안내

교육 신청 시 지정하신 집체교육일에 접수인원이 적은 경우 해당 일자의 집체교육은 폐강되어 다른 일정으로 변경 하셔야 될 수도 있습니다. 꼭! 참고 부탁 드립니다.

- + } }

주의사항

diff --git a/FO/Views/Course/ApplyComplete.cshtml b/FO/Views/Course/ApplyComplete.cshtml index 93caf99..c191632 100644 --- a/FO/Views/Course/ApplyComplete.cshtml +++ b/FO/Views/Course/ApplyComplete.cshtml @@ -53,7 +53,12 @@ else strEduInfo += string.Format(" 교육종료일 {0} | ", Model.SelectCMInningscd.eend2); strEduInfo += string.Format("{0}시간과정 |", Model.CM.studytime); strEduInfo += string.Format(" {0}과정
", (Model.CM.isrefund == 1 ? "환급" : "비환급")); - strEduInfo += string.Format("집체교육 참석일 : {0}
", Model.SelectCMInningscd.estart.ToString("yyyy년 MM월 dd일")); + + if (Model.CM.typeedu != "32") + { + strEduInfo += string.Format("집체교육 참석일 : {0}
", Model.SelectCMInningscd.estart.ToString("yyyy년 MM월 dd일")); + } + strEduInfo += string.Format("교육비 : {0}원", Model.CM.infee.ToString("#,0")); diff --git a/FO/Views/Course/ApplyEdu.cshtml b/FO/Views/Course/ApplyEdu.cshtml index a291795..5f65734 100644 --- a/FO/Views/Course/ApplyEdu.cshtml +++ b/FO/Views/Course/ApplyEdu.cshtml @@ -68,7 +68,12 @@ strEduInfo += string.Format(" 교육종료일 {0} | ", Model.SelectCMInningscd.eend2); strEduInfo += string.Format("{0}시간과정 |", Model.CM.studytime); strEduInfo += string.Format(" {0}과정
", (Model.CM.isrefund == 1 ? "환급" : "비환급")); - strEduInfo += string.Format("집체교육 참석일 : {0}
", Model.SelectCMInningscd.estart.ToString("yyyy년 MM월 dd일")); + + if(Model.CM.typeedu != "32") + { + strEduInfo += string.Format("집체교육 참석일 : {0}
", Model.SelectCMInningscd.estart.ToString("yyyy년 MM월 dd일")); + } + strEduInfo += string.Format("교육비 : {0}원", Model.CM.infee.ToString("#,0")); } diff --git a/FO/Views/Course/ApplyPay.cshtml b/FO/Views/Course/ApplyPay.cshtml index 011cced..6c4593f 100644 --- a/FO/Views/Course/ApplyPay.cshtml +++ b/FO/Views/Course/ApplyPay.cshtml @@ -71,7 +71,12 @@ strEduInfo += string.Format(" 교육종료일 {0} | ", Model.SelectCMInningscd.eend2); strEduInfo += string.Format("{0}시간과정 |", Model.CM.studytime); strEduInfo += string.Format(" {0}과정
", (Model.CM.isrefund == 1 ? "환급" : "비환급")); - strEduInfo += string.Format("집체교육 참석일 : {0}
", Model.SelectCMInningscd.estart.ToString("yyyy년 MM월 dd일")); + + if (Model.CM.typeedu != "32") + { + strEduInfo += string.Format("집체교육 참석일 : {0}
", Model.SelectCMInningscd.estart.ToString("yyyy년 MM월 dd일")); + } + strEduInfo += string.Format("교육비 : {0}원", Model.CM.infee.ToString("#,0")); //strEduInfo = string.Format("교육기간 {0} | 교육종료일 {1} | {2}시간과정 | {3}과정
교육비 : {4}원", diff --git a/FO/Views/Course/SmartSearch.cshtml b/FO/Views/Course/SmartSearch.cshtml index 7834fa2..d9f06c7 100644 --- a/FO/Views/Course/SmartSearch.cshtml +++ b/FO/Views/Course/SmartSearch.cshtml @@ -405,7 +405,7 @@ else if (cshape == 2 && typeedu == "32") //온라인 & 안전관리계속교육 { strTmp = "※ 교육비 입금과 동시에 동영상강의 시청이 가능합니다.
" + - "
교육종료일(집체교육 참석일)을 선택하여 주세요."; + "
교육종료일을 선택하여 주세요."; } else if (cshape == 2) //온라인 { diff --git a/FO/Web.config b/FO/Web.config index edcdb65..17520dd 100644 --- a/FO/Web.config +++ b/FO/Web.config @@ -41,8 +41,8 @@ - - + +