- 사용자가 혼합강좌 신청 시 선택한 교육일정의 '교육장소' 검색 기능 추가
- 강좌별 교육기간 검색 기능 추가 (기간별조회 아래에 동일 ui 추가. label : 교육기간조회)
This commit is contained in:
lch
parent
1b938a6d4b
commit
07cc4ca43d
|
|
@ -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<PayItem>("cr.payitems", ht);
|
||||
vm.pagetotalcount = GetCount(vm.PayItems.FirstOrDefault());
|
||||
vm.CGs = Dao.Get<CG>("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");
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
<col />
|
||||
</colgroup>
|
||||
<tr>
|
||||
<th>기간별조회</th>
|
||||
<th>결제일조회</th>
|
||||
<td class="text-left">
|
||||
<a href="#" style="padding: 6px 12px;" onclick="setdate(1)" class="btn btn-select btn-xxs">오늘</a>
|
||||
<a href="#" style="padding: 6px 12px;" onclick="setdate(7)" class="btn btn-select btn-xxs">7일</a>
|
||||
|
|
@ -26,6 +26,17 @@
|
|||
<a href="#" style="padding: 6px 12px;" onclick="setdate(0)" class="btn btn-select btn-xxs">전체</a>
|
||||
@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" } })
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>교육일조회</th>
|
||||
<td class="text-left">
|
||||
<a href="#" style="padding: 6px 12px;" onclick="setdate2(1)" class="btn btn-select btn-xxs">오늘</a>
|
||||
<a href="#" style="padding: 6px 12px;" onclick="setdate2(7)" class="btn btn-select btn-xxs">7일</a>
|
||||
<a href="#" style="padding: 6px 12px;" onclick="setdate2(15)" class="btn btn-select btn-xxs">15일</a>
|
||||
<a href="#" style="padding: 6px 12px;" onclick="setdate2(30)" class="btn btn-select btn-xxs">1개월</a>
|
||||
<a href="#" style="padding: 6px 12px;" onclick="setdate2(60)" class="btn btn-select btn-xxs">2개월</a>
|
||||
@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" } })
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>결제상태</th>
|
||||
|
|
@ -81,6 +92,12 @@
|
|||
@*<label><input type="checkbox" name="stringval17" value="1" @(Model.stringval17 != null ? "checked" : "") /> 단체결제</label> *@
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>교육장소</th>
|
||||
<td class="text-left">
|
||||
@Html.Partial("./Partial/Select", Model.ComCodes.Where(w => w.cgroup == "studyplace"), new ViewDataDictionary { { "name", "stringval22" }, { "selected", Model.stringval22 }, { "style", "width: 100%" }, { "df", ":교육장소" } })
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>검색어</th>
|
||||
<td class="text-left">
|
||||
|
|
@ -220,7 +237,7 @@
|
|||
@section scripts{
|
||||
<script>
|
||||
var now = '@DateTime.Now.ToString("yyyy-MM-dd")';
|
||||
var ds = '@(Model.stringval20)'.split(';');
|
||||
var ds = '@(Model.stringval19)'.split(';');
|
||||
$(document).ready(function () {
|
||||
$("#stringval16").on("keydown", function (e) {
|
||||
if (e.keyCode == 13) {
|
||||
|
|
@ -244,6 +261,22 @@
|
|||
}, 300);
|
||||
//submit();
|
||||
}
|
||||
function setdate2(idx) {
|
||||
switch (idx) {
|
||||
case 1: setv("stringval20", now); setv("stringval21", now); break;
|
||||
case 7: setv("stringval20", ds[0]); setv("stringval21", now); break;
|
||||
case 15: setv("stringval20", ds[1]); setv("stringval21", now); break;
|
||||
case 30: setv("stringval20", ds[2]); setv("stringval21", now); break;
|
||||
case 60: setv("stringval20", ds[3]); setv("stringval21", now); break;
|
||||
default:
|
||||
setv("stringval20", ""); setv("stringval21", ""); break;
|
||||
}
|
||||
$("#stringval20,#stringval21").css("background-color", "#25313e");
|
||||
setTimeout(function () {
|
||||
$("#stringval20,#stringval21").css("background-color", "#fafafa");
|
||||
}, 300);
|
||||
//submit();
|
||||
}
|
||||
function searchthis() {
|
||||
setv("stringval3", getcheckv("pstatus"));
|
||||
setv("stringval4", $("#chkisrefundcall").prop("checked") ? "1" : "");
|
||||
|
|
|
|||
|
|
@ -813,7 +813,7 @@
|
|||
<isNotNull property="cname">and (cm2.cname like concat('%',#cname#,'%'))</isNotNull>
|
||||
<isNotNull property="usernameiditemname">and (u.username=#usernameiditemname# or u.userid=#usernameiditemname# or cm.cname like concat('%',#usernameiditemname#,'%') or bk.bkname like concat('%',#usernameiditemname#,'%') or ex.exname like concat('%',#usernameiditemname#,'%') or cm2.cname like concat('%',#usernameiditemname#,'%'))</isNotNull>
|
||||
<isNotNull property="isgroup">and p.isgroup=1</isNotNull>
|
||||
<isNotNull property="isunpay">and p.isunpay=#isunpay#</isNotNull>
|
||||
<isNotNull property="isunpay">and p.isunpay=#isunpay#</isNotNull>
|
||||
group by p.payno
|
||||
union all
|
||||
select 1 isexamready,a.exno payno,a.userno pi1,a.userno pi2,1 ccount
|
||||
|
|
@ -853,7 +853,13 @@
|
|||
left outer join book bk on a.isexamready=0 and pi.ptype=2 and bk.bkno=pi.itemno
|
||||
left outer join exam ex on a.isexamready=0 and ex.exno=pi.itemno
|
||||
left outer join examuser exu on exu.exno=ex.exno and exu.userno=p.userno
|
||||
left outer join pplog ppl on ppl.pplno = p.pplno
|
||||
left outer join pplog ppl on ppl.pplno = p.pplno
|
||||
left outer join cminningscd scd on scd.cmisno = le.cmisno
|
||||
<dynamic prepend="where">
|
||||
<isNotNull property="estart" prepend="and">scd.estart >= #estart#</isNotNull>
|
||||
<isNotNull property="eend" prepend="and">scd.eend <= #eend#</isNotNull>
|
||||
<isNotNull property="studyplace" prepend="and">scd.studyplace=#studyplace#</isNotNull>
|
||||
</dynamic>
|
||||
) a
|
||||
<include refid="sql.pagedynamic"></include>
|
||||
order by a.rno
|
||||
|
|
|
|||
Loading…
Reference in New Issue