Skip to content

S
sunac_report
Commit 492f182b by xurui
Options

处理结论修改

parent b2559bc0
Showing with 96 additions and 16 deletions
src/main/java/com/ejweb/modules/report/service/ReportService.java
......@@ -181,11 +181,6 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
}
}
}
//更新举报状态
reportEntity.setReportStatus("1");
if (StringUtils.isNotBlank(reportEntity.getDealResult())){
reportEntity.setReportStatus("2");
}
reportDao.updateReportStatus(reportEntity);
}
......
src/main/java/com/ejweb/modules/report/web/ReportController.java
......@@ -204,9 +204,21 @@ public class ReportController extends BaseController {
*/
@RequestMapping(value = "addTrack")
public String addTrack(ReportEntity reportEntity,HttpServletRequest request, Model model, RedirectAttributes redirectAttributes) {
String ifDone = request.getParameter("ifDone"); // 是否完成
if (!beanValidator(model, reportEntity)) {
return form(reportEntity, model);
}
//更新举报状态
reportEntity.setReportStatus("1");
if (reportEntity.getDealResult().equals("1") || reportEntity.getDealResult().equals("2")){
reportEntity.setReportStatus("2");
}
if (reportEntity.getDealResult().equals("3")){
reportEntity.setReportStatus("1");
}
if ("ifDone".equals(ifDone)) {
reportEntity.setReportStatus("2");
}
reportService.saveTrack(reportEntity);
String exchangeAfterUser = request.getParameter("exchangeAfterUser");
if (StringUtils.isNotBlank(exchangeAfterUser) && StringUtils.isBlank(reportEntity.getDealResult())){
......
src/main/webapp/WEB-INF/views/modules/report/reportList.jsp
......@@ -171,14 +171,15 @@
<td>${report.reportTime}</td>
<td>
<c:if test="${report.reportStatus eq '0'}">未处理</c:if>
<c:if test="${report.reportStatus eq '1'}">核查中</c:if>
<c:if test="${report.reportStatus eq '1'}">跟踪中</c:if>
<c:if test="${report.reportStatus eq '2'}">已处理</c:if>
<c:if test="${report.reportStatus eq '3'}">受理中</c:if>
</td>
<td>
<c:if test="${report.dealResult eq null}">--</c:if>
<c:if test="${report.dealResult eq '1'}">投诉</c:if>
<c:if test="${report.dealResult eq '2'}">无效</c:if>
<c:if test="${report.dealResult eq '3'}">属实</c:if>
<c:if test="${report.dealResult eq '1'}">移交客诉</c:if>
<c:if test="${report.dealResult eq '2'}">举报无效</c:if>
<c:if test="${report.dealResult eq '3'}">举报受理</c:if>
</td>
<td><c:if test="${report.dealResult eq null}">--</c:if>
<c:if test="${report.dealResult ne null}">${report.dealPersonName}</c:if>
......
src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp
......@@ -158,7 +158,15 @@
window.location.href = path;
});
});
// 处理结果的隐藏和显示
// function doSome() {
// var dealResult = $("#dealResult option:selected").text();
// if(dealResult == "举报受理") {
// $("#dhide").attr("style","display:block");
// }else {
// $("#dhide").attr("style","display:none");
// }
// }
</script>
<style type="text/css">
.title{
......@@ -189,6 +197,12 @@
z-index:1002;
overflow: auto;
}
/*#isTrue {*/
/*padding-left:180px;*/
/*height:45px;*/
/*line-height:45px;*/
/*}*/
#chooseContent{
margin: 20px 20px 20px 20px;
}
......@@ -280,6 +294,60 @@
selectMultiple="true" maxWidth="100" maxHeight="100"/>
</div>
</div>
<%--<span class="title">信息分类</span>--%>
<%--<div class="control-group">--%>
<%--<c:if test="${report.dealResult ne '3'}">--%>
<%--<label class="control-label">处理结论:</label>--%>
<%--<div class="controls">--%>
<%--&lt;%&ndash; <form:select path="dealResult" class="input-small required" onchange="doSome()">&ndash;%&gt;--%>
<%--<form:select path="dealResult" class="input-small required">--%>
<%--<form:option value=" ">请选择</form:option>--%>
<%--<form:options items="${fns:getDictList('deal_result')}" itemLabel="label" itemValue="value" htmlEscape="false"/>--%>
<%--</form:select>--%>
<%--</div>--%>
<%--</c:if>--%>
<%--<c:if test="${report.dealResult eq '3'}">--%>
<%--<div class="control-group">--%>
<%--<label class="control-label">处理结论:</label>--%>
<%--<div class="controls">--%>
<%--&lt;%&ndash; <form:select path="dealResult" class="input-small required" onchange="doSome()">&ndash;%&gt;--%>
<%--<form:select path="dealResult" class="input-small required">--%>
<%--<form:option value=" ">请选择</form:option>--%>
<%--<form:option value="dealed">已处理</form:option>--%>
<%--<form:option value="dealing">受理中</form:option>--%>
<%--</form:select>--%>
<%--</div>--%>
<%--&lt;%&ndash;<div id="isTrue" class="isTrue">&ndash;%&gt;--%>
<%--&lt;%&ndash;<input path="true" type="radio" value=""/>属实&ndash;%&gt;--%>
<%--&lt;%&ndash;<input path="notTrue" type="radio" value=""/>不属实&ndash;%&gt;--%>
<%--&lt;%&ndash;</div>&ndash;%&gt;--%>
<%--</div>--%>
<%--</c:if>--%>
<%--&lt;%&ndash; <div id="dhide" style="display:none">&ndash;%&gt;--%>
<%--<span class="title">处理结果</span>--%>
<%--<div class="control-group">--%>
<%--<label class="control-label">处理人:</label>--%>
<%--<div class="controls">--%>
<%--<form:input path="dealPersonName" value="${currentUser}" disabled="true" htmlEscape="false" maxlength="200" class="input-xlarge required"/>--%>
<%--<span class="help-inline"><font color="red">*</font> </span>--%>
<%--</div>--%>
<%--</div>--%>
<%--<div class="control-group">--%>
<%--<label class="control-label">处理成果文件:</label>--%>
<%--<div id="attachment3" class="controls">--%>
<%--<c:if test="${dealAttachmentList ne null}">--%>
<%--<c:forEach items="${dealAttachmentList}" var="dealAttachment" varStatus="vs">--%>
<%--&nbsp;&nbsp;<a href="${dealAttachment.attachmentPath}" class="attachmentClass" target="_blank">${dealAttachment.attachmentName}</a><br>--%>
<%--</c:forEach>--%>
<%--</c:if>--%>
<%--<form:hidden id="dealFile" path="dealAttachment" htmlEscape="false"--%>
<%--maxlength="255" class="input-xlarge"/>--%>
<%--<sys:ckfinder input="dealFile" type="files" uploadPath="/file"--%>
<%--selectMultiple="true" maxWidth="100" maxHeight="100"/>--%>
<%--<label id="checkFile" class="error" style="display: none;">必填信息</label>--%>
<%--</div>--%>
<%--</div>--%>
<%--</div>--%>
<span class="title">处理结果</span>
<div class="control-group">
<label class="control-label">处理人:</label>
......@@ -302,16 +370,20 @@
selectMultiple="true" maxWidth="100" maxHeight="100"/>
<label id="checkFile" class="error" style="display: none;">必填信息</label>
</div>
</div>
<div class="control-group">
<br>
<label class="control-label">处理结论:</label>
<div class="controls">
<form:select path="dealResult" class="input-small required">
<form:option value=" ">请选择</form:option>
<form:options items="${fns:getDictList('deal_result')}" itemLabel="label" itemValue="value"
htmlEscape="false"/></form:select>
<form:option value=" ">请选择</form:option>
<form:options items="${fns:getDictList('deal_result')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
</form:select>
</div>
</div>
<br>
<c:if test="${report.dealResult eq '3'}">
<div class="controls">
<input type="checkbox" id="ifDone" name="ifDone" value="ifDone"/>是否完成
</div>
</c:if>
<span class="title">移交他人处理</span>
<div class="control-group">
<label class="control-label">移交:</label>
......
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