diff --git a/BO/Controllers/ccController.cs b/BO/Controllers/ccController.cs index 832838c..ba14897 100644 --- a/BO/Controllers/ccController.cs +++ b/BO/Controllers/ccController.cs @@ -1,19 +1,27 @@ -using System; +using NP.Model; +using System; using System.Collections.Generic; using System.Linq; -using System.Web; using System.Web.Mvc; -using NP.Model; - namespace NP.BO.Controllers { public class ccController : BOBaseController { - private int jkBoardNo = 13; // // ST :21, LIVE : 13 - public ActionResult bms(NP.Model.VMCC vm) + // ST :21, LIVE : 13 + private int jkBoardNo = 13; + + /// + /// 커뮤니케이션 > 게시판설정 + /// + /// + /// + public ActionResult bms(VMCC vm) { - vm.BMs = InitM(); var ht = SetHash(vm); + vm.BMs = InitM(); + + var ht = SetHash(vm); + if ("3".Equals(vm.stringval)) { ht.Add("bmposition", 0); @@ -23,18 +31,22 @@ namespace NP.BO.Controllers { ht.Add("bmposition", vm.stringval); } + ht.Add("bmtype", vm.stringval2); ht.Add("disptype", vm.stringval3); vm.stringval4 = vm.stringval4 ?? "bmname"; ht.Add(vm.stringval4, vm.stringval5); vm.BMs = Dao.Get("board.bms", ht); vm.pagetotalcount = GetCount(vm.BMs.FirstOrDefault()); + return View(vm); } - public ActionResult bmr(NP.Model.VMCC vm) + + public ActionResult bmr(VMCC vm) { vm.BM = new BoardMaster() { }; vm.BMOs = new List() { }; + if (vm.intval > 0) { vm.BM = Dao.Get("board.bms", new System.Collections.Hashtable() { { "bmno", vm.intval } }).First(); @@ -43,6 +55,7 @@ namespace NP.BO.Controllers vm.BMOs = Dao.Get("board.bmos", vm.BM.bmno); } } + return View(vm); } @@ -67,9 +80,9 @@ namespace NP.BO.Controllers ht.Add("userid", vm.stringval4); ht.Add("sstime", vm.stringval5); ht.Add("setime", vm.stringval6); - ht.Add("isallday", "1"); - /*Excellog excellog = new Excellog();*/ + ht.Add("isallday", "1"); vm.excelloglook = Dao.Get("excellog.look", ht); + vm.pagetotalcount = GetCount(vm.excelloglook.FirstOrDefault()); return View(vm); @@ -106,9 +119,16 @@ namespace NP.BO.Controllers } return View(vm); } + + /// + /// 커뮤니케이션 > 홈페이지게시판 + /// + /// + /// public ActionResult homes(NP.Model.VMCC vm) { vm.Boards = InitM(); + var ht = SetHash(vm); if (SUserInfo.IsSiteAdmin) { @@ -119,21 +139,35 @@ namespace NP.BO.Controllers { 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.BMOs = new List() { }; + if (!string.IsNullOrEmpty(vm.stringval2)) { vm.BMOs = Dao.Get("board.bmos", GetInt(vm.stringval2)); } + ht.Add("asno", vm.stringval); ht.Add("bmno", vm.stringval2); ht.Add("opno", vm.stringval3); ht.Add("scc", vm.stringval4); ht.Add("bmposition", "0"); - vm.Boards = Dao.Get("board.bs", ht); + // stringval6 == "Y" => Home > 잔여 업무 요약 > 강의Q&A미답변 으로 접근일떄 + if (vm.stringval6 == "Y") + { + // 기존 쿼리로 조건절을 만들기엔 JOIN절의 의도를 파악하기가 어렵다. + vm.Boards = Dao.Get("board.bsnoReplies", ht); + } + else + { + 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.Boards.Select(s => s.bno)) } }); @@ -142,6 +176,7 @@ namespace NP.BO.Controllers d.ccount = vm.Boards2.Where(w => w.bno == d.bno).First().ccount; } } + return View(vm); } @@ -215,14 +250,17 @@ namespace NP.BO.Controllers { vm.Board = new Board() { isopen = 1 }; } + if (SUserInfo.IsSiteAdmin) { vm.IsSiteAdmin = SUserInfo.IsSiteAdmin; } + vm.BMs = new List() { }; vm.FileList = new List() { }; vm.BMOs = new List() { }; vm.BoardCMTs = new List() { }; + if (vm.longval > 0 && vm.Board.pbno == null) { vm.Board = Dao.Get("board.get", vm.longval).First(); @@ -260,10 +298,18 @@ namespace NP.BO.Controllers vm.SCUserName = SUserInfo.UserName; return View(vm); } - public ActionResult rooms(NP.Model.VMCC vm) + + /// + /// 커뮤니케이션 > 강의실게시판 + /// + /// + /// + public ActionResult rooms(VMCC vm) { vm.Boards = InitM(); + var ht = SetHash(vm); + if (SUserInfo.IsTeacher) { vm.Terms = Dao.Get("cm.myterm", SUserInfo.UserNo); @@ -272,7 +318,9 @@ namespace NP.BO.Controllers { vm.Terms = Dao.Get("cm.term.ys", new System.Collections.Hashtable() { }); } + vm.CMs = new List() { }; + if (!string.IsNullOrEmpty(vm.stringval2)) { if (SUserInfo.IsTeacher) @@ -284,18 +332,32 @@ namespace NP.BO.Controllers 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 } }); + ht.Add("tyear", !string.IsNullOrEmpty(vm.stringval2) ? null : vm.stringval); ht.Add("tmno", !string.IsNullOrEmpty(vm.stringval3) ? null : vm.stringval2); ht.Add("cmno", vm.stringval3); ht.Add("bmno", vm.stringval4); ht.Add("scc", vm.stringval5); + if (SUserInfo.IsTeacher) { ht.Add("teacherno", SUserInfo.UserNo); } - vm.Boards = Dao.Get("board.roombs", ht); + + // stringval6 == "Y" => Home > 잔여 업무 요약 > 강의Q&A미답변 으로 접근일떄 + if (vm.stringval6 == "Y") + { + vm.Boards = Dao.Get("board.roombsnoReplies", ht); + } + else + { + vm.Boards = Dao.Get("board.roombs", 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.Boards.Select(s => s.bno)) } }); @@ -304,8 +366,10 @@ namespace NP.BO.Controllers d.ccount = vm.Boards2.Where(w => w.bno == d.bno).First().ccount; } } + return View(vm); } + public ActionResult roomr(NP.Model.VMCC vm) { if (vm.Board != null && vm.Board.pbno != null) @@ -323,9 +387,9 @@ namespace NP.BO.Controllers else { vm.Terms = Dao.Get("cm.term.ys", new System.Collections.Hashtable() { }); - } - //vm.BMs = Dao.Get("board.bms", new System.Collections.Hashtable() { { "bmposition", 1 } }); + } } + vm.FileList = new List() { }; vm.BoardCMTs = new List() { }; if (vm.longval > 0 && vm.Board.pbno == null) @@ -346,22 +410,33 @@ namespace NP.BO.Controllers } vm.BoardCMTs = Dao.Get("board.boardcmts", vm.Board.bno); } + if (vm.Board.pbno != null) { vm.BoardP = Dao.Get("board.get", vm.Board.pbno.Value).First(); } vm.SCUserName = SUserInfo.UserName; + return View(vm); } + + /// + /// 커뮤니케이션 > 메일 + /// + /// + /// public ActionResult emails(NP.Model.VMCC vm) { vm.Emails = InitM(); vm.pagerowcount = 100; + var ht = SetHash(vm); vm.Emails = Dao.Get("common.emailsends", ht); vm.pagetotalcount = GetCount(vm.Emails.FirstOrDefault()); + return View(vm); } + public ActionResult emailr(NP.Model.VMCC vm) { vm.Terms = Dao.Get("cm.term.ys", new System.Collections.Hashtable() { }); @@ -370,6 +445,12 @@ namespace NP.BO.Controllers vm.EmailSend = new EmailSend() { }; return View(vm); } + + /// + /// 커뮤니케이션 > 쪽지 + /// + /// + /// public ActionResult memos(NP.Model.VMCC vm) { vm.Memos = InitM(); @@ -379,7 +460,8 @@ namespace NP.BO.Controllers vm.pagetotalcount = GetCount(vm.Memos.FirstOrDefault()); return View(vm); } - public ActionResult memosends(NP.Model.VMCC vm) + + public ActionResult memosends(VMCC vm) { vm.Memos = InitM(); var ht = SetHash(vm); @@ -394,6 +476,7 @@ namespace NP.BO.Controllers vm.pagetotalcount = GetCount(vm.Memos2.FirstOrDefault()); return View(vm); } + public ActionResult memosend(NP.Model.VMCC vm) { vm.Assigns = Dao.Get("users.assigns", new System.Collections.Hashtable() { { "issite", 1 } }); @@ -409,6 +492,7 @@ namespace NP.BO.Controllers vm.userauths = Dao.Get("sys.menu.auths", new System.Collections.Hashtable() { { "isall", 1 } }); return View(vm); } + public ActionResult memoview(NP.Model.VMCC vm) { ViewBag.PopupMenuName = "S".Equals(vm.sendorrcv) ? "보낸쪽지" : "받은쪽지"; @@ -420,7 +504,13 @@ namespace NP.BO.Controllers } return View(vm); } - public ActionResult talks(NP.Model.VMCC vm) + + /// + /// 커뮤니케이션 > 알림톡 + /// + /// + /// + public ActionResult talks(VMCC vm) { vm.Memos = InitM(); var ht = SetHash(vm); @@ -429,14 +519,16 @@ namespace NP.BO.Controllers vm.pagetotalcount = GetCount(vm.Memos.FirstOrDefault()); return View(vm); } + public ActionResult talkr(NP.Model.VMCC vm) { vm.Assigns = Dao.Get("users.assigns", new System.Collections.Hashtable() { { "issite", 1 } }); - vm.Terms = Dao.Get("cm.term.ys", new System.Collections.Hashtable() { }); - //ViewBag.PopupMenuName = "알림톡 발송"; + vm.Terms = Dao.Get("cm.term.ys", new System.Collections.Hashtable() { }); vm.Memo = new Memo() { }; vm.userauths = Dao.Get("sys.menu.auths", new System.Collections.Hashtable() { { "isall", 1 } }); + return View(vm); } + } -} +} \ No newline at end of file diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs index 76276e1..0eede6a 100644 --- a/BO/Controllers/croomController.cs +++ b/BO/Controllers/croomController.cs @@ -1,13 +1,10 @@ -using System; +using NP.Base.Popbill; +using NP.Model; +using System; using System.Collections.Generic; using System.Linq; using System.Net.Http; using System.Web.Mvc; -using NP.Model; -using NP.Base.Popbill; -using Popbill.Taxinvoice; -using System.Collections; -using Spring.Expressions; namespace NP.BO.Controllers { @@ -156,7 +153,8 @@ namespace NP.BO.Controllers if (vm.addstringval == "8") { ht.Add("statusin", "5,8,9"); - } else if (vm.addstringval == "3") + } + else if (vm.addstringval == "3") { ht.Add("statusin", "1,2,3,4"); } @@ -544,8 +542,8 @@ namespace NP.BO.Controllers if (vm.Lects.Any()) { // cshapename가 이미 설정되어 있다. cshapename2에 cshapename의 앞 3글자만 저장 - vm.Lects.ToList().ForEach(i => - { + vm.Lects.ToList().ForEach(i => + { i.cshapename2 = (!string.IsNullOrEmpty(i.cshapename) && i.cshapename.Length > 3) ? i.cshapename.Substring(0, 3) : i.cshapename; }); } @@ -813,7 +811,8 @@ namespace NP.BO.Controllers && String.IsNullOrEmpty(vm.stringval9) && String.IsNullOrEmpty(vm.stringval10) && String.IsNullOrEmpty(vm.stringval11)) { ht.Add("ustatus", 0); - } else + } + else { ht.Add("ustatus", 99); } @@ -845,7 +844,8 @@ namespace NP.BO.Controllers // pms6473 => 엑셀다운로드에서 수료번호의 "제" 와 "호" 글자를 제거해달라는 요청 if (vm.Lects.Any()) { - vm.Lects = vm.Lects.Select(x => { + vm.Lects = vm.Lects.Select(x => + { x.completeno = (x.completeno != null) ? x.completeno.Replace("제", "").Replace("호", "") : ""; return x; }).ToList(); @@ -866,14 +866,14 @@ namespace NP.BO.Controllers , "attrate", "ex1point", "sd0point", "tpointstr", "isoffabsstr", "rs0point" ,"asname","addr","brno","eino","btype","bkind","ceoname","slevelName","uduty","mname","mphone" ,"payamt","isrebatename","rbankamt","rbank","rbankaccnum","rbankuser","taxemail","association" - ,"pcgname","cgname","studyplacename","tyear", "iscompletename" + ,"pcgname","cgname","studyplacename","tyear", "iscompletename" } , vm.Lects , $"성적처리전체{DateTime.Now.Year}{DateTime.Now.Month}{DateTime.Now.Day}" , null , ",2,4" , vm.excellog); - } + } } else { @@ -953,8 +953,8 @@ namespace NP.BO.Controllers public ActionResult atts(VMLect vm) { vm.Lect = Dao.Get("lect.lects", new System.Collections.Hashtable() { { "lectno", vm.longval } }).First(); - vm.LectInningPages = Dao.Get("lect.lectinningpages", new System.Collections.Hashtable() { { "lectno", vm.Lect.lectno },{"isscd", 0} }); - + vm.LectInningPages = Dao.Get("lect.lectinningpages", new System.Collections.Hashtable() { { "lectno", vm.Lect.lectno }, { "isscd", 0 } }); + // [이슈_602 / 박상완] 활동이력 탭에서 '검색' 시 데이터 로드 할 수 있도록 변경 // 파라미터 userno 를 -1으로 변경 // [이슈 404 오류] 첫 페이지 조회시 쿼리문 조회 불필요 @@ -995,13 +995,13 @@ namespace NP.BO.Controllers String pstatusall = null; if (vm.stringval3 != null) { - pstatusall = " and ((p.pstatus in (" +vm.stringval3+") and (pr.rstatus is null or p.rstatus = 0))"; + pstatusall = " and ((p.pstatus in (" + vm.stringval3 + ") and (pr.rstatus is null or p.rstatus = 0))"; } if (vm.stringval4 != null) { pstatusall = pstatusall == null ? "and ((pr.rfdno is not null and pr.rstatus = 0)" : (pstatusall + " or (pr.rfdno is not null and pr.rstatus = 0)"); } - if ((vm.stringval5??"").Contains("1")) + if ((vm.stringval5 ?? "").Contains("1")) { pstatusall = pstatusall == null ? "and ((pi.rstatus=1 and p.payamt>p.refundamt)" : (pstatusall + " or (pi.rstatus=1 and p.payamt>p.refundamt)"); } @@ -1060,15 +1060,15 @@ namespace NP.BO.Controllers payItem.cmistudyplacename = vm.ComCodes.Where(w => w.cgroup.ToString() == "studyplace" && w.ccode == payItem.cmistudyplace).FirstOrDefault()?.cname; } - if(vm.excellog != null) + 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" }, + 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, null, null, vm.excellog); } @@ -1078,7 +1078,7 @@ namespace NP.BO.Controllers { if (!IsPost()) { - LogSet(new ActLog() { logtype = 60, logtarget = 41, logdata = "결제번호: "+vm.payno, uno = SUserInfo.UserNo, uip = GetUserIP() }); + LogSet(new ActLog() { logtype = 60, logtarget = 41, logdata = "결제번호: " + vm.payno, uno = SUserInfo.UserNo, uip = GetUserIP() }); } if (vm.isexamready == 1) { @@ -1089,7 +1089,7 @@ namespace NP.BO.Controllers else { vm.Pay = Dao.Get("cr.pay1", vm.payno).First(); - vm.PayItems = Dao.Get("cr.pay2", vm.payno); + vm.PayItems = Dao.Get("cr.pay2", vm.payno); vm.Lect = Dao.Get("lect.lects", new System.Collections.Hashtable() { { "payno", vm.payno } }).FirstOrDefault(); ViewBag.JobTypeItems = "typejob40,typejob41,typejob42,typejob43,typejob44,typejob45,typejob46,typejob47,typejob48,typejob49,typejob57"; vm.ComCodes = GetComCodes("typeman,typeedu,typegrade,typejob,studyplace," + ViewBag.JobTypeItems); @@ -1100,13 +1100,13 @@ namespace NP.BO.Controllers vm.Lect.typegradename = vm.ComCodes.Where(w => w.cgroup.ToString() == "typegrade" && w.ccode == vm.Lect.typegrade).FirstOrDefault()?.cname; vm.Lect.typejobitemname = vm.ComCodes.Where(w => w.ccode == vm.Lect.typejobitem).FirstOrDefault()?.cname; vm.Lect.typejobname = vm.ComCodes.Where(w => w.cgroup.ToString() == "typejob" && w.ccode == vm.Lect.typejob).FirstOrDefault()?.cname; - if(!string.IsNullOrEmpty(vm.Lect.studyplace)) vm.Lect.studyplacename = vm.ComCodes.Where(w => w.cgroup.ToString() == "studyplace" && w.ccode == int.Parse(vm.Lect.studyplace)).FirstOrDefault()?.cname; + if (!string.IsNullOrEmpty(vm.Lect.studyplace)) vm.Lect.studyplacename = vm.ComCodes.Where(w => w.cgroup.ToString() == "studyplace" && w.ccode == int.Parse(vm.Lect.studyplace)).FirstOrDefault()?.cname; ViewBag.TestCode = TestCode; vm.CM = Dao.Get("cm.cm", new System.Collections.Hashtable() { { "cmno", vm.Lect.cmno } }).First(); } return View(vm); } - + public ActionResult payrefund(VMPay vm) { vm.Pay = Dao.Get("cr.pay.forrfd", vm.payno).First(); @@ -1121,11 +1121,11 @@ namespace NP.BO.Controllers vm.PayRfds = Dao.Get("cr.payrfditems2", vm.rfdno); vm.FileList = new List() { }; vm.FileList2 = new List() { }; - if (vm.PayRfds != null && (vm.PayRfds.First().fgnor??0) > 0) + if (vm.PayRfds != null && (vm.PayRfds.First().fgnor ?? 0) > 0) { vm.FileList = GetFiles(vm.PayRfds.First().fgnor.Value); } - if (vm.PayRfds != null && (vm.PayRfds.First().fgnob??0) > 0) + if (vm.PayRfds != null && (vm.PayRfds.First().fgnob ?? 0) > 0) { vm.FileList2 = GetFiles(vm.PayRfds.First().fgnob.Value); } @@ -1138,18 +1138,27 @@ namespace NP.BO.Controllers vm.PayRfds = Dao.Get("cr.payrfditems2", vm.rfdno); return View(vm); } + + /// + /// 교육운영 > 계산서요청 + /// + /// + /// public ActionResult tax(VMCRoom vm) { var ht = SetHash(vm, false); - if(vm.isexceldown != 1) + + if (vm.isexceldown != 1) { vm.stringval11 = null; } + if (!IsPost()) { vm.stringval6 = DateTime.Now.ToString("yyyy-MM-01"); vm.stringval7 = Convert.ToDateTime(vm.stringval6).AddMonths(1).AddSeconds(-1).ToString("yyyy-MM-dd"); } + ht.Add("staxdatereq", vm.stringval6); ht.Add("etaxdatereq", string.IsNullOrEmpty(vm.stringval7) ? null : (vm.stringval7 + " 23:59:59")); ht.Add("cdts", vm.stringval); @@ -1161,11 +1170,11 @@ namespace NP.BO.Controllers ht.Add("csdate", vm.stringval13); ht.Add("cedate", string.IsNullOrEmpty(vm.stringval14) ? null : (vm.stringval14 + " 23:59:59")); ht.Add("isreceipt", vm.stringval15); + ht.Add("taxnos", vm.stringval11); - ht.Add("taxnos", vm.stringval11); if (!string.IsNullOrEmpty(vm.stringval3)) { - if(vm.stringval3 == "2") + if (vm.stringval3 == "2") { ht.Add("iscancel", 1); } @@ -1175,6 +1184,7 @@ namespace NP.BO.Controllers ht.Add("tstatus" + (vm.stringval3), 1); } } + if (!string.IsNullOrEmpty(vm.stringval5)) { if (!string.IsNullOrEmpty(vm.stringval4)) @@ -1186,7 +1196,9 @@ namespace NP.BO.Controllers ht.Add("nimp", vm.stringval5); } } + vm.PayTaxes = Dao.Get("cr.paytaxes", ht); + if (vm.isexceldown == 1) { if (vm.excellog != null) @@ -1198,25 +1210,35 @@ namespace NP.BO.Controllers return ExportExcel( new String[] {"결제번호","신청일","입금일","결제상태","이름","아이디","전화번호","강좌명","교육종료일","회사명","대표명","주소","사업자번호","업태","종목","담당자명","담당자연락처" ,"계산서수신이메일","청구영수","발행요청금액","발행요청일","실제날짜","발행한날","발행상태"}, - new String[] {"payno","cdtymd", "payoktimeymd", "pstatusname2","username", "userid", "mobile", "itemname","eendymd", "asname", "ceoname","asaddr", + 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, null, vm.excellog); + "계산서요청" + DateTime.Now.ToString("yy.MM.dd"), + null, + null, + vm.excellog); } + vm.pagetotalcount = GetCount(vm.PayTaxes.FirstOrDefault()); - + return View(vm); } + + /// + /// 교육운영 > 계산서요청 (상세) + /// + /// + /// public ActionResult taxdetail(VMCRoom vm) { - if (vm.longval < 1 && vm.intval < 0 ) + if (vm.longval < 1 && vm.intval < 0) { return Redirect("/croom/tax"); } if (vm.intval > 0) vm.PayTaxes = Dao.Get("cr.paytaxes", new System.Collections.Hashtable() { { "payno", vm.intval } }); else - vm.PayTaxes = Dao.Get("cr.paytaxes", new System.Collections.Hashtable() { { "taxno", vm.longval }}); + vm.PayTaxes = Dao.Get("cr.paytaxes", new System.Collections.Hashtable() { { "taxno", vm.longval } }); vm.FileList = new List() { }; if (vm.PayTaxes.First().fgno != null) { @@ -1229,13 +1251,13 @@ namespace NP.BO.Controllers vm.PayTaxItem = Dao.Get("cr.paytaxitem2", new System.Collections.Hashtable() { { "taxno", vm.longval } }); #region 세금계산서 Popbill 연동 - var payTax = vm.PayTaxes.First(); + var payTax = vm.PayTaxes.First(); if (payTax != null) - { + { var result = PopbillService.GetTaxinvoice(payTax); if (result.IsSuccess) { - ViewBag.Taxinvoice = result.Data; + ViewBag.Taxinvoice = result.Data; ViewBag.TaxinvoiceInfo = PopbillService.GetTaxinvoiceInfo(payTax).Data; string[] popbillManager = GetConfig("popbillManager").Split(';'); @@ -1249,8 +1271,8 @@ namespace NP.BO.Controllers if (ViewBag.TaxinvoiceInfo != null && payTax.statecode == 0) { #region 세금계산서 상태코드 업데이트 - payTax.uno = SUserInfo.UserNo; - payTax.uip = GetUserIP(); + payTax.uno = SUserInfo.UserNo; + payTax.uip = GetUserIP(); payTax.statecode = ViewBag.TaxinvoiceInfo.stateCode; Dao.Save("cr.paytax.save", payTax); #endregion @@ -1393,7 +1415,7 @@ namespace NP.BO.Controllers vm.typejobs = Dao.Get("cr.documnetspasts.typejob", ht).ToList(); vm.kinds = Dao.Get("cr.documnetspasts.kind", ht).ToList(); List words = new List(); - words.Add(new textvalue { text = "이름", value = "이름"}); + words.Add(new textvalue { text = "이름", value = "이름" }); words.Add(new textvalue { text = "주민등록번호", value = "주민등록번호" }); words.Add(new textvalue { text = "수료번호", value = "수료번호" }); words.Add(new textvalue { text = "업체명", value = "업체명" }); @@ -1409,9 +1431,9 @@ namespace NP.BO.Controllers ht.Add("typeedu", vm.stringval6); ht.Add("typegrade", vm.stringval7); ht.Add("typejob", vm.stringval8); - vm.stringval9 = vm.stringval9 == null ? vm.stringval == null ? "2019-01-01 00:00:00" : vm.stringval + "-01-01 00:00:00" : vm.stringval9; + vm.stringval9 = vm.stringval9 == null ? vm.stringval == null ? "2019-01-01 00:00:00" : vm.stringval + "-01-01 00:00:00" : vm.stringval9; vm.stringval10 = vm.stringval10 == null ? vm.stringval == null ? "2020-12-31 23:59:59" : vm.stringval + "-12-31 23:59:59" : vm.stringval10; - ht.Add("ssdate", vm.stringval9); + ht.Add("ssdate", vm.stringval9); ht.Add("sedate", vm.stringval10); switch (vm.stringval11) { @@ -1424,7 +1446,7 @@ 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) @@ -1443,13 +1465,13 @@ 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",vm.excellog); + "증빙서류출력(과거)", 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); } public ActionResult completions(VMCRoom vm) - { + { vm.Completions = InitM(); vm.CGs = Dao.Get("cm.cgs", new System.Collections.Hashtable() { { "isuse", 1 }, { "isdel", 0 } }); ViewBag.JobTypeItems = "typejob40,typejob41,typejob42,typejob43,typejob44,typejob45,typejob46,typejob47,typejob48,typejob49,typejob57"; @@ -1462,24 +1484,24 @@ namespace NP.BO.Controllers ht.Add("cshape", vm.stringval4); ht.Add("typeman", vm.stringval5); ht.Add("studyplace", vm.stringval6); - ht.Add("typejob", vm.stringval7); + ht.Add("typejob", vm.stringval7); // 교육종료일 ht.Add("edate1", vm.stringval8); ht.Add("edate2", vm.stringval9); ht.Add("typegrade", vm.stringval10); - ht.Add("typeedu", vm.stringval11); - + ht.Add("typeedu", vm.stringval11); + vm.Completions = Dao.Get("cr.completions", ht); vm.pagetotalcount = GetCount(vm.Completions.FirstOrDefault()); foreach (var completion in vm.Completions) { - completion.typeeduName = vm.ComCodes.Where(w=> w.ccode == completion.typeedu).FirstOrDefault()?.cname; + completion.typeeduName = vm.ComCodes.Where(w => w.ccode == completion.typeedu).FirstOrDefault()?.cname; completion.typegradeName = vm.ComCodes.Where(w => w.ccode == completion.typegrade).FirstOrDefault()?.cname; completion.typejobName = vm.ComCodes.Where(w => w.ccode == completion.typejob).FirstOrDefault()?.cname; completion.typemanName = vm.ComCodes.Where(w => w.ccode == completion.typeman).FirstOrDefault()?.cname; completion.studyplaceName = vm.ComCodes.Where(w => w.ccode == completion.studyplace).FirstOrDefault()?.cname; - if(completion.cshape == 2) + if (completion.cshape == 2) { completion.sdate = completion.payoktime; completion.edate = completion.estart; @@ -1510,7 +1532,8 @@ namespace NP.BO.Controllers if (vm.Completions.Any()) { - vm.Completions = vm.Completions.Select(x => { + vm.Completions = vm.Completions.Select(x => + { x.completeno = (x.completeno != null) ? x.completeno.Replace("제", "").Replace("호", "") : ""; return x; }).ToList(); @@ -1526,7 +1549,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",vm.excellog); + "수료관리", 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); } @@ -1536,4 +1559,4 @@ namespace NP.BO.Controllers return View(vm); } } -} +} \ No newline at end of file diff --git a/BO/Views/Home/Index.cshtml b/BO/Views/Home/Index.cshtml index fee84ba..0f3268b 100644 --- a/BO/Views/Home/Index.cshtml +++ b/BO/Views/Home/Index.cshtml @@ -1,4 +1,5 @@ @model NP.Model.VMHome +
잔여 업무 요약
+ +
운영중인 강의
@Html.Partial("./Partial/Text", Model.stringval, Helpers.DicText(new NP.Model.TextDic() { Name = "stringval", Value = Model.stringval, PH = "강좌명을 입력하시고 Enter키를 입력하세요.", CssClass = "ff" }))
@@ -44,29 +47,34 @@ -@foreach (var d in Model.CMs) -{ - - @d.tmname - @d.cgname - @d.cshapename - @d.cnameclassno - @d.sssename - 강좌관리 - 신청관리 - 성적관리 - -} + @foreach (var d in Model.CMs) + { + + @d.tmname + @d.cgname + @d.cshapename + @d.cnameclassno + @d.sssename + 강좌관리 + 신청관리 + 성적관리 + + }
+
@section styles{ } @section scriptsHeader{ @@ -74,18 +82,20 @@ } @section scripts{ -} +} \ No newline at end of file diff --git a/BO/Views/Shared/_Layout.cshtml b/BO/Views/Shared/_Layout.cshtml index 72f4ba9..bf195cd 100644 --- a/BO/Views/Shared/_Layout.cshtml +++ b/BO/Views/Shared/_Layout.cshtml @@ -18,7 +18,7 @@ @RenderSection("stylecdn", required: false) @Scripts.Render("~/bundles/jquery") @Scripts.Render("~/bundles/scripts") - + + + + + - select f.opname,a.bno,a.pbno,a.subject,a.cdt,b.username cnoname,a.rpcount,a.issecr,a.cno ,case when #getcontents# is null then '' else a.contents end contents ,b.usertype @@ -180,46 +221,94 @@ left outer join boardmasteropening f on f.opno=a.opno where a.pbno in ($pbnos$) and a.isopen=1 and a.isdel=0 - + + + + + + + + +