小问题修改

src/main/java/com/ejweb/modules/workbench/service/WorkbenchService.java

@@ -44,13 +44,13 @@ public class WorkbenchService extends CrudService<ReportDao, ReportEntity> {
         for (HashMap res:results) {
             if(StringUtils.isNotBlank((String) res.get("DEAL_RESULT"))){
                 if("1".equals((String) res.get("DEAL_RESULT"))){
-                    //投诉
+                    //移交客诉
                     workbench.setComplainNum(Integer.valueOf(String.valueOf(res.get("COUNT(DEAL_RESULT)"))));
                 }else if("2".equals((String) res.get("DEAL_RESULT"))){
-                    //无效
+                    //举报无效
                     workbench.setInvalid(Integer.valueOf(String.valueOf(res.get("COUNT(DEAL_RESULT)"))));
                 }else if("3".equals((String) res.get("DEAL_RESULT"))){
-                    //属实
+                    //举报受理
                     workbench.setVerified(Integer.valueOf(String.valueOf(res.get("COUNT(DEAL_RESULT)"))));
                 }
 

src/main/resources/ejweb.properties

@@ -73,7 +73,8 @@ userfiles.prefix=static
 #projectPath=D\:\\workspace\\jeesite
 
 # The Upload File DIR, Must End With File Separator
-file.upload.dir=/mnt/sunac/
+file.upload.dir=/home/static/report/
+#file.upload.dir=/mnt/sunac/
 ## file.upload.dir=D:\\WorkSapce\\JEESpace\\ejweb-api-1.0\\files\\
 #file.upload.dir=/D:/uploads/
 # Max Upload File Size: (default 30M=30*1024*1024(B)=31457280 bytes)
@@ -95,7 +96,11 @@ file.image.thumb.width=640
 file.image.thumb.height=640
 # The Prefix Url
 #file.prefix.url=http://123.56.146.81:8808/
-file.prefix.url=http://192.168.7.210:8081/
+#ڴ
+#file.prefix.url=http://192.168.7.210:8081/
+#ڴʽ
+#file.prefix.url=http://192.168.2.62:8082/
+file.prefix.url=http://221.239.118.251:8899/static/report/
 
 # The Prefix separator
 file.upload.path.separator = /

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

@@ -423,7 +423,7 @@
     <select id="getReportResult" parameterType="com.ejweb.modules.workbench.Bean.WorkbenchBean" resultType="java.util.HashMap">
         select deal_result,COUNT(deal_result)
         FROM ct_bbtc_report
-        WHERE report_status='2'
+        WHERE 1 = 1
         <if test="isAdmin != null">
             AND exchange_after_user = #{isAdmin}
         </if>
@@ -543,6 +543,7 @@
         r.supplement_title AS "supplementTitle",
         r.supplement_type AS "supplementType",
         r.supplement_area AS "supplementArea",
+        r.supplement_department AS "supplementDepartment",
         r.supplement_informant AS "supplementInformant",
         r.deal_person_name AS "dealPersonName",
         r.deal_result AS "dealResult",

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

@@ -172,7 +172,7 @@
                 <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>
                 </td>
                 <td>

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

@@ -166,7 +166,7 @@
                         <c:if test="${report.reportStatus eq '0'}">未处理</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>
+                        <%--<c:if test="${report.reportStatus eq '3'}">受理中</c:if>--%>
                     </td>
                     <td>
                         <c:if test="${report.dealResult eq null}">--</c:if>

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

@@ -206,7 +206,7 @@
                         },
                         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 ,
@@ -231,7 +231,7 @@
                             name: '举报',
                             data: [
                                 ['举报无效', result.invalid],
-                                ['举报投诉', result.complainNum],
+                                ['移交客诉', result.complainNum],
                                 ['举报受理', result.verified],
                             ]
                         }]