diff --git a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java
index a08c916..099c77a 100644
--- a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java
+++ b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java
@@ -620,4 +620,94 @@ public interface AnalysisFeignClient {
      */
     @PostMapping("analysis/data/stats/basereport/agencyRegUser")
     Result agencyRegUser(ScreenJobFormDTO formDto);
+
+
+    /**
+     * 网格状态话题数据
+     *
+     * @param formDto 定时入参
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author zhy
+     * @date 2021/6/28 10:57
+     */
+    @PostMapping("analysis/data/stats/basereport/gridtopicstatus")
+    Result gridtopicstatus(ScreenJobFormDTO formDto);
+
+    /**
+     * 组织状态话题数据
+     *
+     * @param formDto 定时入参
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author zhy
+     * @date 2021/6/28 10:57
+     */
+    @PostMapping("analysis/data/stats/basereport/agencytopicstatus")
+    Result agencytopicstatus(ScreenJobFormDTO formDto);
+
+    /**
+     * 网格话题转议题数据
+     *
+     * @param formDto 定时入参
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author zhy
+     * @date 2021/6/28 10:57
+     */
+    @PostMapping("analysis/data/stats/basereport/gridtopicissue")
+    Result gridtopicissue(ScreenJobFormDTO formDto);
+
+    /**
+     * 组织话题转议题数据
+     *
+     * @param formDto 定时入参
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author zhy
+     * @date 2021/6/28 10:57
+     */
+    @PostMapping("analysis/data/stats/basereport/agencytopicissue")
+    Result agencytopicissue(ScreenJobFormDTO formDto);
+
+    /**
+     * 网格项目数据
+     *
+     * @param formDto 定时入参
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author zhy
+     * @date 2021/6/28 10:57
+     */
+    @PostMapping("analysis/data/stats/basereport/gridproject")
+    Result gridproject(ScreenJobFormDTO formDto);
+
+    /**
+     * 组织项目数据
+     *
+     * @param formDto 定时入参
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author zhy
+     * @date 2021/6/28 10:57
+     */
+    @PostMapping("analysis/data/stats/basereport/agencyproject")
+    Result agencyproject(ScreenJobFormDTO formDto);
+
+    /**
+     * 网格群组总数
+     *
+     * @param formDto 定时入参
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author zhy
+     * @date 2021/6/28 10:57
+     */
+    @PostMapping("analysis/data/stats/basereport/gridgrouptotal")
+    Result gridgrouptotal(ScreenJobFormDTO formDto);
+
+    /**
+     * 组织群组总数
+     *
+     * @param formDto 定时入参
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author zhy
+     * @date 2021/6/28 10:57
+     */
+    @PostMapping("analysis/data/stats/basereport/agencygrouptotal")
+    Result agencygrouptotal(ScreenJobFormDTO formDto);
+
 }
diff --git a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java
index 1545b97..ab06bdd 100644
--- a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java
+++ b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java
@@ -299,4 +299,45 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient {
     public Result agencyRegUser(ScreenJobFormDTO formDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "agencyRegUser");
     }
+
+
+    @Override
+    public Result gridtopicstatus(ScreenJobFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "gridtopicstatus");
+    }
+
+    @Override
+    public Result agencytopicstatus(ScreenJobFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "agencytopicstatus");
+    }
+
+    @Override
+    public Result gridtopicissue(ScreenJobFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "gridtopicissue");
+    }
+
+    @Override
+    public Result agencytopicissue(ScreenJobFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "agencytopicissue");
+    }
+
+    @Override
+    public Result gridproject(ScreenJobFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "gridproject");
+    }
+
+    @Override
+    public Result agencyproject(ScreenJobFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "agencyproject");
+    }
+
+    @Override
+    public Result gridgrouptotal(ScreenJobFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "gridgrouptotal");
+    }
+
+    @Override
+    public Result agencygrouptotal(ScreenJobFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "agencygrouptotal");
+    }
 }
diff --git a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/ScreenBaseReportPushTaskImpl.java b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/ScreenBaseReportPushTaskImpl.java
index a63fe23..8c5711c 100644
--- a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/ScreenBaseReportPushTaskImpl.java
+++ b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/ScreenBaseReportPushTaskImpl.java
@@ -1,7 +1,7 @@
 package com.elink.esua.epdc.task.screen;
 
 import com.alibaba.fastjson.JSONObject;
-import com.elink.esua.epdc.dto.ScreenIndexBasicDataParamDTO;
+import com.elink.esua.epdc.dto.ScreenBaseReportParamDTO;
 import com.elink.esua.epdc.dto.screen.form.ScreenJobFormDTO;
 import com.elink.esua.epdc.feign.AnalysisFeignClient;
 import org.apache.commons.lang3.StringUtils;
@@ -27,23 +27,38 @@ public class ScreenBaseReportPushTaskImpl implements ScreenBaseReportPushTask {
     @Override
     public void run(String param) {
         // 参数处理
-        ScreenIndexBasicDataParamDTO paramDto = new ScreenIndexBasicDataParamDTO();
+        ScreenBaseReportParamDTO paramDto = new ScreenBaseReportParamDTO();
         if (StringUtils.isNotEmpty(param)) {
-            paramDto = JSONObject.parseObject(param, ScreenIndexBasicDataParamDTO.class);
+            paramDto = JSONObject.parseObject(param, ScreenBaseReportParamDTO.class);
         }
         // 01、网格热议话题数据
-        gridHotTopic(paramDto.getGridPartyMemberData());
+        gridHotTopic(paramDto.getGridHotTopic());
         // 02、组织热议话题数据
-        agencyHotTopic(paramDto.getGridPartyAbility());
+        agencyHotTopic(paramDto.getAgencyHotTopic());
         // 03、网格议题数据
-        gridIssue(paramDto.getOrgPartyAbility());
+        gridIssue(paramDto.getGridIssue());
         // 04、组织议题数据
-        agencyIssue(paramDto.getGridServiceAbility());
+        agencyIssue(paramDto.getAgencyIssue());
         // 05、网格注册用户数据
-        gridRegUser(paramDto.getOrgServiceAbility());
+        gridRegUser(paramDto.getGridRegUser());
         // 06、组织注册用户数据
-        agencyRegUser(paramDto.getGridGovernAbility());
+        agencyRegUser(paramDto.getAgencyRegUser());
 
+        gridtopicstatus(paramDto.getGridtopicstatus());
+
+        agencytopicstatus(paramDto.getAgencytopicstatus());
+
+        gridtopicissue(paramDto.getGridtopicissue());
+
+        agencytopicissue(paramDto.getAgencytopicissue());
+
+        gridproject(paramDto.getGridproject());
+
+        agencyproject(paramDto.getAgencyproject());
+
+        gridgrouptotal(paramDto.getGridgrouptotal());
+
+        agencygrouptotal(paramDto.getAgencygrouptotal());
     }
 
     /**
@@ -154,4 +169,149 @@ public class ScreenBaseReportPushTaskImpl implements ScreenBaseReportPushTask {
         logger.info("<" + methodName + "|组织注册用户数据>定时任务执行结束");
     }
 
+
+    /**
+     * 网格状态话题数据
+     *
+     * @param yearMonth
+     * @return void
+     * @author zhy
+     * @date 2021/6/28 10:48
+     */
+    public void gridtopicstatus(String yearMonth) {
+        ScreenJobFormDTO formDto = new ScreenJobFormDTO();
+        formDto.setYearMonth(yearMonth);
+        // 方法名
+        String methodName = Thread.currentThread().getStackTrace()[2].getMethodName();
+        logger.info("<" + methodName + "|网格状态话题数据>定时任务开始执行");
+        analysisFeignClient.gridtopicstatus(formDto);
+        logger.info("<" + methodName + "|网格状态话题数据>定时任务执行结束");
+    }
+
+    /**
+     * 组织状态话题数据
+     *
+     * @param yearMonth
+     * @return void
+     * @author zhy
+     * @date 2021/6/28 10:48
+     */
+    public void agencytopicstatus(String yearMonth) {
+        ScreenJobFormDTO formDto = new ScreenJobFormDTO();
+        formDto.setYearMonth(yearMonth);
+        // 方法名
+        String methodName = Thread.currentThread().getStackTrace()[2].getMethodName();
+        logger.info("<" + methodName + "|组织状态话题数据>定时任务开始执行");
+        analysisFeignClient.agencytopicstatus(formDto);
+        logger.info("<" + methodName + "|组织状态话题数据>定时任务执行结束");
+    }
+
+    /**
+     * 网格话题转议题数据
+     *
+     * @param yearMonth
+     * @return void
+     * @author zhy
+     * @date 2021/6/28 10:48
+     */
+    public void gridtopicissue(String yearMonth) {
+        ScreenJobFormDTO formDto = new ScreenJobFormDTO();
+        formDto.setYearMonth(yearMonth);
+        // 方法名
+        String methodName = Thread.currentThread().getStackTrace()[2].getMethodName();
+        logger.info("<" + methodName + "|网格话题转议题数据>定时任务开始执行");
+        analysisFeignClient.gridtopicissue(formDto);
+        logger.info("<" + methodName + "|网格话题转议题数据>定时任务执行结束");
+    }
+
+    /**
+     * 网格话题转议题数据
+     *
+     * @param yearMonth
+     * @return void
+     * @author zhy
+     * @date 2021/6/28 10:48
+     */
+    public void agencytopicissue(String yearMonth) {
+        ScreenJobFormDTO formDto = new ScreenJobFormDTO();
+        formDto.setYearMonth(yearMonth);
+        // 方法名
+        String methodName = Thread.currentThread().getStackTrace()[2].getMethodName();
+        logger.info("<" + methodName + "|网格话题转议题数据>定时任务开始执行");
+        analysisFeignClient.agencytopicissue(formDto);
+        logger.info("<" + methodName + "|网格话题转议题数据>定时任务执行结束");
+    }
+
+    /**
+     * 网格项目数据
+     *
+     * @param yearMonth
+     * @return void
+     * @author zhy
+     * @date 2021/6/28 10:48
+     */
+    public void gridproject(String yearMonth) {
+        ScreenJobFormDTO formDto = new ScreenJobFormDTO();
+        formDto.setYearMonth(yearMonth);
+        // 方法名
+        String methodName = Thread.currentThread().getStackTrace()[2].getMethodName();
+        logger.info("<" + methodName + "|网格项目数据>定时任务开始执行");
+        analysisFeignClient.gridproject(formDto);
+        logger.info("<" + methodName + "|网格项目数据>定时任务执行结束");
+    }
+
+    /**
+     * 组织项目数据
+     *
+     * @param yearMonth
+     * @return void
+     * @author zhy
+     * @date 2021/6/28 10:48
+     */
+    public void agencyproject(String yearMonth) {
+        ScreenJobFormDTO formDto = new ScreenJobFormDTO();
+        formDto.setYearMonth(yearMonth);
+        // 方法名
+        String methodName = Thread.currentThread().getStackTrace()[2].getMethodName();
+        logger.info("<" + methodName + "|组织项目数据>定时任务开始执行");
+        analysisFeignClient.agencyproject(formDto);
+        logger.info("<" + methodName + "|组织项目数据>定时任务执行结束");
+    }
+
+    /**
+     * 网格群组总数
+     *
+     * @param yearMonth
+     * @return void
+     * @author zhy
+     * @date 2021/6/28 10:48
+     */
+    public void gridgrouptotal(String yearMonth) {
+        ScreenJobFormDTO formDto = new ScreenJobFormDTO();
+        formDto.setYearMonth(yearMonth);
+        // 方法名
+        String methodName = Thread.currentThread().getStackTrace()[2].getMethodName();
+        logger.info("<" + methodName + "|网格群组总数>定时任务开始执行");
+        analysisFeignClient.gridgrouptotal(formDto);
+        logger.info("<" + methodName + "|网格群组总数>定时任务执行结束");
+    }
+
+    /**
+     * 组织群组总数
+     *
+     * @param yearMonth
+     * @return void
+     * @author zhy
+     * @date 2021/6/28 10:48
+     */
+    public void agencygrouptotal(String yearMonth) {
+        ScreenJobFormDTO formDto = new ScreenJobFormDTO();
+        formDto.setYearMonth(yearMonth);
+        // 方法名
+        String methodName = Thread.currentThread().getStackTrace()[2].getMethodName();
+        logger.info("<" + methodName + "|组织群组总数>定时任务开始执行");
+        analysisFeignClient.agencygrouptotal(formDto);
+        logger.info("<" + methodName + "|组织群组总数>定时任务执行结束");
+    }
+
 }