From 950131f2b61bdc581faaf4cb0f3017816a0a6f64 Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Sun, 8 Mar 2020 16:35:42 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=95=B0=E6=8D=AE=E5=88=86?=
 =?UTF-8?q?=E6=9E=90=E7=9B=B8=E5=85=B3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/elink/esua/epdc/excel/GridOpiningExcel.java    | 6 +++---
 .../main/java/com/elink/esua/epdc/excel/RegisterExcel.java  | 6 +++---
 .../modules/user/service/impl/UserAnalysisServiceImpl.java  | 2 ++
 .../src/main/resources/mapper/user/UserAnalysisDao.xml      | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

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 2249c5647..4ba5922cd 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
@@ -16,16 +16,16 @@ public class GridOpiningExcel {
     @Excel(name = "网格党建指导员姓名")
     private String gridLeader;
 
-    @Excel(name = "注册用户数")
+    @Excel(name = "用户总数")
     private Integer registerCount;
 
     @Excel(name = "党员数")
     private Integer partyCount;
 
-    @Excel(name = "未认证用户数")
+    @Excel(name = "未注册居民")
     private Integer unAuthorizedCount;
 
-    @Excel(name = "认证居民数")
+    @Excel(name = "已注册居民")
     private int residentCount;
 
     @Excel(name = "新闻发布数")
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 bfa291e94..2f9ee8c11 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
@@ -16,16 +16,16 @@ public class RegisterExcel {
     @Excel(name = "街道名称")
     private String streetName;
 
-    @Excel(name = "注册用户数")
+    @Excel(name = "用户总数")
     private Integer userCount;
 
     @Excel(name = "党员数")
     private Integer partyMemberCount;
 
-    @Excel(name = "认证居民数")
+    @Excel(name = "已注册居民")
     private Integer residentCount;
 
-    @Excel(name = "未认证用户数")
+    @Excel(name = "未注册居民")
     private Integer unAuthorizedCount;
 
     @Excel(name = "男")
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 51afd0ab9..02108205f 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
@@ -147,6 +147,8 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, Us
                 streetIdList.add(rankResult.getStreetId());
             }
             params.put("streetIdList", streetIdList);
+            // 页码设置为1，则下面几次查询不会拼接分页
+            params.put("page", NumConstant.ONE);
             String partyFlag = MapUtil.getStr(params, "partyFlag");
             // 如果是党员排行列表，查询党员认证失败数
             if (StringUtils.isNotBlank(partyFlag) && YesOrNoEnum.YES.value().equals(partyFlag)) {
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 e12e663a7..32b76a81e 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
@@ -322,7 +322,7 @@
             </if>
             AND ad.del_flag = 0
             AND ama.ID IS <if test='category != null and category == "1"'>NOT</if> NULL
-            <if test="gridId != null and gridId != ''">and (ad1.id = #{gridId} or ad2.id = #{gridId})</if>
+            <if test="gridId != null and gridId != ''">and (ad.id = #{gridId} or ad1.id = #{gridId} or ad2.id = #{gridId})</if>
         GROUP BY ad.id
         ORDER BY ama.CREATED_TIME DESC, ad.create_date DESC
     </select>