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

This commit is contained in:
hyunho 2020-11-02 01:27:11 +00:00
parent 9275a164cc
commit 46e0e996d2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BO/Controllers/cmController.cs
View File

@ -65,7 +65,7 @@ namespace NP.BO.Controllers
} }
if (vm.viewidx == 0 && !IsPost() && string.IsNullOrEmpty(vm.stringval10)) if (vm.viewidx == 0 && !IsPost() && string.IsNullOrEmpty(vm.stringval10))
{ {
vm.stringval10 = vm.stringval10 ?? DateTime.Now.ToString("yyyy-MM-01"); vm.stringval10 = vm.stringval10 ?? DateTime.Now.AddMonths(-1).ToString("yyyy-MM-01");
} }
if (vm.viewidx == 0 && !IsPost() && string.IsNullOrEmpty(vm.stringval11)) if (vm.viewidx == 0 && !IsPost() && string.IsNullOrEmpty(vm.stringval11))
{ {

4
Dao/MyBatis/Maps/CM.xml
View File

@ -158,8 +158,8 @@
<isNotNull property="tseq" prepend="and">t.tseq=#tseq#</isNotNull> <isNotNull property="tseq" prepend="and">t.tseq=#tseq#</isNotNull>
<isNotNull property="tmno" prepend="and">a.tmno=#tmno#</isNotNull> <isNotNull property="tmno" prepend="and">a.tmno=#tmno#</isNotNull>
<isNotNull property="iscurrent" prepend="and">a.setime &gt; now()</isNotNull> <isNotNull property="iscurrent" prepend="and">a.setime &gt; now()</isNotNull>
<isNotNull property="sstime" prepend="and">t.sstime &gt;= #sstime#</isNotNull> <isNotNull property="sstime" prepend="and">a.sstime &gt;= #sstime#</isNotNull>
<isNotNull property="setime" prepend="and">t.setime &lt;= #setime#</isNotNull> <isNotNull property="setime" prepend="and">a.setime &lt;= #setime#</isNotNull>
) a ) a
<include refid="sql.pagedynamic"></include> <include refid="sql.pagedynamic"></include>
order by a.rno order by a.rno