diff --git a/BO/Controllers/ccController.cs b/BO/Controllers/ccController.cs index 99f8a59..1ab3d47 100644 --- a/BO/Controllers/ccController.cs +++ b/BO/Controllers/ccController.cs @@ -44,14 +44,36 @@ namespace NP.BO.Controllers } return View(vm); } - /*덕이 엑셀*/ - public ActionResult exelboard() - { - return View(); - } - /*덕이 엑셀기록*/ - /*덕이...*/ + /// + /// 엑셀로그 + /// + /// + public ActionResult exelboard(VMCM vm) + { + if (!IsPost()) + { + vm.stringval5 = null; + vm.stringval6 = null; + } + + var ht = SetHash(vm, false); + if (string.IsNullOrEmpty(vm.stringval)) + { + vm.stringval = DateTime.Now.Year.ToString(); + } + + ht.Add("userid", vm.stringval4); + ht.Add("sstime", vm.stringval5); + ht.Add("setime", vm.stringval6); + ht.Add("isallday", "1"); + /*Excellog excellog = new Excellog();*/ + vm.excelloglook = Dao.Get("excellog.look", ht); + vm.pagetotalcount = GetCount(vm.excelloglook.FirstOrDefault()); + + return View(vm); + } + public ActionResult homesemployess(NP.Model.VMCC vm) { vm.Boards = InitM(); @@ -86,7 +108,6 @@ namespace NP.BO.Controllers } return View(vm); } - /*덕이꺼 끝*/ public ActionResult homes(NP.Model.VMCC vm) { vm.Boards = InitM(); @@ -98,9 +119,9 @@ namespace NP.BO.Controllers } else { - vm.Assigns = Dao.Get("users.assigns", new System.Collections.Hashtable() { {"issite", 1 } }); + vm.Assigns = Dao.Get("users.assigns", new System.Collections.Hashtable() { { "issite", 1 } }); } - vm.BMs = Dao.Get("board.bms", new System.Collections.Hashtable() { { "asno", vm.stringval }, { "bmposition", 0 }, {"isdefaults", string.IsNullOrEmpty(vm.stringval) ? "0,2" : "3" } }); + vm.BMs = Dao.Get("board.bms", new System.Collections.Hashtable() { { "asno", vm.stringval }, { "bmposition", 0 }, { "isdefaults", string.IsNullOrEmpty(vm.stringval) ? "0,2" : "3" } }); vm.BMOs = new List() { }; if (!string.IsNullOrEmpty(vm.stringval2)) { @@ -115,23 +136,19 @@ namespace NP.BO.Controllers if (vm.Boards.Count() > 0) { 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) + foreach (var d in vm.Boards) { d.ccount = vm.Boards2.Where(w => w.bno == d.bno).First().ccount; } } return View(vm); } - //이거 숙제라고 하셨사와용 - /*public ActionResult cmmasters(NP.Model.VMCM vm) - { - vm.viewidx = 1; - vm.viewname = "cmmasterreg"; - vm.listviewname = "cmmasters"; - return homes(vm); - }*/ - /*덕이 직원게시판 등록*/ + /// + /// 외부 직원게시판 + /// + /// + /// public ActionResult homer2(NP.Model.VMCC vm) { if (vm.Board != null && vm.Board.pbno != null) @@ -187,7 +204,7 @@ namespace NP.BO.Controllers vm.SCUserName = SUserInfo.UserName; return View(vm); } - /*덕이 직원게시판 등록 끝*/ + public ActionResult homer(NP.Model.VMCC vm) { if (vm.Board != null && vm.Board.pbno != null) @@ -264,7 +281,7 @@ namespace NP.BO.Controllers } else { - vm.CMs = Dao.Get("cm.cms", new System.Collections.Hashtable() { { "tmno", vm.stringval2 },{ "ismaster",0 } ,{ "orderby","d.cname,d.classno" } }); + vm.CMs = Dao.Get("cm.cms", new System.Collections.Hashtable() { { "tmno", vm.stringval2 }, { "ismaster", 0 }, { "orderby", "d.cname,d.classno" } }); } } vm.BMs = Dao.Get("board.bms", new System.Collections.Hashtable() { { "bmposition", 1 } }); @@ -349,8 +366,8 @@ namespace NP.BO.Controllers { vm.Terms = Dao.Get("cm.term.ys", new System.Collections.Hashtable() { }); vm.Assigns = Dao.Get("users.assigns", new System.Collections.Hashtable() { { "status", 1 } }); - vm.userauths = Dao.Get("sys.menu.auths", new System.Collections.Hashtable() { {"isall",1 } }); - vm.EmailSend = new EmailSend() { }; + vm.userauths = Dao.Get("sys.menu.auths", new System.Collections.Hashtable() { { "isall", 1 } }); + vm.EmailSend = new EmailSend() { }; return View(vm); } public ActionResult memos(NP.Model.VMCC vm) diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs index 7339f87..d7fc59b 100644 --- a/BO/Controllers/croomController.cs +++ b/BO/Controllers/croomController.cs @@ -179,11 +179,18 @@ namespace NP.BO.Controllers if (vm.isexceldown == 1) { vm.Lects = Dao.Get("lect.lects.att",ht); + + if (vm.excellog != null) + { + vm.excellog.userno = SUserInfo.UserNo; + vm.excellog.userip = GetUserIP(); + } + return ExportExcel( new String[] { "고객사", "이름","직위", "교육생ID", "이메일", "전화번호", "휴대폰번호", "신청일", "수강상태", "결제상태" , "교육일", "기술인구분","직무분야","교육목적","등급"}, new String[] { "asname", "username", "uduty", "userid", "email", "telno", "mobile", "cdtymd", "statusname", "pstatusname", "estartstring", "typemanname", "typejobname", "typeeduname", "typegradename" }, vm.Lects, - "신청자명단"); + "신청자명단", null, null, vm.excellog); } else @@ -721,6 +728,14 @@ namespace NP.BO.Controllers { ht.Add(vm.stringval6, vm.stringval7); } + + + if (vm.excellog != null) + { + vm.excellog.userno = SUserInfo.UserNo; + vm.excellog.userip = GetUserIP(); + } + switch (vm.tabidx) { case 0: @@ -744,7 +759,7 @@ namespace NP.BO.Controllers ,"payamt","isrebatename","rbankamt","rbank","rbankaccnum","rbankuser","taxemail","association" ,"pcgname","cgname","studyplacename","tyear", "iscompletename" }, vm.Lects, - "성적처리전체" + DateTime.Now.Year + DateTime.Now.Month + DateTime.Now.Day,null,",2,4"); + "성적처리전체" + DateTime.Now.Year + DateTime.Now.Month + DateTime.Now.Day,null,",2,4", vm.excellog); } vm.pagetotalcount = GetCount(vm.Lects.FirstOrDefault()); break; @@ -760,7 +775,7 @@ namespace NP.BO.Controllers new String[] { "No", "운영기수", "구분", "고객사", "교육장", "과정명", "시험명", "교육생", "ID", "핸드폰", "교육시작일", "교육종료일", "응시일자(제출일자)","경과시간", "IP", "응시상태", "총점", "수료여부" }, new String[] { "rno", "sseq", "isrebatename", "asname", "studyplacename", "cname", "exname", "username", "userid", "mobile", "leststr", "leestrExcel", "estarteend", "eseterm", "eip", "estatename", "tpoint", "iscompletename" }, vm.LectEXes, - "성적처리평가" + DateTime.Now.Year + DateTime.Now.Month + DateTime.Now.Day); + "성적처리평가" + DateTime.Now.Year + DateTime.Now.Month + DateTime.Now.Day, null, null, vm.excellog); } vm.pagetotalcount = GetCount(vm.LectEXes.FirstOrDefault()); } @@ -779,7 +794,7 @@ namespace NP.BO.Controllers new String[] { "No", "운영기수", "교육장", "과정명", "교육생", "ID", "핸드폰", "교육시작일", "교육종료일", "상태", "점수", "첨삭", "모사", "최근제출일(IP)", "최근평가일(IP)","수료여부" }, new String[] { "rno", "sseq", "studyplacename", "cname", "username", "userid", "mobile", "leststr", "leestrExcel", "sdstatename", "cpoint2", "feedbox", "copyratename", "submittimeip_format", "checktimeip_format", "iscompletename" }, vm.LectSDs, - "성적처리과제" + DateTime.Now.Year + DateTime.Now.Month + DateTime.Now.Day); + "성적처리과제" + DateTime.Now.Year + DateTime.Now.Month + DateTime.Now.Day, null, null, vm.excellog); } vm.pagetotalcount = GetCount(vm.LectSDs.FirstOrDefault()); } @@ -885,11 +900,18 @@ namespace NP.BO.Controllers payItem.studyplacename = vm.ComCodes.Where(w => w.cgroup.ToString() == "studyplace" && w.ccode == payItem.studyplace).FirstOrDefault()?.cname; payItem.cmistudyplacename = vm.ComCodes.Where(w => w.cgroup.ToString() == "studyplace" && w.ccode == payItem.cmistudyplace).FirstOrDefault()?.cname; } + + if(vm.excellog != null) + { + vm.excellog.userno = SUserInfo.UserNo; + vm.excellog.userip = GetUserIP(); + } + return ExportExcel( new String[] { "결제번호", "신청자이름", "ID","주민번호", "핸드폰", "회사명", "상품유형", "환급여부", "상품명", "결제금액", "결제방법", "입금금액", "환불금액", "신청일","신청일시", "입금일", "결제상태", "환급은행명", "환급계좌번호", "환급예금주", "교육장소", "강좌교육시작일", "강좌교육종료일", "신청교육장소", "교육종료일","기술인분류","교육구분","직무분야","등급","목적","수료여부" }, new String[] { "payno", "username", "userid"," userpno", "mobile", "asname", "cshapename", "isrebatename", "itemname", "payamt", "pptypename", "payamt", "refundamt", "cdtymd","cdtymdhms", "payymd", "pstatusname2", "rbank", "rbankaccnum", "tbankuser", "studyplacename", "sdateymd", "edateymd", "cmistudyplacename", "cmiestartymd","tmname","edukind","tjname","tgname","tename", "completename" }, vm.PayItems, - "ProductSales_" + DateTime.Now.Year + DateTime.Now.Month + DateTime.Now.Day); + "ProductSales_" + DateTime.Now.Year + DateTime.Now.Month + DateTime.Now.Day, null, null, vm.excellog); } return View(vm); } @@ -1013,7 +1035,7 @@ namespace NP.BO.Controllers new String[] {"payno","cdtymd", "payoktimeymd", "pstatusname2","username", "userid", "mobile", "itemname","eendymd", "asname", "ceoname","asaddr", "brno", "btype","bkind", "manname", "telno", "email", "isreceiptname", "taxamt", "taxdatereqymd","taxdateymd","realtaxdateymd","status"}, vm.PayTaxes, - "계산서요청"+DateTime.Now.ToString("yy.MM.dd"), null); + "계산서요청"+DateTime.Now.ToString("yy.MM.dd")); } vm.pagetotalcount = GetCount(vm.PayTaxes.FirstOrDefault()); diff --git a/BO/Controllers/dataController.cs b/BO/Controllers/dataController.cs index 2eb6d5d..d53cd72 100644 --- a/BO/Controllers/dataController.cs +++ b/BO/Controllers/dataController.cs @@ -455,11 +455,17 @@ namespace NP.BO.Controllers vm.CMs = new List() { }; if (vm.isexceldown == 1) { + if (vm.excellog != null) + { + vm.excellog.userno = SUserInfo.UserNo; + vm.excellog.userip = GetUserIP(); + } + return ExportExcel( new String[] { "No", "상위분류", "과정분류", "과정", "강좌(반)", "교육기간", "고객사", "교육생(ID)", "부서", "직급", "핸드폰", "이메일", "교육비", "학습진도율", "수료" }, new String[] { "rnorvt","pcgname","cgname","pcname","cnameclassno","sssename","asname","usernameid","depart","ccpositionname","mobile","email","payamt","attrate","iscompleteye" }, vm.CMLects, - vm.excelname); + vm.excelname, null, null, vm.excellog); } if (SUserInfo.IsSiteAdmin) { diff --git a/BO/Views/Account/Index.cshtml b/BO/Views/Account/Index.cshtml index f1b4f47..55c9a5d 100644 --- a/BO/Views/Account/Index.cshtml +++ b/BO/Views/Account/Index.cshtml @@ -30,7 +30,7 @@
@*YOU & PARTNERS - (Career Consulting Group)*@ + (Career Consulting Group)*@
YNP

@@ -52,12 +52,12 @@
Login to Your Account @*
- - 본 시스템은 구글 크롬에 최적화되어있습니다.
- - 타 브라우저로 접근 시 일부 기능이 제한될 수 있습니다.(크롬 다운로드) -
*@ + - 본 시스템은 구글 크롬에 최적화되어있습니다.
+ - 타 브라우저로 접근 시 일부 기능이 제한될 수 있습니다.(크롬 다운로드) + *@ - +
@@ -66,13 +66,13 @@

CTE framework base on Bootstrap
© @DateTime.Now.Year

@* - - - - - - *@ - + + + + *@ + +