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:
duandongmei
2018-07-27 15:29:27 +08:00
parent 42d0807146
commit 78e47ac599
4 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,6 +66,9 @@
<if test="isValid != null"> <if test="isValid != null">
AND r.is_valid=${isValid} AND r.is_valid=${isValid}
</if> </if>
<if test="isValid == null">
AND r.IS_VALID != -1
</if>
<if test="beginDate!=null and beginDate!='' and endDate!=null and endDate!=''"> <if test="beginDate!=null and beginDate!='' and endDate!=null and endDate!=''">
AND r.request_time between #{beginDate} and #{endDate} AND r.request_time between #{beginDate} and #{endDate}
</if> </if>

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

@@ -55,6 +55,9 @@
<if test="page !=null and page.where != null and page.where != ''"> <if test="page !=null and page.where != null and page.where != ''">
AND ${page.where} AND ${page.where}
</if> </if>
<if test="isValid == null">
AND r.IS_VALID != -1
</if>
<if test="taskName != null and taskName != ''"> <if test="taskName != null and taskName != ''">
AND r.task_name like AND r.task_name like
<if test="dbName == 'mysql'">CONCAT('%',#{taskName}, '%')</if> <if test="dbName == 'mysql'">CONCAT('%',#{taskName}, '%')</if>

1
src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp
View File

@@ -209,6 +209,7 @@
<c:when test="${taskInfo.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when> <c:when test="${taskInfo.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
<c:when test="${taskInfo.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when> <c:when test="${taskInfo.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
<c:when test="${taskInfo.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when> <c:when test="${taskInfo.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
<c:when test="${taskInfo.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
</c:choose> </c:choose>
</td> </td>
<td>${taskInfo.taskDesc }</td> <td>${taskInfo.taskDesc }</td>

1
src/main/webapp/WEB-INF/views/cfg/requestList.jsp
View File

@@ -228,6 +228,7 @@
<c:when test="${requestInfo.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when> <c:when test="${requestInfo.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
<c:when test="${requestInfo.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when> <c:when test="${requestInfo.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
<c:when test="${requestInfo.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when> <c:when test="${requestInfo.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
<c:when test="${requestInfo.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
</c:choose> </c:choose>
</td> </td>
<td>${requestInfo.requestTitle }</td> <td>${requestInfo.requestTitle }</td>