diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs index 3cc9a3a..364a2eb 100644 --- a/BO/Controllers/croomController.cs +++ b/BO/Controllers/croomController.cs @@ -791,6 +791,28 @@ namespace NP.BO.Controllers public ActionResult Documents(VMCRoom vm) { + ViewBag.reporturl = GetConfig("reporturl"); + var ht = SetHash(vm, false); + if (!IsPost()) + { + vm.pagerowcount = 50; + vm.stringval = DateTime.Now.ToString("yyyy-MM-01"); + vm.stringval2 = Convert.ToDateTime(vm.stringval).AddMonths(1).AddSeconds(-1).ToString("yyyy-MM-dd"); + } + ht.Add("cdts", vm.stringval); + ht.Add("cdte", string.IsNullOrEmpty(vm.stringval2) ? null : (vm.stringval2 + " 23:59:59")); + ht.Add("asname", string.IsNullOrEmpty(vm.stringval3) ? null : vm.stringval3); + ht.Add("isrebate", string.IsNullOrEmpty(vm.stringval4) ? null : "1"); + if (!string.IsNullOrEmpty(vm.stringval16)) + { + ht.Add(vm.stringval15 ?? "usernameiditemname", vm.stringval16); + } + vm.stringval20 = DateTime.Now.AddDays(-6).ToString("yyyy-MM-dd") + ";" + + DateTime.Now.AddDays(-14).ToString("yyyy-MM-dd") + ";" + + DateTime.Now.AddMonths(-1).ToString("yyyy-MM-dd") + ";" + + DateTime.Now.AddMonths(-2).ToString("yyyy-MM-dd"); + vm.Lects = Dao.Get("lect.lecture.document", ht); + vm.pagetotalcount = GetCount(vm.Lects.FirstOrDefault()); return View(vm); } } diff --git a/BO/Web.config b/BO/Web.config index 660b234..9b55ca9 100644 --- a/BO/Web.config +++ b/BO/Web.config @@ -226,7 +226,7 @@ - + @@ -242,7 +242,7 @@ - + @@ -253,7 +253,7 @@ - + @@ -264,7 +264,7 @@ - + @@ -275,7 +275,7 @@ - + @@ -286,7 +286,7 @@ - + @@ -297,7 +297,7 @@ - + diff --git a/Dao/MyBatis/Maps/Lect.xml b/Dao/MyBatis/Maps/Lect.xml index 8219e35..ab6fc45 100644 --- a/Dao/MyBatis/Maps/Lect.xml +++ b/Dao/MyBatis/Maps/Lect.xml @@ -1344,20 +1344,34 @@ ,b.rstime,b.retime ,b.sstime,b.setime ,c.tyear,c.tseq - ,e.pstatus,e.payamt,e.ptype,e.ispg + ,u.username,u.userid + ,ass.asname + ,e.payno,e.pstatus,e.payamt,e.ptype,e.ispg ,f.estart,f.eend ,cc.cname studyplacename ,pt.taxno,pt.taxdate + ,a.cdt ,row_number() over(order by a.cdt desc) rno ,count(a.lectno) over() pagetotalcount from lect a inner join cm b on b.cmno = a.cmno inner join term c on c.tmno = b.tmno inner join pay e on e.payno = a.payno + left outer join users u on u.userno = a.userno + left outer join assign ass on ass.asno = u.asno left outer join cminningscd f on f.cmisno = a.cmisno left outer join comcode cc on cc.ccode = b.studyplace left outer join paytax pt on pt.payno = e.payno and ifnull(pt.iscancel,0) =0 - where a.userno = #userno# and a.status=1 and a.ischanged=0 + where a.status=1 and a.ischanged=0 + and a.cdt >= #cdts# + and a.cdt <= #cdte# + and ass.asname like concat('%',#asname#,'%') + and a.userno = #userno# + a.isrebate = #isrebate# + u.username like concat('%',#username#,'%') + u.userid like concat('%',#userid#,'%') + b.cname like concat('%',#cname#,'%') + and(u.username like concat('%',#usernameiditemname#,'%') or u.userid like concat('%',#usernameiditemname#,'%') or b.cname like concat('%',#usernameiditemname#,'%')) ) a diff --git a/FO/Spring/ControllersStaging.xml b/FO/Spring/ControllersStaging.xml index 33f3199..2affd8f 100644 --- a/FO/Spring/ControllersStaging.xml +++ b/FO/Spring/ControllersStaging.xml @@ -7,7 +7,7 @@ - + diff --git a/FO/Views/My/Index.cshtml b/FO/Views/My/Index.cshtml index 666239d..a652202 100644 --- a/FO/Views/My/Index.cshtml +++ b/FO/Views/My/Index.cshtml @@ -114,7 +114,7 @@ if (status1CNT < 3) {
  • - +
    @d.intval-@(d.intval2)기 @(d.intval3 == 0 ? "ON" : d.intval3 == 1 ? "OFF" : "혼합") diff --git a/FO/Views/My/Ready.cshtml b/FO/Views/My/Ready.cshtml index f92e1ee..385f84c 100644 --- a/FO/Views/My/Ready.cshtml +++ b/FO/Views/My/Ready.cshtml @@ -132,7 +132,7 @@ } } function gopay(payno) { - location.href = "/My/ReadyPay?payno=" + payno; + location.href = "/Course/ApplyPay?payno=" + payno; } } \ No newline at end of file diff --git a/FO/Web.config b/FO/Web.config index b652a79..7ecd1ff 100644 --- a/FO/Web.config +++ b/FO/Web.config @@ -291,7 +291,7 @@ - + diff --git a/Model/VMCRoom.cs b/Model/VMCRoom.cs index b29ef98..69b623b 100644 --- a/Model/VMCRoom.cs +++ b/Model/VMCRoom.cs @@ -57,5 +57,6 @@ namespace NP.Model public IList PayTaxes { get; set; } public IList PayTaxes2 { get; set; } public IList PayTaxItem { get; set; } + public IList Lects { get; set; } } }