From 7c982cf0703017743329dcadca273f195f30e3d5 Mon Sep 17 00:00:00 2001 From: yujintao Date: Thu, 5 Mar 2020 18:06:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E6=B3=A8?= =?UTF-8?q?=E5=86=8C=E6=8E=92=E8=A1=8C=E5=92=8C=E7=BD=91=E6=A0=BC=E5=BC=80?= =?UTF-8?q?=E9=80=9A=E6=83=85=E5=86=B5=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/dto/user/result/UserDataRankResultDTO.java | 2 +- .../java/com/elink/esua/epdc/excel/GridOpiningExcel.java | 8 +++++++- .../java/com/elink/esua/epdc/excel/RegisterExcel.java | 7 +++++-- .../user/service/impl/UserAnalysisServiceImpl.java | 1 + 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserDataRankResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserDataRankResultDTO.java index e53f5a192..f215ae909 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserDataRankResultDTO.java +++ b/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; /** * 党员数 */ 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 c4325288a..2249c5647 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 @@ -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; diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/excel/RegisterExcel.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/excel/RegisterExcel.java index b6ff4556a..bfa291e94 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/excel/RegisterExcel.java +++ b/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; 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 f4fb3cd6c..51afd0ab9 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 @@ -165,6 +165,7 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl