各种改

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

@@ -262,12 +262,12 @@ public class ReportToPdfController extends BaseController {
             PdfPCell supplementArea1 = new PdfPCell(new Paragraph(supplement_area, textfont));
             supplementArea1.setBorderWidth(0);
             table3.addCell(supplementArea1);
-            PdfPCell supplementProject = new PdfPCell(new Paragraph("被举报项目：", textfont));
-            supplementProject.setBorderWidth(0);
-            table3.addCell(supplementProject);
-            PdfPCell supplementProject1 = new PdfPCell(new Paragraph(reportEntity.getSupplementProject() == null ? "" : reportEntity.getSupplementProject(), textfont));
-            supplementProject1.setBorderWidth(0);
-            table3.addCell(supplementProject1);
+//            PdfPCell supplementProject = new PdfPCell(new Paragraph("被举报项目：", textfont));
+//            supplementProject.setBorderWidth(0);
+//            table3.addCell(supplementProject);
+//            PdfPCell supplementProject1 = new PdfPCell(new Paragraph(reportEntity.getSupplementProject() == null ? "" : reportEntity.getSupplementProject(), textfont));
+//            supplementProject1.setBorderWidth(0);
+//            table3.addCell(supplementProject1);
             PdfPCell supplementContent = new PdfPCell(new Paragraph("内容：", textfont));
             supplementContent.setBorderWidth(0);
             table3.addCell(supplementContent);

src/main/resources/mappings/modules/front/report/FrontReportDao.xml

@@ -41,6 +41,7 @@
             report_person_email,
             report_source,
             report_status,
+            supplement_informant,
             exchange_before_user,
             exchange_after_user,
             create_by,
@@ -58,6 +59,7 @@
             #{reportPersonEmail},
             #{reportSource},
             #{reportStatus},
+            #{supplementInformant},
             #{exchangeBeforeUser},
             #{exchangeAfterUser},
             #{createBy},

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

@@ -92,6 +92,15 @@
             <if test="dealResult != null and dealResult != ''">
                 AND r.deal_result  = #{dealResult}
             </if>
+            <if test="supplementInformant != null and supplementInformant != ''">
+                AND r.supplement_informant LIKE
+                <if test="dbName == 'oracle'">'%'||#{supplementInformant}||'%'</if>
+                <if test="dbName == 'mssql'">'%'+#{supplementInformant}+'%'</if>
+                <if test="dbName == 'mysql'">CONCAT('%', #{supplementInformant}, '%')</if>
+            </if>
+            <if test="supplementArea != null and supplementArea != ''">
+                AND r.supplement_area  = #{supplementArea}
+            </if>
         </where>
         ORDER BY r.update_date DESC
     </select>

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

@@ -199,12 +199,12 @@
             <form:input id="supplementArea" path="supplementArea" 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="supplementProject" 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="supplementProject" htmlEscape="false" maxlength="200" class="input-xlarge required"/>--%>
+        <%--</div>--%>
+    <%--</div>--%>
     <div class="control-group">
         <label class="control-label">内容:</label>
         <div class="controls">

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

@@ -87,7 +87,7 @@
             <li class="clearfix"></li>
             <li><label>举报人：</label><form:input  onchange="resetPageNo();"  path="reportPersonName" htmlEscape="false" maxlength="50" class="input-small"/></li>
             <li><label>举报人电话：</label><form:input  onchange="resetPageNo();"  path="reportPersonTel" htmlEscape="false" maxlength="50" class="input-small"/></li>
-            <li><label>类型：</label><form:select  onchange="resetPageNo();"  path="supplementType" class="input-small">
+            <li><label>业务类型：</label><form:select  onchange="resetPageNo();"  path="supplementType" class="input-small">
                     <form:option value=" ">请选择</form:option>
                     <form:options  items="${fns:getDictList('supplement_type')}" itemLabel="label" itemValue="value"
                     htmlEscape="false"/></form:select></li>
@@ -95,10 +95,15 @@
                     <form:option value=" ">请选择</form:option>
                     <form:options items="${fns:getDictList('report_status')}" itemLabel="label" itemValue="value"
                     htmlEscape="false"/></form:select></li>
+            <li><label>被举报人：</label><form:input  onchange="resetPageNo();"  path="supplementInformant" htmlEscape="false" maxlength="50" class="input-small"/></li>
             <li><label>处理结论：</label><form:select  onchange="resetPageNo();"  path="dealResult" class="input-small">
                     <form:option value=" ">请选择</form:option>
                     <form:options items="${fns:getDictList('deal_result')}" itemLabel="label" itemValue="value"
                     htmlEscape="false"/></form:select></li>
+            <li><label>区域：</label><form:select  onchange="resetPageNo();"  path="supplementArea" class="input-small">
+                <form:option value=" ">请选择</form:option>
+                <form:options items="${fns:getDictList('supplement_area')}" itemLabel="label" itemValue="value"
+                              htmlEscape="false"/></form:select></li>
             <li class="clearfix"></li>
             <li class="btns">
                 <label style="width:auto;"><input id="btnSubmit" class="btn btn-primary" type="submit" value="筛选"/>&nbsp;&nbsp;
@@ -118,6 +123,8 @@
                 <th>被举报项目</th>
                 <th>举报人</th>
                 <th>举报人电话</th>
+                <th>区域</th>
+                <th>被举报人</th>
                 <th>举报时间</th>
                 <th>状态</th>
                 <th>处理结论</th>
@@ -143,6 +150,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/reportTrack.jsp

@@ -140,7 +140,7 @@
                         supplementArea = "集团本部";
                     }
                     path += "被举报区域:"+ supplementArea +"</br>";
-                    path += "被举报项目:${report.supplementProject}</br>";
+                    //path += "被举报项目:${report.supplementProject}</br>";
                     path += "内容:${report.supplementContent}</br>";
                     path += "附件:</br>";
                     $("#attachment2").find("[class='attachmentClass']").each(function(){
@@ -253,13 +253,13 @@
                 <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="supplementProject" 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="supplementProject" 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">

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

@@ -132,6 +132,13 @@
                             column: {
                                 pointPadding: 0.2,
                                 borderWidth: 0
+                            },
+                            series: {
+                                borderWidth: 0,
+                                dataLabels: {
+                                    enabled: true,
+                                    format: '{point.y:.0f}'
+                                }
                             }
                         },
                         series: [{
@@ -175,11 +182,11 @@
                         },
                         title: {//主标题
                             style: { "color": "#333333", "fontSize": "15px" },
-                            text: '举报结果('+start+'-'+end+')'
+                            text: '信息分类('+start+'-'+end+')'
                         },
                         subtitle: {//副标题
                             align: 'right',
-                            text: '总数&nbsp;:&nbsp;'+result.bench.repResultTotal+'<br/><br/>无效&nbsp;:&nbsp;'+result.invalid+'<br/><br/>投诉&nbsp;:&nbsp;'+result.complainNum+'<br/><br/>属实&nbsp;:&nbsp;'+result.verified,
+                            text: '总数&nbsp;:&nbsp;'+result.bench.repResultTotal+'<br/><br/>无效&nbsp;:&nbsp;'+result.invalid+'<br/><br/>投诉&nbsp;:&nbsp;'+result.complainNum+'<br/><br/>举报&nbsp;:&nbsp;'+result.verified,
                             useHTML: true,
                             verticalAlign: 'top' ,
                             x: -5 ,