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

来函信息页面 时间查询默认来函时间，修改sql ,修改成功信息提示

Browse Source
This commit is contained in:
zhanghongqing
2018-02-26 16:33:50 +08:00
parent f83f0a7a16
commit 8198bca01a
3 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/web/controller/configuration/RequestInfoController.java
View File

@@ -59,7 +59,7 @@ public class RequestInfoController extends BaseController{
if(requestInfo.getId()!=null){
// 保存用户信息
requestInfoService.saveOrUpdate(requestInfo);
addMessage(redirectAttributes, "保存success");
addMessage(redirectAttributes, "success");
}else{
if (!"true".equals(checkRequestNumber(requestInfo.getRequestNumber()))){
addMessage(model, "error");

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

@@ -57,10 +57,10 @@
<if test="isAudit != null">
AND r.is_audit=${isAudit}
</if>
<if test=" timeType = 'requestTime' and beginDate!=null and beginDate!='' and endDate!=null and endDate!=''">
<if test=" timeType == 'requestTime' and beginDate!=null and beginDate!='' and endDate!=null and endDate!=''">
AND r.request_time between #{beginDate} and #{endDate}
</if>
<if test="timeType = 'createTime' and beginDate!=null and beginDate!='' and endDate!=null and endDate!=''">
<if test="timeType == 'createTime' and beginDate!=null and beginDate!='' and endDate!=null and endDate!=''">
AND (r.create_time between #{beginDate} and #{endDate}) or (r.audit_time between #{beginDate} and #{endDate})
</if>
order by r.request_time desc

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

@@ -47,7 +47,7 @@
</select> <input id="intype">
<form:select id="timeType" name="timeType" path="timeType">
<form:option value=""></form:option>
<%-- <form:option value=""></form:option> --%>
<form:option value="requestTime"><spring:message code="request_time"></spring:message></form:option>
<form:option value="createTime"><spring:message code="operate_time"></spring:message></form:option>
</form:select>
@@ -67,7 +67,7 @@
<!-- <div class="table-responsive"> -->
<sys:message content="${message}"/>
<table id="contentTable" class="table table-bordered">
<table id="contentTable" class="table table-striped table-bordered table-condensed">
<thead>
<tr>
<th><spring:message code="seq"></spring:message></th>
@@ -117,12 +117,12 @@
<!-- 审核未通过可修改 -->
<c:choose>
<c:when test="${requestInfo.isAudit eq '1'}">
<li><a href="${ctx}/cfg/request/requestCancelExamine?id=${requestInfo.id}" onclick="return confirm('sure？', this.href)"><spring:message code="cancel"></spring:message></a></li>
<li><a href="javascript:void(0);" onclick="return confirmx('requestCancelExamine', ${requestInfo.id})"><spring:message code="cancel"></spring:message></a></li>
</c:when>
<c:otherwise>
<li><a href="${ctx}/cfg/request/requestExamine?id=${requestInfo.id}" onclick="return confirm('sure？', this.href)"><spring:message code="approved"></spring:message></a></li>
<li><a href="${ctx}/cfg/request/form?id=${requestInfo.id}" onclick="javascript:return confirm('sure？', this.href)"><spring:message code="update_request"></spring:message></a></li>
<li><a href="${ctx}/cfg/request/delete?id=${requestInfo.id}" onclick="return confirm('sure？', this.href)"><spring:message code="delete"></spring:message></a></li>
<li><a href="javascript:void(0);" onclick="return confirmx('requestExamine', ${requestInfo.id})"><spring:message code="approved"></spring:message></a></li>
<li><a href="javascript:void(0);" onclick="return confirmx('form', ${requestInfo.id})"><spring:message code="update_request"></spring:message></a></li>
<li><a href="javascript:void(0);" onclick="return confirmx('delete', ${requestInfo.id})"><spring:message code="delete"></spring:message></a></li>
</c:otherwise>
</c:choose>
</ul>
@@ -155,6 +155,25 @@
$("#searchForm").submit();
return false;
}
//确认框
function confirmx(m,id){
var submit = function (v, h, f) {
if (v == 'ok'){
window.location='${ctx}/cfg/request/'+m+"?id="+id;
jBox.tip(v, 'info');
}
else if (v == 'cancel')
jBox.tip(v, 'info');
return true; //close
};
top.$.jBox.confirm("确定吗？", "提示", submit);
top.$('.jbox-button-panel').css('height','auto');
top.$('.jbox-title-panel').css('height','32px');
top.$('.jbox-content').css('font-size','16px');
}
</script>
<style>
.input-medium {