Merge branch 'dev_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp

5 years ago · 4fe1aa6b2f
303 changed files with 3200 additions and 1556 deletions
--- a/epmet-commons/epmet-commons-dynamic-datasource/src/main/java/com/epmet/commons/dynamic/datasource/enums/DataSourceEnum.java
+++ b/epmet-commons/epmet-commons-dynamic-datasource/src/main/java/com/epmet/commons/dynamic/datasource/enums/DataSourceEnum.java
@ -5,9 +5,9 @@ package com.epmet.commons.dynamic.datasource.enums;
 */
 public enum DataSourceEnum {
-	DATA_STATISTICAL_REAL("data-statistical-server", "real", "stats"),
+	DATA_STATISTICAL_REAL("data-statistical-server", "real", "evaluationIndex"),
 	DATA_STATISTICAL_FAKE("data-statistical-server", "fake", "statsDisplay"),
-	DATA_REPORT_REAL("data-report-server", "real", "stats"),
+	DATA_REPORT_REAL("data-report-server", "real", "evaluationIndex"),
 	DATA_REPORT_FAKE("data-report-server", "fake", "statsDisplay"),
 	;
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java
@ -1,5 +1,7 @@
 package com.epmet.commons.tools.constant;
 import java.math.BigDecimal;
 /**
 * 常用数字常量
 *
@ -56,4 +58,6 @@ public interface NumConstant {
    String POSITIVE_EIGHT_STR = "+8";
    String EMPTY_STR = "";
    String ONE_NEG_STR = "-1";
    String FIFTY_STR="50";
 }
--- 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";
 }
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/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;
--- a/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  data-report-server:
    container_name: data-report-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.58
+    image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.59
    ports:
      - "8109:8109"
    network_mode: host # 使用现有网络
--- a/epmet-module/data-report/data-report-server/pom.xml
+++ b/epmet-module/data-report/data-report-server/pom.xml
@ -3,7 +3,7 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.58</version>
+    <version>0.3.59</version>
    <artifactId>data-report-server</artifactId>
    <parent>
@ -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>
--- 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.datareport.service.evaluationindex.screen.AgencyService;
-import com.epmet.screen.dto.form.CompartmentFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.CompartmentFormDTO;
-import com.epmet.screen.dto.result.CompartmentResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.CompartmentResultDTO;
-import com.epmet.screen.dto.result.TreeResultDTO;
+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;
--- 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.datareport.service.evaluationindex.screen.DistributionService;
-import com.epmet.screen.dto.form.*;
+import com.epmet.evaluationindex.screen.dto.form.*;
-import com.epmet.screen.dto.result.*;
+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;
--- 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.datareport.service.evaluationindex.screen.GrassRootsGovernService;
-import com.epmet.screen.dto.form.AgencyAndNumFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.AgencyAndNumFormDTO;
-import com.epmet.screen.dto.form.AgencyFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.AgencyFormDTO;
-import com.epmet.screen.dto.form.AgencyNumTypeParamFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.AgencyNumTypeParamFormDTO;
-import com.epmet.screen.dto.result.*;
+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;
--- 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.datareport.service.evaluationindex.screen.GrassrootsPartyDevService;
-import com.epmet.screen.dto.form.BranchBuildRankFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.BranchBuildRankFormDTO;
-import com.epmet.screen.dto.form.BranchBuildTrendFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.BranchBuildTrendFormDTO;
-import com.epmet.screen.dto.form.ParymemberFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.ParymemberFormDTO;
-import com.epmet.screen.dto.result.BranchBuildRankResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.BranchBuildRankResultDTO;
-import com.epmet.screen.dto.result.BranchBuildTrendResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.BranchBuildTrendResultDTO;
-import com.epmet.screen.dto.result.PartymemberAgeDistributionResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.PartymemberAgeDistributionResultDTO;
-import com.epmet.screen.dto.result.PartymemberPercentResultDTO;
+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;
--- 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.datareport.service.evaluationindex.screen.IndexService;
-import com.epmet.screen.dto.form.MonthBarchartFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.MonthBarchartFormDTO;
-import com.epmet.screen.dto.form.MonthPieChartFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.MonthPieChartFormDTO;
-import com.epmet.screen.dto.form.SubAgencyIndexRankFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.SubAgencyIndexRankFormDTO;
-import com.epmet.screen.dto.form.YearAverageIndexFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.YearAverageIndexFormDTO;
-import com.epmet.screen.dto.result.MonthBarchartResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.MonthBarchartResultDTO;
-import com.epmet.screen.dto.result.MonthPieChartResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.MonthPieChartResultDTO;
-import com.epmet.screen.dto.result.SubAgencyIndexRankResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.SubAgencyIndexRankResultDTO;
-import com.epmet.screen.dto.result.YearAverageIndexResultDTO;
+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;
--- 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.datareport.service.evaluationindex.screen.PartyMemberLeadService;
-import com.epmet.screen.dto.form.*;
+import com.epmet.evaluationindex.screen.dto.form.*;
-import com.epmet.screen.dto.result.*;
+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;
--- 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.datareport.service.evaluationindex.screen.ScreenProjectService;
-import com.epmet.screen.dto.form.ProjectDetailFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.ProjectDetailFormDTO;
-import com.epmet.screen.dto.result.ProjectDetailResultDTO;
+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;
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/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;
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/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;
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/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;
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/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;
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/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;
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/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.evaluationindex.screen.dto.result.ProjectDetailResultDTO;
-import com.epmet.screen.dto.result.ProjectResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.ProjectResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/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;
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/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;
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/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.evaluationindex.screen.dto.form.SubAgencyIndexRankFormDTO;
-import com.epmet.screen.dto.result.MonthBarchartResult;
+import com.epmet.evaluationindex.screen.dto.result.MonthBarchartResult;
-import com.epmet.screen.dto.result.MonthBarchartResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.MonthPieChartResultDTO;
-import com.epmet.screen.dto.result.MonthPieChartResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.SubAgencyIndexRankResultDTO;
 import com.epmet.screen.dto.result.SubAgencyIndexRankResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@ -42,7 +41,7 @@ public interface ScreenIndexDataMonthlyDao{
     * @author zxc
     * @date 2020/8/19 3:43 下午
     */
-    MonthPieChartResultDTO selectMonthPieChart(@Param("agencyId")String agencyId);
+    MonthPieChartResultDTO selectMonthPieChart(@Param("agencyId")String agencyId,@Param("monthId")String monthId);
    /**
     * @Description  查询近一年的指数值【不包括本月】
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/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;
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/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;
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/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.evaluationindex.screen.dto.result.BranchBuildOrderByCountResultDTO;
-import com.epmet.screen.dto.result.BranchIssueDataResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.BranchIssueDataResultDTO;
-import com.epmet.screen.dto.result.VolunteerServiceResult;
+import com.epmet.evaluationindex.screen.dto.result.VolunteerServiceResult;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/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;
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/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.evaluationindex.screen.dto.result.PartyUserPointResultDTO;
-import com.epmet.screen.dto.result.UserPointResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.UserPointResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/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;
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/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.evaluationindex.screen.dto.result.PublicPartiRankResultDTO;
 import com.epmet.screen.dto.result.PublicPartiRankResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/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.evaluationindex.screen.dto.result.UserJoinIndicatorGrowthRateResultDTO;
-import com.epmet.screen.dto.result.UserJoinMonthlyResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.UserJoinMonthlyResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/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.evaluationindex.screen.dto.result.PartymemberPercentResultDTO;
-import com.epmet.screen.dto.result.TopProfileResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.TopProfileResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import java.util.List;
 /**
 * 中央区-各类(用户|党员|党群|话题|议题|项目|注册人数|参与人数)总数
 *
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/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.evaluationindex.screen.dto.form.CompartmentFormDTO;
-import com.epmet.screen.dto.form.CompartmentFormDTO;
+import com.epmet.evaluationindex.screen.dto.result.CompartmentResultDTO;
-import com.epmet.screen.dto.result.CompartmentResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.TreeResultDTO;
 import com.epmet.screen.dto.result.TreeResultDTO;
 import java.util.List;
 /**
 * 组织相关api
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/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.evaluationindex.screen.dto.form.*;
-import com.epmet.screen.dto.result.*;
+import com.epmet.evaluationindex.screen.dto.result.*;
 import java.util.List;
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/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.evaluationindex.screen.dto.form.AgencyAndNumFormDTO;
-import com.epmet.screen.dto.form.AgencyFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.AgencyFormDTO;
-import com.epmet.screen.dto.form.AgencyNumTypeParamFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.AgencyNumTypeParamFormDTO;
-import com.epmet.screen.dto.result.*;
+import com.epmet.evaluationindex.screen.dto.result.*;
 import java.util.List;
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/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.evaluationindex.screen.dto.form.BranchBuildRankFormDTO;
-import com.epmet.screen.dto.form.BranchBuildTrendFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.BranchBuildTrendFormDTO;
-import com.epmet.screen.dto.form.ParymemberFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.ParymemberFormDTO;
-import com.epmet.screen.dto.result.BranchBuildRankResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.BranchBuildRankResultDTO;
-import com.epmet.screen.dto.result.BranchBuildTrendResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.BranchBuildTrendResultDTO;
-import com.epmet.screen.dto.result.PartymemberAgeDistributionResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.PartymemberAgeDistributionResultDTO;
-import com.epmet.screen.dto.result.PartymemberPercentResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.PartymemberPercentResultDTO;
 /**
 * 基层党建相关各指标查询
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/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;
+package com.epmet.datareport.service.evaluationindex.screen;
-
+
-import com.epmet.screen.dto.form.MonthBarchartFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.MonthBarchartFormDTO;
-import com.epmet.screen.dto.form.MonthPieChartFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.MonthPieChartFormDTO;
-import com.epmet.screen.dto.form.SubAgencyIndexRankFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.SubAgencyIndexRankFormDTO;
-import com.epmet.screen.dto.form.YearAverageIndexFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.YearAverageIndexFormDTO;
-import com.epmet.screen.dto.result.MonthBarchartResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.MonthBarchartResultDTO;
-import com.epmet.screen.dto.result.MonthPieChartResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.MonthPieChartResultDTO;
-import com.epmet.screen.dto.result.SubAgencyIndexRankResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.SubAgencyIndexRankResultDTO;
-import com.epmet.screen.dto.result.YearAverageIndexResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.YearAverageIndexResultDTO;
 import java.util.List;
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/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.evaluationindex.screen.dto.form.AgencyAndNumFormDTO;
-import com.epmet.screen.dto.form.ContactMassLineChartFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.ContactMassLineChartFormDTO;
-import com.epmet.screen.dto.form.FineExampleFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.FineExampleFormDTO;
-import com.epmet.screen.dto.form.VolunteerServiceFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.VolunteerServiceFormDTO;
-import com.epmet.screen.dto.result.*;
+import com.epmet.evaluationindex.screen.dto.result.*;
 import java.util.List;
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/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.evaluationindex.screen.dto.form.ProjectDetailFormDTO;
-import com.epmet.screen.dto.result.ProjectDetailResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.ProjectDetailResultDTO;
 /**
 * 项目
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/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.evaluationindex.screen.ScreenCustomerAgencyDao;
-import com.epmet.datareport.dao.screen.ScreenCustomerGridDao;
+import com.epmet.datareport.dao.evaluationindex.screen.ScreenCustomerGridDao;
-import com.epmet.screen.dto.form.CompartmentFormDTO;
+import com.epmet.datareport.service.evaluationindex.screen.AgencyService;
-import com.epmet.screen.dto.result.AgencyDistributionResultDTO;
+import com.epmet.evaluationindex.screen.constant.ScreenConstant;
-import com.epmet.screen.constant.*;
+import com.epmet.evaluationindex.screen.dto.form.CompartmentFormDTO;
-import com.epmet.screen.dto.result.CompartmentResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.AgencyDistributionResultDTO;
-import com.epmet.screen.dto.result.TreeResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.CompartmentResultDTO;
-import com.epmet.datareport.service.screen.AgencyService;
+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());
`@ -1,4 +1,4 @@`
	`package com.epmet.screen.dto.form;`	`package com.epmet.evaluationindex.screen.dto.form;`

	`import lombok.Data;`	`import lombok.Data;`
`@ -1,4 +1,4 @@`
	`package com.epmet.screen.dto.result;`	`package com.epmet.evaluationindex.screen.dto.result;`

	`import lombok.Data;`	`import lombok.Data;`