Commit 2ce40995 by Java-张振楠

修改代码,以适配融创oracle数据库

parent cd4e47b8
...@@ -340,7 +340,7 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> { ...@@ -340,7 +340,7 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
if (reportStatus.equals("0")) { if (reportStatus.equals("0")) {
reportStatus = "未处理"; reportStatus = "未处理";
} else if (reportStatus.equals("1")) { } else if (reportStatus.equals("1")) {
reportStatus = "处理中"; reportStatus = "核查中";
} else if (reportStatus.equals("2")) { } else if (reportStatus.equals("2")) {
reportStatus = "已处理"; reportStatus = "已处理";
} }
......
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
AND r.report_time &gt;= #{reportTimeFrom} AND r.report_time &gt;= #{reportTimeFrom}
</if> </if>
<if test="reportTimeTo != null and reportTimeTo != ''"> <if test="reportTimeTo != null and reportTimeTo != ''">
AND r.report_time &lt;= #{reportTimeTo} AND r.report_time &lt;= #{reportTimeTo}|| ' 23:59:59'
</if> </if>
<if test="reportPersonName != null and reportPersonName != ''"> <if test="reportPersonName != null and reportPersonName != ''">
AND r.report_person_name LIKE AND r.report_person_name LIKE
......
...@@ -9,6 +9,10 @@ ...@@ -9,6 +9,10 @@
$(document).ready(function () { $(document).ready(function () {
$("#inputForm").validate({ $("#inputForm").validate({
submitHandler: function (form) { submitHandler: function (form) {
messages: {
reportProject: {maxlength: "最多输入{0}个字符"}
reportContent: {maxlength: "最多输入{0}个字符"}
},
if ($("#reportContent").val() == ""){ if ($("#reportContent").val() == ""){
top.$.jBox.tip('请填写内容', 'warning'); top.$.jBox.tip('请填写内容', 'warning');
}else { }else {
...@@ -52,7 +56,7 @@ ...@@ -52,7 +56,7 @@
<div class="control-group"> <div class="control-group">
<label class="control-label">被举报项目:</label> <label class="control-label">被举报项目:</label>
<div class="controls"> <div class="controls">
<form:input path="reportProject" htmlEscape="false" maxlength="200" class="input-xlarge required"/> <form:input path="reportProject" htmlEscape="false" maxlength="50" class="input-xlarge required"/>
<span class="help-inline"><font color="red">*</font> </span> <span class="help-inline"><font color="red">*</font> </span>
</div> </div>
</div> </div>
......
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
<li <c:if test="${flag eq null or flag eq ''}">class="active"</c:if>><a href="${ctx}/report/list">核查中举报列表</a></li> <li <c:if test="${flag eq null or flag eq ''}">class="active"</c:if>><a href="${ctx}/report/list">核查中举报列表</a></li>
<li <c:if test="${flag eq '0'}">class="active"</c:if>><a href="${ctx}/report/list?flag=0">未处理举报列表</a></li> <li <c:if test="${flag eq '0'}">class="active"</c:if>><a href="${ctx}/report/list?flag=0">未处理举报列表</a></li>
<li <c:if test="${flag eq '1'}">class="active"</c:if>><a href="${ctx}/report/list?flag=1">举报列表</a></li> <li <c:if test="${flag eq '1'}">class="active"</c:if>><a href="${ctx}/report/list?flag=1">举报列表</a></li>
<li style="float: right;"><input id="btnAdd" class="btn btn-primary" type="button" value="录入举报"/></li> <li style="float: right;"><input id="btnAdd" class="btn btn-primary" type="button" value="举报录入"/></li>
</ul> </ul>
<form:form id="searchForm" modelAttribute="report" action="${ctx}/report/list" method="post" class="breadcrumb form-search"> <form:form id="searchForm" modelAttribute="report" action="${ctx}/report/list" method="post" class="breadcrumb form-search">
<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/> <input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment