diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/MetaUserPartyRankController.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/MetaUserPartyRankController.java
index 75c5f3ed5..b4d678432 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/MetaUserPartyRankController.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/MetaUserPartyRankController.java
@@ -91,4 +91,17 @@ public class MetaUserPartyRankController {
         ExcelUtils.exportExcelToTarget(response, null, list, MetaUserPartyRankExcel.class);
     }
 
+    /***
+     * 定时任务导入
+     * @param
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author qushutong
+     * @date 2020/3/26 18:22
+     */
+    @GetMapping("toLeadPartyRankData")
+    public Result toLeadPartyRankData(){
+
+        return metaUserPartyRankService.toLeadPartyRankData();
+    }
+
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/MetaUserPartyRankDao.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/MetaUserPartyRankDao.java
index c712f2ccc..9bebf3d7a 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/MetaUserPartyRankDao.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/MetaUserPartyRankDao.java
@@ -16,10 +16,14 @@
  */
 
 package com.elink.esua.epdc.modules.user.dao;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.modules.user.entity.MetaUserPartyRankEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 党员排行
  *
@@ -28,5 +32,15 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface MetaUserPartyRankDao extends BaseDao<MetaUserPartyRankEntity> {
-	
+
+    /***
+     * 分页
+     * @param params
+     * @return java.util.List<com.elink.esua.epdc.modules.user.entity.MetaUserPartyRankEntity>
+     * @author qushutong
+     * @date 2020/3/26 18:36
+     */
+    List<MetaUserPartyRankEntity>  selectPagePartyRank(Map<String,Object> params);
+
+
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/MetaUserPartyRankService.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/MetaUserPartyRankService.java
index b73506c94..b98990bbb 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/MetaUserPartyRankService.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/MetaUserPartyRankService.java
@@ -19,6 +19,7 @@ package com.elink.esua.epdc.modules.user.service;
 
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.user.MetaUserPartyRankDTO;
 import com.elink.esua.epdc.modules.user.entity.MetaUserPartyRankEntity;
 
@@ -92,4 +93,13 @@ public interface MetaUserPartyRankService extends BaseService<MetaUserPartyRankE
      * @date 2020-03-26
      */
     void delete(String[] ids);
+
+    /***
+     * 定时任务导入党员排行
+     * @param
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author qushutong
+     * @date 2020/3/26 18:23
+     */
+    Result toLeadPartyRankData();
 }
\ No newline at end of file
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 234128f01..4f03f96b4 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
@@ -20,21 +20,28 @@ package com.elink.esua.epdc.modules.user.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.utils.DateUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.datasources.DataSourceNames;
+import com.elink.esua.epdc.datasources.annotation.DataSource;
 import com.elink.esua.epdc.dto.user.MetaUserPartyRankDTO;
+import com.elink.esua.epdc.dto.user.result.UserDataRankResultDTO;
 import com.elink.esua.epdc.modules.user.dao.MetaUserPartyRankDao;
 import com.elink.esua.epdc.modules.user.entity.MetaUserPartyRankEntity;
 import com.elink.esua.epdc.modules.user.service.MetaUserPartyRankService;
+import com.elink.esua.epdc.modules.user.service.MetaUserRegisterRankService;
+import com.elink.esua.epdc.modules.user.service.UserAnalysisService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 /**
  * 党员排行
@@ -45,14 +52,30 @@ import java.util.Map;
 @Service
 public class MetaUserPartyRankServiceImpl extends BaseServiceImpl<MetaUserPartyRankDao, MetaUserPartyRankEntity> implements MetaUserPartyRankService {
 
+    @Autowired
+    private UserAnalysisService userAnalysisService;
+
+    @Autowired
+    private MetaUserRegisterRankServiceImpl metaUserRegisterRankService;
 
     @Override
+    @DataSource(name = DataSourceNames.TWELVE)
     public PageData<MetaUserPartyRankDTO> page(Map<String, Object> params) {
-        IPage<MetaUserPartyRankEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, MetaUserPartyRankDTO.class);
+        IPage<MetaUserPartyRankEntity> page = getPage(params);
+        // 获取权限下的街道id
+        List<String> streetIdList = metaUserRegisterRankService.getListStreetId();
+        params.put("streetIdList",streetIdList);
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        String time = (String) params.get("createdTime");
+        if(StringUtils.isBlank(time)){
+            String createdTime = format.format(new Date());
+            params.put("createdTime",createdTime);
+        }else {
+            String createdTime = DateUtils.dealDateFormat(time);
+            params.put("createdTime",createdTime);
+        }
+        List<MetaUserPartyRankEntity> metaUserRegisterRankEntities = baseDao.selectPagePartyRank(params);
+        return getPageData(metaUserRegisterRankEntities,page.getTotal(), MetaUserPartyRankDTO.class);
     }
 
     @Override
@@ -98,4 +121,15 @@ public class MetaUserPartyRankServiceImpl extends BaseServiceImpl<MetaUserPartyR
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    @DataSource(name = DataSourceNames.TWELVE)
+    public Result toLeadPartyRankData() {
+        // 获取导出数据
+        Map<String,Object> params = new HashMap<>();
+        params.put("partyFlag", YesOrNoEnum.YES.value());
+        List<UserDataRankResultDTO> toLeadUserRegisterRandData = userAnalysisService.getToLeadUserRegisterRandData(params);
+        List<MetaUserPartyRankEntity> metaUserPartyRankEntities = ConvertUtils.sourceToTarget(toLeadUserRegisterRandData, MetaUserPartyRankEntity.class);
+        return insertBatch(metaUserPartyRankEntities)? new Result(): new Result().error("导入党员排行失败") ;
+    }
+
 }
\ No newline at end of file