KimHanJin
/
YNICTE
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

This commit is contained in:
kdh0120 2020-11-26 06:21:43 +00:00
parent a68a646bb1
commit f790176fd4
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BO/Controllers/croomController.cs
View File

@ -807,10 +807,10 @@ namespace NP.BO.Controllers
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);
ht.Add("isrebate", string.IsNullOrEmpty(vm.stringval4) ? null : "1"); ht.Add("isrebates", vm.stringval4);
if (!string.IsNullOrEmpty(vm.stringval16)) if (!string.IsNullOrEmpty(vm.stringval6))
{ {
ht.Add(vm.stringval15 ?? "usernameiditemname", vm.stringval16); ht.Add(vm.stringval5 ?? "usernameiditemname", vm.stringval6);
} }
vm.stringval20 = DateTime.Now.AddDays(-6).ToString("yyyy-MM-dd") + ";" + vm.stringval20 = DateTime.Now.AddDays(-6).ToString("yyyy-MM-dd") + ";" +
DateTime.Now.AddDays(-14).ToString("yyyy-MM-dd") + ";" + DateTime.Now.AddDays(-14).ToString("yyyy-MM-dd") + ";" +

8
Dao/MyBatis/Maps/Lect.xml
View File

@ -1376,10 +1376,10 @@
<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="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="isrebates">and ifnull(a.isrebate,0) in ($isrebates$)</isNotNull>
<isNotNull property="username"> u.username like concat('%',#username#,'%')</isNotNull> <isNotNull property="username">and u.username like concat('%',#username#,'%')</isNotNull>
<isNotNull property="userid"> u.userid like concat('%',#userid#,'%')</isNotNull> <isNotNull property="userid">and u.userid like concat('%',#userid#,'%')</isNotNull>
<isNotNull property="cname"> b.cname like concat('%',#cname#,'%')</isNotNull> <isNotNull property="itemname">and b.cname like concat('%',#itemname#,'%')</isNotNull>
<isNotNull property="usernameiditemname">and(u.username like concat('%',#usernameiditemname#,'%') or u.userid like concat('%',#usernameiditemname#,'%') or b.cname like concat('%',#usernameiditemname#,'%'))</isNotNull> <isNotNull property="usernameiditemname">and(u.username like concat('%',#usernameiditemname#,'%') or u.userid like concat('%',#usernameiditemname#,'%') or b.cname like concat('%',#usernameiditemname#,'%'))</isNotNull>
) a ) a
<include refid="sql.pagedynamic"></include> <include refid="sql.pagedynamic"></include>