修改用户注册排行和网格开通情况导出功能

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserDataRankResultDTO.java

@@ -44,7 +44,7 @@ public class UserDataRankResultDTO {
     /**
      * 未认证用户（根据用户第一次扫码的网格统计）
      */
-    private Integer unAuthorizedCount;
+    private Integer unAuthorizedCount = 0;
     /**
      * 党员数
      */

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

@@ -19,9 +19,15 @@ public class GridOpiningExcel {
     @Excel(name = "注册用户数")
     private Integer registerCount;
 
-    @Excel(name = "注册党员数")
+    @Excel(name = "党员数")
     private Integer partyCount;
 
+    @Excel(name = "未认证用户数")
+    private Integer unAuthorizedCount;
+
+    @Excel(name = "认证居民数")
+    private int residentCount;
+
     @Excel(name = "新闻发布数")
     private Integer newsCount;
 

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

@@ -19,12 +19,15 @@ public class RegisterExcel {
     @Excel(name = "注册用户数")
     private Integer userCount;
 
-    @Excel(name = "注册党员数")
+    @Excel(name = "党员数")
     private Integer partyMemberCount;
 
-    @Excel(name = "注册居民数")
+    @Excel(name = "认证居民数")
     private Integer residentCount;
 
+    @Excel(name = "未认证用户数")
+    private Integer unAuthorizedCount;
+
     @Excel(name = "男")
     private Integer maleCount;
 

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

@@ -165,6 +165,7 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, Us
                     for (UserDataRankResultDTO unAuthCount : unAuthorizedCountList) {
                         if (rankResult.getStreetId().equals(unAuthCount.getStreetId())) {
                             rankResult.setUnAuthorizedCount(unAuthCount.getUnAuthorizedCount());
+                            rankResult.setUserCount(rankResult.getUnAuthorizedCount() + rankResult.getPartyMemberCount() + rankResult.getResidentCount());
                         }
                     }
                 }