diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/constant/DataSourceConstant.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/constant/DataSourceConstant.java
index b640b06b67..d1e438d81a 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/constant/DataSourceConstant.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/constant/DataSourceConstant.java
@@ -5,7 +5,7 @@ public interface DataSourceConstant {
     /**
      * 统计数据库
      */
-    String STATS = "stats";
+    String EVALUATION_INDEX = "evaluationIndex";
     String STATS_DISPLAY = "statsDisplay";
 
 }
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/constant/ScreenConstant.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/constant/ScreenConstant.java
similarity index 82%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/constant/ScreenConstant.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/constant/ScreenConstant.java
index b1a25cf947..e3ac468fcf 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/constant/ScreenConstant.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/constant/ScreenConstant.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.constant;
+package com.epmet.evaluationindex.screen.constant;
 
 /**
  * @Author zxc
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/AgencyAndNumFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/AgencyAndNumFormDTO.java
similarity index 93%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/AgencyAndNumFormDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/AgencyAndNumFormDTO.java
index a20c10ce80..cd31c9688b 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/AgencyAndNumFormDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/AgencyAndNumFormDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.form;
+package com.epmet.evaluationindex.screen.dto.form;
 
 import lombok.Data;
 
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/AgencyFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/AgencyFormDTO.java
similarity index 92%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/AgencyFormDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/AgencyFormDTO.java
index a9e479e3a5..166c9c2aa9 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/AgencyFormDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/AgencyFormDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.form;
+package com.epmet.evaluationindex.screen.dto.form;
 
 
 import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/AgencyNumTypeParamFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/AgencyNumTypeParamFormDTO.java
similarity index 94%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/AgencyNumTypeParamFormDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/AgencyNumTypeParamFormDTO.java
index 04dfc0625e..9e2e3c74a9 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/AgencyNumTypeParamFormDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/AgencyNumTypeParamFormDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.form;
+package com.epmet.evaluationindex.screen.dto.form;
 
 import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/BranchBuildRankFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/BranchBuildRankFormDTO.java
similarity index 96%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/BranchBuildRankFormDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/BranchBuildRankFormDTO.java
index 458f2e4af5..43604bceb3 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/BranchBuildRankFormDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/BranchBuildRankFormDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.form;
+package com.epmet.evaluationindex.screen.dto.form;
 
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/BranchBuildTrendFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/BranchBuildTrendFormDTO.java
similarity index 96%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/BranchBuildTrendFormDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/BranchBuildTrendFormDTO.java
index 1d68458b20..9a0edf4677 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/BranchBuildTrendFormDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/BranchBuildTrendFormDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.form;
+package com.epmet.evaluationindex.screen.dto.form;
 
 import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/BranchFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/BranchFormDTO.java
similarity index 89%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/BranchFormDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/BranchFormDTO.java
index 89a7bc5eaa..4094c81647 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/BranchFormDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/BranchFormDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.form;
+package com.epmet.evaluationindex.screen.dto.form;
 
 import lombok.Data;
 
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/CompartmentFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/CompartmentFormDTO.java
similarity index 90%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/CompartmentFormDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/CompartmentFormDTO.java
index 3571ff7bb6..dd4be9746b 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/CompartmentFormDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/CompartmentFormDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.form;
+package com.epmet.evaluationindex.screen.dto.form;
 
 import lombok.Data;
 
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/ContactMassLineChartFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/ContactMassLineChartFormDTO.java
similarity index 90%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/ContactMassLineChartFormDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/ContactMassLineChartFormDTO.java
index e82038de21..c2deeac60b 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/ContactMassLineChartFormDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/ContactMassLineChartFormDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.form;
+package com.epmet.evaluationindex.screen.dto.form;
 
 import lombok.Data;
 
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/FineExampleFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/FineExampleFormDTO.java
similarity index 90%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/FineExampleFormDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/FineExampleFormDTO.java
index 1840c3048b..5ed5b9fc1a 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/FineExampleFormDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/FineExampleFormDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.form;
+package com.epmet.evaluationindex.screen.dto.form;
 
 import lombok.Data;
 
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/MonthBarchartFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/MonthBarchartFormDTO.java
similarity index 90%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/MonthBarchartFormDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/MonthBarchartFormDTO.java
index ad454ff8dc..b6e0141d6a 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/MonthBarchartFormDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/MonthBarchartFormDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.form;
+package com.epmet.evaluationindex.screen.dto.form;
 
 import lombok.Data;
 
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/MonthPieChartFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/MonthPieChartFormDTO.java
similarity index 90%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/MonthPieChartFormDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/MonthPieChartFormDTO.java
index 0c188f427e..a5e9c53f26 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/MonthPieChartFormDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/MonthPieChartFormDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.form;
+package com.epmet.evaluationindex.screen.dto.form;
 
 import lombok.Data;
 
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/ParymemberFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/ParymemberFormDTO.java
similarity index 90%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/ParymemberFormDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/ParymemberFormDTO.java
index ee06b313d1..fdf525f37b 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/ParymemberFormDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/ParymemberFormDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.form;
+package com.epmet.evaluationindex.screen.dto.form;
 
 import lombok.Data;
 
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/ProjectDetailFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/ProjectDetailFormDTO.java
similarity index 92%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/ProjectDetailFormDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/ProjectDetailFormDTO.java
index 88744ad004..756095fe1c 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/ProjectDetailFormDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/ProjectDetailFormDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.form;
+package com.epmet.evaluationindex.screen.dto.form;
 
 import lombok.Data;
 
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/ProjectFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/ProjectFormDTO.java
similarity index 89%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/ProjectFormDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/ProjectFormDTO.java
index 445cefc453..6c906e906f 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/ProjectFormDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/ProjectFormDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.form;
+package com.epmet.evaluationindex.screen.dto.form;
 
 import lombok.Data;
 
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/SubAgencyIndexRankFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/SubAgencyIndexRankFormDTO.java
similarity index 93%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/SubAgencyIndexRankFormDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/SubAgencyIndexRankFormDTO.java
index 3410d0638f..608c6b0492 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/SubAgencyIndexRankFormDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/SubAgencyIndexRankFormDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.form;
+package com.epmet.evaluationindex.screen.dto.form;
 
 import lombok.Data;
 
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/TopProfileFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/TopProfileFormDTO.java
similarity index 90%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/TopProfileFormDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/TopProfileFormDTO.java
index 6b0d00dae1..ffe73581a2 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/TopProfileFormDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/TopProfileFormDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.form;
+package com.epmet.evaluationindex.screen.dto.form;
 
 import lombok.Data;
 
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/UserFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/UserFormDTO.java
similarity index 89%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/UserFormDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/UserFormDTO.java
index 4a3b23da00..31b432e725 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/UserFormDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/UserFormDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.form;
+package com.epmet.evaluationindex.screen.dto.form;
 
 import lombok.Data;
 
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/VolunteerServiceFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/VolunteerServiceFormDTO.java
similarity index 90%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/VolunteerServiceFormDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/VolunteerServiceFormDTO.java
index 510bb5ec41..6df6c28ba1 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/VolunteerServiceFormDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/VolunteerServiceFormDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.form;
+package com.epmet.evaluationindex.screen.dto.form;
 
 import lombok.Data;
 
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/YearAverageIndexFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/YearAverageIndexFormDTO.java
similarity index 90%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/YearAverageIndexFormDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/YearAverageIndexFormDTO.java
index 80d526bd48..e53a94cfa9 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/YearAverageIndexFormDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/YearAverageIndexFormDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.form;
+package com.epmet.evaluationindex.screen.dto.form;
 
 import lombok.Data;
 
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/AdvanceBranchRankResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/AdvanceBranchRankResultDTO.java
similarity index 95%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/AdvanceBranchRankResultDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/AdvanceBranchRankResultDTO.java
index 912aedc1df..60545c7fc4 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/AdvanceBranchRankResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/AdvanceBranchRankResultDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.result;
+package com.epmet.evaluationindex.screen.dto.result;
 
 import lombok.Data;
 
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/AgencyDistributionResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/AgencyDistributionResultDTO.java
similarity index 92%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/AgencyDistributionResultDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/AgencyDistributionResultDTO.java
index da0a5a389e..753cf368dd 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/AgencyDistributionResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/AgencyDistributionResultDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.result;
+package com.epmet.evaluationindex.screen.dto.result;
 
 import lombok.Data;
 
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchBuildOrderByCountResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/BranchBuildOrderByCountResultDTO.java
similarity index 89%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchBuildOrderByCountResultDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/BranchBuildOrderByCountResultDTO.java
index d6ba6ae18b..60448888de 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchBuildOrderByCountResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/BranchBuildOrderByCountResultDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.result;
+package com.epmet.evaluationindex.screen.dto.result;
 
 import lombok.Data;
 
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchBuildRankResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/BranchBuildRankResultDTO.java
similarity index 92%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchBuildRankResultDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/BranchBuildRankResultDTO.java
index f7593319e1..f9c08afaea 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchBuildRankResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/BranchBuildRankResultDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.result;
+package com.epmet.evaluationindex.screen.dto.result;
 
 import lombok.Data;
 
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchBuildTrendResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/BranchBuildTrendResultDTO.java
similarity index 95%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchBuildTrendResultDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/BranchBuildTrendResultDTO.java
index ee30981a68..fc3fc3958d 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchBuildTrendResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/BranchBuildTrendResultDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.result;
+package com.epmet.evaluationindex.screen.dto.result;
 
 import com.epmet.commons.tools.constant.NumConstant;
 import lombok.Data;
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchIssueDataResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/BranchIssueDataResultDTO.java
similarity index 87%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchIssueDataResultDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/BranchIssueDataResultDTO.java
index 65a6888047..7708001e26 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchIssueDataResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/BranchIssueDataResultDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.result;
+package com.epmet.evaluationindex.screen.dto.result;
 
 import lombok.Data;
 
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/BranchResultDTO.java
similarity index 89%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchResultDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/BranchResultDTO.java
index f4a611cc10..431859c7d3 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/BranchResultDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.result;
+package com.epmet.evaluationindex.screen.dto.result;
 
 import lombok.Data;
 
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchTrendSeriesDataResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/BranchTrendSeriesDataResultDTO.java
similarity index 91%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchTrendSeriesDataResultDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/BranchTrendSeriesDataResultDTO.java
index 7d5f415547..c1a921508f 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchTrendSeriesDataResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/BranchTrendSeriesDataResultDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.result;
+package com.epmet.evaluationindex.screen.dto.result;
 
 import lombok.Data;
 
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/CompartmentResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/CompartmentResultDTO.java
similarity index 94%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/CompartmentResultDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/CompartmentResultDTO.java
index 2bf8ffd3d6..b959cf8ea7 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/CompartmentResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/CompartmentResultDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.result;
+package com.epmet.evaluationindex.screen.dto.result;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ContactMassLineChartResult.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ContactMassLineChartResult.java
similarity index 89%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ContactMassLineChartResult.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ContactMassLineChartResult.java
index e77c336fbe..2cac006003 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ContactMassLineChartResult.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ContactMassLineChartResult.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.result;
+package com.epmet.evaluationindex.screen.dto.result;
 
 import lombok.Data;
 
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ContactMassLineChartResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ContactMassLineChartResultDTO.java
similarity index 93%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ContactMassLineChartResultDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ContactMassLineChartResultDTO.java
index 5a2b93acd9..69b5244ae0 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ContactMassLineChartResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ContactMassLineChartResultDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.result;
+package com.epmet.evaluationindex.screen.dto.result;
 
 import com.epmet.commons.tools.constant.NumConstant;
 import lombok.Data;
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/DifficultProjectResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/DifficultProjectResultDTO.java
similarity index 94%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/DifficultProjectResultDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/DifficultProjectResultDTO.java
index e89155d00c..fb37328232 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/DifficultProjectResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/DifficultProjectResultDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.result;
+package com.epmet.evaluationindex.screen.dto.result;
 
 import lombok.Data;
 
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/FineExampleResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/FineExampleResultDTO.java
similarity index 96%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/FineExampleResultDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/FineExampleResultDTO.java
index a81f45fc05..b522e3166c 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/FineExampleResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/FineExampleResultDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.result;
+package com.epmet.evaluationindex.screen.dto.result;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/GovernCapacityRankResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GovernCapacityRankResultDTO.java
similarity index 93%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/GovernCapacityRankResultDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GovernCapacityRankResultDTO.java
index 318b290840..0f6b481e1c 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/GovernCapacityRankResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GovernCapacityRankResultDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.result;
+package com.epmet.evaluationindex.screen.dto.result;
 
 import lombok.Data;
 
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/GovernCapacityResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GovernCapacityResultDTO.java
similarity index 93%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/GovernCapacityResultDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GovernCapacityResultDTO.java
index dd2c09cd94..f51fe26255 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/GovernCapacityResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GovernCapacityResultDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.result;
+package com.epmet.evaluationindex.screen.dto.result;
 
 import lombok.Data;
 
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/MonthBarchartResult.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/MonthBarchartResult.java
similarity index 88%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/MonthBarchartResult.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/MonthBarchartResult.java
index ebf0d9d276..ef79775673 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/MonthBarchartResult.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/MonthBarchartResult.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.result;
+package com.epmet.evaluationindex.screen.dto.result;
 
 import lombok.Data;
 
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/MonthBarchartResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/MonthBarchartResultDTO.java
similarity index 88%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/MonthBarchartResultDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/MonthBarchartResultDTO.java
index 479547a883..ad21904ba2 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/MonthBarchartResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/MonthBarchartResultDTO.java
@@ -1,6 +1,5 @@
-package com.epmet.screen.dto.result;
+package com.epmet.evaluationindex.screen.dto.result;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/MonthPieChartResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/MonthPieChartResultDTO.java
similarity index 90%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/MonthPieChartResultDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/MonthPieChartResultDTO.java
index 248f69d5ce..89ca2fd383 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/MonthPieChartResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/MonthPieChartResultDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.result;
+package com.epmet.evaluationindex.screen.dto.result;
 
 import lombok.Data;
 
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/OrgRankDataResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/OrgRankDataResultDTO.java
similarity index 94%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/OrgRankDataResultDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/OrgRankDataResultDTO.java
index 87a8d482c9..9aff92593f 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/OrgRankDataResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/OrgRankDataResultDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.result;
+package com.epmet.evaluationindex.screen.dto.result;
 
 import lombok.Data;
 
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/PartyUserPointResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PartyUserPointResultDTO.java
similarity index 92%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/PartyUserPointResultDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PartyUserPointResultDTO.java
index 5ae10cb73e..3450a623a6 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/PartyUserPointResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PartyUserPointResultDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.result;
+package com.epmet.evaluationindex.screen.dto.result;
 
 import lombok.Data;
 
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/PartymemberAgeDistributionResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PartymemberAgeDistributionResultDTO.java
similarity index 94%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/PartymemberAgeDistributionResultDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PartymemberAgeDistributionResultDTO.java
index 6ae70d9a67..4f9785b6b4 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/PartymemberAgeDistributionResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PartymemberAgeDistributionResultDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.result;
+package com.epmet.evaluationindex.screen.dto.result;
 
 import com.epmet.commons.tools.constant.NumConstant;
 import lombok.Data;
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/PartymemberAgePercentResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PartymemberAgePercentResultDTO.java
similarity index 94%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/PartymemberAgePercentResultDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PartymemberAgePercentResultDTO.java
index c5eec4d539..4a301f0ca0 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/PartymemberAgePercentResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PartymemberAgePercentResultDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.result;
+package com.epmet.evaluationindex.screen.dto.result;
 
 import lombok.Data;
 
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/PartymemberPercentResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PartymemberPercentResultDTO.java
similarity index 93%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/PartymemberPercentResultDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PartymemberPercentResultDTO.java
index eb8bc35184..a8ea84d711 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/PartymemberPercentResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PartymemberPercentResultDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.result;
+package com.epmet.evaluationindex.screen.dto.result;
 
 import com.epmet.commons.tools.constant.NumConstant;
 import lombok.Data;
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ParymemberDistributionResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ParymemberDistributionResultDTO.java
similarity index 94%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ParymemberDistributionResultDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ParymemberDistributionResultDTO.java
index 180d6fd3c8..71efdac8ff 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ParymemberDistributionResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ParymemberDistributionResultDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.result;
+package com.epmet.evaluationindex.screen.dto.result;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ParymemberResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ParymemberResultDTO.java
similarity index 94%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ParymemberResultDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ParymemberResultDTO.java
index 710ce303aa..a435dea3d3 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ParymemberResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ParymemberResultDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.result;
+package com.epmet.evaluationindex.screen.dto.result;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ProjectDetailResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ProjectDetailResultDTO.java
similarity index 93%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ProjectDetailResultDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ProjectDetailResultDTO.java
index 234fe38034..6ad86b371f 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ProjectDetailResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ProjectDetailResultDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.result;
+package com.epmet.evaluationindex.screen.dto.result;
 
 import lombok.Data;
 
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ProjectResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ProjectResultDTO.java
similarity index 92%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ProjectResultDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ProjectResultDTO.java
index 7a0a016b25..5eb58d4f4f 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ProjectResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ProjectResultDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.result;
+package com.epmet.evaluationindex.screen.dto.result;
 
 import lombok.Data;
 
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/PublicPartiChartResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PublicPartiChartResultDTO.java
similarity index 92%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/PublicPartiChartResultDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PublicPartiChartResultDTO.java
index 45f4f801ce..8f9ab22851 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/PublicPartiChartResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PublicPartiChartResultDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.result;
+package com.epmet.evaluationindex.screen.dto.result;
 
 import lombok.Data;
 
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/PublicPartiProfileResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PublicPartiProfileResultDTO.java
similarity index 95%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/PublicPartiProfileResultDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PublicPartiProfileResultDTO.java
index 52a127fd77..c5744d0cdd 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/PublicPartiProfileResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PublicPartiProfileResultDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.result;
+package com.epmet.evaluationindex.screen.dto.result;
 
 import com.epmet.commons.tools.constant.NumConstant;
 import lombok.Data;
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/PublicPartiRankResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PublicPartiRankResultDTO.java
similarity index 90%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/PublicPartiRankResultDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PublicPartiRankResultDTO.java
index b151901bdf..6d4eba5f4b 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/PublicPartiRankResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PublicPartiRankResultDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.result;
+package com.epmet.evaluationindex.screen.dto.result;
 
 import lombok.Data;
 
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/SubAgencyIndexRankResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/SubAgencyIndexRankResultDTO.java
similarity index 92%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/SubAgencyIndexRankResultDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/SubAgencyIndexRankResultDTO.java
index 5b0d89f39f..246b374752 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/SubAgencyIndexRankResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/SubAgencyIndexRankResultDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.result;
+package com.epmet.evaluationindex.screen.dto.result;
 
 import lombok.Data;
 
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/TopProfileResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/TopProfileResultDTO.java
similarity index 92%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/TopProfileResultDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/TopProfileResultDTO.java
index 607891f5bf..55c281db6c 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/TopProfileResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/TopProfileResultDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.result;
+package com.epmet.evaluationindex.screen.dto.result;
 
 import lombok.Data;
 
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/TreeResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/TreeResultDTO.java
similarity index 94%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/TreeResultDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/TreeResultDTO.java
index 0f28cda5b2..8de1c1d377 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/TreeResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/TreeResultDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.result;
+package com.epmet.evaluationindex.screen.dto.result;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/UserDistributionResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/UserDistributionResultDTO.java
similarity index 93%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/UserDistributionResultDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/UserDistributionResultDTO.java
index de772f423b..2476f0497b 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/UserDistributionResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/UserDistributionResultDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.result;
+package com.epmet.evaluationindex.screen.dto.result;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/UserJoinIndicatorGrowthRateResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/UserJoinIndicatorGrowthRateResultDTO.java
similarity index 94%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/UserJoinIndicatorGrowthRateResultDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/UserJoinIndicatorGrowthRateResultDTO.java
index cf870c9b18..a64f02a279 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/UserJoinIndicatorGrowthRateResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/UserJoinIndicatorGrowthRateResultDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.result;
+package com.epmet.evaluationindex.screen.dto.result;
 
 import lombok.Data;
 
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/UserJoinMonthlyResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/UserJoinMonthlyResultDTO.java
similarity index 90%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/UserJoinMonthlyResultDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/UserJoinMonthlyResultDTO.java
index b35ce13c58..3b91a42d4e 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/UserJoinMonthlyResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/UserJoinMonthlyResultDTO.java
@@ -1,7 +1,8 @@
-package com.epmet.screen.dto.result;
+package com.epmet.evaluationindex.screen.dto.result;
 
 
 import lombok.Data;
+
 import java.io.Serializable;
 
 
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/UserPointRankResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/UserPointRankResultDTO.java
similarity index 91%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/UserPointRankResultDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/UserPointRankResultDTO.java
index 43cc73e066..3a1330fa46 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/UserPointRankResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/UserPointRankResultDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.result;
+package com.epmet.evaluationindex.screen.dto.result;
 
 import lombok.Data;
 
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/UserPointResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/UserPointResultDTO.java
similarity index 87%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/UserPointResultDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/UserPointResultDTO.java
index 1f38d6886e..b58be28ff1 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/UserPointResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/UserPointResultDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.result;
+package com.epmet.evaluationindex.screen.dto.result;
 
 import lombok.Data;
 
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/UserResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/UserResultDTO.java
similarity index 94%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/UserResultDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/UserResultDTO.java
index 592b3fd4af..f46da9b45e 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/UserResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/UserResultDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.result;
+package com.epmet.evaluationindex.screen.dto.result;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/VolunteerServiceResult.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/VolunteerServiceResult.java
similarity index 90%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/VolunteerServiceResult.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/VolunteerServiceResult.java
index bc2d53edff..4ef1fd076a 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/VolunteerServiceResult.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/VolunteerServiceResult.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.result;
+package com.epmet.evaluationindex.screen.dto.result;
 
 import lombok.Data;
 
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/VolunteerServiceResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/VolunteerServiceResultDTO.java
similarity index 94%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/VolunteerServiceResultDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/VolunteerServiceResultDTO.java
index e255f61124..e0df20afee 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/VolunteerServiceResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/VolunteerServiceResultDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.result;
+package com.epmet.evaluationindex.screen.dto.result;
 
 import com.epmet.commons.tools.constant.NumConstant;
 import lombok.Data;
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/YearAverageIndexResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/YearAverageIndexResultDTO.java
similarity index 91%
rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/YearAverageIndexResultDTO.java
rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/YearAverageIndexResultDTO.java
index d05479d5d2..21c82e2e66 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/YearAverageIndexResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/YearAverageIndexResultDTO.java
@@ -1,4 +1,4 @@
-package com.epmet.screen.dto.result;
+package com.epmet.evaluationindex.screen.dto.result;
 
 import lombok.Data;
 
diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml
index 455ddbe25f..497f38df57 100644
--- a/epmet-module/data-report/data-report-server/pom.xml
+++ b/epmet-module/data-report/data-report-server/pom.xml
@@ -123,6 +123,12 @@
                 <datasource.druid.statsdisplay.username>epmet_data_stats_display_user</datasource.druid.statsdisplay.username>
                 <datasource.druid.statsdisplay.password>EpmEt-db-UsEr</datasource.druid.statsdisplay.password>
 
+                <datasource.druid.evaluationIndex.url>
+                    <![CDATA[jdbc:mysql://192.168.1.130:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.evaluationIndex.url>
+                <datasource.druid.evaluationIndex.username>epmet_evaluation_index_user</datasource.druid.evaluationIndex.username>
+                <datasource.druid.evaluationIndex.password>EpmEt-db-UsEr</datasource.druid.evaluationIndex.password>
+
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.130</spring.redis.host>
@@ -162,6 +168,19 @@
                 <datasource.druid.stats.username>epmet</datasource.druid.stats.username>
                 <datasource.druid.stats.password>elink@833066</datasource.druid.stats.password>
 
+                <datasource.druid.statsdisplay.url>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_data_statistical_display?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.statsdisplay.url>
+                <datasource.druid.statsdisplay.username>epmet</datasource.druid.statsdisplay.username>
+                <datasource.druid.statsdisplay.password>elink@833066</datasource.druid.statsdisplay.password>
+
+                <datasource.druid.evaluationIndex.url>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.evaluationIndex.url>
+                <datasource.druid.evaluationIndex.username>epmet</datasource.druid.evaluationIndex.username>
+                <datasource.druid.evaluationIndex.password>elink@833066</datasource.druid.evaluationIndex.password>
+
+
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
@@ -201,6 +220,18 @@
                 <datasource.druid.stats.username>epmet_data_statistical</datasource.druid.stats.username>
                 <datasource.druid.stats.password>EpmEt-db-UsEr</datasource.druid.stats.password>
 
+                <datasource.druid.statsdisplay.url>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_data_statistical_display?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.statsdisplay.url>
+                <datasource.druid.statsdisplay.username>epmet_data_stats_display_user</datasource.druid.statsdisplay.username>
+                <datasource.druid.statsdisplay.password>EpmEt-db-UsEr</datasource.druid.statsdisplay.password>
+
+                <datasource.druid.evaluationIndex.url>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.evaluationIndex.url>
+                <datasource.druid.evaluationIndex.username>epmet_evaluation_index_user</datasource.druid.evaluationIndex.username>
+                <datasource.druid.evaluationIndex.password>EpmEt-db-UsEr</datasource.druid.evaluationIndex.password>
+
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java
index 7d4fcfe070..1b063dd470 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java
@@ -3,10 +3,10 @@ package com.epmet.datareport.controller.screen;
 import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.datareport.service.screen.AgencyService;
-import com.epmet.screen.dto.form.CompartmentFormDTO;
-import com.epmet.screen.dto.result.CompartmentResultDTO;
-import com.epmet.screen.dto.result.TreeResultDTO;
+import com.epmet.datareport.service.evaluationindex.screen.AgencyService;
+import com.epmet.evaluationindex.screen.dto.form.CompartmentFormDTO;
+import com.epmet.evaluationindex.screen.dto.result.CompartmentResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.TreeResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/DistributionController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/DistributionController.java
index 935dd13830..248547cc4c 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/DistributionController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/DistributionController.java
@@ -2,9 +2,9 @@ package com.epmet.datareport.controller.screen;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.datareport.service.screen.DistributionService;
-import com.epmet.screen.dto.form.*;
-import com.epmet.screen.dto.result.*;
+import com.epmet.datareport.service.evaluationindex.screen.DistributionService;
+import com.epmet.evaluationindex.screen.dto.form.*;
+import com.epmet.evaluationindex.screen.dto.result.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/GrassRootsGovernController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/GrassRootsGovernController.java
index 3cad80832d..220fb0ca4a 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/GrassRootsGovernController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/GrassRootsGovernController.java
@@ -2,11 +2,11 @@ package com.epmet.datareport.controller.screen;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.datareport.service.screen.GrassRootsGovernService;
-import com.epmet.screen.dto.form.AgencyAndNumFormDTO;
-import com.epmet.screen.dto.form.AgencyFormDTO;
-import com.epmet.screen.dto.form.AgencyNumTypeParamFormDTO;
-import com.epmet.screen.dto.result.*;
+import com.epmet.datareport.service.evaluationindex.screen.GrassRootsGovernService;
+import com.epmet.evaluationindex.screen.dto.form.AgencyAndNumFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.AgencyFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.AgencyNumTypeParamFormDTO;
+import com.epmet.evaluationindex.screen.dto.result.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/GrassrootsPartyDevController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/GrassrootsPartyDevController.java
index 34823bd3fd..66b7555ac8 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/GrassrootsPartyDevController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/GrassrootsPartyDevController.java
@@ -2,14 +2,14 @@ package com.epmet.datareport.controller.screen;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.datareport.service.screen.GrassrootsPartyDevService;
-import com.epmet.screen.dto.form.BranchBuildRankFormDTO;
-import com.epmet.screen.dto.form.BranchBuildTrendFormDTO;
-import com.epmet.screen.dto.form.ParymemberFormDTO;
-import com.epmet.screen.dto.result.BranchBuildRankResultDTO;
-import com.epmet.screen.dto.result.BranchBuildTrendResultDTO;
-import com.epmet.screen.dto.result.PartymemberAgeDistributionResultDTO;
-import com.epmet.screen.dto.result.PartymemberPercentResultDTO;
+import com.epmet.datareport.service.evaluationindex.screen.GrassrootsPartyDevService;
+import com.epmet.evaluationindex.screen.dto.form.BranchBuildRankFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.BranchBuildTrendFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.ParymemberFormDTO;
+import com.epmet.evaluationindex.screen.dto.result.BranchBuildRankResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.BranchBuildTrendResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.PartymemberAgeDistributionResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.PartymemberPercentResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java
index ba4a24ec52..d670c65b1c 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java
@@ -1,17 +1,16 @@
 package com.epmet.datareport.controller.screen;
 
-import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.datareport.service.screen.IndexService;
-import com.epmet.screen.dto.form.MonthBarchartFormDTO;
-import com.epmet.screen.dto.form.MonthPieChartFormDTO;
-import com.epmet.screen.dto.form.SubAgencyIndexRankFormDTO;
-import com.epmet.screen.dto.form.YearAverageIndexFormDTO;
-import com.epmet.screen.dto.result.MonthBarchartResultDTO;
-import com.epmet.screen.dto.result.MonthPieChartResultDTO;
-import com.epmet.screen.dto.result.SubAgencyIndexRankResultDTO;
-import com.epmet.screen.dto.result.YearAverageIndexResultDTO;
+import com.epmet.datareport.service.evaluationindex.screen.IndexService;
+import com.epmet.evaluationindex.screen.dto.form.MonthBarchartFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.MonthPieChartFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.SubAgencyIndexRankFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.YearAverageIndexFormDTO;
+import com.epmet.evaluationindex.screen.dto.result.MonthBarchartResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.MonthPieChartResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.SubAgencyIndexRankResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.YearAverageIndexResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/PartyMemberLeadController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/PartyMemberLeadController.java
index 0f3fe32130..d3f4242013 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/PartyMemberLeadController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/PartyMemberLeadController.java
@@ -2,9 +2,9 @@ package com.epmet.datareport.controller.screen;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.datareport.service.screen.PartyMemberLeadService;
-import com.epmet.screen.dto.form.*;
-import com.epmet.screen.dto.result.*;
+import com.epmet.datareport.service.evaluationindex.screen.PartyMemberLeadService;
+import com.epmet.evaluationindex.screen.dto.form.*;
+import com.epmet.evaluationindex.screen.dto.result.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java
index 79d61f5f75..dc80b5178e 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java
@@ -2,9 +2,9 @@ package com.epmet.datareport.controller.screen;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.datareport.service.screen.ScreenProjectService;
-import com.epmet.screen.dto.form.ProjectDetailFormDTO;
-import com.epmet.screen.dto.result.ProjectDetailResultDTO;
+import com.epmet.datareport.service.evaluationindex.screen.ScreenProjectService;
+import com.epmet.evaluationindex.screen.dto.form.ProjectDetailFormDTO;
+import com.epmet.evaluationindex.screen.dto.result.ProjectDetailResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCpcBaseDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCpcBaseDataDao.java
similarity index 89%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCpcBaseDataDao.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCpcBaseDataDao.java
index 87f26f3b01..e752fe40dd 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCpcBaseDataDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCpcBaseDataDao.java
@@ -15,9 +15,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.datareport.dao.screen;
+package com.epmet.datareport.dao.evaluationindex.screen;
 
-import com.epmet.screen.dto.result.PartymemberAgeDistributionResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.PartymemberAgeDistributionResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCustomerAgencyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java
similarity index 95%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCustomerAgencyDao.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java
index c97ac8b8e0..17c48ae989 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCustomerAgencyDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java
@@ -15,9 +15,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.datareport.dao.screen;
+package com.epmet.datareport.dao.evaluationindex.screen;
 
-import com.epmet.screen.dto.result.*;
+import com.epmet.evaluationindex.screen.dto.result.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCustomerDeptDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerDeptDao.java
similarity index 94%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCustomerDeptDao.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerDeptDao.java
index e6ae450514..15ed670395 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCustomerDeptDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerDeptDao.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.datareport.dao.screen;
+package com.epmet.datareport.dao.evaluationindex.screen;
 
 import org.apache.ibatis.annotations.Mapper;
 
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCustomerGridDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerGridDao.java
similarity index 95%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCustomerGridDao.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerGridDao.java
index ec6a2e7ee1..b6196411f8 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCustomerGridDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerGridDao.java
@@ -15,9 +15,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.datareport.dao.screen;
+package com.epmet.datareport.dao.evaluationindex.screen;
 
-import com.epmet.screen.dto.result.*;
+import com.epmet.evaluationindex.screen.dto.result.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenDifficultyDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenDifficultyDataDao.java
similarity index 90%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenDifficultyDataDao.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenDifficultyDataDao.java
index 17d2e7a420..8697ba9adf 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenDifficultyDataDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenDifficultyDataDao.java
@@ -15,9 +15,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.datareport.dao.screen;
+package com.epmet.datareport.dao.evaluationindex.screen;
 
-import com.epmet.screen.dto.result.DifficultProjectResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.DifficultProjectResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenEventDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenEventDataDao.java
similarity index 87%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenEventDataDao.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenEventDataDao.java
index 24604bf1de..16e023adff 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenEventDataDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenEventDataDao.java
@@ -15,10 +15,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.datareport.dao.screen;
+package com.epmet.datareport.dao.evaluationindex.screen;
 
-import com.epmet.screen.dto.result.ProjectDetailResultDTO;
-import com.epmet.screen.dto.result.ProjectResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.ProjectDetailResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.ProjectResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenEventImgDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenEventImgDataDao.java
similarity index 95%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenEventImgDataDao.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenEventImgDataDao.java
index 8090ce00c7..f0da56ccd9 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenEventImgDataDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenEventImgDataDao.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.datareport.dao.screen;
+package com.epmet.datareport.dao.evaluationindex.screen;
 
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenGovernRankDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenGovernRankDataDao.java
similarity index 90%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenGovernRankDataDao.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenGovernRankDataDao.java
index 3cf167fc5e..e973aa85f3 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenGovernRankDataDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenGovernRankDataDao.java
@@ -15,9 +15,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.datareport.dao.screen;
+package com.epmet.datareport.dao.evaluationindex.screen;
 
-import com.epmet.screen.dto.result.GovernCapacityResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.GovernCapacityResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenIndexDataMonthlyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenIndexDataMonthlyDao.java
similarity index 83%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenIndexDataMonthlyDao.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenIndexDataMonthlyDao.java
index 57f0398615..372dacf9dd 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenIndexDataMonthlyDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenIndexDataMonthlyDao.java
@@ -15,13 +15,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.datareport.dao.screen;
+package com.epmet.datareport.dao.evaluationindex.screen;
 
-import com.epmet.screen.dto.form.SubAgencyIndexRankFormDTO;
-import com.epmet.screen.dto.result.MonthBarchartResult;
-import com.epmet.screen.dto.result.MonthBarchartResultDTO;
-import com.epmet.screen.dto.result.MonthPieChartResultDTO;
-import com.epmet.screen.dto.result.SubAgencyIndexRankResultDTO;
+import com.epmet.evaluationindex.screen.dto.form.SubAgencyIndexRankFormDTO;
+import com.epmet.evaluationindex.screen.dto.result.MonthBarchartResult;
+import com.epmet.evaluationindex.screen.dto.result.MonthPieChartResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.SubAgencyIndexRankResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenIndexDataYearlyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenIndexDataYearlyDao.java
similarity index 89%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenIndexDataYearlyDao.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenIndexDataYearlyDao.java
index 304351b3b7..c63c17fa57 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenIndexDataYearlyDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenIndexDataYearlyDao.java
@@ -15,9 +15,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.datareport.dao.screen;
+package com.epmet.datareport.dao.evaluationindex.screen;
 
-import com.epmet.screen.dto.result.YearAverageIndexResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.YearAverageIndexResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenOrgRankDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenOrgRankDataDao.java
similarity index 90%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenOrgRankDataDao.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenOrgRankDataDao.java
index fbee5cd15c..2b9bdba497 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenOrgRankDataDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenOrgRankDataDao.java
@@ -15,9 +15,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.datareport.dao.screen;
+package com.epmet.datareport.dao.evaluationindex.screen;
 
-import com.epmet.screen.dto.result.OrgRankDataResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.OrgRankDataResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenPartyBranchDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenPartyBranchDataDao.java
similarity index 90%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenPartyBranchDataDao.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenPartyBranchDataDao.java
index f28a23354b..fa2836e4fb 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenPartyBranchDataDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenPartyBranchDataDao.java
@@ -15,11 +15,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.datareport.dao.screen;
+package com.epmet.datareport.dao.evaluationindex.screen;
 
-import com.epmet.screen.dto.result.BranchBuildOrderByCountResultDTO;
-import com.epmet.screen.dto.result.BranchIssueDataResultDTO;
-import com.epmet.screen.dto.result.VolunteerServiceResult;
+import com.epmet.evaluationindex.screen.dto.result.BranchBuildOrderByCountResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.BranchIssueDataResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.VolunteerServiceResult;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenPartyLinkMassesDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenPartyLinkMassesDataDao.java
similarity index 90%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenPartyLinkMassesDataDao.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenPartyLinkMassesDataDao.java
index dfa5c1f6d2..1ca974982f 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenPartyLinkMassesDataDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenPartyLinkMassesDataDao.java
@@ -15,9 +15,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.datareport.dao.screen;
+package com.epmet.datareport.dao.evaluationindex.screen;
 
-import com.epmet.screen.dto.result.ContactMassLineChartResult;
+import com.epmet.evaluationindex.screen.dto.result.ContactMassLineChartResult;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenPartyUserRankDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenPartyUserRankDataDao.java
similarity index 88%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenPartyUserRankDataDao.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenPartyUserRankDataDao.java
index 946ac2a096..2c4358ce15 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenPartyUserRankDataDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenPartyUserRankDataDao.java
@@ -15,10 +15,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.datareport.dao.screen;
+package com.epmet.datareport.dao.evaluationindex.screen;
 
-import com.epmet.screen.dto.result.PartyUserPointResultDTO;
-import com.epmet.screen.dto.result.UserPointResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.PartyUserPointResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.UserPointResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenPioneerDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenPioneerDataDao.java
similarity index 90%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenPioneerDataDao.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenPioneerDataDao.java
index 4b477689c3..92177ec52c 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenPioneerDataDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenPioneerDataDao.java
@@ -15,9 +15,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.datareport.dao.screen;
+package com.epmet.datareport.dao.evaluationindex.screen;
 
-import com.epmet.screen.dto.result.FineExampleResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.FineExampleResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenPublicPartiTotalDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenPublicPartiTotalDataDao.java
similarity index 89%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenPublicPartiTotalDataDao.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenPublicPartiTotalDataDao.java
index 02d7e0c722..88c2aa0e77 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenPublicPartiTotalDataDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenPublicPartiTotalDataDao.java
@@ -15,10 +15,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.datareport.dao.screen;
+package com.epmet.datareport.dao.evaluationindex.screen;
 
-import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.screen.dto.result.PublicPartiRankResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.PublicPartiRankResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenUserJoinDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenUserJoinDao.java
similarity index 87%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenUserJoinDao.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenUserJoinDao.java
index 0edee635d4..962691f625 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenUserJoinDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenUserJoinDao.java
@@ -15,10 +15,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.datareport.dao.screen;
+package com.epmet.datareport.dao.evaluationindex.screen;
 
-import com.epmet.screen.dto.result.UserJoinIndicatorGrowthRateResultDTO;
-import com.epmet.screen.dto.result.UserJoinMonthlyResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.UserJoinIndicatorGrowthRateResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.UserJoinMonthlyResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenUserTotalDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenUserTotalDataDao.java
similarity index 89%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenUserTotalDataDao.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenUserTotalDataDao.java
index 2230e636b9..653cf3f606 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenUserTotalDataDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenUserTotalDataDao.java
@@ -15,15 +15,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.datareport.dao.screen;
+package com.epmet.datareport.dao.evaluationindex.screen;
 
-import com.epmet.screen.dto.result.PartymemberPercentResultDTO;
-import com.epmet.screen.dto.result.TopProfileResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.PartymemberPercentResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.TopProfileResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
-
 /**
  * 中央区-各类(用户|党员|党群|话题|议题|项目|注册人数|参与人数)总数
  *
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/AgencyService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/AgencyService.java
similarity index 68%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/AgencyService.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/AgencyService.java
index d3eee4f133..d633b94ea2 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/AgencyService.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/AgencyService.java
@@ -1,12 +1,9 @@
-package com.epmet.datareport.service.screen;
+package com.epmet.datareport.service.evaluationindex.screen;
 
 import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
-import com.epmet.commons.tools.security.dto.TokenDto;
-import com.epmet.screen.dto.form.CompartmentFormDTO;
-import com.epmet.screen.dto.result.CompartmentResultDTO;
-import com.epmet.screen.dto.result.TreeResultDTO;
-
-import java.util.List;
+import com.epmet.evaluationindex.screen.dto.form.CompartmentFormDTO;
+import com.epmet.evaluationindex.screen.dto.result.CompartmentResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.TreeResultDTO;
 
 /**
  * 组织相关api
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/DistributionService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/DistributionService.java
similarity index 87%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/DistributionService.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/DistributionService.java
index 62a0d0d7bf..a73d1ccfcd 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/DistributionService.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/DistributionService.java
@@ -1,7 +1,7 @@
-package com.epmet.datareport.service.screen;
+package com.epmet.datareport.service.evaluationindex.screen;
 
-import com.epmet.screen.dto.form.*;
-import com.epmet.screen.dto.result.*;
+import com.epmet.evaluationindex.screen.dto.form.*;
+import com.epmet.evaluationindex.screen.dto.result.*;
 
 import java.util.List;
 
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/GrassRootsGovernService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/GrassRootsGovernService.java
similarity index 86%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/GrassRootsGovernService.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/GrassRootsGovernService.java
index 12315295b5..fecde12a9f 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/GrassRootsGovernService.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/GrassRootsGovernService.java
@@ -1,9 +1,9 @@
-package com.epmet.datareport.service.screen;
+package com.epmet.datareport.service.evaluationindex.screen;
 
-import com.epmet.screen.dto.form.AgencyAndNumFormDTO;
-import com.epmet.screen.dto.form.AgencyFormDTO;
-import com.epmet.screen.dto.form.AgencyNumTypeParamFormDTO;
-import com.epmet.screen.dto.result.*;
+import com.epmet.evaluationindex.screen.dto.form.AgencyAndNumFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.AgencyFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.AgencyNumTypeParamFormDTO;
+import com.epmet.evaluationindex.screen.dto.result.*;
 
 import java.util.List;
 
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/GrassrootsPartyDevService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/GrassrootsPartyDevService.java
similarity index 71%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/GrassrootsPartyDevService.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/GrassrootsPartyDevService.java
index a870d21585..41c8fafc28 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/GrassrootsPartyDevService.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/GrassrootsPartyDevService.java
@@ -1,12 +1,12 @@
-package com.epmet.datareport.service.screen;
+package com.epmet.datareport.service.evaluationindex.screen;
 
-import com.epmet.screen.dto.form.BranchBuildRankFormDTO;
-import com.epmet.screen.dto.form.BranchBuildTrendFormDTO;
-import com.epmet.screen.dto.form.ParymemberFormDTO;
-import com.epmet.screen.dto.result.BranchBuildRankResultDTO;
-import com.epmet.screen.dto.result.BranchBuildTrendResultDTO;
-import com.epmet.screen.dto.result.PartymemberAgeDistributionResultDTO;
-import com.epmet.screen.dto.result.PartymemberPercentResultDTO;
+import com.epmet.evaluationindex.screen.dto.form.BranchBuildRankFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.BranchBuildTrendFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.ParymemberFormDTO;
+import com.epmet.evaluationindex.screen.dto.result.BranchBuildRankResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.BranchBuildTrendResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.PartymemberAgeDistributionResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.PartymemberPercentResultDTO;
 
 /**
  * 基层党建相关各指标查询
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/IndexService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/IndexService.java
similarity index 64%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/IndexService.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/IndexService.java
index 5f840c2369..266898530d 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/IndexService.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/IndexService.java
@@ -1,13 +1,13 @@
-package com.epmet.datareport.service.screen;
-
-import com.epmet.screen.dto.form.MonthBarchartFormDTO;
-import com.epmet.screen.dto.form.MonthPieChartFormDTO;
-import com.epmet.screen.dto.form.SubAgencyIndexRankFormDTO;
-import com.epmet.screen.dto.form.YearAverageIndexFormDTO;
-import com.epmet.screen.dto.result.MonthBarchartResultDTO;
-import com.epmet.screen.dto.result.MonthPieChartResultDTO;
-import com.epmet.screen.dto.result.SubAgencyIndexRankResultDTO;
-import com.epmet.screen.dto.result.YearAverageIndexResultDTO;
+package com.epmet.datareport.service.evaluationindex.screen;
+
+import com.epmet.evaluationindex.screen.dto.form.MonthBarchartFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.MonthPieChartFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.SubAgencyIndexRankFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.YearAverageIndexFormDTO;
+import com.epmet.evaluationindex.screen.dto.result.MonthBarchartResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.MonthPieChartResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.SubAgencyIndexRankResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.YearAverageIndexResultDTO;
 
 import java.util.List;
 
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/PartyMemberLeadService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/PartyMemberLeadService.java
similarity index 79%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/PartyMemberLeadService.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/PartyMemberLeadService.java
index 5f781b2622..5e75a3946c 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/PartyMemberLeadService.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/PartyMemberLeadService.java
@@ -1,10 +1,10 @@
-package com.epmet.datareport.service.screen;
+package com.epmet.datareport.service.evaluationindex.screen;
 
-import com.epmet.screen.dto.form.AgencyAndNumFormDTO;
-import com.epmet.screen.dto.form.ContactMassLineChartFormDTO;
-import com.epmet.screen.dto.form.FineExampleFormDTO;
-import com.epmet.screen.dto.form.VolunteerServiceFormDTO;
-import com.epmet.screen.dto.result.*;
+import com.epmet.evaluationindex.screen.dto.form.AgencyAndNumFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.ContactMassLineChartFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.FineExampleFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.VolunteerServiceFormDTO;
+import com.epmet.evaluationindex.screen.dto.result.*;
 
 import java.util.List;
 
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/ScreenProjectService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/ScreenProjectService.java
similarity index 63%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/ScreenProjectService.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/ScreenProjectService.java
index 78543bc52f..aea908ff15 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/ScreenProjectService.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/ScreenProjectService.java
@@ -1,7 +1,7 @@
-package com.epmet.datareport.service.screen;
+package com.epmet.datareport.service.evaluationindex.screen;
 
-import com.epmet.screen.dto.form.ProjectDetailFormDTO;
-import com.epmet.screen.dto.result.ProjectDetailResultDTO;
+import com.epmet.evaluationindex.screen.dto.form.ProjectDetailFormDTO;
+import com.epmet.evaluationindex.screen.dto.result.ProjectDetailResultDTO;
 
 /**
  * 项目
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/AgencyServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java
similarity index 85%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/AgencyServiceImpl.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java
index 0727ebfbde..6eef8b2387 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/AgencyServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java
@@ -1,17 +1,17 @@
-package com.epmet.datareport.service.screen.impl;
+package com.epmet.datareport.service.evaluationindex.screen.impl;
 
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.constant.DataSourceConstant;
-import com.epmet.datareport.dao.screen.ScreenCustomerAgencyDao;
-import com.epmet.datareport.dao.screen.ScreenCustomerGridDao;
-import com.epmet.screen.dto.form.CompartmentFormDTO;
-import com.epmet.screen.dto.result.AgencyDistributionResultDTO;
-import com.epmet.screen.constant.*;
-import com.epmet.screen.dto.result.CompartmentResultDTO;
-import com.epmet.screen.dto.result.TreeResultDTO;
-import com.epmet.datareport.service.screen.AgencyService;
+import com.epmet.datareport.dao.evaluationindex.screen.ScreenCustomerAgencyDao;
+import com.epmet.datareport.dao.evaluationindex.screen.ScreenCustomerGridDao;
+import com.epmet.datareport.service.evaluationindex.screen.AgencyService;
+import com.epmet.evaluationindex.screen.constant.ScreenConstant;
+import com.epmet.evaluationindex.screen.dto.form.CompartmentFormDTO;
+import com.epmet.evaluationindex.screen.dto.result.AgencyDistributionResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.CompartmentResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.TreeResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -25,6 +25,7 @@ import java.util.List;
  * @date 2020/8/18 10:18
  */
 @Service
+@DataSource(DataSourceConstant.EVALUATION_INDEX)
 public class AgencyServiceImpl implements AgencyService {
 
     @Autowired
@@ -38,7 +39,7 @@ public class AgencyServiceImpl implements AgencyService {
      * @author zxc
      * @date 2020/8/18 2:04 下午
      */
-    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public TreeResultDTO tree(ExternalAppRequestParam externalAppRequestParam) {
         // 1. 查询客户根组织ID
@@ -118,7 +119,7 @@ public class AgencyServiceImpl implements AgencyService {
      * @author zxc
      * @date 2020/8/18 2:33 下午
      */
-    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public CompartmentResultDTO compartment(CompartmentFormDTO compartmentFormDTO) {
         CompartmentResultDTO agencyAreaInfo = screenCustomerAgencyDao.getAgencyAreaInfo(compartmentFormDTO.getAgencyId());
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/DistributionServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/DistributionServiceImpl.java
similarity index 79%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/DistributionServiceImpl.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/DistributionServiceImpl.java
index 97a627fb23..b65c0fe059 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/DistributionServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/DistributionServiceImpl.java
@@ -1,16 +1,16 @@
-package com.epmet.datareport.service.screen.impl;
+package com.epmet.datareport.service.evaluationindex.screen.impl;
 
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.constant.DataSourceConstant;
-import com.epmet.datareport.dao.screen.ScreenCustomerAgencyDao;
-import com.epmet.datareport.dao.screen.ScreenCustomerGridDao;
-import com.epmet.datareport.dao.screen.ScreenEventDataDao;
-import com.epmet.datareport.dao.screen.ScreenUserTotalDataDao;
-import com.epmet.screen.dto.form.*;
-import com.epmet.screen.dto.result.*;
-import com.epmet.screen.constant.*;
-import com.epmet.datareport.service.screen.DistributionService;
+import com.epmet.datareport.dao.evaluationindex.screen.ScreenCustomerAgencyDao;
+import com.epmet.datareport.dao.evaluationindex.screen.ScreenCustomerGridDao;
+import com.epmet.datareport.dao.evaluationindex.screen.ScreenEventDataDao;
+import com.epmet.datareport.dao.evaluationindex.screen.ScreenUserTotalDataDao;
+import com.epmet.datareport.service.evaluationindex.screen.DistributionService;
+import com.epmet.evaluationindex.screen.constant.ScreenConstant;
+import com.epmet.evaluationindex.screen.dto.form.*;
+import com.epmet.evaluationindex.screen.dto.result.*;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -25,6 +25,7 @@ import java.util.List;
  * @date 2020/8/18 10:19
  */
 @Service
+@DataSource(DataSourceConstant.EVALUATION_INDEX)
 public class DistributionServiceImpl implements DistributionService {
 
     @Autowired
@@ -42,7 +43,7 @@ public class DistributionServiceImpl implements DistributionService {
      * @author zxc
      * @date 2020/8/18 10:59 上午
      */
-    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public List<BranchResultDTO> branch(BranchFormDTO formDTO) {
         List<BranchResultDTO> branchResultDTOS = screenCustomerGridDao.selectBranch(formDTO.getAgencyId());
@@ -55,7 +56,7 @@ public class DistributionServiceImpl implements DistributionService {
      * @author zxc
      * @date 2020/8/18 11:10 上午
      */
-    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public UserResultDTO user(UserFormDTO userFormDTO) {
         UserResultDTO userResult = new UserResultDTO();
@@ -80,7 +81,7 @@ public class DistributionServiceImpl implements DistributionService {
      * @author zxc
      * @date 2020/8/18 11:20 上午
      */
-    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public ParymemberResultDTO parymember(ParymemberFormDTO parymemberFormDTO) {
         ParymemberResultDTO parymemberResult = new ParymemberResultDTO();
@@ -105,7 +106,7 @@ public class DistributionServiceImpl implements DistributionService {
      * @author zxc
      * @date 2020/8/19 1:29 下午
      */
-    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public List<ProjectResultDTO> project(ProjectFormDTO projectFormDTO) {
         List<ProjectResultDTO> projectResultDTOS = screenEventDataDao.selectEvent(projectFormDTO.getAgencyId());
@@ -121,7 +122,7 @@ public class DistributionServiceImpl implements DistributionService {
      * @author zxc
      * @date 2020/8/19 1:52 下午
      */
-    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public TopProfileResultDTO topProfile(TopProfileFormDTO topProfileFormDTO) {
         TopProfileResultDTO topProfileResultDTO = screenUserTotalDataDao.selectTopProfile(topProfileFormDTO.getAgencyId());
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassRootsGovernServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassRootsGovernServiceImpl.java
similarity index 90%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassRootsGovernServiceImpl.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassRootsGovernServiceImpl.java
index c1ad6a3eca..d750c1ee03 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassRootsGovernServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassRootsGovernServiceImpl.java
@@ -1,17 +1,17 @@
-package com.epmet.datareport.service.screen.impl;
+package com.epmet.datareport.service.evaluationindex.screen.impl;
 
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.constant.DataSourceConstant;
-import com.epmet.datareport.dao.screen.*;
-import com.epmet.datareport.service.screen.GrassRootsGovernService;
+import com.epmet.datareport.dao.evaluationindex.screen.*;
+import com.epmet.datareport.service.evaluationindex.screen.GrassRootsGovernService;
 import com.epmet.datareport.utils.DateUtils;
 import com.epmet.datareport.utils.ModuleConstant;
-import com.epmet.screen.dto.form.AgencyAndNumFormDTO;
-import com.epmet.screen.dto.form.AgencyFormDTO;
-import com.epmet.screen.dto.form.AgencyNumTypeParamFormDTO;
-import com.epmet.screen.dto.result.*;
+import com.epmet.evaluationindex.screen.dto.form.AgencyAndNumFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.AgencyFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.AgencyNumTypeParamFormDTO;
+import com.epmet.evaluationindex.screen.dto.result.*;
 import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -31,6 +31,7 @@ import java.util.stream.Collectors;
  * @date 2020/8/18 10:20
  */
 @Service
+@DataSource(DataSourceConstant.EVALUATION_INDEX)
 public class GrassRootsGovernServiceImpl implements GrassRootsGovernService {
 
     @Autowired
@@ -54,7 +55,7 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService {
      * @author wangc
      * @date 2020.08.20 11:16
      **/
-    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public UserPointRankResultDTO userPointRank(AgencyAndNumFormDTO param) {
         //默认5
@@ -78,7 +79,7 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService {
      * @author wangc
      * @date 2020.08.20 13:55
      **/
-    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public List<DifficultProjectResultDTO> difficultProject(AgencyNumTypeParamFormDTO param) {
         if(null == param.getTopNum()){
@@ -99,7 +100,7 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService {
      * @author wangc
      * @date 2020.08.20 14:37
      **/
-    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public PublicPartiProfileResultDTO publicPartiProfile(AgencyFormDTO param) {
 
@@ -130,7 +131,7 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService {
      * @author wangc
      * @date 2020.08.20 15:32
      **/
-    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public List<PublicPartiRankResultDTO> publicPartiRank(AgencyAndNumFormDTO param) {
         if(null == param.getTopNum()){
@@ -155,7 +156,7 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService {
      * @author wangc
      * @date 2020.08.20 17:46
      **/
-    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public List<GovernCapacityRankResultDTO> governCapacityRank(AgencyAndNumFormDTO param) {
         if(null == param.getTopNum()) param.setTopNum(NumConstant.FIVE);
@@ -168,6 +169,7 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService {
         while(CollectionUtils.isEmpty(orderList) && time > NumConstant.ONE){
             time--;
             monthId = dateUtils.getPreviousMonthIdByDest(null ,monthId);
+            PageHelper.startPage(NumConstant.ONE,param.getTopNum());
             orderList =
                     screenGovernRankDataDao.selectGovernCapacityRatio(monthId,param.getAgencyId());
         }
@@ -237,11 +239,7 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService {
         return result;
     }
 
-    private String convertPercentStr(BigDecimal percent){
-        if(null == percent || BigDecimal.ZERO == percent) return "0.00%";
-        String percentStr = percent.setScale(NumConstant.TWO, BigDecimal.ROUND_HALF_UP).stripTrailingZeros().toPlainString();
-        return percentStr.concat(ModuleConstant.SYMBOL_PERCENT);
-    }
+
 
     private String convertPercentStr(BigDecimal percent,Integer digits){
         if(null == percent) percent = BigDecimal.ZERO;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassrootsPartyDevServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassrootsPartyDevServiceImpl.java
similarity index 90%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassrootsPartyDevServiceImpl.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassrootsPartyDevServiceImpl.java
index a4cbbc87da..619eba4625 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassrootsPartyDevServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassrootsPartyDevServiceImpl.java
@@ -1,20 +1,19 @@
-package com.epmet.datareport.service.screen.impl;
+package com.epmet.datareport.service.evaluationindex.screen.impl;
 
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.constant.DataSourceConstant;
-import com.epmet.datareport.dao.screen.ScreenCpcBaseDataDao;
-import com.epmet.datareport.dao.screen.ScreenPartyBranchDataDao;
-import com.epmet.datareport.dao.screen.ScreenUserTotalDataDao;
-import com.epmet.datareport.service.screen.GrassrootsPartyDevService;
+import com.epmet.datareport.dao.evaluationindex.screen.ScreenCpcBaseDataDao;
+import com.epmet.datareport.dao.evaluationindex.screen.ScreenPartyBranchDataDao;
+import com.epmet.datareport.dao.evaluationindex.screen.ScreenUserTotalDataDao;
+import com.epmet.datareport.service.evaluationindex.screen.GrassrootsPartyDevService;
 import com.epmet.datareport.utils.DateUtils;
 import com.epmet.datareport.utils.ModuleConstant;
-import com.epmet.screen.dto.form.BranchBuildRankFormDTO;
-import com.epmet.screen.dto.form.BranchBuildTrendFormDTO;
-import com.epmet.screen.dto.form.ParymemberFormDTO;
-import com.epmet.screen.dto.result.*;
+import com.epmet.evaluationindex.screen.dto.form.BranchBuildRankFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.BranchBuildTrendFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.ParymemberFormDTO;
+import com.epmet.evaluationindex.screen.dto.result.*;
 import com.github.pagehelper.PageHelper;
-import com.google.common.collect.Maps;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -23,7 +22,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -34,6 +32,7 @@ import java.util.stream.Collectors;
  * @date 2020/8/18 10:21
  */
 @Service
+@DataSource(DataSourceConstant.EVALUATION_INDEX)
 public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService {
 
     private static final Logger logger = LoggerFactory.getLogger(GrassrootsPartyDevServiceImpl.class);
@@ -55,7 +54,7 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService
      * @author wangc
      * @date 2020.08.18 14:58
      **/
-    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public PartymemberPercentResultDTO partymemberBaseInfo(ParymemberFormDTO param) {
 
@@ -84,7 +83,7 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService
      * @author wangc
      * @date 2020.08.18 17:54
      **/
-    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public PartymemberAgeDistributionResultDTO partymemberAgeDistribution(ParymemberFormDTO param) {
        return screenCpcBaseDataDao.selectPartymemberAgeDistribution(param.getAgencyId());
@@ -98,7 +97,7 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService
      * @author wangc
      * @date 2020.08.19 11:02
      **/
-    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public BranchBuildTrendResultDTO branchBuildTrend(BranchBuildTrendFormDTO param) {
         if(StringUtils.equals(ModuleConstant.PARAM_BRANCH_CATEGORY_UNION,param.getCategory())){
@@ -183,7 +182,7 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService
      * @author wangc
      * @date 2020.08.19 15:25
      **/
-    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public BranchBuildRankResultDTO branchBuildRank(BranchBuildRankFormDTO param) {
         if(StringUtils.equals(ModuleConstant.PARAM_BRANCH_CATEGORY_UNION,param.getCategory())){
@@ -208,6 +207,7 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService
         while(CollectionUtils.isEmpty(orderList) && time > NumConstant.ONE){
             time --;
             param.setMonthId(dateUtils.getPreviousMonthIdByDest(null,param.getMonthId()));
+            PageHelper.startPage(NumConstant.ONE,param.getTopNum());
             orderList =
                     screenPartyBranchDataDao.selectBranchDataByTypeOrder(param.getAgencyId(),param.getCategory(),param.getMonthId(),param.getBottomMonthId());
         }
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/IndexServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java
similarity index 88%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/IndexServiceImpl.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java
index fa1e261128..22f6aa376b 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/IndexServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java
@@ -1,18 +1,17 @@
-package com.epmet.datareport.service.screen.impl;
+package com.epmet.datareport.service.evaluationindex.screen.impl;
 
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
-import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.constant.DataSourceConstant;
-import com.epmet.datareport.dao.screen.ScreenIndexDataMonthlyDao;
-import com.epmet.datareport.dao.screen.ScreenIndexDataYearlyDao;
-import com.epmet.datareport.service.screen.IndexService;
+import com.epmet.datareport.dao.evaluationindex.screen.ScreenIndexDataMonthlyDao;
+import com.epmet.datareport.dao.evaluationindex.screen.ScreenIndexDataYearlyDao;
+import com.epmet.datareport.service.evaluationindex.screen.IndexService;
 import com.epmet.datareport.utils.DateUtils;
-import com.epmet.screen.dto.form.MonthBarchartFormDTO;
-import com.epmet.screen.dto.form.MonthPieChartFormDTO;
-import com.epmet.screen.dto.form.SubAgencyIndexRankFormDTO;
-import com.epmet.screen.dto.form.YearAverageIndexFormDTO;
-import com.epmet.screen.dto.result.*;
+import com.epmet.evaluationindex.screen.dto.form.MonthBarchartFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.MonthPieChartFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.SubAgencyIndexRankFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.YearAverageIndexFormDTO;
+import com.epmet.evaluationindex.screen.dto.result.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -31,6 +30,7 @@ import java.util.stream.Collectors;
  * @date 2020/8/18 10:21
  */
 @Service
+@DataSource(DataSourceConstant.EVALUATION_INDEX)
 public class IndexServiceImpl implements IndexService {
 
     @Autowired
@@ -48,7 +48,7 @@ public class IndexServiceImpl implements IndexService {
      * @author zxc
      * @date 2020/8/19 2:53 下午
      */
-    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public YearAverageIndexResultDTO yearAverageIndex(YearAverageIndexFormDTO yearAverageIndexFormDTO) {
         YearAverageIndexResultDTO yearAverageIndexResultDTO = screenIndexDataYearlyDao.selectYearAverageIndex(yearAverageIndexFormDTO.getAgencyId());
@@ -64,7 +64,7 @@ public class IndexServiceImpl implements IndexService {
      * @author zxc
      * @date 2020/8/19 3:17 下午
      */
-    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public MonthPieChartResultDTO monthPieChart(MonthPieChartFormDTO monthPieChartFormDTO) {
 
@@ -89,7 +89,7 @@ public class IndexServiceImpl implements IndexService {
      * @author zxc
      * @date 2020/8/19 5:27 下午
      */
-    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public MonthBarchartResultDTO monthBarchart(MonthBarchartFormDTO monthBarchartFormDTO) {
         MonthBarchartResultDTO result = new MonthBarchartResultDTO();
@@ -170,7 +170,7 @@ public class IndexServiceImpl implements IndexService {
      * @author zxc
      * @date 2020/8/20 10:04 上午
      */
-    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public List<SubAgencyIndexRankResultDTO> subAgencyIndexRank(SubAgencyIndexRankFormDTO subAgencyIndexRankFormDTO) {
         LocalDate now = LocalDate.now().minusMonths(NumConstant.ONE);
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/PartyMemberLeadServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/PartyMemberLeadServiceImpl.java
similarity index 90%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/PartyMemberLeadServiceImpl.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/PartyMemberLeadServiceImpl.java
index 8d85e51d8f..203b5cb456 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/PartyMemberLeadServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/PartyMemberLeadServiceImpl.java
@@ -1,23 +1,19 @@
-package com.epmet.datareport.service.screen.impl;
+package com.epmet.datareport.service.evaluationindex.screen.impl;
 
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.constant.DataSourceConstant;
-import com.epmet.datareport.dao.screen.ScreenOrgRankDataDao;
-import com.epmet.datareport.dao.screen.ScreenPartyBranchDataDao;
-import com.epmet.datareport.dao.screen.ScreenPartyLinkMassesDataDao;
-import com.epmet.datareport.dao.screen.ScreenPioneerDataDao;
-import com.epmet.datareport.dao.screen.ScreenPartyUserRankDataDao;
-import com.epmet.datareport.service.screen.PartyMemberLeadService;
+import com.epmet.datareport.dao.evaluationindex.screen.*;
+import com.epmet.datareport.service.evaluationindex.screen.PartyMemberLeadService;
 import com.epmet.datareport.utils.DateUtils;
 import com.epmet.datareport.utils.ModuleConstant;
-import com.epmet.screen.dto.form.AgencyAndNumFormDTO;
-import com.epmet.screen.dto.form.ContactMassLineChartFormDTO;
-import com.epmet.screen.dto.form.FineExampleFormDTO;
-import com.epmet.screen.dto.form.VolunteerServiceFormDTO;
-import com.epmet.screen.dto.result.*;
-import com.epmet.screen.constant.*;
+import com.epmet.evaluationindex.screen.constant.ScreenConstant;
+import com.epmet.evaluationindex.screen.dto.form.AgencyAndNumFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.ContactMassLineChartFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.FineExampleFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.VolunteerServiceFormDTO;
+import com.epmet.evaluationindex.screen.dto.result.*;
 import com.github.pagehelper.PageHelper;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +23,6 @@ import org.springframework.util.CollectionUtils;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * 党建引领相关各指标查询
@@ -36,6 +31,7 @@ import java.util.stream.Collectors;
  * @date 2020/8/18 10:22
  */
 @Service
+@DataSource(DataSourceConstant.EVALUATION_INDEX)
 public class PartyMemberLeadServiceImpl implements PartyMemberLeadService {
 
     @Autowired
@@ -57,7 +53,7 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService {
      * @author zxc
      * @date 2020/8/20 1:56 下午
      */
-    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public FineExampleResultDTO fineExample(FineExampleFormDTO fineExampleFormDTO) {
         FineExampleResultDTO fineExampleResultDTO = screenPioneerDataDao.selectFineExample(fineExampleFormDTO.getAgencyId());
@@ -89,7 +85,7 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService {
      * @author zxc
      * @date 2020/8/20 2:35 下午
      */
-    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public ContactMassLineChartResultDTO contactMassLineChart(ContactMassLineChartFormDTO contactMassLineChartFormDTO) {
         ContactMassLineChartResultDTO result = new ContactMassLineChartResultDTO();
@@ -122,7 +118,7 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService {
      * @author zxc
      * @date 2020/8/20 3:19 下午
      */
-    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public VolunteerServiceResultDTO volunteerService(VolunteerServiceFormDTO volunteerServiceFormDTO) {
         VolunteerServiceResultDTO result = new VolunteerServiceResultDTO();
@@ -207,7 +203,7 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService {
      * @author wangc
      * @date 2020.08.21 11:05
      **/
-    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public List<AdvanceBranchRankResultDTO> advancedBranchRank(AgencyAndNumFormDTO param) {
         if(null == param.getTopNum()){
@@ -223,6 +219,7 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService {
         while(CollectionUtils.isEmpty(gridData) && time > NumConstant.ONE){
             time--;
             monthId = dateUtils.getPreviousMonthIdByDest(null,monthId);
+            PageHelper.startPage(NumConstant.ONE,param.getTopNum());
             gridData = screenOrgRankDataDao.selectGridDataMonthly(param.getAgencyId(),monthId);
         }
         List<AdvanceBranchRankResultDTO> result = new LinkedList<>();
@@ -245,7 +242,7 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService {
      * @author wangc
      * @date 2020.08.21 14:22
      **/
-    @DataSource(value = DataSourceConstant.STATS,datasourceNameFromArg = true)
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public List<PartyUserPointResultDTO> advancedPartymemberRank(AgencyAndNumFormDTO param) {
         if(null == param.getTopNum()) param.setTopNum(NumConstant.TEN);
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/ScreenProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java
similarity index 68%
rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/ScreenProjectServiceImpl.java
rename to epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java
index e617449458..2cf288cae9 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/ScreenProjectServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java
@@ -1,12 +1,12 @@
-package com.epmet.datareport.service.screen.impl;
+package com.epmet.datareport.service.evaluationindex.screen.impl;
 
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.constant.DataSourceConstant;
-import com.epmet.datareport.dao.screen.ScreenEventDataDao;
-import com.epmet.datareport.dao.screen.ScreenEventImgDataDao;
-import com.epmet.datareport.service.screen.ScreenProjectService;
-import com.epmet.screen.dto.form.ProjectDetailFormDTO;
-import com.epmet.screen.dto.result.ProjectDetailResultDTO;
+import com.epmet.datareport.dao.evaluationindex.screen.ScreenEventDataDao;
+import com.epmet.datareport.dao.evaluationindex.screen.ScreenEventImgDataDao;
+import com.epmet.datareport.service.evaluationindex.screen.ScreenProjectService;
+import com.epmet.evaluationindex.screen.dto.form.ProjectDetailFormDTO;
+import com.epmet.evaluationindex.screen.dto.result.ProjectDetailResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +19,7 @@ import java.util.List;
  * @date 2020/8/18 10:23
  */
 @Service
+@DataSource(DataSourceConstant.EVALUATION_INDEX)
 public class ScreenProjectServiceImpl implements ScreenProjectService {
 
     @Autowired
@@ -32,7 +33,7 @@ public class ScreenProjectServiceImpl implements ScreenProjectService {
      * @author zxc
      * @date 2020/8/19 4:36 下午
      */
-    @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true)
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     public ProjectDetailResultDTO projectDetail(ProjectDetailFormDTO projectDetailFormDTO) {
         ProjectDetailResultDTO projectDetailResultDTO = screenEventDataDao.selectEventDetail(projectDetailFormDTO.getProjectId(),projectDetailFormDTO.getAgencyId());
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/bootstrap.yml b/epmet-module/data-report/data-report-server/src/main/resources/bootstrap.yml
index 44b522b30b..5899ead6dd 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/bootstrap.yml
@@ -104,6 +104,11 @@ dynamic:
       url: @datasource.druid.statsdisplay.url@
       username: @datasource.druid.statsdisplay.username@
       password: @datasource.druid.statsdisplay.password@
+    evaluationIndex:
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      url: @datasource.druid.evaluationIndex.url@
+      username: @datasource.druid.evaluationIndex.username@
+      password: @datasource.druid.evaluationIndex.password@
 
 feign:
   hystrix:
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml b/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml
index ea81aca726..793be083a1 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml
@@ -149,7 +149,7 @@
         <logger name="com.epmet.datareport.dao.topic" level="DEBUG"/>
         <logger name="com.epmet.datareport.dao.user" level="DEBUG"/>
         <logger name="com.epmet.datareport.dao.voice" level="DEBUG"/>
-        <logger name="com.epmet.datareport.dao.screen" level="DEBUG"/>
+        <logger name="com.epmet.datareport.dao.evaluationindex.screen" level="DEBUG"/>
         <root level="INFO">
             <appender-ref ref="DEBUG_FILE"/>
             <appender-ref ref="INFO_FILE"/>
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCpcBaseDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCpcBaseDataDao.xml
index ef851d6a08..fa89221e37 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCpcBaseDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCpcBaseDataDao.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.datareport.dao.screen.ScreenCpcBaseDataDao">
+<mapper namespace="com.epmet.datareport.dao.evaluationindex.screen.ScreenCpcBaseDataDao">
 
     <!-- 查询党员年龄分布情况 -->
-    <select id="selectPartymemberAgeDistribution" resultType="com.epmet.screen.dto.result.PartymemberAgeDistributionResultDTO">
+    <select id="selectPartymemberAgeDistribution" resultType="com.epmet.evaluationindex.screen.dto.result.PartymemberAgeDistributionResultDTO">
         SELECT
             SUM( AGE_LEVEL_1 ) + SUM( AGE_LEVEL_2 ) AS under30Count,
             SUM( AGE_LEVEL_3 ) + SUM( AGE_LEVEL_4 ) AS between31And50Count,
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
index f66aef3609..22a62be6d0 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.datareport.dao.screen.ScreenCustomerAgencyDao">
+<mapper namespace="com.epmet.datareport.dao.evaluationindex.screen.ScreenCustomerAgencyDao">
 
     <!-- 查询客户根组织ID -->
-    <select id="selectRootAgencyId" resultType="com.epmet.screen.dto.result.TreeResultDTO">
+    <select id="selectRootAgencyId" resultType="com.epmet.evaluationindex.screen.dto.result.TreeResultDTO">
         SELECT
             agency_name AS label,
             agency_id AS value,
@@ -20,7 +20,7 @@
     </select>
 
     <!-- 查询下级机关的 名称和id -->
-    <select id="selectSubAgencyList" resultType="com.epmet.screen.dto.result.TreeResultDTO">
+    <select id="selectSubAgencyList" resultType="com.epmet.evaluationindex.screen.dto.result.TreeResultDTO">
         SELECT
             agency_id AS value,
             agency_name AS label,
@@ -37,7 +37,7 @@
     </select>
 
     <!-- 查询当前机关的区域信息 -->
-    <select id="getAgencyAreaInfo" resultType="com.epmet.screen.dto.result.CompartmentResultDTO">
+    <select id="getAgencyAreaInfo" resultType="com.epmet.evaluationindex.screen.dto.result.CompartmentResultDTO">
         SELECT
             agency_id AS agencyId,
             agency_name AS name,
@@ -51,7 +51,7 @@
     </select>
 
     <!-- 查询子级区域分布信息【机关级别】 -->
-    <select id="selectSubDistribution" resultType="com.epmet.screen.dto.result.AgencyDistributionResultDTO">
+    <select id="selectSubDistribution" resultType="com.epmet.evaluationindex.screen.dto.result.AgencyDistributionResultDTO">
         SELECT
             agency_id AS subId,
             agency_name AS subName,
@@ -66,7 +66,7 @@
     </select>
 
     <!-- 查询子级用户分布【机关级别】 -->
-    <select id="selectUserDistributionAgency" resultType="com.epmet.screen.dto.result.UserDistributionResultDTO">
+    <select id="selectUserDistributionAgency" resultType="com.epmet.evaluationindex.screen.dto.result.UserDistributionResultDTO">
         SELECT
             sutd.org_id AS subId,
             sca.center_mark AS centerMark,
@@ -84,7 +84,7 @@
     </select>
 
     <!-- 查询子级党员分布【机关级别】 -->
-    <select id="selectParymemberDistribution" resultType="com.epmet.screen.dto.result.ParymemberDistributionResultDTO">
+    <select id="selectParymemberDistribution" resultType="com.epmet.evaluationindex.screen.dto.result.ParymemberDistributionResultDTO">
         SELECT
             sutd.org_id AS subId,
             sca.center_mark AS centerMark,
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerDeptDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerDeptDao.xml
index 58e2171c3d..cf939d024a 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerDeptDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerDeptDao.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.datareport.dao.screen.ScreenCustomerDeptDao">
+<mapper namespace="com.epmet.datareport.dao.evaluationindex.screen.ScreenCustomerDeptDao">
 
 
 
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml
index 01d3f4da7d..6cafd96036 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.datareport.dao.screen.ScreenCustomerGridDao">
+<mapper namespace="com.epmet.datareport.dao.evaluationindex.screen.ScreenCustomerGridDao">
 
     <!-- 查询子级区域分布信息 -->
-    <select id="selectSubDistribution" resultType="com.epmet.screen.dto.result.AgencyDistributionResultDTO">
+    <select id="selectSubDistribution" resultType="com.epmet.evaluationindex.screen.dto.result.AgencyDistributionResultDTO">
         SELECT
             grid_id AS subId,
             grid_name AS subName,
@@ -19,7 +19,7 @@
     </select>
 
     <!-- 查询党支部信息 -->
-    <select id="selectBranch" resultType="com.epmet.screen.dto.result.BranchResultDTO">
+    <select id="selectBranch" resultType="com.epmet.evaluationindex.screen.dto.result.BranchResultDTO">
         SELECT
             grid_id AS gridId,
             grid_name AS gridName,
@@ -32,7 +32,7 @@
     </select>
 
     <!-- 查询子级用户分布【网格级别】 -->
-    <select id="selectUserDistribution" resultType="com.epmet.screen.dto.result.UserDistributionResultDTO">
+    <select id="selectUserDistribution" resultType="com.epmet.evaluationindex.screen.dto.result.UserDistributionResultDTO">
         SELECT
             sutd.org_id AS subId,
             scg.center_mark AS centerMark,
@@ -50,7 +50,7 @@
     </select>
 
     <!-- 查询子级党员分布【网格级别】 -->
-    <select id="selectParymemberDistribution" resultType="com.epmet.screen.dto.result.ParymemberDistributionResultDTO">
+    <select id="selectParymemberDistribution" resultType="com.epmet.evaluationindex.screen.dto.result.ParymemberDistributionResultDTO">
         SELECT
             sutd.org_id AS subId,
             scg.center_mark AS centerMark,
@@ -68,7 +68,7 @@
     </select>
 
     <!-- 查询机关下的网格 -->
-    <select id="selectGridInfo" resultType="com.epmet.screen.dto.result.TreeResultDTO">
+    <select id="selectGridInfo" resultType="com.epmet.evaluationindex.screen.dto.result.TreeResultDTO">
         SELECT
             grid_id AS value,
             grid_name AS label,
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml
index 630befedcd..0bb479ed65 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.datareport.dao.screen.ScreenDifficultyDataDao">
+<mapper namespace="com.epmet.datareport.dao.evaluationindex.screen.ScreenDifficultyDataDao">
 
     <!-- 查询难点赌点-耗时最长|涉及部门最多|处理次数 -->
-    <select id="selectDifficulty" resultType="com.epmet.screen.dto.result.DifficultProjectResultDTO">
+    <select id="selectDifficulty" resultType="com.epmet.evaluationindex.screen.dto.result.DifficultProjectResultDTO">
          SELECT
             diff.EVENT_ID AS projectId,
             diff.EVENT_CONTENT AS title,
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml
index 750439bb3e..b877ad611d 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.datareport.dao.screen.ScreenEventDataDao">
+<mapper namespace="com.epmet.datareport.dao.evaluationindex.screen.ScreenEventDataDao">
 
     <!-- 查询事件 -->
-    <select id="selectEvent" resultType="com.epmet.screen.dto.result.ProjectResultDTO">
+    <select id="selectEvent" resultType="com.epmet.evaluationindex.screen.dto.result.ProjectResultDTO">
         SELECT
             IFNULL(event_title,'') AS projectTitle,
             event_level AS color,
@@ -20,7 +20,7 @@
     </select>
 
     <!-- 项目详情 -->
-    <select id="selectEventDetail" resultType="com.epmet.screen.dto.result.ProjectDetailResultDTO">
+    <select id="selectEventDetail" resultType="com.epmet.evaluationindex.screen.dto.result.ProjectDetailResultDTO">
         SELECT
             event_content AS projectContent,
             event_status_desc AS STATUS,
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventImgDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventImgDataDao.xml
index e5e3e636af..ef20677ece 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventImgDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventImgDataDao.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.datareport.dao.screen.ScreenEventImgDataDao">
+<mapper namespace="com.epmet.datareport.dao.evaluationindex.screen.ScreenEventImgDataDao">
 
     <!-- 查询事件imgUrl集合 -->
     <select id="selectEventImgList" resultType="java.lang.String">
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml
index a453f09e54..7976de7ff1 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.datareport.dao.screen.ScreenGovernRankDataDao">
+<mapper namespace="com.epmet.datareport.dao.evaluationindex.screen.ScreenGovernRankDataDao">
 
     <!-- 查询政府治理能力各项指标 -->
-    <select id="selectGovernCapacityRatio" resultType="com.epmet.screen.dto.result.GovernCapacityResultDTO">
+    <select id="selectGovernCapacityRatio" resultType="com.epmet.evaluationindex.screen.dto.result.GovernCapacityResultDTO">
        SELECT
             ORG_NAME AS agencyName,
             RESPONSE_RATIO,
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
index 4122ee8d29..37f45b8084 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.datareport.dao.screen.ScreenIndexDataMonthlyDao">
+<mapper namespace="com.epmet.datareport.dao.evaluationindex.screen.ScreenIndexDataMonthlyDao">
 
     <!-- 2、月度指数分析-饼状图 -->
-    <select id="selectMonthPieChart" resultType="com.epmet.screen.dto.result.MonthPieChartResultDTO">
+    <select id="selectMonthPieChart" resultType="com.epmet.evaluationindex.screen.dto.result.MonthPieChartResultDTO">
         SELECT
             service_ablity AS serviceAbility,
             party_dev_ablity AS partyDevAbility,
@@ -27,7 +27,7 @@
     </select>
 
     <!-- 查询近一年的指数值【包括本月】 -->
-    <select id="selectMonthBarchart" resultType="com.epmet.screen.dto.result.MonthBarchartResult">
+    <select id="selectMonthBarchart" resultType="com.epmet.evaluationindex.screen.dto.result.MonthBarchartResult">
         SELECT
 	        month_id AS monthId,
             service_ablity AS serviceAbility,
@@ -44,7 +44,7 @@
     </select>
 
     <!-- 下级部门指数排行 -->
-    <select id="selectSubAgencyIndexRank" parameterType="com.epmet.screen.dto.form.SubAgencyIndexRankFormDTO" resultType="com.epmet.screen.dto.result.SubAgencyIndexRankResultDTO">
+    <select id="selectSubAgencyIndexRank" parameterType="com.epmet.evaluationindex.screen.dto.form.SubAgencyIndexRankFormDTO" resultType="com.epmet.evaluationindex.screen.dto.result.SubAgencyIndexRankResultDTO">
         SELECT
             org_name AS NAME,
             index_total AS totalIndex,
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml
index 3d9329846d..d224b92d4e 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.datareport.dao.screen.ScreenIndexDataYearlyDao">
+<mapper namespace="com.epmet.datareport.dao.evaluationindex.screen.ScreenIndexDataYearlyDao">
 
     <!-- 1、年度平均指数 -->
-    <select id="selectYearAverageIndex" resultType="com.epmet.screen.dto.result.YearAverageIndexResultDTO">
+    <select id="selectYearAverageIndex" resultType="com.epmet.evaluationindex.screen.dto.result.YearAverageIndexResultDTO">
         SELECT
             index_total AS yearAverageIndex,
             service_ablity AS serviceAbility,
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml
index 97292b4797..310320029e 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.datareport.dao.screen.ScreenOrgRankDataDao">
+<mapper namespace="com.epmet.datareport.dao.evaluationindex.screen.ScreenOrgRankDataDao">
 
     <!-- 查询指定机关的直属网格月度数据 -->
-    <select id="selectGridDataMonthly" resultType="com.epmet.screen.dto.result.OrgRankDataResultDTO">
+    <select id="selectGridDataMonthly" resultType="com.epmet.evaluationindex.screen.dto.result.OrgRankDataResultDTO">
         SELECT
             ORG_NAME AS NAME,
             PARTY_TOTAL AS partyMemberNum,
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml
index 2b20c44880..0ee2a6a315 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.datareport.dao.screen.ScreenPartyBranchDataDao">
+<mapper namespace="com.epmet.datareport.dao.evaluationindex.screen.ScreenPartyBranchDataDao">
 
     <!-- 根据agencyTd、type(数据类别 party:支部建设;union:联合建设)查出共有多少议题主题 -->
     <select id="selectIssueGroup" resultType="java.lang.String">
@@ -17,7 +17,7 @@
     </select>
 
     <!-- 根据议题名称查找近12个月的数据 -->
-    <select id="selectBranchDataByTypeAndTimeZone" resultType="com.epmet.screen.dto.result.BranchIssueDataResultDTO">
+    <select id="selectBranchDataByTypeAndTimeZone" resultType="com.epmet.evaluationindex.screen.dto.result.BranchIssueDataResultDTO">
         SELECT
             MONTH_ID,
             MEET_CATEGORY_NAME AS issue,
@@ -38,7 +38,7 @@
     </select>
 
     <!-- 查找指定组织的下级组织的党建联建数据排序 -->
-    <select id="selectBranchDataByTypeOrder" resultType="com.epmet.screen.dto.result.BranchBuildOrderByCountResultDTO">
+    <select id="selectBranchDataByTypeOrder" resultType="com.epmet.evaluationindex.screen.dto.result.BranchBuildOrderByCountResultDTO">
         SELECT
             ORG_NAME,
             SUM( ORGANIZE_COUNT ) AS organizeData ,
@@ -69,7 +69,7 @@
     </select>
 
     <!-- 查询党员志愿服务 -->
-    <select id="selectVolunteerServiceResult" resultType="com.epmet.screen.dto.result.VolunteerServiceResult">
+    <select id="selectVolunteerServiceResult" resultType="com.epmet.evaluationindex.screen.dto.result.VolunteerServiceResult">
         SELECT
             month_id AS monthId,
             SUM(organize_count) AS organizeData,
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyLinkMassesDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyLinkMassesDataDao.xml
index 5643b1e31b..2bbdece16c 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyLinkMassesDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyLinkMassesDataDao.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.datareport.dao.screen.ScreenPartyLinkMassesDataDao">
+<mapper namespace="com.epmet.datareport.dao.evaluationindex.screen.ScreenPartyLinkMassesDataDao">
 
     <!-- 查询党员联系群众 -->
-    <select id="selectContactMassLineChart" resultType="com.epmet.screen.dto.result.ContactMassLineChartResult">
+    <select id="selectContactMassLineChart" resultType="com.epmet.evaluationindex.screen.dto.result.ContactMassLineChartResult">
         SELECT
             org_name AS orgName,
             create_group_total AS groupTotal,
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
index 80aee4ece5..8d865b6341 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.datareport.dao.screen.ScreenPartyUserRankDataDao">
+<mapper namespace="com.epmet.datareport.dao.evaluationindex.screen.ScreenPartyUserRankDataDao">
 
     <!-- 查询指定机关所属网格的用户积分排名 -->
-    <select id="selectUserPointOrder" resultType="com.epmet.screen.dto.result.UserPointResultDTO">
+    <select id="selectUserPointOrder" resultType="com.epmet.evaluationindex.screen.dto.result.UserPointResultDTO">
         SELECT
             concat( surname, CASE char_length( NAME ) WHEN 1 THEN '*' WHEN 2 THEN '**' ELSE '***' END )  AS name,
             point_total AS point
@@ -21,7 +21,7 @@
 
 
     <!-- 查询指定机关所属网格的党员积分排名 -->
-    <select id="selectPartymemberPointOrder" resultType="com.epmet.screen.dto.result.PartyUserPointResultDTO">
+    <select id="selectPartymemberPointOrder" resultType="com.epmet.evaluationindex.screen.dto.result.PartyUserPointResultDTO">
         SELECT
             USER_ID,
             concat( surname, CASE char_length( NAME ) WHEN 1 THEN '*' WHEN 2 THEN '**' ELSE '***' END )  AS name,
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml
index 5e509c8329..992c347f9b 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.datareport.dao.screen.ScreenPioneerDataDao">
+<mapper namespace="com.epmet.datareport.dao.evaluationindex.screen.ScreenPioneerDataDao">
 
     <!-- 查询先锋模范 -->
-    <select id="selectFineExample" resultType="com.epmet.screen.dto.result.FineExampleResultDTO">
+    <select id="selectFineExample" resultType="com.epmet.evaluationindex.screen.dto.result.FineExampleResultDTO">
         SELECT
             issue_total AS issueTotal,
             issue_ratio AS issueRatioA,
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPublicPartiTotalDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPublicPartiTotalDataDao.xml
index ff931885f6..1a94210725 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPublicPartiTotalDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPublicPartiTotalDataDao.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.datareport.dao.screen.ScreenPublicPartiTotalDataDao">
+<mapper namespace="com.epmet.datareport.dao.evaluationindex.screen.ScreenPublicPartiTotalDataDao">
 
     <!-- 查询公众参与各类总数 -->
-    <select id="selectPublicPartiTotal" resultType="com.epmet.screen.dto.result.PublicPartiRankResultDTO">
+    <select id="selectPublicPartiTotal" resultType="com.epmet.evaluationindex.screen.dto.result.PublicPartiRankResultDTO">
         SELECT
             ORG_NAME AS NAME,
             REG_USER_TOTAL AS regNum,
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml
index 2fe2eb4337..cbbc5fe211 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.datareport.dao.screen.ScreenUserJoinDao">
+<mapper namespace="com.epmet.datareport.dao.evaluationindex.screen.ScreenUserJoinDao">
 
     <!-- 查询用户参与数据 -->
-    <select id="selectUserJoinData" resultType="com.epmet.screen.dto.result.UserJoinIndicatorGrowthRateResultDTO">
+    <select id="selectUserJoinData" resultType="com.epmet.evaluationindex.screen.dto.result.UserJoinIndicatorGrowthRateResultDTO">
         SELECT
             JOIN_TOTAL AS total,
             AVG_JOIN AS averageJoin,
@@ -25,7 +25,7 @@
     </select>
 
     <!-- 查询用户参与月度数据 -->
-    <select id="selectUserJoinDataMonthly" resultType="com.epmet.screen.dto.result.UserJoinMonthlyResultDTO">
+    <select id="selectUserJoinDataMonthly" resultType="com.epmet.evaluationindex.screen.dto.result.UserJoinMonthlyResultDTO">
      <!-- 字段完全对不上 -->
      /*   SELECT
             MONTH_ID,
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml
index 84e00a0f5d..57b2959430 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.datareport.dao.screen.ScreenUserTotalDataDao">
+<mapper namespace="com.epmet.datareport.dao.evaluationindex.screen.ScreenUserTotalDataDao">
 
     <!-- 党员基本情况-饼状图概况 -->
-    <select id="selectAgencyPartymemberPercent" resultType="com.epmet.screen.dto.result.PartymemberPercentResultDTO">
+    <select id="selectAgencyPartymemberPercent" resultType="com.epmet.evaluationindex.screen.dto.result.PartymemberPercentResultDTO">
         SELECT
             SUM( PARTY_TOTAL ) AS partyMemberTotal,
             SUM( USER_TOTAL ) AS platFormTotal
@@ -16,7 +16,7 @@
     </select>
 
     <!-- 查询top区概况 -->
-    <select id="selectTopProfile" resultType="com.epmet.screen.dto.result.TopProfileResultDTO">
+    <select id="selectTopProfile" resultType="com.epmet.evaluationindex.screen.dto.result.TopProfileResultDTO">
         SELECT
 	        user_total AS userNum,
             party_total AS partyMemberNum,
@@ -46,7 +46,7 @@
 
 
     <!-- 查询用户数据 -->
-    <select id="selectUserTotalData" resultType="com.epmet.screen.dto.result.PublicPartiRankResultDTO">
+    <select id="selectUserTotalData" resultType="com.epmet.evaluationindex.screen.dto.result.PublicPartiRankResultDTO">
         SELECT
             ORG_NAME AS NAME,
             REG_USER_TOTAL AS regNum,
diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml
index 70552ac026..8a76d00116 100644
--- a/epmet-module/data-statistical/data-statistical-server/pom.xml
+++ b/epmet-module/data-statistical/data-statistical-server/pom.xml
@@ -281,6 +281,18 @@
                 <datasource.druid.user.username>epmet</datasource.druid.user.username>
                 <datasource.druid.user.password>elink@833066</datasource.druid.user.password>
 
+                <datasource.druid.statsdisplay.url>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_data_statistical_display?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.statsdisplay.url>
+                <datasource.druid.statsdisplay.username>epmet</datasource.druid.statsdisplay.username>
+                <datasource.druid.statsdisplay.password>elink@833066</datasource.druid.statsdisplay.password>
+
+                <datasource.druid.evaluationIndex.url>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.evaluationIndex.url>
+                <datasource.druid.evaluationIndex.username>epmet</datasource.druid.evaluationIndex.username>
+                <datasource.druid.evaluationIndex.password>elink@833066</datasource.druid.evaluationIndex.password>
+
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
@@ -363,6 +375,18 @@
                 <datasource.druid.user.username>epmet_user_user</datasource.druid.user.username>
                 <datasource.druid.user.password>EpmEt-db-UsEr</datasource.druid.user.password>
 
+                <datasource.druid.statsdisplay.url>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_data_statistical_display?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.statsdisplay.url>
+                <datasource.druid.statsdisplay.username>epmet_data_stats_display_user</datasource.druid.statsdisplay.username>
+                <datasource.druid.statsdisplay.password>EpmEt-db-UsEr</datasource.druid.statsdisplay.password>
+
+                <datasource.druid.evaluationIndex.url>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.evaluationIndex.url>
+                <datasource.druid.evaluationIndex.username>epmet_evaluation_index_user</datasource.druid.evaluationIndex.username>
+                <datasource.druid.evaluationIndex.password>EpmEt-db-UsEr</datasource.druid.evaluationIndex.password>
+
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/2020-09-02_add_screen_table.sql b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/2020-09-02_add_screen_table.sql
new file mode 100644
index 0000000000..4374c4cd09
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/2020-09-02_add_screen_table.sql
@@ -0,0 +1,514 @@
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : 测试
+ Source Server Type    : MySQL
+ Source Server Version : 50726
+ Source Host           : rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306
+ Source Schema         : epmet_evaluation_index
+
+ Target Server Type    : MySQL
+ Target Server Version : 50726
+ File Encoding         : 65001
+
+ Date: 02/09/2020 17:57:39
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for screen_cpc_base_data
+-- ----------------------------
+DROP TABLE IF EXISTS `screen_cpc_base_data`;
+CREATE TABLE `screen_cpc_base_data` (
+                                        `ID` varchar(64) NOT NULL COMMENT 'ID 主键',
+                                        `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id',
+                                        `ORG_TYPE` varchar(32) NOT NULL COMMENT '组织类别 agency：组织；部门：department；网格：grid',
+                                        `ORG_ID` varchar(64) NOT NULL COMMENT '组织Id 可以为网格，机关id',
+                                        `PARENT_ID` varchar(64) NOT NULL COMMENT '上级组织Id',
+                                        `ORG_NAME` varchar(128) NOT NULL COMMENT '组织名称',
+                                        `DATA_END_TIME` varchar(32) NOT NULL COMMENT '数据更新至: yyyy|yyyyMM|yyyyMMdd(08-21新增)',
+                                        `REGISTER_USER_COUNT` int(11) DEFAULT '0' COMMENT '注册用户数',
+                                        `RESI_TOTAL` int(11) DEFAULT '0' COMMENT '群众用户数',
+                                        `PARTY_MEMBER_COUNT` int(11) DEFAULT '0' COMMENT '注册党员数',
+                                        `AGE_LEVEL_1` int(11) DEFAULT '0' COMMENT '小于20岁的党员总人数',
+                                        `AGE_LEVEL_2` int(11) DEFAULT '0' COMMENT '20-30岁的党员总人数',
+                                        `AGE_LEVEL_3` int(11) DEFAULT '0' COMMENT '31-40岁的党员总人数',
+                                        `AGE_LEVEL_4` int(11) DEFAULT '0' COMMENT '41-50岁的党员总人数',
+                                        `AGE_LEVEL_5` int(11) DEFAULT '0' COMMENT '51-60岁的党员总人数',
+                                        `AGE_LEVEL_6` int(11) DEFAULT '0' COMMENT '60+岁的党员总人数',
+                                        `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除；1已删除',
+                                        `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+                                        `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人',
+                                        `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+                                        `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人',
+                                        `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+                                        PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='基层党建-党员基本情况';
+
+-- ----------------------------
+-- Table structure for screen_customer_agency
+-- ----------------------------
+DROP TABLE IF EXISTS `screen_customer_agency`;
+CREATE TABLE `screen_customer_agency` (
+                                          `ID` varchar(64) NOT NULL COMMENT '主键ID 主键ID',
+                                          `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id',
+                                          `AGENCY_ID` varchar(64) NOT NULL COMMENT '组织id',
+                                          `AGENCY_NAME` varchar(255) NOT NULL COMMENT '组织名称',
+                                          `PID` varchar(64) NOT NULL COMMENT '父级id ,顶级，此列为0',
+                                          `PIDS` varchar(512) DEFAULT NULL COMMENT '所有上级ID，用逗号（英文）分开',
+                                          `ALL_PARENT_NAMES` varchar(512) DEFAULT NULL COMMENT '所有组织名称以-链接',
+                                          `AREA_MARKS` text COMMENT '坐标区域',
+                                          `CENTER_MARK` varchar(255) DEFAULT NULL COMMENT '中心点位',
+                                          `PARTY_MARK` varchar(255) DEFAULT NULL COMMENT '党工委或者党委的位置，目前此阶段为预留字段',
+                                          `LEVEL` varchar(32) NOT NULL COMMENT '机关级别（社区级：community，\r\n乡（镇、街道）级:street,\r\n区县级: district,\r\n市级: city\r\n省级:province）',
+                                          `AREA_CODE` varchar(30) DEFAULT NULL COMMENT '行政地区编码',
+                                          `DEL_FLAG` int(11) NOT NULL DEFAULT '0' COMMENT '删除标识 0.未删除 1.已删除',
+                                          `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+                                          `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人',
+                                          `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+                                          `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人',
+                                          `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+                                          `DATA_END_TIME` varchar(32) NOT NULL COMMENT '数据更新至: yyyy|yyyyMM|yyyyMMdd(08-21新增)',
+                                          PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='组织机构信息';
+
+-- ----------------------------
+-- Table structure for screen_customer_dept
+-- ----------------------------
+DROP TABLE IF EXISTS `screen_customer_dept`;
+CREATE TABLE `screen_customer_dept` (
+                                        `ID` varchar(64) NOT NULL COMMENT '主键ID 主键ID',
+                                        `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id',
+                                        `DEPT_ID` varchar(64) NOT NULL COMMENT '部门id',
+                                        `DEPT_NAME` varchar(255) NOT NULL COMMENT '部门名称',
+                                        `PARENT_AGENCY_ID` varchar(64) NOT NULL COMMENT '部门所属组织id',
+                                        `AREA_MARKS` text COMMENT '坐标区域',
+                                        `CENTER_MARK` varchar(255) DEFAULT NULL COMMENT '中心点位',
+                                        `DEPT_MARK` varchar(255) DEFAULT NULL COMMENT '部门所在位置（目前预留此字段）',
+                                        `DEL_FLAG` int(11) NOT NULL DEFAULT '0' COMMENT '删除标识 0.未删除 1.已删除',
+                                        `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+                                        `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人',
+                                        `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+                                        `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人',
+                                        `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+                                        `DATA_END_TIME` varchar(32) NOT NULL COMMENT '数据更新至: yyyy|yyyyMM|yyyyMMdd(08-21新增)',
+                                        PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='部门信息';
+
+-- ----------------------------
+-- Table structure for screen_customer_grid
+-- ----------------------------
+DROP TABLE IF EXISTS `screen_customer_grid`;
+CREATE TABLE `screen_customer_grid` (
+                                        `ID` varchar(64) NOT NULL COMMENT '主键ID 主键ID',
+                                        `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id',
+                                        `GRID_ID` varchar(64) NOT NULL COMMENT '网格id',
+                                        `GRID_NAME` varchar(255) NOT NULL COMMENT '组织名称',
+                                        `PARENT_AGENCY_ID` varchar(64) NOT NULL COMMENT '网格所属组织id',
+                                        `AREA_MARKS` text COMMENT '坐标区域',
+                                        `CENTER_MARK` varchar(255) DEFAULT NULL COMMENT '中心点位',
+                                        `PARTY_MARK` varchar(255) DEFAULT NULL COMMENT '党支部（=网格）的位置',
+                                        `DEL_FLAG` int(11) NOT NULL DEFAULT '0' COMMENT '删除标识 0.未删除 1.已删除',
+                                        `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+                                        `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人',
+                                        `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+                                        `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人',
+                                        `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+                                        `DATA_END_TIME` varchar(32) NOT NULL COMMENT '数据更新至: yyyy|yyyyMM|yyyyMMdd(08-21新增)',
+                                        `ALL_PARENT_IDS` varchar(512) DEFAULT NULL COMMENT '所有上级ID，用英文逗号分开',
+                                        PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='网格(党支部)信息';
+
+-- ----------------------------
+-- Table structure for screen_difficulty_data
+-- ----------------------------
+DROP TABLE IF EXISTS `screen_difficulty_data`;
+CREATE TABLE `screen_difficulty_data` (
+                                          `ID` varchar(64) NOT NULL COMMENT 'ID 主键',
+                                          `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id',
+                                          `ORG_TYPE` varchar(32) NOT NULL DEFAULT 'agency' COMMENT '组织类别 agency：组织；部门：department；网格：grid',
+                                          `ORG_ID` varchar(64) NOT NULL COMMENT '组织Id 可以为网格，机关id',
+                                          `PARENT_ID` varchar(64) NOT NULL COMMENT '上级组织Id',
+                                          `ORG_NAME` varchar(128) NOT NULL COMMENT '组织名称',
+                                          `EVENT_ID` varchar(64) NOT NULL COMMENT '事件原Id',
+                                          `EVENT_IMG_URL` varchar(512) DEFAULT NULL COMMENT '事件图片',
+                                          `EVENT_SOURCE` varchar(64) DEFAULT NULL COMMENT '事件来源 XX街道-社区-网格',
+                                          `EVENT_CONTENT` varchar(512) DEFAULT NULL COMMENT '事件内容',
+                                          `EVENT_COST_TIME` int(11) DEFAULT '0' COMMENT '事件耗时 单位：分钟',
+                                          `EVENT_RE_ORG` int(11) DEFAULT '0' COMMENT '事件涉及部门数',
+                                          `EVENT_HANDLED_COUNT` int(11) NOT NULL COMMENT '事件被处理次数（08-21新增）',
+                                          `EVENT_CATEGORY_CODE` varchar(32) DEFAULT NULL COMMENT '事件类别编码',
+                                          `EVENT_CATEGORY_NAME` varchar(128) DEFAULT NULL COMMENT '事件类别名称',
+                                          `EVENT_STATUS_CODE` varchar(32) DEFAULT NULL COMMENT '事件状态key',
+                                          `EVENT_STATUS_DESC` varchar(64) DEFAULT NULL COMMENT '事件状态描述',
+                                          `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除；1已删除',
+                                          `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁',
+                                          `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人',
+                                          `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+                                          `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人',
+                                          `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+                                          `LATEST_OPERATE_DESC` varchar(64) NOT NULL COMMENT '最近一次操作说明',
+                                          `DATA_END_TIME` varchar(32) NOT NULL COMMENT '数据更新至: yyyy|yyyyMM|yyyyMMdd(08-21新增)',
+                                          `ALL_PARENT_IDS` varchar(512) DEFAULT NULL COMMENT '所有上级ID，用英文逗号分开',
+                                          PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='基层治理-难点堵点(耗时最长|设计部门最多|处理次数)';
+
+-- ----------------------------
+-- Table structure for screen_event_data
+-- ----------------------------
+DROP TABLE IF EXISTS `screen_event_data`;
+CREATE TABLE `screen_event_data` (
+                                     `ID` varchar(256) NOT NULL COMMENT 'ID 主键',
+                                     `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id',
+                                     `ORG_TYPE` varchar(32) NOT NULL DEFAULT 'agency' COMMENT '组织类别 agency：组织；部门：department；网格：grid',
+                                     `ORG_ID` varchar(64) NOT NULL COMMENT '组织Id 可以为网格，机关id',
+                                     `PARENT_ID` varchar(64) NOT NULL COMMENT '上级组织Id',
+                                     `ORG_NAME` varchar(128) NOT NULL COMMENT '组织名称',
+                                     `EVENT_ID` varchar(64) NOT NULL COMMENT '原始事件Id',
+                                     `EVENT_TITLE` varchar(256) DEFAULT '0' COMMENT '事件名称',
+                                     `EVENT_CREATE_TIME` datetime DEFAULT NULL COMMENT '事件时间',
+                                     `LINK_MOBILE` varchar(32) DEFAULT NULL COMMENT '联系人 联系人',
+                                     `EVENT_CONTENT` varchar(1024) DEFAULT '0' COMMENT '事件描述',
+                                     `EVENT_IMG_URL` varchar(512) DEFAULT NULL COMMENT '事件图片',
+                                     `EVENT_LEVEL` varchar(32) DEFAULT '0' COMMENT '事件待处理级别 red:红；yellow：黄；绿色：green',
+                                     `EVENT_ADDRESS` varchar(512) DEFAULT NULL COMMENT '事件地址',
+                                     `LONGITUDE` decimal(32,8) DEFAULT '0.00000000' COMMENT '事件所在经度',
+                                     `LATITUDE` decimal(32,8) DEFAULT '0.00000000' COMMENT '事件所在维度',
+                                     `LAST_PROCESS_DEPT` varchar(128) DEFAULT '0' COMMENT '最后处理组织',
+                                     `LAST_PROCESS_DATE` datetime DEFAULT '0000-00-00 00:00:00' COMMENT '最后处理时间',
+                                     `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除；1已删除',
+                                     `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+                                     `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人',
+                                     `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+                                     `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人',
+                                     `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+                                     `EVENT_STATUS_CODE` varchar(32) DEFAULT NULL COMMENT '事件状态key',
+                                     `EVENT_STATUS_DESC` varchar(64) DEFAULT NULL COMMENT '事件状态描述',
+                                     `LATEST_OPERATE_DESC` varchar(64) DEFAULT NULL COMMENT '最近一次操作说明',
+                                     `DATA_END_TIME` varchar(32) NOT NULL COMMENT '数据更新至: yyyy|yyyMM|yyyyMMdd',
+                                     `ALL_PARENT_IDS` varchar(512) DEFAULT NULL COMMENT '所有上级ID，用英文逗号分开',
+                                     PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='中央区-事件数据';
+
+-- ----------------------------
+-- Table structure for screen_event_img_data
+-- ----------------------------
+DROP TABLE IF EXISTS `screen_event_img_data`;
+CREATE TABLE `screen_event_img_data` (
+                                         `ID` varchar(64) NOT NULL COMMENT 'ID 主键',
+                                         `EVENT_ID` varchar(64) NOT NULL COMMENT '原始事件Id',
+                                         `EVENT_IMG_URL` varchar(512) NOT NULL COMMENT '图片图片地址',
+                                         `SORT` int(11) NOT NULL COMMENT '排序',
+                                         `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除；1已删除',
+                                         `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+                                         `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人',
+                                         `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+                                         `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人',
+                                         `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+                                         PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='中央区-事件数据图片数据';
+
+-- ----------------------------
+-- Table structure for screen_govern_rank_data
+-- ----------------------------
+DROP TABLE IF EXISTS `screen_govern_rank_data`;
+CREATE TABLE `screen_govern_rank_data` (
+                                           `ID` varchar(64) NOT NULL COMMENT 'ID 主键',
+                                           `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id',
+                                           `YEAR_ID` varchar(32) NOT NULL COMMENT '年Id',
+                                           `MONTH_ID` varchar(32) NOT NULL COMMENT '月份Id',
+                                           `ORG_TYPE` varchar(32) NOT NULL DEFAULT 'agency' COMMENT '组织类别 agency：组织；部门：department；网格：grid',
+                                           `ORG_ID` varchar(64) NOT NULL COMMENT '组织Id 可以为网格，机关id',
+                                           `PARENT_ID` varchar(64) NOT NULL COMMENT '上级组织Id',
+                                           `ORG_NAME` varchar(32) NOT NULL COMMENT '组织名称',
+                                           `RESPONSE_RATIO` decimal(10,6) DEFAULT NULL COMMENT '响应率',
+                                           `RESOLVED_RATIO` decimal(10,6) DEFAULT NULL COMMENT '解决率',
+                                           `GOVERN_RATIO` decimal(10,6) DEFAULT NULL COMMENT '自治率',
+                                           `SATISFACTION_RATIO` decimal(10,6) DEFAULT NULL COMMENT '满意率',
+                                           `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除；1已删除',
+                                           `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+                                           `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人',
+                                           `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+                                           `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人',
+                                           `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+                                           PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='基层治理-治理能力排行数据(按月统计)';
+
+-- ----------------------------
+-- Table structure for screen_index_data_monthly
+-- ----------------------------
+DROP TABLE IF EXISTS `screen_index_data_monthly`;
+CREATE TABLE `screen_index_data_monthly` (
+                                             `ID` varchar(64) NOT NULL COMMENT 'ID 主键',
+                                             `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id',
+                                             `YEAR_ID` varchar(32) NOT NULL COMMENT '年Id: yyyy',
+                                             `MONTH_ID` varchar(32) NOT NULL COMMENT '月份Id yyyyMM',
+                                             `ORG_TYPE` varchar(32) NOT NULL DEFAULT 'agency' COMMENT '组织类别 agency：组织；部门：department；网格：grid',
+                                             `ORG_ID` varchar(64) NOT NULL COMMENT '组织Id 可以为网格，机关id',
+                                             `PARENT_ID` varchar(64) NOT NULL COMMENT '上级组织Id',
+                                             `ORG_NAME` varchar(128) NOT NULL COMMENT '组织名称',
+                                             `INDEX_TOTAL` decimal(10,6) DEFAULT NULL COMMENT '总指数',
+                                             `PARTY_DEV_ABLITY` decimal(10,6) DEFAULT NULL COMMENT '党建能力指数',
+                                             `SERVICE_ABLITY` decimal(10,6) DEFAULT NULL COMMENT '服务能力指数',
+                                             `GOVERN_ABLITY` decimal(10,6) DEFAULT NULL COMMENT '治理能力指数',
+                                             `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除；1已删除',
+                                             `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+                                             `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人',
+                                             `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+                                             `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人',
+                                             `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+                                             PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='指数-指数数据(每月数值)';
+
+-- ----------------------------
+-- Table structure for screen_index_data_yearly
+-- ----------------------------
+DROP TABLE IF EXISTS `screen_index_data_yearly`;
+CREATE TABLE `screen_index_data_yearly` (
+                                            `ID` varchar(64) NOT NULL COMMENT 'ID 主键',
+                                            `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id',
+                                            `YEAR_ID` varchar(32) NOT NULL COMMENT '年Id: yyyy',
+                                            `ORG_TYPE` varchar(32) NOT NULL DEFAULT 'agency' COMMENT '组织类别 agency：组织；部门：department；网格：grid',
+                                            `ORG_ID` varchar(64) NOT NULL COMMENT '组织Id 可以为网格，机关id',
+                                            `PARENT_ID` varchar(64) NOT NULL COMMENT '上级组织Id',
+                                            `ORG_NAME` varchar(128) NOT NULL COMMENT '组织名称',
+                                            `INDEX_TOTAL` decimal(10,6) NOT NULL COMMENT '总指数',
+                                            `PARTY_DEV_ABLITY` decimal(10,6) NOT NULL COMMENT '党建能力指数',
+                                            `SERVICE_ABLITY` decimal(10,6) NOT NULL COMMENT '服务能力指数',
+                                            `GOVERN_ABLITY` decimal(10,6) NOT NULL COMMENT '治理能力指数',
+                                            `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除；1已删除',
+                                            `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+                                            `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人',
+                                            `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+                                            `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人',
+                                            `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+                                            PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='指数-指数数据(按年统计)';
+
+-- ----------------------------
+-- Table structure for screen_org_rank_data
+-- ----------------------------
+DROP TABLE IF EXISTS `screen_org_rank_data`;
+CREATE TABLE `screen_org_rank_data` (
+                                        `ID` varchar(64) NOT NULL COMMENT 'ID 主键',
+                                        `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id',
+                                        `YEAR_ID` varchar(32) NOT NULL COMMENT '年Id',
+                                        `MONTH_ID` varchar(32) NOT NULL COMMENT '月份Id',
+                                        `ORG_TYPE` varchar(32) NOT NULL COMMENT '组织类别 agency：组织；部门：department；网格：grid',
+                                        `ORG_ID` varchar(64) NOT NULL COMMENT '组织Id 可以为网格，机关id',
+                                        `PARENT_ID` varchar(64) NOT NULL COMMENT '上级组织Id',
+                                        `ORG_NAME` varchar(128) NOT NULL COMMENT '组织名称',
+                                        `PARTY_TOTAL` int(11) DEFAULT '0' COMMENT '党员总数',
+                                        `GROUP_TOTAL` int(11) DEFAULT '0' COMMENT '小组（支部建设）总数',
+                                        `TOPIC_TOTAL` int(11) DEFAULT '0' COMMENT '话题总数',
+                                        `ISSUE_TOTAL` int(11) DEFAULT '0' COMMENT '议题总数',
+                                        `PROJECT_TOTAL` int(11) DEFAULT '0' COMMENT '项目总数',
+                                        `CLOSE_PROJECT_RATIO` decimal(10,6) DEFAULT NULL COMMENT '结案率',
+                                        `SATISFACTION_RATIO` decimal(10,6) DEFAULT NULL COMMENT '满意率',
+                                        `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除；1已删除',
+                                        `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+                                        `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人',
+                                        `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+                                        `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人',
+                                        `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+                                        `ALL_PARENT_IDS` varchar(512) DEFAULT NULL COMMENT '所有上级ID，用英文逗号分开',
+                                        PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='党建引领-组织先进排行榜';
+
+-- ----------------------------
+-- Table structure for screen_party_branch_data
+-- ----------------------------
+DROP TABLE IF EXISTS `screen_party_branch_data`;
+CREATE TABLE `screen_party_branch_data` (
+                                            `ID` varchar(64) NOT NULL COMMENT 'ID 主键',
+                                            `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id',
+                                            `YEAR_ID` varchar(32) NOT NULL COMMENT '年Id',
+                                            `MONTH_ID` varchar(32) NOT NULL COMMENT '月份Id',
+                                            `TYPE` varchar(32) NOT NULL DEFAULT 'party' COMMENT '数据类别 ：party:支部建设; union:联合建设；党员志愿服务：voluntaryservice',
+                                            `ORG_TYPE` varchar(32) NOT NULL DEFAULT 'agency' COMMENT '组织类别 agency：组织；部门：department；网格：grid',
+                                            `ORG_ID` varchar(64) NOT NULL COMMENT '组织Id 可以为网格，机关id',
+                                            `PARENT_ID` varchar(64) NOT NULL COMMENT '上级组织Id',
+                                            `ORG_NAME` varchar(128) NOT NULL COMMENT '组织名称',
+                                            `MEET_CATEGORY_ID` varchar(32) DEFAULT '0' COMMENT '会议分类Id',
+                                            `MEET_CATEGORY_NAME` varchar(64) DEFAULT '0' COMMENT '会议分类名称（三会党课、主题党日.....等等）',
+                                            `ORGANIZE_COUNT` int(11) DEFAULT '0' COMMENT '组织次数',
+                                            `JOIN_USER_COUNT` int(11) DEFAULT '0' COMMENT '参加人数',
+                                            `AVERAGE_JOIN_USER_COUNT` int(11) DEFAULT NULL COMMENT '平均参加人数',
+                                            `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除；1已删除',
+                                            `REVISION` int(11) DEFAULT NULL COMMENT '乐观锁',
+                                            `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人',
+                                            `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+                                            `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人',
+                                            `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+                                            PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='基层党建-建设情况数据（支部，联建,志愿服务)按月';
+
+-- ----------------------------
+-- Table structure for screen_party_link_masses_data
+-- ----------------------------
+DROP TABLE IF EXISTS `screen_party_link_masses_data`;
+CREATE TABLE `screen_party_link_masses_data` (
+                                                 `ID` varchar(64) NOT NULL COMMENT 'ID 主键',
+                                                 `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id',
+                                                 `ORG_TYPE` varchar(32) NOT NULL DEFAULT 'agency' COMMENT '组织类别 agency：组织；部门：department；网格：grid',
+                                                 `ORG_ID` varchar(64) NOT NULL COMMENT '组织Id 可以为网格，机关id',
+                                                 `PARENT_ID` varchar(64) NOT NULL COMMENT '上级组织Id',
+                                                 `ORG_NAME` varchar(128) NOT NULL COMMENT '组织名称',
+                                                 `CREATE_GROUP_TOTAL` int(11) DEFAULT '0' COMMENT '党员建群总数',
+                                                 `GROUP_USER_TOTAL` int(11) DEFAULT '0' COMMENT '群成员总数',
+                                                 `DEL_FLAG` char(1) NOT NULL COMMENT '删除标识 0未删除；1已删除',
+                                                 `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+                                                 `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人',
+                                                 `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+                                                 `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人',
+                                                 `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+                                                 `DATA_END_TIME` varchar(32) NOT NULL COMMENT '数据更新至: yyyy|yyyyMM|yyyyMMdd(08-21新增)',
+                                                 PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='党建引领-党员联系群众数据';
+
+-- ----------------------------
+-- Table structure for screen_party_user_rank_data
+-- ----------------------------
+DROP TABLE IF EXISTS `screen_party_user_rank_data`;
+CREATE TABLE `screen_party_user_rank_data` (
+                                               `ID` varchar(64) NOT NULL COMMENT 'ID 主键',
+                                               `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id',
+                                               `GRID_ID` varchar(64) NOT NULL COMMENT '用户所属网格id',
+                                               `GRID_NAME` varchar(128) NOT NULL COMMENT '用户所属网格名称',
+                                               `ORG_ID` varchar(64) NOT NULL COMMENT '网格所属的组织id',
+                                               `ORG_NAME` varchar(255) NOT NULL COMMENT '网格所属的组织名称',
+                                               `PARTY_FLAG` tinyint(1) NOT NULL COMMENT '是否是党员标志：1是。0不是党员',
+                                               `USER_ID` varchar(64) NOT NULL COMMENT '用户Id',
+                                               `SURNAME` varchar(32) DEFAULT NULL COMMENT '姓',
+                                               `NAME` varchar(32) DEFAULT NULL COMMENT '名',
+                                               `USER_NAME` varchar(32) NOT NULL COMMENT '姓名',
+                                               `POINT_TOTAL` int(11) DEFAULT '0' COMMENT '用户积分',
+                                               `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除；1已删除',
+                                               `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+                                               `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人',
+                                               `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+                                               `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人',
+                                               `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+                                               `DATA_END_TIME` varchar(32) NOT NULL COMMENT '数据更新至: yyyy|yyyyMM|yyyyMMdd(08-21新增)',
+                                               `ALL_PARENT_IDS` varchar(512) DEFAULT NULL COMMENT '所有上级ID，用英文逗号分开',
+                                               PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='党建引领｜基层治理-市民（党员）积分排行榜';
+
+-- ----------------------------
+-- Table structure for screen_pioneer_data
+-- ----------------------------
+DROP TABLE IF EXISTS `screen_pioneer_data`;
+CREATE TABLE `screen_pioneer_data` (
+                                       `ID` varchar(64) NOT NULL COMMENT 'ID 主键',
+                                       `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id',
+                                       `ORG_TYPE` varchar(32) NOT NULL DEFAULT 'agency' COMMENT '组织类别 agency：组织；部门：department；网格：grid',
+                                       `ORG_ID` varchar(64) NOT NULL COMMENT '组织Id 可以为网格，机关id',
+                                       `PARENT_ID` varchar(64) NOT NULL COMMENT '上级组织Id',
+                                       `ORG_NAME` varchar(128) NOT NULL COMMENT '组织名称',
+                                       `ISSUE_TOTAL` int(11) DEFAULT '0' COMMENT '党员参与议事',
+                                       `ISSUE_RATIO` decimal(10,6) DEFAULT NULL COMMENT '党员参与议事占比',
+                                       `TOPIC_TOTAL` int(11) DEFAULT '0' COMMENT '党员发布话题',
+                                       `TOPIC_RATIO` decimal(10,6) DEFAULT NULL COMMENT '党员发布话题占比',
+                                       `PUBLISH_ISSUE_TOTAL` int(11) DEFAULT '0' COMMENT '党员发布议题',
+                                       `PUBLISH_ISSUE_RATIO` decimal(10,6) DEFAULT NULL COMMENT '党员发布议题占比',
+                                       `SHIFT_PROJECT_TOTAL` int(11) DEFAULT '0' COMMENT '议题转项目数',
+                                       `SHIFT_PROJECT_RATIO` decimal(10,6) DEFAULT NULL COMMENT '议题转项目占比',
+                                       `RESOLVED_PROJECT_TOTAL` int(11) DEFAULT '0' COMMENT '解决项目总数',
+                                       `RESOLVED_PROJECT_RATIO` decimal(10,6) DEFAULT NULL COMMENT '解决项目总数占比',
+                                       `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除；1已删除',
+                                       `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+                                       `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人',
+                                       `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+                                       `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人',
+                                       `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+                                       `DATA_END_TIME` varchar(32) NOT NULL COMMENT '数据更新至: yyyy|yyyyMM|yyyyMMdd(08-21新增)',
+                                       PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='党建引领-先锋模范数据';
+
+-- ----------------------------
+-- Table structure for screen_public_parti_total_data
+-- ----------------------------
+DROP TABLE IF EXISTS `screen_public_parti_total_data`;
+CREATE TABLE `screen_public_parti_total_data` (
+                                                  `ID` varchar(64) NOT NULL COMMENT 'ID 主键',
+                                                  `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id',
+                                                  `ORG_TYPE` varchar(32) NOT NULL DEFAULT 'agency' COMMENT '组织类别 agency：组织；网格：grid；部门：department；',
+                                                  `ORG_ID` varchar(64) NOT NULL COMMENT '组织Id 可以为网格，机关id',
+                                                  `PARENT_ID` varchar(64) NOT NULL COMMENT '上级组织Id，如果是网格，传入网格所属组织id',
+                                                  `ORG_NAME` varchar(128) NOT NULL COMMENT '组织名称，也可能是网格名称',
+                                                  `DATA_END_TIME` varchar(32) NOT NULL COMMENT '数据更新至: yyyy|yyyyMM|yyyyMMdd(08-21新增)',
+                                                  `TOPIC_TOTAL` int(11) NOT NULL DEFAULT '0' COMMENT '话题总数',
+                                                  `ISSUE_TOTAL` int(11) NOT NULL DEFAULT '0' COMMENT '议题总数',
+                                                  `PROJECT_TOTAL` int(11) NOT NULL DEFAULT '0' COMMENT '项目总数',
+                                                  `REG_USER_TOTAL` int(11) NOT NULL COMMENT '注册人数',
+                                                  `JOIN_USER_TOTAL` int(11) NOT NULL COMMENT '参与人数',
+                                                  `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除；1已删除',
+                                                  `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁',
+                                                  `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人',
+                                                  `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+                                                  `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人',
+                                                  `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+                                                  PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='公众参与-各类(话题|议题|项目|注册人数|参与人数)总数';
+
+-- ----------------------------
+-- Table structure for screen_user_join
+-- ----------------------------
+DROP TABLE IF EXISTS `screen_user_join`;
+CREATE TABLE `screen_user_join` (
+                                    `ID` varchar(64) NOT NULL COMMENT 'ID 主键',
+                                    `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id',
+                                    `ORG_TYPE` varchar(32) NOT NULL COMMENT '组织类别 agency：组织；部门：department；网格：grid',
+                                    `ORG_ID` varchar(64) NOT NULL COMMENT '组织Id 可以为网格，机关id',
+                                    `PARENT_ID` varchar(64) NOT NULL COMMENT '上级组织Id',
+                                    `ORG_NAME` varchar(128) NOT NULL COMMENT '组织名称',
+                                    `YEAR_ID` varchar(32) NOT NULL COMMENT '数据更新至 年Id:  yyyy',
+                                    `MONTH_ID` varchar(32) NOT NULL COMMENT '数据更新至 ：月份Id :yyyyMM',
+                                    `JOIN_TOTAL` int(11) DEFAULT '0' COMMENT '总的参与次数',
+                                    `JOIN_TOTAL_UP_RATE` decimal(30,6) DEFAULT NULL COMMENT '总的参与次数较上月增长率(采集的时候后台自己计算)',
+                                    `JOIN_TOTAL_UP_FLAG` varchar(10) DEFAULT NULL COMMENT '增长：incr；下降：decr； 相等 ：eq；默认：空',
+                                    `AVG_ISSUE` int(11) DEFAULT '0' COMMENT '人均议题',
+                                    `AVG_ISSUE_UP_RATE` decimal(30,6) DEFAULT NULL COMMENT '人均议题较上月增长率(采集的时候后台自己计算)',
+                                    `AVG_ISSUE_UP_FLAG` varchar(10) DEFAULT NULL COMMENT '增长：incr；下降：decr； 相等 ：eq；默认：空',
+                                    `AVG_JOIN` int(11) DEFAULT '0' COMMENT '平均参与度',
+                                    `AGVG_JOIN_UP_RATE` decimal(30,6) DEFAULT NULL COMMENT '平均参与度较上月增长率(采集的时候后台自己计算)',
+                                    `AGVG_JOIN_UP_FLAG` varchar(10) DEFAULT NULL COMMENT '增长：incr；下降：decr； 相等 ：eq；默认：空',
+                                    `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除；1已删除',
+                                    `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+                                    `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人',
+                                    `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+                                    `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人',
+                                    `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+                                    PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='基层治理-公众参与';
+
+-- ----------------------------
+-- Table structure for screen_user_total_data
+-- ----------------------------
+DROP TABLE IF EXISTS `screen_user_total_data`;
+CREATE TABLE `screen_user_total_data` (
+                                          `ID` varchar(64) NOT NULL COMMENT 'ID 主键',
+                                          `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id',
+                                          `ORG_TYPE` varchar(32) NOT NULL DEFAULT 'agency' COMMENT '组织类别 agency：组织；网格：grid；部门：department；',
+                                          `ORG_ID` varchar(64) NOT NULL COMMENT '组织Id 可以为网格，机关id',
+                                          `PARENT_ID` varchar(64) NOT NULL COMMENT '上级组织Id',
+                                          `ORG_NAME` varchar(128) NOT NULL COMMENT '组织名称，也可能是网格名称',
+                                          `DATA_END_TIME` varchar(32) NOT NULL COMMENT '数据更新至: yyyy|yyyyMM|yyyyMMdd(08-21新增)',
+                                          `USER_TOTAL` int(11) DEFAULT '0' COMMENT '用户总数',
+                                          `PARTY_TOTAL` int(11) DEFAULT '0' COMMENT '注册党总数',
+                                          `GROUP_TOTAL` int(11) DEFAULT '0' COMMENT '小组（党群）总数',
+                                          `TOPIC_TOTAL` int(11) DEFAULT '0' COMMENT '话题总数',
+                                          `ISSUE_TOTAL` int(11) DEFAULT '0' COMMENT '议题总数',
+                                          `PROJECT_TOTAL` int(11) DEFAULT '0' COMMENT '项目总数',
+                                          `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除；1已删除',
+                                          `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁',
+                                          `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人',
+                                          `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+                                          `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人',
+                                          `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+                                          PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='中央区-各类(用户|党员|党群|话题|议题|项目)总数';
+
+SET FOREIGN_KEY_CHECKS = 1;