diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java
index 3b03d3768d..74af482075 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java
@@ -177,143 +177,155 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
             threadPool.submit(() -> {
                 //党员基本情况screen_cpc_base_data
                 try {
-                    partyBaseInfoService.statsPartyMemberBaseInfoToScreen(customerId, dateId);
-                } catch (Exception e) {
-                    log.error("党员基本情况抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
-                }
-                //先锋模范screen_pioneer_data
-                if (isLast) {
                     try {
-                        pioneerDataExtractService.extractGridPioneerData(customerId, dateId);
+                        partyBaseInfoService.statsPartyMemberBaseInfoToScreen(customerId, dateId);
                     } catch (Exception e) {
-                        log.error("先锋模范【网格】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+                        log.error("党员基本情况抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
                     }
-                    try {
-                        pioneerDataExtractService.extractCommunityPioneerData(customerId, dateId);
-                    } catch (Exception e) {
-                        log.error("先锋模范【社区】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
-                    }
-                    try {
-                        pioneerDataExtractService.extractExceptCommunityPioneerData(customerId, dateId);
-                    } catch (Exception e) {
-                        log.error("先锋模范【extractExceptCommunityPioneerData】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+                    //先锋模范screen_pioneer_data
+                    if (isLast) {
+                        try {
+                            pioneerDataExtractService.extractGridPioneerData(customerId, dateId);
+                        } catch (Exception e) {
+                            log.error("先锋模范【网格】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+                        }
+                        try {
+                            pioneerDataExtractService.extractCommunityPioneerData(customerId, dateId);
+                        } catch (Exception e) {
+                            log.error("先锋模范【社区】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+                        }
+                        try {
+                            pioneerDataExtractService.extractExceptCommunityPioneerData(customerId, dateId);
+                        } catch (Exception e) {
+                            log.error("先锋模范【extractExceptCommunityPioneerData】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+                        }
                     }
+                } finally {
+                    latch.countDown();
+                    log.info("extractDaily 1 thread run end ========= dateId:{},customerId:{}", dateId, customerId);
                 }
 
-                latch.countDown();
-                log.info("extractDaily 1 thread run end ========= dateId:{},customerId:{}", dateId, customerId);
             });
             threadPool.submit(() -> {
                 //公众参与排行（注册人数、参与人数、话题数、议题数、项目数）screen_public_party_total_data
                 try {
-                    publicPartiTotalDataExtractService.extractPublicPartiTotalData(customerId, dateId);
-                } catch (Exception e) {
-                    log.error("公众参与排行抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
-                }
-                if (isLast) {
-                    //基层治理- 难点赌点 screen_difficulty_data  |  screen_difficulty_img_data
                     try {
-                        ScreenCentralZoneDataFormDTO param2 = new ScreenCentralZoneDataFormDTO();
-                        param2.setCustomerId(customerId);
-                        param2.setDateId(null);
-                        log.info("【难点赌点数据上报开始------】 当前客户Id{}", param2.getCustomerId());
-                        //screenGrassrootsGovernDataAbsorptionService.difficultyDataHub(param);
-
-                        screenGrassrootsGovernDataAbsorptionService.difficultyDataExtract(param2);
-                        log.info("【难点赌点数据上报结束------】 当前客户Id{}", param2.getCustomerId());
+                        publicPartiTotalDataExtractService.extractPublicPartiTotalData(customerId, dateId);
                     } catch (Exception e) {
-                        log.error("基层治理-难点赌点抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+                        log.error("公众参与排行抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+                    }
+                    if (isLast) {
+                        //基层治理- 难点赌点 screen_difficulty_data  |  screen_difficulty_img_data
+                        try {
+                            ScreenCentralZoneDataFormDTO param2 = new ScreenCentralZoneDataFormDTO();
+                            param2.setCustomerId(customerId);
+                            param2.setDateId(null);
+                            log.info("【难点赌点数据上报开始------】 当前客户Id{}", param2.getCustomerId());
+                            //screenGrassrootsGovernDataAbsorptionService.difficultyDataHub(param);
+
+                            screenGrassrootsGovernDataAbsorptionService.difficultyDataExtract(param2);
+                            log.info("【难点赌点数据上报结束------】 当前客户Id{}", param2.getCustomerId());
+                        } catch (Exception e) {
+                            log.error("基层治理-难点赌点抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+                        }
                     }
+                } finally {
+                    latch.countDown();
+                    log.info("extractDaily 2 thread run end ========= dateId:{},customerId:{}", dateId, customerId);
                 }
-                latch.countDown();
-                log.info("extractDaily 2 thread run end ========= dateId:{},customerId:{}", dateId, customerId);
             });
             threadPool.submit(() -> {
-                ScreenCentralZoneDataFormDTO param = new ScreenCentralZoneDataFormDTO();
-                param.setCustomerId(customerId);
-                param.setDateId(dateId);
-                //中央区 screen_user_total_data
                 try {
-                    screenCentralZoneDataAbsorptionService.centralZoneDataHub(param);
-                } catch (Exception e) {
-                    log.error("中央区抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
-                }
+                    ScreenCentralZoneDataFormDTO param = new ScreenCentralZoneDataFormDTO();
+                    param.setCustomerId(customerId);
+                    param.setDateId(dateId);
+                    //中央区 screen_user_total_data
+                    try {
+                        screenCentralZoneDataAbsorptionService.centralZoneDataHub(param);
+                    } catch (Exception e) {
+                        log.error("中央区抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+                    }
 
-                try {
-                    // 项目(事件)分析按网格_按天统计
-                    screenProjectGridDailyService.extractionProjectGridDaily(customerId, dateId);
-                } catch (Exception e) {
-                    log.error("项目(事件)分析按网格_按天统计失败，customerId为：" + customerId + "dateId为：" + dateId, e);
-                }
-                try {
-                    // 项目(事件)分析按组织_按天统计
-                    screenProjectOrgDailyService.extractionProjectOrgDaily(customerId, dateId);
-                } catch (Exception e) {
-                    log.error("项目(事件)分析按组织_按天统计失败，customerId为：" + customerId + "dateId为：" + dateId, e);
-                }
+                    try {
+                        // 项目(事件)分析按网格_按天统计
+                        screenProjectGridDailyService.extractionProjectGridDaily(customerId, dateId);
+                    } catch (Exception e) {
+                        log.error("项目(事件)分析按网格_按天统计失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+                    }
+                    try {
+                        // 项目(事件)分析按组织_按天统计
+                        screenProjectOrgDailyService.extractionProjectOrgDaily(customerId, dateId);
+                    } catch (Exception e) {
+                        log.error("项目(事件)分析按组织_按天统计失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+                    }
 
-                //按天统计：网格内各个分类下的项目总数
-                try {
-                    screenProjectCategoryGridAndOrgDailyService.extractCategoryProjectGridData(customerId, dateId);
-                } catch (Exception e) {
-                    log.error("按天统计：网格内各个分类下的项目总数，customerId为：" + customerId + "dateId为：" + dateId, e);
-                }
+                    //按天统计：网格内各个分类下的项目总数
+                    try {
+                        screenProjectCategoryGridAndOrgDailyService.extractCategoryProjectGridData(customerId, dateId);
+                    } catch (Exception e) {
+                        log.error("按天统计：网格内各个分类下的项目总数，customerId为：" + customerId + "dateId为：" + dateId, e);
+                    }
 
-                // 按天统计：组织内各个分类下的项目总数
-                try {
-                    screenProjectCategoryGridAndOrgDailyService.extractCategoryProjectOrgData(customerId, dateId);
-                } catch (Exception e) {
-                    log.error("按天统计：组织内各个分类下的项目总数，customerId为：" + customerId + "dateId为：" + dateId, e);
+                    // 按天统计：组织内各个分类下的项目总数
+                    try {
+                        screenProjectCategoryGridAndOrgDailyService.extractCategoryProjectOrgData(customerId, dateId);
+                    } catch (Exception e) {
+                        log.error("按天统计：组织内各个分类下的项目总数，customerId为：" + customerId + "dateId为：" + dateId, e);
+                    }
+                } finally {
+                    latch.countDown();
+                    log.info("extractDaily 3 thread run end ========= dateId:{},customerId:{}", dateId, customerId);
                 }
-                latch.countDown();
-                log.info("extractDaily 3 thread run end ========= dateId:{},customerId:{}", dateId, customerId);
             });
             threadPool.submit(() -> {
                 //治理能力排行screen_govern_rank_data
                 try {
-                    governRankDataExtractService.extractGridDataDaily(customerId, dateId);
-                } catch (Exception e) {
-                    log.error("治理能力排行【网格】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
-                }
-                try {
-                    governRankDataExtractService.extractCommunityDataDaily(customerId, dateId);
-                } catch (Exception e) {
-                    log.error("治理能力排行【社区】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
-                }
-                try {
-                    governRankDataExtractService.extractStreetDataDaily(customerId, dateId);
-                } catch (Exception e) {
-                    log.error("治理能力排行【街道】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
-                }
-                try {
-                    governRankDataExtractService.extractDistrictDataDaily(customerId, dateId);
-                } catch (Exception e) {
-                    log.error("治理能力排行【全区】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
-                }
+                    try {
+                        governRankDataExtractService.extractGridDataDaily(customerId, dateId);
+                    } catch (Exception e) {
+                        log.error("治理能力排行【网格】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+                    }
+                    try {
+                        governRankDataExtractService.extractCommunityDataDaily(customerId, dateId);
+                    } catch (Exception e) {
+                        log.error("治理能力排行【社区】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+                    }
+                    try {
+                        governRankDataExtractService.extractStreetDataDaily(customerId, dateId);
+                    } catch (Exception e) {
+                        log.error("治理能力排行【街道】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+                    }
+                    try {
+                        governRankDataExtractService.extractDistrictDataDaily(customerId, dateId);
+                    } catch (Exception e) {
+                        log.error("治理能力排行【全区】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+                    }
 
-                try {
-                    ExtractFactGridGovernDailyFromDTO extractFactGridGovernDailyFromDTO = new ExtractFactGridGovernDailyFromDTO();
-                    extractFactGridGovernDailyFromDTO.setCustomerId(customerId);
-                    extractFactGridGovernDailyFromDTO.setDateId(dateId);
-                    factGridGovernDailyService.extractFactGridGovernDaily(extractFactGridGovernDailyFromDTO);
-                } catch (Exception e) {
-                    log.error("治理指数-网格fact_grid_govern_daily抽取失败，customerId为：" + customerId + "dateId为：" + dateId, e);
-                }
+                    try {
+                        ExtractFactGridGovernDailyFromDTO extractFactGridGovernDailyFromDTO = new ExtractFactGridGovernDailyFromDTO();
+                        extractFactGridGovernDailyFromDTO.setCustomerId(customerId);
+                        extractFactGridGovernDailyFromDTO.setDateId(dateId);
+                        factGridGovernDailyService.extractFactGridGovernDaily(extractFactGridGovernDailyFromDTO);
+                    } catch (Exception e) {
+                        log.error("治理指数-网格fact_grid_govern_daily抽取失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+                    }
 
-                try {
-                    factAgencyGovernDailyService.extractFactAgencyGovernDaily(customerId, dateId);
-                } catch (Exception e) {
-                    log.error("治理指数-组织fact_agency_govern_daily抽取失败，customerId为：" + customerId + "dateId为：" + dateId, e);
-                }
+                    try {
+                        factAgencyGovernDailyService.extractFactAgencyGovernDaily(customerId, dateId);
+                    } catch (Exception e) {
+                        log.error("治理指数-组织fact_agency_govern_daily抽取失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+                    }
 
-                try {
-                    factGridMemberStatisticsDailyService.extractGridMemberStatisticsDaily(customerId, dateId);
-                } catch (Exception e) {
-                    log.error("网格员数据统计fact_grid_member_statistics_daily抽取失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+                    try {
+                        factGridMemberStatisticsDailyService.extractGridMemberStatisticsDaily(customerId, dateId);
+                    } catch (Exception e) {
+                        log.error("网格员数据统计fact_grid_member_statistics_daily抽取失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+                    }
+                    extractPartData(customerId, dateId);
+                } finally {
+                    latch.countDown();
+                    log.info("extractDaily 4 thread run end ========= dateId:{},customerId:{}", dateId, customerId);
                 }
-                extractPartData(customerId, dateId);
-                latch.countDown();
-                log.info("extractDaily 4 thread run end ========= dateId:{},customerId:{}", dateId, customerId);
             });
             try {
                 latch.await();
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java
index fcdcf05349..e2597eae16 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java
@@ -352,7 +352,7 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
                 entity.setProjectId(project.getProjectId());
                 entity.setOriginCategoryCode(category);
                 CustomerProjectCategoryDictEntity categoryEntity = customerProjectCategoryDictService.getByCategoryCode(customerId, category);
-                if (null != categoryEntity) {
+                if (null == categoryEntity) {
                     log.error("customerId:{} categoryCode:{} is not exist in ProjectCategoryDict", customerId, category);
                     return;
                 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/BaseReportServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/BaseReportServiceImpl.java
index c6d884c32e..1f8fdf806c 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/BaseReportServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/BaseReportServiceImpl.java
@@ -60,7 +60,7 @@ public class BaseReportServiceImpl implements BaseReportService {
         }
         if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
             ListUtils.partition(formDTO.getDataList(),NumConstant.ONE_HUNDRED)
-                    .forEach(part->baseReportDao.insertBatchAgencyRegUser(part);
+                    .forEach(part->baseReportDao.insertBatchAgencyRegUser(part));
         }
     }
 
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/UserDemandPageFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/UserDemandPageFormDTO.java
index 265a88b5f1..82dd913b31 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/UserDemandPageFormDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/UserDemandPageFormDTO.java
@@ -43,13 +43,13 @@ public class UserDemandPageFormDTO extends PageFormDTO implements Serializable {
      * 上报时间开始
      */
     @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date reportStartDate;
+    private Date reportStartTime;
 
     /**
      * 上报时间截止
      */
     @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date reportEndDate;
+    private Date reportEndTime;
 
     /**
      * 待处理：pending；已取消canceled；已派单：assigned；已接单：have_order；已完成：finished
@@ -73,11 +73,11 @@ public class UserDemandPageFormDTO extends PageFormDTO implements Serializable {
      * 希望服务时间开始
      */
     @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date wantServiceStartDate;
+    private Date wantServiceStartTime;
 
     /**
      * 希望截止
      */
     @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date wantServiceEndDate;
+    private Date wantServiceEndTime;
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml
index 33d471906e..72ac018284 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml
@@ -93,11 +93,11 @@
             <if test="null != demandUserName and demandUserName !='' ">
                 and r.DEMAND_USER_NAME like concat('%',#{demandUserName},'%')
             </if>
-            <if test=" null != reportStartDate and reportStartDate != '' ">
-                AND DATE_FORMAT(r.REPORT_TIME,'%Y-%m-%d') <![CDATA[ >= ]]> #{reportStartDate}
+            <if test=" null != reportStartTime and reportStartTime != '' ">
+                AND DATE_FORMAT(r.REPORT_TIME,'%Y-%m-%d') <![CDATA[ >= ]]> #{reportStartTime}
             </if>
-            <if test="null != reportEndDate and reportEndDate != '' ">
-                AND DATE_FORMAT(r.REPORT_TIME,'%Y-%m-%d') <![CDATA[ <= ]]> #{reportEndDate}
+            <if test="null != reportEndTime and reportEndTime != '' ">
+                AND DATE_FORMAT(r.REPORT_TIME,'%Y-%m-%d') <![CDATA[ <= ]]> #{reportEndTime}
             </if>
             <if test="null != status and status != '' ">
                 and r.STATUS=#{status}
@@ -108,11 +108,11 @@
             <if test="null != serverId and serverId != '' ">
                 and s.SERVER_ID=#{serverId}
             </if>
-            <if test=" null != wantServiceStartDate and wantServiceStartDate != '' ">
-                AND DATE_FORMAT(r.WANT_SERVICE_TIME,'%Y-%m-%d') <![CDATA[ >= ]]> #{wantServiceStartDate}
+            <if test=" null != wantServiceStartTime and wantServiceStartTime != '' ">
+                AND DATE_FORMAT(r.WANT_SERVICE_TIME,'%Y-%m-%d') <![CDATA[ >= ]]> #{wantServiceStartTime}
             </if>
-            <if test="null != wantServiceEndDate and wantServiceEndDate != '' ">
-                AND DATE_FORMAT(r.WANT_SERVICE_TIME,'%Y-%m-%d') <![CDATA[ <= ]]> #{wantServiceEndDate}
+            <if test="null != wantServiceEndTime and wantServiceEndTime != '' ">
+                AND DATE_FORMAT(r.WANT_SERVICE_TIME,'%Y-%m-%d') <![CDATA[ <= ]]> #{wantServiceEndTime}
             </if>
             order by r.WANT_SERVICE_TIME desc,r.CREATED_TIME asc
     </select>