gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复专项、来函查询界面仅按照终止时间检索错误

Browse Source
This commit is contained in:
leijun
2018-09-18 18:20:38 +08:00
parent 6ace42c208
commit c60e42d2ba
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml
View File

@@ -69,11 +69,17 @@
<if test="isValid == null"> <if test="isValid == null">
AND r.IS_VALID != -1 AND r.IS_VALID != -1
</if> </if>
<if test="beginDate!=null and beginDate!='' and endDate!=null and endDate!=''"> <if test="beginDate!=null and beginDate!=''">
AND r.request_time between #{beginDate} and #{endDate} AND r.request_time &gt;= #{beginDate}
</if> </if>
<if test="dobeginDate!=null and dobeginDate!='' and doendDate!=null and doendDate!=''"> <if test="endDate!=null and endDate!=''">
AND r.edit_time between #{dobeginDate} and #{doendDate} AND r.request_time &lt;= #{endDate}
</if>
<if test="dobeginDate!=null and dobeginDate!='' ">
AND r.edit_time &gt;= #{dobeginDate}
</if>
<if test="doendDate!=null and doendDate!=''">
AND r.edit_time &lt;= #{doendDate}
</if> </if>
<!-- 数据范围过滤 --> <!-- 数据范围过滤 -->
${sqlMap.dsf} ${sqlMap.dsf}

14
src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml
View File

@@ -65,11 +65,17 @@
<if test="isAudit != null"> <if test="isAudit != null">
AND r.is_audit=${isAudit} AND r.is_audit=${isAudit}
</if> </if>
<if test="beginDate!=null and beginDate!='' and endDate!=null and endDate!=''"> <if test="beginDate!=null and beginDate!='' ">
AND r.task_time between #{beginDate} and #{endDate} AND r.task_time &gt;= #{beginDate}
</if> </if>
<if test="dobeginDate!=null and dobeginDate!='' and doendDate!=null and doendDate!=''"> <if test="endDate!=null and endDate!=''">
AND r.edit_time between #{dobeginDate} and #{doendDate} AND r.task_time &lt;= #{endDate}
</if>
<if test="dobeginDate!=null and dobeginDate!='' ">
AND r.edit_time &gt;= #{dobeginDate}
</if>
<if test="doendDate!=null and doendDate!=''">
AND r.edit_time &lt;= #{doendDate}
</if> </if>
<!-- 数据范围过滤 --> <!-- 数据范围过滤 -->