From 16fdeb6bd28986d57cc3f6ee906bf2656a50784c Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Sat, 15 Feb 2020 10:34:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=A1=B9=E7=9B=AE=E5=A5=BD?=
 =?UTF-8?q?=E8=AF=84=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/user/result/GridOpeningResultDTO.java |  6 ++++-
 .../esua/epdc/excel/GridOpiningExcel.java     | 11 +++++----
 .../service/impl/UserAnalysisServiceImpl.java | 21 ++++++++++++-----
 .../resources/mapper/user/UserAnalysisDao.xml | 23 ++++++++++---------
 4 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridOpeningResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridOpeningResultDTO.java
index 941ffa520..6f2530edb 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridOpeningResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridOpeningResultDTO.java
@@ -65,6 +65,11 @@ public class GridOpeningResultDTO implements Serializable {
      */
     private int itemCloseCount = 0;
 
+    /**
+     * 项目好评数（满意度评价为非常满意）
+     */
+    private int itemPraiseCount = 0;
+
     /**
      * 社群数
      */
@@ -86,5 +91,4 @@ public class GridOpeningResultDTO implements Serializable {
     private String gridLeader;
 
 
-
 }
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/excel/GridOpiningExcel.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/excel/GridOpiningExcel.java
index c6cae13f5..c4325288a 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/excel/GridOpiningExcel.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/excel/GridOpiningExcel.java
@@ -3,12 +3,10 @@ package com.elink.esua.epdc.excel;
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import lombok.Data;
 
-import java.math.BigDecimal;
-
 /**
- *  @author: qushutong
- *  @Date: 2020/2/13 15:23
- *  @Description: 网格开通导出
+ * @author: qushutong
+ * @Date: 2020/2/13 15:23
+ * @Description: 网格开通导出
  */
 @Data
 public class GridOpiningExcel {
@@ -42,6 +40,9 @@ public class GridOpiningExcel {
     @Excel(name = "项目关闭数")
     private Integer itemCloseCount;
 
+    @Excel(name = "好评数")
+    private Integer itemPraiseCount;
+
     @Excel(name = "议题数")
     private Integer eventCount;
 
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java
index 130716430..2731ea0e6 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java
@@ -28,7 +28,8 @@ import org.springframework.stereotype.Service;
 import java.util.List;
 import java.util.Map;
 
-/** 用户数据分析业务实现
+/**
+ * 用户数据分析业务实现
  *
  * @author work@yujt.net.cn
  * @date 2020/2/11 09:46
@@ -61,7 +62,8 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, Us
         return list;
     }
 
-    /** 组装网格开通情况的数据
+    /**
+     * 组装网格开通情况的数据
      *
      * @param list   第一次执行查询获取到的列表，主要包含机构id和机构名称
      * @param params 查询条件
@@ -84,7 +86,7 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, Us
             List<GridOpeningResultDTO> registerDataList = baseDao.selectListReigistData(params);
             // 新闻数 通知数 议题数
             List<GridOpeningResultDTO> nneCountList = baseDao.selectListNewsNoticeEventCount(params);
-            // 项目数，项目结案数
+            // 项目数，项目结案数，项目好评数
             List<GridOpeningResultDTO> itemCountList = baseDao.selectListItemCount(params);
             // 社群数 社群成员数 社群话题数
             List<GridOpeningResultDTO> communityCountList = baseDao.selectListCommunityCount(params);
@@ -110,6 +112,7 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, Us
                     if (resultDto.getGridId().equals(itemCountData.getGridId())) {
                         resultDto.setItemCount(itemCountData.getItemCount());
                         resultDto.setItemCloseCount(itemCountData.getItemCloseCount());
+                        resultDto.setItemPraiseCount(itemCountData.getItemPraiseCount());
                         break;
                     }
                 }
@@ -142,7 +145,8 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, Us
         return new PageData<>(list, page.getTotal());
     }
 
-    /** 根据已经查出的列表的街道id，查询街道下党员认证失败的人数
+    /**
+     * 根据已经查出的列表的街道id，查询街道下党员认证失败的人数
      *
      * @param hasList
      * @return java.util.List<com.elink.esua.epdc.dto.user.result.UserDataRankResultDTO>
@@ -170,7 +174,8 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, Us
         return hasList;
     }
 
-    /** 用户数据统计
+    /**
+     * 用户数据统计
      *
      * @param formDto
      * @return com.elink.esua.epdc.commons.tools.utils.Result
@@ -189,7 +194,8 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, Us
     }
 
 
-    /** 网格开通状况
+    /**
+     * 网格开通状况
      *
      * @param formDto
      * @return com.elink.esua.epdc.commons.tools.utils.Result
@@ -232,6 +238,7 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, Us
         int eventCount = 0;
         int itemCount = 0;
         int itemCloseCount = 0;
+        int itemPraiseCount = 0;
         int communityCount = 0;
         int communityMemberCount = 0;
         int communityTopicCount = 0;
@@ -245,6 +252,7 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, Us
             eventCount += openingResult.getEventCount();
             itemCount += openingResult.getItemCount();
             itemCloseCount += openingResult.getItemCloseCount();
+            itemPraiseCount += openingResult.getItemPraiseCount();
             communityCount += openingResult.getCommunityCount();
             communityMemberCount += openingResult.getCommunityMemberCount();
             communityTopicCount += openingResult.getCommunityTopicCount();
@@ -256,6 +264,7 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, Us
         result.setNewsCount(newsCount);
         result.setNoticeCount(noticeCount);
         result.setEventCount(eventCount);
+        result.setItemPraiseCount(itemPraiseCount);
         result.setItemCloseCount(itemCloseCount);
         result.setItemCount(itemCount);
         result.setCommunityCount(communityCount);
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
index 2abfe21b2..6ba24f825 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
@@ -132,19 +132,20 @@
     <!--项目数-->
     <select id="selectListItemCount" resultType="com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO">
         SELECT
-        epen.GRID_ID gridId,
-        COUNT( epen.ID ) itemCount,
-        count(epen.ITEM_STATE = '10' or null) itemCloseCount
+            epen.GRID_ID gridId,
+            COUNT( epen.ID ) itemCount,
+            COUNT(epen.EVALUATION_SCORE = '2' OR NULL) itemPraiseCount,
+            count(epen.ITEM_STATE = '10' or null) itemCloseCount
         FROM
-        esua_epdc_events.epdc_item epen
+            esua_epdc_events.epdc_item epen
         WHERE
-        epen.DEL_FLAG = '0'
-        <if test="gridIdList != null and gridIdList.size() > 0">
-            AND epen.GRID_ID in <include refid="foreachGridIdList"></include>
-        </if>
-        <if test="startTime != null and endTime != null and endTime != ''">
-            AND epen.CREATED_TIME BETWEEN #{startTime} AND #{endTime}
-        </if>
+            epen.DEL_FLAG = '0'
+            <if test="gridIdList != null and gridIdList.size() > 0">
+                AND epen.GRID_ID in <include refid="foreachGridIdList"></include>
+            </if>
+            <if test="startTime != null and endTime != null and endTime != ''">
+                AND epen.CREATED_TIME BETWEEN #{startTime} AND #{endTime}
+            </if>
         GROUP BY epen.GRID_ID
     </select>