来函信息页面 时间查询默认来函时间,修改sql ,修改成功信息提示
This commit is contained in:
@@ -59,7 +59,7 @@ public class RequestInfoController extends BaseController{
|
|||||||
if(requestInfo.getId()!=null){
|
if(requestInfo.getId()!=null){
|
||||||
// 保存用户信息
|
// 保存用户信息
|
||||||
requestInfoService.saveOrUpdate(requestInfo);
|
requestInfoService.saveOrUpdate(requestInfo);
|
||||||
addMessage(redirectAttributes, "保存success");
|
addMessage(redirectAttributes, "success");
|
||||||
}else{
|
}else{
|
||||||
if (!"true".equals(checkRequestNumber(requestInfo.getRequestNumber()))){
|
if (!"true".equals(checkRequestNumber(requestInfo.getRequestNumber()))){
|
||||||
addMessage(model, "error");
|
addMessage(model, "error");
|
||||||
|
|||||||
@@ -57,10 +57,10 @@
|
|||||||
<if test="isAudit != null">
|
<if test="isAudit != null">
|
||||||
AND r.is_audit=${isAudit}
|
AND r.is_audit=${isAudit}
|
||||||
</if>
|
</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}
|
AND r.request_time between #{beginDate} and #{endDate}
|
||||||
</if>
|
</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})
|
AND (r.create_time between #{beginDate} and #{endDate}) or (r.audit_time between #{beginDate} and #{endDate})
|
||||||
</if>
|
</if>
|
||||||
order by r.request_time desc
|
order by r.request_time desc
|
||||||
|
|||||||
@@ -47,7 +47,7 @@
|
|||||||
</select> <input id="intype">
|
</select> <input id="intype">
|
||||||
|
|
||||||
<form:select id="timeType" name="timeType" path="timeType">
|
<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="requestTime"><spring:message code="request_time"></spring:message></form:option>
|
||||||
<form:option value="createTime"><spring:message code="operate_time"></spring:message></form:option>
|
<form:option value="createTime"><spring:message code="operate_time"></spring:message></form:option>
|
||||||
</form:select>
|
</form:select>
|
||||||
@@ -67,7 +67,7 @@
|
|||||||
|
|
||||||
<!-- <div class="table-responsive"> -->
|
<!-- <div class="table-responsive"> -->
|
||||||
<sys:message content="${message}"/>
|
<sys:message content="${message}"/>
|
||||||
<table id="contentTable" class="table table-bordered">
|
<table id="contentTable" class="table table-striped table-bordered table-condensed">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th><spring:message code="seq"></spring:message></th>
|
<th><spring:message code="seq"></spring:message></th>
|
||||||
@@ -117,12 +117,12 @@
|
|||||||
<!-- 审核未通过可修改 -->
|
<!-- 审核未通过可修改 -->
|
||||||
<c:choose>
|
<c:choose>
|
||||||
<c:when test="${requestInfo.isAudit eq '1'}">
|
<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:when>
|
||||||
<c:otherwise>
|
<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="javascript:void(0);" onclick="return confirmx('requestExamine', ${requestInfo.id})"><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="javascript:void(0);" onclick="return confirmx('form', ${requestInfo.id})"><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('delete', ${requestInfo.id})"><spring:message code="delete"></spring:message></a></li>
|
||||||
</c:otherwise>
|
</c:otherwise>
|
||||||
</c:choose>
|
</c:choose>
|
||||||
</ul>
|
</ul>
|
||||||
@@ -155,6 +155,25 @@
|
|||||||
$("#searchForm").submit();
|
$("#searchForm").submit();
|
||||||
return false;
|
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>
|
</script>
|
||||||
<style>
|
<style>
|
||||||
.input-medium {
|
.input-medium {
|
||||||
|
|||||||
Reference in New Issue
Block a user