培训后修改

src/main/java/com/ejweb/modules/report/entity/ReportEntity.java

@@ -62,7 +62,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
         this.reportCity = reportCity;
     }
 
-    @ExcelField(title="举报时间", align=2, sort=30)
+    @ExcelField(title="举报时间", align=2, sort=34)
     public String getReportTime() {
         return reportTime;
     }
@@ -113,7 +113,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
         this.reportSource = reportSource;
     }
 
-    @ExcelField(title="状态", align=2, sort=32)
+    @ExcelField(title="状态", align=2, sort=36)
     public String getReportStatus() {
         return reportStatus;
     }
@@ -138,6 +138,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
         this.supplementDepartment = supplementDepartment;
     }
 
+    @ExcelField(title="被举报人", align=2, sort=32)
     public String getSupplementInformant() {
         return supplementInformant;
     }
@@ -164,6 +165,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
         this.supplementType = supplementType;
     }
 
+    @ExcelField(title="区域", align=2, sort=30)
     public String getSupplementArea() {
         return supplementArea;
     }
@@ -188,7 +190,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
         this.supplementContent = supplementContent;
     }
 
-    @ExcelField(title="处理人", align=2, sort=36)
+    @ExcelField(title="处理人", align=2, sort=40)
     public String getDealPersonName() {
         return dealPersonName;
     }
@@ -197,7 +199,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
         this.dealPersonName = dealPersonName;
     }
 
-    @ExcelField(title="处理结论", align=2, sort=34)
+    @ExcelField(title="处理结论", align=2, sort=38)
     public String getDealResult() {
         return dealResult;
     }

src/main/java/com/ejweb/modules/report/service/ReportService.java

@@ -365,6 +365,32 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
                 dealResult = "--";
             }
             report.setDealResult(dealResult);
+            String supplementArea = report.getSupplementArea();
+            if (StringUtils.isNotBlank(supplementArea)){
+                if (supplementArea.equals("North China")){
+                    supplementArea = "华北区域公司";
+                }else if (supplementArea.equals("BeiJing")){
+                    supplementArea = "北京区域公司";
+                }else if (supplementArea.equals("ShangHai")){
+                    supplementArea = "上海区域公司";
+                }else if (supplementArea.equals("SouthWest")){
+                    supplementArea = "西南区域公司";
+                }else if (supplementArea.equals("SouthEast")){
+                    supplementArea = "东南区域公司";
+                }else if (supplementArea.equals("Central China")){
+                    supplementArea = "华中区域公司";
+                }else if (supplementArea.equals("GuangShen")){
+                    supplementArea = "广深区域公司";
+                }else if (supplementArea.equals("Hainan")){
+                    supplementArea = "海南区域公司";
+                }else if (supplementArea.equals("Group")){
+                    supplementArea = "集团本部";
+                }
+            }else{
+                supplementArea = "--";
+            }
+            report.setSupplementArea(supplementArea);
+            report.setSupplementInformant(report.getSupplementInformant() == null?"--":report.getSupplementInformant());
             report.setDealPersonName(report.getDealPersonName() == null?"--":report.getDealPersonName());
         }
         return reportList;

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

@@ -78,6 +78,12 @@ public class ReportToPdfController extends BaseController {
         PdfPCell reportProject1 = new PdfPCell(new Paragraph(reportEntity.getReportProject()==null?"":reportEntity.getReportProject(),textfont));
         reportProject1.setBorderWidth(0);
         table1.addCell(reportProject1);
+        PdfPCell supplementInformant = new PdfPCell(new Paragraph("被举报人：", textfont));
+        supplementInformant.setBorderWidth(0);
+        table1.addCell(supplementInformant);
+        PdfPCell supplementInformant1 = new PdfPCell(new Paragraph(reportEntity.getSupplementInformant() == null ? "" : reportEntity.getSupplementInformant(), textfont));
+        supplementInformant1.setBorderWidth(0);
+        table1.addCell(supplementInformant1);
         PdfPCell reportCity = new PdfPCell(new Paragraph("所在城市：",textfont));
         reportCity.setBorderWidth(0);
         table1.addCell(reportCity);
@@ -200,12 +206,6 @@ public class ReportToPdfController extends BaseController {
             PdfPCell supplementDepartment1 = new PdfPCell(new Paragraph(reportEntity.getSupplementDepartment() == null ? "" : reportEntity.getSupplementDepartment(), textfont));
             supplementDepartment1.setBorderWidth(0);
             table3.addCell(supplementDepartment1);
-            PdfPCell supplementInformant = new PdfPCell(new Paragraph("被举报人：", textfont));
-            supplementInformant.setBorderWidth(0);
-            table3.addCell(supplementInformant);
-            PdfPCell supplementInformant1 = new PdfPCell(new Paragraph(reportEntity.getSupplementInformant() == null ? "" : reportEntity.getSupplementInformant(), textfont));
-            supplementInformant1.setBorderWidth(0);
-            table3.addCell(supplementInformant1);
             PdfPCell supplementType = new PdfPCell(new Paragraph("业务类型：", textfont));
             supplementType.setBorderWidth(0);
             table3.addCell(supplementType);

src/main/resources/mappings/modules/report/ReportDao.xml

@@ -518,6 +518,8 @@
         r.report_status AS "reportStatus",
         r.supplement_title AS "supplementTitle",
         r.supplement_type AS "supplementType",
+        r.supplement_area AS "supplementArea",
+        r.supplement_informant AS "supplementInformant",
         r.deal_person_name AS "dealPersonName",
         r.deal_result AS "dealResult",
         (CASE WHEN r.exchange_type='2' THEN (SELECT name FROM ct_bbtc_sys_user WHERE id=r.exchange_after_user) ELSE '--' END) AS "exchangeAfterUser",

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

@@ -110,6 +110,8 @@
         <th>被举报项目</th>
         <th>举报人</th>
         <th>举报人电话</th>
+        <th>区域</th>
+        <th>被举报人</th>
         <th>举报时间</th>
         <th>状态</th>
         <th>处理结论</th>
@@ -137,6 +139,22 @@
                 <td>${report.reportProject}</td>
                 <td>${report.reportPersonName}</td>
                 <td>${report.reportPersonTel}</td>
+                <td>
+                    <c:if test="${report.supplementArea eq 'North China'}">华北区域公司</c:if>
+                    <c:if test="${report.supplementArea eq 'BeiJing'}">北京区域公司</c:if>
+                    <c:if test="${report.supplementArea eq 'ShangHai'}">上海区域公司</c:if>
+                    <c:if test="${report.supplementArea eq 'SouthWest'}">西南区域公司</c:if>
+                    <c:if test="${report.supplementArea eq 'SouthEast'}">东南区域公司</c:if>
+                    <c:if test="${report.supplementArea eq 'Central China'}">华中区域公司</c:if>
+                    <c:if test="${report.supplementArea eq 'GuangShen'}">广深区域公司</c:if>
+                    <c:if test="${report.supplementArea eq 'Hainan'}">海南区域公司</c:if>
+                    <c:if test="${report.supplementArea eq 'Group'}">集团本部</c:if>
+                    <c:if test="${report.supplementArea eq null}">--</c:if>
+                </td>
+                <td>
+                    <c:if test="${report.supplementInformant eq null}">--</c:if>
+                    <c:if test="${report.supplementInformant ne null}">${report.supplementInformant}</c:if>
+                </td>
                 <td>${report.reportTime}</td>
                 <td>
                     <c:if test="${report.reportStatus eq '0'}">未处理</c:if>

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

@@ -110,6 +110,12 @@
         </div>
     </div>
     <div class="control-group">
+        <label class="control-label">被举报人:</label>
+        <div class="controls">
+            <form:input path="supplementInformant" 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="reportTime" htmlEscape="false" maxlength="200" class="input-xlarge required"/>
@@ -182,12 +188,6 @@
         </div>
     </div>
     <div class="control-group">
-        <label class="control-label">被举报人:</label>
-        <div class="controls">
-            <form:input path="supplementInformant" htmlEscape="false" maxlength="200" class="input-xlarge required"/>
-        </div>
-    </div>
-    <div class="control-group">
         <label class="control-label">业务类型:</label>
         <div class="controls">
             <form:input id="supplementType" path="supplementType" htmlEscape="false" maxlength="200" class="input-xlarge required"/>

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

@@ -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 '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 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>
     <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}"/>
@@ -175,8 +175,8 @@
                     <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 '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

@@ -62,6 +62,7 @@
                 //path += "<br/><br/><br/>%0D%0A${userName}";
                 path += "</p>举报内容</br>";
                 path += "被举报项目:${report.reportProject}</br>";
+                path += "被举报人:${report.supplementInformant}</br>";
                 path += "举报时间:${report.reportTime}</br>";
                 path += "所在城市:${report.reportCity}</br>";
                 path += "内容:${report.reportContent}</br>";
@@ -101,7 +102,6 @@
                     path += "标题:${report.supplementTitle}</br>";
                     path += "被举报公司:${report.supplementCompany}</br>";
                     path += "被举报部门:${report.supplementDepartment}</br>";
-                    path += "被举报人:${report.supplementInformant}</br>";
                     var supplementType = "${report.supplementType}";
                     if (supplementType == "1"){
                         supplementType = "营销";
@@ -220,13 +220,6 @@
             </div>
         </div>
         <div class="control-group">
-            <label class="control-label">被举报人:</label>
-            <div class="controls">
-                <form:input id="supplementInformant" path="supplementInformant" 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 class="controls">
                 <form:input path="supplementTitle" htmlEscape="false" maxlength="200" class="input-xlarge required"/>

src/main/webapp/WEB-INF/views/modules/workbench/workbench.jsp

@@ -212,7 +212,7 @@
                             data: [
                                 ['无效', result.invalid],
                                 ['投诉', result.complainNum],
-                                ['属实', result.verified],
+                                ['举报', result.verified],
                             ]
                         }]
                     });