【PC端】用户数据分析模块功能完善（导出项调整）-王公峰-2020-07-15

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/excel/GridOpiningExcel.java

@@ -28,6 +28,9 @@ public class GridOpiningExcel {
     @Excel(name = "未认证居民")
     private Integer unAuthorizedCount;
 
+    @Excel(name = "企业代表数")
+    private Integer enterpriseCount;
+
     @Excel(name = "新闻发布数")
     private Integer newsCount;
 

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java

@@ -278,6 +278,7 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, Us
         int communityMemberCount = 0;
         int communityTopicCount = 0;
         int unAuthorizedCount = 0;
+        int enterpriseCount = 0;
 
         for (GridOpeningResultDTO openingResult : gridOpeningResults) {
             residentCount += openingResult.getResidentCount();
@@ -292,6 +293,7 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, Us
             communityCount += openingResult.getCommunityCount();
             communityMemberCount += openingResult.getCommunityMemberCount();
             communityTopicCount += openingResult.getCommunityTopicCount();
+            enterpriseCount += openingResult.getEnterpriseCount();
         }
 
         result.setRegisterCount(residentCount + partyCount + unAuthorizedCount);
@@ -308,6 +310,7 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, Us
         result.setCommunityCount(communityCount);
         result.setCommunityMemberCount(communityMemberCount);
         result.setCommunityTopicCount(communityTopicCount);
+        result.setEnterpriseCount(enterpriseCount);
 
         return result;
     }

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml

@@ -1300,7 +1300,7 @@
 
     <select id="selectExportEnterpriseCountByGridId" resultType="com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO">
         SELECT
-        t0.`name` gridId,
+        t0.id gridId,
         count(uu.ID) enterpriseCount
         FROM
         (