diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs index 0d77afc..b3143a8 100644 --- a/BO/Controllers/croomController.cs +++ b/BO/Controllers/croomController.cs @@ -628,7 +628,6 @@ namespace NP.BO.Controllers } ht.Add("cdts", vm.stringval); ht.Add("cdte", string.IsNullOrEmpty(vm.stringval2) ? null : (vm.stringval2 + " 23:59:59")); - //ht.Add("pstatusin", vm.stringval3); //ht.Add("isrefundcall", string.IsNullOrEmpty(vm.stringval4) ? null : "1"); //ht.Add("rstatusin", vm.stringval5); @@ -666,11 +665,15 @@ namespace NP.BO.Controllers { ht.Add(vm.stringval15 ?? "usernameiditemname", vm.stringval16); } - ht.Add("isgroup", vm.stringval17); + ht.Add("isgroup", vm.stringval17); + ht.Add("estart", vm.stringval20); + ht.Add("eend", string.IsNullOrEmpty(vm.stringval21) ? null : (vm.stringval21 + " 23:59:59")); + ht.Add("studyplace", vm.stringval22); vm.PayItems = Dao.Get("cr.payitems", ht); vm.pagetotalcount = GetCount(vm.PayItems.FirstOrDefault()); vm.CGs = Dao.Get("cm.cgs", new System.Collections.Hashtable() { { "istop", 1 }, { "isdel", 0 }, { "isuse", 1 } }); - vm.stringval20 = DateTime.Now.AddDays(-6).ToString("yyyy-MM-dd") + ";" + + vm.ComCodes = GetComCodes("typeman,typeedu,typegrade,typejob,studyplace"); + vm.stringval19 = 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"); diff --git a/BO/Views/croom/pay.cshtml b/BO/Views/croom/pay.cshtml index 8d088b4..668c2e3 100644 --- a/BO/Views/croom/pay.cshtml +++ b/BO/Views/croom/pay.cshtml @@ -16,7 +16,7 @@ - 기간별조회 + 결제일조회 오늘 7일 @@ -26,6 +26,17 @@ 전체 @Html.Partial("./Partial/Date", string.IsNullOrEmpty(Model.stringval) ? (DateTime?)null : Convert.ToDateTime(Model.stringval), new ViewDataDictionary { { "name", "stringval" } }) ~ @Html.Partial("./Partial/Date", string.IsNullOrEmpty(Model.stringval2) ? (DateTime?)null : Convert.ToDateTime(Model.stringval2), new ViewDataDictionary { { "name", "stringval2" } }) + + + 교육일조회 + + 오늘 + 7일 + 15일 + 1개월 + 2개월 + @Html.Partial("./Partial/Date", string.IsNullOrEmpty(Model.stringval20) ? (DateTime?)null : Convert.ToDateTime(Model.stringval20), new ViewDataDictionary { { "name", "stringval20" } }) ~ @Html.Partial("./Partial/Date", string.IsNullOrEmpty(Model.stringval21) ? (DateTime?)null : Convert.ToDateTime(Model.stringval21), new ViewDataDictionary { { "name", "stringval21" } }) + 결제상태 @@ -81,6 +92,12 @@ @*  *@ + + 교육장소 + + @Html.Partial("./Partial/Select", Model.ComCodes.Where(w => w.cgroup == "studyplace"), new ViewDataDictionary { { "name", "stringval22" }, { "selected", Model.stringval22 }, { "style", "width: 100%" }, { "df", ":교육장소" } }) + + 검색어 @@ -220,7 +237,7 @@ @section scripts{