From 57124ea489dcb48e345fd96a6306ecdc3ff5033f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Fri, 27 Mar 2020 14:49:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E5=88=97=E8=A1=A8=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/MetaUserGridOpiningServiceImpl.java   | 10 +++++++---
 .../service/impl/MetaUserPartyRankServiceImpl.java     | 10 +++++++---
 .../service/impl/MetaUserRegisterRankServiceImpl.java  | 10 +++++++---
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java
index 6f8be2ed9..555ce3522 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java
@@ -59,6 +59,11 @@ public class MetaUserGridOpiningServiceImpl extends BaseServiceImpl<MetaUserGrid
     @DataSource(name = DataSourceNames.TWELVE)
     public PageData<MetaUserGridOpiningDTO> page(Map<String, Object> params) {
         IPage<MetaUserGridOpiningEntity> page = getPage(params);
+        List<MetaUserGridOpiningEntity> metaUserGridOpiningEntityList = getMetaUserGridOpiningEntities(params);
+        return getPageData(metaUserGridOpiningEntityList,page.getTotal(), MetaUserGridOpiningDTO.class);
+    }
+
+    private List<MetaUserGridOpiningEntity> getMetaUserGridOpiningEntities(Map<String, Object> params) {
         // 获取所有网格
         List<GridOpeningResultDTO> gridOpeningResultDTOS = userAnalysisService.selectListGridHasMaCode(params);
         List<String> deptIdList = new ArrayList<>();
@@ -75,13 +80,12 @@ public class MetaUserGridOpiningServiceImpl extends BaseServiceImpl<MetaUserGrid
             String createdTime = DateUtils.dealDateFormat(time);
             params.put("createdTime",createdTime);
         }
-        List<MetaUserGridOpiningEntity> metaUserGridOpiningEntityList = baseDao.pageselectListPage(params);
-        return getPageData(metaUserGridOpiningEntityList,page.getTotal(), MetaUserGridOpiningDTO.class);
+        return baseDao.pageselectListPage(params);
     }
 
     @Override
     public List<MetaUserGridOpiningDTO> list(Map<String, Object> params) {
-        List<MetaUserGridOpiningEntity> entityList = baseDao.selectList(getWrapper(params));
+        List<MetaUserGridOpiningEntity> entityList = getMetaUserGridOpiningEntities(params);
 
         return ConvertUtils.sourceToTarget(entityList, MetaUserGridOpiningDTO.class);
     }
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserPartyRankServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserPartyRankServiceImpl.java
index 4f03f96b4..afa6720e0 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserPartyRankServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserPartyRankServiceImpl.java
@@ -62,6 +62,11 @@ public class MetaUserPartyRankServiceImpl extends BaseServiceImpl<MetaUserPartyR
     @DataSource(name = DataSourceNames.TWELVE)
     public PageData<MetaUserPartyRankDTO> page(Map<String, Object> params) {
         IPage<MetaUserPartyRankEntity> page = getPage(params);
+        List<MetaUserPartyRankEntity> metaUserRegisterRankEntities = getMetaUserPartyRankEntities(params);
+        return getPageData(metaUserRegisterRankEntities,page.getTotal(), MetaUserPartyRankDTO.class);
+    }
+
+    private List<MetaUserPartyRankEntity> getMetaUserPartyRankEntities(Map<String, Object> params) {
         // 获取权限下的街道id
         List<String> streetIdList = metaUserRegisterRankService.getListStreetId();
         params.put("streetIdList",streetIdList);
@@ -74,13 +79,12 @@ public class MetaUserPartyRankServiceImpl extends BaseServiceImpl<MetaUserPartyR
             String createdTime = DateUtils.dealDateFormat(time);
             params.put("createdTime",createdTime);
         }
-        List<MetaUserPartyRankEntity> metaUserRegisterRankEntities = baseDao.selectPagePartyRank(params);
-        return getPageData(metaUserRegisterRankEntities,page.getTotal(), MetaUserPartyRankDTO.class);
+        return baseDao.selectPagePartyRank(params);
     }
 
     @Override
     public List<MetaUserPartyRankDTO> list(Map<String, Object> params) {
-        List<MetaUserPartyRankEntity> entityList = baseDao.selectList(getWrapper(params));
+        List<MetaUserPartyRankEntity> entityList = getMetaUserPartyRankEntities(params);
 
         return ConvertUtils.sourceToTarget(entityList, MetaUserPartyRankDTO.class);
     }
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserRegisterRankServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserRegisterRankServiceImpl.java
index 725348551..83d6061ef 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserRegisterRankServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserRegisterRankServiceImpl.java
@@ -57,6 +57,11 @@ public class MetaUserRegisterRankServiceImpl extends BaseServiceImpl<MetaUserReg
     @DataSource(name = DataSourceNames.TWELVE)
     public PageData<MetaUserRegisterRankDTO> page(Map<String, Object> params) {
         IPage<MetaUserRegisterRankEntity> page = getPage(params);
+        List<MetaUserRegisterRankEntity> metaUserRegisterRankEntities = getMetaUserRegisterRankEntities(params);
+        return getPageData(metaUserRegisterRankEntities,page.getTotal(), MetaUserRegisterRankDTO.class);
+    }
+
+    private List<MetaUserRegisterRankEntity> getMetaUserRegisterRankEntities(Map<String, Object> params) {
         // 获取权限下的街道id
         List<String> streetIdList = getListStreetId();
         params.put("streetIdList",streetIdList);
@@ -69,13 +74,12 @@ public class MetaUserRegisterRankServiceImpl extends BaseServiceImpl<MetaUserReg
             String createdTime = DateUtils.dealDateFormat(time);
             params.put("createdTime",createdTime);
         }
-        List<MetaUserRegisterRankEntity> metaUserRegisterRankEntities = baseDao.selectPageUserRegisterRank(params);
-        return getPageData(metaUserRegisterRankEntities,page.getTotal(), MetaUserRegisterRankDTO.class);
+        return baseDao.selectPageUserRegisterRank(params);
     }
 
     @Override
     public List<MetaUserRegisterRankDTO> list(Map<String, Object> params) {
-        List<MetaUserRegisterRankEntity> entityList = baseDao.selectList(getWrapper(params));
+        List<MetaUserRegisterRankEntity> entityList = getMetaUserRegisterRankEntities(params);
 
         return ConvertUtils.sourceToTarget(entityList, MetaUserRegisterRankDTO.class);
     }