工作台信息分类添加举报未处理

oa途经判断方式改为contains

src/main/java/com/ejweb/modules/front/report/service/FrontReportService.java

@@ -52,7 +52,7 @@ public class FrontReportService extends CrudService<FrontReportDao,FrontReportEn
         bean.setReportStatus("0");
         log.info("report_source为:"+bean.getReportSource());
         log.info("token为:"+token);
-        if (bean.getReportSource().equals("oa")){
+        if (bean.getReportSource().contains("oa")){
             try {
                 DefaultResourceLoader resourceLoader = new DefaultResourceLoader();
                 Resource resource = resourceLoader.getResource("LtpaToken.properties");

src/main/java/com/ejweb/modules/report/dao/ReportDao.java

@@ -200,4 +200,9 @@ public interface ReportDao extends CrudDao<ReportEntity> {
      * @return
      */
     public int updateConclusion(ReportEntity reportEntity);
+
+    /**
+     * 总数
+     */
+    public int getTotalNum(WorkbenchBean bean);
 }

src/main/java/com/ejweb/modules/workbench/Bean/WorkbenchBean.java

@@ -8,6 +8,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
  */
 public class WorkbenchBean {
 
+    //总数
+    private int totalCount;
     //是否管理员
     private String  isAdmin;
     //处理状态
@@ -30,6 +32,7 @@ public class WorkbenchBean {
     private int complainNum = 0;
     private int confirmed = 0;
     private int verified = 0;
+    private int unsettled = 0;
 
     //总体
     private int total = 0;
@@ -355,4 +358,20 @@ public class WorkbenchBean {
     public void setClosed(int closed) {
         this.closed = closed;
     }
+
+    public int getTotalCount() {
+        return totalCount;
+    }
+
+    public void setTotalCount(int totalCount) {
+        this.totalCount = totalCount;
+    }
+
+    public int getUnsettled() {
+        return unsettled;
+    }
+
+    public void setUnsettled(int unsettled) {
+        this.unsettled = unsettled;
+    }
 }

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

@@ -39,6 +39,7 @@ public class WorkbenchService extends CrudService<ReportDao, ReportEntity> {
         }else if(StringUtils.isBlank(workbench.getStartDate()) && StringUtils.isNotBlank(workbench.getEndDate())){
             workbench.setStartDate("2017-09-12");
         }
+        workbench.setTotalCount(reportDao.getTotalNum(workbench));
         List<HashMap> results = reportDao.getReportResult(workbench);
         //举报结果
         for (HashMap res:results) {
@@ -60,7 +61,8 @@ public class WorkbenchService extends CrudService<ReportDao, ReportEntity> {
             }
 
         }
-        workbench.setRepResultTotal(workbench.getComplainNum()+workbench.getInvalid()+workbench.getVerified());
+        workbench.setRepResultTotal(workbench.getComplainNum()+workbench.getInvalid()+workbench.getVerified()+workbench.getConfirmed());
+        workbench.setUnsettled(workbench.getTotalCount()-workbench.getRepResultTotal());
         List<HashMap> statusList = reportDao.getReportStatus(workbench);
         //举报状态
         for(HashMap status:statusList){
@@ -80,7 +82,7 @@ public class WorkbenchService extends CrudService<ReportDao, ReportEntity> {
                 }
             }
         }
-        workbench.setRepStatusTotal(workbench.getUnProcess()+workbench.getProcessing()+workbench.getProcessed());
+        workbench.setRepStatusTotal(workbench.getUnProcess()+workbench.getProcessing()+workbench.getProcessed()+workbench.getClosed());
         List<HashMap> types = reportDao.getReportType(workbench);
         for (HashMap type:types){
             //营销
@@ -126,7 +128,7 @@ public class WorkbenchService extends CrudService<ReportDao, ReportEntity> {
                 if("web".equals((String) total.get("REPORT_SOURCE"))){
                     //官网
                     workbench.setWeb(Integer.valueOf(String.valueOf(total.get("COUNT(REPORT_SOURCE)"))));
-                }else if("oa".equals((String) total.get("REPORT_SOURCE"))){
+                }else if("oa".contains((String) total.get("REPORT_SOURCE"))){
                     //融创oa
                     workbench.setOa(Integer.valueOf(String.valueOf(total.get("COUNT(REPORT_SOURCE)"))));
                 }else if("supplier".equals(String.valueOf(total.get("REPORT_SOURCE")))){

src/main/java/com/ejweb/modules/workbench/web/WorkbenchController.java

@@ -68,6 +68,7 @@ public class WorkbenchController extends BaseController {
             res.put("processed",bean.getProcessed());
             res.put("closed",bean.getClosed());
             //举报结果
+            res.put("unsettled",bean.getUnsettled());
             res.put("invalid",bean.getInvalid());
             res.put("complainNum",bean.getComplainNum());
             res.put("verified",bean.getVerified());

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

@@ -601,4 +601,21 @@
         deal_result = #{lStatus}
         WHERE id = #{id}
     </update>
+
+    <select id="getTotalNum" parameterType="com.ejweb.modules.workbench.Bean.WorkbenchBean" resultType="Integer">
+        SELECT count(*) AS "totalCount"
+        FROM ct_bbtc_report
+        WHERE 1 = 1
+        <if test="isAdmin != null">
+            AND exchange_after_user = #{isAdmin}
+        </if>
+        <if test="startDate != null">
+            <if test="dbName == 'oracle'"> AND create_date >= to_date(#{startDate}, 'yyyy-MM-dd')</if>
+            <if test="dbName == 'mysql'"> AND DATE(create_date) >= #{startDate}</if>
+        </if>
+        <if test="endDate != null">
+            <if test="dbName == 'oracle'"> AND create_date &lt;= to_date( #{endDate}|| ' 23:59:59', 'yyyy-MM-dd hh24:mi:ss')</if>
+            <if test="dbName == 'mysql'"> AND DATE(create_date) &lt;= #{endDate}</if>
+        </if>
+    </select>
 </mapper>
\ No newline at end of file

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

@@ -43,7 +43,7 @@
                         },
                         subtitle: {//副标题
                             align: 'right',
-                            text: '总数&nbsp;:&nbsp;'+result.bench.repStatusTotal+'<br/>未处理&nbsp;:&nbsp;'+result.unProcess+'<br/>跟踪中&nbsp;:&nbsp;'+result.processing+'<br/>已处理&nbsp;:&nbsp;'+result.processed+'<br/>已关闭&nbsp;:&nbsp;'+result.closed,
+                            text: '总数&nbsp;:&nbsp;'+result.bench.totalCount+'<br/>未处理&nbsp;:&nbsp;'+result.unProcess+'<br/>跟踪中&nbsp;:&nbsp;'+result.processing+'<br/>已处理&nbsp;:&nbsp;'+result.processed+'<br/>已关闭&nbsp;:&nbsp;'+result.closed,
                             useHTML: true,
                             verticalAlign: 'top' ,
                             x: -5 ,
@@ -207,7 +207,7 @@
                         },
                         subtitle: {//副标题
                             align: 'right',
-                            text: '总数&nbsp;:&nbsp;'+result.bench.repResultTotal+'<br/>举报无效&nbsp;:&nbsp;'+result.invalid+'<br/>移交客诉&nbsp;:&nbsp;'+result.complainNum+'<br/>举报受理&nbsp;:&nbsp;'+result.verified+'<br/>举报属实&nbsp;:&nbsp;'+result.confirmed,
+                            text: '总数&nbsp;:&nbsp;'+result.bench.totalCount+'<br/>举报无效&nbsp;:&nbsp;'+result.invalid+'<br/>移交客诉&nbsp;:&nbsp;'+result.complainNum+'<br/>举报受理&nbsp;:&nbsp;'+result.verified+'<br/>举报属实&nbsp;:&nbsp;'+result.confirmed+'<br/>举报未处理&nbsp;:&nbsp;'+result.unsettled,
                             useHTML: true,
                             verticalAlign: 'top' ,
                             x: -5 ,
@@ -235,6 +235,7 @@
                                 ['移交客诉', result.complainNum],
                                 ['举报受理', result.verified],
                                 ['举报属实', result.confirmed],
+                                ['举报未处理', result.unsettled],
                             ]
                         }]
                     });
@@ -276,7 +277,7 @@
                         <td style="width: 10%">&nbsp;&nbsp;&nbsp;&nbsp;融E&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${workbench.sunacE}</td>
                     </tr>
                     <tr height="60">
-                        <td style="width: 10%"><h4>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${workbench.total}</h4>
+                        <td style="width: 10%"><h4>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${workbench.totalCount}</h4>
                             &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;举报事件
                         </td>
                         <td>&nbsp;&nbsp;&nbsp;&nbsp;融创OA系统&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${workbench.oa}</td>