用户数据分析相关修改

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 = "新闻发布数")

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 = "男")

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)) {

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>