This commit is contained in:
parent
bcb2ca2a21
commit
a68a646bb1
|
|
@ -799,6 +799,11 @@ namespace NP.BO.Controllers
|
||||||
vm.stringval = DateTime.Now.ToString("yyyy-MM-01");
|
vm.stringval = DateTime.Now.ToString("yyyy-MM-01");
|
||||||
vm.stringval2 = Convert.ToDateTime(vm.stringval).AddMonths(1).AddSeconds(-1).ToString("yyyy-MM-dd");
|
vm.stringval2 = Convert.ToDateTime(vm.stringval).AddMonths(1).AddSeconds(-1).ToString("yyyy-MM-dd");
|
||||||
}
|
}
|
||||||
|
if (SUserInfo.IsSiteAdmin)
|
||||||
|
{
|
||||||
|
ht.Add("asno", SUserInfo.ASNo);
|
||||||
|
ViewBag.IsSiteAdmin = SUserInfo.IsSiteAdmin;
|
||||||
|
}
|
||||||
ht.Add("cdts", vm.stringval);
|
ht.Add("cdts", vm.stringval);
|
||||||
ht.Add("cdte", string.IsNullOrEmpty(vm.stringval2) ? null : (vm.stringval2 + " 23:59:59"));
|
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("asname", string.IsNullOrEmpty(vm.stringval3) ? null : vm.stringval3);
|
||||||
|
|
|
||||||
|
|
@ -1374,6 +1374,7 @@
|
||||||
<isNotNull property="cdts">and a.cdt >= #cdts#</isNotNull>
|
<isNotNull property="cdts">and a.cdt >= #cdts#</isNotNull>
|
||||||
<isNotNull property="cdte">and a.cdt <= #cdte#</isNotNull>
|
<isNotNull property="cdte">and a.cdt <= #cdte#</isNotNull>
|
||||||
<isNotNull property="asname">and ass.asname like concat('%',#asname#,'%')</isNotNull>
|
<isNotNull property="asname">and ass.asname like concat('%',#asname#,'%')</isNotNull>
|
||||||
|
<isNotNull property="asno">and ass.asno = #asno#</isNotNull>
|
||||||
<isNotNull property="userno">and a.userno = #userno#</isNotNull>
|
<isNotNull property="userno">and a.userno = #userno#</isNotNull>
|
||||||
<isNotNull property="isrebate"> a.isrebate = #isrebate#</isNotNull>
|
<isNotNull property="isrebate"> a.isrebate = #isrebate#</isNotNull>
|
||||||
<isNotNull property="username"> u.username like concat('%',#username#,'%')</isNotNull>
|
<isNotNull property="username"> u.username like concat('%',#username#,'%')</isNotNull>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue