页面修改

src/main/java/com/ejweb/modules/report/web/ReportController.java

@@ -125,17 +125,25 @@ public class ReportController extends BaseController {
      */
     @RequestMapping(value = "view")
     public String view(ReportEntity reportEntity, Model model, RedirectAttributes redirectAttributes) {
+        //获取举报提交文件列表
         ReportAttachmentEntity reportAttachment = new ReportAttachmentEntity();
         reportAttachment.setReportId(reportEntity.getId());
         reportAttachment.setAttachmentType("0");
         List<ReportAttachmentEntity> reportAttachmentList = reportService.getAttachmentInfo(reportAttachment);
+        //获取补充提交文件列表
         ReportAttachmentEntity supplementAttachment = new ReportAttachmentEntity();
         supplementAttachment.setReportId(reportEntity.getId());
         supplementAttachment.setAttachmentType("1");
         List<ReportAttachmentEntity> supplementAttachmentList = reportService.getAttachmentInfo(supplementAttachment);
+        //获取处理成果文件列表
+        ReportAttachmentEntity dealAttachment = new ReportAttachmentEntity();
+        dealAttachment.setReportId(reportEntity.getId());
+        dealAttachment.setAttachmentType("2");
+        List<ReportAttachmentEntity> dealAttachmentList = reportService.getAttachmentInfo(dealAttachment);
         model.addAttribute("report", reportEntity);
         model.addAttribute("reportAttachmentList", reportAttachmentList);
         model.addAttribute("supplementAttachmentList", supplementAttachmentList);
+        model.addAttribute("dealAttachmentList", dealAttachmentList);
         return "modules/report/reportDetail";
     }
 

src/main/webapp/WEB-INF/views/modules/report/reportDetail.jsp

@@ -11,6 +11,56 @@
             $("#btnTrack").click(function () {
                 window.location.href = "${ctx}/report/track?id=${report.id}";
             });
+
+            var supplementType = "${report.supplementType}";
+            if (supplementType == "1"){
+                supplementType = "营销";
+            }else if (supplementType == "2"){
+                supplementType = "工程";
+            }else if (supplementType == "3"){
+                supplementType = "成本";
+            }else if (supplementType == "4"){
+                supplementType = "招采";
+            }else if (supplementType == "5"){
+                supplementType = "人力";
+            }else if (supplementType == "6"){
+                supplementType = "物业";
+            }else if (supplementType == "7"){
+                supplementType = "投诉";
+            }
+            $("#supplementType").val(supplementType);
+
+            var supplementArea = "${report.supplementArea}";
+            if (supplementArea == "North China"){
+                supplementArea = "华北区域公司";
+            }else if (supplementArea == "BeiJing"){
+                supplementArea = "北京区域公司";
+            }else if (supplementArea == "ShangHai"){
+                supplementArea = "上海区域公司";
+            }else if (supplementArea == "SouthWest"){
+                supplementArea = "西南区域公司";
+            }else if (supplementArea == "SouthEast"){
+                supplementArea = "东南区域公司";
+            }else if (supplementArea == "Central China"){
+                supplementArea = "华中区域公司";
+            }else if (supplementArea == "GuangShen"){
+                supplementArea = "广深区域公司";
+            }else if (supplementArea == "Hainan"){
+                supplementArea = "海南区域公司";
+            }else if (supplementArea == "Group"){
+                supplementArea = "集团本部";
+            }
+            $("#supplementArea").val(supplementArea);
+
+            var dealResult = "${report.dealResult}";
+            if (dealResult == "1"){
+                dealResult = "投诉";
+            }else if (dealResult == "2"){
+                dealResult = "举报无效";
+            }else if (dealResult == "3"){
+                dealResult = "举报属实";
+            }
+            $("#dealResult").val(dealResult);
         });
         var requestFlag = true;
         function openDownloadDialog(id){
@@ -111,6 +161,7 @@
                           htmlEscape="false" disabled="true"/>
         </div>
     </div>
+    <c:if test="${report.reportStatus ne '0'}">
     <span class="title">举报信息补充</span>
     <div class="control-group">
         <label class="control-label">标题:</label>
@@ -139,13 +190,13 @@
     <div class="control-group">
         <label class="control-label">业务类型:</label>
         <div class="controls">
-            <form:input path="supplementType" htmlEscape="false" maxlength="200" class="input-xlarge required"/>
+            <form:input id="supplementType" path="supplementType" htmlEscape="false" maxlength="200" class="input-xlarge required"/>
         </div>
     </div>
     <div class="control-group">
         <label class="control-label">被举报区域:</label>
         <div class="controls">
-            <form:input path="supplementArea" htmlEscape="false" maxlength="200" class="input-xlarge required"/>
+            <form:input id="supplementArea" path="supplementArea" htmlEscape="false" maxlength="200" class="input-xlarge required"/>
         </div>
     </div>
     <div class="control-group">
@@ -168,6 +219,30 @@
             </c:forEach>
         </div>
     </div>
+    </c:if>
+    <c:if test="${report.reportStatus eq '2'}">
+        <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"/>
+            </div>
+        </div>
+        <div class="control-group">
+            <label class="control-label">处理成果文件:</label>
+            <div class="controls">
+                <c:forEach items="${dealAttachmentList}" var="dealAttachment" varStatus="vs">
+                    ${vs.count}.<a href="${dealAttachment.attachmentPath}" target="_blank">${dealAttachment.attachmentName}</a><br>
+                </c:forEach>
+            </div>
+        </div>
+        <div class="control-group">
+            <label class="control-label">处理结论:</label>
+            <div class="controls">
+                <form:input id="dealResult" path="dealResult" htmlEscape="false" maxlength="200" class="input-xlarge required"/>
+            </div>
+        </div>
+    </c:if>
     <li class="btns">
         <label style="width:auto;">
             <c:if test="${report.reportStatus != '2'}"><input id="btnTrack" class="btn btn-primary" type="button" value="跟踪"/>&nbsp;&nbsp;</c:if>

src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp

@@ -144,15 +144,10 @@
         <div class="control-group">
             <label class="control-label">被举报区域:</label>
             <div class="controls">
-                <form:radiobutton path="supplementArea" value="North China" checked="true"/>华北区域公司
-                <form:radiobutton path="supplementArea" value="BeiJing"/>北京区域公司
-                <form:radiobutton path="supplementArea" value="ShangHai"/>上海区域公司
-                <form:radiobutton path="supplementArea" value="SouthWest"/>西南区域公司
-                <form:radiobutton path="supplementArea" value="SouthEast"/>东南区域公司
-                <form:radiobutton path="supplementArea" value="Central China"/>华中区域公司
-                <form:radiobutton path="supplementArea" value="GuangShen"/>广深区域公司
-                <form:radiobutton path="supplementArea" value="Hainan"/>海南区域公司
-                <form:radiobutton path="supplementArea" value="Group"/>集团本部
+                <form:select id="supplementType" path="supplementArea" class="input-small required">
+                    <form:option value=" ">请选择</form:option>
+                    <form:options  items="${fns:getDictList('supplement_area')}" itemLabel="label" itemValue="value"
+                                   htmlEscape="false"/></form:select>
                 <span class="help-inline"><font color="red">*</font> </span>
             </div>
         </div>