From bded65921f5df7f107ab955a3db56e776408ddae Mon Sep 17 00:00:00 2001 From: ksjihd163 Date: Mon, 16 May 2022 02:22:06 +0000 Subject: [PATCH] =?UTF-8?q?=EC=88=98=EC=A0=95=EB=82=B4=EC=9A=A9=20?= =?UTF-8?q?=EB=8B=A4=EC=9D=8C=20=EC=BB=A4=EB=B0=8B=20=EB=82=B4=EC=9A=A9?= =?UTF-8?q?=EC=97=90=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BO/Controllers/ccController.cs | 16 +- BO/Controllers/croomController.cs | 24 +- BO/Views/cc/homesemployess.cshtml | 2 +- BO/Views/croom/completions.cshtml | 22 +- BO/Views/croom/documentspast.cshtml | 38 +-- BO/Views/croom/rsv.cshtml | 89 +++--- BO/Views/croom/tax.cshtml | 16 +- BO/Web.config | 425 ------------------------- Base/Controller/FOCommon.cs | 11 +- Dao/MyBatis/Maps/Lect.xml | 6 +- FO/Views/Course/SmartSearch.cshtml | 29 +- FO/Web.config | 473 ---------------------------- FO/css/style.css | 6 +- Model/Documents.cs | 1 + 14 files changed, 151 insertions(+), 1007 deletions(-) delete mode 100644 BO/Web.config delete mode 100644 FO/Web.config diff --git a/BO/Controllers/ccController.cs b/BO/Controllers/ccController.cs index 19ccdbd..a11c262 100644 --- a/BO/Controllers/ccController.cs +++ b/BO/Controllers/ccController.cs @@ -93,15 +93,15 @@ namespace NP.BO.Controllers { vm.BMOs = Dao.Get("board.bmos", GetInt(vm.stringval2)); } - ht.Add("bmno", vm.stringval2); + ht.Add("bmno", "21"); // ST :21, LIVE : 13 //ht.Add("opno", vm.stringval3); //ht.Add("scc", vm.stringval4); - vm.Boards2 = Dao.Get("board.bs", ht); - vm.pagetotalcount = GetCount(vm.Boards2.FirstOrDefault()); - if (vm.Boards2.Count() > 0) + vm.Boards = Dao.Get("board.bs", ht); + vm.pagetotalcount = GetCount(vm.Boards.FirstOrDefault()); + if (vm.Boards.Count() > 0) { - vm.Boards2 = Dao.Get("board.bcmt.cnt", new System.Collections.Hashtable() { { "bnos", string.Join(",", vm.Boards2.Select(s => s.bno)) } }); - foreach (var d in vm.Boards2) + vm.Boards2 = Dao.Get("board.bcmt.cnt", new System.Collections.Hashtable() { { "bnos", string.Join(",", vm.Boards.Select(s => s.bno)) } }); + foreach (var d in vm.Boards) { d.ccount = vm.Boards2.Where(w => w.bno == d.bno).First().ccount; } @@ -135,10 +135,10 @@ namespace NP.BO.Controllers vm.pagetotalcount = GetCount(vm.Boards.FirstOrDefault()); if (vm.Boards.Count() > 0) { - vm.Boards = Dao.Get("board.bcmt.cnt", new System.Collections.Hashtable() { { "bnos", string.Join(",", vm.Boards.Select(s => s.bno)) } }); + vm.Boards2 = Dao.Get("board.bcmt.cnt", new System.Collections.Hashtable() { { "bnos", string.Join(",", vm.Boards.Select(s => s.bno)) } }); foreach (var d in vm.Boards) { - d.ccount = vm.Boards.Where(w => w.bno == d.bno).First().ccount; + d.ccount = vm.Boards2.Where(w => w.bno == d.bno).First().ccount; } } return View(vm); diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs index f39fef3..8290e1f 100644 --- a/BO/Controllers/croomController.cs +++ b/BO/Controllers/croomController.cs @@ -433,10 +433,18 @@ namespace NP.BO.Controllers Response.AddHeader("Content-Type", "application/vnd.ms-excel"); Response.Output.Write(sw.ToString()); Response.End(); + if (vm.excellog != null) + { + vm.excellog.userno = SUserInfo.UserNo; + vm.excellog.userip = GetUserIP(); + + Dao.Save("excellog.in", vm.excellog); + } return null; } } } + else { vm.RSCQs = Dao.Get("lect.cmrscqs", vm.CMRS.rsno); @@ -1253,9 +1261,14 @@ namespace NP.BO.Controllers ht.Add("text", vm.stringval12); vm.DocumentList = Dao.Get("cr.documnetspasts", ht); vm.pagetotalcount = GetCount(vm.DocumentList.FirstOrDefault()); - + if (vm.isexceldown == 1) { + if (vm.excellog != null) + { + vm.excellog.userno = SUserInfo.UserNo; + vm.excellog.userip = GetUserIP(); + } vm.DocumentList = Dao.Get("cr.documnetspasts", ht); return ExportExcel( new String[] {"순번","사용자ID","이름","주민번호","교육생연락처","교육유형","교육구분","기술인분류","직무분야","교육목적","등급","교육시작일","교육종료일", @@ -1267,7 +1280,7 @@ namespace NP.BO.Controllers "ceoname","slevel","uduty","mname","mphone","sprice","rprice","rbank","rbankno","rbankuser","taxemail", "assign","userid","userid","userid","sctime","syear"}, vm.DocumentList, - "증빙서류출력(과거)",null,",0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38"); + "증빙서류출력(과거)",null,",0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38",vm.excellog); } return View(vm); } @@ -1324,6 +1337,11 @@ namespace NP.BO.Controllers completion.edate = completion.estart; } } + if (vm.excellog != null) + { + vm.excellog.userno = SUserInfo.UserNo; + vm.excellog.userip = GetUserIP(); + } return ExportExcel( new String[] {"순번" ,"사용자ID","이름","주민번호","교육생연락처","교육유형","교육구분","기술인분류","직무분야","교육목적","등급","교육시작일","교육종료일", "과정명","수료번호","주문번호","업체명","업체주소","사업자등록번호","고용보험관리번호","업태","종목", @@ -1334,7 +1352,7 @@ namespace NP.BO.Controllers "ceoname","slevelName","uduty","mname","mphone","payamt","rbankamt","rbank","rbankaccnum","rbankuser","taxemail", "association","pcgname", "cgname", "studyplaceName","studytime","tyear"}, vm.Completions, - "수료관리", null, ",0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38"); + "수료관리", null, ",0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38",vm.excellog); } return View(vm); } diff --git a/BO/Views/cc/homesemployess.cshtml b/BO/Views/cc/homesemployess.cshtml index 5c3a2ac..96bb345 100644 --- a/BO/Views/cc/homesemployess.cshtml +++ b/BO/Views/cc/homesemployess.cshtml @@ -32,7 +32,7 @@ - @foreach (var item in Model.Boards2) + @foreach (var item in Model.Boards) { @item.rnorvt diff --git a/BO/Views/croom/completions.cshtml b/BO/Views/croom/completions.cshtml index e7e924b..e1bb210 100644 --- a/BO/Views/croom/completions.cshtml +++ b/BO/Views/croom/completions.cshtml @@ -101,8 +101,9 @@
+ @* 엑셀다운로드*@ + 엑셀다운로드 +
@Html.Partial("./Partial/pagerow", new ViewDataDictionary { { "tbodyid", "tbody1" }, { "searchmethod", "submit()" }, { "pagesize", Model.pagerowcount } })
@@ -397,15 +398,16 @@ + @Html.Partial("./Partial/AssignBox2", "bindAssign;고객사 검색;1") @Html.Partial("./Partial/CMScdBox2", "bindCMScd;교육일정선택;1") @section scriptsHeader{ @Html.Partial("./Partial/ScriptDate") - @Html.Partial("./Partial/ScriptPost") + @Html.Partial("./Partial/ScriptPost") + @Html.Partial("./Partial/ExcelCommentBox") } @section scripts{ - + + } diff --git a/BO/Views/croom/tax.cshtml b/BO/Views/croom/tax.cshtml index b59b829..ab1b344 100644 --- a/BO/Views/croom/tax.cshtml +++ b/BO/Views/croom/tax.cshtml @@ -62,7 +62,7 @@
@Html.Partial("./Partial/pagerow", new ViewDataDictionary { { "tbodyid", "tbody1" }, { "searchmethod", "submit()" }, { "pagesize", Model.pagerowcount } }) @*엑셀다운로드*@ - 엑셀다운로드 + 엑셀다운로드 일괄발행취소 일괄확인 일괄확인취소 @@ -166,15 +166,25 @@ function callexcel() { $("#stringval11").val("") if ($("#tbody1 tr td input.autocheck:checked").length < 1) { + msg("엑셀 다운로드 할 건이 선택되지 않았습니다."); - } else { + } + else { + var taxnos = ""; + $.each($("#tbody1 tr td input.autocheck:checked"), function (i, c) { + taxnos += "," + $(c).val(); + }); + $("#stringval11").val(taxnos.substr(1)); + callComment('mform', '/croom/tax', 'tbody1', '계산서요청') + } + @* else { var taxnos = ""; $.each($("#tbody1 tr td input.autocheck:checked"), function (i, c) { taxnos += "," + $(c).val(); }); $("#stringval11").val(taxnos.substr(1)); exceldown('mform', '/croom/tax', 'tbody1', '계산서요청'); - } + }*@ } function taxcheck() { if ($("#tbody1 tr td input.autocheck:checked").length < 1) { diff --git a/BO/Web.config b/BO/Web.config deleted file mode 100644 index b97a6fc..0000000 --- a/BO/Web.config +++ /dev/null @@ -1,425 +0,0 @@ - - - - - -
- -
- - -
-
-
-
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Base/Controller/FOCommon.cs b/Base/Controller/FOCommon.cs index 22dc9aa..468e9d6 100644 --- a/Base/Controller/FOCommon.cs +++ b/Base/Controller/FOCommon.cs @@ -558,6 +558,7 @@ namespace NP.Base.Controllers { int rst = 0; + // 갯수를 가져오기 if (edu == "30" && cgcode == "105") // 최초교육 , 105 { rst = 0; // 신청가능 @@ -591,23 +592,23 @@ where t1.status = 1 and t4.pstatus= 1 if ((edu == "31" || edu == "35") && (grade == "38" || grade == "39")) // 계속교육, 승급교육 && 고급, 특급 { - var lectCount = Dao.Get("lect.count.user2", new Hashtable() { { "userno", userno }, { "cgcode", cgcode }, { "edu", edu }, { "grade", grade } }); + var lectCount = Dao.Get("lect.count.user2", new Hashtable() { { "userno", userno }, { "cgcode", cgcode }, { "edu", edu }, { "grade", grade }, { "cmno", cmno } }); rst = lectCount.First(); } else if((cgcode == "103" || cgcode == "104") && edu == "30") // 최초 { - var lectCount = Dao.Get("lect.count.user3", new Hashtable() { { "userno", userno } }); + var lectCount = Dao.Get("lect.count.user3", new Hashtable() { { "userno", userno }, { "cmno", cmno } }); rst = lectCount.First(); } else { - var lectCount = Dao.Get("lect.count.user", new Hashtable() { { "userno", userno }, { "cgcode", cgcode }, { "edu", edu } }); + var lectCount = Dao.Get("lect.count.user", new Hashtable() { { "userno", userno }, { "cgcode", cgcode }, { "edu", edu }, { "cmno", cmno } }); rst = lectCount.First(); } } - - result = rst == 0 ? 0 : 1;// + //-1= 짧은 문구 + result = rst == 0 ? 0 : ((rst > 0) ? 1 : -1); // } } diff --git a/Dao/MyBatis/Maps/Lect.xml b/Dao/MyBatis/Maps/Lect.xml index 6e26c9f..b16b2fd 100644 --- a/Dao/MyBatis/Maps/Lect.xml +++ b/Dao/MyBatis/Maps/Lect.xml @@ -1968,7 +1968,7 @@ order by e.qno,e.qino