diff --git a/epmet-admin/epmet-admin-server/Dockerfile b/epmet-admin/epmet-admin-server/Dockerfile
index c0b3c72e27..63927bad16 100644
--- a/epmet-admin/epmet-admin-server/Dockerfile
+++ b/epmet-admin/epmet-admin-server/Dockerfile
@@ -4,7 +4,7 @@ RUN export LANG="zh_CN.UTF-8"
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 RUN echo 'Asia/Shanghai' > /etc/timezone
 
-COPY ./target/*.jar ./app.jar
+COPY ./target/*.jar ./epmet-admin.jar
 
 EXPOSE 8082
 
diff --git a/epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml b/epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml
index 1b77c09bda..f86422e850 100644
--- a/epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml
+++ b/epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-admin.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml b/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml
index e5d93e9ac3..e9d8d41470 100644
--- a/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml
+++ b/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./epmet-admin.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-admin/epmet-admin-server/deploy/docker-compose-test.yml b/epmet-admin/epmet-admin-server/deploy/docker-compose-test.yml
index 6ae49f3aa3..575e1267c8 100644
--- a/epmet-admin/epmet-admin-server/deploy/docker-compose-test.yml
+++ b/epmet-admin/epmet-admin-server/deploy/docker-compose-test.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-admin.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-auth/Dockerfile b/epmet-auth/Dockerfile
index c106eaf299..207ac66a19 100644
--- a/epmet-auth/Dockerfile
+++ b/epmet-auth/Dockerfile
@@ -4,7 +4,7 @@ RUN export LANG="zh_CN.UTF-8"
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 RUN echo 'Asia/Shanghai' > /etc/timezone
 
-COPY ./target/*.jar ./app.jar
+COPY ./target/*.jar ./epmet-auth.jar
 
 EXPOSE 8081
 
diff --git a/epmet-auth/deploy/docker-compose-dev.yml b/epmet-auth/deploy/docker-compose-dev.yml
index f533348156..0ee4421f6f 100644
--- a/epmet-auth/deploy/docker-compose-dev.yml
+++ b/epmet-auth/deploy/docker-compose-dev.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-auth.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-auth/deploy/docker-compose-prod.yml b/epmet-auth/deploy/docker-compose-prod.yml
index afffcf2474..b9387658c5 100644
--- a/epmet-auth/deploy/docker-compose-prod.yml
+++ b/epmet-auth/deploy/docker-compose-prod.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./epmet-auth.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-auth/deploy/docker-compose-test.yml b/epmet-auth/deploy/docker-compose-test.yml
index bfc9acc44b..e4aab166ec 100644
--- a/epmet-auth/deploy/docker-compose-test.yml
+++ b/epmet-auth/deploy/docker-compose-test.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./epmet-auth.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
index 0d623e2010..e1fa2fa2c7 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
@@ -303,6 +303,17 @@ public class RedisKeys {
 	 * @return
 	 */
 	public static String getIndexCodeFieldReKey() {
-		return rootPrefix.concat("data:index:indexcode:field");
+		return rootPrefix.concat("stats:indexcal:indexcode:field");
+	}
+
+	/**
+	 * 客户统计的计算标记。
+	 * 0:未在计算
+	 * 1:正在计算
+	 * @param customerId
+	 * @return
+	 */
+	public static String getCustomerStatsCalFlag(String customerId) {
+		return String.format(rootPrefix+"stats:calflag:%s", customerId);
 	}
 }
diff --git a/epmet-gateway/Dockerfile b/epmet-gateway/Dockerfile
index a237b2929f..fad72ba2ca 100644
--- a/epmet-gateway/Dockerfile
+++ b/epmet-gateway/Dockerfile
@@ -4,7 +4,7 @@ RUN export LANG="zh_CN.UTF-8"
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 RUN echo 'Asia/Shanghai' > /etc/timezone
 
-COPY ./target/*.jar ./app.jar
+COPY ./target/*.jar ./epmet-gateway.jar
 
 EXPOSE 8080
 
diff --git a/epmet-gateway/deploy/docker-compose-dev.yml b/epmet-gateway/deploy/docker-compose-dev.yml
index 3329f89b6d..ad7aa38516 100644
--- a/epmet-gateway/deploy/docker-compose-dev.yml
+++ b/epmet-gateway/deploy/docker-compose-dev.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-gateway.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-gateway/deploy/docker-compose-prod.yml b/epmet-gateway/deploy/docker-compose-prod.yml
index cec4f16116..c87d903e73 100644
--- a/epmet-gateway/deploy/docker-compose-prod.yml
+++ b/epmet-gateway/deploy/docker-compose-prod.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./epmet-gateway.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-gateway/deploy/docker-compose-test.yml b/epmet-gateway/deploy/docker-compose-test.yml
index 57a4913b0e..b0b7024f33 100644
--- a/epmet-gateway/deploy/docker-compose-test.yml
+++ b/epmet-gateway/deploy/docker-compose-test.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-gateway.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/AnNingSubAgencyIndexRankResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/AnNingSubAgencyIndexRankResultDTO.java
new file mode 100644
index 0000000000..f93b98b16d
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/AnNingSubAgencyIndexRankResultDTO.java
@@ -0,0 +1,45 @@
+package com.epmet.evaluationindex.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zhangyong
+ * @DateTime 2020/09/11 9:58 上午
+ */
+@Data
+public class AnNingSubAgencyIndexRankResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -2767000156092731932L;
+
+    /**
+     * 名称（组织或者网格名称，部门名称）
+     */
+    private String name = "";
+
+    /**
+     * 总指数
+     */
+    private Double totalIndex = 0.0;
+
+    /**
+     * 党建能力
+     */
+    private Double governAbility = 0.0;
+
+    /**
+     * 治理能力
+     */
+    private Double partyDevAbility = 0.0;
+
+    /**
+     * 服务能力
+     */
+    private Double serviceAbility = 0.0;
+
+    /**
+     * 组织id或者网格id
+     */
+    private String orgId = "";
+}
diff --git a/epmet-module/data-report/data-report-server/Dockerfile b/epmet-module/data-report/data-report-server/Dockerfile
index 1f773a109f..abb03ca056 100644
--- a/epmet-module/data-report/data-report-server/Dockerfile
+++ b/epmet-module/data-report/data-report-server/Dockerfile
@@ -4,7 +4,7 @@ RUN export LANG="zh_CN.UTF-8"
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 RUN echo 'Asia/Shanghai' > /etc/timezone
 
-COPY ./target/*.jar ./app.jar
+COPY ./target/*.jar ./data-report.jar
 
 EXPOSE 8109
 
diff --git 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
index 2d85c451a1..8be97cd85a 100644
--- 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
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx250m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx250m -jar ./data-report.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml
index 8fdb335fda..360131c836 100644
--- a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./data-report.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-test.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-test.yml
index 78d38da205..8917a4f9e9 100644
--- a/epmet-module/data-report/data-report-server/deploy/docker-compose-test.yml
+++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-test.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx250m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx250m -jar ./data-report.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/DataReportApplication.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/DataReportApplication.java
index 989bf71965..cee0ed9096 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/DataReportApplication.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/DataReportApplication.java
@@ -1,7 +1,5 @@
 package com.epmet;
 
-import com.epmet.commons.tools.enums.EnvEnum;
-import com.epmet.commons.tools.utils.HttpClientManager;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
@@ -15,6 +13,5 @@ import org.springframework.scheduling.annotation.EnableAsync;
 public class DataReportApplication {
     public static void main(String[] args) {
         SpringApplication.run(DataReportApplication.class, args);
-        HttpClientManager.getInstance().sendAlarmMsg(EnvEnum.getCurrentEnv().getName() +" DataStatsApplication started!");
     }
 }
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 c6d6de4ce3..1828f19ac8 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
@@ -1,5 +1,6 @@
 package com.epmet.datareport.controller.screen;
 
+import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
 import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -35,7 +36,7 @@ public class AgencyController {
      * @author zxc
      * @date 2020/8/18 2:04 下午
      */
-    //@ExternalAppRequestAuth
+    @ExternalAppRequestAuth
     @PostMapping("tree")
     public Result<TreeResultDTO> tree(HttpServletRequest request, ExternalAppRequestParam externalAppRequestParam){
         String customerId = request.getHeader("CustomerId");
@@ -51,7 +52,7 @@ public class AgencyController {
      * @author zxc
      * @date 2020/8/18 2:33 下午
      */
-    //@ExternalAppRequestAuth
+    @ExternalAppRequestAuth
     @PostMapping("compartment")
     public Result<CompartmentResultDTO> compartment(@RequestBody CompartmentFormDTO compartmentFormDTO){
         ValidatorUtils.validateEntity(compartmentFormDTO, CompartmentFormDTO.Compartment.class);
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 248547cc4c..30f0f82584 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
@@ -1,5 +1,6 @@
 package com.epmet.datareport.controller.screen;
 
+import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.datareport.service.evaluationindex.screen.DistributionService;
@@ -32,7 +33,7 @@ public class DistributionController {
      * @author zxc
      * @date 2020/8/18 10:59 上午
      */
-    //@ExternalAppRequestAuth
+    @ExternalAppRequestAuth
     @PostMapping("branch")
     public Result<List<BranchResultDTO>> branch(@RequestBody BranchFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO, BranchFormDTO.Branch.class);
@@ -45,7 +46,7 @@ public class DistributionController {
      * @author zxc
      * @date 2020/8/18 11:10 上午
      */
-    //@ExternalAppRequestAuth
+    @ExternalAppRequestAuth
     @PostMapping("user")
     public Result<UserResultDTO> user(@RequestBody UserFormDTO userFormDTO){
         ValidatorUtils.validateEntity(userFormDTO, UserFormDTO.User.class);
@@ -58,7 +59,7 @@ public class DistributionController {
      * @author zxc
      * @date 2020/8/18 11:20 上午
      */
-    //@ExternalAppRequestAuth
+    @ExternalAppRequestAuth
     @PostMapping("parymember")
     public Result<ParymemberResultDTO> parymember(@RequestBody ParymemberFormDTO parymemberFormDTO){
         ValidatorUtils.validateEntity(parymemberFormDTO, ParymemberFormDTO.Parymember.class);
@@ -71,7 +72,7 @@ public class DistributionController {
      * @author zxc
      * @date 2020/8/19 1:29 下午
      */
-    //@ExternalAppRequestAuth
+    @ExternalAppRequestAuth
     @PostMapping("project")
     public Result<List<ProjectResultDTO>> project(@RequestBody ProjectFormDTO projectFormDTO){
         ValidatorUtils.validateEntity(projectFormDTO, ProjectFormDTO.Project.class);
@@ -84,7 +85,7 @@ public class DistributionController {
      * @author zxc
      * @date 2020/8/19 1:52 下午
      */
-    //@ExternalAppRequestAuth
+    @ExternalAppRequestAuth
     @PostMapping("topprofile")
     public Result<TopProfileResultDTO> topProfile(@RequestBody TopProfileFormDTO topProfileFormDTO){
         ValidatorUtils.validateEntity(topProfileFormDTO, TopProfileFormDTO.TopProfile.class);
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 220fb0ca4a..1ee85baeb4 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
@@ -1,5 +1,6 @@
 package com.epmet.datareport.controller.screen;
 
+import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.datareport.service.evaluationindex.screen.GrassRootsGovernService;
@@ -38,7 +39,7 @@ public class GrassRootsGovernController {
      * @author wangc
      * @date 2020.08.20 11:16
      **/
-    //@ExternalAppRequestAuth
+    @ExternalAppRequestAuth
     @PostMapping("userpointrank")
     public Result<UserPointRankResultDTO> userPointRank(@RequestBody AgencyAndNumFormDTO param){
         ValidatorUtils.validateEntity(param,AgencyFormDTO.CommonAgencyIdGroup.class);
@@ -53,7 +54,7 @@ public class GrassRootsGovernController {
      * @author wangc
      * @date 2020.08.20 13:55
      **/
-    //@ExternalAppRequestAuth
+    @ExternalAppRequestAuth
     @PostMapping("difficultprojects")
     public Result<List<DifficultProjectResultDTO>> difficultProject(@RequestBody AgencyNumTypeParamFormDTO param){
         ValidatorUtils.validateEntity(param, AgencyNumTypeParamFormDTO.AgencyNumTypeParamGroup.class);
@@ -68,7 +69,7 @@ public class GrassRootsGovernController {
      * @author wangc
      * @date 2020.08.20 14:37
      **/
-    //@ExternalAppRequestAuth
+    @ExternalAppRequestAuth
     @PostMapping("publicpartiprofile")
     public Result<PublicPartiProfileResultDTO> publicPartiProfile(@RequestBody AgencyFormDTO param){
         ValidatorUtils.validateEntity(param, AgencyFormDTO.CommonAgencyIdGroup.class);
@@ -83,7 +84,7 @@ public class GrassRootsGovernController {
      * @author wangc
      * @date 2020.08.20 15:32
      **/
-    //@ExternalAppRequestAuth
+    @ExternalAppRequestAuth
     @PostMapping("publicpartirank")
     public Result<List<PublicPartiRankResultDTO>> publicPartiRank(@RequestBody AgencyAndNumFormDTO param){
         ValidatorUtils.validateEntity(param,AgencyFormDTO.CommonAgencyIdGroup.class);
@@ -98,7 +99,7 @@ public class GrassRootsGovernController {
      * @author wangc
      * @date 2020.08.20 17:46
      **/
-    //@ExternalAppRequestAuth
+    @ExternalAppRequestAuth
     @PostMapping("governcapacityrank")
     public Result<List<GovernCapacityRankResultDTO>> governCapacityRank(@RequestBody AgencyAndNumFormDTO param){
         ValidatorUtils.validateEntity(param,AgencyFormDTO.CommonAgencyIdGroup.class);
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 66b7555ac8..db7c83089f 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
@@ -1,5 +1,6 @@
 package com.epmet.datareport.controller.screen;
 
+import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.datareport.service.evaluationindex.screen.GrassrootsPartyDevService;
@@ -37,7 +38,7 @@ public class GrassrootsPartyDevController {
      * @author wangc
      * @date 2020.08.18 16:59
     **/
-    //@ExternalAppRequestAuth
+    @ExternalAppRequestAuth
     @PostMapping("basicinfo")
     public Result<PartymemberPercentResultDTO> baseInfo(@RequestBody ParymemberFormDTO param){
         ValidatorUtils.validateEntity(param, ParymemberFormDTO.Parymember.class);
@@ -52,7 +53,7 @@ public class GrassrootsPartyDevController {
      * @author wangc
      * @date 2020.08.18 17:54
      **/
-    //@ExternalAppRequestAuth
+    @ExternalAppRequestAuth
     @PostMapping("ageinfo")
     public Result<PartymemberAgeDistributionResultDTO> ageInfo(@RequestBody ParymemberFormDTO param){
         ValidatorUtils.validateEntity(param, ParymemberFormDTO.Parymember.class);
@@ -67,7 +68,7 @@ public class GrassrootsPartyDevController {
      * @author wangc
      * @date 2020.08.19 11:02
      **/
-    //@ExternalAppRequestAuth
+    @ExternalAppRequestAuth
     @PostMapping("branchbuildtrend")
     public Result<BranchBuildTrendResultDTO> branchBuildTrend(@RequestBody BranchBuildTrendFormDTO param){
         ValidatorUtils.validateEntity(param, BranchBuildTrendFormDTO.branchBuildTrendGroup.class);
@@ -82,7 +83,7 @@ public class GrassrootsPartyDevController {
      * @author wangc
      * @date 2020.08.19 15:25
      **/
-    //@ExternalAppRequestAuth
+    @ExternalAppRequestAuth
     @PostMapping("branchbuildrank")
     public Result<BranchBuildRankResultDTO> branchBuildRank(@RequestBody BranchBuildRankFormDTO param){
         ValidatorUtils.validateEntity(param, BranchBuildRankFormDTO.BranchBuildRankGroup.class);
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 fea6239953..fd3564c53b 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,13 +1,11 @@
 package com.epmet.datareport.controller.screen;
 
+import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.datareport.service.evaluationindex.screen.IndexService;
 import com.epmet.evaluationindex.screen.dto.form.*;
-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 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;
@@ -35,7 +33,7 @@ public class IndexController {
      * @author zxc
      * @date 2020/8/19 2:53 下午
      */
-    //@ExternalAppRequestAuth
+    @ExternalAppRequestAuth
     @PostMapping("yearaverageindex")
     public Result<YearAverageIndexResultDTO> yearAverageIndex(@RequestBody YearAverageIndexFormDTO yearAverageIndexFormDTO){
         ValidatorUtils.validateEntity(yearAverageIndexFormDTO, YearAverageIndexFormDTO.YearAverageIndex.class);
@@ -48,7 +46,7 @@ public class IndexController {
      * @author zxc
      * @date 2020/8/19 3:17 下午
      */
-    //@ExternalAppRequestAuth
+    @ExternalAppRequestAuth
     @PostMapping("monthindexanalysis/piechart")
     public Result<MonthPieChartResultDTO> monthPieChart(@RequestBody MonthPieChartFormDTO monthPieChartFormDTO){
         ValidatorUtils.validateEntity(monthPieChartFormDTO, MonthPieChartFormDTO.MonthPieChart.class);
@@ -61,7 +59,7 @@ public class IndexController {
      * @author zxc
      * @date 2020/8/19 5:27 下午
      */
-    //@ExternalAppRequestAuth
+    @ExternalAppRequestAuth
     @PostMapping("monthindexanalysis/barchart")
     public Result<MonthBarchartResultDTO> monthBarchart(@RequestBody MonthBarchartFormDTO monthBarchartFormDTO){
         ValidatorUtils.validateEntity(monthBarchartFormDTO, MonthBarchartFormDTO.MonthBarchart.class);
@@ -74,7 +72,7 @@ public class IndexController {
      * @author zxc
      * @date 2020/8/20 10:02 上午
      */
-    //@ExternalAppRequestAuth
+    @ExternalAppRequestAuth
     @PostMapping("subagencyindexrank")
     public Result<List<SubAgencyIndexRankResultDTO>> subAgencyIndexRank(@RequestBody SubAgencyIndexRankFormDTO subAgencyIndexRankFormDTO){
         ValidatorUtils.validateEntity(subAgencyIndexRankFormDTO, SubAgencyIndexRankFormDTO.SubAgencyIndexRank.class);
@@ -82,18 +80,17 @@ public class IndexController {
     }
 
     /**
-     * 5、下级部门指数排行（安宁数据段用）
-     *
+     *  5、下级部门指数排行（安宁数据段用）
      * @param formDTO
-     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankFormDTO>>
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankResultDTO>>
      * @Author zhangyong
-     * @Date 09:38 2020-09-08
+     * @Date 13:39 2020-09-11
      **/
-    //@ExternalAppRequestAuth
+    @ExternalAppRequestAuth
     @PostMapping("dataclient/subagencyindexrank")
-    public Result<List<SubAgencyIndexRankResultDTO>> anNingSubAgencyIndexRank(@RequestBody AnNingSubAgencyIndexRankFormDTO formDTO){
+    public Result<List<AnNingSubAgencyIndexRankResultDTO>> anNingSubAgencyIndexRank(@RequestBody AnNingSubAgencyIndexRankFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO, AnNingSubAgencyIndexRankFormDTO.SubAgencyIndexRank.class);
-        return new Result<List<SubAgencyIndexRankResultDTO>>().ok(indexService.anNingSubAgencyIndexRank(formDTO));
+        return new Result<List<AnNingSubAgencyIndexRankResultDTO>>().ok(indexService.anNingSubAgencyIndexRank(formDTO));
     }
 
 }
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/KcScreenController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/KcScreenController.java
new file mode 100644
index 0000000000..eb28cd5270
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/KcScreenController.java
@@ -0,0 +1,30 @@
+package com.epmet.datareport.controller.screen;
+
+import com.epmet.datareport.service.evaluationindex.screen.KcScreenService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 孔村大屏api
+ *
+ * @author zhangyong
+ * @date 2020/9/10 10:21
+ */
+@RestController
+@RequestMapping("kcscreen")
+public class KcScreenController {
+
+    @Autowired
+    private KcScreenService kcScreenService;
+
+
+//    @ExternalAppRequestAuth
+//    @PostMapping("homepage/summary")
+//    public Result<YearAverageIndexResultDTO> yearAverageIndex(){
+////        ValidatorUtils.validateEntity(yearAverageIndexFormDTO, YearAverageIndexFormDTO.YearAverageIndex.class);
+////        return new Result<YearAverageIndexResultDTO>().ok(indexService.yearAverageIndex(yearAverageIndexFormDTO));
+//    }
+
+    // @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 d3f4242013..5530fae8b0 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
@@ -1,5 +1,6 @@
 package com.epmet.datareport.controller.screen;
 
+import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.datareport.service.evaluationindex.screen.PartyMemberLeadService;
@@ -32,7 +33,7 @@ public class PartyMemberLeadController {
      * @author zxc
      * @date 2020/8/20 1:56 下午
      */
-    //@ExternalAppRequestAuth
+    @ExternalAppRequestAuth
     @PostMapping("fineexample")
     public Result<FineExampleResultDTO> fineExample(@RequestBody FineExampleFormDTO fineExampleFormDTO){
         ValidatorUtils.validateEntity(fineExampleFormDTO, FineExampleFormDTO.FineExample.class);
@@ -45,7 +46,7 @@ public class PartyMemberLeadController {
      * @author zxc
      * @date 2020/8/20 2:35 下午
      */
-    //@ExternalAppRequestAuth
+    @ExternalAppRequestAuth
     @PostMapping("contactmasslinechart")
     public Result<ContactMassLineChartResultDTO> contactMassLineChart(@RequestBody ContactMassLineChartFormDTO contactMassLineChartFormDTO){
         ValidatorUtils.validateEntity(contactMassLineChartFormDTO, ContactMassLineChartFormDTO.ContactMassLineChart.class);
@@ -58,7 +59,7 @@ public class PartyMemberLeadController {
      * @author zxc
      * @date 2020/8/20 3:19 下午
      */
-    //@ExternalAppRequestAuth
+    @ExternalAppRequestAuth
     @PostMapping("volunteerservice")
     public Result<VolunteerServiceResultDTO> volunteerService(@RequestBody VolunteerServiceFormDTO volunteerServiceFormDTO){
         ValidatorUtils.validateEntity(volunteerServiceFormDTO, VolunteerServiceFormDTO.VolunteerService.class);
@@ -73,7 +74,7 @@ public class PartyMemberLeadController {
      * @author wangc
      * @date 2020.08.21 11:05
      **/
-    //@ExternalAppRequestAuth
+    @ExternalAppRequestAuth
     @PostMapping("advancedbranchrank")
     Result<List<AdvanceBranchRankResultDTO>> advancedBranchRank(@RequestBody AgencyAndNumFormDTO param){
         ValidatorUtils.validateEntity(param, AgencyFormDTO.CommonAgencyIdGroup.class);
@@ -88,7 +89,7 @@ public class PartyMemberLeadController {
      * @author wangc
      * @date 2020.08.21 14:22
      **/
-    //@ExternalAppRequestAuth
+    @ExternalAppRequestAuth
     @PostMapping("advancedpartymemberrank")
     Result<List<PartyUserPointResultDTO>> advancedPartymemberRank(@RequestBody AgencyAndNumFormDTO param){
         ValidatorUtils.validateEntity(param, AgencyFormDTO.CommonAgencyIdGroup.class);
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 dc80b5178e..5417767ee6 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
@@ -1,5 +1,6 @@
 package com.epmet.datareport.controller.screen;
 
+import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.datareport.service.evaluationindex.screen.ScreenProjectService;
@@ -30,7 +31,7 @@ public class ScreenProjectController {
      * @author zxc
      * @date 2020/8/19 4:36 下午
      */
-    //@ExternalAppRequestAuth
+    @ExternalAppRequestAuth
     @PostMapping("detail")
     public Result<ProjectDetailResultDTO> projectDetail(@RequestBody ProjectDetailFormDTO projectDetailFormDTO){
         ValidatorUtils.validateEntity(projectDetailFormDTO, ProjectDetailFormDTO.ProjectDetail.class);
diff --git 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
index 8f1e472b18..3128862ece 100644
--- 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
@@ -19,6 +19,7 @@ package com.epmet.datareport.dao.evaluationindex.screen;
 
 import com.epmet.evaluationindex.screen.dto.form.AnNingSubAgencyIndexRankFormDTO;
 import com.epmet.evaluationindex.screen.dto.form.SubAgencyIndexRankFormDTO;
+import com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.MonthBarchartResult;
 import com.epmet.evaluationindex.screen.dto.result.MonthPieChartResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.SubAgencyIndexRankResultDTO;
@@ -64,10 +65,10 @@ public interface ScreenIndexDataMonthlyDao{
      * 5、下级部门指数排行（安宁数据段用） - 月(上一个月)
      *
      * @param formDTO
-     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankFormDTO>>
+     * @return java.util.List<com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankResultDTO>
      * @Author zhangyong
      * @Date 09:38 2020-09-08
      **/
-    List<SubAgencyIndexRankResultDTO> selectAnNingSubAgencyIndexMonthlyRank(AnNingSubAgencyIndexRankFormDTO formDTO);
+    List<AnNingSubAgencyIndexRankResultDTO> selectAnNingSubAgencyIndexMonthlyRank(AnNingSubAgencyIndexRankFormDTO formDTO);
 
 }
diff --git 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
index eced6fc1ff..70f0f1b5a6 100644
--- 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
@@ -18,7 +18,7 @@
 package com.epmet.datareport.dao.evaluationindex.screen;
 
 import com.epmet.evaluationindex.screen.dto.form.AnNingSubAgencyIndexRankFormDTO;
-import com.epmet.evaluationindex.screen.dto.result.SubAgencyIndexRankResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.YearAverageIndexResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -46,9 +46,9 @@ public interface ScreenIndexDataYearlyDao{
      * 5、下级部门指数排行（安宁数据段用） - 年
      *
      * @param formDTO
-     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankFormDTO>>
+     * @return java.util.List<com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankFormDTO>
      * @Author zhangyong
      * @Date 09:38 2020-09-08
      **/
-    List<SubAgencyIndexRankResultDTO> selectAnNingSubAgencyIndexYearlyRank(AnNingSubAgencyIndexRankFormDTO formDTO);
+    List<AnNingSubAgencyIndexRankResultDTO> selectAnNingSubAgencyIndexYearlyRank(AnNingSubAgencyIndexRankFormDTO formDTO);
 }
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcActSummaryDailyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcActSummaryDailyDao.java
new file mode 100644
index 0000000000..8ed8b0f9d9
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcActSummaryDailyDao.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.evaluationindex.screenkc;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * KC-活动各类总数(先根据customerId+dateId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcActSummaryDailyDao {
+
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcActTrendMonthlyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcActTrendMonthlyDao.java
new file mode 100644
index 0000000000..052febf324
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcActTrendMonthlyDao.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.evaluationindex.screenkc;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * KC-活动(次数+时长)趋势(先根据customerId+monthId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcActTrendMonthlyDao {
+
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcGroupDetailGridDailyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcGroupDetailGridDailyDao.java
new file mode 100644
index 0000000000..8ab08ef8ce
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcGroupDetailGridDailyDao.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.evaluationindex.screenkc;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * KC-小组详情(先根据customerId+dateId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcGroupDetailGridDailyDao {
+
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcGroupSummaryGridDailyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcGroupSummaryGridDailyDao.java
new file mode 100644
index 0000000000..3b92aa4fa1
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcGroupSummaryGridDailyDao.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.evaluationindex.screenkc;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * KC-小组分析各类总数(先根据customerId+dateId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcGroupSummaryGridDailyDao {
+
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcIssueSummaryGridDailyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcIssueSummaryGridDailyDao.java
new file mode 100644
index 0000000000..2ec71f1d79
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcIssueSummaryGridDailyDao.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.evaluationindex.screenkc;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * KC-议题分析(各类总数)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcIssueSummaryGridDailyDao {
+
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcIssueTrendGridMonthlyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcIssueTrendGridMonthlyDao.java
new file mode 100644
index 0000000000..37edac5861
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcIssueTrendGridMonthlyDao.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.evaluationindex.screenkc;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * KC-议题参与趋势(每天上报当前月)customerId+monthId先删后增
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcIssueTrendGridMonthlyDao {
+
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcNewsCategoryAnalysisDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcNewsCategoryAnalysisDao.java
new file mode 100644
index 0000000000..6a779fb248
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcNewsCategoryAnalysisDao.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.evaluationindex.screenkc;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * KC-新闻-按类别统计(先根据customerId+dateId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcNewsCategoryAnalysisDao {
+
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcNewsRankDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcNewsRankDao.java
new file mode 100644
index 0000000000..6a03be5485
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcNewsRankDao.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.evaluationindex.screenkc;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * KC-热点新闻排行-(先根据customerId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcNewsRankDao {
+
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcNewsSummaryDailyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcNewsSummaryDailyDao.java
new file mode 100644
index 0000000000..ec9d49c5c2
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcNewsSummaryDailyDao.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.evaluationindex.screenkc;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * KC-新闻-各类总数(先根据customerId+dateId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcNewsSummaryDailyDao {
+
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcNewsTrendMonthlyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcNewsTrendMonthlyDao.java
new file mode 100644
index 0000000000..c3d60f0b83
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcNewsTrendMonthlyDao.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.evaluationindex.screenkc;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * KC-新闻参与趋势-(先根据customerId+monthId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcNewsTrendMonthlyDao {
+
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcPlatformSummaryDailyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcPlatformSummaryDailyDao.java
new file mode 100644
index 0000000000..04c0d5dec9
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcPlatformSummaryDailyDao.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.evaluationindex.screenkc;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * KC-平台各汇总值(先根据customerId+dateId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcPlatformSummaryDailyDao {
+
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcProjectCategoryGridDailyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcProjectCategoryGridDailyDao.java
new file mode 100644
index 0000000000..a730e97577
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcProjectCategoryGridDailyDao.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.evaluationindex.screenkc;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * KC-项目按分类统计上报总数(先根据customerId+dateId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcProjectCategoryGridDailyDao {
+
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcProjectSatisGridMonthlyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcProjectSatisGridMonthlyDao.java
new file mode 100644
index 0000000000..324bc723c5
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcProjectSatisGridMonthlyDao.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.evaluationindex.screenkc;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * KC-项目满意度分析(customerId+monthId先删除记录，再插入)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcProjectSatisGridMonthlyDao {
+
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcProjectSummaryGridDailyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcProjectSummaryGridDailyDao.java
new file mode 100644
index 0000000000..2c50f1205c
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcProjectSummaryGridDailyDao.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.evaluationindex.screenkc;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * KC-项目分析(各类总数先根据customerId+dateId删除，后插入)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcProjectSummaryGridDailyDao {
+
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcTopicTrendGridMonthlyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcTopicTrendGridMonthlyDao.java
new file mode 100644
index 0000000000..8c8e181b0f
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcTopicTrendGridMonthlyDao.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.evaluationindex.screenkc;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * KC-话题参与趋势(先根据customerId+monthId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcTopicTrendGridMonthlyDao {
+
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcUserHeatRankGridDailyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcUserHeatRankGridDailyDao.java
new file mode 100644
index 0000000000..dbd5ca3fc1
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcUserHeatRankGridDailyDao.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.evaluationindex.screenkc;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * KC-用户公益时长排名(先根据customerId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcUserHeatRankGridDailyDao {
+
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcUserSummaryDailyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcUserSummaryDailyDao.java
new file mode 100644
index 0000000000..ff33f78b39
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcUserSummaryDailyDao.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.evaluationindex.screenkc;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * KC-用户分析(先根据customerId+dateId删除，后插入)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcUserSummaryDailyDao {
+
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcUserTrendGridMonthlyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcUserTrendGridMonthlyDao.java
new file mode 100644
index 0000000000..92bb3dce0f
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcUserTrendGridMonthlyDao.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.evaluationindex.screenkc;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * KC-用户趋势分析(根据monthId+customerId先删后增)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcUserTrendGridMonthlyDao {
+
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcVolunteerHeatRankGridDailyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcVolunteerHeatRankGridDailyDao.java
new file mode 100644
index 0000000000..91bd730689
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcVolunteerHeatRankGridDailyDao.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.evaluationindex.screenkc;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * KC-志愿者公益时长排名(先根据customerId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcVolunteerHeatRankGridDailyDao {
+
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcVolunteerSummaryDailyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcVolunteerSummaryDailyDao.java
new file mode 100644
index 0000000000..38a06222dd
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenkc/ScreenKcVolunteerSummaryDailyDao.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.evaluationindex.screenkc;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * KC-志愿者汇总(先根据customerId+dateId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcVolunteerSummaryDailyDao {
+
+}
diff --git 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
index e2191e20ec..761d369b7a 100644
--- 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,10 +1,7 @@
 package com.epmet.datareport.service.evaluationindex.screen;
 
 import com.epmet.evaluationindex.screen.dto.form.*;
-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 com.epmet.evaluationindex.screen.dto.result.*;
 
 import java.util.List;
 
@@ -52,10 +49,10 @@ public interface IndexService {
      * 5、下级部门指数排行（安宁数据段用）
      *
      * @param formDTO
-     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankFormDTO>>
+     * @return java.util.List<com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankResultDTO>
      * @Author zhangyong
      * @Date 09:38 2020-09-08
      **/
-    List<SubAgencyIndexRankResultDTO> anNingSubAgencyIndexRank(AnNingSubAgencyIndexRankFormDTO formDTO);
+    List<AnNingSubAgencyIndexRankResultDTO> anNingSubAgencyIndexRank(AnNingSubAgencyIndexRankFormDTO formDTO);
 
 }
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/KcScreenService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/KcScreenService.java
new file mode 100644
index 0000000000..e079aefb42
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/KcScreenService.java
@@ -0,0 +1,12 @@
+package com.epmet.datareport.service.evaluationindex.screen;
+
+/**
+ * 孔村大屏api
+ *
+ * @author zhangyong
+ * @date 2020/9/10 10:21
+ */
+public interface KcScreenService {
+
+
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java
index 4d23ca4bca..e3e6ce4a61 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java
@@ -181,9 +181,10 @@ public class IndexServiceImpl implements IndexService {
         return subAgencyIndexRankResultDTOS;
     }
 
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
-    public List<SubAgencyIndexRankResultDTO> anNingSubAgencyIndexRank(AnNingSubAgencyIndexRankFormDTO formDTO) {
-        List<SubAgencyIndexRankResultDTO> subAgencyIndexRankResultDTOS = new ArrayList<>();
+    public List<AnNingSubAgencyIndexRankResultDTO> anNingSubAgencyIndexRank(AnNingSubAgencyIndexRankFormDTO formDTO) {
+        List<AnNingSubAgencyIndexRankResultDTO> subAgencyIndexRankResultDTOS = new ArrayList<>();
         if (ScreenConstant.YEAR_ID.equals(formDTO.getType())){
             // 年 指数排行
             subAgencyIndexRankResultDTOS = screenIndexDataYearlyDao.selectAnNingSubAgencyIndexYearlyRank(formDTO);
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/KcScreenServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/KcScreenServiceImpl.java
new file mode 100644
index 0000000000..a7f656884b
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/KcScreenServiceImpl.java
@@ -0,0 +1,24 @@
+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.service.evaluationindex.screen.KcScreenService;
+import com.epmet.datareport.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 孔村大屏api
+ *
+ * @author zhangyong
+ * @date 2020/9/10 10:21
+ */
+@Service
+@DataSource(DataSourceConstant.EVALUATION_INDEX)
+public class KcScreenServiceImpl implements KcScreenService {
+
+    @Autowired
+    private DateUtils dateUtils;
+
+
+}
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 fa89221e37..573c7501fa 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
@@ -15,7 +15,7 @@
             screen_cpc_base_data
         WHERE
             DEL_FLAG = '0'
-            AND PARENT_ID = #{agencyId}
+            AND ORG_ID = #{agencyId}
     </select>
 
 </mapper>
\ No newline at end of file
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 7dcb6c526b..58a41b9d5f 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
@@ -6,9 +6,9 @@
     <!-- 2、月度指数分析-饼状图 -->
     <select id="selectMonthPieChart" resultType="com.epmet.evaluationindex.screen.dto.result.MonthPieChartResultDTO">
         SELECT
-            service_ablity AS serviceAbility,
-            party_dev_ablity AS partyDevAbility,
-            govern_ablity AS governAbility
+            ROUND(service_ablity,1) AS serviceAbility,
+            ROUND(party_dev_ablity,1) AS partyDevAbility,
+            ROUND(govern_ablity,1) AS governAbility
         FROM
             screen_index_data_monthly
         WHERE
@@ -30,10 +30,10 @@
     <select id="selectMonthBarchart" resultType="com.epmet.evaluationindex.screen.dto.result.MonthBarchartResult">
         SELECT
 	        month_id AS monthId,
-            service_ablity AS serviceAbility,
-            party_dev_ablity AS partyDevAbility,
-            govern_ablity AS governAbility,
-            index_total AS indexTotal
+            ROUND(service_ablity,1) AS serviceAbility,
+            ROUND(party_dev_ablity,1) AS partyDevAbility,
+            ROUND(govern_ablity,1) AS governAbility,
+            ROUND(index_total,1) AS indexTotal
         FROM
             screen_index_data_monthly
         WHERE
@@ -47,10 +47,10 @@
     <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,
-            govern_ablity AS governAbility,
-            party_dev_ablity AS partyDevAbility,
-            service_ablity AS serviceAbility
+            ROUND(index_total,1) AS totalIndex,
+            ROUND(govern_ablity,1) AS governAbility,
+            ROUND(party_dev_ablity,1) AS partyDevAbility,
+            ROUND(service_ablity,1) AS serviceAbility
         FROM
             screen_index_data_yearly
         WHERE
@@ -62,13 +62,15 @@
     </select>
 
     <!-- 下级部门指数排行 安宁 - 月 -->
-    <select id="selectAnNingSubAgencyIndexMonthlyRank" parameterType="com.epmet.evaluationindex.screen.dto.form.AnNingSubAgencyIndexRankFormDTO" resultType="com.epmet.evaluationindex.screen.dto.result.SubAgencyIndexRankResultDTO">
+    <select id="selectAnNingSubAgencyIndexMonthlyRank" parameterType="com.epmet.evaluationindex.screen.dto.form.AnNingSubAgencyIndexRankFormDTO"
+            resultType="com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankResultDTO">
         SELECT
         org_name AS `NAME`,
-        index_total AS totalIndex,
-        govern_ablity AS governAbility,
-        party_dev_ablity AS partyDevAbility,
-        service_ablity AS serviceAbility
+        ROUND(index_total, 1) AS totalIndex,
+        ROUND(govern_ablity, 1) AS governAbility,
+        ROUND(party_dev_ablity, 1) AS partyDevAbility,
+        ROUND(service_ablity, 1) AS serviceAbility,
+        ORG_ID orgId
         FROM
         screen_index_data_monthly
         WHERE
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 60dc82b24b..a848319221 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
@@ -6,10 +6,10 @@
     <!-- 1、年度平均指数 -->
     <select id="selectYearAverageIndex" resultType="com.epmet.evaluationindex.screen.dto.result.YearAverageIndexResultDTO">
         SELECT
-            index_total AS yearAverageIndex,
-            service_ablity AS serviceAbility,
-            party_dev_ablity AS partyDevAbility,
-            govern_ablity AS governAbility
+            ROUND(index_total,1) AS yearAverageIndex,
+            ROUND(service_ablity,1) AS serviceAbility,
+            ROUND(party_dev_ablity,1) AS partyDevAbility,
+            ROUND(govern_ablity,1) AS governAbility
         FROM
             screen_index_data_yearly
         WHERE
@@ -20,13 +20,15 @@
     </select>
 
     <!-- 下级部门指数排行 安宁 - 年 -->
-    <select id="selectAnNingSubAgencyIndexYearlyRank" parameterType="com.epmet.evaluationindex.screen.dto.form.AnNingSubAgencyIndexRankFormDTO" resultType="com.epmet.evaluationindex.screen.dto.result.SubAgencyIndexRankResultDTO">
+    <select id="selectAnNingSubAgencyIndexYearlyRank" parameterType="com.epmet.evaluationindex.screen.dto.form.AnNingSubAgencyIndexRankFormDTO"
+            resultType="com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankResultDTO">
         SELECT
         org_name AS `NAME`,
-        index_total AS totalIndex,
-        govern_ablity AS governAbility,
-        party_dev_ablity AS partyDevAbility,
-        service_ablity AS serviceAbility
+        ROUND(index_total, 1) AS totalIndex,
+        ROUND(govern_ablity, 1) AS governAbility,
+        ROUND(party_dev_ablity, 1) AS partyDevAbility,
+        ROUND(service_ablity, 1) AS serviceAbility,
+        ORG_ID orgId
         FROM
         screen_index_data_yearly
         WHERE
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcActSummaryDailyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcActSummaryDailyDao.xml
new file mode 100644
index 0000000000..a2b108ceb9
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcActSummaryDailyDao.xml
@@ -0,0 +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.evaluationindex.screenkc.ScreenKcActSummaryDailyDao">
+
+
+</mapper>
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcActTrendMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcActTrendMonthlyDao.xml
new file mode 100644
index 0000000000..5978feed5a
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcActTrendMonthlyDao.xml
@@ -0,0 +1,8 @@
+<?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.evaluationindex.screenkc.ScreenKcActTrendMonthlyDao">
+
+
+
+</mapper>
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcGroupDetailGridDailyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcGroupDetailGridDailyDao.xml
new file mode 100644
index 0000000000..618e712bff
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcGroupDetailGridDailyDao.xml
@@ -0,0 +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.evaluationindex.screenkc.ScreenKcGroupDetailGridDailyDao">
+
+
+</mapper>
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcGroupSummaryGridDailyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcGroupSummaryGridDailyDao.xml
new file mode 100644
index 0000000000..03bbdb55c2
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcGroupSummaryGridDailyDao.xml
@@ -0,0 +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.evaluationindex.screenkc.ScreenKcGroupSummaryGridDailyDao">
+
+
+</mapper>
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcIssueSummaryGridDailyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcIssueSummaryGridDailyDao.xml
new file mode 100644
index 0000000000..98b91d3ee3
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcIssueSummaryGridDailyDao.xml
@@ -0,0 +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.evaluationindex.screenkc.ScreenKcIssueSummaryGridDailyDao">
+
+
+</mapper>
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcIssueTrendGridMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcIssueTrendGridMonthlyDao.xml
new file mode 100644
index 0000000000..e9298902f1
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcIssueTrendGridMonthlyDao.xml
@@ -0,0 +1,8 @@
+<?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.evaluationindex.screenkc.ScreenKcIssueTrendGridMonthlyDao">
+
+
+
+</mapper>
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcNewsCategoryAnalysisDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcNewsCategoryAnalysisDao.xml
new file mode 100644
index 0000000000..c42b4df218
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcNewsCategoryAnalysisDao.xml
@@ -0,0 +1,6 @@
+<?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.evaluationindex.screenkc.ScreenKcNewsCategoryAnalysisDao">
+
+</mapper>
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcNewsRankDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcNewsRankDao.xml
new file mode 100644
index 0000000000..49fb7817e0
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcNewsRankDao.xml
@@ -0,0 +1,8 @@
+<?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.evaluationindex.screenkc.ScreenKcNewsRankDao">
+
+
+
+</mapper>
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcNewsSummaryDailyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcNewsSummaryDailyDao.xml
new file mode 100644
index 0000000000..715ce1f038
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcNewsSummaryDailyDao.xml
@@ -0,0 +1,8 @@
+<?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.evaluationindex.screenkc.ScreenKcNewsSummaryDailyDao">
+
+
+
+</mapper>
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcNewsTrendMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcNewsTrendMonthlyDao.xml
new file mode 100644
index 0000000000..71d977bd38
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcNewsTrendMonthlyDao.xml
@@ -0,0 +1,8 @@
+<?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.evaluationindex.screenkc.ScreenKcNewsTrendMonthlyDao">
+
+
+
+</mapper>
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcPlatformSummaryDailyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcPlatformSummaryDailyDao.xml
new file mode 100644
index 0000000000..1618b51341
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcPlatformSummaryDailyDao.xml
@@ -0,0 +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.evaluationindex.screenkc.ScreenKcPlatformSummaryDailyDao">
+
+
+</mapper>
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcProjectCategoryGridDailyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcProjectCategoryGridDailyDao.xml
new file mode 100644
index 0000000000..76241a4406
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcProjectCategoryGridDailyDao.xml
@@ -0,0 +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.evaluationindex.screenkc.ScreenKcProjectCategoryGridDailyDao">
+
+
+</mapper>
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcProjectSatisGridMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcProjectSatisGridMonthlyDao.xml
new file mode 100644
index 0000000000..0155931631
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcProjectSatisGridMonthlyDao.xml
@@ -0,0 +1,8 @@
+<?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.evaluationindex.screenkc.ScreenKcProjectSatisGridMonthlyDao">
+
+
+
+</mapper>
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcProjectSummaryGridDailyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcProjectSummaryGridDailyDao.xml
new file mode 100644
index 0000000000..183c0858e0
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcProjectSummaryGridDailyDao.xml
@@ -0,0 +1,6 @@
+<?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.evaluationindex.screenkc.ScreenKcProjectSummaryGridDailyDao">
+
+</mapper>
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcTopicTrendGridMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcTopicTrendGridMonthlyDao.xml
new file mode 100644
index 0000000000..f6eb105077
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcTopicTrendGridMonthlyDao.xml
@@ -0,0 +1,8 @@
+<?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.evaluationindex.screenkc.ScreenKcTopicTrendGridMonthlyDao">
+
+
+
+</mapper>
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcUserHeatRankGridDailyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcUserHeatRankGridDailyDao.xml
new file mode 100644
index 0000000000..76f68580a1
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcUserHeatRankGridDailyDao.xml
@@ -0,0 +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.evaluationindex.screenkc.ScreenKcUserHeatRankGridDailyDao">
+
+
+</mapper>
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcUserSummaryDailyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcUserSummaryDailyDao.xml
new file mode 100644
index 0000000000..7ccf73a888
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcUserSummaryDailyDao.xml
@@ -0,0 +1,8 @@
+<?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.evaluationindex.screenkc.ScreenKcUserSummaryDailyDao">
+
+
+
+</mapper>
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcUserTrendGridMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcUserTrendGridMonthlyDao.xml
new file mode 100644
index 0000000000..39f0f5a0fc
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcUserTrendGridMonthlyDao.xml
@@ -0,0 +1,8 @@
+<?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.evaluationindex.screenkc.ScreenKcUserTrendGridMonthlyDao">
+
+
+
+</mapper>
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcVolunteerHeatRankGridDailyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcVolunteerHeatRankGridDailyDao.xml
new file mode 100644
index 0000000000..4c6ff538f8
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcVolunteerHeatRankGridDailyDao.xml
@@ -0,0 +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.evaluationindex.screenkc.ScreenKcVolunteerHeatRankGridDailyDao">
+
+
+</mapper>
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcVolunteerSummaryDailyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcVolunteerSummaryDailyDao.xml
new file mode 100644
index 0000000000..39f5781f95
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcVolunteerSummaryDailyDao.xml
@@ -0,0 +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.evaluationindex.screenkc.ScreenKcVolunteerSummaryDailyDao">
+
+
+</mapper>
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/IndexCalConstant.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/IndexCalConstant.java
index f02185071f..49057915f6 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/IndexCalConstant.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/IndexCalConstant.java
@@ -1,14 +1,25 @@
 package com.epmet.constant;
 
 /**
- * 描述一下
+ * 指标计算 常量类
  *
  * @author yinzuomei@elink-cn.com
  * @date 2020/8/27 15:20
  */
 public interface IndexCalConstant {
 
-    Integer PAGE_SIZE = 10;
+    /**
+     * 批量插入 最大数据量
+     */
+    Integer INSERT_SIZE= 100;
+    /**
+     * 批量删除 一次删除50
+     */
+    Integer DELETE_SIZE=1000;
+    /**
+     * 分批计算，一次计算 10条
+     */
+    Integer PAGE_SIZE = 1000;
 
     String GRID_ID="GRID_ID";
 
@@ -35,11 +46,27 @@ public interface IndexCalConstant {
 
     String COMMUNITY_RELATE = "shequxiangguan";
 
+    /**
+     * 网格相关:党建能力
+     */
+    String GRID_DJ_ALL_PARENT_INDEX_CODE="wanggexiangguan:dangjiannengli";
+    /**
+     * 网格相关:治理能力
+     */
+    String GRID_ZL_ALL_PARENT_INDEX_CODE="wanggexiangguan:zhilinengli";
+    /**
+     * 网格相关:服务能力
+     */
+    String GRID_FW_ALL_PARENT_INDEX_CODE="wanggexiangguan:fuwunengli";
+    /**
+     * 区直部门:治理能力
+     */
+    String DEPT_ZL_ALL_PARENT_INDEX_CODE="quzhibumen:zhilinengli";
 
 
 
     // 测试插入数据用
-    String customerId="b09527201c4409e19d1dbc5e3c3429a1";
+    String customerId="epmettest";
     //社区S1-C1
      String SHE_QU_S1_C1="S1-C1";
     //社区S1-C2
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/AgencyCalResultDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/AgencyCalResultDTO.java
new file mode 100644
index 0000000000..0287801453
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/AgencyCalResultDTO.java
@@ -0,0 +1,20 @@
+package com.epmet.dto.indexcal;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/9/9 5:52 下午
+ */
+@Data
+public class AgencyCalResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 2482954776048082386L;
+
+    private List<AgencyScoreDTO> oneTwoLevel;
+
+    private List<AgencyScoreDTO> fiveLevel;
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/CalculateCommonFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/CalculateCommonFormDTO.java
index 187f69c960..cfdc9f2ec9 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/CalculateCommonFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/CalculateCommonFormDTO.java
@@ -1,7 +1,9 @@
 package com.epmet.dto.indexcal;
 
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
@@ -13,6 +15,9 @@ import java.io.Serializable;
 @Data
 public class CalculateCommonFormDTO implements Serializable {
     private static final long serialVersionUID = -5689788391963427717L;
+
+    public interface CancelCalculateGroup extends CustomerClientShowGroup {}
+
     /**
      * 月份id:  yyyyMM
      */
@@ -21,6 +26,7 @@ public class CalculateCommonFormDTO implements Serializable {
     /**
      * 客户id
      */
+    @NotBlank(message = "客户id不能为空", groups = { CancelCalculateGroup.class })
     private String customerId;
 
     public CalculateCommonFormDTO() {
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/CommunityCalResultDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/CommunityCalResultDTO.java
new file mode 100644
index 0000000000..f8325206c8
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/CommunityCalResultDTO.java
@@ -0,0 +1,21 @@
+package com.epmet.dto.indexcal;
+
+import com.epmet.dto.screen.FactIndexCommunityScoreDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/9/10 9:19 上午
+ */
+@Data
+public class CommunityCalResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 2482954776048082386L;
+
+    private List<FactIndexCommunityScoreDTO> oneLevel;
+
+    private List<FactIndexCommunityScoreDTO> fiveLevel;
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/DeotScore.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/DeotScore.java
new file mode 100644
index 0000000000..351a4e9ad6
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/DeotScore.java
@@ -0,0 +1,47 @@
+package com.epmet.dto.indexcal;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 区直部门-相关分值
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/9/10 18:13
+ */
+@Data
+public class DeotScore implements Serializable {
+    /**
+     * 部门id
+     */
+    private String deptId;
+
+    /**
+     * 客户Id
+     */
+    private String customerId;
+
+    /**
+     * 部门所属的机关Id
+     */
+    private String agencyId;
+
+    /**
+     * 季度id: yyyyQ1、yyyyQ2、yyyyQ3、yyyyQ4
+     */
+    private String quarterId;
+
+    /**
+     * 年度ID: yyyy
+     */
+    private String yearId;
+
+    /**
+     * 月维度Id: yyyyMM
+     */
+    private String monthId;
+
+    private List<DeptScoreDetailDTO> detailList;
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/DeptScoreDetailDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/DeptScoreDetailDTO.java
new file mode 100644
index 0000000000..e5f63cab5b
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/DeptScoreDetailDTO.java
@@ -0,0 +1,32 @@
+package com.epmet.dto.indexcal;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 区直部门相关分值
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/9/10 17:56
+ */
+@Data
+public class DeptScoreDetailDTO implements Serializable {
+    private static final long serialVersionUID = -1520962964833708922L;
+
+    /**
+     * 1：总分；0不是
+     */
+    private String isTotal;
+
+    /**
+     * 分值
+     */
+    private BigDecimal score;
+
+    /**
+     * 党建能力：dangjiannengli；治理能力：zhilinengli；服务能力：fuwunengli；网格相关：quzhibumen
+     */
+    private String indexCode;
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcActSummaryFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcActSummaryFormDTO.java
new file mode 100644
index 0000000000..a942ef7c96
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcActSummaryFormDTO.java
@@ -0,0 +1,42 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 孔村
+ * 7、公益互助-活动各类总数
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class KcActSummaryFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 活动总数
+     */
+    private Integer actCount;
+
+    /**
+     * 志愿者总数
+     */
+    private Integer volunteerCount;
+
+    /**
+     * 参与人次
+     */
+    private Integer partiUserCount;
+
+    /**
+     * 发放积分
+     */
+    private Integer rewardPointCount;
+
+    /**
+     * 公益时长单位分钟
+     */
+    private Integer heartTime;
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcActTrendFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcActTrendFormDTO.java
new file mode 100644
index 0000000000..26469e1ac4
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcActTrendFormDTO.java
@@ -0,0 +1,22 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 孔村
+ * 8、公益互助-活动次数趋势
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class KcActTrendFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 活动数量（本月举行的活动）
+     */
+    private Integer actCount;
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcCategorySummaryFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcCategorySummaryFormDTO.java
new file mode 100644
index 0000000000..495e3ac7f7
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcCategorySummaryFormDTO.java
@@ -0,0 +1,52 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 孔村
+ * 11、项目分析-按分类统计
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class KcCategorySummaryFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+    /**
+     * 网格所属的组织id
+     */
+    private String parentAgencyId;
+
+    /**
+     * 所有上级ID，用英文逗号分开 ？
+     */
+    private String allParentIds;
+
+    /**
+     * 类别id
+     */
+    private String categoryId;
+
+    /**
+     * 分类名称
+     */
+    private String categoryName;
+
+    /**
+     * 项目数量
+     */
+    private Integer projectCount;
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcGroupDetailFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcGroupDetailFormDTO.java
new file mode 100644
index 0000000000..8fc4130dbc
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcGroupDetailFormDTO.java
@@ -0,0 +1,67 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 孔村
+ * 18、邻里党群-小组详情
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class KcGroupDetailFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+    /**
+     * 网格所属的组织id
+     */
+    private String parentAgencyId;
+
+    /**
+     * 所有上级ID，用英文逗号分开 ？
+     */
+    private String allParentIds;
+
+    /**
+     * 小组id
+     */
+    private String groupId;
+
+    /**
+     * 群名称
+     */
+    private String groupName;
+
+    /**
+     * 群主名称
+     */
+    private String groupLeader;
+
+    /**
+     * 群成员数
+     */
+    private Integer memberCount;
+
+    /**
+     * 话题总数
+     */
+    private Integer topicCount;
+
+    /**
+     * 转为议题的话题数
+     */
+    private Integer shifitIssueCount;
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcGroupSummaryFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcGroupSummaryFormDTO.java
new file mode 100644
index 0000000000..2018c4905d
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcGroupSummaryFormDTO.java
@@ -0,0 +1,62 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 孔村
+ * 17、邻里党群-各类总数汇总
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class KcGroupSummaryFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+    /**
+     * 网格所属的组织id
+     */
+    private String parentAgencyId;
+
+    /**
+     * 所有上级ID，用英文逗号分开 ？
+     */
+    private String allParentIds;
+
+    /**
+     * 社群总数
+     */
+    private Integer groupCount;
+
+    /**
+     * 群成员总数
+     */
+    private Integer memberCount;
+
+    /**
+     * 话题数量
+     */
+    private Integer topicCount;
+
+    /**
+     * 话题参与量
+     */
+    private Integer partiCount;
+
+    /**
+     * 话题转议题总数
+     */
+    private Integer shiftIssueCount;
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcGroupTopicTrendFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcGroupTopicTrendFormDTO.java
new file mode 100644
index 0000000000..1ad02ab91c
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcGroupTopicTrendFormDTO.java
@@ -0,0 +1,42 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 孔村
+ * 19、邻里党群-话题参与趋势
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class KcGroupTopicTrendFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+    /**
+     * 网格所属的组织id
+     */
+    private String parentAgencyId;
+
+    /**
+     * 所有上级ID，用英文逗号分开 ？
+     */
+    private String allParentIds;
+
+    /**
+     * 话题数量(所在月新增话题数)
+     */
+    private Integer topicCount;
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcHomePageFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcHomePageFormDTO.java
new file mode 100644
index 0000000000..b12c97bb54
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcHomePageFormDTO.java
@@ -0,0 +1,77 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 孔村
+ * 1、首页-平台各类总数上报 入参
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class KcHomePageFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 网格总数
+     */
+    private Integer gridCount;
+
+    /**
+     * 已开通网格总数
+     */
+    private Integer openedGridCount;
+
+    /**
+     * 议题总数
+     */
+    private Integer issueCount;
+
+    /**
+     * 项目总数
+     */
+    private Integer projectCount;
+
+    /**
+     * 用户总数
+     */
+    private Integer userCount;
+
+    /**
+     * 党员用户
+     */
+    private Integer partyUserCount;
+
+    /**
+     * 社群总数
+     */
+    private Integer groupCount;
+
+    /**
+     * 话题总数
+     */
+    private Integer topicCount;
+
+    /**
+     * 新闻数量
+     */
+    private Integer newsCount;
+
+    /**
+     * 阅读数量
+     */
+    private Integer readCount;
+
+    /**
+     * 公益活动数量
+     */
+    private Integer actCount;
+
+    /**
+     * 志愿者总数
+     */
+    private Integer vounteerCount;
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcIssueSummaryFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcIssueSummaryFormDTO.java
new file mode 100644
index 0000000000..ae08d2330f
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcIssueSummaryFormDTO.java
@@ -0,0 +1,92 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 孔村
+ * 2、议题分析-各类总数
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class KcIssueSummaryFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 所有上级ID，用英文逗号分开 ？
+     */
+    private String allParentIds;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+    /**
+     * 网格所属的组织id
+     */
+    private String parentAgencyId;
+
+    /**
+     * 上报总数
+     */
+    private Integer reportCount;
+
+    /**
+     * 议题总数
+     */
+    private Integer issueCount;
+
+    /**
+     * 待审核数
+     */
+    private Integer pendingCount;
+
+    /**
+     * 已驳回数
+     */
+    private Integer rejectedCount;
+
+    /**
+     * 处理中数
+     */
+    private Integer processingCount;
+
+    /**
+     * 已关闭数
+     */
+    private Integer closedCount;
+
+    /**
+     * 议题浏览数
+     */
+    private Integer issueViewCount;
+
+    /**
+     * 表态数
+     */
+    private Integer voteCount;
+
+    /**
+     * 审核通过数 ？为了算议题效率
+     */
+    private Integer passedCount;
+
+    /**
+     * 转化成项目数 ？为了算议题效率
+     */
+    private Integer shiftToProjectCount;
+
+    /**
+     * 平均审核时间单位分钟  ？
+     */
+    private Integer avgAuditTime;
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcIssueTrendFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcIssueTrendFormDTO.java
new file mode 100644
index 0000000000..3fe5df6075
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcIssueTrendFormDTO.java
@@ -0,0 +1,42 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 孔村
+ * 3、议题分析-参与趋势
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class KcIssueTrendFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+    /**
+     * 网格所属的组织id
+     */
+    private String parentAgencyId;
+
+    /**
+     * 所有上级ID，用英文逗号分开 ？
+     */
+    private String allParentIds;
+
+    /**
+     * 议题上报数（本月内上报的议题数量）
+     */
+    private Integer reportCount;
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcNewsCategoryAnalysisFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcNewsCategoryAnalysisFormDTO.java
new file mode 100644
index 0000000000..ed16c44348
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcNewsCategoryAnalysisFormDTO.java
@@ -0,0 +1,47 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 孔村
+ * 16、党建声音-新闻按类别统计
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class KcNewsCategoryAnalysisFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 类别id
+     */
+    private String categoryId;
+
+    /**
+     * 分类名称
+     */
+    private String categoryName;
+
+    /**
+     * 新闻的数量
+     */
+    private Integer newsCount;
+
+    /**
+     * 阅读的数量
+     */
+    private Integer readCount;
+
+    /**
+     * 点赞的数量
+     */
+    private Integer likeCount;
+
+    /**
+     * 点踩的数量
+     */
+    private Integer disLikeCount;
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcNewsHotRankFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcNewsHotRankFormDTO.java
new file mode 100644
index 0000000000..035fbd4971
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcNewsHotRankFormDTO.java
@@ -0,0 +1,32 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 孔村
+ * 15、党建声音-热度新闻排行
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class KcNewsHotRankFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 新闻id
+     */
+    private String newsId;
+
+    /**
+     * 新闻标题
+     */
+    private String newsTitle;
+
+    /**
+     * 新闻热点值
+     */
+    private Integer hotCount;
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcNewsSummaryFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcNewsSummaryFormDTO.java
new file mode 100644
index 0000000000..276244a9f1
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcNewsSummaryFormDTO.java
@@ -0,0 +1,37 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 孔村
+ * 13、党建声音-新闻各类总数汇总
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class KcNewsSummaryFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 文章总数
+     */
+    private Integer newsCount;
+
+    /**
+     * 阅读量
+     */
+    private Integer readCount;
+
+    /**
+     * 点赞量
+     */
+    private Integer likeCount;
+
+    /**
+     * 评论量
+     */
+    private Integer commentCount;
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcNewsTrendFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcNewsTrendFormDTO.java
new file mode 100644
index 0000000000..6e6bdf9359
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcNewsTrendFormDTO.java
@@ -0,0 +1,27 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 孔村
+ * 14、党建声音-新闻阅读参与趋势
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class KcNewsTrendFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 阅读数量
+     */
+    private Integer readCount;
+
+    /**
+     * 参与数量
+     */
+    private Integer partiCount;
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcProjectSatisanalysisFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcProjectSatisanalysisFormDTO.java
new file mode 100644
index 0000000000..97843831e2
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcProjectSatisanalysisFormDTO.java
@@ -0,0 +1,52 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 孔村
+ * 12、项目分析-满意度分析
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class KcProjectSatisanalysisFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+    /**
+     * 网格所属的组织id
+     */
+    private String parentAgencyId;
+
+    /**
+     * 所有上级ID，用英文逗号分开 ？
+     */
+    private String allParentIds;
+
+    /**
+     * 非常满意项目总数
+     */
+    private Integer greatSatis;
+
+    /**
+     * 满意项目总数
+     */
+    private Integer goodSatis;
+
+    /**
+     * 不满意的项目总数
+     */
+    private Integer disSatis;
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcProjectSummaryFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcProjectSummaryFormDTO.java
new file mode 100644
index 0000000000..1b723b68d1
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcProjectSummaryFormDTO.java
@@ -0,0 +1,77 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 孔村
+ * 10、项目分析-各类总数
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class KcProjectSummaryFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+    /**
+     * 网格所属的组织id
+     */
+    private String parentAgencyId;
+
+    /**
+     * 所有上级ID，用英文逗号分开 ？
+     */
+    private String allParentIds;
+
+    /**
+     * 项目总数
+     */
+    private Integer projectCount;
+
+    /**
+     * 处理中数
+     */
+    private Integer processingCount;
+
+    /**
+     * 已关闭数
+     */
+    private Integer closedCount;
+
+    /**
+     * 流转次数
+     */
+    private Integer moveCount;
+
+    /**
+     * 已结案数量
+     */
+    private Integer closedCaseCount;
+
+    /**
+     * 项目浏览数
+     */
+    private Integer projectViewCount;
+
+    /**
+     * 表态数
+     */
+    private Integer voteCount;
+
+    /**
+     * 平均结案时间 单位分钟 ？
+     */
+    private Integer avgClosedCaseTime;
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcUserHeartRankFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcUserHeartRankFormDTO.java
new file mode 100644
index 0000000000..d5a272c182
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcUserHeartRankFormDTO.java
@@ -0,0 +1,47 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 孔村
+ * 6、用户分析-用户趋势
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class KcUserHeartRankFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+    /**
+     * 网格所属的组织id
+     */
+    private String parentAgencyId;
+
+    /**
+     * 所有上级ID，用英文逗号分开 ？
+     */
+    private String allParentIds;
+
+    /**
+     * 本月内新增用户数量
+     */
+    private Integer regUserCount;
+
+    /**
+     * 本月内新增党员数量
+     */
+    private Integer partyUserCount;
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcUserSummaryFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcUserSummaryFormDTO.java
new file mode 100644
index 0000000000..cd9b0db555
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcUserSummaryFormDTO.java
@@ -0,0 +1,93 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 孔村
+ * 4、用户分析-各类总数
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class KcUserSummaryFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+    /**
+     * 网格所属的组织id
+     */
+    private String parentAgencyId;
+
+    /**
+     * 所有上级ID，用英文逗号分开 ？
+     */
+    private String allParentIds;
+
+    /**
+     * 浏览用户（首页的用户总数，原型上首页是叫注册用户）
+     */
+    private Integer visitorCount;
+
+    /**
+     * 注册用户=居民数量
+     */
+    private Integer regUserCount;
+
+    /**
+     * 党员用户
+     */
+    private Integer partyUserCount;
+
+    /**
+     * 小于20岁的党员总人数
+     */
+    private Integer ageLevel1;
+
+    /**
+     * 20-30岁的党员总人数
+     */
+    private Integer ageLevel2;
+
+    /**
+     * 31-40岁的党员总人数
+     */
+    private Integer ageLevel3;
+
+    /**
+     * 41-50岁的党员总人数
+     */
+    private Integer ageLevel4;
+
+    /**
+     * 51-60岁的党员总人数
+     */
+    private Integer ageLevel5;
+
+    /**
+     * 60+岁的党员总人数
+     */
+    private Integer ageLevel6;
+
+    /**
+     * 党员中男性总人数
+     */
+    private Integer malePartyUserCount;
+
+    /**
+     * 党员中女性总人数
+     */
+    private Integer femalePartyUserCount;
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcVolunteerHeartRankFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcVolunteerHeartRankFormDTO.java
new file mode 100644
index 0000000000..d25d044750
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcVolunteerHeartRankFormDTO.java
@@ -0,0 +1,62 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 孔村
+ * 5、公益互助-志愿者公益时长排名
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class KcVolunteerHeartRankFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+    /**
+     * 网格所属组织id
+     */
+    private String parentAgencyId;
+
+    /**
+     * 所有上级ID，用英文逗号分开 ？
+     */
+    private String allParentIds;
+
+    /**
+     * 用户id
+     */
+    private String userId;
+
+    /**
+     * 用户姓名
+     */
+    private String userName;
+
+    /**
+     * 爱心时长 单位分钟
+     */
+    private Integer heartTime;
+
+    /**
+     * 积分09-11新增
+     */
+    private Integer points;
+
+    /**
+     * 志愿者id 09-11新增
+     */
+    private String volunteerId;
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcVolunteerSummaryFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcVolunteerSummaryFormDTO.java
new file mode 100644
index 0000000000..ebfee5da52
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/KcVolunteerSummaryFormDTO.java
@@ -0,0 +1,77 @@
+package com.epmet.dto.screencoll.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 孔村
+ * 9、公益互助-志愿者画像
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class KcVolunteerSummaryFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+    /**
+     * 网格所属组织id
+     */
+    private String parentAgencyId;
+
+    /**
+     * 所有上级ID，用英文逗号分开 ？
+     */
+    private String allParentIds;
+
+    /**
+     * 小于20岁的志愿者总人数
+     */
+    private Integer ageLevel1;
+
+    /**
+     * 20-30岁的志愿者总人数
+     */
+    private Integer ageLevel2;
+
+    /**
+     * 31-40岁的志愿者总人数
+     */
+    private Integer ageLevel3;
+
+    /**
+     * 41-50岁的志愿者总人数
+     */
+    private Integer ageLevel4;
+
+    /**
+     * 51-60岁的志愿者总人数
+     */
+    private Integer ageLevel5;
+
+    /**
+     * 60+岁的志愿者总人数
+     */
+    private Integer ageLevel6;
+
+    /**
+     * 志愿者中男性总人数
+     */
+    private Integer maleCount;
+
+    /**
+     * 志愿者中女性总人数
+     */
+    private Integer femaleCount;
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/Dockerfile b/epmet-module/data-statistical/data-statistical-server/Dockerfile
index e592acbf38..074bc1d2de 100644
--- a/epmet-module/data-statistical/data-statistical-server/Dockerfile
+++ b/epmet-module/data-statistical/data-statistical-server/Dockerfile
@@ -4,7 +4,7 @@ RUN export LANG="zh_CN.UTF-8"
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 RUN echo 'Asia/Shanghai' > /etc/timezone
 
-COPY ./target/*.jar ./app.jar
+COPY ./target/*.jar ./data-stats.jar
 
 EXPOSE 8108
 
diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml
index 36afabff51..f9a01abc70 100644
--- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml
@@ -9,10 +9,10 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx250m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx512m -jar ./data-stats.jar"
     restart: "unless-stopped"
     deploy:
       resources:
         limits:
           cpus: '0.1'
-          memory: 300M
\ No newline at end of file
+          memory: 600M
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml
index 668e453b36..03f501aceb 100644
--- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml
@@ -9,10 +9,10 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms256m -Xmx1024m -jar ./data-stats.jar"
     restart: "unless-stopped"
     deploy:
       resources:
         limits:
           cpus: '0.1'
-          memory: 600M
\ No newline at end of file
+          memory: 1100M
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml
index 075a43a0af..0f4d72c3e4 100644
--- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml
+++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml
@@ -9,10 +9,10 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx250m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx512m -jar ./data-stats.jar"
     restart: "unless-stopped"
     deploy:
       resources:
         limits:
           cpus: '0.1'
-          memory: 300M
\ No newline at end of file
+          memory: 600M
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml
index a4aaa4ca34..7418d07d65 100644
--- a/epmet-module/data-statistical/data-statistical-server/pom.xml
+++ b/epmet-module/data-statistical/data-statistical-server/pom.xml
@@ -226,7 +226,7 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <properties>
-                <server.port>8108</server.port>
+                <server.port>8109</server.port>
                 <spring.profiles.active>local</spring.profiles.active>
 
                 <!-- 数据库配置-->
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
index bf2e750a65..59ed8ba771 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
@@ -157,16 +157,20 @@ public class DemoController {
     private FactIndexServiceAblityGridMonthlyDao factIndexServiceAblityGridMonthlyDao;
     @Autowired
     private ScreenCustomerGridDao screenCustomerGridDao;
+    @Autowired
+    private CpcIndexCalculateService cpcIndexCalculateService;
 //    private static  Integer testcal=100;
 
     @PostMapping("testcal")
     public Result testCal(){
-        CalculateCommonFormDTO formDTO=new CalculateCommonFormDTO("b09527201c4409e19d1dbc5e3c3429a1","202008");
+        CalculateCommonFormDTO formDTO=new CalculateCommonFormDTO("epmettest","202008");
 //        //查询总记录数
 //        List<GridScoreDTO> gridScoreDTOList=gridScoreDao.selectList(formDTO);
 //        return new Result<List<GridScoreDTO>>().ok(gridScoreDTOList);
+
+        cpcIndexCalculateService.cpcIndexCalculate(formDTO);
         gridCorreLationService.calculateGridCorreLation(formDTO);
-//        deptScoreService.calculateDeptCorreLation(formDTO);
+        deptScoreService.calculateDeptCorreLation(formDTO);
         return new Result();
     }
     @DataSource(DataSourceConstant.EVALUATION_INDEX)
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/IndexCalculateController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/IndexCalculateController.java
index 003813df2b..1a48df14d5 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/IndexCalculateController.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/IndexCalculateController.java
@@ -2,12 +2,18 @@ package com.epmet.controller;
 
 import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
 import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
+import com.epmet.commons.tools.redis.RedisKeys;
+import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.utils.DateUtils;
+import com.epmet.commons.tools.utils.HttpClientManager;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.indexcal.CalculateCommonFormDTO;
 import com.epmet.service.evaluationindex.indexcal.CpcIndexCalculateService;
 import com.epmet.service.evaluationindex.indexcal.IndexCalculateService;
 import com.epmet.util.DimIdGenerator;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -15,7 +21,11 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.PreDestroy;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.*;
 
 /**
  * 指标计算controller
@@ -23,9 +33,16 @@ import java.util.Date;
  * @author liujianjun@elink-cn.com
  * @date 2020/8/24 14:38
  */
+@Slf4j
 @RestController
 @RequestMapping("indexcalculate")
 public class IndexCalculateController {
+    ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+            .setNameFormat("indexcalculate-pool-%d").build();
+    ExecutorService singleThreadPool = new ThreadPoolExecutor(1, 1,
+            0L, TimeUnit.MILLISECONDS,
+            new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+
 
     @Autowired
     private IndexCalculateService indexCalculateService;
@@ -33,6 +50,23 @@ public class IndexCalculateController {
     @Autowired
     private CpcIndexCalculateService cpcIndexCalculateService;
 
+    @Autowired
+    private RedisUtils redisUtils;
+
+    // 计算同步锁
+    private Object statsCalLock = new Object();
+
+    private Map<String, Future> futureMap = new HashMap<>();
+
+    @PreDestroy
+    public void clearDataCalFlag() {
+        // 实例销毁之前，将正在本实例中执行计算的客户列表的计算状态清空
+        futureMap.forEach((customerId, future) -> {
+            redisUtils.delete(RedisKeys.getCustomerStatsCalFlag(customerId));
+        });
+    }
+
+
     /**
      * 按照客户计算所有指标(按照月份)
      *
@@ -44,20 +78,67 @@ public class IndexCalculateController {
     @ExternalAppRequestAuth
     @PostMapping("all")
     public Result<Boolean> indexCalculate(ExternalAppRequestParam externalAppRequestParam, @RequestBody CalculateCommonFormDTO formDTO) {
-        formDTO.setCustomerId(externalAppRequestParam.getCustomerId());
-        Boolean aBoolean = indexCalculateService.indexCalculate(formDTO);
-        if (aBoolean) {
-            return new Result<Boolean>().ok(true);
+        String customerId = externalAppRequestParam.getCustomerId();
+        //String customerId = "epmettest";
+        Boolean executing = (Boolean) redisUtils.get(RedisKeys.getCustomerStatsCalFlag(customerId));
+        if (executing == null || !executing) {
+            synchronized (statsCalLock) {
+                Boolean executing2 = (Boolean) redisUtils.get(RedisKeys.getCustomerStatsCalFlag(customerId));
+                if (executing2 != null && executing2) {
+                    log.error(String.format("该客户正在执行计算，请勿重复提交计算请求。", customerId));
+                    return new Result<Boolean>().ok(false);
+                }
+                Future<?> future = singleThreadPool.submit(() -> {
+                    formDTO.setCustomerId(customerId);
+                    long start = System.currentTimeMillis();
+                    Boolean aBoolean = indexCalculateService.indexCalculate(formDTO);
+                    if (aBoolean) {
+                        log.error("客户Id：{},全部指标计算完成，总耗时：{}秒", customerId, (System.currentTimeMillis() - start) / 1000);
+                    }
+                    redisUtils.delete(RedisKeys.getCustomerStatsCalFlag(customerId));
+                    futureMap.remove(customerId);
+                });
+                futureMap.put(customerId, future);
+                redisUtils.set(RedisKeys.getCustomerStatsCalFlag(customerId), true);
+            }
+        } else {
+            log.error(String.format("该客户正在执行计算，请勿重复提交计算请求。", customerId));
+            return new Result<Boolean>().ok(false);
         }
-        return new Result<Boolean>().error("指标计算失败");
+
+
+        return new Result<Boolean>().ok(true);
+    }
+
+    /**
+     * 终止计算
+     * @param form
+     * @return
+     */
+    @ExternalAppRequestAuth
+    @PostMapping("stopcalculate")
+    public Result stopcalculate(@RequestBody CalculateCommonFormDTO form) {
+        ValidatorUtils.validateEntity(form);
+
+        String customerId = form.getCustomerId();
+        Future future = this.futureMap.get(customerId);
+        if (future != null && !future.isCancelled()) {
+            future.cancel(true);
+            redisUtils.delete(RedisKeys.getCustomerStatsCalFlag(customerId));
+            futureMap.remove(customerId);
+            HttpClientManager.getInstance().sendAlarmMsg(String.format("数据统计服务-中止计算成功，customerId:%s", customerId));
+        }
+        return new Result();
     }
 
     @PostMapping("reAll")
     public Result<Boolean> calculateAll(@RequestBody CalculateCommonFormDTO formDTO) {
+        long start = System.currentTimeMillis();
         Boolean aBoolean = indexCalculateService.indexCalculate(formDTO);
         if (aBoolean) {
             return new Result<Boolean>().ok(true);
         }
+        HttpClientManager.getInstance().sendAlarmMsg("客户Id：" + formDTO.getCustomerId() + ",calculateAll全部指标计算完成，总耗时：" + (System.currentTimeMillis() - start) / 1000 + "秒");
         return new Result<Boolean>().error("指标计算失败");
     }
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/KcScreenCollController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/KcScreenCollController.java
index 766db2294b..09d06df653 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/KcScreenCollController.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/KcScreenCollController.java
@@ -1,5 +1,14 @@
 package com.epmet.controller;
 
+import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
+import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.screencoll.ScreenCollFormDTO;
+import com.epmet.dto.screencoll.form.*;
+import com.epmet.service.evaluationindex.screen.KcScreenCollService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,4 +21,368 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("kcscreencoll")
 public class KcScreenCollController {
+
+    @Autowired
+    private KcScreenCollService kcScreenCollService;
+
+    /**
+     * 1、首页-平台各类总数上报
+     *      当isFirst为true时，后台先按照customerId+dateId，清空数据，再插入。
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *      table:screen_kc_platform_summary_daily
+     *
+     * @param externalAppRequestParam
+     * @param formDTO
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    @ExternalAppRequestAuth
+    @PostMapping("homepage/platformsummary")
+    public Result platFormSummary(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcHomePageFormDTO> formDTO) {
+        kcScreenCollService.insertPlatFormSummary(formDTO, externalAppRequestParam.getCustomerId());
+        return new Result();
+    }
+
+    /**
+     * 2、议题分析-各类总数
+     *      当isFirst为true时，后台先按照customerId+dateId，清空数据，再插入。
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *      table:screen_kc_issue_summary_grid_daily
+     *
+     * @param externalAppRequestParam
+     * @param formDTO
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    @ExternalAppRequestAuth
+    @PostMapping("issue/summary")
+    public Result issueSummary(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcIssueSummaryFormDTO> formDTO) {
+        kcScreenCollService.insertIssueSummary(formDTO, externalAppRequestParam.getCustomerId());
+        return new Result();
+    }
+
+    /**
+     * 3、议题分析-参与趋势
+     *      当isFirst为true时，customerId+monthId先删后增
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *      table:  screen_kc_issue_trend_grid_monthly
+     *
+     * @param externalAppRequestParam
+     * @param formDTO
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    @ExternalAppRequestAuth
+    @PostMapping("issue/trend")
+    public Result issueTrend(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcIssueTrendFormDTO> formDTO) {
+        kcScreenCollService.insertIssueTrend(formDTO, externalAppRequestParam.getCustomerId());
+        return new Result();
+    }
+
+    /**
+     * 4、用户分析-各类总数
+     *      当isFirst为true时根据customerId+dateId删除，后插入
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *      table:screen_kc_user_summary_daily
+     *
+     * @param externalAppRequestParam
+     * @param formDTO
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    @ExternalAppRequestAuth
+    @PostMapping("user/summary")
+    public Result userSummary(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcUserSummaryFormDTO> formDTO) {
+        kcScreenCollService.insertUserSummary(formDTO, externalAppRequestParam.getCustomerId());
+        return new Result();
+    }
+
+    /**
+     * 5、公益互助-志愿者公益时长排名
+     *      当isFirst为true时, 根据customerId清空当前客户下所有用户的信息，再插入
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *      table:screen_kc_volunteer_heat_rank_grid_daily
+     *
+     * @param externalAppRequestParam
+     * @param formDTO
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    @ExternalAppRequestAuth
+    @PostMapping("volunteer/heartrank")
+    public Result volunteerHeartRank(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcVolunteerHeartRankFormDTO> formDTO) {
+        kcScreenCollService.insertVolunteerHeartRank(formDTO, externalAppRequestParam.getCustomerId());
+        return new Result();
+    }
+
+    /**
+     * 6、用户分析-用户趋势
+     *      当isFirst为true时,根据monthId+customerId先删后增
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *      table:screen_kc_user_trend_grid_monthly
+     *
+     * @param externalAppRequestParam
+     * @param formDTO
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    @ExternalAppRequestAuth
+    @PostMapping("user/userheartrank")
+    public Result userHeartRank(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcUserHeartRankFormDTO> formDTO) {
+        kcScreenCollService.insertUserHeartRank(formDTO, externalAppRequestParam.getCustomerId());
+        return new Result();
+    }
+
+    /**
+     * 7、公益互助-活动各类总数
+     *      当isFirst为true时,根据customerId+dateId先删后增
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *      table:screen_kc_act_summary_daily
+     *
+     * @param externalAppRequestParam
+     * @param formDTO
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    @ExternalAppRequestAuth
+    @PostMapping("act/summary")
+    public Result actSummary(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcActSummaryFormDTO> formDTO) {
+        kcScreenCollService.insertActSummary(formDTO, externalAppRequestParam.getCustomerId());
+        return new Result();
+    }
+
+    /**
+     * 8、公益互助-活动次数趋势
+     *      当isFirst为true时,根据customerId+monthId先删后增
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *      table:screen_kc_act_trend_monthly
+     *
+     * @param externalAppRequestParam
+     * @param formDTO
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    @ExternalAppRequestAuth
+    @PostMapping("act/trend")
+    public Result actTrend(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcActTrendFormDTO> formDTO) {
+        kcScreenCollService.insertActTrend(formDTO, externalAppRequestParam.getCustomerId());
+        return new Result();
+    }
+
+    /**
+     * 9、公益互助-志愿者画像
+     *      当isFirst为true时,根据 customerId+dateId 先删后增
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *      table:screen_kc_volunteer_summary_daily
+     *
+     * @param externalAppRequestParam
+     * @param formDTO
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    @ExternalAppRequestAuth
+    @PostMapping("act/volunteersummary")
+    public Result volunteerSummary(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcVolunteerSummaryFormDTO> formDTO) {
+        kcScreenCollService.insertVolunteerSummary(formDTO, externalAppRequestParam.getCustomerId());
+        return new Result();
+    }
+
+    /**
+     * 10、项目分析-各类总数
+     *      当isFirst为true时,根据 customerId+dateId 先删后增
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *      table:screen_kc_project_summary_grid_daily
+     *
+     * @param externalAppRequestParam
+     * @param formDTO
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    @ExternalAppRequestAuth
+    @PostMapping("project/summary")
+    public Result projectSummary(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcProjectSummaryFormDTO> formDTO) {
+        kcScreenCollService.insertProjectSummary(formDTO, externalAppRequestParam.getCustomerId());
+        return new Result();
+    }
+
+    /**
+     * 11、项目分析-按分类统计
+     *      当isFirst为true时,根据 customerId+dateId 先删后增
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *      table:screen_kc_project_category_grid_daily
+     *
+     * @param externalAppRequestParam
+     * @param formDTO
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    @ExternalAppRequestAuth
+    @PostMapping("project/categorysummary")
+    public Result categorySummary(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcCategorySummaryFormDTO> formDTO) {
+        kcScreenCollService.insertCategorySummary(formDTO, externalAppRequestParam.getCustomerId());
+        return new Result();
+    }
+
+    /**
+     * 12、项目分析-满意度分析
+     *      当isFirst为true时,根据 customerId+monthId 先删后增
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *      table:screen_kc_project_satis_grid_monthly
+     *
+     * @param externalAppRequestParam
+     * @param formDTO
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    @ExternalAppRequestAuth
+    @PostMapping("project/satisanalysis")
+    public Result projectSatisanalysis(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcProjectSatisanalysisFormDTO> formDTO) {
+        kcScreenCollService.insertProjectSatisanalysis(formDTO, externalAppRequestParam.getCustomerId());
+        return new Result();
+    }
+
+    /**
+     * 13、党建声音-新闻各类总数汇总
+     *      当isFirst为true时,根据 customerId+dateId 先删后增
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *      table:screen_kc_news_summary_daily
+     *
+     * @param externalAppRequestParam
+     * @param formDTO
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    @ExternalAppRequestAuth
+    @PostMapping("news/summary")
+    public Result newsSummary(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcNewsSummaryFormDTO> formDTO) {
+        kcScreenCollService.insertNewsSummary(formDTO, externalAppRequestParam.getCustomerId());
+        return new Result();
+    }
+
+    /**
+     * 14、党建声音-新闻阅读参与趋势
+     *      当isFirst为true时,根据 customerId+monthId 先删后增
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *      table:screen_kc_news_trend_monthly
+     *
+     * @param externalAppRequestParam
+     * @param formDTO
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    @ExternalAppRequestAuth
+    @PostMapping("news/trend")
+    public Result newsTrend(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcNewsTrendFormDTO> formDTO) {
+        kcScreenCollService.insertNewsTrend(formDTO, externalAppRequestParam.getCustomerId());
+        return new Result();
+    }
+
+    /**
+     * 15、党建声音-热度新闻排行
+     *      当isFirst为true时,根据 customerId 先删后增
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *      table:screen_kc_news_rank
+     *
+     * @param externalAppRequestParam
+     * @param formDTO
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    @ExternalAppRequestAuth
+    @PostMapping("news/hotrank")
+    public Result newsHotRank(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcNewsHotRankFormDTO> formDTO) {
+        kcScreenCollService.insertNewsHotRank(formDTO, externalAppRequestParam.getCustomerId());
+        return new Result();
+    }
+
+    /**
+     * 16、党建声音-新闻按类别统计
+     *      当isFirst为true时,根据 customerId+dateId 先删后增
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *      table:screen_kc_news_category_analysis
+     *
+     * @param externalAppRequestParam
+     * @param formDTO
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    @ExternalAppRequestAuth
+    @PostMapping("news/categoryanalysis")
+    public Result newsCategoryAnalysis(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcNewsCategoryAnalysisFormDTO> formDTO) {
+        kcScreenCollService.insertNewsCategoryAnalysis(formDTO, externalAppRequestParam.getCustomerId());
+        return new Result();
+    }
+
+    /**
+     * 17、邻里党群-各类总数汇总
+     *      当isFirst为true时,根据 customerId+dateId 先删后增
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *      table:screen_kc_group_summary_grid_daily
+     *
+     * @param externalAppRequestParam
+     * @param formDTO
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    @ExternalAppRequestAuth
+    @PostMapping("group/summary")
+    public Result groupSummary(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcGroupSummaryFormDTO> formDTO) {
+        kcScreenCollService.insertGroupSummary(formDTO, externalAppRequestParam.getCustomerId());
+        return new Result();
+    }
+
+    /**
+     * 18、邻里党群-小组详情
+     *      当isFirst为true时,根据 customerId+dateId 先删后增
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *      table:screen_kc_group_detail_grid_daily
+     *
+     * @param externalAppRequestParam
+     * @param formDTO
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    @ExternalAppRequestAuth
+    @PostMapping("group/detail")
+    public Result groupDetail(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcGroupDetailFormDTO> formDTO) {
+        kcScreenCollService.insertGroupDetail(formDTO, externalAppRequestParam.getCustomerId());
+        return new Result();
+    }
+
+    /**
+     * 19、邻里党群-话题参与趋势
+     *      当isFirst为true时,根据 customerId+monthId 先删后增
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *      table:screen_kc_topic_trend_grid_monthly
+     *
+     * @param externalAppRequestParam
+     * @param formDTO
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    @ExternalAppRequestAuth
+    @PostMapping("group/topictrend")
+    public Result groupTopicTrend(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcGroupTopicTrendFormDTO> formDTO) {
+        kcScreenCollService.insertGroupTopicTrend(formDTO, externalAppRequestParam.getCustomerId());
+        return new Result();
+    }
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/AgencyScoreDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/AgencyScoreDao.java
index d97a697f7b..fa9ae610f4 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/AgencyScoreDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/AgencyScoreDao.java
@@ -51,7 +51,7 @@ public interface AgencyScoreDao extends BaseDao<AgencyScoreEntity> {
      * @author zxc
      * @date 2020/9/2 15:47
      */
-    void deleteOldRecord(@Param("customerId") String customerId, @Param("monthId")String monthId, @Param("dataType")String dataType);
+    Integer deleteOldRecord(@Param("customerId") String customerId, @Param("monthId")String monthId, @Param("dataType")String dataType,@Param("delNum")Integer delNum);
 
     /**
      * @Description  查询【fact_index_agency_score】相关信息
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/AgencySubScoreDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/AgencySubScoreDao.java
index 959b5649c4..970b671a7f 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/AgencySubScoreDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/AgencySubScoreDao.java
@@ -46,62 +46,10 @@ public interface AgencySubScoreDao extends BaseDao<AgencyScoreEntity> {
     /**
      * @param customerId
      * @param monthId
-     * @param indexCode
      * @Description 删除旧记录
      * @author zxc
      * @date 2020/9/2 15:47
      */
-    void deleteOldRecord(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("indexCode") String indexCode, @Param("dataType") String dataType);
+    Integer deleteOldRecord(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("dataType") String dataType,@Param("delNum")Integer delNum);
 
-    /**
-     * @param customerId
-     * @param monthId
-     * @Description 查询【fact_index_agency_score】相关信息
-     * @author zxc
-     * @date 2020/9/1 9:41 上午
-     */
-    List<AgencyScoreDTO> selectAgencyScoreInfo(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("dataType") String dataType);
-
-    /**
-     * @param customerId
-     * @param monthId
-     * @Description 区下级街道得分平均值
-     * @author zxc
-     * @date 2020/8/31 1:51 下午
-     */
-    List<SubAgencyScoreAvgResultDTO> selectAgencyScoreAvg(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("indexCode") String indexCode, @Param("dataType") String dataType);
-
-
-    /**
-     * 根据入参查询  区/街道相关分数表 记录
-     *
-     * @param customerId
-     * @param monthId
-     * @return java.util.List<com.epmet.dto.indexcal.AgencyScoreDTO>
-     * @Author zhangyong
-     * @Date 10:43 2020-09-03
-     **/
-    List<AgencyScoreDTO> selectListAgencyScore(@Param("customerId") String customerId, @Param("monthId") String monthId);
-
-    /**
-     * 批量插入区/街道相关分数表
-     *
-     * @param list
-     * @param customerId
-     * @return void
-     * @Author zhangyong
-     * @Date 11:11 2020-09-04
-     **/
-    void batchInsertAgencyScoreData(@Param("list") List<AgencyScoreEntity> list, @Param("customerId") String customerId);
-
-    /**
-     * 根据入参查询  区/街道相关分数表id
-     *
-     * @param customerId
-     * @param monthId
-     * @return java.util.List<java.lang.String>
-     * @Author zhangyong
-     * @Date 10:43 2020-09-03
-     **/
-    List<String> selectListAgencyId(@Param("customerId") String customerId, @Param("monthId") String monthId);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/CommunityScoreDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/CommunityScoreDao.java
index ab1439481e..4df07097d9 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/CommunityScoreDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/CommunityScoreDao.java
@@ -50,7 +50,7 @@ public interface CommunityScoreDao extends BaseDao<FactIndexCommunityScoreEntity
      * @author zxc
      * @date 2020/9/1 9:03 上午
      */
-    void deleteOldRecord(@Param("customerId") String customerId,@Param("monthId")String monthId);
+    Integer deleteOldRecord(@Param("customerId") String customerId,@Param("monthId")String monthId,@Param("delNum")Integer delNum);
 
     /**
      * @Description  查询社区相关信息
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/CommunitySubScoreDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/CommunitySubScoreDao.java
index 9caf146b4d..7107d29e8c 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/CommunitySubScoreDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/CommunitySubScoreDao.java
@@ -50,56 +50,6 @@ public interface CommunitySubScoreDao extends BaseDao<FactIndexCommunityScoreEnt
      * @author zxc
      * @date 2020/9/1 9:03 上午
      */
-    void deleteOldRecord(@Param("customerId") String customerId, @Param("monthId") String monthId);
+    Integer deleteOldRecord(@Param("customerId") String customerId, @Param("monthId") String monthId,@Param("delNum")Integer delNum);
 
-    /**
-     * @param customerId
-     * @param monthId
-     * @Description 查询社区相关信息
-     * @author zxc
-     * @date 2020/9/1 9:41 上午
-     */
-    List<FactIndexCommunityScoreDTO> selectCommunityInfo(@Param("customerId") String customerId, @Param("monthId") String monthId);
-
-    /**
-     * 根据入参查询  查询社区相关信息
-     *
-     * @param customerId
-     * @param monthId
-     * @return java.util.List<com.epmet.dto.screen.FactIndexCommunityScoreDTO>
-     * @Author zhangyong
-     * @Date 10:43 2020-09-03
-     **/
-    List<FactIndexCommunityScoreDTO> selectListCommunityScore(@Param("customerId") String customerId, @Param("monthId") String monthId);
-
-    /**
-     * @param customerId
-     * @param monthId
-     * @Description 街道下级所有社区得分平均值
-     * @author zxc
-     * @date 2020/8/31 1:51 下午
-     */
-    List<SubCommunityAvgResultDTO> selectSubCommAvgScore(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("indexCode") String indexCode);
-
-    /**
-     * 批量插入 社区相关分数表
-     *
-     * @param list
-     * @param customerId
-     * @return void
-     * @Author zhangyong
-     * @Date 11:11 2020-09-04
-     **/
-    void batchInsertCommunityScoreData(@Param("list") List<FactIndexCommunityScoreEntity> list, @Param("customerId") String customerId);
-
-    /**
-     * 根据入参查询  查询社区id
-     *
-     * @param customerId
-     * @param monthId
-     * @return java.util.List<java.util.String>
-     * @Author zhangyong
-     * @Date 10:43 2020-09-03
-     **/
-    List<String> selectListCommunityId(@Param("customerId") String customerId, @Param("monthId") String monthId);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/CpcScoreDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/CpcScoreDao.java
index f4aac59361..c03786ecfe 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/CpcScoreDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/CpcScoreDao.java
@@ -78,9 +78,9 @@ public interface CpcScoreDao extends BaseDao<CpcScoreEntity> {
      **/
     BigDecimal selectGridJoinIssueAvgValue(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("gridId") String gridId);
 
-    int deleteByMonthId(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("indexCode") String indexCode);
+    int deleteByMonthId(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("indexCode") String indexCode, @Param("deleteSize") Integer deleteSize, @Param("isTotal") String isTotal);
 
-    List<CpcScoreEntity> getPartScore(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("allParentCode") String allParentCode);
+    List<CpcScoreEntity> getPartScore(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("allParentCode") String allParentCode, @Param("offset") int offset, @Param("pageSize") int pageSize);
 
     int insertBatch(@Param("list") Collection<CpcScoreEntity> values);
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/CpcSubScoreDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/CpcSubScoreDao.java
index 54226d0cc7..cb9b840d60 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/CpcSubScoreDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/CpcSubScoreDao.java
@@ -79,7 +79,7 @@ public interface CpcSubScoreDao extends BaseDao<CpcScoreEntity> {
      **/
     BigDecimal selectGridJoinIssueAvgValue(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("gridId") String gridId);
 
-    int deleteByMonthId(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("allParentCode") String allParentCode);
+    int deleteByMonthId(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("allParentCode") String allParentCode, @Param("deleteSize") Integer deleteSize);
 
     List<CpcScoreEntity> getPartScore(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("allParentCode") String allParentCode);
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/DeptScoreDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/DeptScoreDao.java
index 4be461b59a..c236c31e6c 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/DeptScoreDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/DeptScoreDao.java
@@ -18,6 +18,8 @@
 package com.epmet.dao.evaluationindex.indexcal;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.indexcal.CalculateCommonFormDTO;
+import com.epmet.dto.indexcal.DeotScore;
 import com.epmet.dto.indexcal.SubAgencyScoreAvgResultDTO;
 import com.epmet.dto.indexcal.DeptScoreDTO;
 import com.epmet.entity.evaluationindex.indexcal.DeptScoreEntity;
@@ -45,17 +47,6 @@ public interface DeptScoreDao extends BaseDao<DeptScoreEntity> {
      **/
     List<DeptScoreDTO> selectListDeptScore(@Param("customerId")String customerId, @Param("monthId")String monthId);
 
-    /**
-     * 批量插入 区直部门分值表
-     *
-     * @param list
-     * @param customerId
-     * @return void
-     * @Author zhangyong
-     * @Date 11:11 2020-09-04
-     **/
-    void batchInsertDeptScoreData(@Param("list") List<DeptScoreEntity> list, @Param("customerId")String customerId);
-
     /**
      * 根据入参查询 区直部门分值表id
      * @param customerId
@@ -79,12 +70,34 @@ public interface DeptScoreDao extends BaseDao<DeptScoreEntity> {
 
     /**
      * @return int
-     * @param customerId
-     * @param monthId
-     * @param deptId
+     * @param customerId 客户id
+     * @param monthId  月id
+     * @param indexCode 不必填
+     * @param  deleteSize
      * @author yinzuomei
-     * @description
+     * @description 根据客户id+monthId,删除这个月某个指标所有的数据  一次至多删除50条
      * @Date 2020/9/7 14:30
      **/
-    int deleteByDeptIdAndMonthId(@Param("customerId") String customerId, @Param("monthId")String monthId,@Param("deptId") String deptId);
+    int deleteByDeptIdAndMonthId(@Param("customerId") String customerId,
+                                 @Param("monthId")String monthId,
+                                 @Param("indexCode") String indexCode,
+                                 @Param("deleteSize") Integer deleteSize);
+
+    /**
+     * @return int
+     * @param deptScoreEntityList
+     * @author yinzuomei
+     * @description 批量插入计算结果
+     * @Date 2020/9/10 10:40
+     **/
+    int insertBatchEntity(@Param("list") List<DeptScoreEntity> deptScoreEntityList);
+
+    /**
+     * @return java.util.List<com.epmet.dto.indexcal.DeptScoreDTO>
+     * @param formDTO
+     * @author yinzuomei
+     * @description 查询每个部门下所有的指标对应的分值
+     * @Date 2020/9/10 18:07
+     **/
+    List<DeotScore> selectList(CalculateCommonFormDTO formDTO);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/DeptSubScoreDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/DeptSubScoreDao.java
index e084506452..fe388c6b6b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/DeptSubScoreDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/DeptSubScoreDao.java
@@ -18,12 +18,11 @@
 package com.epmet.dao.evaluationindex.indexcal;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dto.indexcal.DeptScoreDTO;
-import com.epmet.dto.indexcal.SubAgencyScoreAvgResultDTO;
-import com.epmet.entity.evaluationindex.indexcal.DeptScoreEntity;
+import com.epmet.entity.evaluationindex.indexcal.DeptSubScoreEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import javax.annotation.security.PermitAll;
 import java.util.List;
 
 /**
@@ -33,60 +32,29 @@ import java.util.List;
  * @since v1.0.0 2020-09-02
  */
 @Mapper
-public interface DeptSubScoreDao extends BaseDao<DeptScoreEntity> {
+public interface DeptSubScoreDao extends BaseDao<DeptSubScoreEntity> {
 
     /**
-     * 根据入参查询 区直部门分值表 记录
-     *
-     * @param customerId
-     * @param monthId
-     * @return java.util.List<com.epmet.dto.indexcal.DeptScoreDTO>
-     * @Author zhangyong
-     * @Date 10:43 2020-09-03
-     **/
-    List<DeptScoreDTO> selectListDeptScore(@Param("customerId") String customerId, @Param("monthId") String monthId);
-
-    /**
-     * 批量插入 区直部门分值表
-     *
-     * @param list
-     * @param customerId
-     * @return void
-     * @Author zhangyong
-     * @Date 11:11 2020-09-04
-     **/
-    void batchInsertDeptScoreData(@Param("list") List<DeptScoreEntity> list, @Param("customerId") String customerId);
-
-    /**
-     * 根据入参查询 区直部门分值表id
-     *
-     * @param customerId
-     * @param monthId
-     * @return java.lang.String
-     * @Author zhangyong
-     * @Date 10:43 2020-09-03
+     * @param insertDeptSubList
+     * @return int
+     * @author yinzuomei
+     * @description 批量插入计算结果 五级指标分数值
+     * @Date 2020/9/10 10:39
      **/
-    List<String> selectListDeptId(@Param("customerId") String customerId, @Param("monthId") String monthId);
-
-
-    /**
-     * @param customerId
-     * @param monthId
-     * @param indexCode
-     * @Description 所有直属部门治理能力平均值
-     * @author zxc
-     * @date 2020/9/4 10:53 上午
-     */
-    List<SubAgencyScoreAvgResultDTO> selectGovernDeptScoreAvg(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("indexCode") String indexCode);
+    int insertBatchEntity(@Param("list") List<DeptSubScoreEntity> insertDeptSubList);
 
     /**
      * @param customerId
      * @param monthId
-     * @param deptId
+     * @param allParentIndexCode
+     * @param deleteSize         一次至多删除XX条记录
      * @return int
      * @author yinzuomei
-     * @description
-     * @Date 2020/9/7 14:30
+     * @description 批量删除
+     * @Date 2020/9/10 12:28
      **/
-    int deleteByDeptIdAndMonthId(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("deptId") String deptId);
+    int deleteBatches(@Param("customerId") String customerId,
+                                 @Param("monthId") String monthId,
+                                 @Param("allParentIndexCode") String allParentIndexCode,
+                                 @Param("deleteSize") Integer deleteSize);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/GridScoreDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/GridScoreDao.java
index b4db5f05f9..e4eef189fd 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/GridScoreDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/GridScoreDao.java
@@ -40,16 +40,16 @@ public interface GridScoreDao extends BaseDao<GridScoreEntity> {
      * @param customerId
      * @param monthId
      * @param indexCode
-     * @param isTotal 1：总分；0不是
+     * @param deleteSize
      * @return int
      * @author yinzuomei
      * @description
      * @Date 2020/8/31 14:00
      **/
-    int deleteByCusAndMonthId(@Param("customerId") String customerId,
+    int deleteBatches(@Param("customerId") String customerId,
                               @Param("monthId") String monthId,
                               @Param("indexCode") String indexCode,
-                              @Param("isTotal") String isTotal);
+                              @Param("deleteSize") Integer deleteSize);
 
     /**
      * @return int
@@ -58,7 +58,7 @@ public interface GridScoreDao extends BaseDao<GridScoreEntity> {
      * @description
      * @Date 2020/8/31 14:01
      **/
-    int insertBatches(List<GridScoreEntity> gridScoreEntityList);
+    int insertBatches(@Param("list")List<GridScoreEntity> gridScoreEntityList);
 
     /**
      * @return java.util.List<com.epmet.dto.indexcal.GridScoreDTO>
@@ -98,15 +98,5 @@ public interface GridScoreDao extends BaseDao<GridScoreEntity> {
      **/
     List<String> selectListGridId(@Param("customerId")String customerId, @Param("monthId")String monthId);
 
-    /**
-     * 批量插入 网格相关分值表
-     *
-     * @param list
-     * @param customerId
-     * @return void
-     * @Author zhangyong
-     * @Date 11:11 2020-09-04
-     **/
-    void batchInsertGridScoreData(@Param("list") List<FactIndexGridScoreDTO> list,@Param("customerId")String customerId);
 
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/GridSubScoreDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/GridSubScoreDao.java
index e0cf724899..1005fcf781 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/GridSubScoreDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/GridSubScoreDao.java
@@ -18,11 +18,7 @@
 package com.epmet.dao.evaluationindex.indexcal;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dto.indexcal.CalculateCommonFormDTO;
-import com.epmet.dto.indexcal.GridScoreDTO;
-import com.epmet.dto.screen.FactIndexGridScoreDTO;
-import com.epmet.dto.screen.result.SubGridAvgResultDTO;
-import com.epmet.entity.evaluationindex.indexcal.GridScoreEntity;
+import com.epmet.entity.evaluationindex.indexcal.GridSubScoreEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -35,80 +31,28 @@ import java.util.List;
  * @since v1.0.0 2020-08-31
  */
 @Mapper
-public interface GridSubScoreDao extends BaseDao<GridScoreEntity> {
+public interface GridSubScoreDao extends BaseDao<GridSubScoreEntity> {
     /**
-     * @param customerId
-     * @param monthId
-     * @param indexCode
-     * @param isTotal    1：总分；0不是
-     * @return int
-     * @author yinzuomei
-     * @description
-     * @Date 2020/8/31 14:00
-     **/
-    int deleteByCusAndMonthId(@Param("customerId") String customerId,
-                              @Param("monthId") String monthId,
-                              @Param("indexCode") String indexCode,
-                              @Param("isTotal") String isTotal);
-
-    /**
-     * @param gridScoreEntityList
+     * @param gridSubScoreEntityList
      * @return int
      * @author yinzuomei
      * @description
      * @Date 2020/8/31 14:01
      **/
-    int insertBatches(List<GridScoreEntity> gridScoreEntityList);
-
-    /**
-     * @param formDTO
-     * @return java.util.List<com.epmet.dto.indexcal.GridScoreDTO>
-     * @author yinzuomei
-     * @description
-     * @Date 2020/8/31 16:42
-     **/
-    List<GridScoreDTO> selectList(CalculateCommonFormDTO formDTO);
+    int insertBatches(@Param("list") List<GridSubScoreEntity> gridSubScoreEntityList);
 
     /**
      * @param customerId
      * @param monthId
-     * @Description 下属所有网格的平均值
-     * @author zxc
-     * @date 2020/8/28 3:20 下午
-     */
-    List<SubGridAvgResultDTO> selectSubGridAvgScore(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("indexCode") String indexCode);
-
-    /**
-     * 根据入参查询  网格相关分值记录
-     *
-     * @param customerId
-     * @param monthId
-     * @return java.util.List<com.epmet.dto.screen.FactIndexGridScoreDTO>
-     * @Author zhangyong
-     * @Date 10:43 2020-09-03
-     **/
-    List<FactIndexGridScoreDTO> selectListGridScore(@Param("customerId") String customerId, @Param("monthId") String monthId);
-
-    /**
-     * 根据入参查询  网格id
-     *
-     * @param customerId
-     * @param monthId
-     * @return java.util.List<java.util.String>
-     * @Author zhangyong
-     * @Date 10:43 2020-09-03
-     **/
-    List<String> selectListGridId(@Param("customerId") String customerId, @Param("monthId") String monthId);
-
-    /**
-     * 批量插入 网格相关分值表
-     *
-     * @param list
-     * @param customerId
-     * @return void
-     * @Author zhangyong
-     * @Date 11:11 2020-09-04
+     * @param allParentIndexCode
+     * @param deleteSize         一次至多删除XX条记录
+     * @return int
+     * @author yinzuomei
+     * @description 批量删除
+     * @Date 2020/9/10 13:36
      **/
-    void batchInsertGridScoreData(@Param("list") List<FactIndexGridScoreDTO> list, @Param("customerId") String customerId);
-
+    int deleteBatches(@Param("customerId") String customerId,
+                                 @Param("monthId") String monthId,
+                                 @Param("allParentIndexCode") String allParentIndexCode,
+                                 @Param("deleteSize") Integer deleteSize);
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/FactIndexPartyAblityCpcMonthlyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/FactIndexPartyAblityCpcMonthlyDao.java
index ffdc533581..824b7a04a1 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/FactIndexPartyAblityCpcMonthlyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/FactIndexPartyAblityCpcMonthlyDao.java
@@ -19,7 +19,6 @@ package com.epmet.dao.evaluationindex.indexcoll;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.indexcollect.form.GridPartyMemberDataDetailFormDTO;
-import com.epmet.dto.indexcollect.form.GridPartyMemberDataFormDTO;
 import com.epmet.entity.evaluationindex.indexcoll.FactIndexPartyAblityCpcMonthlyEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -46,7 +45,7 @@ public interface FactIndexPartyAblityCpcMonthlyDao extends BaseDao<FactIndexPart
      * @Date 10:52 2020-08-20
      **/
     int deleteFactIndexPartyAblityCpcMonthly(@Param("customerId") String customerId,
-                                              @Param("monthId") String monthId);
+                                             @Param("monthId") String monthId);
 
     /**
      * 1、党建能力-党员相关指标上报(按照月份)
@@ -58,9 +57,9 @@ public interface FactIndexPartyAblityCpcMonthlyDao extends BaseDao<FactIndexPart
      * @Date 10:52 2020-08-20
      **/
     int batchInsertFactIndexPartyAblityCpcMonthly(@Param("list") List<GridPartyMemberDataDetailFormDTO> list,
-                                                   @Param("customerId") String customerId);
+                                                  @Param("customerId") String customerId);
 
     List<Map<String, Object>> getCountByMonthId(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("offset") Integer offset, @Param("pageSize") Integer pageSize);
 
-    Map<String, Object> getExtremeValue(@Param("customerId") String customerId);
+    Map<String, Object> getExtremeValue(@Param("customerId") String customerId, @Param("monthId") String monthId);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java
index 0d1acd8cf6..56f6c9d5b4 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java
@@ -56,14 +56,14 @@ public interface ScreenCustomerAgencyDao extends BaseDao<ScreenCustomerAgencyEnt
     void batchInsertCustomerAgency(@Param("list") List<CustomerAgencyFormDTO> list, @Param("customerId")String customerId);
 
     /**
-     * 返回当前客户下，未匹配到的组织信息
+     * 返回当前客户下，未匹配到的 【社区级】 组织信息
      * @param customerId  客户id
      * @param agencyIds   组织id集合
      * @return java.util.List<com.epmet.entity.evaluationindex.screen.ScreenCustomerAgencyEntity>
      * @Author zhangyong
      * @Date 14:38 2020-09-04
      **/
-    List<ScreenCustomerAgencyEntity> selectListMismatcAgencyInfo(@Param("customerId")String customerId,  @Param("agencyIds") String[] agencyIds);
+    List<ScreenCustomerAgencyEntity> selectListMismatcCommunityAgencyInfo(@Param("customerId")String customerId,  @Param("agencyIds") String[] agencyIds);
 
     /**
      * 根据客户id，查询区/街道  组织名称、id
@@ -82,4 +82,15 @@ public interface ScreenCustomerAgencyDao extends BaseDao<ScreenCustomerAgencyEnt
      * @date 2020/9/8 3:36 下午
      */
     String selectPid(@Param("agencyId")String agencyId);
+
+    /**
+     * 返回当前客户下，未匹配到的 【乡（镇、街道）级、区县级】 组织信息
+     * @param customerId  客户id
+     * @param agencyIds   组织id集合
+     * @return java.util.List<com.epmet.entity.evaluationindex.screen.ScreenCustomerAgencyEntity>
+     * @Author zhangyong
+     * @Date 14:38 2020-09-04
+     **/
+    List<ScreenCustomerAgencyEntity> selectListMismatcStreetAndDistrictAgencyInfo(@Param("customerId")String customerId,  @Param("agencyIds") String[] agencyIds);
+
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenIndexDataMonthlyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenIndexDataMonthlyDao.java
index 760e7abc5f..925c5c728f 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenIndexDataMonthlyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenIndexDataMonthlyDao.java
@@ -62,11 +62,37 @@ public interface ScreenIndexDataMonthlyDao extends BaseDao<ScreenIndexDataMonthl
      * 获取今年的各月份的平均值
      * @param customerId
      * @param yearId
-     * @param month  做除法运算
+     * @param monthCount  (今年汇总的指数统计，的总月数)做除法运算
      * @return java.util.List<com.epmet.dto.screencoll.form.IndexDataMonthlyFormDTO>
      * @Author zhangyong
      * @Date 15:51 2020-09-04
      **/
     List<IndexDataMonthlyFormDTO> selectListIndexDataMonthlyByYear(@Param("customerId") String customerId,
-                                @Param("yearId") String yearId, @Param("month") String month);
+                                @Param("yearId") String yearId, @Param("monthCount") Integer monthCount);
+
+    /**
+     * 统计 今年，汇总了几个月的 指数统计
+     * @param customerId
+     * @param yearId
+     * @return java.lang.Integer
+     * @Author zhangyong
+     * @Date 18:04 2020-09-11
+     **/
+    Integer selectCountIndexDataMonthly(@Param("customerId") String customerId,
+                                        @Param("yearId") String yearId);
+
+    /**
+     * 批量删除月表数据
+     *    根据CUSTOMER_ID、MONTH_ID、ORG_TYPE进行查询，如果有数据，则先进行物理删除, 一次删除1000条
+     *
+     * @param customerId
+     * @param monthId
+     * @param orgType
+     * @return java.util.Integer
+     * @Author zhangyong
+     * @Date 10:52 2020-08-18
+     **/
+    Integer deleteIndexDataMonthlyByOrgType(@Param("customerId") String customerId,
+                                            @Param("monthId") String monthId,
+                                            @Param("orgType") String orgType);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcActSummaryDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcActSummaryDailyDao.java
new file mode 100644
index 0000000000..72e45ad0f8
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcActSummaryDailyDao.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.KcActSummaryFormDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenKcActSummaryDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * KC-活动各类总数(先根据customerId+dateId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcActSummaryDailyDao extends BaseDao<ScreenKcActSummaryDailyEntity> {
+
+    /**
+     * 根据customerId+dateId，清空数据
+     *
+     * @param customerId
+     * @param dateId  日期Id, 数据更新至：yyyyMMdd
+     * @return java.lang.Integer
+     * @Author zhangyong
+     * @Date 16:14 2020-09-09
+     **/
+    Integer deleteActSummary(@Param("customerId") String customerId,
+                             @Param("dateId") String dateId);
+
+    /**
+     * 批量插入
+     *
+     * @param list
+     * @param customerId
+     * @param dateId  日期Id, 数据更新至：yyyyMMdd
+     * @return void
+     * @Author zhangyong
+     * @Date 16:17 2020-09-09
+     **/
+    void batchInsertActSummary(@Param("list") List<KcActSummaryFormDTO> list, @Param("customerId")String customerId,
+                               @Param("dateId")String dateId);
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcActTrendMonthlyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcActTrendMonthlyDao.java
new file mode 100644
index 0000000000..49d63fec9c
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcActTrendMonthlyDao.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.KcActTrendFormDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenKcActTrendMonthlyEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * KC-活动(次数+时长)趋势(先根据customerId+monthId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcActTrendMonthlyDao extends BaseDao<ScreenKcActTrendMonthlyEntity> {
+
+    /**
+     * 按照customerId+monthId，清空数据
+     *
+     * @param customerId
+     * @param monthId    例:202008
+     * @return java.lang.Integer
+     * @Author zhangyong
+     * @Date 16:14 2020-09-09
+     **/
+    Integer deleteActTrend(@Param("customerId") String customerId,
+                           @Param("monthId") String monthId);
+
+    /**
+     * 批量插入
+     *
+     * @param list
+     * @param customerId
+     * @param monthId    例:202008
+     * @return void
+     * @Author zhangyong
+     * @Date 16:17 2020-09-09
+     **/
+    void batchInsertActTrend (@Param("list") List<KcActTrendFormDTO> list, @Param("customerId")String customerId,
+                              @Param("monthId")String monthId);
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcGroupDetailGridDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcGroupDetailGridDailyDao.java
new file mode 100644
index 0000000000..c94d1a0f14
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcGroupDetailGridDailyDao.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.KcGroupDetailFormDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenKcGroupDetailGridDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * KC-小组详情(先根据customerId+dateId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcGroupDetailGridDailyDao extends BaseDao<ScreenKcGroupDetailGridDailyEntity> {
+
+    /**
+     * 按照customerId+dateId，清空数据
+     *
+     * @param customerId
+     * @param dateId  日期Id, 数据更新至：yyyyMMdd
+     * @return java.lang.Integer
+     * @Author zhangyong
+     * @Date 16:14 2020-09-09
+     **/
+    Integer deleteGroupDetailGrid(@Param("customerId") String customerId,
+                                  @Param("dateId") String dateId);
+
+    /**
+     * 批量插入
+     *
+     * @param list
+     * @param customerId
+     * @param dateId  日期Id, 数据更新至：yyyyMMdd
+     * @return void
+     * @Author zhangyong
+     * @Date 16:17 2020-09-09
+     **/
+    void batchInsertGroupDetailGrid(@Param("list") List<KcGroupDetailFormDTO> list, @Param("customerId")String customerId,
+                                    @Param("dateId")String dateId);
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcGroupSummaryGridDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcGroupSummaryGridDailyDao.java
new file mode 100644
index 0000000000..e942f1d7d7
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcGroupSummaryGridDailyDao.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.KcGroupSummaryFormDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenKcGroupSummaryGridDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * KC-小组分析各类总数(先根据customerId+dateId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcGroupSummaryGridDailyDao extends BaseDao<ScreenKcGroupSummaryGridDailyEntity> {
+
+    /**
+     * 按照customerId+dateId，清空数据
+     *
+     * @param customerId
+     * @param dateId  日期Id, 数据更新至：yyyyMMdd
+     * @return java.lang.Integer
+     * @Author zhangyong
+     * @Date 16:14 2020-09-09
+     **/
+    Integer deleteGroupSummaryGrid(@Param("customerId") String customerId,
+                                   @Param("dateId") String dateId);
+
+    /**
+     * 批量插入
+     *
+     * @param list
+     * @param customerId
+     * @param dateId  日期Id, 数据更新至：yyyyMMdd
+     * @return void
+     * @Author zhangyong
+     * @Date 16:17 2020-09-09
+     **/
+    void batchInsertGroupSummaryGrid(@Param("list") List<KcGroupSummaryFormDTO> list, @Param("customerId")String customerId,
+                                     @Param("dateId")String dateId);
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcIssueSummaryGridDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcIssueSummaryGridDailyDao.java
new file mode 100644
index 0000000000..6e905f0865
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcIssueSummaryGridDailyDao.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.KcIssueSummaryFormDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenKcIssueSummaryGridDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * KC-议题分析(各类总数)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcIssueSummaryGridDailyDao extends BaseDao<ScreenKcIssueSummaryGridDailyEntity> {
+
+    /**
+     * 按照customerId+dateId，清空数据
+     *
+     * @param customerId
+     * @param dateId  日期Id, 数据更新至：yyyyMMdd
+     * @return java.util.Integer
+     * @Author zhangyong
+     * @Date 16:14 2020-09-09
+     **/
+    Integer deleteIssueSummaryGrid(@Param("customerId") String customerId,
+                                   @Param("dateId") String dateId);
+
+    /**
+     * 批量插入
+     *
+     * @param list
+     * @param customerId
+     * @param dateId  日期Id, 数据更新至：yyyyMMdd
+     * @return void
+     * @Author zhangyong
+     * @Date 16:17 2020-09-09
+     **/
+    void batchInsertIssueSummaryGrid(@Param("list") List<KcIssueSummaryFormDTO> list, @Param("customerId")String customerId,
+                                     @Param("dateId")String dateId);
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcIssueTrendGridMonthlyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcIssueTrendGridMonthlyDao.java
new file mode 100644
index 0000000000..d6b2db2ef3
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcIssueTrendGridMonthlyDao.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.KcIssueTrendFormDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenKcIssueTrendGridMonthlyEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * KC-议题参与趋势(每天上报当前月)customerId+monthId先删后增
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcIssueTrendGridMonthlyDao extends BaseDao<ScreenKcIssueTrendGridMonthlyEntity> {
+
+    /**
+     * 按照customerId+monthId，清空数据
+     *
+     * @param customerId
+     * @param monthId   例：202008
+     * @return java.lang.Integer
+     * @Author zhangyong
+     * @Date 16:14 2020-09-09
+     **/
+    Integer deleteIssueTrendGrid(@Param("customerId") String customerId,
+                                  @Param("monthId") String monthId);
+
+    /**
+     * 批量插入
+     *
+     * @param list
+     * @param customerId
+     * @param monthId    例：202008
+     * @return void
+     * @Author zhangyong
+     * @Date 16:17 2020-09-09
+     **/
+    void batchInsertIssueTrendGrid(@Param("list") List<KcIssueTrendFormDTO> list, @Param("customerId")String customerId,
+                                   @Param("monthId")String monthId);
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcNewsCategoryAnalysisDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcNewsCategoryAnalysisDao.java
new file mode 100644
index 0000000000..48be92ba09
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcNewsCategoryAnalysisDao.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.KcNewsCategoryAnalysisFormDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenKcNewsCategoryAnalysisEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * KC-新闻-按类别统计(先根据customerId+dateId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcNewsCategoryAnalysisDao extends BaseDao<ScreenKcNewsCategoryAnalysisEntity> {
+
+    /**
+     * 按照customerId+dateId，清空数据
+     *
+     * @param customerId
+     * @param dateId  日期Id, 数据更新至：yyyyMMdd
+     * @return java.lang.Integer
+     * @Author zhangyong
+     * @Date 16:14 2020-09-09
+     **/
+    Integer deleteNewsCategoryAnalysis(@Param("customerId") String customerId,
+                                       @Param("dateId") String dateId);
+
+    /**
+     * 批量插入
+     *
+     * @param list
+     * @param customerId
+     * @param dateId  日期Id, 数据更新至：yyyyMMdd
+     * @return void
+     * @Author zhangyong
+     * @Date 16:17 2020-09-09
+     **/
+    void batchInsertNewsCategoryAnalysis(@Param("list") List<KcNewsCategoryAnalysisFormDTO> list, @Param("customerId")String customerId,
+                                         @Param("dateId")String dateId);
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcNewsRankDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcNewsRankDao.java
new file mode 100644
index 0000000000..37d7e0e31e
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcNewsRankDao.java
@@ -0,0 +1,59 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.KcNewsHotRankFormDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenKcNewsRankEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * KC-热点新闻排行-(先根据customerId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcNewsRankDao extends BaseDao<ScreenKcNewsRankEntity> {
+
+    /**
+     * 按照customerId，清空数据
+     *
+     * @param customerId
+     * @return java.lang.Integer
+     * @Author zhangyong
+     * @Date 16:14 2020-09-09
+     **/
+    Integer deleteNewsRank(@Param("customerId") String customerId);
+
+    /**
+     * 批量插入
+     *
+     * @param list
+     * @param customerId
+     * @param dateId  日期Id, 数据更新至：yyyyMMdd
+     * @return void
+     * @Author zhangyong
+     * @Date 16:17 2020-09-09
+     **/
+    void batchInsertNewsRank(@Param("list") List<KcNewsHotRankFormDTO> list, @Param("customerId")String customerId,
+                             @Param("dateId")String dateId);
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcNewsSummaryDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcNewsSummaryDailyDao.java
new file mode 100644
index 0000000000..ca4414aaf6
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcNewsSummaryDailyDao.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.KcNewsSummaryFormDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenKcNewsSummaryDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * KC-新闻-各类总数(先根据customerId+dateId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcNewsSummaryDailyDao extends BaseDao<ScreenKcNewsSummaryDailyEntity> {
+
+    /**
+     * 按照customerId+dateId，清空数据
+     *
+     * @param customerId
+     * @param dateId  日期Id, 数据更新至：yyyyMMdd
+     * @return java.lang.Integer
+     * @Author zhangyong
+     * @Date 16:14 2020-09-09
+     **/
+    Integer deleteNewsSummary(@Param("customerId") String customerId,
+                              @Param("dateId") String dateId);
+
+    /**
+     * 批量插入
+     *
+     * @param list
+     * @param customerId
+     * @param dateId  日期Id, 数据更新至：yyyyMMdd
+     * @return void
+     * @Author zhangyong
+     * @Date 16:17 2020-09-09
+     **/
+    void batchInsertNewsSummary(@Param("list") List<KcNewsSummaryFormDTO> list, @Param("customerId")String customerId,
+                                @Param("dateId")String dateId);
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcNewsTrendMonthlyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcNewsTrendMonthlyDao.java
new file mode 100644
index 0000000000..26c018f6fb
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcNewsTrendMonthlyDao.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.KcNewsTrendFormDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenKcNewsTrendMonthlyEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * KC-新闻参与趋势-(先根据customerId+monthId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcNewsTrendMonthlyDao extends BaseDao<ScreenKcNewsTrendMonthlyEntity> {
+
+    /**
+     * 按照customerId+monthId，清空数据
+     *
+     * @param customerId
+     * @param monthId    例:202008
+     * @return java.lang.Integer
+     * @Author zhangyong
+     * @Date 16:14 2020-09-09
+     **/
+    Integer deleteNewsTrend(@Param("customerId") String customerId,
+                            @Param("monthId") String monthId);
+
+    /**
+     * 批量插入
+     *
+     * @param list
+     * @param customerId
+     * @param monthId    例:202008
+     * @return void
+     * @Author zhangyong
+     * @Date 16:17 2020-09-09
+     **/
+    void batchInsertNewsTrend(@Param("list") List<KcNewsTrendFormDTO> list, @Param("customerId")String customerId,
+                              @Param("monthId")String monthId);
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcPlatformSummaryDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcPlatformSummaryDailyDao.java
new file mode 100644
index 0000000000..7762c772bb
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcPlatformSummaryDailyDao.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.KcHomePageFormDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenKcPlatformSummaryDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * KC-平台各汇总值(先根据customerId+dateId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcPlatformSummaryDailyDao extends BaseDao<ScreenKcPlatformSummaryDailyEntity> {
+
+    /**
+     * 按照customerId+dateId，清空数据
+     *
+     * @param customerId
+     * @param dateId  日期Id, 数据更新至：yyyyMMdd
+     * @return java.util.Integer
+     * @Author zhangyong
+     * @Date 16:14 2020-09-09
+     **/
+    Integer deletePlatFormSummary(@Param("customerId") String customerId,
+                                  @Param("dateId") String dateId);
+
+    /**
+     * 批量插入
+     *
+     * @param list
+     * @param customerId
+     * @param dateId  日期Id, 数据更新至：yyyyMMdd
+     * @return void
+     * @Author zhangyong
+     * @Date 16:17 2020-09-09
+     **/
+    void batchInsertPlatFormSummary(@Param("list") List<KcHomePageFormDTO> list, @Param("customerId")String customerId,
+                                    @Param("dateId")String dateId);
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcProjectCategoryGridDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcProjectCategoryGridDailyDao.java
new file mode 100644
index 0000000000..2f8e9236b0
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcProjectCategoryGridDailyDao.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.KcCategorySummaryFormDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenKcProjectCategoryGridDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * KC-项目按分类统计上报总数(先根据customerId+dateId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcProjectCategoryGridDailyDao extends BaseDao<ScreenKcProjectCategoryGridDailyEntity> {
+
+    /**
+     * 按照customerId+dateId，清空数据
+     *
+     * @param customerId
+     * @param dateId  日期Id, 数据更新至：yyyyMMdd
+     * @return java.lang.Integer
+     * @Author zhangyong
+     * @Date 16:14 2020-09-09
+     **/
+    Integer deleteCategoryGrid(@Param("customerId") String customerId,
+                               @Param("dateId") String dateId);
+
+    /**
+     * 批量插入
+     *
+     * @param list
+     * @param customerId
+     * @param dateId  日期Id, 数据更新至：yyyyMMdd
+     * @return void
+     * @Author zhangyong
+     * @Date 16:17 2020-09-09
+     **/
+    void batchInsertCategoryGrid(@Param("list") List<KcCategorySummaryFormDTO> list, @Param("customerId")String customerId,
+                                 @Param("dateId")String dateId);
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcProjectSatisGridMonthlyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcProjectSatisGridMonthlyDao.java
new file mode 100644
index 0000000000..c2bbdf98e8
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcProjectSatisGridMonthlyDao.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.KcProjectSatisanalysisFormDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenKcProjectSatisGridMonthlyEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * KC-项目满意度分析(customerId+monthId先删除记录，再插入)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcProjectSatisGridMonthlyDao extends BaseDao<ScreenKcProjectSatisGridMonthlyEntity> {
+
+    /**
+     * 按照customerId+monthId，清空数据
+     *
+     * @param customerId
+     * @param monthId    例: 202008
+     * @return java.lang.Integer
+     * @Author zhangyong
+     * @Date 16:14 2020-09-09
+     **/
+    Integer deleteProjectSatisGrid(@Param("customerId") String customerId,
+                                   @Param("monthId") String monthId);
+
+    /**
+     * 批量插入
+     *
+     * @param list
+     * @param customerId
+     * @param monthId    例: 202008
+     * @return void
+     * @Author zhangyong
+     * @Date 16:17 2020-09-09
+     **/
+    void batchInsertProjectSatisGrid(@Param("list") List<KcProjectSatisanalysisFormDTO> list, @Param("customerId")String customerId,
+                                     @Param("monthId")String monthId);
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcProjectSummaryGridDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcProjectSummaryGridDailyDao.java
new file mode 100644
index 0000000000..cac89d10c5
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcProjectSummaryGridDailyDao.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.KcProjectSummaryFormDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenKcProjectSummaryGridDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * KC-项目分析(各类总数先根据customerId+dateId删除，后插入)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcProjectSummaryGridDailyDao extends BaseDao<ScreenKcProjectSummaryGridDailyEntity> {
+
+    /**
+     * 按照customerId+dateId，清空数据
+     *
+     * @param customerId
+     * @param dateId  日期Id, 数据更新至：yyyyMMdd
+     * @return java.lang.Integer
+     * @Author zhangyong
+     * @Date 16:14 2020-09-09
+     **/
+    Integer deleteProjectSummary(@Param("customerId") String customerId,
+                                 @Param("dateId") String dateId);
+
+    /**
+     * 批量插入
+     *
+     * @param list
+     * @param customerId
+     * @param dateId  日期Id, 数据更新至：yyyyMMdd
+     * @return void
+     * @Author zhangyong
+     * @Date 16:17 2020-09-09
+     **/
+    void batchInsertProjectSummary(@Param("list") List<KcProjectSummaryFormDTO> list, @Param("customerId")String customerId,
+                                   @Param("dateId")String dateId);
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcTopicTrendGridMonthlyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcTopicTrendGridMonthlyDao.java
new file mode 100644
index 0000000000..66e554a9dc
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcTopicTrendGridMonthlyDao.java
@@ -0,0 +1,62 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.KcGroupTopicTrendFormDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenKcTopicTrendGridMonthlyEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * KC-话题参与趋势(先根据customerId+monthId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcTopicTrendGridMonthlyDao extends BaseDao<ScreenKcTopicTrendGridMonthlyEntity> {
+
+    /**
+     * 按照customerId+dateId，清空数据
+     *
+     * @param customerId
+     * @param monthId    例：202008
+     * @return java.lang.Integer
+     * @Author zhangyong
+     * @Date 16:14 2020-09-09
+     **/
+    Integer deleteTopicTrendGrid(@Param("customerId") String customerId,
+                                 @Param("monthId") String monthId);
+
+    /**
+     * 批量插入
+     *
+     * @param list
+     * @param customerId
+     * @param monthId    例：202008
+     * @return void
+     * @Author zhangyong
+     * @Date 16:17 2020-09-09
+     **/
+    void batchInsertTopicTrendGrid(@Param("list") List<KcGroupTopicTrendFormDTO> list, @Param("customerId")String customerId,
+                                   @Param("monthId")String monthId);
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcUserHeatRankGridDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcUserHeatRankGridDailyDao.java
new file mode 100644
index 0000000000..58ed6bf539
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcUserHeatRankGridDailyDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.evaluationindex.screen.ScreenKcUserHeatRankGridDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * KC-用户公益时长排名(先根据customerId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcUserHeatRankGridDailyDao extends BaseDao<ScreenKcUserHeatRankGridDailyEntity> {
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcUserSummaryDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcUserSummaryDailyDao.java
new file mode 100644
index 0000000000..bfaa371bf8
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcUserSummaryDailyDao.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.KcUserSummaryFormDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenKcUserSummaryDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * KC-用户分析(先根据customerId+dateId删除，后插入)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcUserSummaryDailyDao extends BaseDao<ScreenKcUserSummaryDailyEntity> {
+
+    /**
+     * 按照customerId+dateId，清空数据
+     *
+     * @param customerId
+     * @param dateId  日期Id, 数据更新至：yyyyMMdd
+     * @return java.lang.Integer
+     * @Author zhangyong
+     * @Date 16:14 2020-09-09
+     **/
+    Integer deleteUserSummary(@Param("customerId") String customerId,
+                              @Param("dateId") String dateId);
+
+    /**
+     * 批量插入
+     *
+     * @param list
+     * @param customerId
+     * @param dateId  日期Id, 数据更新至：yyyyMMdd
+     * @return void
+     * @Author zhangyong
+     * @Date 16:17 2020-09-09
+     **/
+    void batchInsertUserSummary(@Param("list") List<KcUserSummaryFormDTO> list, @Param("customerId")String customerId,
+                                @Param("dateId")String dateId);
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcUserTrendGridMonthlyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcUserTrendGridMonthlyDao.java
new file mode 100644
index 0000000000..a3bb44b7fa
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcUserTrendGridMonthlyDao.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.KcUserHeartRankFormDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenKcUserTrendGridMonthlyEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * KC-用户趋势分析(根据monthId+customerId先删后增)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcUserTrendGridMonthlyDao extends BaseDao<ScreenKcUserTrendGridMonthlyEntity> {
+
+    /**
+     * 根据monthId+customerId先删后增
+     *
+     * @param customerId
+     * @param monthId       例:202008
+     * @return java.lang.Integer
+     * @Author zhangyong
+     * @Date 16:14 2020-09-09
+     **/
+    Integer deleteUserTrendGrid(@Param("customerId") String customerId,
+                                @Param("monthId") String monthId);
+
+    /**
+     * 批量插入
+     *
+     * @param list
+     * @param customerId
+     * @param monthId       例:202008
+     * @return void
+     * @Author zhangyong
+     * @Date 16:17 2020-09-09
+     **/
+    void batchInsertUserTrendGrid(@Param("list") List<KcUserHeartRankFormDTO> list, @Param("customerId")String customerId,
+                                  @Param("monthId")String monthId);
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcVolunteerHeatRankGridDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcVolunteerHeatRankGridDailyDao.java
new file mode 100644
index 0000000000..3e0de5f451
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcVolunteerHeatRankGridDailyDao.java
@@ -0,0 +1,59 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.KcVolunteerHeartRankFormDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenKcVolunteerHeatRankGridDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * KC-志愿者公益时长排名(先根据customerId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcVolunteerHeatRankGridDailyDao extends BaseDao<ScreenKcVolunteerHeatRankGridDailyEntity> {
+
+    /**
+     * 按照customerId，清空数据
+     *
+     * @param customerId
+     * @return java.lang.Integer
+     * @Author zhangyong
+     * @Date 16:14 2020-09-09
+     **/
+    Integer deleteVolunteerHeatRankGrid(@Param("customerId") String customerId);
+
+    /**
+     * 批量插入
+     *
+     * @param list
+     * @param customerId
+     * @param dateId  日期Id, 数据更新至：yyyyMMdd
+     * @return void
+     * @Author zhangyong
+     * @Date 16:17 2020-09-09
+     **/
+    void batchInsertVolunteerHeatRankGrid(@Param("list") List<KcVolunteerHeartRankFormDTO> list, @Param("customerId")String customerId,
+                                          @Param("dateId")String dateId);
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcVolunteerSummaryDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcVolunteerSummaryDailyDao.java
new file mode 100644
index 0000000000..ae2d38d3e5
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenKcVolunteerSummaryDailyDao.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screencoll.form.KcVolunteerSummaryFormDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenKcVolunteerSummaryDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * KC-志愿者汇总(先根据customerId+dateId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Mapper
+public interface ScreenKcVolunteerSummaryDailyDao extends BaseDao<ScreenKcVolunteerSummaryDailyEntity> {
+
+    /**
+     * 按照customerId+dateId，清空数据
+     *
+     * @param customerId
+     * @param dateId  日期Id, 数据更新至：yyyyMMdd
+     * @return java.lang.Integer
+     * @Author zhangyong
+     * @Date 16:14 2020-09-09
+     **/
+    Integer deleteVolunteerSummary(@Param("customerId") String customerId,
+                                  @Param("dateId") String dateId);
+
+    /**
+     * 批量插入
+     *
+     * @param list
+     * @param customerId
+     * @param dateId  日期Id, 数据更新至：yyyyMMdd
+     * @return void
+     * @Author zhangyong
+     * @Date 16:17 2020-09-09
+     **/
+    void batchInsertVolunteerSummary(@Param("list") List<KcVolunteerSummaryFormDTO> list, @Param("customerId")String customerId,
+                                     @Param("dateId")String dateId);
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/AgencySubScoreEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/AgencySubScoreEntity.java
index a3e18f4b4f..2f1d277b46 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/AgencySubScoreEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/AgencySubScoreEntity.java
@@ -32,7 +32,7 @@ import java.math.BigDecimal;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName("fact_index_sub_agency_score")
+@TableName("fact_index_agency_sub_score")
 public class AgencySubScoreEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/CpcSubScoreEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/CpcSubScoreEntity.java
index e69c222258..2183f77502 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/CpcSubScoreEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/CpcSubScoreEntity.java
@@ -32,7 +32,7 @@ import java.math.BigDecimal;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName("fact_index_sub_cpc_score")
+@TableName("fact_index_cpc_sub_score")
 public class CpcSubScoreEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/DeptSubScoreEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/DeptSubScoreEntity.java
index 476f3c2568..db12edfeec 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/DeptSubScoreEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/DeptSubScoreEntity.java
@@ -32,7 +32,7 @@ import java.math.BigDecimal;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName("fact_index_sub_dept_score")
+@TableName("fact_index_dept_sub_score")
 public class DeptSubScoreEntity extends BaseEpmetEntity {
 
     private static final long serialVersionUID = 1L;
@@ -67,11 +67,6 @@ public class DeptSubScoreEntity extends BaseEpmetEntity {
      */
     private String monthId;
 
-    /**
-     * 1：总分；0不是；默认0
-     */
-    private String isTotal;
-
     /**
      * 分值
      */
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/GridSubScoreEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/GridSubScoreEntity.java
index ad99f92586..01f40a5ddd 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/GridSubScoreEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/GridSubScoreEntity.java
@@ -32,7 +32,7 @@ import java.math.BigDecimal;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName("fact_index_sub_grid_score")
+@TableName("fact_index_grid_sub_score")
 public class GridSubScoreEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcActSummaryDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcActSummaryDailyEntity.java
new file mode 100644
index 0000000000..1cda08cfa7
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcActSummaryDailyEntity.java
@@ -0,0 +1,76 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.evaluationindex.screen;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * KC-活动各类总数(先根据customerId+dateId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("screen_kc_act_summary_daily")
+public class ScreenKcActSummaryDailyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 数据更新至：yyyyMMdd
+     */
+	private String dateId;
+
+    /**
+     * 活动总数
+     */
+	private Integer actCount;
+
+    /**
+     * 志愿者总数
+     */
+	private Integer volunteerCount;
+
+    /**
+     * 参与人次
+     */
+	private Integer partiUserCount;
+
+    /**
+     * 发放积分
+     */
+	private Integer rewardPointCount;
+
+    /**
+     * 公益时长单位分钟
+     */
+	private Integer heartTime;
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcActTrendMonthlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcActTrendMonthlyEntity.java
new file mode 100644
index 0000000000..86c991a114
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcActTrendMonthlyEntity.java
@@ -0,0 +1,56 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.evaluationindex.screen;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * KC-活动(次数+时长)趋势(先根据customerId+monthId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("screen_kc_act_trend_monthly")
+public class ScreenKcActTrendMonthlyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 月id :yyyyMM
+     */
+	private String monthId;
+
+    /**
+     * 活动数量（本月举行的活动）
+     */
+	private Integer actCount;
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcGroupDetailGridDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcGroupDetailGridDailyEntity.java
new file mode 100644
index 0000000000..8247c51d97
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcGroupDetailGridDailyEntity.java
@@ -0,0 +1,101 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.evaluationindex.screen;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * KC-小组详情(先根据customerId+dateId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("screen_kc_group_detail_grid_daily")
+public class ScreenKcGroupDetailGridDailyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 数据更新至：yyyyMMdd
+     */
+	private String dateId;
+
+    /**
+     * 网格id
+     */
+	private String gridId;
+
+    /**
+     * 网格名称
+     */
+	private String gridName;
+
+    /**
+     * 网格所属的组织id
+     */
+	private String parentAgencyId;
+
+    /**
+     * 所有上级ID，用英文逗号分开 ？
+     */
+	private String allParentIds;
+
+    /**
+     * 小组id
+     */
+	private String groupId;
+
+    /**
+     * 群名称
+     */
+	private String groupName;
+
+    /**
+     * 群主名称
+     */
+	private String groupLeader;
+
+    /**
+     * 群成员数
+     */
+	private Integer memberCount;
+
+    /**
+     * 话题总数
+     */
+	private Integer topicCount;
+
+    /**
+     * 转为议题的话题数
+     */
+	private Integer shifitIssueCount;
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcGroupSummaryGridDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcGroupSummaryGridDailyEntity.java
new file mode 100644
index 0000000000..8f29a2829e
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcGroupSummaryGridDailyEntity.java
@@ -0,0 +1,96 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.evaluationindex.screen;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * KC-小组分析各类总数(先根据customerId+dateId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("screen_kc_group_summary_grid_daily")
+public class ScreenKcGroupSummaryGridDailyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 数据更新至：yyyyMMdd
+     */
+	private String dateId;
+
+    /**
+     * 网格id
+     */
+	private String gridId;
+
+    /**
+     * 网格名称
+     */
+	private String gridName;
+
+    /**
+     * 网格所属的组织id
+     */
+	private String parentAgencyId;
+
+    /**
+     * 所有上级ID，用英文逗号分开 ？
+     */
+	private String allParentIds;
+
+    /**
+     * 社群总数
+     */
+	private Integer groupCount;
+
+    /**
+     * 群成员总数
+     */
+	private Integer memberCount;
+
+    /**
+     * 话题数量
+     */
+	private Integer topicCount;
+
+    /**
+     * 话题参与量
+     */
+	private Integer partiCount;
+
+    /**
+     * 话题转议题总数
+     */
+	private Integer shiftIssueCount;
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcIssueSummaryGridDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcIssueSummaryGridDailyEntity.java
new file mode 100644
index 0000000000..2d22bf38b0
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcIssueSummaryGridDailyEntity.java
@@ -0,0 +1,126 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.evaluationindex.screen;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * KC-议题分析(各类总数)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("screen_kc_issue_summary_grid_daily")
+public class ScreenKcIssueSummaryGridDailyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 数据更新至：yyyyMMdd
+     */
+	private String dateId;
+
+    /**
+     * 网格id
+     */
+	private String gridId;
+
+    /**
+     * 网格名称
+     */
+	private String gridName;
+
+    /**
+     * 网格所属的组织id
+     */
+	private String parentAgencyId;
+
+    /**
+     * 所有上级ID，用英文逗号分开 ？
+     */
+	private String allParentIds;
+
+    /**
+     * 上报总数
+     */
+	private Integer reportCount;
+
+    /**
+     * 议题总数
+     */
+	private Integer issueCount;
+
+    /**
+     * 待审核数
+     */
+	private Integer pendingCount;
+
+    /**
+     * 已驳回数
+     */
+	private Integer rejectedCount;
+
+    /**
+     * 处理中数
+     */
+	private Integer processingCount;
+
+    /**
+     * 已关闭数
+     */
+	private Integer closedCount;
+
+    /**
+     * 议题浏览数
+     */
+	private Integer issueViewCount;
+
+    /**
+     * 表态数
+     */
+	private Integer voteCount;
+
+    /**
+     * 审核通过数 ？为了算议题效率
+     */
+	private Integer passedCount;
+
+    /**
+     * 转化成项目数 ？为了算议题效率
+     */
+	private Integer shiftToProjectCount;
+
+    /**
+     * 平均审核时间单位分钟  ？
+     */
+	private Integer avgAuditTime;
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcIssueTrendGridMonthlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcIssueTrendGridMonthlyEntity.java
new file mode 100644
index 0000000000..85f9cd9d2c
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcIssueTrendGridMonthlyEntity.java
@@ -0,0 +1,76 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.evaluationindex.screen;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * KC-议题参与趋势(每天上报当前月)customerId+monthId先删后增
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("screen_kc_issue_trend_grid_monthly")
+public class ScreenKcIssueTrendGridMonthlyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 月id :yyyyMM
+     */
+	private String monthId;
+
+    /**
+     * 网格id
+     */
+	private String gridId;
+
+    /**
+     * 网格名称
+     */
+	private String gridName;
+
+    /**
+     * 网格所属的组织id
+     */
+	private String parentAgencyId;
+
+    /**
+     * 所有上级ID，用英文逗号分开 ？
+     */
+	private String allParentIds;
+
+    /**
+     * 议题上报数（本月内上报的议题数量）
+     */
+	private Integer reportCount;
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcNewsCategoryAnalysisEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcNewsCategoryAnalysisEntity.java
new file mode 100644
index 0000000000..364a95575a
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcNewsCategoryAnalysisEntity.java
@@ -0,0 +1,81 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.evaluationindex.screen;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * KC-新闻-按类别统计(先根据customerId+dateId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("screen_kc_news_category_analysis")
+public class ScreenKcNewsCategoryAnalysisEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 数据更新至：yyyyMMdd
+     */
+	private String dateId;
+
+    /**
+     * 类别id
+     */
+	private String categoryId;
+
+    /**
+     * 分类名称
+     */
+	private String categoryName;
+
+    /**
+     * 新闻的数量
+     */
+	private Integer newsCount;
+
+    /**
+     * 阅读的数量
+     */
+	private Integer readCount;
+
+    /**
+     * 点赞的数量
+     */
+	private Integer likeCount;
+
+    /**
+     * 点踩的数量
+     */
+	private Integer disLikeCount;
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcNewsRankEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcNewsRankEntity.java
new file mode 100644
index 0000000000..5b41cfbe2f
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcNewsRankEntity.java
@@ -0,0 +1,66 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.evaluationindex.screen;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * KC-热点新闻排行-(先根据customerId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("screen_kc_news_rank")
+public class ScreenKcNewsRankEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 数据更新至：yyyyMMdd
+     */
+	private String dateId;
+
+    /**
+     * 新闻id
+     */
+	private String newsId;
+
+    /**
+     * 新闻标题
+     */
+	private String newsTitle;
+
+    /**
+     * 新闻热点值
+     */
+	private Integer hotCount;
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcNewsSummaryDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcNewsSummaryDailyEntity.java
new file mode 100644
index 0000000000..d344db9ad2
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcNewsSummaryDailyEntity.java
@@ -0,0 +1,71 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.evaluationindex.screen;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * KC-新闻-各类总数(先根据customerId+dateId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("screen_kc_news_summary_daily")
+public class ScreenKcNewsSummaryDailyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 数据更新至：yyyyMMdd
+     */
+	private String dateId;
+
+    /**
+     * 文章总数
+     */
+	private Integer newsCount;
+
+    /**
+     * 阅读量
+     */
+	private Integer readCount;
+
+    /**
+     * 点赞量
+     */
+	private Integer likeCount;
+
+    /**
+     * 评论量
+     */
+	private Integer commentCount;
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcNewsTrendMonthlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcNewsTrendMonthlyEntity.java
new file mode 100644
index 0000000000..548d34f284
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcNewsTrendMonthlyEntity.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.evaluationindex.screen;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * KC-新闻参与趋势-(先根据customerId+monthId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("screen_kc_news_trend_monthly")
+public class ScreenKcNewsTrendMonthlyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 月id :yyyyMM
+     */
+	private String monthId;
+
+    /**
+     * 阅读数量
+     */
+	private Integer readCount;
+
+    /**
+     * 参与数量
+     */
+	private Integer partiCount;
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcPlatformSummaryDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcPlatformSummaryDailyEntity.java
new file mode 100644
index 0000000000..2f9c5343c8
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcPlatformSummaryDailyEntity.java
@@ -0,0 +1,111 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.evaluationindex.screen;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * KC-平台各汇总值(先根据customerId+dateId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("screen_kc_platform_summary_daily")
+public class ScreenKcPlatformSummaryDailyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 数据更新至：yyyyMMdd
+     */
+	private String dateId;
+
+    /**
+     * 网格总数
+     */
+	private Integer gridCount;
+
+    /**
+     * 已开通网格数
+     */
+	private Integer openedGridCount;
+
+    /**
+     * 议题总数
+     */
+	private Integer issueCount;
+
+    /**
+     * 项目总数
+     */
+	private Integer projectCount;
+
+    /**
+     * 用户总数
+     */
+	private Integer userCount;
+
+    /**
+     * 党员用户
+     */
+	private Integer partyUserCount;
+
+    /**
+     * 社群总数
+     */
+	private Integer groupCount;
+
+    /**
+     * 话题总数
+     */
+	private Integer topicCount;
+
+    /**
+     * 新闻数量
+     */
+	private Integer newsCount;
+
+    /**
+     * 阅读数量
+     */
+	private Integer readCount;
+
+    /**
+     * 公益活动总数
+     */
+	private Integer actCount;
+
+    /**
+     * 志愿者总数
+     */
+	private Integer volunteerCount;
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcProjectCategoryGridDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcProjectCategoryGridDailyEntity.java
new file mode 100644
index 0000000000..3307b3dcfa
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcProjectCategoryGridDailyEntity.java
@@ -0,0 +1,86 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.evaluationindex.screen;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * KC-项目按分类统计上报总数(先根据customerId+dateId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("screen_kc_project_category_grid_daily")
+public class ScreenKcProjectCategoryGridDailyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 数据更新至：yyyyMMdd
+     */
+	private String dateId;
+
+    /**
+     * 网格id
+     */
+	private String gridId;
+
+    /**
+     * 网格名称
+     */
+	private String gridName;
+
+    /**
+     * 网格所属的组织id
+     */
+	private String parentAgencyId;
+
+    /**
+     * 所有上级ID，用英文逗号分开 ？
+     */
+	private String allParentIds;
+
+    /**
+     * 类别id
+     */
+	private String categoryId;
+
+    /**
+     * 分类名称
+     */
+	private String categoryName;
+
+    /**
+     * 项目数量
+     */
+	private Integer projectCount;
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcProjectSatisGridMonthlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcProjectSatisGridMonthlyEntity.java
new file mode 100644
index 0000000000..be5d16142e
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcProjectSatisGridMonthlyEntity.java
@@ -0,0 +1,86 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.evaluationindex.screen;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * KC-项目满意度分析(customerId+monthId先删除记录，再插入)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("screen_kc_project_satis_grid_monthly")
+public class ScreenKcProjectSatisGridMonthlyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 月id :yyyyMM
+     */
+	private String monthId;
+
+    /**
+     * 网格id
+     */
+	private String gridId;
+
+    /**
+     * 网格名称
+     */
+	private String gridName;
+
+    /**
+     * 网格所属的组织id
+     */
+	private String parentAgencyId;
+
+    /**
+     * 所有上级ID，用英文逗号分开 ？
+     */
+	private String allParentIds;
+
+    /**
+     * 非常满意项目总数
+     */
+	private Integer greatSatis;
+
+    /**
+     * 满意项目总数
+     */
+	private Integer goodSatis;
+
+    /**
+     * 不满意的项目总数
+     */
+	private Integer disSatis;
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcProjectSummaryGridDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcProjectSummaryGridDailyEntity.java
new file mode 100644
index 0000000000..85a387c49b
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcProjectSummaryGridDailyEntity.java
@@ -0,0 +1,111 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.evaluationindex.screen;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * KC-项目分析(各类总数先根据customerId+dateId删除，后插入)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("screen_kc_project_summary_grid_daily")
+public class ScreenKcProjectSummaryGridDailyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 数据更新至：yyyyMMdd
+     */
+	private String dateId;
+
+    /**
+     * 网格id
+     */
+	private String gridId;
+
+    /**
+     * 网格名称
+     */
+	private String gridName;
+
+    /**
+     * 网格所属的组织id
+     */
+	private String parentAgencyId;
+
+    /**
+     * 所有上级ID，用英文逗号分开 ？
+     */
+	private String allParentIds;
+
+    /**
+     * 项目总数
+     */
+	private Integer projectCount;
+
+    /**
+     * 处理中数
+     */
+	private Integer processingCount;
+
+    /**
+     * 已关闭数
+     */
+	private Integer closedCount;
+
+    /**
+     * 流转次数
+     */
+	private Integer moveCount;
+
+    /**
+     * 已结案数量
+     */
+	private Integer closedCaseCount;
+
+    /**
+     * 项目浏览数
+     */
+	private Integer projectViewCount;
+
+    /**
+     * 表态数
+     */
+	private Integer voteCount;
+
+    /**
+     * 平均结案时间 单位分钟 ？
+     */
+	private Integer avgClosedCaseTime;
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcTopicTrendGridMonthlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcTopicTrendGridMonthlyEntity.java
new file mode 100644
index 0000000000..0f0a5b4e6c
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcTopicTrendGridMonthlyEntity.java
@@ -0,0 +1,76 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.evaluationindex.screen;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * KC-话题参与趋势(先根据customerId+monthId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("screen_kc_topic_trend_grid_monthly")
+public class ScreenKcTopicTrendGridMonthlyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 月id :yyyyMM
+     */
+	private String monthId;
+
+    /**
+     * 网格id
+     */
+	private String gridId;
+
+    /**
+     * 网格名称
+     */
+	private String gridName;
+
+    /**
+     * 网格所属的组织id
+     */
+	private String parentAgencyId;
+
+    /**
+     * 所有上级ID，用英文逗号分开 ？
+     */
+	private String allParentIds;
+
+    /**
+     * 话题数量(所在月新增话题数)
+     */
+	private Integer topicCount;
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcUserHeatRankGridDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcUserHeatRankGridDailyEntity.java
new file mode 100644
index 0000000000..03f18a5709
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcUserHeatRankGridDailyEntity.java
@@ -0,0 +1,96 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.evaluationindex.screen;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * KC-用户公益时长排名(先根据customerId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("screen_kc_user_heat_rank_grid_daily")
+public class ScreenKcUserHeatRankGridDailyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 数据更新至：yyyyMMdd
+     */
+	private String dateId;
+
+    /**
+     * 网格id
+     */
+	private String gridId;
+
+    /**
+     * 网格名称
+     */
+	private String gridName;
+
+    /**
+     * 网格所属组织id
+     */
+	private String parentAgencyId;
+
+    /**
+     * 所有上级ID，用英文逗号分开 ？
+     */
+	private String allParentIds;
+
+    /**
+     * 用户id
+     */
+	private String userId;
+
+    /**
+     * 用户姓名
+     */
+	private String userName;
+
+    /**
+     * 1志愿者 0不是志愿者
+     */
+	private Integer volunteerFlag;
+
+    /**
+     * 爱心时长 单位分钟
+     */
+	private Integer heartTime;
+
+    /**
+     * 积分
+     */
+	private Integer points;
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcUserSummaryDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcUserSummaryDailyEntity.java
new file mode 100644
index 0000000000..6c47a97487
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcUserSummaryDailyEntity.java
@@ -0,0 +1,126 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.evaluationindex.screen;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * KC-用户分析(先根据customerId+dateId删除，后插入)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("screen_kc_user_summary_daily")
+public class ScreenKcUserSummaryDailyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 数据更新至：yyyyMMdd
+     */
+	private String dateId;
+
+    /**
+     * 网格id
+     */
+	private String gridId;
+
+    /**
+     * 网格名称
+     */
+	private String gridName;
+
+    /**
+     * 网格所属的组织id
+     */
+	private String parentAgencyId;
+
+    /**
+     * 所有上级ID，用英文逗号分开 ？
+     */
+	private String allParentIds;
+
+    /**
+     * 浏览用户（首页的用户总数，原型上首页是叫注册用户）
+     */
+	private Integer visitorCount;
+
+    /**
+     * 注册用户=居民数量
+     */
+	private Integer regUserCount;
+
+    /**
+     * 党员用户
+     */
+	private Integer partyUserCount;
+
+    /**
+     * 小于20岁的党员总人数
+     */
+	private Integer ageLevel1;
+
+    /**
+     * 20-30岁的党员总人数
+     */
+	private Integer ageLevel2;
+
+    /**
+     * 31-40岁的党员总人数
+     */
+	private Integer ageLevel3;
+
+    /**
+     * 41-50岁的党员总人数
+     */
+	private Integer ageLevel4;
+
+    /**
+     * 51-60岁的党员总人数
+     */
+	private Integer ageLevel5;
+
+    /**
+     * 60+岁的党员总人数
+     */
+	private Integer ageLevel6;
+
+    /**
+     * 党员中男性总人数
+     */
+	private Integer malePartyUserCount;
+
+    /**
+     * 党员中女性总人数
+     */
+	private Integer femalePartyUserCount;
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcUserTrendGridMonthlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcUserTrendGridMonthlyEntity.java
new file mode 100644
index 0000000000..70b51169da
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcUserTrendGridMonthlyEntity.java
@@ -0,0 +1,81 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.evaluationindex.screen;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * KC-用户趋势分析(根据monthId+customerId先删后增)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("screen_kc_user_trend_grid_monthly")
+public class ScreenKcUserTrendGridMonthlyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 月id :yyyyMM
+     */
+	private String monthId;
+
+    /**
+     * 网格id
+     */
+	private String gridId;
+
+    /**
+     * 网格名称
+     */
+	private String gridName;
+
+    /**
+     * 网格所属的组织id
+     */
+	private String parentAgencyId;
+
+    /**
+     * 所有上级ID，用英文逗号分开 ？
+     */
+	private String allParentIds;
+
+    /**
+     * 本月内新增用户数量
+     */
+	private Integer regUserCount;
+
+    /**
+     * 本月内新增党员数量
+     */
+	private Integer partyUserCount;
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcVolunteerHeatRankGridDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcVolunteerHeatRankGridDailyEntity.java
new file mode 100644
index 0000000000..a681c2bca0
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcVolunteerHeatRankGridDailyEntity.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.evaluationindex.screen;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * KC-志愿者公益时长排名(先根据customerId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("screen_kc_volunteer_heat_rank_grid_daily")
+public class ScreenKcVolunteerHeatRankGridDailyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 数据更新至：yyyyMMdd
+     */
+	private String dateId;
+
+    /**
+     * 网格id
+     */
+	private String gridId;
+
+    /**
+     * 网格名称
+     */
+	private String gridName;
+
+    /**
+     * 网格所属组织id
+     */
+	private String parentAgencyId;
+
+    /**
+     * 所有上级ID，用英文逗号分开 ？
+     */
+	private String allParentIds;
+
+    /**
+     * 用户id
+     */
+	private String userId;
+
+    /**
+     * 用户姓名
+     */
+	private String userName;
+
+    /**
+     * 爱心时长 单位分钟
+     */
+	private Integer heartTime;
+
+	/**
+	 * 积分09-11新增
+	 */
+	private Integer points;
+
+	/**
+	 * 志愿者id 09-11新增
+	 */
+	private String volunteerId;
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcVolunteerSummaryDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcVolunteerSummaryDailyEntity.java
new file mode 100644
index 0000000000..dc3f16f2c0
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenKcVolunteerSummaryDailyEntity.java
@@ -0,0 +1,111 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.evaluationindex.screen;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * KC-志愿者汇总(先根据customerId+dateId删除)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-09
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("screen_kc_volunteer_summary_daily")
+public class ScreenKcVolunteerSummaryDailyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 数据更新至：yyyyMMdd
+     */
+	private String dateId;
+
+    /**
+     * 网格id
+     */
+	private String gridId;
+
+    /**
+     * 网格名称
+     */
+	private String gridName;
+
+    /**
+     * 网格所属组织id
+     */
+	private String parentAgencyId;
+
+    /**
+     * 所有上级ID，用英文逗号分开 ？
+     */
+	private String allParentIds;
+
+    /**
+     * 小于20岁的志愿者总人数
+     */
+	private Integer ageLevel1;
+
+    /**
+     * 20-30岁的志愿者总人数
+     */
+	private Integer ageLevel2;
+
+    /**
+     * 31-40岁的志愿者总人数
+     */
+	private Integer ageLevel3;
+
+    /**
+     * 41-50岁的志愿者总人数
+     */
+	private Integer ageLevel4;
+
+    /**
+     * 51-60岁的志愿者总人数
+     */
+	private Integer ageLevel5;
+
+    /**
+     * 60+岁的志愿者总人数
+     */
+	private Integer ageLevel6;
+
+    /**
+     * 志愿者中男性总人数
+     */
+	private Integer maleCount;
+
+    /**
+     * 志愿者中女性总人数
+     */
+	private Integer femaleCount;
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/IndexExcelDataListener.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/IndexExcelDataListener.java
index b172852d63..57eead6c35 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/IndexExcelDataListener.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/IndexExcelDataListener.java
@@ -92,7 +92,7 @@ public class IndexExcelDataListener extends AnalysisEventListener<IndexModel> {
                 threshold = "-1";
             } else if (data.getThreshold().contains("%")) {
                 String thresholdStr = data.getThreshold().replace("%", "");
-                threshold = new BigDecimal(thresholdStr).divide(new BigDecimal(100), 4, RoundingMode.HALF_UP).toString();
+                threshold = new BigDecimal(thresholdStr).toString();
             }
             data.setThreshold(threshold);
         }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/GridCorreLationService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/GridCorreLationService.java
index a93697ce12..994f8818fb 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/GridCorreLationService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/GridCorreLationService.java
@@ -3,6 +3,7 @@ package com.epmet.service.evaluationindex.indexcal;
 import com.epmet.dto.ScreenCustomerGridDTO;
 import com.epmet.dto.indexcal.CalculateCommonFormDTO;
 import com.epmet.dto.indexcal.PageQueryGridFormDTO;
+import com.epmet.support.normalizing.batch.CalculateResult;
 import com.epmet.support.normalizing.batch.IndexInputVO;
 
 import java.math.BigDecimal;
@@ -52,5 +53,5 @@ public interface GridCorreLationService {
      * @description 通用计算方法
      * @Date 2020/9/3 16:07
      **/
-    HashMap<String, BigDecimal> calculate(Map<String, IndexInputVO<BigDecimal>> indexMap);
+    HashMap<String, CalculateResult> calculate(Map<String, IndexInputVO<BigDecimal>> indexMap);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/CpcIndexCalculateServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/CpcIndexCalculateServiceImpl.java
index 139353e83c..7c2f3dc367 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/CpcIndexCalculateServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/CpcIndexCalculateServiceImpl.java
@@ -29,6 +29,7 @@ import com.epmet.support.normalizing.batch.CalculateResult;
 import com.epmet.support.normalizing.batch.IndexInputVO;
 import com.epmet.support.normalizing.batch.SampleValue;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.ListUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -36,7 +37,10 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -75,37 +79,64 @@ public class CpcIndexCalculateServiceImpl implements CpcIndexCalculateService {
         }
         Map<String, CpcScoreEntity> cpcScoreTotalMap = new HashMap<>();
         Map<String, IndexGroupDetailEntity> indexWeightMap = parentIndexDetails.stream().collect(Collectors.toMap(IndexGroupDetailEntity::getIndexCode, o -> o));
+        int pageNo = NumConstant.ONE;
+        int pageSize = IndexCalConstant.PAGE_SIZE;
+        List<CpcScoreEntity> list = null;
 
-        //获取数据
-        List<CpcScoreEntity> list = cpcScoreDao.getPartScore(formDTO.getCustomerId(), formDTO.getMonthId(), IndexCodeEnum.DANG_YUAN_XIANG_GUAN.getCode());
-        if (CollectionUtils.isEmpty(list)) {
-            log.error("calculateTotalScore cpcScoreDao.getPartScore return empty,customerId:{},monthId:{}", formDTO.getCustomerId(), formDTO.getMonthId());
-            throw new RenException("客户四级指标分值记录不存在");
-        }
-        Map<String, List<CpcScoreEntity>> userGroupMap = list.stream().collect(Collectors.groupingBy(CpcScoreEntity::getUserId));
-        userGroupMap.forEach((userId, partScoreList) -> {
-            CpcScoreEntity totalEntity = null;
-            for (CpcScoreEntity part : partScoreList) {
-                IndexGroupDetailEntity indexGroupDetailEntity = indexWeightMap.get(part.getIndexCode());
-                if (indexGroupDetailEntity == null) {
-                    log.error(" indexCode:{} 在指标明细中不存在", part.getIndexCode());
-                    continue;
-                }
-                if (totalEntity == null) {
-                    totalEntity = ConvertUtils.sourceToTarget(part, CpcScoreEntity.class);
-                    totalEntity.setIsTotal(NumConstant.ONE_STR);
-                    totalEntity.setIndexCode(IndexCodeEnum.DANG_YUAN_XIANG_GUAN.getCode());
-                    totalEntity.setScore(new BigDecimal(0));
-                    totalEntity.setAllParentIndexCode(indexGroupDetailEntity.getAllParentIndexCode());
-                    cpcScoreTotalMap.put(userId, totalEntity);
+        Map<String, CpcScoreEntity> preLastCpcScoreTotalMap = new HashMap<>();
+        CpcScoreEntity currentLastCpcScore = null;
+        do {
+            //获取数据
+            list = cpcScoreDao.getPartScore(formDTO.getCustomerId(), formDTO.getMonthId(), IndexCodeEnum.DANG_YUAN_XIANG_GUAN.getCode(), (pageNo - NumConstant.ONE) * pageSize, pageSize);
+            pageNo++;
+            if (CollectionUtils.isEmpty(list)) {
+                log.warn("calculateTotalScore cpcScoreDao.getPartScore return empty,customerId:{},monthId:{}", formDTO.getCustomerId(), formDTO.getMonthId());
+            } else {
+                //获取最后一条
+                currentLastCpcScore = list.get(list.size() - 1);
+                if (preLastCpcScoreTotalMap.containsKey(currentLastCpcScore.getUserId())) {
+                    cpcScoreTotalMap.putAll(preLastCpcScoreTotalMap);
+                    preLastCpcScoreTotalMap.put(currentLastCpcScore.getUserId(), null);
                 }
-                //自建群活跃度——议题转项目率 有阈值 >60%按60%算
-                BigDecimal total = part.getScore().multiply(indexGroupDetailEntity.getWeight());
-                log.info("userId:{},分数：{},权重：{},total:{}", userId, part.getScore(), indexGroupDetailEntity.getWeight(), total);
-                totalEntity.setScore(totalEntity.getScore().add(total));
+                Map<String, List<CpcScoreEntity>> userGroupMap = list.stream().collect(Collectors.groupingBy(CpcScoreEntity::getUserId));
+                userGroupMap.forEach((userId, partScoreList) -> {
+                    CpcScoreEntity totalEntity = null;
+                    for (CpcScoreEntity part : partScoreList) {
+                        IndexGroupDetailEntity indexGroupDetailEntity = indexWeightMap.get(part.getIndexCode());
+                        if (indexGroupDetailEntity == null) {
+                            log.error(" indexCode:{} 在指标明细中不存在", part.getIndexCode());
+                            continue;
+                        }
+                        if (totalEntity == null) {
+                            totalEntity = ConvertUtils.sourceToTarget(part, CpcScoreEntity.class);
+                            totalEntity.setIsTotal(NumConstant.ONE_STR);
+                            totalEntity.setIndexCode(IndexCodeEnum.DANG_YUAN_XIANG_GUAN.getCode());
+                            totalEntity.setScore(new BigDecimal(NumConstant.ZERO));
+                            totalEntity.setAllParentIndexCode(NumConstant.ZERO_STR);
+
+                            if (preLastCpcScoreTotalMap.containsKey(part.getUserId())) {
+                                preLastCpcScoreTotalMap.put(part.getUserId(), part);
+                            } else {
+                                cpcScoreTotalMap.put(userId, totalEntity);
+                            }
+                        }
+                        //自建群活跃度——议题转项目率 有阈值 >60%按60%算
+                        BigDecimal total = part.getScore().multiply(indexGroupDetailEntity.getWeight());
+                        log.info("userId:{},分数：{},权重：{},total:{}", userId, part.getScore(), indexGroupDetailEntity.getWeight(), total);
+                        totalEntity.setScore(totalEntity.getScore().add(total));
+                    }
+                });
             }
-        });
-        deleteAndInsertBatch(formDTO, cpcScoreTotalMap.values().stream().collect(Collectors.toList()), IndexCodeEnum.DANG_YUAN_XIANG_GUAN.getCode());
+
+            //没查询到数据 就把上次的放进去
+            if (list == null || list.size() < pageSize || !CollectionUtils.isEmpty(preLastCpcScoreTotalMap)) {
+                cpcScoreTotalMap.putAll(preLastCpcScoreTotalMap);
+            }
+            //删除总分 然后插入
+            cpcScoreDao.deleteByMonthId(formDTO.getCustomerId(), formDTO.getMonthId(), IndexCodeEnum.DANG_YUAN_XIANG_GUAN.getCode(), IndexCalConstant.DELETE_SIZE, NumConstant.ONE_STR);
+            insertCpcScoreBatch(formDTO, cpcScoreTotalMap.values().stream().collect(Collectors.toList()), IndexCodeEnum.DANG_YUAN_XIANG_GUAN.getCode());
+        } while (!CollectionUtils.isEmpty(list));
+
     }
 
     /**
@@ -140,15 +171,18 @@ public class CpcIndexCalculateServiceImpl implements CpcIndexCalculateService {
      * @param indexCode 指标code 非必填
      * @param values
      */
-    @Transactional(rollbackFor = Exception.class)
-    private void deleteAndInsertBatch(CalculateCommonFormDTO formDTO, Collection<CpcScoreEntity> values, String indexCode) {
-        cpcScoreDao.deleteByMonthId(formDTO.getCustomerId(), formDTO.getMonthId(), indexCode);
-        cpcScoreDao.insertBatch(values);
+    public void insertCpcScoreBatch(CalculateCommonFormDTO formDTO, List<CpcScoreEntity> values, String indexCode) {
+        if (CollectionUtils.isEmpty(values)) {
+            log.error("insertCpcScoreBatch要插入的数据为空，param：{},indexCode:{}", JSON.toJSONString(formDTO), indexCode);
+            return;
+        }
+        List<List<CpcScoreEntity>> partition = ListUtils.partition(values, IndexCalConstant.INSERT_SIZE);
+        partition.forEach(list -> cpcScoreDao.insertBatch(list));
     }
 
     private void calculatePartScore(CalculateCommonFormDTO formDTO) {
         //计算最大最小值
-        Map<String, Object> minAndMaxMap = factIndexPartyAblityCpcMonthlyDao.getExtremeValue(formDTO.getCustomerId());
+        Map<String, Object> minAndMaxMap = factIndexPartyAblityCpcMonthlyDao.getExtremeValue(formDTO.getCustomerId(), formDTO.getMonthId());
         if (CollectionUtils.isEmpty(minAndMaxMap)) {
             log.error("cpcIndexCalculate getExtremeValue customerId:{} have not any fact record", formDTO.getCustomerId());
             throw new RenException("指标原始数据记录不存在");
@@ -161,9 +195,10 @@ public class CpcIndexCalculateServiceImpl implements CpcIndexCalculateService {
         }
 
         int pageNo = NumConstant.ONE;
-        int pageSize = NumConstant.ONE_THOUSAND;
+        int pageSize = IndexCalConstant.PAGE_SIZE;
         //分页查询 要计算的原始数据
         List<Map<String, Object>> list = null;
+        groupIndexDetailsMap.keySet().forEach(indexCode -> deleteOldData(formDTO, indexCode));
         do {
             list = factIndexPartyAblityCpcMonthlyDao.getCountByMonthId(formDTO.getCustomerId(), formDTO.getMonthId(), (pageNo - 1) * pageSize, pageSize);
             if (!CollectionUtils.isEmpty(list)) {
@@ -178,6 +213,20 @@ public class CpcIndexCalculateServiceImpl implements CpcIndexCalculateService {
         } while (!CollectionUtils.isEmpty(list) && list.size() == pageSize);
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteOldData(CalculateCommonFormDTO formDTO, String indexCode) {
+        int effectRow;
+        do {
+            effectRow = cpcScoreDao.deleteByMonthId(formDTO.getCustomerId(), formDTO.getMonthId(), indexCode, IndexCalConstant.DELETE_SIZE, NumConstant.ZERO_STR);
+        } while (effectRow > NumConstant.ZERO);
+        effectRow = NumConstant.ZERO;
+        do {
+            //删除 党员相关：（参与议事等4级指标的 明细数据）
+            String allParentCode = IndexCodeEnum.DANG_YUAN_XIANG_GUAN.getCode().concat(StrConstant.COLON).concat(indexCode);
+            effectRow = cpcSubScoreDao.deleteByMonthId(formDTO.getCustomerId(), formDTO.getMonthId(), allParentCode, IndexCalConstant.DELETE_SIZE);
+        } while (effectRow > NumConstant.ZERO);
+    }
+
     /**
      * desc：计算并保存中间结果
      *
@@ -213,7 +262,7 @@ public class CpcIndexCalculateServiceImpl implements CpcIndexCalculateService {
                 cpcScoreEntity.setUserId(userId);
                 cpcScoreEntity.setIsTotal(NumConstant.ZERO_STR);
                 cpcScoreEntity.setMonthId(formDTO.getMonthId());
-                cpcScoreEntity.setScore(new BigDecimal(0));
+                cpcScoreEntity.setScore(new BigDecimal(NumConstant.ZERO));
                 cpcScoreEntity.setIndexCode(parentIndexCode);
                 cpcScoreEntity.setAllParentIndexCode(value.getAllParentIndexCode());
                 scoreEntityMap.put(userId, cpcScoreEntity);
@@ -243,7 +292,6 @@ public class CpcIndexCalculateServiceImpl implements CpcIndexCalculateService {
      * @param parentIndexCode
      * @param result
      */
-    @Transactional(rollbackFor = Exception.class)
     public void saveCpcScore(CalculateCommonFormDTO formDTO, Map<String, CpcScoreEntity> indexDetails, String parentIndexCode, HashMap<String, CalculateResult> result) {
 
         List<CpcScoreEntity> list = new ArrayList<>();
@@ -254,8 +302,8 @@ public class CpcIndexCalculateServiceImpl implements CpcIndexCalculateService {
             CalculateResult score = entry.getValue();
             CpcScoreEntity cpcScoreEntity = indexDetails.get(userId);
             cpcScoreEntity.setScore(score.getTotalScore());
-            allParentIndexCode = score.getDetails().get(0).getAllParentIndexCode();
-            cpcScoreEntity.setAllParentIndexCode(allParentIndexCode.substring(0, allParentIndexCode.lastIndexOf(StrConstant.COLON)));
+            allParentIndexCode = score.getDetails().get(NumConstant.ZERO).getAllParentIndexCode();
+            cpcScoreEntity.setAllParentIndexCode(allParentIndexCode.substring(NumConstant.ZERO, allParentIndexCode.lastIndexOf(StrConstant.COLON)));
             list.add(cpcScoreEntity);
             CpcScoreEntity parent = ConvertUtils.sourceToTarget(cpcScoreEntity, CpcScoreEntity.class);
             score.getDetails().forEach(o -> {
@@ -267,9 +315,8 @@ public class CpcIndexCalculateServiceImpl implements CpcIndexCalculateService {
             });
 
         }
-        System.out.println("value:" + JSON.toJSONString(list));
-        this.deleteAndInsertBatch(formDTO, list, parentIndexCode);
-        this.deleteAndInsertSubBatch(formDTO, subList, allParentIndexCode);
+        this.insertCpcScoreBatch(formDTO, list, parentIndexCode);
+        this.insertCpcSubScoreBatch(formDTO, subList, allParentIndexCode);
     }
 
     /**
@@ -279,10 +326,13 @@ public class CpcIndexCalculateServiceImpl implements CpcIndexCalculateService {
      * @param subList
      * @param parentIndexCode 指标code 非必填
      */
-    @Transactional(rollbackFor = Exception.class)
-    public void deleteAndInsertSubBatch(CalculateCommonFormDTO formDTO, List<CpcSubScoreEntity> subList, String parentIndexCode) {
-        cpcSubScoreDao.deleteByMonthId(formDTO.getCustomerId(), formDTO.getMonthId(), parentIndexCode);
-        cpcSubScoreDao.insertBatch(subList);
+    public void insertCpcSubScoreBatch(CalculateCommonFormDTO formDTO, List<CpcSubScoreEntity> subList, String parentIndexCode) {
+        if (CollectionUtils.isEmpty(subList)) {
+            log.error("insertCpcScoreBatch要插入的数据为空，param：{},indexCode:{}", JSON.toJSONString(formDTO), parentIndexCode);
+            return;
+        }
+        List<List<CpcSubScoreEntity>> partition = ListUtils.partition(subList, IndexCalConstant.INSERT_SIZE);
+        partition.forEach(list -> cpcSubScoreDao.insertBatch(list));
     }
 
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/DeptScoreServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/DeptScoreServiceImpl.java
index dba7178f96..b133615512 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/DeptScoreServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/DeptScoreServiceImpl.java
@@ -17,21 +17,24 @@
 
 package com.epmet.service.evaluationindex.indexcal.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.constant.IndexCalConstant;
 import com.epmet.dao.evaluationindex.indexcal.DeptScoreDao;
+import com.epmet.dao.evaluationindex.indexcal.DeptSubScoreDao;
 import com.epmet.dao.evaluationindex.indexcoll.FactIndexGovrnAblityDeptMonthlyDao;
 import com.epmet.dao.evaluationindex.screen.ScreenCustomerDeptDao;
 import com.epmet.dto.indexcal.CalculateCommonFormDTO;
+import com.epmet.dto.indexcal.DeotScore;
+import com.epmet.dto.indexcal.DeptScoreDetailDTO;
 import com.epmet.entity.evaluationindex.indexcal.DeptScoreEntity;
-import com.epmet.entity.evaluationindex.indexcoll.FactIndexGovrnAblityDeptMonthlyEntity;
+import com.epmet.entity.evaluationindex.indexcal.DeptSubScoreEntity;
 import com.epmet.entity.evaluationindex.screen.IndexGroupDetailEntity;
 import com.epmet.entity.evaluationindex.screen.ScreenCustomerDeptEntity;
 import com.epmet.eum.IndexCodeEnum;
@@ -43,9 +46,12 @@ import com.epmet.support.normalizing.BigDecimalScoreCalculator;
 import com.epmet.support.normalizing.Correlation;
 import com.epmet.support.normalizing.ScoreCalculator;
 import com.epmet.support.normalizing.ScoreConstants;
+import com.epmet.support.normalizing.batch.CalculateResult;
 import com.epmet.support.normalizing.batch.IndexInputVO;
+import com.epmet.support.normalizing.batch.IndexScoreVo;
 import com.epmet.support.normalizing.batch.SampleValue;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.ListUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -57,6 +63,8 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 
 /**
@@ -81,38 +89,48 @@ public class DeptScoreServiceImpl extends BaseServiceImpl<DeptScoreDao, DeptScor
     private ScreenCustomerDeptDao screenCustomerDeptDao;
     @Autowired
     private DeptScoreDao deptScoreDao;
+    @Autowired
+    private DeptSubScoreDao deptSubScoreDao;
 
     /**
      * @param formDTO
      * @return java.lang.Boolean
      * @author yinzuomei
-     * @description 区直部门，分值计算
+     * @description 区直部门相关-分值计算
      * @Date 2020/8/26 10:51
      **/
     @Override
     public Boolean calculateDeptCorreLation(CalculateCommonFormDTO formDTO) {
-        //获取指标权重
+        //1、区直部门-治理能力下五级指标分值计算+  治理能力总分计算
+        calculateZhiLiNengLiScore(formDTO);
+        //2、区直部门 总分计算
+        calculateDeptTotalScore(formDTO);
+        return true;
+    }
+
+    /**
+     * @return void
+     * @param formDTO
+     * @author yinzuomei
+     * @description 区直部门-党建能力分值计算
+     * @Date 2020/9/10 17:21 
+     **/
+    private void calculateZhiLiNengLiScore(CalculateCommonFormDTO formDTO) {
+        //获取区直部门的治理能力下，五级指标权重
         List<IndexGroupDetailEntity> indexGroupDetailEntityList = getDetailListByParentCode.getDetailListByParentCode(formDTO.getCustomerId(),
                 IndexCodeEnum.QU_ZHI_BU_MEN.getCode(),
                 IndexCodeEnum.ZHI_LI_NENG_LI.getCode());
         if (CollectionUtils.isEmpty(indexGroupDetailEntityList)) {
-            log.warn("calculateDeptCorreLation customerId:{} have not any indexGroupDetail", formDTO.getCustomerId());
-            throw new RenException("客户【区直部门:治理能力】指标权重信息不存在");
+            log.error("calculateDeptCorreLation customerId:{} have not any indexGroupDetail", formDTO.getCustomerId());
+            throw new RenException("客户【区直部门:治理能力】下级指标权重信息不存在");
         }
-        log.info(JSON.toJSONString(indexGroupDetailEntityList));
-
+        //        log.info(JSON.toJSONString(indexGroupDetailEntityList));
         //1、查询总记录数
         int total = factIndexGovrnAblityDeptMonthlyDao.selectCount(formDTO);
         if (NumConstant.ZERO == total) {
             log.warn(String.format("customerId=%s,monthId=%s,fact_index_govrn_ablity_dept_monthly have not any fact record", formDTO.getCustomerId(), formDTO.getMonthId()));
-            return Boolean.FALSE;
-        } else if (NumConstant.ONE == total) {
-            //只有一个网格时
-            log.warn(String.format("customerId:%s,monthId:%s,only one fact_index_govrn_ablity_dept_monthly record", formDTO.getCustomerId(), formDTO.getMonthId()));
-            this.handleOneGridScene(formDTO);
-            return Boolean.TRUE;
+            return;
         }
-
         //2、计算最大最小值
         Map<String, Object> minAndMaxMap = factIndexGovrnAblityDeptMonthlyDao.selectExtremeValue(formDTO);
         if (CollectionUtils.isEmpty(minAndMaxMap)) {
@@ -121,7 +139,10 @@ public class DeptScoreServiceImpl extends BaseServiceImpl<DeptScoreDao, DeptScor
         }
         //3、构造入参 指标集合
         Map<String, IndexInputVO<BigDecimal>> indexMap = buildDeptCorrelationIndexInputVO(indexGroupDetailEntityList, minAndMaxMap);
-        //4、分批计算
+        //4、先全部删除，后批量插入
+        //quzhibumen:zhilinengli
+        deleteBeforeDataList(formDTO,IndexCodeEnum.ZHI_LI_NENG_LI.getCode(),IndexCalConstant.DEPT_ZL_ALL_PARENT_INDEX_CODE);
+        //5、分批计算
         int pageNo = NumConstant.ONE;
         int pageSize = IndexCalConstant.PAGE_SIZE;
         //分页查询 要计算的原始数据
@@ -134,7 +155,95 @@ public class DeptScoreServiceImpl extends BaseServiceImpl<DeptScoreDao, DeptScor
                 calculateScore(formDTO,indexMap,crrentFactRecordList);
             }
         } while (!CollectionUtils.isEmpty(list) && pageNo++ > 0);
-        return true;
+        log.info("区直部门-治理能力- 计算完成");
+    }
+
+    /**
+     * @return void
+     * @param formDTO
+     * @author yinzuomei
+     * @description 区直部门总分
+     * @Date 2020/9/10 17:20
+     **/
+    private void calculateDeptTotalScore(CalculateCommonFormDTO formDTO) {
+        //计算区直部门总分
+        List<IndexGroupDetailEntity> indexList = getDetailListByParentCode.getDetailListByParentCode(formDTO.getCustomerId(),
+                IndexCodeEnum.QU_ZHI_BU_MEN.getCode());
+        if (CollectionUtils.isEmpty(indexList)) {
+            log.error("calculateDeptTotalScore customerId:{} have not any indexGroupDetail", formDTO.getCustomerId());
+            throw new RenException("客户【区直部门】下级指标权重信息不存在");
+        }
+        //查询总记录数
+        List<DeotScore> deptScoreDTOList = deptScoreDao.selectList(formDTO);
+        if(CollectionUtils.isEmpty(deptScoreDTOList)){
+            log.warn("calculateDeptTotalScore deptScoreDao.selectList return empty,customerId:{},monthId:{}", formDTO.getCustomerId(), formDTO.getMonthId());
+//            throw new RenException("客户一级指标分值记录不存在");
+            log.warn(String.format("customerId=%s,monthId=%s,fact_index_dept_score have not any fact record", formDTO.getCustomerId(), formDTO.getMonthId()));
+            return;
+        }
+        Map<String, IndexGroupDetailEntity> indexMap = indexList.stream().collect(Collectors.toMap(IndexGroupDetailEntity::getIndexCode, Function.identity()));
+        List<DeptScoreEntity> deotScoreEntityList = new ArrayList<>();
+        for (DeotScore deptScore : deptScoreDTOList) {
+            DeptScoreEntity deptScoreEntity =  ConvertUtils.sourceToTarget(deptScore, DeptScoreEntity.class);
+            deptScoreEntity.setIsTotal(NumConstant.ONE_STR);
+            deptScoreEntity.setIndexCode(IndexCodeEnum.QU_ZHI_BU_MEN.getCode());
+            deptScoreEntity.setScore(BigDecimal.ZERO);
+            deptScoreEntity.setAllParentIndexCode(NumConstant.ZERO_STR);
+            for (DeptScoreDetailDTO deptScoreDetailDTO : deptScore.getDetailList()) {
+                BigDecimal indexScore = deptScoreDetailDTO.getScore().multiply(indexMap.get(deptScoreDetailDTO.getIndexCode()).getWeight());
+                deptScoreEntity.setScore(deptScoreEntity.getScore().add(indexScore));
+            }
+            deotScoreEntityList.add(deptScoreEntity);
+        }
+        //先删除
+        int effectRow;
+        do {
+            effectRow = deptScoreDao.deleteByDeptIdAndMonthId(formDTO.getCustomerId(),
+                    formDTO.getMonthId(),
+                    IndexCodeEnum.QU_ZHI_BU_MEN.getCode(),
+                    IndexCalConstant.DELETE_SIZE);
+        } while (effectRow > NumConstant.ZERO);
+        //后新增
+        if (!CollectionUtils.isEmpty(deotScoreEntityList)) {
+            //批量插入
+            List<List<DeptScoreEntity>> partition = ListUtils.partition(deotScoreEntityList, IndexCalConstant.INSERT_SIZE);
+            partition.forEach(list -> {
+                deptScoreDao.insertBatchEntity(list);
+            });
+        }
+
+    }
+
+    /**
+     * @param formDTO
+     * @param indexCode          zhilinengli
+     * @param allParentIndexCode quzhibumen:zhilinengli
+     * @return void
+     * @author yinzuomei
+     * @description
+     * @Date 2020/9/10 12:15
+     **/
+    @Transactional(rollbackFor = Exception.class)
+    void deleteBeforeDataList(CalculateCommonFormDTO formDTO, String indexCode, String allParentIndexCode) {
+        int masterDeleteNum;
+        do {
+            //一次删除50条
+            masterDeleteNum = deptScoreDao.deleteByDeptIdAndMonthId(formDTO.getCustomerId(),
+                    formDTO.getMonthId(),
+                    indexCode,
+                    IndexCalConstant.DELETE_SIZE);
+        } while (masterDeleteNum > NumConstant.ZERO);
+
+        //删除明细时，需要根据分组删，比方说当前计算的是区直部门治理能力，主表需要删除indexCode=zhilinengli的，明细需要删除区直部门:治理能力下面所有的指标明细
+        int detailDelteNum;
+        do {
+            detailDelteNum = deptSubScoreDao.deleteBatches(formDTO.getCustomerId(),
+                    formDTO.getMonthId(),
+                    allParentIndexCode,
+                    IndexCalConstant.DELETE_SIZE);
+        } while (detailDelteNum > NumConstant.ZERO);
+
+        log.info("delete fact_index_dept_score and fact_index_dept_sub_score complete");
     }
 
     /**
@@ -152,7 +261,7 @@ public class DeptScoreServiceImpl extends BaseServiceImpl<DeptScoreDao, DeptScor
             indexMap.forEach((key, indexInputVO) -> {
                 if (StringUtils.isNotBlank(indexCodeFieldReService.getFieldNameByIndexCode(key))) {
                     //对应的数值
-                    String sampleValueStr =String.valueOf(recordMap.get(indexCodeFieldReService.getFieldNameByIndexCode(key)));
+                    String sampleValueStr = String.valueOf(recordMap.get(indexCodeFieldReService.getFieldNameByIndexCode(key)));
                     //构造样本值对象
                     SampleValue<BigDecimal> currentGridIndexValue = new SampleValue((String) recordMap.get(IndexCalConstant.DEPT_ID), new BigDecimal(sampleValueStr));
                     indexInputVO.getIndexValueVOs().add(currentGridIndexValue);
@@ -161,9 +270,11 @@ public class DeptScoreServiceImpl extends BaseServiceImpl<DeptScoreDao, DeptScor
             });
 
         });
-        HashMap<String, BigDecimal> resultMap = gridCorreLationService.calculate(indexMap);
-        //保存中间表记录
-        this.saveDeptScoreEntity(formDTO,resultMap);
+        HashMap<String, CalculateResult> resultMap = gridCorreLationService.calculate(indexMap);
+        if (!CollectionUtils.isEmpty(resultMap)) {
+            //保存中间表记录
+            this.saveDeptScoreEntity(formDTO, resultMap);
+        }
     }
 
     /**
@@ -175,10 +286,12 @@ public class DeptScoreServiceImpl extends BaseServiceImpl<DeptScoreDao, DeptScor
      * @Date 2020/9/3 16:11
      **/
     @Transactional(rollbackFor = Exception.class)
-    public void saveDeptScoreEntity(CalculateCommonFormDTO formDTO, HashMap<String, BigDecimal> resultMap) {
+    public void saveDeptScoreEntity(CalculateCommonFormDTO formDTO, HashMap<String, CalculateResult> resultMap) {
         String quarterId = DateUtils.getQuarterId(formDTO.getMonthId());
         String yearId = DateUtils.getYearId(formDTO.getMonthId());
-        resultMap.forEach((deptId, governAblityScore) -> {
+        List<DeptScoreEntity> deptScoreEntityList=new ArrayList<>();
+        List<DeptSubScoreEntity> deptSubScoreEntityList=new ArrayList<>();
+        resultMap.forEach((deptId, calculateResult) -> {
             DeptScoreEntity deptScoreEntity = new DeptScoreEntity();
             deptScoreEntity.setCustomerId(formDTO.getCustomerId());
             deptScoreEntity.setDeptId(deptId);
@@ -193,24 +306,27 @@ public class DeptScoreServiceImpl extends BaseServiceImpl<DeptScoreDao, DeptScor
             deptScoreEntity.setQuarterId(quarterId);
             deptScoreEntity.setYearId(yearId);
             deptScoreEntity.setMonthId(formDTO.getMonthId());
-            deptScoreEntity.setScore(governAblityScore);
-            deptScoreDao.deleteByDeptIdAndMonthId(formDTO.getCustomerId(),formDTO.getMonthId(),deptId);
-            deptScoreDao.insert(deptScoreEntity);
+            deptScoreEntity.setScore(calculateResult.getTotalScore());
+            //区直部门治理能力的 上一级是 quzhibumen
+            ////新增ALL_PARENT_INDEX_CODE 所有指标code拼接的字符串 冒号隔开
+            deptScoreEntity.setAllParentIndexCode(IndexCodeEnum.QU_ZHI_BU_MEN.getCode());
+            deptScoreEntityList.add(deptScoreEntity);
+            for(IndexScoreVo detail:calculateResult.getDetails()){
+                DeptSubScoreEntity deptSubScore= ConvertUtils.sourceToTarget(deptScoreEntity, DeptSubScoreEntity.class);
+                //重新赋值
+                deptSubScore.setIndexCode(detail.getIndexCode());
+                deptSubScore.setAllParentIndexCode(detail.getAllParentIndexCode());
+                deptSubScore.setScore(detail.getScore());
+                deptSubScoreEntityList.add(deptSubScore);
+            }
         });
-    }
-
-    /**
-     * @param formDTO
-     * @return void
-     * @author yinzuomei
-     * @description
-     * @Date 2020/9/3 9:35
-     **/
-    private void handleOneGridScene(CalculateCommonFormDTO formDTO) {
-        FactIndexGovrnAblityDeptMonthlyEntity entity = factIndexGovrnAblityDeptMonthlyDao.selectOneRecord(formDTO.getCustomerId(), formDTO.getMonthId());
-        HashMap<String, BigDecimal> resultMap = new HashMap<>();
-        resultMap.put(entity.getDeptId(), new BigDecimal(NumConstant.FIFTY_STR));
-        this.saveDeptScoreEntity(formDTO, resultMap);
+        //本身是分页计算的,主表一次性插入
+        deptScoreDao.insertBatchEntity(deptScoreEntityList);
+        //明细表分组插入
+        List<List<DeptSubScoreEntity>> partitionDeptSubScoreList = ListUtils.partition(deptSubScoreEntityList, IndexCalConstant.INSERT_SIZE);
+        for (List<DeptSubScoreEntity> insertDeptSubList : partitionDeptSubScoreList) {
+            deptSubScoreDao.insertBatchEntity(insertDeptSubList);
+        }
     }
 
     /**
@@ -228,7 +344,7 @@ public class DeptScoreServiceImpl extends BaseServiceImpl<DeptScoreDao, DeptScor
             //获取指标对应的列名
             String fieldName = indexCodeFieldReService.getFieldNameByIndexCode(index.getIndexCode());
             if (StringUtils.isBlank(fieldName)) {
-                log.error("index_code:{} not find field_name", index.getIndexCode());
+                log.warn("index_code:{} not find field_name", index.getIndexCode());
                 continue;
             }
             String minValueKey = fieldName.concat(StrConstant.UNDER_LINE).concat(StrConstant.MIN);
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java
index 1db443914c..204556a035 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java
@@ -11,6 +11,7 @@ import com.epmet.constant.DataSourceConstant;
 import com.epmet.constant.IndexCalConstant;
 import com.epmet.dao.evaluationindex.indexcal.CpcScoreDao;
 import com.epmet.dao.evaluationindex.indexcal.GridScoreDao;
+import com.epmet.dao.evaluationindex.indexcal.GridSubScoreDao;
 import com.epmet.dao.evaluationindex.indexcoll.FactIndexGovrnAblityGridMonthlyDao;
 import com.epmet.dao.evaluationindex.indexcoll.FactIndexPartyAblityGridMonthlyDao;
 import com.epmet.dao.evaluationindex.indexcoll.FactIndexServiceAblityGridMonthlyDao;
@@ -18,6 +19,7 @@ import com.epmet.dao.evaluationindex.screen.ScreenCustomerGridDao;
 import com.epmet.dto.ScreenCustomerGridDTO;
 import com.epmet.dto.indexcal.*;
 import com.epmet.entity.evaluationindex.indexcal.GridScoreEntity;
+import com.epmet.entity.evaluationindex.indexcal.GridSubScoreEntity;
 import com.epmet.entity.evaluationindex.screen.IndexGroupDetailEntity;
 import com.epmet.eum.IndexCodeEnum;
 import com.epmet.service.evaluationindex.indexcal.GridCorreLationService;
@@ -27,11 +29,9 @@ import com.epmet.support.normalizing.BigDecimalScoreCalculator;
 import com.epmet.support.normalizing.Correlation;
 import com.epmet.support.normalizing.ScoreCalculator;
 import com.epmet.support.normalizing.ScoreConstants;
-import com.epmet.support.normalizing.batch.BatchScoreCalculator;
-import com.epmet.support.normalizing.batch.IndexInputVO;
-import com.epmet.support.normalizing.batch.IndexOutputVO;
-import com.epmet.support.normalizing.batch.SampleValue;
+import com.epmet.support.normalizing.batch.*;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.ListUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -69,6 +69,8 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
     private CpcScoreDao cpcScoreDao;
     @Autowired
     private GridScoreDao gridScoreDao;
+    @Autowired
+    private GridSubScoreDao gridSubScoreDao;
 
 
     /**
@@ -80,66 +82,38 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
      **/
     @Override
     public Boolean calculateGridCorreLation(CalculateCommonFormDTO formDTO) {
-        boolean resultFlag = false;
         //1、计算网格相关-党建能力
-        List<IndexGroupDetailEntity> dangJianNengLiList = indexGroupDetailService.getDetailListByParentCode(formDTO.getCustomerId(),
-                IndexCodeEnum.WANG_GE_XIANG_GUAN.getCode(),
-                IndexCodeEnum.DANG_JIAN_NENG_LI.getCode());
-        if (CollectionUtils.isEmpty(dangJianNengLiList)) {
-            log.warn("calculateGridDangJian customerId:{} have not any indexGroupDetail", formDTO.getCustomerId());
-            throw new RenException("客户【网格相关:党建能力】指标权重信息不存在");
-        }
-        calculateGridDangJian(formDTO, dangJianNengLiList);
+        calculateGridDangJian(formDTO);
         //2、计算网格相关-治理能力
-        List<IndexGroupDetailEntity> zhiLiNengLiList = indexGroupDetailService.getDetailListByParentCode(formDTO.getCustomerId(),
-                IndexCodeEnum.WANG_GE_XIANG_GUAN.getCode(),
-                IndexCodeEnum.ZHI_LI_NENG_LI.getCode());
-        if (CollectionUtils.isEmpty(zhiLiNengLiList)) {
-            log.warn("calculateGridZhiLi customerId:{} have not any indexGroupDetail", formDTO.getCustomerId());
-            throw new RenException("客户【网格相关:治理能力】指标权重信息不存在");
-        }
-        calculateGridZhiLi(formDTO, zhiLiNengLiList);
+        calculateGridZhiLi(formDTO);
         //3、计算网格相关-服务能力
-        List<IndexGroupDetailEntity> fuWuNengLiList = indexGroupDetailService.getDetailListByParentCode(formDTO.getCustomerId(),
-                IndexCodeEnum.WANG_GE_XIANG_GUAN.getCode(),
-                IndexCodeEnum.FU_WU_NENG_LI.getCode());
-        if (CollectionUtils.isEmpty(fuWuNengLiList)) {
-            log.warn("calculateGridFuWu customerId:{} have not any indexGroupDetail", formDTO.getCustomerId());
-            throw new RenException("客户【网格相关:服务能力】指标权重信息不存在");
-        }
-        calculateGridFuWu(formDTO, fuWuNengLiList);
+        calculateGridFuWu(formDTO);
         //4、计算网格相关总分
-        List<IndexGroupDetailEntity> wgxgList = indexGroupDetailService.getDetailListByParentCode(formDTO.getCustomerId(),
-                IndexCodeEnum.WANG_GE_XIANG_GUAN.getCode());
-        if (CollectionUtils.isEmpty(wgxgList)) {
-            log.warn("calculateGridTotal customerId:{} have not any indexGroupDetail", formDTO.getCustomerId());
-            throw new RenException("客户【网格相关】指标权重信息不存在");
-        }
-        calculateGridTotal(formDTO, wgxgList, IndexCodeEnum.WANG_GE_XIANG_GUAN.getCode());
-
-        resultFlag = true;
-        return resultFlag;
+        calculateGridTotal(formDTO);
+        return true;
     }
 
     /**
      * @param formDTO
-     * @param indexList
      * @return void
      * @author yinzuomei
      * @description 计算网格相关-党建能力
      * @Date 2020/8/26 16:47
      **/
     @Transactional(rollbackFor = Exception.class)
-    public void calculateGridDangJian(CalculateCommonFormDTO formDTO, List<IndexGroupDetailEntity> indexList) {
+    public void calculateGridDangJian(CalculateCommonFormDTO formDTO) {
+        List<IndexGroupDetailEntity> indexList = indexGroupDetailService.getDetailListByParentCode(formDTO.getCustomerId(),
+                IndexCodeEnum.WANG_GE_XIANG_GUAN.getCode(),
+                IndexCodeEnum.DANG_JIAN_NENG_LI.getCode());
+        if (CollectionUtils.isEmpty(indexList)) {
+            log.error("calculateGridDangJian customerId:{} have not any indexGroupDetail", formDTO.getCustomerId());
+            throw new RenException("客户【网格相关:党建能力】指标权重信息不存在");
+        }
         //查询总记录数
         int total = factIndexPartyAblityGridMonthlyDao.selectCount(formDTO);
         if (NumConstant.ZERO == total) {
             log.warn(String.format("customerId=%s,monthId=%s,没有上传网格相关-党建能力-五级指标数据", formDTO.getCustomerId(), formDTO.getMonthId()));
             return;
-        } else if (NumConstant.ONE == total) {
-            //只有一个网格时
-            log.warn(String.format("indexCode:%s,customerId:%s,monthId:%s,only one fact_index_party_ablity_grid_monthly record",IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(),formDTO.getCustomerId(),formDTO.getMonthId()));
-            this.handleOneGridScene(formDTO,IndexCodeEnum.DANG_JIAN_NENG_LI.getCode());
         }
         //总页数,进行批量查询，批量计算
         int totalPage = (int) Math.ceil((double) total / IndexCalConstant.PAGE_SIZE);
@@ -147,12 +121,12 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
         //每一组指标的最大值，key:code_MIN/MAX
         Map<String, Object> minAndMaxMap = queryPartyAblityGridMinAndMax(formDTO.getCustomerId(), formDTO.getMonthId());
         if (CollectionUtils.isEmpty(minAndMaxMap)) {
-            log.error("calculateGridDangJian queryPartyAblityGridMinAndMax customerId:{} monthId:{} have not any fact record", formDTO.getCustomerId(),formDTO.getMonthId());
+            log.warn("calculateGridDangJian queryPartyAblityGridMinAndMax customerId:{} monthId:{} have not any fact record", formDTO.getCustomerId(),formDTO.getMonthId());
             return;
         }
         //指标集合
         Map<String, IndexInputVO<BigDecimal>> indexMap = buildGridCorrelationIndexInputVO(formDTO, indexList, minAndMaxMap);
-        List<HashMap<String, BigDecimal>> resultMapList = new ArrayList<>();
+        List<HashMap<String, CalculateResult>> resultMapList = new ArrayList<>();
         //分页查询采集记录
         for (int pageNo = 1; pageNo <= totalPage; pageNo++) {
             int pageIndex = (pageNo - NumConstant.ONE) * IndexCalConstant.PAGE_SIZE;
@@ -184,11 +158,15 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
                     }
                 });
             });
-            HashMap<String, BigDecimal> resultMap = calculate(indexMap);
+            HashMap<String, CalculateResult> resultMap = calculate(indexMap);
             resultMapList.add(resultMap);
         }
         // 保存中间表
-        saveGridCorreLationResult(formDTO, resultMapList, IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(), NumConstant.ZERO_STR);
+        deleteBeforeDataList(formDTO,IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(),IndexCalConstant.GRID_DJ_ALL_PARENT_INDEX_CODE);
+        saveGridCorreLationResult(formDTO,
+                resultMapList,
+                IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(),
+                NumConstant.ZERO_STR);
     }
 
     /**
@@ -199,7 +177,7 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
      * @description 只有一条事实记录时，分值默认赋50
      * @Date 2020/9/2 14:35
      **/
-    private void handleOneGridScene(CalculateCommonFormDTO formDTO, String indexCode) {
+    /*private void handleOneGridScene(CalculateCommonFormDTO formDTO, String indexCode) {
         List<HashMap<String, BigDecimal>> resultMapList = new ArrayList<>();
         HashMap<String, BigDecimal> resultMap = new HashMap<>();
         String gridId =null;
@@ -215,7 +193,7 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
         // 保存中间表
         saveGridCorreLationResult(formDTO, resultMapList, indexCode, NumConstant.ZERO_STR);
     }
-
+*/
     /**
      * @param calculateCommonFormDTO
      * @return java.util.Map<java.lang.String, java.math.BigDecimal>
@@ -316,6 +294,36 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
         return map;
     }
 
+    /**
+     * @return void
+     * @param formDTO
+     * @param indexCode 当前计算的指标（党建能力，治理能力，服务能力）
+     * @param allParentIndexCode
+     * @author yinzuomei
+     * @description
+     * @Date 2020/9/10 13:58
+     **/
+    private void deleteBeforeDataList(CalculateCommonFormDTO formDTO,String indexCode,String allParentIndexCode) {
+        //先删除
+        int masterDeleteNum;
+        do {
+            //一次删除50条
+            masterDeleteNum = gridScoreDao.deleteBatches(formDTO.getCustomerId(),
+                    formDTO.getMonthId(),
+                    indexCode,
+                    IndexCalConstant.DELETE_SIZE);
+        } while (masterDeleteNum > NumConstant.ZERO);
+        //删除明细时，需要根据分组删，比方说当前计算的是网格相关-党建能力，主表需要删除indexCode=dangjiannengli的，明细需要删除网格相关:党建能力 下面所有的指标明细
+        int detailDelteNum;
+        do {
+            detailDelteNum = gridSubScoreDao.deleteBatches(formDTO.getCustomerId(),
+                    formDTO.getMonthId(),
+                    allParentIndexCode,
+                    IndexCalConstant.DELETE_SIZE);
+        } while (detailDelteNum > NumConstant.ZERO);
+        log.info("delete fact_index_grid_score and fact_index_grid_sub_score complete");
+    }
+
     /**
      * @param formDTO       客户id   月份id:  yyyyMM
      * @param resultMapList
@@ -327,15 +335,17 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
      * @Date 2020/8/30 22:50
      **/
     private void saveGridCorreLationResult(CalculateCommonFormDTO formDTO,
-                                             List<HashMap<String, BigDecimal>> resultMapList,
+                                             List<HashMap<String, CalculateResult>> resultMapList,
                                              String indexCode,
                                              String isTotal) {
-        List<GridScoreEntity> gridScoreEntityList = new ArrayList<>();
         String quarterId = DateUtils.getQuarterId(formDTO.getMonthId());
         String yearId = DateUtils.getYearId(formDTO.getMonthId());
-        for (HashMap<String, BigDecimal> resultMap : resultMapList) {
-            resultMap.forEach((gridId, partyAblityScore) -> {
-                log.info("网格id:" + gridId + ";index_Code:"+indexCode+";分值：" + partyAblityScore);
+        //三大能力结果表
+        List<GridScoreEntity> gridScoreEntityList = new ArrayList<>();
+        //五级指标分值明细
+        List<GridSubScoreEntity> gridSubScoreList = new ArrayList<>();
+        for (HashMap<String, CalculateResult> resultMap : resultMapList) {
+            resultMap.forEach((gridId, calculateResult) -> {
                 GridScoreEntity gridScoreEntity = new GridScoreEntity();
                 gridScoreEntity.setCustomerId(formDTO.getCustomerId());
                 gridScoreEntity.setGridId(gridId);
@@ -353,14 +363,36 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
                 gridScoreEntity.setQuarterId(quarterId);
                 gridScoreEntity.setYearId(yearId);
                 gridScoreEntity.setMonthId(formDTO.getMonthId());
-                gridScoreEntity.setScore(partyAblityScore);
+                gridScoreEntity.setScore(calculateResult.getTotalScore());
+                //新增ALL_PARENT_INDEX_CODE 所有指标code拼接的字符串 冒号隔开
+                gridScoreEntity.setAllParentIndexCode(IndexCodeEnum.WANG_GE_XIANG_GUAN.getCode());
                 gridScoreEntityList.add(gridScoreEntity);
+                for(IndexScoreVo detail:calculateResult.getDetails()){
+                    GridSubScoreEntity gridSubScoreEntity= ConvertUtils.sourceToTarget(gridScoreEntity, GridSubScoreEntity.class);
+                    //重新赋值
+                    gridSubScoreEntity.setIndexCode(detail.getIndexCode());
+                    gridSubScoreEntity.setAllParentIndexCode(detail.getAllParentIndexCode());
+                    gridSubScoreEntity.setScore(detail.getScore());
+                    gridSubScoreList.add(gridSubScoreEntity);
+                }
             });
         }
+        //后新增
         if (!CollectionUtils.isEmpty(gridScoreEntityList)) {
-            gridScoreDao.deleteByCusAndMonthId(formDTO.getCustomerId(), formDTO.getMonthId(), indexCode, isTotal);
-            gridScoreDao.insertBatches(gridScoreEntityList);
+            //批量插入
+            List<List<GridScoreEntity>> partition = ListUtils.partition(gridScoreEntityList, IndexCalConstant.INSERT_SIZE);
+            partition.forEach(list -> {
+                gridScoreDao.insertBatches(list);
+            });
+        }
+        if (!CollectionUtils.isEmpty(gridSubScoreList)) {
+            //批量插入
+            List<List<GridSubScoreEntity>> subPartition = ListUtils.partition(gridSubScoreList, IndexCalConstant.INSERT_SIZE);
+            subPartition.forEach(subList -> {
+                gridSubScoreDao.insertBatches(subList);
+            });
         }
+        log.info("insert fact_index_grid_score and fact_index_grid_sub_score complete");
     }
 
     /**
@@ -371,17 +403,17 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
      * @Date 2020/8/30 21:40
      **/
     @Override
-    public HashMap<String, BigDecimal> calculate(Map<String, IndexInputVO<BigDecimal>> indexMap) {
+    public HashMap<String, CalculateResult> calculate(Map<String, IndexInputVO<BigDecimal>> indexMap) {
         //构造入参
         List<IndexInputVO> indexInputVOS = this.getIndexInputVOList(indexMap);
         log.info("计算的参数"+JSON.toJSONString(indexInputVOS));
         BatchScoreCalculator batchScoreCalculator = new BatchScoreCalculator();
 
         //如果想看每一个指标的分值调用下面的方法
-        List<IndexOutputVO> listTemp=batchScoreCalculator.getScoreDetailOfIndexId(indexInputVOS);
-        log.info("计算的结果(List)"+JSON.toJSONString(listTemp));
+        /*List<IndexOutputVO> listTemp=batchScoreCalculator.getScoreDetailOfIndexId(indexInputVOS);
+        log.info("计算的结果(List)"+JSON.toJSONString(listTemp));*/
 
-        HashMap<String, BigDecimal> resultMap = batchScoreCalculator.getScoreCountOfSampleId(indexInputVOS);
+        HashMap<String, CalculateResult> resultMap = batchScoreCalculator.getScoreTotalOfSampleId(indexInputVOS);
         log.info("计算的结果{}", resultMap);
         return resultMap;
     }
@@ -431,7 +463,7 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
                 //获取指标对应的列名
                 String fieldName = indexCodeFieldReService.getFieldNameByIndexCode(index.getIndexCode());
                 if (StringUtils.isBlank(fieldName)) {
-                    log.error("index_code:{} not find field_name",index.getIndexCode());
+                    log.warn("index_code:{} not find field_name",index.getIndexCode());
                     continue;
                 }
 //                log.info("index_code2:{} ,field_name:{}",index.getIndexCode(),fieldName);
@@ -467,22 +499,24 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
 
     /**
      * @param formDTO
-     * @param indexList
      * @return void
      * @author yinzuomei
      * @description 计算网格相关-治理能力
      * @Date 2020/8/26 16:47
      **/
-    private void calculateGridZhiLi(CalculateCommonFormDTO formDTO, List<IndexGroupDetailEntity> indexList) {
+    private void calculateGridZhiLi(CalculateCommonFormDTO formDTO) {
+        List<IndexGroupDetailEntity> indexList = indexGroupDetailService.getDetailListByParentCode(formDTO.getCustomerId(),
+                IndexCodeEnum.WANG_GE_XIANG_GUAN.getCode(),
+                IndexCodeEnum.ZHI_LI_NENG_LI.getCode());
+        if (CollectionUtils.isEmpty(indexList)) {
+            log.error("calculateGridZhiLi customerId:{} have not any indexGroupDetail", formDTO.getCustomerId());
+            throw new RenException("客户【网格相关:治理能力】指标权重信息不存在");
+        }
         //查询总记录数
         int total = factIndexGovrnAblityGridMonthlyDao.selectCount(formDTO);
         if (NumConstant.ZERO == total) {
             log.warn(String.format("customerId%s,monthId%s,没有上传网格相关-治理能力-五级指标数据", formDTO.getCustomerId(), formDTO.getMonthId()));
             return;
-        }else if (NumConstant.ONE == total) {
-            //只有一个网格时
-            log.warn(String.format("indexCode:%s,customerId:%s,monthId:%s,only one fact_index_govrn_ablity_grid_monthly record",IndexCodeEnum.ZHI_LI_NENG_LI.getCode(),formDTO.getCustomerId(),formDTO.getMonthId()));
-            this.handleOneGridScene(formDTO,IndexCodeEnum.ZHI_LI_NENG_LI.getCode());
         }
         //总页数,进行批量查询，批量计算
         int totalPage = (int) Math.ceil((double) total / IndexCalConstant.PAGE_SIZE);
@@ -490,12 +524,12 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
         //每一组指标的最大值，key:code_MIN/MAX
         Map<String, Object> minAndMaxMap = queryGovrnAblityGridMinAndMax(formDTO.getCustomerId(), formDTO.getMonthId());
         if (CollectionUtils.isEmpty(minAndMaxMap)) {
-            log.error("calculateGridZhiLi queryGovrnAblityGridMinAndMax customerId:{} monthId:{} have not any fact record", formDTO.getCustomerId(),formDTO.getMonthId());
+            log.warn("calculateGridZhiLi queryGovrnAblityGridMinAndMax customerId:{} monthId:{} have not any fact record", formDTO.getCustomerId(),formDTO.getMonthId());
             return;
         }
         //指标集合
         Map<String, IndexInputVO<BigDecimal>> indexMap = buildGridCorrelationIndexInputVO(formDTO, indexList, minAndMaxMap);
-        List<HashMap<String, BigDecimal>> resultMapList = new ArrayList<>();
+        List<HashMap<String, CalculateResult>> resultMapList = new ArrayList<>();
         //分页查询采集记录
         for (int pageNo = 1; pageNo <= totalPage; pageNo++) {
             int pageIndex = (pageNo - NumConstant.ONE) * IndexCalConstant.PAGE_SIZE;
@@ -524,32 +558,38 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
                     }
                 });
             });
-            HashMap<String, BigDecimal> resultMap = calculate(indexMap);
+            HashMap<String, CalculateResult> resultMap = calculate(indexMap);
             resultMapList.add(resultMap);
         }
         // 保存中间表
-        saveGridCorreLationResult(formDTO, resultMapList, IndexCodeEnum.ZHI_LI_NENG_LI.getCode(), NumConstant.ZERO_STR);
+        deleteBeforeDataList(formDTO,IndexCodeEnum.ZHI_LI_NENG_LI.getCode(),IndexCalConstant.GRID_ZL_ALL_PARENT_INDEX_CODE);
+        saveGridCorreLationResult(formDTO,
+                                resultMapList,
+                                IndexCodeEnum.ZHI_LI_NENG_LI.getCode(),
+                                NumConstant.ZERO_STR);
     }
 
 
     /**
      * @param formDTO
-     * @param indexList
      * @return void
      * @author yinzuomei
      * @description 计算网格相关-服务能力
      * @Date 2020/8/26 16:48
      **/
-    private void calculateGridFuWu(CalculateCommonFormDTO formDTO, List<IndexGroupDetailEntity> indexList) {
+    private void calculateGridFuWu(CalculateCommonFormDTO formDTO) {
+        List<IndexGroupDetailEntity> indexList = indexGroupDetailService.getDetailListByParentCode(formDTO.getCustomerId(),
+                IndexCodeEnum.WANG_GE_XIANG_GUAN.getCode(),
+                IndexCodeEnum.FU_WU_NENG_LI.getCode());
+        if (CollectionUtils.isEmpty(indexList)) {
+            log.error("calculateGridFuWu customerId:{} have not any indexGroupDetail", formDTO.getCustomerId());
+            throw new RenException("客户【网格相关:服务能力】指标权重信息不存在");
+        }
         //查询总记录数
         int total = factIndexServiceAblityGridMonthlyDao.selectCount(formDTO);
         if (NumConstant.ZERO == total) {
             log.warn(String.format("customerId:%s,monthId:%s,没有上传网格相关-服务能力-五级指标数据", formDTO.getCustomerId(), formDTO.getMonthId()));
             return;
-        }else if (NumConstant.ONE == total) {
-            //只有一个网格时
-            log.warn(String.format("indexCode:%s,customerId:%s,monthId:%s,only one fact_index_service_ablity_grid_monthly record",IndexCodeEnum.FU_WU_NENG_LI.getCode(),formDTO.getCustomerId(),formDTO.getMonthId()));
-            this.handleOneGridScene(formDTO,IndexCodeEnum.FU_WU_NENG_LI.getCode());
         }
         //总页数,进行批量查询，批量计算
         int totalPage = (int) Math.ceil((double) total / IndexCalConstant.PAGE_SIZE);
@@ -557,12 +597,12 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
         //每一组指标的最大值，key:code_MIN/MAX
         Map<String, Object> minAndMaxMap = queryServiceAblityGridMinAndMax(formDTO.getCustomerId(), formDTO.getMonthId());
         if (CollectionUtils.isEmpty(minAndMaxMap)) {
-            log.error("calculateGridFuWu queryServiceAblityGridMinAndMax customerId:{} monthId:{} have not any fact record", formDTO.getCustomerId(),formDTO.getMonthId());
+            log.warn("calculateGridFuWu queryServiceAblityGridMinAndMax customerId:{} monthId:{} have not any fact record", formDTO.getCustomerId(),formDTO.getMonthId());
             return;
         }
         //指标集合
         Map<String, IndexInputVO<BigDecimal>> indexMap = buildGridCorrelationIndexInputVO(formDTO, indexList, minAndMaxMap);
-        List<HashMap<String, BigDecimal>> resultMapList = new ArrayList<>();
+        List<HashMap<String, CalculateResult>> resultMapList = new ArrayList<>();
         //分页查询采集记录
         for (int pageNo = 1; pageNo <= totalPage; pageNo++) {
             int pageIndex = (pageNo - NumConstant.ONE) * IndexCalConstant.PAGE_SIZE;
@@ -583,52 +623,72 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
                         SampleValue<BigDecimal> currentGridIndexValue = new SampleValue((String) recordMap.get(IndexCalConstant.GRID_ID), new BigDecimal(sampleValueStr));
                         value.getIndexValueVOs().add(currentGridIndexValue);
                     } else {
-                        log.error("index_code:" + key + " not find field_name");
+                        log.warn("index_code:" + key + " not find field_name");
                     }
                 });
             });
-            HashMap<String, BigDecimal> resultMap = calculate(indexMap);
+            HashMap<String, CalculateResult> resultMap = calculate(indexMap);
             resultMapList.add(resultMap);
         }
         // 保存中间表
-        saveGridCorreLationResult(formDTO, resultMapList, IndexCodeEnum.FU_WU_NENG_LI.getCode(), NumConstant.ZERO_STR);
+        deleteBeforeDataList(formDTO,IndexCodeEnum.FU_WU_NENG_LI.getCode(),IndexCalConstant.GRID_FW_ALL_PARENT_INDEX_CODE);
+        saveGridCorreLationResult(formDTO,
+                resultMapList,
+                IndexCodeEnum.FU_WU_NENG_LI.getCode(),
+                NumConstant.ZERO_STR);
     }
 
     /**
      * @param formDTO
-     * @param indexList
      * @return void
      * @author yinzuomei
      * @description 计算网格相关总分
      * @Date 2020/8/26 16:50
      **/
-    private void calculateGridTotal(CalculateCommonFormDTO formDTO, List<IndexGroupDetailEntity> indexList, String indexCode) {
+    private void calculateGridTotal(CalculateCommonFormDTO formDTO) {
+        List<IndexGroupDetailEntity> indexList = indexGroupDetailService.getDetailListByParentCode(formDTO.getCustomerId(),
+                IndexCodeEnum.WANG_GE_XIANG_GUAN.getCode());
+        if (CollectionUtils.isEmpty(indexList)) {
+            log.error("calculateGridTotal customerId:{} have not any indexGroupDetail", formDTO.getCustomerId());
+            throw new RenException("客户【网格相关】指标权重信息不存在");
+        }
         //查询总记录数
         List<GridScoreDTO> gridScoreDTOList = gridScoreDao.selectList(formDTO);
         if(CollectionUtils.isEmpty(gridScoreDTOList)){
-            log.error("calculateGridTotal gridScoreDao.selectList return empty,customerId:{},monthId:{}", formDTO.getCustomerId(), formDTO.getMonthId());
-            throw new RenException("客户一级指标分值记录不存在");
+            log.warn("calculateGridTotal gridScoreDao.selectList return empty,customerId:{},monthId:{}", formDTO.getCustomerId(), formDTO.getMonthId());
+//            throw new RenException("客户一级指标分值记录不存在");
+            return;
         }
         Map<String, IndexGroupDetailEntity> indexMap = indexList.stream().collect(Collectors.toMap(IndexGroupDetailEntity::getIndexCode, Function.identity()));
         List<GridScoreEntity> gridScoreEntityList = new ArrayList<>();
         for (GridScoreDTO gridScoreDTO : gridScoreDTOList) {
             GridScoreEntity gridScoreEntity =  ConvertUtils.sourceToTarget(gridScoreDTO, GridScoreEntity.class);
             gridScoreEntity.setIsTotal(NumConstant.ONE_STR);
-            gridScoreEntity.setIndexCode(indexCode);
+            gridScoreEntity.setIndexCode(IndexCodeEnum.WANG_GE_XIANG_GUAN.getCode());
             gridScoreEntity.setScore(BigDecimal.ZERO);
-            if (!CollectionUtils.isEmpty(gridScoreDTO.getDetailList()) && gridScoreDTO.getDetailList().size() != 3) {
-                log.error("customerId:" + gridScoreDTO.getCustomerId() + ";gridId:" + gridScoreDTO.getGridId() + ";monthId:" + gridScoreDTO.getMonthId() + "能力值缺失,无法计算总值");
-                continue;
-            }
+            gridScoreEntity.setAllParentIndexCode(NumConstant.ZERO_STR);
+            log.warn("customerId:" + gridScoreDTO.getCustomerId() + ";gridId:" + gridScoreDTO.getGridId() + ";monthId:" + gridScoreDTO.getMonthId() + "能力值缺失");
             for (GridScoreDetailDTO gridScoreDetailDTO : gridScoreDTO.getDetailList()) {
                 BigDecimal indexScore = gridScoreDetailDTO.getScore().multiply(indexMap.get(gridScoreDetailDTO.getIndexCode()).getWeight());
                 gridScoreEntity.setScore(gridScoreEntity.getScore().add(indexScore));
             }
             gridScoreEntityList.add(gridScoreEntity);
         }
+        //先删除
+        int effectRow;
+        do {
+            effectRow =gridScoreDao.deleteBatches(formDTO.getCustomerId(),
+                    formDTO.getMonthId(),
+                    IndexCodeEnum.WANG_GE_XIANG_GUAN.getCode(),
+                    IndexCalConstant.DELETE_SIZE);
+        } while (effectRow > NumConstant.ZERO);
+        //批量插入
         if (!CollectionUtils.isEmpty(gridScoreEntityList)) {
-            gridScoreDao.deleteByCusAndMonthId(formDTO.getCustomerId(), formDTO.getMonthId(), indexCode, NumConstant.ONE_STR);
-            gridScoreDao.insertBatches(gridScoreEntityList);
+            //批量插入
+            List<List<GridScoreEntity>> partition = ListUtils.partition(gridScoreEntityList, IndexCalConstant.INSERT_SIZE);
+            partition.forEach(list -> {
+                gridScoreDao.insertBatches(list);
+            });
         }
     }
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateCommunityServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateCommunityServiceImpl.java
index d98981e803..da6956d167 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateCommunityServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateCommunityServiceImpl.java
@@ -9,10 +9,12 @@ import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.constant.IndexCalConstant;
 import com.epmet.dao.evaluationindex.indexcal.CommunityScoreDao;
+import com.epmet.dao.evaluationindex.indexcal.CommunitySubScoreDao;
 import com.epmet.dao.evaluationindex.indexcal.GridScoreDao;
 import com.epmet.dao.evaluationindex.indexcoll.FactIndexGovrnAblityOrgMonthlyDao;
 import com.epmet.dao.evaluationindex.indexcoll.FactIndexPartyAblityOrgMonthlyDao;
 import com.epmet.dao.evaluationindex.indexcoll.FactIndexServiceAblityOrgMonthlyDao;
+import com.epmet.dto.indexcal.CommunityCalResultDTO;
 import com.epmet.dto.screen.FactIndexCommunityScoreDTO;
 import com.epmet.dto.screen.result.MaxAndMinBigDecimalResultDTO;
 import com.epmet.dto.screen.result.SubGridAvgResultDTO;
@@ -63,6 +65,8 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
     private CommunityScoreDao factIndexCommunityScoreDao;
     @Autowired
     private GridScoreDao factIndexGridScoreDao;
+    @Autowired
+    private CommunitySubScoreDao communitySubScoreDao;
 
     /**
      * @param customerId
@@ -89,8 +93,7 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
                     return;
                 } else {
                     MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal = this.getMaxAndMinBigDecimal(subGridPartyAvgScore.stream().map(o -> o.getScore()).collect(Collectors.toList()));
-                    Integer indexEnd = NumConstant.TEN;
-                    List<List<SubGridAvgResultDTO>> subPartyAvgList = ListUtils.partition(subGridPartyAvgScore, indexEnd);
+                    List<List<SubGridAvgResultDTO>> subPartyAvgList = ListUtils.partition(subGridPartyAvgScore, IndexCalConstant.PAGE_SIZE);
                     subPartyAvgList.forEach(party -> {
                         List<SampleValue> index1SampleValues = new ArrayList<>();
                         party.forEach(c -> {
@@ -136,8 +139,8 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
         log.info("communityPartyCalculate getScoreCountOfSampleId param:{}", JSON.toJSONString(indexInputVOS));
         HashMap<String, CalculateResult> scoreTotalOfSampleId = batchScoreCalculator.getScoreTotalOfSampleId(indexInputVOS);
         log.info("communityPartyCalculate getScoreCountOfSampleId result:{}", JSON.toJSONString(scoreTotalOfSampleId));
-        List<FactIndexCommunityScoreDTO> result = getResultB(scoreTotalOfSampleId, customerId, monthId, NumConstant.ZERO_STR, IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(),IndexCodeEnum.SHE_QU_XIANG_GUAN.getCode(), pid);
-        factIndexCommunityScoreDao.deleteOldRecord(customerId, monthId);
+        CommunityCalResultDTO result = getResultB(scoreTotalOfSampleId, customerId, monthId, NumConstant.ZERO_STR, IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(), IndexCodeEnum.SHE_QU_XIANG_GUAN.getCode(), pid);
+        deleteOldRecord(customerId,monthId);
         deleteAndInsert(result);
         return true;
     }
@@ -211,7 +214,7 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
         log.info("communityGovernAbilityCalculate getScoreCountOfSampleId param:{}", JSON.toJSONString(indexInputVOS));
         HashMap<String, CalculateResult> scoreTotalOfSampleId = batchScoreCalculator.getScoreTotalOfSampleId(indexInputVOS);
         log.info("communityGovernAbilityCalculate getScoreCountOfSampleId result:{}", JSON.toJSONString(scoreTotalOfSampleId));
-        List<FactIndexCommunityScoreDTO> result = getResultB(scoreTotalOfSampleId, customerId, monthId, NumConstant.ZERO_STR, IndexCodeEnum.ZHI_LI_NENG_LI.getCode(), IndexCodeEnum.SHE_QU_XIANG_GUAN.getCode(), pid);
+        CommunityCalResultDTO result = getResultB(scoreTotalOfSampleId, customerId, monthId, NumConstant.ZERO_STR, IndexCodeEnum.ZHI_LI_NENG_LI.getCode(), IndexCodeEnum.SHE_QU_XIANG_GUAN.getCode(), pid);
         deleteAndInsert(result);
         return true;
     }
@@ -237,7 +240,7 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
                 List<SubGridAvgResultDTO> subGridServiceAvg = factIndexGridScoreDao.selectSubGridAvgScore(customerId, monthId,IndexCodeEnum.FU_WU_NENG_LI.getCode());
                 if (CollectionUtils.isEmpty(subGridServiceAvg)) {
                     log.error("查询社区下级所有网格服务能力得分平均值集合为空");
-                    return;
+                    //todo return;
                 } else {
                     MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal = this.getMaxAndMinBigDecimal(subGridServiceAvg.stream().map(o -> o.getScore()).collect(Collectors.toList()));
                     List<List<SubGridAvgResultDTO>> serviceAvgList = ListUtils.partition(subGridServiceAvg, IndexCalConstant.PAGE_SIZE);
@@ -285,7 +288,7 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
         log.info("communityServiceAbilityCalculate getScoreCountOfSampleId param:{}", JSON.toJSONString(indexInputVOS));
         HashMap<String, CalculateResult> scoreTotalOfSampleId = batchScoreCalculator.getScoreTotalOfSampleId(indexInputVOS);
         log.info("communityServiceAbilityCalculate getScoreCountOfSampleId result:{}", JSON.toJSONString(scoreTotalOfSampleId));
-        List<FactIndexCommunityScoreDTO> result = getResultB(scoreTotalOfSampleId, customerId, monthId, NumConstant.ZERO_STR, IndexCodeEnum.FU_WU_NENG_LI.getCode(), IndexCodeEnum.SHE_QU_XIANG_GUAN.getCode(), pid);
+        CommunityCalResultDTO result = getResultB(scoreTotalOfSampleId, customerId, monthId, NumConstant.ZERO_STR, IndexCodeEnum.FU_WU_NENG_LI.getCode(), IndexCodeEnum.SHE_QU_XIANG_GUAN.getCode(), pid);
         deleteAndInsert(result);
         return true;
     }
@@ -325,7 +328,9 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
             });
             result.add(score);
         });
-        deleteAndInsert(result);
+        if (!CollectionUtils.isEmpty(result)){
+            factIndexCommunityScoreDao.insertCommunityPartyRecord(result);
+        }
         return true;
     }
 
@@ -372,18 +377,45 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
     }
 
     /**
-     * @param subAllGridList
+     * @param result
      * @Description 先删除记录，在插入
      * @author zxc
      * @date 2020/9/1 4:24 下午
      */
     @Transactional(rollbackFor = Exception.class)
-    public void deleteAndInsert(List<FactIndexCommunityScoreDTO> subAllGridList) {
-        if (!CollectionUtils.isEmpty(subAllGridList)) {
-            factIndexCommunityScoreDao.insertCommunityPartyRecord(subAllGridList);
+    public void deleteAndInsert(CommunityCalResultDTO result) {
+        if (!CollectionUtils.isEmpty(result.getOneLevel())) {
+            List<List<FactIndexCommunityScoreDTO>> partition = ListUtils.partition(result.getOneLevel(), IndexCalConstant.INSERT_SIZE);
+            partition.forEach(p -> {
+                factIndexCommunityScoreDao.insertCommunityPartyRecord(p);
+            });
+        }
+        if (!CollectionUtils.isEmpty(result.getFiveLevel())){
+            List<List<FactIndexCommunityScoreDTO>> partition = ListUtils.partition(result.getFiveLevel(), IndexCalConstant.INSERT_SIZE);
+            partition.forEach(p -> {
+                communitySubScoreDao.insertCommunityPartyRecord(p);
+            });
         }
     }
 
+    /**
+     * @Description
+     * @param customerId
+     * @param monthId
+     * @author zxc
+     * @date 2020/9/10 2:50 下午
+     */
+    public void deleteOldRecord(String customerId,String monthId){
+        Integer num;
+        do {
+            num = factIndexCommunityScoreDao.deleteOldRecord(customerId, monthId,IndexCalConstant.DELETE_SIZE);
+        }while (num != NumConstant.ZERO);
+        Integer subNum;
+        do {
+            subNum = communitySubScoreDao.deleteOldRecord(customerId,monthId,IndexCalConstant.DELETE_SIZE);
+        }while (subNum != NumConstant.ZERO);
+    }
+
     /**
      * @param scoreCountOfSampleId 指标计算结果
      * @param customerId           客户ID
@@ -394,8 +426,10 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
      * @author zxc
      * @date 2020/9/2 2:37 下午
      */
-    public List<FactIndexCommunityScoreDTO> getResultB(HashMap<String, CalculateResult> scoreCountOfSampleId, String customerId, String monthId, String isTotal, String indexCode,String allParentIndexCode, Map<String, String> pid) {
-        List<FactIndexCommunityScoreDTO> result = new ArrayList<>();
+    public CommunityCalResultDTO getResultB(HashMap<String, CalculateResult> scoreCountOfSampleId, String customerId, String monthId, String isTotal, String indexCode,String allParentIndexCode, Map<String, String> pid) {
+        CommunityCalResultDTO result = new CommunityCalResultDTO();
+        List<FactIndexCommunityScoreDTO> resultOne = new ArrayList<>();
+        List<FactIndexCommunityScoreDTO> resultFive = new ArrayList<>();
         scoreCountOfSampleId.forEach((k, v) -> {
             FactIndexCommunityScoreDTO score = new FactIndexCommunityScoreDTO();
             score.setCustomerId(customerId);
@@ -429,11 +463,13 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
                             s.setParentAgencyId(parentAgency);
                         }
                     });
-                    result.add(s);
+                    resultFive.add(s);
                 });
             }
-            result.add(score);
+            resultOne.add(score);
         });
+        result.setOneLevel(resultOne);
+        result.setFiveLevel(resultFive);
         return result;
     }
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java
index 652958151d..d11a1e7df2 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java
@@ -1,6 +1,7 @@
 package com.epmet.service.evaluationindex.indexcal.impl;
 
 import com.alibaba.druid.util.StringUtils;
+import com.alibaba.fastjson.JSON;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.RenException;
@@ -8,9 +9,11 @@ import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.constant.IndexCalConstant;
 import com.epmet.dao.evaluationindex.indexcal.AgencyScoreDao;
+import com.epmet.dao.evaluationindex.indexcal.AgencySubScoreDao;
 import com.epmet.dao.evaluationindex.indexcal.DeptScoreDao;
 import com.epmet.dao.evaluationindex.indexcoll.FactIndexPartyAblityOrgMonthlyDao;
 import com.epmet.dao.evaluationindex.screen.ScreenCustomerAgencyDao;
+import com.epmet.dto.indexcal.AgencyCalResultDTO;
 import com.epmet.dto.indexcal.AgencyScoreDTO;
 import com.epmet.dto.indexcal.SubAgencyScoreAvgResultDTO;
 import com.epmet.dto.screen.result.MaxAndMinBigDecimalResultDTO;
@@ -59,6 +62,8 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
     private DeptScoreDao deptScoreDao;
     @Autowired
     private ScreenCustomerAgencyDao customerAgencyDao;
+    @Autowired
+    private AgencySubScoreDao agencySubScoreDao;
 
     /**
      * @Description  计算全区相关总分
@@ -157,9 +162,11 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
         });
         BatchScoreCalculator batchScoreCalculator = new BatchScoreCalculator();
         HashMap<String, CalculateResult> scoreTotalOfSampleId = batchScoreCalculator.getScoreTotalOfSampleId(indexInputVOS);
-        List<AgencyScoreDTO> result = getResultB(scoreTotalOfSampleId, customerId, monthId, NumConstant.ZERO_STR, IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(),IndexCodeEnum.QUAN_QU_XIANG_GUAN.getCode(), pid);
-        agencyScoreDao.deleteOldRecord(customerId, monthId,IndexCalConstant.DISTRICT_LEVEL);
-        deleteAndInsert(result);
+        log.info("districtPartyAbilityCalculate getScoreTotalOfSampleId param:{}", JSON.toJSONString(indexInputVOS));
+        log.info("districtPartyAbilityCalculate getScoreCountOfSampleId result:{}", JSON.toJSONString(scoreTotalOfSampleId));
+        AgencyCalResultDTO result = getResultB(scoreTotalOfSampleId, customerId, monthId, NumConstant.ZERO_STR, IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(), IndexCodeEnum.QUAN_QU_XIANG_GUAN.getCode(), pid);
+        deleteOldRecord(customerId,monthId,IndexCalConstant.DISTRICT_LEVEL);
+        insertDetail(result);
         return true;
     }
 
@@ -203,7 +210,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
                 List<SubAgencyScoreAvgResultDTO> deptScoreAvgList = deptScoreDao.selectGovernDeptScoreAvg(customerId, monthId, IndexCodeEnum.ZHI_LI_NENG_LI.getCode());
                 if (CollectionUtils.isEmpty(deptScoreAvgList)) {
                     log.error("查询所有直属部门治理能力平均值集合为空");
-                    return;
+                    //return;
                 } else{
                     MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal = this.getMaxAndMinBigDecimal(deptScoreAvgList.stream().map(o -> o.getScore()).collect(Collectors.toList()));
                     List<List<SubAgencyScoreAvgResultDTO>> governAvg = ListUtils.partition(deptScoreAvgList, IndexCalConstant.PAGE_SIZE);
@@ -225,8 +232,10 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
         });
         BatchScoreCalculator batchScoreCalculator = new BatchScoreCalculator();
         HashMap<String, CalculateResult> scoreTotalOfSampleId = batchScoreCalculator.getScoreTotalOfSampleId(indexInputVOS);
-        List<AgencyScoreDTO> result = getResultB(scoreTotalOfSampleId, customerId, monthId, NumConstant.ZERO_STR, IndexCodeEnum.ZHI_LI_NENG_LI.getCode(),IndexCodeEnum.QUAN_QU_XIANG_GUAN.getCode(), pid);
-        deleteAndInsert(result);
+        log.info("districtGovernAbilityCalculate getScoreTotalOfSampleId param:{}", JSON.toJSONString(indexInputVOS));
+        log.info("districtGovernAbilityCalculate getScoreCountOfSampleId result:{}", JSON.toJSONString(scoreTotalOfSampleId));
+        AgencyCalResultDTO result = getResultB(scoreTotalOfSampleId, customerId, monthId, NumConstant.ZERO_STR, IndexCodeEnum.ZHI_LI_NENG_LI.getCode(), IndexCodeEnum.QUAN_QU_XIANG_GUAN.getCode(), pid);
+        insertDetail(result);
         return true;
     }
 
@@ -272,9 +281,13 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
             }
         });
         BatchScoreCalculator batchScoreCalculator = new BatchScoreCalculator();
-        HashMap<String, CalculateResult> scoreTotalOfSampleId = batchScoreCalculator.getScoreTotalOfSampleId(indexInputVOS);
-        List<AgencyScoreDTO> result = getResultB(scoreTotalOfSampleId, customerId, monthId, NumConstant.ZERO_STR, IndexCodeEnum.FU_WU_NENG_LI.getCode(),IndexCodeEnum.QUAN_QU_XIANG_GUAN.getCode(), pid);
-        deleteAndInsert(result);
+        if (!CollectionUtils.isEmpty(indexInputVOS)) {
+            HashMap<String, CalculateResult> scoreTotalOfSampleId = batchScoreCalculator.getScoreTotalOfSampleId(indexInputVOS);
+            log.info("districtServiceAbilityCalculate getScoreTotalOfSampleId param:{}", JSON.toJSONString(indexInputVOS));
+            log.info("districtServiceAbilityCalculate getScoreCountOfSampleId result:{}", JSON.toJSONString(scoreTotalOfSampleId));
+            AgencyCalResultDTO result = getResultB(scoreTotalOfSampleId, customerId, monthId, NumConstant.ZERO_STR, IndexCodeEnum.FU_WU_NENG_LI.getCode(), IndexCodeEnum.QUAN_QU_XIANG_GUAN.getCode(), pid);
+            insertDetail(result);
+        }
         return true;
     }
 
@@ -314,7 +327,9 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
             });
             result.add(score);
         });
-        deleteAndInsert(result);
+        if (!CollectionUtils.isEmpty(result)){
+            agencyScoreDao.insertStreetRecord(result);
+        }
         return true;
     }
 
@@ -334,15 +349,43 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
     }
 
     /**
-     * @param subAllDistrict
+     * @Description
+     * @param customerId
+     * @param monthId
+     * @param dataType	 数据类型 （街道：street，全区：district）
+     * @author zxc
+     * @date 2020/9/10 2:50 下午
+     */
+    public void deleteOldRecord(String customerId,String monthId,String dataType){
+        Integer num;
+        do {
+            num = agencyScoreDao.deleteOldRecord(customerId, monthId,dataType,IndexCalConstant.DELETE_SIZE);
+        }while (num != NumConstant.ZERO);
+        Integer subNum;
+        do {
+            subNum = agencySubScoreDao.deleteOldRecord(customerId,monthId,dataType,IndexCalConstant.DELETE_SIZE);
+        }while (subNum != NumConstant.ZERO);
+    }
+
+    /**
+     * @param result
      * @Description 先删除记录，在插入
      * @author zxc
      * @date 2020/9/1 4:24 下午
      */
     @Transactional(rollbackFor = Exception.class)
-    public void deleteAndInsert(List<AgencyScoreDTO> subAllDistrict) {
-        if (!CollectionUtils.isEmpty(subAllDistrict)) {
-            agencyScoreDao.insertStreetRecord(subAllDistrict);
+    public void insertDetail(AgencyCalResultDTO result) {
+        if (!CollectionUtils.isEmpty(result.getOneTwoLevel())){
+            List<List<AgencyScoreDTO>> partition = ListUtils.partition(result.getOneTwoLevel(), IndexCalConstant.INSERT_SIZE);
+            partition.forEach(p -> {
+                agencyScoreDao.insertStreetRecord(p);
+            });
+        }
+        if (!CollectionUtils.isEmpty(result.getFiveLevel())){
+            List<List<AgencyScoreDTO>> partition = ListUtils.partition(result.getFiveLevel(), IndexCalConstant.INSERT_SIZE);
+            partition.forEach(p -> {
+                agencySubScoreDao.insertStreetRecord(p);
+            });
         }
     }
 
@@ -356,8 +399,10 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
      * @author zxc
      * @date 2020/9/2 2:37 下午
      */
-    public List<AgencyScoreDTO> getResultB(HashMap<String, CalculateResult> scoreCountOfSampleId, String customerId, String monthId, String isTotal, String indexCode, String allParentIndexCode, Map<String, String> pid) {
-        List<AgencyScoreDTO> result = new ArrayList<>();
+    public AgencyCalResultDTO getResultB(HashMap<String, CalculateResult> scoreCountOfSampleId, String customerId, String monthId, String isTotal, String indexCode, String allParentIndexCode, Map<String, String> pid) {
+        AgencyCalResultDTO result = new AgencyCalResultDTO();
+        List<AgencyScoreDTO> resultOne = new ArrayList<>();
+        List<AgencyScoreDTO> resultFive = new ArrayList<>();
         scoreCountOfSampleId.forEach((k, v) -> {
             AgencyScoreDTO score = new AgencyScoreDTO();
             score.setCustomerId(customerId);
@@ -371,7 +416,8 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
             score.setAllParentIndexCode(allParentIndexCode);
             score.setDataType(IndexCalConstant.DISTRICT_LEVEL);
             pid.forEach((agency, parentAgency) -> {
-                if (k.equals(agency)) {
+                //todo 确认
+                if (k != null && k.equals(agency)) {
                     score.setParentAgencyId(parentAgency);
                 }
             });
@@ -389,15 +435,18 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
                     s.setAllParentIndexCode(streetScore.getAllParentIndexCode());
                     s.setDataType(IndexCalConstant.DISTRICT_LEVEL);
                     pid.forEach((agency, parentAgency) -> {
-                        if (k.equals(agency)) {
+                        //todo 确认
+                        if (k != null && k.equals(agency)) {
                             s.setParentAgencyId(parentAgency);
                         }
                     });
-                    result.add(s);
+                    resultFive.add(s);
                 });
             }
-            result.add(score);
+            resultOne.add(score);
         });
+        result.setOneTwoLevel(resultOne);
+        result.setFiveLevel(resultFive);
         return result;
     }
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateServiceImpl.java
index 5ab74faadf..48b8b46e31 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateServiceImpl.java
@@ -71,56 +71,63 @@ public class IndexCalculateServiceImpl implements IndexCalculateService {
             Boolean flag = false;
             for (String customerId : customerIds) {
                 CalculateCommonFormDTO calculateCommonFormDTO = new CalculateCommonFormDTO(customerId, formDTO.getMonthId());
+                long start = System.currentTimeMillis();
                 try {
                     //计算党员相关的
                     try {
                         CalculateCommonFormDTO param = new CalculateCommonFormDTO(customerId, formDTO.getMonthId());
                         flag = cpcIndexCalculateService.cpcIndexCalculate(param);
-                        log.info("indexCalculate cpcIndexCalculate return result:{}", flag);
+                        log.info("客户Id：{}【党员相关】计算完毕，总耗时：{}秒,result:{}", customerId, (System.currentTimeMillis() - start) / 1000, flag);
                     } catch (Exception e) {
                         log.error("indexCalculate cpcIndexCalculate exception", e);
                         throw new RenException("indexCalculate cpcIndexCalculate exception", e);
                     }
+                    //测试用
 
                     //计算网格
+                    start = System.currentTimeMillis();
                     try {
                         flag = gridCorreLationService.calculateGridCorreLation(calculateCommonFormDTO);
-                        log.info("indexCalculate calculateGridCorreLation return result:{}", flag);
+                        log.info("客户Id：{}【网格相关】计算完毕，总耗时：{}秒,result:{},result:{}", customerId, (System.currentTimeMillis() - start) / 1000, flag);
                     } catch (Exception e) {
                         log.error("indexCalculate calculateGridCorreLation exception", e);
                         throw new RenException("indexCalculate calculateGridCorreLation exception", e);
                     }
                     //计算社区
+                    start = System.currentTimeMillis();
                     try {
                         flag = indexCalculateCommunityService.calCommunityAll(customerId, formDTO.getMonthId());
-                        log.info("indexCalculate calCommunityAll return result:{}", flag);
+                        log.info("客户Id：{}【社区相关】计算完毕，总耗时：{}秒,result:{},result:{}", customerId, (System.currentTimeMillis() - start) / 1000, flag);
                     } catch (Exception e) {
                         log.error("indexCalculate calCommunityAll exception", e);
                         throw new RenException("indexCalculate calAll exception", e);
                     }
 
                     //计算街道
+                    start = System.currentTimeMillis();
                     try {
                         flag = indexCalculateStreetService.calStreetAll(customerId, formDTO.getMonthId());
-                        log.info("indexCalculate calStreetAll return result:{}", flag);
+                        log.info("客户Id：{}【街道相关】计算完毕，总耗时：{}秒,result:{}", customerId, (System.currentTimeMillis() - start) / 1000, flag);
                     } catch (Exception e) {
                         log.error("indexCalculate calStreetAll exception", e);
                         throw new RenException("indexCalculate calStreetAll exception", e);
                     }
 
                     //计算区直属
+                    start = System.currentTimeMillis();
                     try {
                         flag = deptScoreService.calculateDeptCorreLation(calculateCommonFormDTO);
-                        log.info("indexCalculate calculateDeptCorreLation return result:{}", flag);
+                        log.info("客户Id：{}【区直部门】计算完毕，总耗时：{}秒,result:{}", customerId, (System.currentTimeMillis() - start) / 1000, flag);
                     } catch (Exception e) {
                         log.error("indexCalculate calculateDeptCorreLation exception", e);
                         throw new RenException("indexCalculate calculateDeptCorreLation exception", e);
                     }
 
                     //计算全区
+                    start = System.currentTimeMillis();
                     try {
                         indexCalculateDistrictService.calDistrictAll(customerId, formDTO.getMonthId());
-                        log.info("indexCalculate calDistrictAll return result:{}", flag);
+                        log.info("客户Id：{}【全区相关】计算完毕，总耗时：{}秒,result:{}", customerId, (System.currentTimeMillis() - start) / 1000, flag);
                     } catch (Exception e) {
                         log.error("indexCalculate calDistrictAll exception", e);
                         throw new RenException("indexCalculate calDistrictAll exception", e);
@@ -131,8 +138,10 @@ public class IndexCalculateServiceImpl implements IndexCalculateService {
 
                 //计算完毕后 将结果插入大屏相关数据表
                 if (flag) {
+                    start = System.currentTimeMillis();
                     try {
                         factIndexCollectService.insertScreenIndexDataMonthlyAndYearly(formDTO.getMonthId(), formDTO.getCustomerId());
+                        log.info("客户Id：{}分数插入到大屏显示库完毕，总耗时:{}秒", customerId, (System.currentTimeMillis() - start) / 1000);
                     } catch (Exception e) {
                         log.error("indexCalculate insertScreenIndexDataMonthlyAndYearly exception", e);
                         flag = false;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java
index 8efe24bbed..1eb6a60a5b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java
@@ -1,6 +1,7 @@
 package com.epmet.service.evaluationindex.indexcal.impl;
 
 import com.alibaba.druid.util.StringUtils;
+import com.alibaba.fastjson.JSON;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.RenException;
@@ -8,10 +9,12 @@ import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.constant.IndexCalConstant;
 import com.epmet.dao.evaluationindex.indexcal.AgencyScoreDao;
+import com.epmet.dao.evaluationindex.indexcal.AgencySubScoreDao;
 import com.epmet.dao.evaluationindex.indexcal.CommunityScoreDao;
 import com.epmet.dao.evaluationindex.indexcoll.FactIndexGovrnAblityOrgMonthlyDao;
 import com.epmet.dao.evaluationindex.indexcoll.FactIndexPartyAblityOrgMonthlyDao;
 import com.epmet.dao.evaluationindex.indexcoll.FactIndexServiceAblityOrgMonthlyDao;
+import com.epmet.dto.indexcal.AgencyCalResultDTO;
 import com.epmet.dto.indexcal.AgencyScoreDTO;
 import com.epmet.dto.indexcal.SubCommunityAvgResultDTO;
 import com.epmet.dto.screen.result.MaxAndMinBigDecimalResultDTO;
@@ -62,6 +65,8 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
     private CommunityScoreDao communityScoreDao;
     @Autowired
     private AgencyScoreDao agencyScoreDao;
+    @Autowired
+    private AgencySubScoreDao agencySubScoreDao;
 
     /**
      * @Description  计算街道相关总分
@@ -113,7 +118,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
                 List<SubCommunityAvgResultDTO> subCommPartyAvgScore = communityScoreDao.selectSubCommAvgScore(customerId, monthId,IndexCodeEnum.DANG_JIAN_NENG_LI.getCode());
                 if (CollectionUtils.isEmpty(subCommPartyAvgScore)) {
                     log.error(IndexCalConstant.COMMUNITY_PARTY_AVG_NULL);
-                    return;
+                    //todo return;
                 } else if (subCommPartyAvgScore.size() > NumConstant.ZERO) {
                     MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal = this.getMaxAndMinBigDecimal(subCommPartyAvgScore.stream().map(o -> o.getScore()).collect(Collectors.toList()));
                     Integer indexEnd = NumConstant.TEN;
@@ -160,9 +165,11 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
         });
         BatchScoreCalculator batchScoreCalculator = new BatchScoreCalculator();
         HashMap<String, CalculateResult> scoreTotalOfSampleId = batchScoreCalculator.getScoreTotalOfSampleId(indexInputVOS);
-        List<AgencyScoreDTO> result = getResultB(scoreTotalOfSampleId, customerId, monthId, NumConstant.ZERO_STR, IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(),IndexCodeEnum.JIE_DAO_XIANG_GUAN.getCode(), pid);
-        agencyScoreDao.deleteOldRecord(customerId, monthId, IndexCalConstant.STREET_LEVEL);
-        deleteAndInsert(result);
+        log.info("streetPartyAbilityCalculate getScoreTotalOfSampleId param:{}", JSON.toJSONString(indexInputVOS));
+        log.info("streetPartyAbilityCalculate getScoreCountOfSampleId result:{}", JSON.toJSONString(scoreTotalOfSampleId));
+        AgencyCalResultDTO result = getResultB(scoreTotalOfSampleId, customerId, monthId, NumConstant.ZERO_STR, IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(), IndexCodeEnum.JIE_DAO_XIANG_GUAN.getCode(), pid);
+        deleteOldRecord(customerId, monthId, IndexCalConstant.STREET_LEVEL);
+        insertDetail(result);
         return true;
     }
 
@@ -186,7 +193,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
                 List<SubCommunityAvgResultDTO> subGridGovernAvg = communityScoreDao.selectSubCommAvgScore(customerId, monthId,IndexCodeEnum.ZHI_LI_NENG_LI.getCode());
                 if (CollectionUtils.isEmpty(subGridGovernAvg)){
                     log.error("查询街道下属所有社区治理能力汇总为空");
-                    return;
+                    //todo return;
                 }else if (subGridGovernAvg.size() > NumConstant.ZERO) {
                     MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal = this.getMaxAndMinBigDecimal(subGridGovernAvg.stream().map(o -> o.getScore()).collect(Collectors.toList()));
                     List<List<SubCommunityAvgResultDTO>> governAvg = ListUtils.partition(subGridGovernAvg, IndexCalConstant.PAGE_SIZE);
@@ -233,8 +240,10 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
         });
         BatchScoreCalculator batchScoreCalculator = new BatchScoreCalculator();
         HashMap<String, CalculateResult> scoreTotalOfSampleId = batchScoreCalculator.getScoreTotalOfSampleId(indexInputVOS);
-        List<AgencyScoreDTO> result = getResultB(scoreTotalOfSampleId, customerId, monthId, NumConstant.ZERO_STR, IndexCodeEnum.ZHI_LI_NENG_LI.getCode(),IndexCodeEnum.JIE_DAO_XIANG_GUAN.getCode(), pid);
-        deleteAndInsert(result);
+        log.info("streetGovernAbilityCalculate getScoreTotalOfSampleId param:{}", JSON.toJSONString(indexInputVOS));
+        log.info("streetGovernAbilityCalculate getScoreCountOfSampleId result:{}", JSON.toJSONString(scoreTotalOfSampleId));
+        AgencyCalResultDTO result = getResultB(scoreTotalOfSampleId, customerId, monthId, NumConstant.ZERO_STR, IndexCodeEnum.ZHI_LI_NENG_LI.getCode(), IndexCodeEnum.JIE_DAO_XIANG_GUAN.getCode(), pid);
+        insertDetail(result);
         return true;
     }
 
@@ -259,7 +268,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
                 List<SubCommunityAvgResultDTO> subCommServiceAvg = communityScoreDao.selectSubCommAvgScore(customerId, monthId,IndexCodeEnum.FU_WU_NENG_LI.getCode());
                 if (CollectionUtils.isEmpty(subCommServiceAvg)) {
                     log.error("查询街道下属社区服务能力得分平均值为空");
-                    return;
+                    //todo return;
                 } else if (subCommServiceAvg.size() > NumConstant.ZERO) {
                     MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal = this.getMaxAndMinBigDecimal(subCommServiceAvg.stream().map(o -> o.getScore()).collect(Collectors.toList()));
                     List<List<SubCommunityAvgResultDTO>> serviceAvgList = ListUtils.partition(subCommServiceAvg, IndexCalConstant.PAGE_SIZE);
@@ -305,8 +314,10 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
         });
         BatchScoreCalculator batchScoreCalculator = new BatchScoreCalculator();
         HashMap<String, CalculateResult> scoreTotalOfSampleId = batchScoreCalculator.getScoreTotalOfSampleId(indexInputVOS);
-        List<AgencyScoreDTO> result = getResultB(scoreTotalOfSampleId, customerId, monthId, NumConstant.ZERO_STR, IndexCodeEnum.FU_WU_NENG_LI.getCode(),IndexCodeEnum.JIE_DAO_XIANG_GUAN.getCode(), pid);
-        deleteAndInsert(result);
+        log.info("streetServiceAbilityCalculate getScoreTotalOfSampleId param:{}", JSON.toJSONString(indexInputVOS));
+        log.info("streetServiceAbilityCalculate getScoreCountOfSampleId result:{}", JSON.toJSONString(scoreTotalOfSampleId));
+        AgencyCalResultDTO result = getResultB(scoreTotalOfSampleId, customerId, monthId, NumConstant.ZERO_STR, IndexCodeEnum.FU_WU_NENG_LI.getCode(), IndexCodeEnum.JIE_DAO_XIANG_GUAN.getCode(), pid);
+        insertDetail(result);
         return true;
     }
 
@@ -346,7 +357,9 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
             });
             result.add(score);
         });
-        deleteAndInsert(result);
+        if (!CollectionUtils.isEmpty(result)){
+            agencyScoreDao.insertStreetRecord(result);
+        }
         return true;
     }
 
@@ -366,18 +379,46 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
     }
 
     /**
-     * @param subAllCommunityList
+     * @param result
      * @Description 先删除记录，在插入
      * @author zxc
      * @date 2020/9/1 4:24 下午
      */
     @Transactional(rollbackFor = Exception.class)
-    public void deleteAndInsert(List<AgencyScoreDTO> subAllCommunityList) {
-        if (!CollectionUtils.isEmpty(subAllCommunityList)) {
-            agencyScoreDao.insertStreetRecord(subAllCommunityList);
+    public void insertDetail(AgencyCalResultDTO result) {
+        if (!CollectionUtils.isEmpty(result.getOneTwoLevel())) {
+            List<List<AgencyScoreDTO>> partition = ListUtils.partition(result.getOneTwoLevel(), IndexCalConstant.INSERT_SIZE);
+            partition.forEach(p -> {
+                agencyScoreDao.insertStreetRecord(p);
+            });
+        }
+        if (!CollectionUtils.isEmpty(result.getFiveLevel())){
+            List<List<AgencyScoreDTO>> partition = ListUtils.partition(result.getFiveLevel(), IndexCalConstant.INSERT_SIZE);
+            partition.forEach(p -> {
+                agencySubScoreDao.insertStreetRecord(p);
+            });
         }
     }
 
+    /**
+     * @Description
+     * @param customerId
+     * @param monthId
+     * @param dataType	 数据类型 （街道：street，全区：district）
+     * @author zxc
+     * @date 2020/9/10 2:50 下午
+     */
+    public void deleteOldRecord(String customerId,String monthId,String dataType){
+        Integer num;
+        do {
+            num = agencyScoreDao.deleteOldRecord(customerId, monthId,dataType,IndexCalConstant.DELETE_SIZE);
+        }while (num != NumConstant.ZERO);
+        Integer subNum;
+        do {
+            subNum = agencySubScoreDao.deleteOldRecord(customerId,monthId,dataType,IndexCalConstant.DELETE_SIZE);
+        }while (subNum != NumConstant.ZERO);
+    }
+
     /**
      * @param scoreCountOfSampleId 指标计算结果
      * @param customerId           客户ID
@@ -388,8 +429,10 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
      * @author zxc
      * @date 2020/9/2 2:37 下午
      */
-    public List<AgencyScoreDTO> getResultB(HashMap<String, CalculateResult> scoreCountOfSampleId, String customerId, String monthId, String isTotal, String indexCode, String allParentIndexCode, Map<String, String> pid) {
-        List<AgencyScoreDTO> result = new ArrayList<>();
+    public AgencyCalResultDTO getResultB(HashMap<String, CalculateResult> scoreCountOfSampleId, String customerId, String monthId, String isTotal, String indexCode, String allParentIndexCode, Map<String, String> pid) {
+        AgencyCalResultDTO result = new AgencyCalResultDTO();
+        List<AgencyScoreDTO> resultOne = new ArrayList<>();
+        List<AgencyScoreDTO> resultFive = new ArrayList<>();
         scoreCountOfSampleId.forEach((k, v) -> {
             AgencyScoreDTO score = new AgencyScoreDTO();
             score.setCustomerId(customerId);
@@ -425,11 +468,13 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
                             s.setParentAgencyId(parentAgency);
                         }
                     });
-                    result.add(s);
+                    resultFive.add(s);
                 });
             }
-            result.add(score);
+            resultOne.add(score);
         });
+        result.setOneTwoLevel(resultOne);
+        result.setFiveLevel(resultFive);
         return result;
     }
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexCollectServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexCollectServiceImpl.java
index ce32b2ff4d..1a879bd3a8 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexCollectServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexCollectServiceImpl.java
@@ -87,7 +87,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
             int deleteNum;
             do {
                 deleteNum = factIndexPartyAblityCpcMonthlyDao.deleteFactIndexPartyAblityCpcMonthly(customerId, formDTO.getMonthId());
-            } while (deleteNum != NumConstant.ZERO);
+            } while (deleteNum > NumConstant.ZERO);
         }
         if (null != formDTO && !CollectionUtils.isEmpty(formDTO.getDataList())) {
             factIndexPartyAblityCpcMonthlyDao.batchInsertFactIndexPartyAblityCpcMonthly(formDTO.getDataList(), customerId);
@@ -101,7 +101,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
             int deleteNum;
             do {
                 deleteNum = factIndexPartyAblityGridMonthlyDao.deleteFactIndexPartyAblityGridMonthly(customerId, formDTO.getMonthId());
-            } while (deleteNum != NumConstant.ZERO);
+            } while (deleteNum > NumConstant.ZERO);
         }
         if ( !CollectionUtils.isEmpty(formDTO.getDataList())) {
             factIndexPartyAblityGridMonthlyDao.batchInsertFactIndexPartyAblityGridMonthly(formDTO.getDataList(), customerId);
@@ -115,7 +115,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
             int deleteNum;
             do {
                 deleteNum = factIndexPartyAblityOrgMonthlyDao.deleteFactIndexPartyAblityOrgMonthly(customerId, formDTO.getMonthId());
-            } while (deleteNum != NumConstant.ZERO);
+            } while (deleteNum > NumConstant.ZERO);
         }
         if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
             factIndexPartyAblityOrgMonthlyDao.batchInsertFactIndexPartyAblityOrgMonthly(formDTO.getDataList(), customerId);
@@ -129,7 +129,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
             int deleteNum;
             do {
                 deleteNum = factIndexServiceAblityGridMonthlyDao.deleteFactIndexServiceAblityGridMonthly(customerId, formDTO.getMonthId());
-            } while (deleteNum != NumConstant.ZERO);
+            } while (deleteNum > NumConstant.ZERO);
         }
         if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
             factIndexServiceAblityGridMonthlyDao.batchInsertFactIndexServiceAblityGridMonthly(formDTO.getDataList(), customerId);
@@ -143,7 +143,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
             int deleteNum;
             do {
                 deleteNum = factIndexServiceAblityOrgMonthlyDao.deleteFactIndexServiceAblityOrgMonthly(customerId, formDTO.getMonthId());
-            } while (deleteNum != NumConstant.ZERO);
+            } while (deleteNum > NumConstant.ZERO);
         }
         if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
             factIndexServiceAblityOrgMonthlyDao.batchInsertFactIndexServiceAblityOrgMonthly(formDTO.getDataList(), customerId);
@@ -157,7 +157,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
             int deleteNum;
             do {
                 deleteNum = factIndexGovrnAblityGridMonthlyDao.deleteFactIndexGovrnAblityGridMonthly(customerId, formDTO.getMonthId());
-            } while (deleteNum != NumConstant.ZERO);
+            } while (deleteNum > NumConstant.ZERO);
         }
         if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
             factIndexGovrnAblityGridMonthlyDao.batchInsertFactIndexGovrnAblityGridMonthly(formDTO.getDataList(), customerId);
@@ -171,7 +171,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
             int deleteNum;
             do {
                 deleteNum = factIndexGovrnAblityOrgMonthlyDao.deleteFactIndexGovrnAblityOrgMonthly(customerId, formDTO.getMonthId());
-            } while (deleteNum != NumConstant.ZERO);
+            } while (deleteNum > NumConstant.ZERO);
         }
         if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
             factIndexGovrnAblityOrgMonthlyDao.batchInsertFactIndexGovrnAblityOrgMonthly(formDTO.getDataList(), customerId);
@@ -185,7 +185,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
             int deleteNum;
             do {
                 deleteNum = factIndexGovrnAblityDeptMonthlyDao.deleteFactIndexGovrnAblityDeptMonthly(customerId, formDTO.getMonthId());
-            } while (deleteNum != NumConstant.ZERO);
+            } while (deleteNum > NumConstant.ZERO);
         }
         if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
             factIndexGovrnAblityDeptMonthlyDao.batchInsertFactIndexGovrnAblityDeptMonthly(formDTO.getDataList(), customerId);
@@ -198,12 +198,22 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
         if (NumConstant.SIX != monthId.length()){
             throw new RuntimeException("入参monthId格式不正确：monthId =" + monthId);
         }
+        // 根据网格类型，删除 指数-指数数据(每月数值)表中 匹配的数据
+        this.batchDelIndexDataMonthly(customerId, monthId, OrgTypeConstant.GRID);
         // 开始处理 网格相关分值表
         this.startHandleIndexGridScore(monthId, customerId);
+
+        // 根据组织类型，删除 指数-指数数据(每月数值)表中 匹配的数据
+        this.batchDelIndexDataMonthly(customerId, monthId, OrgTypeConstant.AGENCY);
         // 开始处理 社区相关分值表
         this.startHandleIndexCommunityScore(monthId, customerId);
+
+        // 根据部门类型，删除 指数-指数数据(每月数值)表中 匹配的数据
+        this.batchDelIndexDataMonthly(customerId, monthId, OrgTypeConstant.DEPARTMENT);
         // 开始处理 区直部门分值表
         this.startHandleIndexDeptScore(monthId, customerId);
+
+        // 同样是 组织类型，所以不再重复删除了
         // 开始处理 区/街道相关分数表
         this.startHandleIndexAgencyScore(monthId, customerId);
 
@@ -236,16 +246,15 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
         } else {
             mismatchGridList = screenCustomerGridDao.selectListMismatchGridInfo(customerId, null);
         }
-        boolean delFlag = true;
+
         if (!CollectionUtils.isEmpty(mismatchGridList)){
             // 如果进行不匹配查询，查到了其他网格信息，一律赋默认值
             this.insertIndexMonthlyByGridDefaultScore(monthId, customerId, mismatchGridList);
-            delFlag = false;
         }
         // fact_index_grid_score 网格相关分值记录表 grid
         List<FactIndexGridScoreDTO> gridScoreDTOS = factIndexGridScoreDao.selectListGridScore(customerId, monthId);
         // 开始处理实际分数
-        this.insertIndexDataMonthlyByGridScore(delFlag, monthId, customerId, gridScoreDTOS);
+        this.insertIndexDataMonthlyByGridScore(monthId, customerId, gridScoreDTOS);
     }
 
     /**
@@ -272,17 +281,12 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
                     gridScoreDTOS.get(i).getParentAgencyId(), gridScoreDTOS.get(i).getGridName(), monthlyDTO);
             monthlyFormDTOList.add(monthlyDTO);
         }
-        int deleteNum;
-        do {
-            deleteNum = screenIndexDataMonthlyDao.deleteIndexDataMonthly(customerId,monthId);
-        } while (deleteNum != NumConstant.ZERO);
         screenIndexDataMonthlyDao.batchInsertIndexDataMonthly(monthlyFormDTOList, customerId);
     }
 
     /**
      * 将网格相关分值记录表 数据 插入月表 screenIndexDataMonthlyDao
      *
-     * @param delFlag        true: 执行删除语句；false：已经删过一次了，本次只添加不删除
      * @param monthId        202008
      * @param customerId     客户id
      * @param gridScoreDTOS  网格相关分值记录表 当前客户所属月份数据集
@@ -290,7 +294,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
      * @Author zhangyong
      * @Date 14:17 2020-09-03
      **/
-    private void insertIndexDataMonthlyByGridScore(boolean delFlag, String monthId, String customerId, List<FactIndexGridScoreDTO> gridScoreDTOS){
+    private void insertIndexDataMonthlyByGridScore(String monthId, String customerId, List<FactIndexGridScoreDTO> gridScoreDTOS){
         List<IndexDataMonthlyFormDTO> monthlyFormDTOList = new ArrayList<>();
         // 根据网格id进行分组，最后组装一条数据   一个网格 对应 4条数据
         Map<String, List<FactIndexGridScoreDTO>> collect = gridScoreDTOS.stream().collect(Collectors.groupingBy(FactIndexGridScoreDTO::getGridId));
@@ -333,12 +337,6 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
             monthlyFormDTOList.add(monthlyFormDTO);
         }
         if (monthlyFormDTOList.size() > NumConstant.ZERO){
-            if (delFlag){
-                int deleteNum;
-                do {
-                    deleteNum = screenIndexDataMonthlyDao.deleteIndexDataMonthly(customerId,monthId);
-                } while (deleteNum != NumConstant.ZERO);
-            }
             screenIndexDataMonthlyDao.batchInsertIndexDataMonthly(monthlyFormDTOList, customerId);
         }
     }
@@ -363,11 +361,12 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
             for (int i = NumConstant.ZERO; i < indexCommunityIds.size(); i++){
                 communityIds[i] = indexCommunityIds.get(i);
             }
-            // 进行不匹配查询(即返回社区相关分值表 中不存在的社区信息)。
-            mismatchAgencyList = screenCustomerAgencyDao.selectListMismatcAgencyInfo(customerId, communityIds);
+            // 进行不匹配查询(即返回社区相关分值表 中不存在的【社区级】 组织信息)。
+            mismatchAgencyList = screenCustomerAgencyDao.selectListMismatcCommunityAgencyInfo(customerId, communityIds);
         } else {
-            mismatchAgencyList = screenCustomerAgencyDao.selectListMismatcAgencyInfo(customerId, null);
+            mismatchAgencyList = screenCustomerAgencyDao.selectListMismatcCommunityAgencyInfo(customerId, null);
         }
+
         if (!CollectionUtils.isEmpty(mismatchAgencyList)){
             // 如果进行不匹配查询，查到了其他社区信息，一律赋默认值
             this.insertIndexMonthlyByAgencyDefaultScore(monthId, customerId, mismatchAgencyList);
@@ -399,7 +398,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
             monthlyDTO.setServiceAblity(zero);
             monthlyDTO.setGovernAblity(zero);
             // 补充表中其他字段
-            monthlyDTO = this.supplementIndexDataMonthlyTable(monthId, OrgTypeConstant.GRID, communityScoreDTOS.get(i).getAgencyId(),
+            monthlyDTO = this.supplementIndexDataMonthlyTable(monthId, OrgTypeConstant.AGENCY, communityScoreDTOS.get(i).getAgencyId(),
                     communityScoreDTOS.get(i).getPid(), communityScoreDTOS.get(i).getAgencyName(), monthlyDTO);
             monthlyFormDTOList.add(monthlyDTO);
         }
@@ -487,6 +486,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
         } else {
             mismatchDeptList = screenCustomerDeptDao.selectListMismatchDeptInfo(customerId, null);
         }
+
         if (!CollectionUtils.isEmpty(mismatchDeptList)){
             // 如果进行不匹配查询，查到了其他部门信息，一律赋默认值
             this.insertIndexMonthlyByDeptDefaultScore(monthId, customerId, mismatchDeptList);
@@ -518,7 +518,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
             monthlyDTO.setServiceAblity(zero);
             monthlyDTO.setGovernAblity(zero);
             // 补充表中其他字段
-            monthlyDTO = this.supplementIndexDataMonthlyTable(monthId, OrgTypeConstant.GRID, deptScoreDTOS.get(i).getDeptId(),
+            monthlyDTO = this.supplementIndexDataMonthlyTable(monthId, OrgTypeConstant.DEPARTMENT, deptScoreDTOS.get(i).getDeptId(),
                     deptScoreDTOS.get(i).getParentAgencyId(), deptScoreDTOS.get(i).getDeptName(), monthlyDTO);
             monthlyFormDTOList.add(monthlyDTO);
         }
@@ -592,10 +592,11 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
             for (int i = NumConstant.ZERO; i < indexAgencyIds.size(); i++){
                 agencyIds[i] = indexAgencyIds.get(i);
             }
-            mismatchAgencyList = screenCustomerAgencyDao.selectListMismatcAgencyInfo(customerId, agencyIds);
+            mismatchAgencyList = screenCustomerAgencyDao.selectListMismatcStreetAndDistrictAgencyInfo(customerId, agencyIds);
         } else {
-            mismatchAgencyList = screenCustomerAgencyDao.selectListMismatcAgencyInfo(customerId, null);
+            mismatchAgencyList = screenCustomerAgencyDao.selectListMismatcStreetAndDistrictAgencyInfo(customerId, null);
         }
+
         if (!CollectionUtils.isEmpty(mismatchAgencyList)){
             this.insertIndexMonthlyByAgencyDefaultScore(monthId, customerId, mismatchAgencyList);
         }
@@ -733,12 +734,14 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
      * @Date 22:06 2020-09-04
      **/
     private void insertIndexDataYear(String monthId, String customerId){
-        List<IndexDataMonthlyFormDTO> monthlyFormList = screenIndexDataMonthlyDao.selectListIndexDataMonthlyByYear(customerId, getYearStr(monthId), getMonthStr(monthId));
+        // 查询今年，上报了几个月的指数统计
+        Integer monthCount = screenIndexDataMonthlyDao.selectCountIndexDataMonthly(customerId, getYearStr(monthId));
+        List<IndexDataMonthlyFormDTO> monthlyFormList = screenIndexDataMonthlyDao.selectListIndexDataMonthlyByYear(customerId, getYearStr(monthId), monthCount);
         if (monthlyFormList.size() > NumConstant.ZERO){
             int deleteNum;
             do {
                 deleteNum = screenIndexDataYearlyDao.deleteIndexDataYearly(customerId, getYearStr(monthId));
-            } while (deleteNum != NumConstant.ZERO);
+            } while (deleteNum > NumConstant.ZERO);
             List<IndexDataYearlyFormDTO> entity = ConvertUtils.sourceToTarget(monthlyFormList, IndexDataYearlyFormDTO.class);
             screenIndexDataYearlyDao.batchInsertIndexDataYearly(entity, customerId);
         }
@@ -768,4 +771,21 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
     private String getMonthStr(String monthId){
         return monthId.substring(NumConstant.FOUR, NumConstant.SIX);
     }
+
+    /**
+     * 批量删除 指数-指数数据(每月数值) 表数据
+     *
+     * @param customerId
+     * @param monthId        202008
+     * @param orgType        组织类别 agency：组织；部门：department；网格：grid
+     * @return void
+     * @Author zhangyong
+     * @Date 09:55 2020-09-12
+     **/
+    private void batchDelIndexDataMonthly( String customerId, String monthId, String orgType){
+        int deleteNum;
+        do {
+            deleteNum = screenIndexDataMonthlyDao.deleteIndexDataMonthlyByOrgType(customerId, monthId, orgType);
+        } while (deleteNum > NumConstant.ZERO);
+    }
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/KcScreenCollService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/KcScreenCollService.java
new file mode 100644
index 0000000000..492a951156
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/KcScreenCollService.java
@@ -0,0 +1,260 @@
+package com.epmet.service.evaluationindex.screen;
+
+import com.epmet.dto.screencoll.ScreenCollFormDTO;
+import com.epmet.dto.screencoll.form.*;
+
+/**
+ * 大屏数据采集api - kc
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/8/18 10:25
+ */
+public interface KcScreenCollService {
+
+    /**
+     * 1、首页-平台各类总数上报
+     *      当isFirst为true时，后台先按照customerId+dateId，清空数据，再插入。
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *
+     * @param formDTO
+     * @param customerId
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    void insertPlatFormSummary(ScreenCollFormDTO<KcHomePageFormDTO> formDTO, String customerId);
+
+    /**
+     * 2、议题分析-各类总数
+     *      当isFirst为true时，后台先按照customerId+dateId，清空数据，再插入。
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *
+     * @param formDTO
+     * @param customerId
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    void insertIssueSummary(ScreenCollFormDTO<KcIssueSummaryFormDTO> formDTO, String customerId);
+
+    /**
+     * 3、议题分析-参与趋势
+     *      当isFirst为true时，customerId+monthId先删后增
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *
+     * @param formDTO
+     * @param customerId
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    void insertIssueTrend(ScreenCollFormDTO<KcIssueTrendFormDTO> formDTO, String customerId);
+
+    /**
+     * 4、用户分析-各类总数
+     *      当isFirst为true时根据customerId+dateId删除，后插入
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *
+     * @param formDTO
+     * @param customerId
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    void insertUserSummary(ScreenCollFormDTO<KcUserSummaryFormDTO> formDTO, String customerId);
+
+    /**
+     * 5、公益互助-志愿者公益时长排名
+     *      当isFirst为true时根据customerId删除，后插入
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *
+     * @param formDTO
+     * @param customerId
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    void insertVolunteerHeartRank(ScreenCollFormDTO<KcVolunteerHeartRankFormDTO> formDTO, String customerId);
+
+    /**
+     * 6、用户分析-用户趋势
+     *      当isFirst为true时,根据monthId+customerId先删后增
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *
+     * @param formDTO
+     * @param customerId
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    void insertUserHeartRank(ScreenCollFormDTO<KcUserHeartRankFormDTO> formDTO, String customerId);
+
+    /**
+     * 7、公益互助-活动各类总数
+     *      当isFirst为true时,根据customerId+dateId先删后增
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *
+     * @param formDTO
+     * @param customerId
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    void insertActSummary(ScreenCollFormDTO<KcActSummaryFormDTO> formDTO, String customerId);
+
+    /**
+     * 8、公益互助-活动次数趋势
+     *      当isFirst为true时,根据customerId+monthId先删后增
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *
+     * @param formDTO
+     * @param customerId
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    void insertActTrend(ScreenCollFormDTO<KcActTrendFormDTO> formDTO, String customerId);
+
+    /**
+     * 9、公益互助-志愿者画像
+     *      当isFirst为true时,根据 customerId+dateId 先删后增
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *
+     * @param formDTO
+     * @param customerId
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    void insertVolunteerSummary(ScreenCollFormDTO<KcVolunteerSummaryFormDTO> formDTO, String customerId);
+
+    /**
+     * 10、项目分析-各类总数
+     *      当isFirst为true时,根据 customerId+dateId 先删后增
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *
+     * @param formDTO
+     * @param customerId
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    void insertProjectSummary(ScreenCollFormDTO<KcProjectSummaryFormDTO> formDTO, String customerId);
+
+    /**
+     * 11、项目分析-按分类统计
+     *      当isFirst为true时,根据 customerId+dateId 先删后增
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *
+     * @param formDTO
+     * @param customerId
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    void insertCategorySummary(ScreenCollFormDTO<KcCategorySummaryFormDTO> formDTO, String customerId);
+
+    /**
+     * 12、项目分析-满意度分析
+     *      当isFirst为true时,根据 customerId+monthId 先删后增
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *
+     * @param formDTO
+     * @param customerId
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    void insertProjectSatisanalysis(ScreenCollFormDTO<KcProjectSatisanalysisFormDTO> formDTO, String customerId);
+
+    /**
+     * 13、党建声音-新闻各类总数汇总
+     *      当isFirst为true时,根据 customerId+dateId 先删后增
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *
+     * @param formDTO
+     * @param customerId
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    void insertNewsSummary(ScreenCollFormDTO<KcNewsSummaryFormDTO> formDTO, String customerId);
+
+    /**
+     * 14、党建声音-新闻阅读参与趋势
+     *      当isFirst为true时,根据 customerId+monthId 先删后增
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *
+     * @param formDTO
+     * @param customerId
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    void insertNewsTrend(ScreenCollFormDTO<KcNewsTrendFormDTO> formDTO, String customerId);
+
+    /**
+     * 15、党建声音-热度新闻排行
+     *      当isFirst为true时,根据 customerId 先删后增
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *
+     * @param formDTO
+     * @param customerId
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    void insertNewsHotRank(ScreenCollFormDTO<KcNewsHotRankFormDTO> formDTO, String customerId);
+
+    /**
+     * 16、党建声音-新闻按类别统计
+     *      当isFirst为true时,根据 customerId+dateId 先删后增
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *
+     * @param formDTO
+     * @param customerId
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    void insertNewsCategoryAnalysis(ScreenCollFormDTO<KcNewsCategoryAnalysisFormDTO> formDTO, String customerId);
+
+    /**
+     * 17、邻里党群-各类总数汇总
+     *      当isFirst为true时,根据 customerId+dateId 先删后增
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *
+     * @param formDTO
+     * @param customerId
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    void insertGroupSummary(ScreenCollFormDTO<KcGroupSummaryFormDTO> formDTO, String customerId);
+
+    /**
+     * 18、邻里党群-小组详情
+     *      当isFirst为true时,根据 customerId+dateId 先删后增
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *
+     * @param formDTO
+     * @param customerId
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    void insertGroupDetail(ScreenCollFormDTO<KcGroupDetailFormDTO> formDTO, String customerId);
+
+    /**
+     * 19、邻里党群-话题参与趋势
+     *      当isFirst为true时,根据 customerId+monthId 先删后增
+     *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
+     *
+     * @param formDTO
+     * @param customerId
+     * @return void
+     * @Author zhangyong
+     * @Date 15:57 2020-09-09
+     **/
+    void insertGroupTopicTrend(ScreenCollFormDTO<KcGroupTopicTrendFormDTO> formDTO, String customerId);
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/KcScreenCollServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/KcScreenCollServiceImpl.java
new file mode 100644
index 0000000000..2e4abd79df
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/KcScreenCollServiceImpl.java
@@ -0,0 +1,367 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.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.dao.evaluationindex.screen.*;
+import com.epmet.dto.screencoll.ScreenCollFormDTO;
+import com.epmet.dto.screencoll.form.*;
+import com.epmet.service.evaluationindex.screen.KcScreenCollService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+/**
+ * 大屏数据采集
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Service
+@DataSource(DataSourceConstant.EVALUATION_INDEX)
+public class KcScreenCollServiceImpl implements KcScreenCollService {
+
+	@Autowired
+	private ScreenKcPlatformSummaryDailyDao screenKcPlatformSummaryDailyDao;
+    @Autowired
+    private ScreenKcIssueSummaryGridDailyDao screenKcIssueSummaryGridDailyDao;
+    @Autowired
+    private ScreenKcIssueTrendGridMonthlyDao screenKcIssueTrendGridMonthlyDao;
+    @Autowired
+    private ScreenKcUserSummaryDailyDao screenKcUserSummaryDailyDao;
+    @Autowired
+    private ScreenKcVolunteerHeatRankGridDailyDao screenKcVolunteerHeatRankGridDailyDao;
+    @Autowired
+    private ScreenKcUserTrendGridMonthlyDao screenKcUserTrendGridMonthlyDao;
+    @Autowired
+    private ScreenKcActSummaryDailyDao screenKcActSummaryDailyDao;
+    @Autowired
+    private ScreenKcActTrendMonthlyDao screenKcActTrendMonthlyDao;
+    @Autowired
+    private ScreenKcVolunteerSummaryDailyDao screenKcVolunteerSummaryDailyDao;
+    @Autowired
+    private ScreenKcProjectSummaryGridDailyDao screenKcProjectSummaryGridDailyDao;
+    @Autowired
+    private ScreenKcProjectCategoryGridDailyDao screenKcProjectCategoryGridDailyDao;
+    @Autowired
+    private ScreenKcProjectSatisGridMonthlyDao screenKcProjectSatisGridMonthlyDao;
+    @Autowired
+    private ScreenKcNewsSummaryDailyDao screenKcNewsSummaryDailyDao;
+    @Autowired
+    private ScreenKcNewsTrendMonthlyDao screenKcNewsTrendMonthlyDao;
+    @Autowired
+    private ScreenKcNewsRankDao screenKcNewsRankDao;
+    @Autowired
+    private ScreenKcNewsCategoryAnalysisDao screenKcNewsCategoryAnalysisDao;
+    @Autowired
+    private ScreenKcGroupSummaryGridDailyDao screenKcGroupSummaryGridDailyDao;
+    @Autowired
+    private ScreenKcGroupDetailGridDailyDao screenKcGroupDetailGridDailyDao;
+    @Autowired
+    private ScreenKcTopicTrendGridMonthlyDao screenKcTopicTrendGridMonthlyDao;
+
+
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void insertPlatFormSummary(ScreenCollFormDTO<KcHomePageFormDTO> formDTO, String customerId) {
+        if (formDTO.getIsFirst()) {
+            int deleteNum;
+            do {
+                deleteNum = screenKcPlatformSummaryDailyDao.deletePlatFormSummary(customerId, formDTO.getDateId());
+            } while (deleteNum > NumConstant.ZERO);
+        }
+        if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
+            screenKcPlatformSummaryDailyDao.batchInsertPlatFormSummary(formDTO.getDataList(), customerId, formDTO.getDateId());
+        }
+    }
+
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void insertIssueSummary(ScreenCollFormDTO<KcIssueSummaryFormDTO> formDTO, String customerId) {
+        if (formDTO.getIsFirst()) {
+            int deleteNum;
+            do {
+                deleteNum = screenKcIssueSummaryGridDailyDao.deleteIssueSummaryGrid(customerId, formDTO.getDateId());
+            } while (deleteNum > NumConstant.ZERO);
+        }
+        if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
+            screenKcIssueSummaryGridDailyDao.batchInsertIssueSummaryGrid(formDTO.getDataList(), customerId, formDTO.getDateId());
+        }
+    }
+
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void insertIssueTrend(ScreenCollFormDTO<KcIssueTrendFormDTO> formDTO, String customerId) {
+        if (formDTO.getIsFirst()) {
+            int deleteNum;
+            do {
+                deleteNum = screenKcIssueTrendGridMonthlyDao.deleteIssueTrendGrid(customerId, formDTO.getMonthId());
+            } while (deleteNum > NumConstant.ZERO);
+        }
+        if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
+            screenKcIssueTrendGridMonthlyDao.batchInsertIssueTrendGrid(formDTO.getDataList(), customerId, formDTO.getMonthId());
+        }
+    }
+
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void insertUserSummary(ScreenCollFormDTO<KcUserSummaryFormDTO> formDTO, String customerId) {
+        if (formDTO.getIsFirst()) {
+            int deleteNum;
+            do {
+                deleteNum = screenKcUserSummaryDailyDao.deleteUserSummary(customerId, formDTO.getDateId());
+            } while (deleteNum > NumConstant.ZERO);
+        }
+        if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
+            screenKcUserSummaryDailyDao.batchInsertUserSummary(formDTO.getDataList(), customerId, formDTO.getDateId());
+        }
+    }
+
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void insertVolunteerHeartRank(ScreenCollFormDTO<KcVolunteerHeartRankFormDTO> formDTO, String customerId) {
+        if (formDTO.getIsFirst()) {
+            int deleteNum;
+            do {
+                deleteNum = screenKcVolunteerHeatRankGridDailyDao.deleteVolunteerHeatRankGrid(customerId);
+            } while (deleteNum > NumConstant.ZERO);
+        }
+        if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
+            screenKcVolunteerHeatRankGridDailyDao.batchInsertVolunteerHeatRankGrid(formDTO.getDataList(), customerId, formDTO.getDateId());
+        }
+    }
+
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void insertUserHeartRank(ScreenCollFormDTO<KcUserHeartRankFormDTO> formDTO, String customerId) {
+        if (formDTO.getIsFirst()) {
+            int deleteNum;
+            do {
+                deleteNum = screenKcUserTrendGridMonthlyDao.deleteUserTrendGrid(customerId, formDTO.getMonthId());
+            } while (deleteNum > NumConstant.ZERO);
+        }
+        if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
+            screenKcUserTrendGridMonthlyDao.batchInsertUserTrendGrid(formDTO.getDataList(), customerId, formDTO.getMonthId());
+        }
+    }
+
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void insertActSummary(ScreenCollFormDTO<KcActSummaryFormDTO> formDTO, String customerId) {
+        if (formDTO.getIsFirst()) {
+            int deleteNum;
+            do {
+                deleteNum = screenKcActSummaryDailyDao.deleteActSummary(customerId, formDTO.getDateId());
+            } while (deleteNum > NumConstant.ZERO);
+        }
+        if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
+            screenKcActSummaryDailyDao.batchInsertActSummary(formDTO.getDataList(), customerId, formDTO.getDateId());
+        }
+    }
+
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void insertActTrend(ScreenCollFormDTO<KcActTrendFormDTO> formDTO, String customerId) {
+        if (formDTO.getIsFirst()) {
+            int deleteNum;
+            do {
+                deleteNum = screenKcActTrendMonthlyDao.deleteActTrend(customerId, formDTO.getMonthId());
+            } while (deleteNum > NumConstant.ZERO);
+        }
+        if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
+            screenKcActTrendMonthlyDao.batchInsertActTrend(formDTO.getDataList(), customerId, formDTO.getMonthId());
+        }
+    }
+
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void insertVolunteerSummary(ScreenCollFormDTO<KcVolunteerSummaryFormDTO> formDTO, String customerId) {
+        if (formDTO.getIsFirst()) {
+            int deleteNum;
+            do {
+                deleteNum = screenKcVolunteerSummaryDailyDao.deleteVolunteerSummary(customerId, formDTO.getDateId());
+            } while (deleteNum > NumConstant.ZERO);
+        }
+        if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
+            screenKcVolunteerSummaryDailyDao.batchInsertVolunteerSummary(formDTO.getDataList(), customerId, formDTO.getDateId());
+        }
+    }
+
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void insertProjectSummary(ScreenCollFormDTO<KcProjectSummaryFormDTO> formDTO, String customerId) {
+        if (formDTO.getIsFirst()) {
+            int deleteNum;
+            do {
+                deleteNum = screenKcProjectSummaryGridDailyDao.deleteProjectSummary(customerId, formDTO.getDateId());
+            } while (deleteNum > NumConstant.ZERO);
+        }
+        if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
+            screenKcProjectSummaryGridDailyDao.batchInsertProjectSummary(formDTO.getDataList(), customerId, formDTO.getDateId());
+        }
+    }
+
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void insertCategorySummary(ScreenCollFormDTO<KcCategorySummaryFormDTO> formDTO, String customerId) {
+        if (formDTO.getIsFirst()) {
+            int deleteNum;
+            do {
+                deleteNum = screenKcProjectCategoryGridDailyDao.deleteCategoryGrid(customerId, formDTO.getDateId());
+            } while (deleteNum > NumConstant.ZERO);
+        }
+        if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
+            screenKcProjectCategoryGridDailyDao.batchInsertCategoryGrid(formDTO.getDataList(), customerId, formDTO.getDateId());
+        }
+    }
+
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void insertProjectSatisanalysis(ScreenCollFormDTO<KcProjectSatisanalysisFormDTO> formDTO, String customerId) {
+        if (formDTO.getIsFirst()) {
+            int deleteNum;
+            do {
+                deleteNum = screenKcProjectSatisGridMonthlyDao.deleteProjectSatisGrid(customerId, formDTO.getMonthId());
+            } while (deleteNum > NumConstant.ZERO);
+        }
+        if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
+            screenKcProjectSatisGridMonthlyDao.batchInsertProjectSatisGrid(formDTO.getDataList(), customerId, formDTO.getMonthId());
+        }
+    }
+
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void insertNewsSummary(ScreenCollFormDTO<KcNewsSummaryFormDTO> formDTO, String customerId) {
+        if (formDTO.getIsFirst()) {
+            int deleteNum;
+            do {
+                deleteNum = screenKcNewsSummaryDailyDao.deleteNewsSummary(customerId, formDTO.getDateId());
+            } while (deleteNum > NumConstant.ZERO);
+        }
+        if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
+            screenKcNewsSummaryDailyDao.batchInsertNewsSummary(formDTO.getDataList(), customerId, formDTO.getDateId());
+        }
+    }
+
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void insertNewsTrend(ScreenCollFormDTO<KcNewsTrendFormDTO> formDTO, String customerId) {
+        if (formDTO.getIsFirst()) {
+            int deleteNum;
+            do {
+                deleteNum = screenKcNewsTrendMonthlyDao.deleteNewsTrend(customerId, formDTO.getMonthId());
+            } while (deleteNum > NumConstant.ZERO);
+        }
+        if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
+            screenKcNewsTrendMonthlyDao.batchInsertNewsTrend(formDTO.getDataList(), customerId, formDTO.getMonthId());
+        }
+    }
+
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void insertNewsHotRank(ScreenCollFormDTO<KcNewsHotRankFormDTO> formDTO, String customerId) {
+        if (formDTO.getIsFirst()) {
+            int deleteNum;
+            do {
+                deleteNum = screenKcNewsRankDao.deleteNewsRank(customerId);
+            } while (deleteNum > NumConstant.ZERO);
+        }
+        if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
+            screenKcNewsRankDao.batchInsertNewsRank(formDTO.getDataList(), customerId, formDTO.getDateId());
+        }
+    }
+
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void insertNewsCategoryAnalysis(ScreenCollFormDTO<KcNewsCategoryAnalysisFormDTO> formDTO, String customerId) {
+        if (formDTO.getIsFirst()) {
+            int deleteNum;
+            do {
+                deleteNum = screenKcNewsCategoryAnalysisDao.deleteNewsCategoryAnalysis(customerId, formDTO.getDateId());
+            } while (deleteNum > NumConstant.ZERO);
+        }
+        if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
+            screenKcNewsCategoryAnalysisDao.batchInsertNewsCategoryAnalysis(formDTO.getDataList(), customerId, formDTO.getDateId());
+        }
+    }
+
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void insertGroupSummary(ScreenCollFormDTO<KcGroupSummaryFormDTO> formDTO, String customerId) {
+        if (formDTO.getIsFirst()) {
+            int deleteNum;
+            do {
+                deleteNum = screenKcGroupSummaryGridDailyDao.deleteGroupSummaryGrid(customerId, formDTO.getDateId());
+            } while (deleteNum > NumConstant.ZERO);
+        }
+        if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
+            screenKcGroupSummaryGridDailyDao.batchInsertGroupSummaryGrid(formDTO.getDataList(), customerId, formDTO.getDateId());
+        }
+    }
+
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void insertGroupDetail(ScreenCollFormDTO<KcGroupDetailFormDTO> formDTO, String customerId) {
+        if (formDTO.getIsFirst()) {
+            int deleteNum;
+            do {
+                deleteNum = screenKcGroupDetailGridDailyDao.deleteGroupDetailGrid(customerId, formDTO.getDateId());
+            } while (deleteNum > NumConstant.ZERO);
+        }
+        if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
+            screenKcGroupDetailGridDailyDao.batchInsertGroupDetailGrid(formDTO.getDataList(), customerId, formDTO.getDateId());
+        }
+    }
+
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void insertGroupTopicTrend(ScreenCollFormDTO<KcGroupTopicTrendFormDTO> formDTO, String customerId) {
+        if (formDTO.getIsFirst()) {
+            int deleteNum;
+            do {
+                deleteNum = screenKcTopicTrendGridMonthlyDao.deleteTopicTrendGrid(customerId, formDTO.getMonthId());
+            } while (deleteNum > NumConstant.ZERO);
+        }
+        if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
+            screenKcTopicTrendGridMonthlyDao.batchInsertTopicTrendGrid(formDTO.getDataList(), customerId, formDTO.getMonthId());
+        }
+    }
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.3__add_index_table.sql b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.3__add_index_table.sql
new file mode 100644
index 0000000000..6a6ca63849
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.3__add_index_table.sql
@@ -0,0 +1,687 @@
+# /*
+#  Navicat Premium Data Transfer
+#
+#  Source Server         : 亿联开发
+#  Source Server Type    : MySQL
+#  Source Server Version : 50728
+#  Source Host           : 192.168.1.130:3306
+#  Source Schema         : epmet_evaluation_index
+#
+#  Target Server Type    : MySQL
+#  Target Server Version : 50728
+#  File Encoding         : 65001
+#
+#  Date: 12/09/2020 09:10:38
+# */
+#
+# SET NAMES utf8mb4;
+# SET FOREIGN_KEY_CHECKS = 0;
+#
+# -- ----------------------------
+# -- Table structure for fact_index_agency_score
+# -- ----------------------------
+# DROP TABLE IF EXISTS `fact_index_agency_score`;
+# CREATE TABLE `fact_index_agency_score` (
+#                                            `ID` varchar(64) NOT NULL COMMENT 'ID 主键',
+#                                            `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id',
+#                                            `AGENCY_ID` varchar(64) NOT NULL COMMENT '组织id(eg：社区或者街道id)',
+#                                            `PARENT_AGENCY_ID` varchar(64) DEFAULT NULL COMMENT '上级组织id',
+#                                            `YEAR_ID` varchar(32) NOT NULL COMMENT '年度ID: yyyy',
+#                                            `QUARTER_ID` varchar(32) NOT NULL COMMENT '季度id: yyyyQ1、yyyyQ2、yyyyQ3、yyyyQ4',
+#                                            `MONTH_ID` varchar(32) NOT NULL COMMENT '月维度Id: yyyyMM',
+#                                            `DATA_TYPE` varchar(100) NOT NULL DEFAULT '' COMMENT '数据类型 district  ：全区；street：街道',
+#                                            `IS_TOTAL` varchar(1) NOT NULL DEFAULT '0' COMMENT '1：总分；0不是；默认0',
+#                                            `SCORE` decimal(10,6) NOT NULL COMMENT '分值',
+#                                            `INDEX_CODE` varchar(255) NOT NULL COMMENT '党建能力：dangjiannengli；治理能力：zhilinengli；服务能力：fuwunengli；街道相关：jiedaoxiangguan；全区相关:quanquxiangguan',
+#                                            `ALL_PARENT_INDEX_CODE` varchar(256) NOT NULL COMMENT '所有指标code拼接的字符串 冒号隔开',
+#                                            `DEL_FLAG` int(1) NOT NULL COMMENT '1删除，默认0',
+#                                            `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 '更新时间'
+# ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='区/街道相关分数表 ';
+#
+# -- ----------------------------
+# -- Table structure for fact_index_agency_sub_score
+# -- ----------------------------
+# DROP TABLE IF EXISTS `fact_index_agency_sub_score`;
+# CREATE TABLE `fact_index_agency_sub_score` (
+#                                                `ID` varchar(64) NOT NULL COMMENT 'ID 主键',
+#                                                `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id',
+#                                                `AGENCY_ID` varchar(64) NOT NULL COMMENT '组织id(eg：社区或者街道id)',
+#                                                `PARENT_AGENCY_ID` varchar(64) DEFAULT NULL COMMENT '上级组织id',
+#                                                `YEAR_ID` varchar(32) NOT NULL COMMENT '年度ID: yyyy',
+#                                                `QUARTER_ID` varchar(32) NOT NULL COMMENT '季度id: yyyyQ1、yyyyQ2、yyyyQ3、yyyyQ4',
+#                                                `MONTH_ID` varchar(32) NOT NULL COMMENT '月维度Id: yyyyMM',
+#                                                `DATA_TYPE` varchar(100) NOT NULL DEFAULT '' COMMENT '数据类型 district  ：全区；street：街道',
+#                                                `SCORE` decimal(10,6) NOT NULL COMMENT '分值',
+#                                                `INDEX_CODE` varchar(64) NOT NULL COMMENT '党建能力：dangjiannengli；治理能力：zhilinengli；服务能力：fuwunengli；街道相关：jiedaoxiangguan；全区相关:quanquxiangguan',
+#                                                `ALL_PARENT_INDEX_CODE` varchar(256) NOT NULL COMMENT '所有指标code拼接的字符串 冒号隔开',
+#                                                `DEL_FLAG` int(1) NOT NULL COMMENT '1删除，默认0',
+#                                                `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`) USING BTREE
+# ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='区/街道相关分数表 ';
+#
+# -- ----------------------------
+# -- Table structure for fact_index_community_score
+# -- ----------------------------
+# DROP TABLE IF EXISTS `fact_index_community_score`;
+# CREATE TABLE `fact_index_community_score` (
+#                                               `ID` varchar(64) NOT NULL COMMENT 'ID 主键',
+#                                               `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id',
+#                                               `AGENCY_ID` varchar(64) NOT NULL COMMENT '组织id',
+#                                               `PARENT_AGENCY_ID` varchar(64) DEFAULT NULL COMMENT '社区上一级组织id',
+#                                               `YEAR_ID` varchar(32) NOT NULL COMMENT '年度ID: yyyy',
+#                                               `QUARTER_ID` varchar(32) NOT NULL COMMENT '季度id: yyyyQ1、yyyyQ2、yyyyQ3、yyyyQ4',
+#                                               `MONTH_ID` varchar(32) NOT NULL COMMENT '月维度Id: yyyyMM',
+#                                               `IS_TOTAL` varchar(1) NOT NULL DEFAULT '0' COMMENT '1：总分；0不是；默认0',
+#                                               `SCORE` decimal(10,6) NOT NULL COMMENT '分值',
+#                                               `INDEX_CODE` varchar(255) NOT NULL COMMENT '党建能力：dangjiannengli；治理能力：zhilinengli；服务能力：fuwunengli；社区相关：shequxiangguan',
+#                                               `ALL_PARENT_INDEX_CODE` varchar(256) NOT NULL COMMENT '所有指标code拼接的字符串 冒号隔开',
+#                                               `DEL_FLAG` int(1) NOT NULL,
+#                                               `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`) USING BTREE
+# ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='社区相关分数表 ';
+#
+# -- ----------------------------
+# -- Table structure for fact_index_community_sub_score
+# -- ----------------------------
+# DROP TABLE IF EXISTS `fact_index_community_sub_score`;
+# CREATE TABLE `fact_index_community_sub_score` (
+#                                                   `ID` varchar(64) NOT NULL COMMENT 'ID 主键',
+#                                                   `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id',
+#                                                   `AGENCY_ID` varchar(64) NOT NULL COMMENT '组织id',
+#                                                   `PARENT_AGENCY_ID` varchar(64) DEFAULT NULL COMMENT '社区上一级组织id',
+#                                                   `YEAR_ID` varchar(32) NOT NULL COMMENT '年度ID: yyyy',
+#                                                   `QUARTER_ID` varchar(32) NOT NULL COMMENT '季度id: yyyyQ1、yyyyQ2、yyyyQ3、yyyyQ4',
+#                                                   `MONTH_ID` varchar(32) NOT NULL COMMENT '月维度Id: yyyyMM',
+#                                                   `SCORE` decimal(10,6) NOT NULL COMMENT '分值',
+#                                                   `INDEX_CODE` varchar(64) NOT NULL COMMENT '党建能力：dangjiannengli；治理能力：zhilinengli；服务能力：fuwunengli；社区相关：shequxiangguan',
+#                                                   `ALL_PARENT_INDEX_CODE` varchar(256) NOT NULL COMMENT '所有指标code拼接的字符串 冒号隔开',
+#                                                   `DEL_FLAG` int(1) NOT NULL,
+#                                                   `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`) USING BTREE
+# ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='社区相关分数表 ';
+#
+# -- ----------------------------
+# -- Table structure for fact_index_cpc_score
+# -- ----------------------------
+# DROP TABLE IF EXISTS `fact_index_cpc_score`;
+# CREATE TABLE `fact_index_cpc_score` (
+#                                         `ID` varchar(64) NOT NULL COMMENT 'ID 主键',
+#                                         `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id',
+#                                         `AGENCY_ID` varchar(64) NOT NULL COMMENT '网格所属的机关Id',
+#                                         `GRID_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',
+#                                         `USER_ID` varchar(64) NOT NULL COMMENT '用户id',
+#                                         `IS_TOTAL` varchar(1) NOT NULL DEFAULT '0' COMMENT '1：总分；0不是 默认0',
+#                                         `SCORE` decimal(10,6) NOT NULL COMMENT '分值',
+#                                         `INDEX_CODE` varchar(64) NOT NULL COMMENT '参与议事分值：canyuyishi；\r\n党务活动分值：dangwuhuodong；\r\n联系群众分值：lianxiqunzhong；\r\n党建能力分值：dangjiannengli',
+#                                         `ALL_PARENT_INDEX_CODE` varchar(256) NOT NULL COMMENT '所有指标code拼接的字符串 冒号隔开',
+#                                         `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`) USING BTREE
+# ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='党员相关分值';
+#
+# -- ----------------------------
+# -- Table structure for fact_index_cpc_sub_score
+# -- ----------------------------
+# DROP TABLE IF EXISTS `fact_index_cpc_sub_score`;
+# CREATE TABLE `fact_index_cpc_sub_score` (
+#                                             `ID` varchar(64) NOT NULL COMMENT 'ID 主键',
+#                                             `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id',
+#                                             `AGENCY_ID` varchar(64) NOT NULL COMMENT '网格所属的机关Id',
+#                                             `GRID_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',
+#                                             `USER_ID` varchar(64) NOT NULL COMMENT '用户id',
+#                                             `SCORE` decimal(10,6) NOT NULL COMMENT '分值',
+#                                             `INDEX_CODE` varchar(64) NOT NULL COMMENT '参与议事分值：canyuyishi；\r\n党务活动分值：dangwuhuodong；\r\n联系群众分值：lianxiqunzhong；\r\n党建能力分值：dangjiannengli',
+#                                             `ALL_PARENT_INDEX_CODE` varchar(256) NOT NULL COMMENT '所有指标code拼接的字符串 冒号隔开',
+#                                             `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`) USING BTREE
+# ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='党员相关分值';
+#
+# -- ----------------------------
+# -- Table structure for fact_index_dept_score
+# -- ----------------------------
+# DROP TABLE IF EXISTS `fact_index_dept_score`;
+# CREATE TABLE `fact_index_dept_score` (
+#                                          `ID` varchar(64) NOT NULL COMMENT 'ID 主键',
+#                                          `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id',
+#                                          `DEPT_ID` varchar(64) NOT NULL COMMENT '部门id',
+#                                          `AGENCY_ID` varchar(64) DEFAULT NULL COMMENT '部门所属的机关Id',
+#                                          `QUARTER_ID` varchar(32) NOT NULL COMMENT '季度id: yyyyQ1、yyyyQ2、yyyyQ3、yyyyQ4',
+#                                          `YEAR_ID` varchar(32) NOT NULL COMMENT '年度ID: yyyy',
+#                                          `MONTH_ID` varchar(32) NOT NULL COMMENT '月维度Id: yyyyMM',
+#                                          `IS_TOTAL` varchar(1) NOT NULL DEFAULT '0' COMMENT '1：总分；0不是；默认0',
+#                                          `SCORE` decimal(10,6) NOT NULL COMMENT '分值',
+#                                          `INDEX_CODE` varchar(64) NOT NULL COMMENT '治理能力：zhilinengli；区直部门：quzhibumen',
+#                                          `ALL_PARENT_INDEX_CODE` varchar(256) NOT NULL COMMENT '所有指标code拼接的字符串 冒号隔开',
+#                                          `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 '更新时间',
+#                                          PRIMARY KEY (`ID`)
+# ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='区直部门分值表';
+#
+# -- ----------------------------
+# -- Table structure for fact_index_dept_sub_score
+# -- ----------------------------
+# DROP TABLE IF EXISTS `fact_index_dept_sub_score`;
+# CREATE TABLE `fact_index_dept_sub_score` (
+#                                              `ID` varchar(64) NOT NULL COMMENT 'ID 主键',
+#                                              `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id',
+#                                              `DEPT_ID` varchar(64) NOT NULL COMMENT '部门id',
+#                                              `AGENCY_ID` varchar(64) DEFAULT NULL COMMENT '部门所属的机关Id',
+#                                              `QUARTER_ID` varchar(32) NOT NULL COMMENT '季度id: yyyyQ1、yyyyQ2、yyyyQ3、yyyyQ4',
+#                                              `YEAR_ID` varchar(32) NOT NULL COMMENT '年度ID: yyyy',
+#                                              `MONTH_ID` varchar(32) NOT NULL COMMENT '月维度Id: yyyyMM',
+#                                              `SCORE` decimal(10,6) NOT NULL COMMENT '分值',
+#                                              `INDEX_CODE` varchar(64) NOT NULL COMMENT '治理能力：zhilinengli；',
+#                                              `ALL_PARENT_INDEX_CODE` varchar(256) NOT NULL COMMENT '所有指标code拼接的字符串 冒号隔开',
+#                                              `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 '更新时间',
+#                                              PRIMARY KEY (`ID`)
+# ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='区直部门分值表';
+#
+# -- ----------------------------
+# -- Table structure for fact_index_govrn_ablity_dept_monthly
+# -- ----------------------------
+# DROP TABLE IF EXISTS `fact_index_govrn_ablity_dept_monthly`;
+# CREATE TABLE `fact_index_govrn_ablity_dept_monthly` (
+#                                                         `ID` varchar(64) NOT NULL COMMENT 'ID 主键',
+#                                                         `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id',
+#                                                         `AGENCY_ID` varchar(64) NOT NULL COMMENT '部门所属机关Id',
+#                                                         `DEPT_ID` varchar(64) NOT NULL COMMENT '部门id',
+#                                                         `MONTH_ID` varchar(32) NOT NULL COMMENT '月维度Id:yyyyMM',
+#                                                         `QUARTER_ID` varchar(32) NOT NULL COMMENT '季度Id:yyyyQ1,yyyyQ2,yyyyQ3,yyyyQ4',
+#                                                         `YEAR_ID` varchar(32) NOT NULL COMMENT '年Id:yyyy',
+#                                                         `TRANSFERED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '区直部门被吹哨次数',
+#                                                         `CLOSED_PROJECT_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '区直部门办结项目数',
+#                                                         `RESP_PROJECT_RATIO` decimal(10,6) NOT NULL COMMENT '区直部门项目响应度 所有被吹哨后的滞留时间除以项目数',
+#                                                         `HANDLE_PROJECT_RATIO` decimal(10,6) NOT NULL COMMENT '区直部门办结项目的处理效率',
+#                                                         `CLOSED_PROJECT_RATIO` decimal(10,6) NOT NULL COMMENT '区直部门项目办结率',
+#                                                         `SATISFACTION_RATIO` 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(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`) USING BTREE
+# ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='治理能力-区直部门相关数据 ';
+#
+# -- ----------------------------
+# -- Table structure for fact_index_govrn_ablity_grid_monthly
+# -- ----------------------------
+# DROP TABLE IF EXISTS `fact_index_govrn_ablity_grid_monthly`;
+# CREATE TABLE `fact_index_govrn_ablity_grid_monthly` (
+#                                                         `ID` varchar(64) NOT NULL COMMENT 'ID 主键',
+#                                                         `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id',
+#                                                         `AGENCY_ID` varchar(64) NOT NULL COMMENT '网格所属机关Id',
+#                                                         `GRID_ID` varchar(64) NOT NULL COMMENT '网格Id',
+#                                                         `MONTH_ID` varchar(32) NOT NULL COMMENT '月维度Id：yyyyMM',
+#                                                         `QUARTER_ID` varchar(32) NOT NULL COMMENT '季度Id:yyyyQ1,yyyyQ2,yyyyQ3,yyyyQ4',
+#                                                         `YEAR_ID` varchar(32) NOT NULL COMMENT '年Id:yyyy',
+#                                                         `ISSUE_TOTAL` int(11) NOT NULL DEFAULT '0' COMMENT '网格总议题数',
+#                                                         `AVG_ISSUE_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '网格人均议题数目',
+#                                                         `ISSUE_TO_PROJECT_RATIO` decimal(10,6) NOT NULL COMMENT '网格议题转项目率',
+#                                                         `PROJECT_TOTAL` int(11) NOT NULL DEFAULT '0' COMMENT '网格总项目数',
+#                                                         `SELF_SOLVE_PROJECT_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '网格自治项目数 统计期网格自身内办结的项目数目',
+#                                                         `RESOLVE_PROJECT_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '网格办结项目数 统计期内办结的项目数目',
+#                                                         `TRANSFER_RIGHT_RATIO` decimal(10,6) NOT NULL COMMENT '网格吹哨部门准确率',
+#                                                         `SATISFACTION_RATIO` 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(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`) USING BTREE
+# ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='治理能力-网格相关事实表 ';
+#
+# -- ----------------------------
+# -- Table structure for fact_index_govrn_ablity_org_monthly
+# -- ----------------------------
+# DROP TABLE IF EXISTS `fact_index_govrn_ablity_org_monthly`;
+# CREATE TABLE `fact_index_govrn_ablity_org_monthly` (
+#                                                        `ID` varchar(64) NOT NULL COMMENT 'ID 主键',
+#                                                        `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id',
+#                                                        `AGENCY_ID` varchar(64) NOT NULL COMMENT '机关Id',
+#                                                        `PARENT_ID` varchar(64) NOT NULL COMMENT '上级组织Id,如果是根级组织，此列为0',
+#                                                        `MONTH_ID` varchar(32) NOT NULL COMMENT '月维度Id:yyyyMM',
+#                                                        `QUARTER_ID` varchar(32) NOT NULL COMMENT '季度Id:yyyyQ1,yyyyQ2,yyyyQ3,yyyyQ4',
+#                                                        `YEAR_ID` varchar(32) NOT NULL COMMENT '年Id:yyyy',
+#                                                        `DATA_TYPE` varchar(100) NOT NULL DEFAULT '' COMMENT '数据类型 district  ：全区；community：社区；street：街道',
+#                                                        `TRANSFERED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '被吹哨次数',
+#                                                        `CLOSED_PROJECT_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '办结项目数',
+#                                                        `RESP_PROJECT_RATIO` decimal(10,6) NOT NULL COMMENT '项目响应度 所有被吹哨后的滞留时间除以项目数',
+#                                                        `OVERDUE_PROJECT_RATIO` decimal(10,6) NOT NULL COMMENT '社区超期项目率，dataTyp=commnuity有值',
+#                                                        `CLOSED_PROJECT_RATIO` decimal(10,6) NOT NULL COMMENT '办结项目率',
+#                                                        `SATISFACTION_RATIO` decimal(10,6) NOT NULL COMMENT '办结项目满意度',
+#                                                        `HANDLE_PROJECT_RATIO` decimal(10,6) NOT NULL COMMENT '街道办结项目的处理效率, data_type=street时有值',
+#                                                        `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`) USING BTREE
+# ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='治理能力-街道及社区相关数据 ';
+#
+# -- ----------------------------
+# -- Table structure for fact_index_grid_score
+# -- ----------------------------
+# DROP TABLE IF EXISTS `fact_index_grid_score`;
+# CREATE TABLE `fact_index_grid_score` (
+#                                          `ID` varchar(64) NOT NULL COMMENT 'ID 主键',
+#                                          `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id',
+#                                          `GRID_ID` varchar(64) NOT NULL COMMENT '网格Id',
+#                                          `AGENCY_ID` varchar(64) DEFAULT NULL COMMENT '网格所属的机关Id',
+#                                          `ALL_PARENT_IDS` varchar(512) DEFAULT NULL COMMENT '所有上级ID，用英文逗号分开',
+#                                          `QUARTER_ID` varchar(32) NOT NULL COMMENT '季度id: yyyyQ1、yyyyQ2、yyyyQ3、yyyyQ4',
+#                                          `YEAR_ID` varchar(32) NOT NULL COMMENT '年度ID: yyyy',
+#                                          `MONTH_ID` varchar(32) NOT NULL COMMENT '月维度Id: yyyyMM',
+#                                          `IS_TOTAL` varchar(1) NOT NULL DEFAULT '0' COMMENT '1：总分；0不是；默认0',
+#                                          `SCORE` decimal(10,6) NOT NULL COMMENT '分值',
+#                                          `INDEX_CODE` varchar(255) NOT NULL COMMENT '党建能力：dangjiannengli；治理能力：zhilinengli；服务能力：fuwunengli；网格相关：wanggexiangguan',
+#                                          `ALL_PARENT_INDEX_CODE` varchar(256) NOT NULL COMMENT '所有指标code拼接的字符串 冒号隔开',
+#                                          `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 '更新时间'
+# ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='网格相关分值记录表';
+#
+# -- ----------------------------
+# -- Table structure for fact_index_grid_sub_score
+# -- ----------------------------
+# DROP TABLE IF EXISTS `fact_index_grid_sub_score`;
+# CREATE TABLE `fact_index_grid_sub_score` (
+#                                              `ID` varchar(64) NOT NULL COMMENT 'ID 主键',
+#                                              `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id',
+#                                              `GRID_ID` varchar(64) NOT NULL COMMENT '网格Id',
+#                                              `AGENCY_ID` varchar(64) DEFAULT NULL COMMENT '网格所属的机关Id',
+#                                              `ALL_PARENT_IDS` varchar(512) DEFAULT NULL COMMENT '所有上级ID，用英文逗号分开',
+#                                              `QUARTER_ID` varchar(32) NOT NULL COMMENT '季度id: yyyyQ1、yyyyQ2、yyyyQ3、yyyyQ4',
+#                                              `YEAR_ID` varchar(32) NOT NULL COMMENT '年度ID: yyyy',
+#                                              `MONTH_ID` varchar(32) NOT NULL COMMENT '月维度Id: yyyyMM',
+#                                              `SCORE` decimal(10,6) NOT NULL COMMENT '分值',
+#                                              `INDEX_CODE` varchar(64) NOT NULL COMMENT '党建能力：dangjiannengli；治理能力：zhilinengli；服务能力：fuwunengli；网格相关：wanggexiangguan',
+#                                              `ALL_PARENT_INDEX_CODE` varchar(256) NOT NULL COMMENT '所有指标code拼接的字符串 冒号隔开',
+#                                              `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 '更新时间',
+#                                              PRIMARY KEY (`ID`)
+# ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='网格相关分值记录表';
+#
+# -- ----------------------------
+# -- Table structure for fact_index_party_ablity_cpc_monthly
+# -- ----------------------------
+# DROP TABLE IF EXISTS `fact_index_party_ablity_cpc_monthly`;
+# CREATE TABLE `fact_index_party_ablity_cpc_monthly` (
+#                                                        `ID` varchar(64) NOT NULL COMMENT 'ID 主键',
+#                                                        `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id',
+#                                                        `AGENCY_ID` varchar(64) NOT NULL COMMENT '网格所属的机关Id',
+#                                                        `PARENT_ID` varchar(64) DEFAULT NULL COMMENT 'agency_id的上级组织Id',
+#                                                        `GRID_ID` varchar(64) NOT NULL COMMENT '党员所属的网格Id',
+#                                                        `MONTH_ID` varchar(32) NOT NULL COMMENT '月维度Id: yyyMM',
+#                                                        `QUARTER_ID` varchar(32) NOT NULL COMMENT '季度Id: yyyyQ1,yyyyQ2,yyyyQ3,yyyyQ4',
+#                                                        `YEAR_ID` varchar(32) NOT NULL COMMENT '年Id :  yyyy',
+#                                                        `USER_ID` varchar(64) NOT NULL COMMENT '用户id',
+#                                                        `CREATE_TOPIC_COUNT` int(11) NOT NULL COMMENT '党员提出的话题数',
+#                                                        `JOIN_TOPIC_COUNT` int(11) NOT NULL COMMENT '党员参与话题数（支持，反对，评论，浏览）',
+#                                                        `SHIFT_ISSUE_COUNT` int(11) NOT NULL COMMENT '党员提出的话题转议题数',
+#                                                        `SHIFT_PROJECT_COUNT` int(11) NOT NULL COMMENT '党员提出的议题转项目数',
+#                                                        `JOIN_THREE_MEETS_COUNT` int(11) NOT NULL COMMENT '参加三会一课次数',
+#                                                        `GROUP_USER_COUNT` int(11) NOT NULL COMMENT '党员自建群群众人数',
+#                                                        `GROUP_ACTIVE_USER_COUNT` int(11) NOT NULL COMMENT '党员自建群活跃群众人数(08-24)',
+#                                                        `GROUP_TOPIC_COUNT` int(11) NOT NULL COMMENT '党员自建群活跃度——话题数',
+#                                                        `TOPIC_TO_ISSUE_RATIO` 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`) USING BTREE
+# ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='党建能力-党员相关的事实表 ';
+#
+# -- ----------------------------
+# -- Table structure for fact_index_party_ablity_grid_monthly
+# -- ----------------------------
+# DROP TABLE IF EXISTS `fact_index_party_ablity_grid_monthly`;
+# CREATE TABLE `fact_index_party_ablity_grid_monthly` (
+#                                                         `ID` varchar(64) NOT NULL COMMENT 'ID 主键',
+#                                                         `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id',
+#                                                         `AGENCY_ID` varchar(64) NOT NULL COMMENT '机关Id',
+#                                                         `GRID_ID` varchar(64) NOT NULL COMMENT '网格Id',
+#                                                         `MONTH_ID` varchar(32) NOT NULL COMMENT '月维度Id:yyyyMM',
+#                                                         `QUARTER_ID` varchar(32) NOT NULL COMMENT '季度Id yyyyQ1,yyyyQ2,yyyyQ3,yyyyQ4',
+#                                                         `YEAR_ID` varchar(32) NOT NULL COMMENT '年Idyyyy',
+#                                                         `USER_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '网格群众用户数',
+#                                                         `PARTY_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '网格党员用户数',
+#                                                         `ACTIVE_USER_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '网格活跃群众用户数',
+#                                                         `ACTIVE_PARTY_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '网格活跃党员用户数',
+#                                                         `PARTY_AVG_TOPIC_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '网格党员人均提出话题数',
+#                                                         `USER_AVG_TOPIC_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '网格群众人均提出话题数',
+#                                                         `PARTY_AVG_SHIFT_PROJECT_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '网格党员人均提出的议题转项目数',
+#                                                         `USER_AVG_SHIFT_PROJECT_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '网格群众人均提出的议题转项目数',
+#                                                         `CREATE_GROUP_PARTY_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '建群党员数（累计值） 去重',
+#                                                         `PUBLISH_ARTICLE_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '网格发文数',
+#                                                         `ISSUE_TO_PROJECT_RATIO` decimal(10,6) NOT NULL COMMENT '网格议题转项目率',
+#                                                         `CREATE_THREE_MEETS_COUNT` int(11) NOT NULL COMMENT '组织三会一课次数',
+#                                                         `JOIN_THREE_MEETS_COUNT` 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(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`) USING BTREE
+# ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='党建能力-网格相关事实表 ';
+#
+# -- ----------------------------
+# -- Table structure for fact_index_party_ablity_org_monthly
+# -- ----------------------------
+# DROP TABLE IF EXISTS `fact_index_party_ablity_org_monthly`;
+# CREATE TABLE `fact_index_party_ablity_org_monthly` (
+#                                                        `ID` varchar(64) NOT NULL COMMENT 'ID 主键',
+#                                                        `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id',
+#                                                        `AGENCY_ID` varchar(64) NOT NULL COMMENT '机关Id',
+#                                                        `PARENT_ID` varchar(64) NOT NULL COMMENT '上级组织Id',
+#                                                        `MONTH_ID` varchar(32) NOT NULL COMMENT '月维度Id',
+#                                                        `QUARTER_ID` varchar(32) NOT NULL COMMENT '季度Id',
+#                                                        `YEAR_ID` varchar(32) NOT NULL COMMENT '年Id',
+#                                                        `PUBLISH_ARTICLE_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT 'XXX名义发文数',
+#                                                        `DATA_TYPE` varchar(100) NOT NULL DEFAULT '' COMMENT '数据类型district  ：全区；community：社区；street：街道',
+#                                                        `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`) USING BTREE
+# ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='党建能力-街道及社区相关事实表 ';
+#
+# -- ----------------------------
+# -- Table structure for fact_index_service_ablity_grid_monthly
+# -- ----------------------------
+# DROP TABLE IF EXISTS `fact_index_service_ablity_grid_monthly`;
+# CREATE TABLE `fact_index_service_ablity_grid_monthly` (
+#                                                           `ID` varchar(64) NOT NULL COMMENT 'ID 主键',
+#                                                           `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id',
+#                                                           `AGENCY_ID` varchar(64) NOT NULL COMMENT '网格所属组织Id',
+#                                                           `GRID_ID` varchar(64) NOT NULL COMMENT '网格Id',
+#                                                           `MONTH_ID` varchar(32) NOT NULL COMMENT '月维度Id:yyyyMM',
+#                                                           `QUARTER_ID` varchar(32) NOT NULL COMMENT '季度Id:yyyyQ1,yyyyQ2,yyyyQ3,yyyyQ4',
+#                                                           `YEAR_ID` varchar(32) NOT NULL DEFAULT '0' COMMENT '年Id: yyyy',
+#                                                           `ACTIVITY_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '网格活动组织次数 爱心活动',
+#                                                           `VOLUNTEER_RATIO` decimal(10,6) NOT NULL COMMENT '网格志愿者占比',
+#                                                           `PARTY_VOLUNTEER_RATIO` 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(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`) USING BTREE
+# ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='服务能力-网格相关事实表';
+#
+# -- ----------------------------
+# -- Table structure for fact_index_service_ablity_org_monthly
+# -- ----------------------------
+# DROP TABLE IF EXISTS `fact_index_service_ablity_org_monthly`;
+# CREATE TABLE `fact_index_service_ablity_org_monthly` (
+#                                                          `ID` varchar(64) NOT NULL COMMENT 'ID 主键',
+#                                                          `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id',
+#                                                          `AGENCY_ID` varchar(64) NOT NULL COMMENT '组织Id',
+#                                                          `PARENT_ID` varchar(64) NOT NULL COMMENT '上级组织Id',
+#                                                          `MONTH_ID` varchar(32) NOT NULL COMMENT '月维度Id:yyyyMM',
+#                                                          `QUARTER_ID` varchar(32) NOT NULL COMMENT '季度Id:yyyyQ1,yyyyQ2,yyyyQ3,yyyyQ4',
+#                                                          `YEAR_ID` varchar(32) NOT NULL DEFAULT '0' COMMENT '年Id：yyyy',
+#                                                          `ACTIVITY_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '社区/街道活动组织次数 爱心活动',
+#                                                          `DATA_TYPE` varchar(100) NOT NULL DEFAULT '' COMMENT '数据类型 district  ：全区；community：社区；street：街道',
+#                                                          `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`) USING BTREE
+# ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='服务能力-组织（街道|社区|全区）相关事实表 ';
+#
+# -- ----------------------------
+# -- Table structure for index_dict
+# -- ----------------------------
+# DROP TABLE IF EXISTS `index_dict`;
+# CREATE TABLE `index_dict` (
+#                               `ID` varchar(64) NOT NULL COMMENT '主键id',
+#                               `INDEX_NAME` varchar(255) NOT NULL COMMENT '指标名',
+#                               `INDEX_CODE` varchar(64) NOT NULL COMMENT '指标code',
+#                               `INDEX_DESC` varchar(1024) DEFAULT NULL COMMENT '指标描述',
+#                               `LEVEL` varchar(1) NOT NULL COMMENT '指标级别（1,2,3,4,5）',
+#                               `CORRELATION` varchar(32) DEFAULT NULL COMMENT '正相关：positive；负相关：negative',
+#                               `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 '更新时间',
+#                               PRIMARY KEY (`ID`) USING BTREE
+# ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='评价指标字典';
+#
+# -- ----------------------------
+# -- Table structure for index_group
+# -- ----------------------------
+# DROP TABLE IF EXISTS `index_group`;
+# CREATE TABLE `index_group` (
+#                                `ID` varchar(64) NOT NULL COMMENT '主键id',
+#                                `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id',
+#                                `INDEX_ID` varchar(64) NOT NULL COMMENT '指标id',
+#                                `INDEX_CODE` varchar(64) NOT NULL COMMENT '指标code',
+#                                `STATUS` varchar(32) NOT NULL DEFAULT 'enable' COMMENT '是否启用：启用：enable 禁用：disabled',
+#                                `PARENT_INDEX_GROUP_ID` varchar(64) DEFAULT NULL COMMENT '当前指标关联的上一级指标分组，如果没有上一级，则为0',
+#                                `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 '更新时间',
+#                                PRIMARY KEY (`ID`) USING BTREE
+# ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='客户指标分组';
+#
+# -- ----------------------------
+# -- Table structure for index_group_detail
+# -- ----------------------------
+# DROP TABLE IF EXISTS `index_group_detail`;
+# CREATE TABLE `index_group_detail` (
+#                                       `ID` varchar(64) NOT NULL COMMENT '主键id',
+#                                       `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id',
+#                                       `INDEX_GROUP_ID` varchar(64) NOT NULL COMMENT 'index_group.id',
+#                                       `INDEX_ID` varchar(64) NOT NULL COMMENT '指标id',
+#                                       `INDEX_CODE` varchar(64) NOT NULL COMMENT '指标code',
+#                                       `WEIGHT` decimal(5,4) NOT NULL COMMENT '权重（同一组权重总和=1）',
+#                                       `THRESHOLD` decimal(16,4) NOT NULL DEFAULT '-1.0000' COMMENT '计算阈值，-1:没有阈值；如果是百分数则 为0.00几；如果为数据则直接填数值',
+#                                       `ALL_PARENT_INDEX_CODE` varchar(256) NOT NULL COMMENT '所有指标code拼接的字符串 冒号隔开',
+#                                       `STATUS` varchar(32) NOT NULL DEFAULT 'enable' COMMENT '是否启用：启用：enable 禁用：disabled',
+#                                       `CORRELATION` varchar(32) DEFAULT NULL COMMENT '正相关：positive；负相关：negative',
+#                                       `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 '更新时间',
+#                                       PRIMARY KEY (`ID`) USING BTREE
+# ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='客户指标详情';
+#
+# -- ----------------------------
+# -- Table structure for index_group_detail_template
+# -- ----------------------------
+# DROP TABLE IF EXISTS `index_group_detail_template`;
+# CREATE TABLE `index_group_detail_template` (
+#                                                `ID` varchar(64) NOT NULL COMMENT '主键id',
+#                                                `INDEX_GROUP_ID` varchar(64) NOT NULL COMMENT 'index_group_template.id',
+#                                                `INDEX_ID` varchar(64) NOT NULL COMMENT '指标id',
+#                                                `INDEX_CODE` varchar(64) NOT NULL COMMENT '指标code',
+#                                                `WEIGHT` decimal(5,4) NOT NULL COMMENT '权重（同一组权重总和=1）',
+#                                                `THRESHOLD` decimal(16,4) NOT NULL DEFAULT '-1.0000' COMMENT '计算阈值，-1:没有阈值；如果是百分数则 为0.00几；如果为数据则直接填数值',
+#                                                `ALL_PARENT_INDEX_CODE` varchar(256) NOT NULL COMMENT '所有指标code拼接的字符串 冒号隔开',
+#                                                `CORRELATION` varchar(32) DEFAULT NULL COMMENT '正相关：positive；负相关：negative',
+#                                                `STATUS` varchar(32) NOT NULL DEFAULT 'enable' COMMENT '是否启用：启用：enable 禁用：disabled',
+#                                                `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 '更新时间',
+#                                                PRIMARY KEY (`ID`) USING BTREE
+# ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='客户指标详情';
+#
+# -- ----------------------------
+# -- Table structure for index_group_template
+# -- ----------------------------
+# DROP TABLE IF EXISTS `index_group_template`;
+# CREATE TABLE `index_group_template` (
+#                                         `ID` varchar(64) NOT NULL COMMENT '主键id',
+#                                         `INDEX_ID` varchar(64) NOT NULL COMMENT '指标id',
+#                                         `INDEX_CODE` varchar(64) NOT NULL COMMENT '指标code',
+#                                         `STATUS` varchar(32) NOT NULL DEFAULT 'enable' COMMENT '是否启用：启用：enable 禁用：disabled',
+#                                         `PARENT_INDEX_GROUP_ID` varchar(64) DEFAULT NULL COMMENT '当前指标关联的上一级指标分组，如果没有上一级，则为0',
+#                                         `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 '更新时间',
+#                                         PRIMARY KEY (`ID`)
+# ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='客户指标分组';
+#
+# -- ----------------------------
+# -- Table structure for index_code_field_re
+# -- ----------------------------
+# DROP TABLE IF EXISTS `index_code_field_re`;
+# CREATE TABLE `index_code_field_re` (
+#                                        `ID` varchar(64) NOT NULL COMMENT '主键id',
+#                                        `INDEX_CODE` varchar(256) NOT NULL COMMENT '指标code',
+#                                        `FIELD_ID` varchar(32) DEFAULT '' COMMENT '是否启用：启用：enable 禁用：disabled',
+#                                        `DEL_FLAG` varchar(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`) USING BTREE,
+#                                        UNIQUE KEY `unx_index_code` (`INDEX_CODE`)
+# ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='指标code和原始数据对应的字段关系表';
+#
+# -- ----------------------------
+# -- Records of index_code_field_re
+# -- ----------------------------
+# BEGIN;
+# INSERT INTO `index_code_field_re` VALUES ('1', 'dangyuantichuhts', 'CREATE_TOPIC_COUNT', '0', 0, '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00');
+# INSERT INTO `index_code_field_re` VALUES ('10', 'wanggequnzhongyhs', 'USER_COUNT', '0', 0, '', '0000-00-00 00:00:00', 'yinzuomei', '2020-08-30 18:05:13');
+# INSERT INTO `index_code_field_re` VALUES ('11', 'wanggedangyuanyhs', 'PARTY_COUNT', '0', 0, '', '0000-00-00 00:00:00', 'yinzuomei', '2020-08-30 18:05:13');
+# INSERT INTO `index_code_field_re` VALUES ('12', 'wanggehuoyueqzyhs', 'ACTIVE_USER_COUNT', '0', 0, '', '0000-00-00 00:00:00', 'yinzuomei', '2020-08-30 18:05:13');
+# INSERT INTO `index_code_field_re` VALUES ('13', 'wanggehuoyuedyyhs', 'ACTIVE_PARTY_COUNT', '0', 0, '', '0000-00-00 00:00:00', 'yinzuomei', '2020-08-30 18:05:13');
+# INSERT INTO `index_code_field_re` VALUES ('14', 'wanggedangyuanrjtchts', 'PARTY_AVG_TOPIC_COUNT', '0', 0, '', '0000-00-00 00:00:00', 'yinzuomei', '2020-08-30 18:05:13');
+# INSERT INTO `index_code_field_re` VALUES ('15', 'wanggequnzhongrjtchts', 'USER_AVG_TOPIC_COUNT', '0', 0, '', '0000-00-00 00:00:00', 'yinzuomei', '2020-08-30 18:05:13');
+# INSERT INTO `index_code_field_re` VALUES ('16', 'wanggedangyuanrjtcdytzxms', 'PARTY_AVG_SHIFT_PROJECT_COUNT', '0', 0, '', '0000-00-00 00:00:00', 'yinzuomei', '2020-08-30 18:05:13');
+# INSERT INTO `index_code_field_re` VALUES ('17', 'wanggequnzhongrjtcdytzxms', 'USER_AVG_SHIFT_PROJECT_COUNT', '0', 0, '', '0000-00-00 00:00:00', 'yinzuomei', '2020-08-30 18:05:13');
+# INSERT INTO `index_code_field_re` VALUES ('18', 'jianqundangyuans', 'CREATE_GROUP_PARTY_COUNT', '0', 0, '', '0000-00-00 00:00:00', 'yinzuomei', '2020-08-30 18:05:13');
+# INSERT INTO `index_code_field_re` VALUES ('19', 'zuzhineidangydlxqznlkpfpjz', '1', '0', 0, '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00');
+# INSERT INTO `index_code_field_re` VALUES ('2', 'dangyuancanyuhtszcfdplll', 'JOIN_TOPIC_COUNT', '0', 0, '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00');
+# INSERT INTO `index_code_field_re` VALUES ('20', 'wanggedifawsl', 'PUBLISH_ARTICLE_COUNT', '0', 0, '', '0000-00-00 00:00:00', 'yinzuomei', '2020-08-30 18:05:13');
+# INSERT INTO `index_code_field_re` VALUES ('21', 'wanggeyitizxml', 'ISSUE_TO_PROJECT_RATIO', '0', 0, '', '0000-00-00 00:00:00', 'yinzuomei', '2020-08-30 18:22:45');
+# INSERT INTO `index_code_field_re` VALUES ('22', 'zuzhisanhykcs', 'CREATE_THREE_MEETS_COUNT', '0', 0, '', '0000-00-00 00:00:00', 'yinzuomei', '2020-08-30 18:05:13');
+# INSERT INTO `index_code_field_re` VALUES ('23', 'dangyuancanjiashykrc', 'JOIN_THREE_MEETS_COUNT', '0', 0, '', '0000-00-00 00:00:00', 'yinzuomei', '2020-08-30 18:05:13');
+# INSERT INTO `index_code_field_re` VALUES ('24', 'xiashusuoyouwgddjnlpjz', 'PARTY_ABLITY_SCORE', '0', 0, '', '0000-00-00 00:00:00', 'z', '0000-00-00 00:00:00');
+# INSERT INTO `index_code_field_re` VALUES ('25', 'shequmingyifwsl', 'PUBLISH_ARTICLE_COUNT', '0', 0, 'zxc', '0000-00-00 00:00:00', 'zxc', '0000-00-00 00:00:00');
+# INSERT INTO `index_code_field_re` VALUES ('26', 'jiedaoxiashusysqdjnlhzpyz', '1', '0', 0, '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00');
+# INSERT INTO `index_code_field_re` VALUES ('27', 'jiedaomingyifwsl', 'PUBLISH_ARTICLE_COUNT', '0', 0, 'zxc', '0000-00-00 00:00:00', 'zxc', '0000-00-00 00:00:00');
+# INSERT INTO `index_code_field_re` VALUES ('28', 'quxiajijieddjnlhzpyz', '1', '0', 0, '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00');
+# INSERT INTO `index_code_field_re` VALUES ('29', 'qumingyifawsl', 'PUBLISH_ARTICLE_COUNT', '0', 0, '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00');
+# INSERT INTO `index_code_field_re` VALUES ('3', 'dangyuantichudhtzyts', 'SHIFT_ISSUE_COUNT', '0', 0, '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00');
+# INSERT INTO `index_code_field_re` VALUES ('30', 'zuzhineidangydcyysnlkpfpjz', '1', '0', 0, '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00');
+# INSERT INTO `index_code_field_re` VALUES ('31', 'wanggezongyitsm', 'ISSUE_TOTAL', '0', 0, '', '0000-00-00 00:00:00', 'yinzuomei', '2020-08-30 18:22:45');
+# INSERT INTO `index_code_field_re` VALUES ('32', 'wanggerenjunytsm', 'AVG_ISSUE_COUNT', '0', 0, '', '0000-00-00 00:00:00', 'yinzuomei', '2020-08-30 18:22:45');
+# INSERT INTO `index_code_field_re` VALUES ('33', 'wanggezongxiangms', 'PROJECT_TOTAL', '0', 0, '', '0000-00-00 00:00:00', 'yinzuomei', '2020-08-30 18:22:45');
+# INSERT INTO `index_code_field_re` VALUES ('34', 'wanggezizhixms', 'SELF_SOLVE_PROJECT_COUNT', '0', 0, '', '0000-00-00 00:00:00', 'yinzuomei', '2020-08-30 18:22:45');
+# INSERT INTO `index_code_field_re` VALUES ('35', 'wanggebanjiexms', 'RESOLVE_PROJECT_COUNT', '0', 0, '', '0000-00-00 00:00:00', 'yinzuomei', '2020-08-30 18:22:45');
+# INSERT INTO `index_code_field_re` VALUES ('36', 'wanggechuishaobmzql', 'TRANSFER_RIGHT_RATIO', '0', 0, '', '0000-00-00 00:00:00', 'yinzuomei', '2020-08-30 18:22:45');
+# INSERT INTO `index_code_field_re` VALUES ('37', 'wanggeneijiejdxmdmyd', 'SATISFACTION_RATIO', '0', 0, '', '0000-00-00 00:00:00', 'yinzuomei', '2020-08-30 18:22:45');
+# INSERT INTO `index_code_field_re` VALUES ('38', 'shequxiashusywgzlnlhzpyz', '1', '0', 0, '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00');
+# INSERT INTO `index_code_field_re` VALUES ('39', 'shequbeichuiscs', 'TRANSFERED_COUNT', '0', 0, 'zxc', '0000-00-00 00:00:00', 'zxc', '0000-00-00 00:00:00');
+# INSERT INTO `index_code_field_re` VALUES ('4', 'dangyuantichudytzxms', 'SHIFT_PROJECT_COUNT', '0', 0, '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00');
+# INSERT INTO `index_code_field_re` VALUES ('40', 'shequbanjiexms', 'CLOSED_PROJECT_COUNT', '0', 0, 'zxc', '0000-00-00 00:00:00', 'zxc', '0000-00-00 00:00:00');
+# INSERT INTO `index_code_field_re` VALUES ('41', 'shequxiangmuxyd', 'RESP_PROJECT_RATIO', '0', 0, 'zxc', '0000-00-00 00:00:00', 'zxc', '0000-00-00 00:00:00');
+# INSERT INTO `index_code_field_re` VALUES ('42', 'shequchaoqixml', 'OVERDUE_PROJECT_RATIO', '0', 0, 'zxc', '0000-00-00 00:00:00', 'zxc', '0000-00-00 00:00:00');
+# INSERT INTO `index_code_field_re` VALUES ('43', 'shequbanjiexml', 'CLOSED_PROJECT_RATIO', '0', 0, 'zxc', '0000-00-00 00:00:00', 'zxc', '0000-00-00 00:00:00');
+# INSERT INTO `index_code_field_re` VALUES ('44', 'shequbanjiexmmyd', 'SATISFACTION_RATIO', '0', 0, 'zxc', '0000-00-00 00:00:00', 'zxc', '0000-00-00 00:00:00');
+# INSERT INTO `index_code_field_re` VALUES ('45', 'jiedaoxiashusysqzlnlhz', '1', '0', 0, '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00');
+# INSERT INTO `index_code_field_re` VALUES ('46', 'jiedaobeichuiscs', 'TRANSFERED_COUNT', '0', 0, 'zxc', '0000-00-00 00:00:00', 'zxc', '0000-00-00 00:00:00');
+# INSERT INTO `index_code_field_re` VALUES ('47', 'jiedaobanjiexms', 'CLOSED_PROJECT_COUNT', '0', 0, 'zxc', '0000-00-00 00:00:00', 'zxc', '0000-00-00 00:00:00');
+# INSERT INTO `index_code_field_re` VALUES ('48', 'jiedaoxiangmuxyd', 'RESP_PROJECT_RATIO', '0', 0, 'zxc', '0000-00-00 00:00:00', 'zxc', '0000-00-00 00:00:00');
+# INSERT INTO `index_code_field_re` VALUES ('49', 'jiedaobanjiexmdclxl', 'HANDLE_PROJECT_RATIO', '0', 0, '', '0000-00-00 00:00:00', 'zxc', '0000-00-00 00:00:00');
+# INSERT INTO `index_code_field_re` VALUES ('5', 'canjiasanhykcs', 'JOIN_THREE_MEETS_COUNT', '0', 0, '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00');
+# INSERT INTO `index_code_field_re` VALUES ('50', 'jiedaoxiangmubjl', 'CLOSED_PROJECT_RATIO', '0', 0, 'zxc', '0000-00-00 00:00:00', 'zxc', '0000-00-00 00:00:00');
+# INSERT INTO `index_code_field_re` VALUES ('51', 'jiedaojixiangmumyd', 'SATISFACTION_RATIO', '0', 0, 'zxc', '0000-00-00 00:00:00', 'zxc', '0000-00-00 00:00:00');
+# INSERT INTO `index_code_field_re` VALUES ('52', 'quzhibumenbcscs', 'TRANSFERED_COUNT', '0', 0, '', '0000-00-00 00:00:00', 'yinzuomei', '2020-09-03 17:09:31');
+# INSERT INTO `index_code_field_re` VALUES ('53', 'quzhibumenbjxms', 'CLOSED_PROJECT_COUNT', '0', 0, '', '0000-00-00 00:00:00', 'yinzuomei', '2020-09-03 17:09:31');
+# INSERT INTO `index_code_field_re` VALUES ('54', 'quzhibumenxmxyd', 'RESP_PROJECT_RATIO', '0', 0, '', '0000-00-00 00:00:00', 'yinzuomei', '2020-09-03 17:09:31');
+# INSERT INTO `index_code_field_re` VALUES ('55', 'quzhibumenbjxmdclxl', 'HANDLE_PROJECT_RATIO', '0', 0, '', '0000-00-00 00:00:00', 'yinzuomei', '2020-09-03 17:09:31');
+# INSERT INTO `index_code_field_re` VALUES ('56', 'quzhibumenxmbjl', 'CLOSED_PROJECT_RATIO', '0', 0, '', '0000-00-00 00:00:00', 'yinzuomei', '2020-09-03 17:09:31');
+# INSERT INTO `index_code_field_re` VALUES ('57', 'quzhibumenxmmyd', 'SATISFACTION_RATIO', '0', 0, '', '0000-00-00 00:00:00', 'yinzuomei', '2020-09-03 17:09:31');
+# INSERT INTO `index_code_field_re` VALUES ('58', 'suoyoujiedaozlnlpjz', '1', '0', 0, '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00');
+# INSERT INTO `index_code_field_re` VALUES ('59', 'suoyouzhizhubmzlnlpjz', '1', '0', 0, '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00');
+# INSERT INTO `index_code_field_re` VALUES ('6', 'dangyuanzijianqqzrs', 'GROUP_USER_COUNT', '0', 0, '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00');
+# INSERT INTO `index_code_field_re` VALUES ('60', 'wanggehuodongzzcs', 'ACTIVITY_COUNT', '0', 0, '', '0000-00-00 00:00:00', 'yinzuomei', '2020-08-30 18:15:06');
+# INSERT INTO `index_code_field_re` VALUES ('61', 'wanggezhiyuanzzb', 'VOLUNTEER_RATIO', '0', 0, '', '0000-00-00 00:00:00', 'yinzuomei', '2020-08-30 18:15:06');
+# INSERT INTO `index_code_field_re` VALUES ('62', 'wanggedangyuanzyzl', 'PARTY_VOLUNTEER_RATIO', '0', 0, '', '0000-00-00 00:00:00', 'yinzuomei', '2020-08-30 18:15:06');
+# INSERT INTO `index_code_field_re` VALUES ('63', 'shequxiajisywgfwnldfpjz', '1', '0', 0, '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00');
+# INSERT INTO `index_code_field_re` VALUES ('64', 'shequhuodongzzcs', 'ACTIVITY_COUNT', '0', 0, 'zxc', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00');
+# INSERT INTO `index_code_field_re` VALUES ('65', 'jiedaoxiashusqfwnldfpyz', '1', '0', 0, '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00');
+# INSERT INTO `index_code_field_re` VALUES ('66', 'jiedaohuodongzzcs', 'ACTIVITY_COUNT', '0', 0, 'zxc', '0000-00-00 00:00:00', 'zxc', '0000-00-00 00:00:00');
+# INSERT INTO `index_code_field_re` VALUES ('67', 'quxiazhujiedfwnlhzpyz', '1', '0', 0, '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00');
+# INSERT INTO `index_code_field_re` VALUES ('68', 'jiedaojixiangmmyd', 'SATISFACTION_RATIO', '0', 0, 'zxc', '2020-09-04 17:50:33', 'zxc', '2020-09-04 17:50:39');
+# INSERT INTO `index_code_field_re` VALUES ('7', 'dangyuanzijianqhyqzrs', 'GROUP_ACTIVE_USER_COUNT', '0', 0, '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00');
+# INSERT INTO `index_code_field_re` VALUES ('8', 'dangyuanzijianqhydhts', 'GROUP_TOPIC_COUNT', '0', 0, '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00');
+# INSERT INTO `index_code_field_re` VALUES ('9', 'zijianqunhuoydytzxml', 'TOPIC_TO_ISSUE_RATIO', '0', 0, '', '0000-00-00 00:00:00', '', '0000-00-00 00:00:00');
+# COMMIT;
+#
+# SET FOREIGN_KEY_CHECKS = 1;
+select 1;
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml
index 8ad6400d13..99ae63af58 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml
@@ -139,7 +139,7 @@
     </appender>
 
     <!-- 开发、测试环境 -->
-    <springProfile name="dev,test">
+    <springProfile name="dev,test,local">
         <logger name="org.springframework.web" level="INFO"/>
         <logger name="org.springboot.sample" level="INFO"/>
         <logger name="com.epmet.dao" level="DEBUG"/>
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/AgencyScoreDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/AgencyScoreDao.xml
index 45768cdde6..a0c7f2cdae 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/AgencyScoreDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/AgencyScoreDao.xml
@@ -41,6 +41,7 @@
           AND customer_id = #{customerId}
           AND month_id = #{monthId}
           AND data_type = #{dataType}
+          LIMIT #{delNum}
     </delete>
 
     <select id="selectListAgencyScore" resultType="com.epmet.dto.indexcal.AgencyScoreDTO">
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/AgencySubScoreDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/AgencySubScoreDao.xml
index 57bb0cd700..5c086b99e8 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/AgencySubScoreDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/AgencySubScoreDao.xml
@@ -5,7 +5,7 @@
 
     <!-- 【街道】中间表插入 -->
     <insert id="insertStreetRecord">
-        INSERT INTO fact_index_agency_score (ID, CUSTOMER_ID, AGENCY_ID, PARENT_AGENCY_ID, YEAR_ID, QUARTER_ID, MONTH_ID, DATA_TYPE, SCORE, INDEX_CODE, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME )
+        INSERT INTO fact_index_agency_sub_score (ID, CUSTOMER_ID, AGENCY_ID, PARENT_AGENCY_ID, YEAR_ID, QUARTER_ID, MONTH_ID, DATA_TYPE, SCORE, INDEX_CODE,ALL_PARENT_INDEX_CODE, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME )
         VALUES
         <foreach collection="lists" item="item" separator=",">
         (
@@ -19,6 +19,7 @@
             #{item.dataType},
             #{item.score},
             #{item.indexCode},
+            #{item.allParentIndexCode},
             #{item.delFlag},
             #{item.revision},
             #{item.createdBy},
@@ -33,128 +34,13 @@
     <delete id="deleteOldRecord">
         DELETE
         FROM
-            fact_index_agency_score
+            fact_index_agency_sub_score
         WHERE
             del_flag = '0'
           AND customer_id = #{customerId}
           AND month_id = #{monthId}
-          AND index_code = #{indexCode}
           AND data_type = #{dataType}
+          LIMIT #{delNum}
     </delete>
 
-    <select id="selectListAgencyScore" resultType="com.epmet.dto.indexcal.AgencyScoreDTO">
-       SELECT
-            CUSTOMER_ID customerId,
-            AGENCY_ID agencyId,
-			PARENT_AGENCY_ID parentAgencyId,
-            YEAR_ID yearId,
-            MONTH_ID monthId,
-            SCORE score,
-            INDEX_CODE indexCode
-        FROM
-            fact_index_agency_score
-        WHERE
-            DEL_FLAG = '0'
-            AND CUSTOMER_ID = #{customerId}
-            AND MONTH_ID = #{monthId}
-            ORDER BY AGENCY_ID
-    </select>
-
-    <!-- 查询街道相关信息 -->
-    <select id="selectAgencyScoreInfo" resultType="com.epmet.dto.indexcal.AgencyScoreDTO">
-        SELECT
-            CUSTOMER_ID,
-            AGENCY_ID,
-            MONTH_ID,
-            QUARTER_ID,
-            YEAR_ID,
-            SCORE,
-            INDEX_CODE,
-            PARENT_AGENCY_ID
-        FROM
-            fact_index_agency_score
-        WHERE
-            del_flag = 0
-            AND CUSTOMER_ID = #{customerId}
-            AND MONTH_ID = #{monthId}
-            AND INDEX_CODE != "jiedaoxiangguan"
-            AND data_type = #{dataType}
-    </select>
-
-    <select id="selectAgencyScoreAvg" resultType="com.epmet.dto.indexcal.SubAgencyScoreAvgResultDTO">
-        SELECT
-            fics.agency_id,
-            fics.month_id,
-            fics.quarter_id,
-            fics.year_id,
-            ROUND(AVG( fics.score ),6) AS score,
-            fics.customer_id,
-            PARENT_AGENCY_ID AS parentId
-        FROM
-            fact_index_agency_score fics
-        WHERE
-            fics.del_flag = '0'
-          AND fics.customer_id = #{customerId}
-          AND fics.month_id = #{monthId}
-          AND fics.index_code = #{indexCode}
-            AND fics.DATA_TYPE = #{dataType}
-        GROUP BY fics.parent_agency_id
-    </select>
-
-    <insert id="batchInsertAgencyScoreData" parameterType="map">
-        insert into fact_index_agency_score
-        (
-        ID,
-        CUSTOMER_ID,
-
-        AGENCY_ID,
-        PARENT_AGENCY_ID,
-        YEAR_ID,
-        QUARTER_ID,
-        MONTH_ID,
-        DATA_TYPE,
-        SCORE,
-        INDEX_CODE,
-
-        DEL_FLAG,
-        REVISION,
-        CREATED_BY,
-        CREATED_TIME,
-        UPDATED_BY,
-        UPDATED_TIME
-        ) values
-        <foreach collection="list" item="item" index="index" separator=",">
-            (
-            (SELECT REPLACE(UUID(), '-', '') AS id),
-            #{customerId},
-            #{item.agencyId},
-            #{item.parentAgencyId},
-
-            #{item.yearId},
-            #{item.quarterId},
-            #{item.monthId},
-            #{item.dataType},
-            #{item.score},
-            #{item.indexCode},
-            0,
-            0,
-            'APP_USER',
-            now(),
-            'APP_USER',
-            now()
-            )
-        </foreach>
-    </insert>
-
-    <select id="selectListAgencyId" resultType="String">
-       SELECT
-            AGENCY_ID agencyId
-        FROM
-            fact_index_agency_score
-        WHERE
-            DEL_FLAG = '0'
-            AND CUSTOMER_ID = #{customerId}
-            AND MONTH_ID = #{monthId}
-            ORDER BY AGENCY_ID
-    </select>
 </mapper>
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CommunityScoreDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CommunityScoreDao.xml
index 0b038f6a88..c80e0945ff 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CommunityScoreDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CommunityScoreDao.xml
@@ -39,6 +39,7 @@
             del_flag = '0'
           AND customer_id = #{customerId}
           AND month_id = #{monthId}
+          LIMIT #{delNum}
     </delete>
 
     <!-- 查询社区相关信息 -->
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CommunitySubScoreDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CommunitySubScoreDao.xml
index 48b171c119..e6306a57da 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CommunitySubScoreDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CommunitySubScoreDao.xml
@@ -5,7 +5,7 @@
 
     <!-- 党建能力【社区】中间表插入 -->
     <insert id="insertCommunityPartyRecord">
-        INSERT INTO fact_index_community_score ( ID, CUSTOMER_ID, AGENCY_ID, PARENT_AGENCY_ID, YEAR_ID, QUARTER_ID, MONTH_ID, SCORE, INDEX_CODE,ALL_PARENT_INDEX_CODE, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME )
+        INSERT INTO fact_index_community_sub_score ( ID, CUSTOMER_ID, AGENCY_ID, PARENT_AGENCY_ID, YEAR_ID, QUARTER_ID, MONTH_ID, SCORE, INDEX_CODE,ALL_PARENT_INDEX_CODE, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME )
         VALUES
         <foreach collection="lists" item="item" separator=",">
             (
@@ -33,124 +33,12 @@
     <delete id="deleteOldRecord">
         DELETE
         FROM
-            fact_index_community_score
+            fact_index_community_sub_score
         WHERE
             del_flag = '0'
           AND customer_id = #{customerId}
           AND month_id = #{monthId}
+          LIMIT #{delNum}
     </delete>
 
-    <!-- 查询社区相关信息 -->
-    <select id="selectCommunityInfo" resultType="com.epmet.dto.screen.FactIndexCommunityScoreDTO">
-        SELECT
-            CUSTOMER_ID,
-            AGENCY_ID,
-            MONTH_ID,
-            QUARTER_ID,
-            YEAR_ID,
-            SCORE,
-            INDEX_CODE,
-            PARENT_AGENCY_ID
-        FROM
-            fact_index_community_score
-        WHERE
-            del_flag = 0
-          AND CUSTOMER_ID = #{customerId}
-          AND MONTH_ID = #{monthId}
-          AND INDEX_CODE = "dangjiannengli"
-          OR INDEX_CODE = "zhilinengli"
-          OR INDEX_CODE = "fuwunengli"
-    </select>
-
-    <!-- 街道下级所有社区服务能力得分平均值 -->
-    <select id="selectSubCommAvgScore" resultType="com.epmet.dto.indexcal.SubCommunityAvgResultDTO">
-        SELECT
-            fics.PARENT_AGENCY_ID AS agencyId,
-            fics.month_id,
-            fics.quarter_id,
-            fics.year_id,
-            ROUND(AVG( fics.score ),6) AS score,
-            fics.customer_id,
-            sca.pid AS parentId
-        FROM
-            fact_index_community_score fics
-            LEFT JOIN screen_customer_agency sca ON sca.AGENCY_ID = fics.PARENT_AGENCY_ID
-        WHERE
-            fics.del_flag = '0'
-          AND sca.DEL_FLAG = 0
-          AND fics.customer_id = #{customerId}
-          AND fics.month_id = #{monthId}
-          AND fics.index_code = #{indexCode}
-        GROUP BY fics.parent_agency_id
-    </select>
-
-    <select id="selectListCommunityScore" resultType="com.epmet.dto.screen.FactIndexCommunityScoreDTO">
-        SELECT
-            CUSTOMER_ID customerId,
-            AGENCY_ID agencyId,
-			PARENT_AGENCY_ID parentAgencyId,
-            YEAR_ID yearId,
-            MONTH_ID monthId,
-            SCORE score,
-            INDEX_CODE indexCode
-        FROM
-            fact_index_community_score
-        WHERE
-          DEL_FLAG = '0'
-          AND CUSTOMER_ID = #{customerId}
-          AND MONTH_ID = #{monthId}
-		  ORDER BY AGENCY_ID
-    </select>
-
-    <insert id="batchInsertCommunityScoreData" parameterType="map">
-        insert into fact_index_community_score
-        (
-        ID,
-        CUSTOMER_ID,
-        AGENCY_ID,
-        PARENT_AGENCY_ID,
-        YEAR_ID,
-        QUARTER_ID,
-        MONTH_ID,
-        SCORE,
-        INDEX_CODE,
-        DEL_FLAG,
-        REVISION,
-        CREATED_BY,
-        CREATED_TIME,
-        UPDATED_BY,
-        UPDATED_TIME
-        ) values
-        <foreach collection="list" item="item" index="index" separator=",">
-            (
-            (SELECT REPLACE(UUID(), '-', '') AS id),
-            #{customerId},
-            #{item.agencyId},
-            #{item.parentAgencyId},
-            #{item.yearId},
-            #{item.quarterId},
-            #{item.monthId},
-            #{item.score},
-            #{item.indexCode},
-            0,
-            0,
-            'APP_USER',
-            now(),
-            'APP_USER',
-            now()
-            )
-        </foreach>
-    </insert>
-
-    <select id="selectListCommunityId" resultType="String">
-        SELECT
-            AGENCY_ID agencyId
-        FROM
-            fact_index_community_score
-        WHERE
-          DEL_FLAG = '0'
-          AND CUSTOMER_ID = #{customerId}
-          AND MONTH_ID = #{monthId}
-		  ORDER BY AGENCY_ID
-    </select>
 </mapper>
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CpcScoreDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CpcScoreDao.xml
index 13c69b8957..c6e0decab9 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CpcScoreDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CpcScoreDao.xml
@@ -6,11 +6,15 @@
     <delete id="deleteByMonthId">
         delete from fact_index_cpc_score
         where
-        CUSTOMER_ID = #{customerId,jdbcType=VARCHAR}
-        and MONTH_ID = #{monthId,jdbcType=VARCHAR}
-        <if test="indexCode != null and indexCode !=''">
-            and INDEX_CODE = #{indexCode,jdbcType=VARCHAR}
-        </if>
+            CUSTOMER_ID = #{customerId,jdbcType=VARCHAR}
+            AND MONTH_ID = #{monthId,jdbcType=VARCHAR}
+            AND IS_TOTAL = #{isTotal,jdbcType=VARCHAR}
+            <if test="indexCode != null and indexCode !=''">
+                and INDEX_CODE = #{indexCode,jdbcType=VARCHAR}
+            </if>
+            <if test="deleteSize != null">
+                limit #{deleteSize,jdbcType=INTEGER}
+            </if>
     </delete>
 
     <resultMap type="com.epmet.entity.evaluationindex.indexcal.CpcScoreEntity" id="cpcScoreMap">
@@ -36,6 +40,8 @@
             and MONTH_ID = #{monthId,jdbcType=VARCHAR}
             and ALL_PARENT_INDEX_CODE = #{allParentCode,jdbcType=VARCHAR}
             AND IS_TOTAL = '0'
+            order by USER_ID
+            limit #{offset}, #{pageSize}
     </select>
 
 
@@ -51,8 +57,6 @@
             AND m.MONTH_ID = #{monthId}
             AND m.GRID_ID = #{gridId}
             and m.INDEX_CODE='lianxiqunzhong'
-         GROUP BY
-            m.GRID_ID
     </select>
 
     <!-- 获取网格内党员的联系群众能力考评分（平均值）的最大值，最小值   -->
@@ -97,8 +101,6 @@
             AND m.MONTH_ID = #{monthId}
             AND m.GRID_ID = #{gridId}
             and m.INDEX_CODE='canyuyishi'
-         GROUP BY
-            m.GRID_ID
     </select>
 
     <insert id="insertBatch">
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CpcSubScoreDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CpcSubScoreDao.xml
index b1e069bab2..eb6e291f37 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CpcSubScoreDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CpcSubScoreDao.xml
@@ -6,10 +6,12 @@
     <delete id="deleteByMonthId">
         delete from fact_index_cpc_sub_score
         where
-        CUSTOMER_ID = #{customerId,jdbcType=VARCHAR}
-        and MONTH_ID = #{monthId,jdbcType=VARCHAR}
-        and ALL_PARENT_INDEX_CODE = #{allParentCode,jdbcType=VARCHAR}
-
+            CUSTOMER_ID = #{customerId,jdbcType=VARCHAR}
+            and MONTH_ID = #{monthId,jdbcType=VARCHAR}
+            and ALL_PARENT_INDEX_CODE = #{allParentCode,jdbcType=VARCHAR}
+            <if test="deleteSize != null">
+                limit #{deleteSize,jdbcType=INTEGER}
+            </if>
     </delete>
 
     <resultMap type="com.epmet.entity.evaluationindex.indexcal.CpcScoreEntity" id="cpcScoreMap">
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/DeptScoreDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/DeptScoreDao.xml
index 077c6a7430..f232171208 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/DeptScoreDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/DeptScoreDao.xml
@@ -43,7 +43,33 @@
         GROUP BY fidc.agency_id
     </select>
 
-    <insert id="batchInsertDeptScoreData" parameterType="map">
+
+    <select id="selectListDeptId" resultType="String">
+       	SELECT
+            DEPT_ID deptId
+        FROM
+            fact_index_dept_score
+        WHERE
+            DEL_FLAG = '0'
+          AND CUSTOMER_ID = #{customerId}
+          AND MONTH_ID = #{monthId}
+		  ORDER BY DEPT_ID
+    </select>
+
+    <!-- 根据客户id+monthId,删除这个月某个指标所有的数据   -->
+    <delete id="deleteByDeptIdAndMonthId" parameterType="map">
+        delete from fact_index_dept_score where   CUSTOMER_ID = #{customerId}
+          AND MONTH_ID = #{monthId}
+          <if test="indexCode != null and indexCode !=''">
+            and INDEX_CODE=#{indexCode}
+          </if>
+          <if test="deleteSize != null">
+            limit #{deleteSize}
+          </if>
+    </delete>
+
+    <!--  批量插入计算结果  -->
+    <insert id="insertBatchEntity">
         insert into fact_index_dept_score
         (
         ID,
@@ -56,7 +82,7 @@
         IS_TOTAL,
         SCORE,
         INDEX_CODE,
-
+        ALL_PARENT_INDEX_CODE,
         DEL_FLAG,
         REVISION,
         CREATED_BY,
@@ -67,17 +93,17 @@
         <foreach collection="list" item="item" index="index" separator=",">
             (
             (SELECT REPLACE(UUID(), '-', '') AS id),
-            #{customerId},
+            #{item.customerId},
             #{item.deptId},
             #{item.agencyId},
             #{item.quarterId},
             #{item.yearId},
-
             #{item.monthId},
             #{item.isTotal},
             #{item.score},
             #{item.indexCode},
-            #{item.delFlag},
+            #{item.allParentIndexCode},
+            0,
             0,
             'APP_USER',
             now(),
@@ -87,21 +113,38 @@
         </foreach>
     </insert>
 
-    <select id="selectListDeptId" resultType="String">
-       	SELECT
-            DEPT_ID deptId
-        FROM
-            fact_index_dept_score
-        WHERE
-            DEL_FLAG = '0'
-          AND CUSTOMER_ID = #{customerId}
-          AND MONTH_ID = #{monthId}
-		  ORDER BY DEPT_ID
-    </select>
 
-    <delete id="deleteByDeptIdAndMonthId" parameterType="map">
-        delete from fact_index_dept_score where   CUSTOMER_ID = #{customerId}
-          AND MONTH_ID = #{monthId}
-          and DEPT_ID=#{deptId}
-    </delete>
+    <resultMap id="DeptScoreDTOMap" type="com.epmet.dto.indexcal.DeotScore">
+        <result property="deptId" column="DEPT_ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="agencyId" column="AGENCY_ID"/>
+        <result property="quarterId" column="QUARTER_ID"/>
+        <result property="yearId" column="YEAR_ID"/>
+        <result property="monthId" column="MONTH_ID"/>
+        <collection property="detailList" ofType="com.epmet.dto.indexcal.DeptScoreDetailDTO" >
+            <result property="isTotal" column="IS_TOTAL"/>
+            <result property="score" column="SCORE"/>
+            <result property="indexCode" column="INDEX_CODE"/>
+        </collection>
+    </resultMap>
+    <!-- 查询每个部门下所有的指标对应的分值   -->
+    <select id="selectList" parameterType="com.epmet.dto.indexcal.CalculateCommonFormDTO" resultMap="DeptScoreDTOMap">
+        SELECT
+                m.DEPT_ID,
+                m.CUSTOMER_ID,
+                m.AGENCY_ID,
+                m.QUARTER_ID,
+                m.YEAR_ID,
+                m.MONTH_ID,
+                m.IS_TOTAL,
+                M.SCORE,
+                M.INDEX_CODE
+            FROM
+                fact_index_dept_score m
+            WHERE
+                m.DEL_FLAG = '0'
+                AND m.IS_TOTAL='0'
+                AND m.CUSTOMER_ID =#{customerId}
+                AND m.MONTH_ID =#{monthId}
+    </select>
 </mapper>
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/DeptSubScoreDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/DeptSubScoreDao.xml
index f75bed424b..21ca50b196 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/DeptSubScoreDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/DeptSubScoreDao.xml
@@ -2,47 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.epmet.dao.evaluationindex.indexcal.DeptSubScoreDao">
-
-    <select id="selectListDeptScore" resultType="com.epmet.dto.indexcal.DeptScoreDTO">
-       	SELECT
-            CUSTOMER_ID customerId,
-            DEPT_ID deptId,
-            YEAR_ID yearId,
-            MONTH_ID monthId,
-            SCORE score,
-            INDEX_CODE indexCode
-        FROM
-            fact_index_dept_score
-        WHERE
-            DEL_FLAG = '0'
-          AND CUSTOMER_ID = #{customerId}
-          AND MONTH_ID = #{monthId}
-		  ORDER BY DEPT_ID
-    </select>
-
-    <!-- 所有直属部门治理能力平均值 -->
-    <select id="selectGovernDeptScoreAvg" resultType="com.epmet.dto.indexcal.SubAgencyScoreAvgResultDTO">
-        SELECT
-            fidc.agency_id,
-            fidc.month_id,
-            fidc.quarter_id,
-            fidc.year_id,
-            AVG( fidc.score ) AS score,
-            fidc.customer_id,
-            sca.pid AS parentId
-        FROM
-            fact_index_dept_score fidc
-            LEFT JOIN screen_customer_agency sca ON sca.AGENCY_ID = fidc.AGENCY_ID
-        WHERE
-            fidc.del_flag = '0'
-          AND fidc.customer_id = #{customerId}
-          AND fidc.month_id = #{monthId}
-          AND fidc.index_code = #{indexCode}
-        GROUP BY fidc.agency_id
-    </select>
-
-    <insert id="batchInsertDeptScoreData" parameterType="map">
-        insert into fact_index_dept_score
+    <!--    批量插入计算结果 五级指标分数值 -->
+    <insert id="insertBatchEntity">
+        insert into fact_index_dept_sub_score
         (
         ID,
         CUSTOMER_ID,
@@ -53,7 +15,7 @@
         MONTH_ID,
         SCORE,
         INDEX_CODE,
-
+        ALL_PARENT_INDEX_CODE,
         DEL_FLAG,
         REVISION,
         CREATED_BY,
@@ -64,16 +26,16 @@
         <foreach collection="list" item="item" index="index" separator=",">
             (
             (SELECT REPLACE(UUID(), '-', '') AS id),
-            #{customerId},
+            #{item.customerId},
             #{item.deptId},
             #{item.agencyId},
             #{item.quarterId},
             #{item.yearId},
-
             #{item.monthId},
             #{item.score},
             #{item.indexCode},
-            #{item.delFlag},
+            #{item.allParentIndexCode},
+            0,
             0,
             'APP_USER',
             now(),
@@ -83,21 +45,14 @@
         </foreach>
     </insert>
 
-    <select id="selectListDeptId" resultType="String">
-       	SELECT
-            DEPT_ID deptId
-        FROM
-            fact_index_dept_score
-        WHERE
-            DEL_FLAG = '0'
-          AND CUSTOMER_ID = #{customerId}
-          AND MONTH_ID = #{monthId}
-		  ORDER BY DEPT_ID
-    </select>
-
-    <delete id="deleteByDeptIdAndMonthId" parameterType="map">
-        delete from fact_index_dept_score where   CUSTOMER_ID = #{customerId}
-          AND MONTH_ID = #{monthId}
-          and DEPT_ID=#{deptId}
+    <!--  批量删除  -->
+    <delete id="deleteBatches" parameterType="map">
+        delete from fact_index_dept_sub_score
+        where CUSTOMER_ID = #{customerId}
+        AND MONTH_ID = #{monthId}
+        and ALL_PARENT_INDEX_CODE=#{allParentIndexCode}
+        <if test="deleteSize != null">
+            limit #{deleteSize}
+        </if>
     </delete>
 </mapper>
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridScoreDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridScoreDao.xml
index d42d063e35..9fd9adbb43 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridScoreDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridScoreDao.xml
@@ -15,6 +15,7 @@
         <result property="isTotal" column="IS_TOTAL"/>
         <result property="score" column="SCORE"/>
         <result property="indexCode" column="INDEX_CODE"/>
+        <result property="allParentIndexCode" column="ALL_PARENT_INDEX_CODE"/>
         <result property="delFlag" column="DEL_FLAG"/>
         <result property="revision" column="REVISION"/>
         <result property="createdBy" column="CREATED_BY"/>
@@ -23,7 +24,7 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
-    <delete id="deleteByCusAndMonthId" parameterType="map">
+    <delete id="deleteBatches" parameterType="map">
         DELETE
         FROM
             fact_index_grid_score
@@ -31,9 +32,12 @@
             CUSTOMER_ID = #{customerId}
             AND MONTH_ID = #{monthId}
             AND INDEX_CODE = #{indexCode}
-            and IS_TOTAL=#{isTotal}
+            <if test="deleteSize != null">
+                limit #{deleteSize}
+            </if>
     </delete>
 
+    <!--  批量插入计算结果  -->
     <insert id="insertBatches">
         INSERT INTO `fact_index_grid_score` (
         `ID`,
@@ -47,6 +51,7 @@
         `IS_TOTAL`,
         `SCORE`,
         `INDEX_CODE`,
+        ALL_PARENT_INDEX_CODE,
         `DEL_FLAG`,
         `REVISION`,
         `CREATED_BY`,
@@ -68,6 +73,7 @@
             #{item.isTotal},
             #{item.score},
             #{item.indexCode},
+            #{item.allParentIndexCode},
             0,
             0,
             'APP_USER',
@@ -156,50 +162,6 @@
         ORDER BY GRID_ID
     </select>
 
-    <insert id="batchInsertGridScoreData" parameterType="map">
-        insert into fact_index_grid_score
-        (
-        ID,
-        CUSTOMER_ID,
-        GRID_ID,
-        AGENCY_ID,
-        ALL_PARENT_IDS,
-        QUARTER_ID,
-        YEAR_ID,
-        MONTH_ID,
-        IS_TOTAL,
-        SCORE,
-        INDEX_CODE,
-        DEL_FLAG,
-        REVISION,
-        CREATED_BY,
-        CREATED_TIME,
-        UPDATED_BY,
-        UPDATED_TIME
-        ) values
-        <foreach collection="list" item="item" index="index" separator=",">
-            (
-            (SELECT REPLACE(UUID(), '-', '') AS id),
-            #{customerId},
-            #{item.gridId},
-            #{item.agencyId},
-            #{item.allParentIds},
-            #{item.quarterId},
-
-            #{item.yearId},
-            #{item.monthId},
-            #{item.isTotal},
-            #{item.score},
-            #{item.indexCode},
-            #{item.delFlag},
-            0,
-            'APP_USER',
-            now(),
-            'APP_USER',
-            now()
-            )
-        </foreach>
-    </insert>
 
     <select id="selectListGridId" resultType="String">
         SELECT
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridSubScoreDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridSubScoreDao.xml
index 54d36b195e..7111976b9d 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridSubScoreDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridSubScoreDao.xml
@@ -3,18 +3,9 @@
 
 <mapper namespace="com.epmet.dao.evaluationindex.indexcal.GridSubScoreDao">
 
-    <delete id="deleteByCusAndMonthId" parameterType="map">
-        DELETE
-        FROM
-            fact_index_grid_score
-        WHERE
-            CUSTOMER_ID = #{customerId}
-            AND MONTH_ID = #{monthId}
-            AND INDEX_CODE = #{indexCode}
-    </delete>
-
+    <!--   批量插入计算结果 -->
     <insert id="insertBatches">
-        INSERT INTO `fact_index_grid_score` (
+        INSERT INTO `fact_index_grid_sub_score` (
         `ID`,
         `CUSTOMER_ID`,
         `GRID_ID`,
@@ -25,6 +16,7 @@
         `MONTH_ID`,
         `SCORE`,
         `INDEX_CODE`,
+         ALL_PARENT_INDEX_CODE,
         `DEL_FLAG`,
         `REVISION`,
         `CREATED_BY`,
@@ -43,9 +35,9 @@
             #{item.quarterId},
             #{item.yearId},
             #{item.monthId},
-            #{item.isTotal},
             #{item.score},
             #{item.indexCode},
+            #{item.allParentIndexCode},
             0,
             0,
             'APP_USER',
@@ -56,133 +48,17 @@
         </foreach>
     </insert>
 
-    <resultMap id="GridScoreDTOMap" type="com.epmet.dto.indexcal.GridScoreDTO">
-        <result property="gridId" column="GRID_ID"/>
-        <result property="customerId" column="CUSTOMER_ID"/>
-        <result property="agencyId" column="AGENCY_ID"/>
-        <result property="allParentIds" column="ALL_PARENT_IDS"/>
-        <result property="quarterId" column="QUARTER_ID"/>
-        <result property="yearId" column="YEAR_ID"/>
-        <result property="monthId" column="MONTH_ID"/>
-        <collection property="detailList" ofType="com.epmet.dto.indexcal.GridScoreDetailDTO" >
-            <result property="score" column="SCORE"/>
-            <result property="indexCode" column="INDEX_CODE"/>
-        </collection>
-    </resultMap>
-    <select id="selectList" parameterType="com.epmet.dto.indexcal.CalculateCommonFormDTO" resultMap="GridScoreDTOMap">
-            SELECT
-                m.GRID_ID,
-                m.CUSTOMER_ID,
-                m.AGENCY_ID,
-                m.ALL_PARENT_IDS,
-                m.QUARTER_ID,
-                m.YEAR_ID,
-                m.MONTH_ID,
-                M.SCORE,
-                M.INDEX_CODE
-            FROM
-                fact_index_grid_score m
-            WHERE
-                m.DEL_FLAG = '0'
-                AND m.CUSTOMER_ID =#{customerId}
-                AND m.MONTH_ID =#{monthId}
-    </select>
-
-
-
-    <!-- 下属所有网格的平均值 -->
-    <select id="selectSubGridAvgScore" resultType="com.epmet.dto.screen.result.SubGridAvgResultDTO">
-        SELECT
-            figc.agency_id AS agencyId,
-            figc.month_id as monthId,
-            figc.quarter_id as quarterId,
-            figc.year_id as yearId,
-            ROUND(AVG( figc.score ),6) AS score,
-            figc.customer_id as customerId,
-            sca.pid AS parentId
-        FROM
-            fact_index_grid_score figc
-                LEFT JOIN screen_customer_agency sca ON sca.AGENCY_ID = figc.AGENCY_ID
-        WHERE
-            figc.del_flag = '0'
-          AND sca.DEL_FLAG = 0
-          AND figc.customer_id = #{customerId}
-          AND figc.month_id = #{monthId}
-          AND figc.index_code = #{indexCode}
-        GROUP BY figc.agency_id
-    </select>
-
-    <select id="selectListGridScore" resultType="com.epmet.dto.screen.FactIndexGridScoreDTO">
-        SELECT
-            CUSTOMER_ID customerId,
-            GRID_ID gridId,
-            AGENCY_ID agencyId,
-            YEAR_ID yearId,
-            MONTH_ID monthId,
-            SCORE score,
-            INDEX_CODE indexCode
-        FROM
-            fact_index_grid_score
-        WHERE
-            DEL_FLAG = '0'
-          AND CUSTOMER_ID = #{customerId}
-          AND MONTH_ID = #{monthId}
-        ORDER BY GRID_ID
-    </select>
-
-    <insert id="batchInsertGridScoreData" parameterType="map">
-        insert into fact_index_grid_score
-        (
-        ID,
-        CUSTOMER_ID,
-        GRID_ID,
-        AGENCY_ID,
-        ALL_PARENT_IDS,
-        QUARTER_ID,
-        YEAR_ID,
-        MONTH_ID,
-        SCORE,
-        INDEX_CODE,
-        DEL_FLAG,
-        REVISION,
-        CREATED_BY,
-        CREATED_TIME,
-        UPDATED_BY,
-        UPDATED_TIME
-        ) values
-        <foreach collection="list" item="item" index="index" separator=",">
-            (
-            (SELECT REPLACE(UUID(), '-', '') AS id),
-            #{customerId},
-            #{item.gridId},
-            #{item.agencyId},
-            #{item.allParentIds},
-            #{item.quarterId},
-
-            #{item.yearId},
-            #{item.monthId},
-            #{item.score},
-            #{item.indexCode},
-            #{item.delFlag},
-            0,
-            'APP_USER',
-            now(),
-            'APP_USER',
-            now()
-            )
-        </foreach>
-    </insert>
-
-    <select id="selectListGridId" resultType="String">
-        SELECT
-            GRID_ID gridId
+    <!--  批量删除  -->
+    <delete id="deleteBatches">
+        DELETE
         FROM
-            fact_index_grid_score
+            fact_index_grid_sub_score
         WHERE
-            DEL_FLAG = '0'
-          AND CUSTOMER_ID = #{customerId}
-          AND MONTH_ID = #{monthId}
-        ORDER BY GRID_ID
-    </select>
-
+            CUSTOMER_ID = #{customerId}
+            AND MONTH_ID = #{monthId}
+            AND ALL_PARENT_INDEX_CODE = #{allParentIndexCode}
+            <if test="deleteSize != null">
+                limit #{deleteSize}
+            </if>
+    </delete>
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexPartyAblityCpcMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexPartyAblityCpcMonthlyDao.xml
index 8336f33e9a..443d22edfa 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexPartyAblityCpcMonthlyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexPartyAblityCpcMonthlyDao.xml
@@ -93,7 +93,9 @@
         FROM
             fact_index_party_ablity_cpc_monthly
         WHERE
-            CUSTOMER_ID = #{customerId,jdbcType=VARCHAR} AND DEL_FLAG = '0'
+            CUSTOMER_ID = #{customerId,jdbcType=VARCHAR}
+          AND MONTH_ID = #{monthId,jdbcType=VARCHAR}
+          AND DEL_FLAG = '0'
     </select>
 
     <select id="getCountByMonthId" resultType="java.util.Map">
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerAgencyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerAgencyDao.xml
index 452d1ec34b..7963aefd4c 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerAgencyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerAgencyDao.xml
@@ -57,7 +57,7 @@
         </foreach>
     </insert>
 
-    <select id="selectListMismatcAgencyInfo" parameterType="map" resultType="com.epmet.entity.evaluationindex.screen.ScreenCustomerAgencyEntity">
+    <select id="selectListMismatcCommunityAgencyInfo" parameterType="map" resultType="com.epmet.entity.evaluationindex.screen.ScreenCustomerAgencyEntity">
         SELECT
         AGENCY_ID agencyId,
         AGENCY_NAME agencyName,
@@ -69,6 +69,7 @@
         WHERE
         DEL_FLAG = '0'
         AND CUSTOMER_ID =#{customerId}
+        AND `LEVEL` = 'community'
         <if test="agencyIds != null and agencyIds!= ''">
             AND AGENCY_ID  NOT IN
             <foreach item="item" collection="agencyIds" open="(" separator="," close=")">
@@ -98,4 +99,33 @@
             del_flag = '0'
           AND agency_id = #{agencyId}
     </select>
+
+    <select id="selectListMismatcStreetAndDistrictAgencyInfo" parameterType="map" resultType="com.epmet.entity.evaluationindex.screen.ScreenCustomerAgencyEntity">
+        SELECT
+            agencyId,
+            agencyName,
+            pid,
+            pids,
+            `level`
+        FROM(
+            SELECT
+                AGENCY_ID agencyId,
+                AGENCY_NAME agencyName,
+                PID pid,
+                PIDS pids,
+                `LEVEL` `level`
+            FROM
+              screen_customer_agency
+            WHERE
+              DEL_FLAG = '0'
+              AND CUSTOMER_ID = #{customerId}
+              AND (`LEVEL` = 'street' OR  `LEVEL` = 'district')
+        )  agency
+        <if test="agencyIds != null and agencyIds!= ''">
+            WHERE agencyId  NOT IN
+            <foreach item="item" collection="agencyIds" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+    </select>
 </mapper>
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenIndexDataMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenIndexDataMonthlyDao.xml
index 11a990aa9c..417ac18c3f 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenIndexDataMonthlyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenIndexDataMonthlyDao.xml
@@ -64,10 +64,10 @@
             ORG_ID orgId,
             PARENT_ID parentId,
             ORG_NAME orgName,
-            SUM(INDEX_TOTAL) / #{month} as indexTotal,
-            SUM(PARTY_DEV_ABLITY) / #{month} as partyDevAblity,
-            SUM(SERVICE_ABLITY) / #{month} as serviceAblity,
-            SUM(GOVERN_ABLITY) / #{month} as governAblity
+            SUM(INDEX_TOTAL) / #{monthCount} as indexTotal,
+            SUM(PARTY_DEV_ABLITY) / #{monthCount} as partyDevAblity,
+            SUM(SERVICE_ABLITY) / #{monthCount} as serviceAblity,
+            SUM(GOVERN_ABLITY) / #{monthCount} as governAblity
          FROM screen_index_data_monthly
          WHERE DEL_FLAG = '0'
          AND YEAR_ID = #{yearId}
@@ -75,4 +75,22 @@
          GROUP BY ORG_ID
     </select>
 
+    <select id="selectCountIndexDataMonthly" parameterType="map" resultType="java.lang.Integer">
+         SELECT
+            COUNT(1)
+        FROM(
+            SELECT
+            distinct MONTH_ID
+            FROM screen_index_data_monthly
+            WHERE DEL_FLAG = '0'
+            AND  YEAR_ID = #{yearId}
+            AND CUSTOMER_ID = #{customerId}
+        ) monthCount
+    </select>
+
+    <delete id="deleteIndexDataMonthlyByOrgType">
+        delete from screen_index_data_monthly
+        where CUSTOMER_ID = #{customerId} AND MONTH_ID = #{monthId} AND ORG_TYPE = #{orgType}
+        limit 1000;
+    </delete>
 </mapper>
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcActSummaryDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcActSummaryDailyDao.xml
new file mode 100644
index 0000000000..149c94e075
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcActSummaryDailyDao.xml
@@ -0,0 +1,68 @@
+<?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.dao.evaluationindex.screen.ScreenKcActSummaryDailyDao">
+
+    <resultMap type="com.epmet.entity.evaluationindex.screen.ScreenKcActSummaryDailyEntity" id="screenKcActSummaryDailyMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="dateId" column="DATE_ID"/>
+        <result property="actCount" column="ACT_COUNT"/>
+        <result property="volunteerCount" column="VOLUNTEER_COUNT"/>
+        <result property="partiUserCount" column="PARTI_USER_COUNT"/>
+        <result property="rewardPointCount" column="REWARD_POINT_COUNT"/>
+        <result property="heartTime" column="HEART_TIME"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+    <delete id="deleteActSummary">
+        delete from screen_kc_act_summary_daily
+        where CUSTOMER_ID = #{customerId} AND DATE_ID != #{dateId}
+        limit 1000;
+    </delete>
+
+    <insert id="batchInsertActSummary" parameterType="map">
+        insert into screen_kc_act_summary_daily
+        (
+        ID,
+        CUSTOMER_ID,
+        DATE_ID,
+
+        ACT_COUNT,
+        VOLUNTEER_COUNT,
+        PARTI_USER_COUNT,
+        REWARD_POINT_COUNT,
+        HEART_TIME,
+
+        DEL_FLAG,
+        REVISION,
+        CREATED_BY,
+        CREATED_TIME,
+        UPDATED_BY,
+        UPDATED_TIME
+        ) values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (
+            (SELECT REPLACE(UUID(), '-', '') AS id),
+            #{customerId},
+            #{dateId},
+            #{item.actCount},
+            #{item.volunteerCount},
+            #{item.partiUserCount},
+            #{item.rewardPointCount},
+            #{item.heartTime},
+            0,
+            0,
+            'APP_USER',
+            now(),
+            'APP_USER',
+            now()
+            )
+        </foreach>
+    </insert>
+</mapper>
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcActTrendMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcActTrendMonthlyDao.xml
new file mode 100644
index 0000000000..b8762aa572
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcActTrendMonthlyDao.xml
@@ -0,0 +1,54 @@
+<?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.dao.evaluationindex.screen.ScreenKcActTrendMonthlyDao">
+
+    <resultMap type="com.epmet.entity.evaluationindex.screen.ScreenKcActTrendMonthlyEntity" id="screenKcActTrendMonthlyMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="monthId" column="MONTH_ID"/>
+        <result property="actCount" column="ACT_COUNT"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+    <delete id="deleteActTrend">
+        delete from screen_kc_act_trend_monthly
+        where CUSTOMER_ID = #{customerId} AND MONTH_ID = #{monthId}
+        limit 1000;
+    </delete>
+
+    <insert id="batchInsertActTrend" parameterType="map">
+        insert into screen_kc_act_trend_monthly
+        (
+        ID,
+        CUSTOMER_ID,
+        MONTH_ID,
+        ACT_COUNT,
+        DEL_FLAG,
+        REVISION,
+        CREATED_BY,
+        CREATED_TIME,
+        UPDATED_BY,
+        UPDATED_TIME
+        ) values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (
+            (SELECT REPLACE(UUID(), '-', '') AS id),
+            #{customerId},
+            #{monthId},
+            #{item.actCount},
+            0,
+            0,
+            'APP_USER',
+            now(),
+            'APP_USER',
+            now()
+            )
+        </foreach>
+    </insert>
+</mapper>
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcGroupDetailGridDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcGroupDetailGridDailyDao.xml
new file mode 100644
index 0000000000..e7cf3fa2cd
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcGroupDetailGridDailyDao.xml
@@ -0,0 +1,83 @@
+<?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.dao.evaluationindex.screen.ScreenKcGroupDetailGridDailyDao">
+
+    <resultMap type="com.epmet.entity.evaluationindex.screen.ScreenKcGroupDetailGridDailyEntity" id="screenKcGroupDetailGridDailyMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="dateId" column="DATE_ID"/>
+        <result property="gridId" column="GRID_ID"/>
+        <result property="gridName" column="GRID_NAME"/>
+        <result property="parentAgencyId" column="PARENT_AGENCY_ID"/>
+        <result property="allParentIds" column="ALL_PARENT_IDS"/>
+        <result property="groupId" column="GROUP_ID"/>
+        <result property="groupName" column="GROUP_NAME"/>
+        <result property="groupLeader" column="GROUP_LEADER"/>
+        <result property="memberCount" column="MEMBER_COUNT"/>
+        <result property="topicCount" column="TOPIC_COUNT"/>
+        <result property="shifitIssueCount" column="SHIFIT_ISSUE_COUNT"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+    <delete id="deleteGroupDetailGrid">
+        delete from screen_kc_group_detail_grid_daily
+        where CUSTOMER_ID = #{customerId} AND DATE_ID != #{dateId}
+        limit 1000;
+    </delete>
+
+    <insert id="batchInsertGroupDetailGrid" parameterType="map">
+        insert into screen_kc_group_detail_grid_daily
+        (
+        ID,
+        CUSTOMER_ID,
+        DATE_ID,
+
+        GRID_ID,
+        GRID_NAME,
+        PARENT_AGENCY_ID,
+        ALL_PARENT_IDS,
+        GROUP_ID,
+        GROUP_NAME,
+        GROUP_LEADER,
+        MEMBER_COUNT,
+        TOPIC_COUNT,
+        SHIFIT_ISSUE_COUNT,
+
+        DEL_FLAG,
+        REVISION,
+        CREATED_BY,
+        CREATED_TIME,
+        UPDATED_BY,
+        UPDATED_TIME
+        ) values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (
+            (SELECT REPLACE(UUID(), '-', '') AS id),
+            #{customerId},
+            #{dateId},
+            #{item.gridId},
+            #{item.gridName},
+            #{item.parentAgencyId},
+            #{item.allParentIds},
+            #{item.groupId},
+            #{item.groupName},
+            #{item.groupLeader},
+            #{item.memberCount},
+            #{item.topicCount},
+            #{item.shifitIssueCount},
+            0,
+            0,
+            'APP_USER',
+            now(),
+            'APP_USER',
+            now()
+            )
+        </foreach>
+    </insert>
+</mapper>
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcGroupSummaryGridDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcGroupSummaryGridDailyDao.xml
new file mode 100644
index 0000000000..833ca38965
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcGroupSummaryGridDailyDao.xml
@@ -0,0 +1,80 @@
+<?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.dao.evaluationindex.screen.ScreenKcGroupSummaryGridDailyDao">
+
+    <resultMap type="com.epmet.entity.evaluationindex.screen.ScreenKcGroupSummaryGridDailyEntity" id="screenKcGroupSummaryGridDailyMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="dateId" column="DATE_ID"/>
+        <result property="gridId" column="GRID_ID"/>
+        <result property="gridName" column="GRID_NAME"/>
+        <result property="parentAgencyId" column="PARENT_AGENCY_ID"/>
+        <result property="allParentIds" column="ALL_PARENT_IDS"/>
+        <result property="groupCount" column="GROUP_COUNT"/>
+        <result property="memberCount" column="MEMBER_COUNT"/>
+        <result property="topicCount" column="TOPIC_COUNT"/>
+        <result property="partiCount" column="PARTI_COUNT"/>
+        <result property="shiftIssueCount" column="SHIFT_ISSUE_COUNT"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+    <delete id="deleteGroupSummaryGrid">
+        delete from screen_kc_group_summary_grid_daily
+        where CUSTOMER_ID = #{customerId} AND DATE_ID != #{dateId}
+        limit 1000;
+    </delete>
+
+    <insert id="batchInsertGroupSummaryGrid" parameterType="map">
+        insert into screen_kc_group_summary_grid_daily
+        (
+        ID,
+        CUSTOMER_ID,
+        DATE_ID,
+
+        GRID_ID,
+        GRID_NAME,
+        PARENT_AGENCY_ID,
+        ALL_PARENT_IDS,
+        GROUP_COUNT,
+        MEMBER_COUNT,
+        TOPIC_COUNT,
+        PARTI_COUNT,
+        SHIFT_ISSUE_COUNT,
+
+        DEL_FLAG,
+        REVISION,
+        CREATED_BY,
+        CREATED_TIME,
+        UPDATED_BY,
+        UPDATED_TIME
+        ) values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (
+            (SELECT REPLACE(UUID(), '-', '') AS id),
+            #{customerId},
+            #{dateId},
+            #{item.gridId},
+            #{item.gridName},
+            #{item.parentAgencyId},
+            #{item.allParentIds},
+            #{item.groupCount},
+            #{item.memberCount},
+            #{item.topicCount},
+            #{item.partiCount},
+            #{item.shiftIssueCount},
+            0,
+            0,
+            'APP_USER',
+            now(),
+            'APP_USER',
+            now()
+            )
+        </foreach>
+    </insert>
+</mapper>
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcIssueSummaryGridDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcIssueSummaryGridDailyDao.xml
new file mode 100644
index 0000000000..57055dfcba
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcIssueSummaryGridDailyDao.xml
@@ -0,0 +1,97 @@
+<?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.dao.evaluationindex.screen.ScreenKcIssueSummaryGridDailyDao">
+
+    <resultMap type="com.epmet.entity.evaluationindex.screen.ScreenKcIssueSummaryGridDailyEntity" id="screenKcIssueSummaryGridDailyMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="dateId" column="DATE_ID"/>
+        <result property="gridId" column="GRID_ID"/>
+        <result property="gridName" column="GRID_NAME"/>
+        <result property="parentAgencyId" column="PARENT_AGENCY_ID"/>
+        <result property="allParentIds" column="ALL_PARENT_IDS"/>
+        <result property="reportCount" column="REPORT_COUNT"/>
+        <result property="issueCount" column="ISSUE_COUNT"/>
+        <result property="pendingCount" column="PENDING_COUNT"/>
+        <result property="rejectedCount" column="REJECTED_COUNT"/>
+        <result property="processingCount" column="PROCESSING_COUNT"/>
+        <result property="closedCount" column="CLOSED_COUNT"/>
+        <result property="issueViewCount" column="ISSUE_VIEW_COUNT"/>
+        <result property="voteCount" column="VOTE_COUNT"/>
+        <result property="passedCount" column="PASSED_COUNT"/>
+        <result property="shiftToProjectCount" column="SHIFT_TO_PROJECT_COUNT"/>
+        <result property="avgAuditTime" column="AVG_AUDIT_TIME"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+    <delete id="deleteIssueSummaryGrid">
+        delete from screen_kc_issue_summary_grid_daily
+        where CUSTOMER_ID = #{customerId} AND DATE_ID != #{dateId}
+        limit 1000;
+    </delete>
+
+    <insert id="batchInsertIssueSummaryGrid" parameterType="map">
+        insert into screen_kc_issue_summary_grid_daily
+        (
+        ID,
+        CUSTOMER_ID,
+        DATE_ID,
+        GRID_ID,
+        GRID_NAME,
+        PARENT_AGENCY_ID,
+        ALL_PARENT_IDS,
+        REPORT_COUNT,
+        ISSUE_COUNT,
+        PENDING_COUNT,
+        REJECTED_COUNT,
+        PROCESSING_COUNT,
+        CLOSED_COUNT,
+        ISSUE_VIEW_COUNT,
+        VOTE_COUNT,
+        PASSED_COUNT,
+        SHIFT_TO_PROJECT_COUNT,
+        AVG_AUDIT_TIME,
+        DEL_FLAG,
+        REVISION,
+        CREATED_BY,
+        CREATED_TIME,
+        UPDATED_BY,
+        UPDATED_TIME
+        ) values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (
+            (SELECT REPLACE(UUID(), '-', '') AS id),
+            #{customerId},
+            #{dateId},
+            #{item.gridId},
+            #{item.gridName},
+            #{item.parentAgencyId},
+            #{item.allParentIds},
+            #{item.reportCount},
+            #{item.issueCount},
+            #{item.pendingCount},
+            #{item.rejectedCount},
+            #{item.processingCount},
+            #{item.closedCount},
+            #{item.issueViewCount},
+            #{item.voteCount},
+            #{item.passedCount},
+            #{item.shiftToProjectCount},
+            #{item.avgAuditTime},
+            0,
+            0,
+            'APP_USER',
+            now(),
+            'APP_USER',
+            now()
+            )
+        </foreach>
+    </insert>
+
+</mapper>
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcIssueTrendGridMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcIssueTrendGridMonthlyDao.xml
new file mode 100644
index 0000000000..1957824176
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcIssueTrendGridMonthlyDao.xml
@@ -0,0 +1,70 @@
+<?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.dao.evaluationindex.screen.ScreenKcIssueTrendGridMonthlyDao">
+
+    <resultMap type="com.epmet.entity.evaluationindex.screen.ScreenKcIssueTrendGridMonthlyEntity" id="screenKcIssueTrendGridMonthlyMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="monthId" column="MONTH_ID"/>
+        <result property="gridId" column="GRID_ID"/>
+        <result property="gridName" column="GRID_NAME"/>
+        <result property="parentAgencyId" column="PARENT_AGENCY_ID"/>
+        <result property="allParentIds" column="ALL_PARENT_IDS"/>
+        <result property="reportCount" column="REPORT_COUNT"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+    <delete id="deleteIssueTrendGrid">
+        delete from screen_kc_issue_trend_grid_monthly
+        where CUSTOMER_ID = #{customerId} AND MONTH_ID = #{monthId}
+        limit 1000;
+    </delete>
+
+    <insert id="batchInsertIssueTrendGrid" parameterType="map">
+        insert into screen_kc_issue_trend_grid_monthly
+        (
+        ID,
+        CUSTOMER_ID,
+        MONTH_ID,
+
+        GRID_ID,
+        GRID_NAME,
+        PARENT_AGENCY_ID,
+        ALL_PARENT_IDS,
+        REPORT_COUNT,
+
+        DEL_FLAG,
+        REVISION,
+        CREATED_BY,
+        CREATED_TIME,
+        UPDATED_BY,
+        UPDATED_TIME
+        ) values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (
+            (SELECT REPLACE(UUID(), '-', '') AS id),
+            #{customerId},
+            #{monthId},
+            #{item.gridId},
+            #{item.gridName},
+            #{item.parentAgencyId},
+            #{item.allParentIds},
+            #{item.reportCount},
+            0,
+            0,
+            'APP_USER',
+            now(),
+            'APP_USER',
+            now()
+            )
+        </foreach>
+    </insert>
+
+
+</mapper>
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcNewsCategoryAnalysisDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcNewsCategoryAnalysisDao.xml
new file mode 100644
index 0000000000..38d1b6cda4
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcNewsCategoryAnalysisDao.xml
@@ -0,0 +1,72 @@
+<?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.dao.evaluationindex.screen.ScreenKcNewsCategoryAnalysisDao">
+
+    <resultMap type="com.epmet.entity.evaluationindex.screen.ScreenKcNewsCategoryAnalysisEntity" id="screenKcNewsCategoryAnalysisMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="dateId" column="DATE_ID"/>
+        <result property="categoryId" column="CATEGORY_ID"/>
+        <result property="categoryName" column="CATEGORY_NAME"/>
+        <result property="newsCount" column="NEWS_COUNT"/>
+        <result property="readCount" column="READ_COUNT"/>
+        <result property="likeCount" column="LIKE_COUNT"/>
+        <result property="disLikeCount" column="DIS_LIKE_COUNT"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+    <delete id="deleteNewsCategoryAnalysis">
+        delete from screen_kc_news_category_analysis
+        where CUSTOMER_ID = #{customerId} AND DATE_ID != #{dateId}
+        limit 1000;
+    </delete>
+
+    <insert id="batchInsertNewsCategoryAnalysis" parameterType="map">
+        insert into screen_kc_news_category_analysis
+        (
+        ID,
+        CUSTOMER_ID,
+        DATE_ID,
+
+        CATEGORY_ID,
+        CATEGORY_NAME,
+        NEWS_COUNT,
+        READ_COUNT,
+        LIKE_COUNT,
+        DIS_LIKE_COUNT,
+
+        DEL_FLAG,
+        REVISION,
+        CREATED_BY,
+        CREATED_TIME,
+        UPDATED_BY,
+        UPDATED_TIME
+        ) values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (
+            (SELECT REPLACE(UUID(), '-', '') AS id),
+            #{customerId},
+            #{dateId},
+            #{item.categoryId},
+            #{item.categoryName},
+            #{item.newsCount},
+            #{item.readCount},
+            #{item.likeCount},
+            #{item.disLikeCount},
+            0,
+            0,
+            'APP_USER',
+            now(),
+            'APP_USER',
+            now()
+            )
+        </foreach>
+    </insert>
+
+</mapper>
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcNewsRankDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcNewsRankDao.xml
new file mode 100644
index 0000000000..08886ea7d2
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcNewsRankDao.xml
@@ -0,0 +1,62 @@
+<?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.dao.evaluationindex.screen.ScreenKcNewsRankDao">
+
+    <resultMap type="com.epmet.entity.evaluationindex.screen.ScreenKcNewsRankEntity" id="screenKcNewsRankMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="dateId" column="DATE_ID"/>
+        <result property="newsId" column="NEWS_ID"/>
+        <result property="newsTitle" column="NEWS_TITLE"/>
+        <result property="hotCount" column="HOT_COUNT"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+    <delete id="deleteNewsRank">
+        delete from screen_kc_news_rank
+        where CUSTOMER_ID = #{customerId}
+        limit 1000;
+    </delete>
+
+    <insert id="batchInsertNewsRank" parameterType="map">
+        insert into screen_kc_news_rank
+        (
+        ID,
+        CUSTOMER_ID,
+        DATE_ID,
+        NEWS_ID,
+        NEWS_TITLE,
+        HOT_COUNT,
+        DEL_FLAG,
+        REVISION,
+        CREATED_BY,
+        CREATED_TIME,
+        UPDATED_BY,
+        UPDATED_TIME
+        ) values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (
+            (SELECT REPLACE(UUID(), '-', '') AS id),
+            #{customerId},
+            #{dateId},
+            #{item.newsId},
+            #{item.newsTitle},
+            #{item.hotCount},
+            0,
+            0,
+            'APP_USER',
+            now(),
+            'APP_USER',
+            now()
+            )
+        </foreach>
+    </insert>
+
+
+</mapper>
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcNewsSummaryDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcNewsSummaryDailyDao.xml
new file mode 100644
index 0000000000..9a29f845d8
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcNewsSummaryDailyDao.xml
@@ -0,0 +1,65 @@
+<?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.dao.evaluationindex.screen.ScreenKcNewsSummaryDailyDao">
+
+    <resultMap type="com.epmet.entity.evaluationindex.screen.ScreenKcNewsSummaryDailyEntity" id="screenKcNewsSummaryDailyMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="dateId" column="DATE_ID"/>
+        <result property="newsCount" column="NEWS_COUNT"/>
+        <result property="readCount" column="READ_COUNT"/>
+        <result property="likeCount" column="LIKE_COUNT"/>
+        <result property="commentCount" column="COMMENT_COUNT"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+    <delete id="deleteNewsSummary">
+        delete from screen_kc_news_summary_daily
+        where CUSTOMER_ID = #{customerId} AND DATE_ID != #{dateId}
+        limit 1000;
+    </delete>
+
+    <insert id="batchInsertNewsSummary" parameterType="map">
+        insert into screen_kc_news_summary_daily
+        (
+        ID,
+        CUSTOMER_ID,
+        DATE_ID,
+
+        NEWS_COUNT,
+        READ_COUNT,
+        LIKE_COUNT,
+        COMMENT_COUNT,
+
+        DEL_FLAG,
+        REVISION,
+        CREATED_BY,
+        CREATED_TIME,
+        UPDATED_BY,
+        UPDATED_TIME
+        ) values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (
+            (SELECT REPLACE(UUID(), '-', '') AS id),
+            #{customerId},
+            #{dateId},
+            #{item.newsCount},
+            #{item.readCount},
+            #{item.likeCount},
+            #{item.commentCount},
+            0,
+            0,
+            'APP_USER',
+            now(),
+            'APP_USER',
+            now()
+            )
+        </foreach>
+    </insert>
+</mapper>
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcNewsTrendMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcNewsTrendMonthlyDao.xml
new file mode 100644
index 0000000000..4caffe8fba
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcNewsTrendMonthlyDao.xml
@@ -0,0 +1,57 @@
+<?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.dao.evaluationindex.screen.ScreenKcNewsTrendMonthlyDao">
+
+    <resultMap type="com.epmet.entity.evaluationindex.screen.ScreenKcNewsTrendMonthlyEntity" id="screenKcNewsTrendMonthlyMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="monthId" column="MONTH_ID"/>
+        <result property="readCount" column="READ_COUNT"/>
+        <result property="partiCount" column="PARTI_COUNT"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+    <delete id="deleteNewsTrend">
+        delete from screen_kc_news_trend_monthly
+        where CUSTOMER_ID = #{customerId} AND MONTH_ID = #{monthId}
+        limit 1000;
+    </delete>
+
+    <insert id="batchInsertNewsTrend" parameterType="map">
+        insert into screen_kc_news_trend_monthly
+        (
+        ID,
+        CUSTOMER_ID,
+        MONTH_ID,
+        READ_COUNT,
+        PARTI_COUNT,
+        DEL_FLAG,
+        REVISION,
+        CREATED_BY,
+        CREATED_TIME,
+        UPDATED_BY,
+        UPDATED_TIME
+        ) values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (
+            (SELECT REPLACE(UUID(), '-', '') AS id),
+            #{customerId},
+            #{monthId},
+            #{item.readCount},
+            #{item.partiCount},
+            0,
+            0,
+            'APP_USER',
+            now(),
+            'APP_USER',
+            now()
+            )
+        </foreach>
+    </insert>
+</mapper>
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcPlatformSummaryDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcPlatformSummaryDailyDao.xml
new file mode 100644
index 0000000000..ea2ca56f7d
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcPlatformSummaryDailyDao.xml
@@ -0,0 +1,87 @@
+<?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.dao.evaluationindex.screen.ScreenKcPlatformSummaryDailyDao">
+
+    <resultMap type="com.epmet.entity.evaluationindex.screen.ScreenKcPlatformSummaryDailyEntity" id="screenKcPlatformSummaryDailyMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="dateId" column="DATE_ID"/>
+        <result property="gridCount" column="GRID_COUNT"/>
+        <result property="openedGridCount" column="OPENED_GRID_COUNT"/>
+        <result property="issueCount" column="ISSUE_COUNT"/>
+        <result property="projectCount" column="PROJECT_COUNT"/>
+        <result property="userCount" column="USER_COUNT"/>
+        <result property="partyUserCount" column="PARTY_USER_COUNT"/>
+        <result property="groupCount" column="GROUP_COUNT"/>
+        <result property="topicCount" column="TOPIC_COUNT"/>
+        <result property="newsCount" column="NEWS_COUNT"/>
+        <result property="readCount" column="READ_COUNT"/>
+        <result property="actCount" column="ACT_COUNT"/>
+        <result property="volunteerCount" column="VOLUNTEER_COUNT"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+    <delete id="deletePlatFormSummary">
+        delete from screen_kc_platform_summary_daily
+        where CUSTOMER_ID = #{customerId} AND DATE_ID != #{dateId}
+        limit 1000;
+    </delete>
+
+    <insert id="batchInsertPlatFormSummary" parameterType="map">
+        insert into screen_kc_platform_summary_daily
+        (
+        ID,
+        CUSTOMER_ID,
+        DATE_ID,
+        GRID_COUNT,
+        OPENED_GRID_COUNT,
+        ISSUE_COUNT,
+        PROJECT_COUNT,
+        USER_COUNT,
+        PARTY_USER_COUNT,
+        GROUP_COUNT,
+        TOPIC_COUNT,
+        NEWS_COUNT,
+        READ_COUNT,
+        ACT_COUNT,
+        VOLUNTEER_COUNT,
+        DEL_FLAG,
+        REVISION,
+        CREATED_BY,
+        CREATED_TIME,
+        UPDATED_BY,
+        UPDATED_TIME
+        ) values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (
+            (SELECT REPLACE(UUID(), '-', '') AS id),
+            #{customerId},
+            #{dateId},
+            #{item.gridCount},
+            #{item.openedGridCount},
+            #{item.issueCount},
+            #{item.projectCount},
+            #{item.userCount},
+            #{item.partyUserCount},
+            #{item.groupCount},
+            #{item.topicCount},
+            #{item.newsCount},
+            #{item.readCount},
+            #{item.actCount},
+            #{item.vounteerCount},
+            0,
+            0,
+            'APP_USER',
+            now(),
+            'APP_USER',
+            now()
+            )
+        </foreach>
+    </insert>
+</mapper>
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcProjectCategoryGridDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcProjectCategoryGridDailyDao.xml
new file mode 100644
index 0000000000..a285d083b3
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcProjectCategoryGridDailyDao.xml
@@ -0,0 +1,74 @@
+<?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.dao.evaluationindex.screen.ScreenKcProjectCategoryGridDailyDao">
+
+    <resultMap type="com.epmet.entity.evaluationindex.screen.ScreenKcProjectCategoryGridDailyEntity" id="screenKcProjectCategoryGridDailyMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="dateId" column="DATE_ID"/>
+        <result property="gridId" column="GRID_ID"/>
+        <result property="gridName" column="GRID_NAME"/>
+        <result property="parentAgencyId" column="PARENT_AGENCY_ID"/>
+        <result property="allParentIds" column="ALL_PARENT_IDS"/>
+        <result property="categoryId" column="CATEGORY_ID"/>
+        <result property="categoryName" column="CATEGORY_NAME"/>
+        <result property="projectCount" column="PROJECT_COUNT"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+    <delete id="deleteCategoryGrid">
+        delete from screen_kc_project_category_grid_daily
+        where CUSTOMER_ID = #{customerId} AND DATE_ID != #{dateId}
+        limit 1000;
+    </delete>
+
+    <insert id="batchInsertCategoryGrid" parameterType="map">
+        insert into screen_kc_project_category_grid_daily
+        (
+        ID,
+        CUSTOMER_ID,
+        DATE_ID,
+
+        GRID_ID,
+        GRID_NAME,
+        PARENT_AGENCY_ID,
+        ALL_PARENT_IDS,
+        CATEGORY_ID,
+        CATEGORY_NAME,
+        PROJECT_COUNT,
+
+        DEL_FLAG,
+        REVISION,
+        CREATED_BY,
+        CREATED_TIME,
+        UPDATED_BY,
+        UPDATED_TIME
+        ) values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (
+            (SELECT REPLACE(UUID(), '-', '') AS id),
+            #{customerId},
+            #{dateId},
+            #{item.gridId},
+            #{item.gridName},
+            #{item.parentAgencyId},
+            #{item.allParentIds},
+            #{item.categoryId},
+            #{item.categoryName},
+            #{item.projectCount},
+            0,
+            0,
+            'APP_USER',
+            now(),
+            'APP_USER',
+            now()
+            )
+        </foreach>
+    </insert>
+</mapper>
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcProjectSatisGridMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcProjectSatisGridMonthlyDao.xml
new file mode 100644
index 0000000000..1147f687d5
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcProjectSatisGridMonthlyDao.xml
@@ -0,0 +1,75 @@
+<?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.dao.evaluationindex.screen.ScreenKcProjectSatisGridMonthlyDao">
+
+    <resultMap type="com.epmet.entity.evaluationindex.screen.ScreenKcProjectSatisGridMonthlyEntity" id="screenKcProjectSatisGridMonthlyMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="monthId" column="MONTH_ID"/>
+        <result property="gridId" column="GRID_ID"/>
+        <result property="gridName" column="GRID_NAME"/>
+        <result property="parentAgencyId" column="PARENT_AGENCY_ID"/>
+        <result property="allParentIds" column="ALL_PARENT_IDS"/>
+        <result property="greatSatis" column="GREAT_SATIS"/>
+        <result property="goodSatis" column="GOOD_SATIS"/>
+        <result property="disSatis" column="DIS_SATIS"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+    <delete id="deleteProjectSatisGrid">
+        delete from screen_kc_project_satis_grid_monthly
+        where CUSTOMER_ID = #{customerId} AND MONTH_ID = #{monthId}
+        limit 1000;
+    </delete>
+
+    <insert id="batchInsertProjectSatisGrid" parameterType="map">
+        insert into screen_kc_project_satis_grid_monthly
+        (
+        ID,
+        CUSTOMER_ID,
+        MONTH_ID,
+
+        GRID_ID,
+        GRID_NAME,
+        PARENT_AGENCY_ID,
+        ALL_PARENT_IDS,
+        GREAT_SATIS,
+        GOOD_SATIS,
+        DIS_SATIS,
+
+        DEL_FLAG,
+        REVISION,
+        CREATED_BY,
+        CREATED_TIME,
+        UPDATED_BY,
+        UPDATED_TIME
+        ) values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (
+            (SELECT REPLACE(UUID(), '-', '') AS id),
+            #{customerId},
+            #{monthId},
+            #{item.gridId},
+            #{item.gridName},
+            #{item.parentAgencyId},
+            #{item.allParentIds},
+            #{item.greatSatis},
+            #{item.goodSatis},
+            #{item.disSatis},
+            0,
+            0,
+            'APP_USER',
+            now(),
+            'APP_USER',
+            now()
+            )
+        </foreach>
+    </insert>
+
+</mapper>
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcProjectSummaryGridDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcProjectSummaryGridDailyDao.xml
new file mode 100644
index 0000000000..614ffac3af
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcProjectSummaryGridDailyDao.xml
@@ -0,0 +1,91 @@
+<?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.dao.evaluationindex.screen.ScreenKcProjectSummaryGridDailyDao">
+
+    <resultMap type="com.epmet.entity.evaluationindex.screen.ScreenKcProjectSummaryGridDailyEntity" id="screenKcProjectSummaryGridDailyMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="dateId" column="DATE_ID"/>
+        <result property="gridId" column="GRID_ID"/>
+        <result property="gridName" column="GRID_NAME"/>
+        <result property="parentAgencyId" column="PARENT_AGENCY_ID"/>
+        <result property="allParentIds" column="ALL_PARENT_IDS"/>
+        <result property="projectCount" column="PROJECT_COUNT"/>
+        <result property="processingCount" column="PROCESSING_COUNT"/>
+        <result property="closedCount" column="CLOSED_COUNT"/>
+        <result property="moveCount" column="MOVE_COUNT"/>
+        <result property="closedCaseCount" column="CLOSED_CASE_COUNT"/>
+        <result property="projectViewCount" column="PROJECT_VIEW_COUNT"/>
+        <result property="voteCount" column="VOTE_COUNT"/>
+        <result property="avgClosedCaseTime" column="AVG_CLOSED_CASE_TIME"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+    <delete id="deleteProjectSummary">
+        delete from screen_kc_project_summary_grid_daily
+        where CUSTOMER_ID = #{customerId} AND DATE_ID != #{dateId}
+        limit 1000;
+    </delete>
+
+    <insert id="batchInsertProjectSummary" parameterType="map">
+        insert into screen_kc_project_summary_grid_daily
+        (
+        ID,
+        CUSTOMER_ID,
+        DATE_ID,
+
+        GRID_ID,
+        GRID_NAME,
+        PARENT_AGENCY_ID,
+        ALL_PARENT_IDS,
+        PROJECT_COUNT,
+        PROCESSING_COUNT,
+        CLOSED_COUNT,
+        MOVE_COUNT,
+        CLOSED_CASE_COUNT,
+        PROJECT_VIEW_COUNT,
+        VOTE_COUNT,
+        AVG_CLOSED_CASE_TIME,
+
+        DEL_FLAG,
+        REVISION,
+        CREATED_BY,
+        CREATED_TIME,
+        UPDATED_BY,
+        UPDATED_TIME
+        ) values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (
+            (SELECT REPLACE(UUID(), '-', '') AS id),
+            #{customerId},
+            #{dateId},
+            #{item.gridId},
+            #{item.gridName},
+            #{item.parentAgencyId},
+            #{item.allParentIds},
+            #{item.projectCount},
+            #{item.processingCount},
+            #{item.closedCount},
+            #{item.moveCount},
+            #{item.closedCaseCount},
+            #{item.projectViewCount},
+            #{item.voteCount},
+            #{item.avgClosedCaseTime},
+            0,
+            0,
+            'APP_USER',
+            now(),
+            'APP_USER',
+            now()
+            )
+        </foreach>
+    </insert>
+
+
+</mapper>
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcTopicTrendGridMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcTopicTrendGridMonthlyDao.xml
new file mode 100644
index 0000000000..868d8b70ce
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcTopicTrendGridMonthlyDao.xml
@@ -0,0 +1,69 @@
+<?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.dao.evaluationindex.screen.ScreenKcTopicTrendGridMonthlyDao">
+
+    <resultMap type="com.epmet.entity.evaluationindex.screen.ScreenKcTopicTrendGridMonthlyEntity" id="screenKcTopicTrendGridMonthlyMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="monthId" column="MONTH_ID"/>
+        <result property="gridId" column="GRID_ID"/>
+        <result property="gridName" column="GRID_NAME"/>
+        <result property="parentAgencyId" column="PARENT_AGENCY_ID"/>
+        <result property="allParentIds" column="ALL_PARENT_IDS"/>
+        <result property="topicCount" column="TOPIC_COUNT"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+    <delete id="deleteTopicTrendGrid">
+        delete from screen_kc_topic_trend_grid_monthly
+        where CUSTOMER_ID = #{customerId} AND MONTH_ID = #{monthId}
+        limit 1000;
+    </delete>
+
+    <insert id="batchInsertTopicTrendGrid" parameterType="map">
+        insert into screen_kc_topic_trend_grid_monthly
+        (
+        ID,
+        CUSTOMER_ID,
+        MONTH_ID,
+
+        GRID_ID,
+        GRID_NAME,
+        PARENT_AGENCY_ID,
+        ALL_PARENT_IDS,
+        TOPIC_COUNT,
+
+        DEL_FLAG,
+        REVISION,
+        CREATED_BY,
+        CREATED_TIME,
+        UPDATED_BY,
+        UPDATED_TIME
+        ) values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (
+            (SELECT REPLACE(UUID(), '-', '') AS id),
+            #{customerId},
+            #{monthId},
+            #{item.gridId},
+            #{item.gridName},
+            #{item.parentAgencyId},
+            #{item.allParentIds},
+            #{item.topicCount},
+            0,
+            0,
+            'APP_USER',
+            now(),
+            'APP_USER',
+            now()
+            )
+        </foreach>
+    </insert>
+
+</mapper>
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcUserHeatRankGridDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcUserHeatRankGridDailyDao.xml
new file mode 100644
index 0000000000..a8a3c2eff3
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcUserHeatRankGridDailyDao.xml
@@ -0,0 +1,28 @@
+<?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.dao.evaluationindex.screen.ScreenKcUserHeatRankGridDailyDao">
+
+    <resultMap type="com.epmet.entity.evaluationindex.screen.ScreenKcUserHeatRankGridDailyEntity" id="screenKcUserHeatRankGridDailyMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="dateId" column="DATE_ID"/>
+        <result property="gridId" column="GRID_ID"/>
+        <result property="gridName" column="GRID_NAME"/>
+        <result property="parentAgencyId" column="PARENT_AGENCY_ID"/>
+        <result property="allParentIds" column="ALL_PARENT_IDS"/>
+        <result property="userId" column="USER_ID"/>
+        <result property="userName" column="USER_NAME"/>
+        <result property="volunteerFlag" column="VOLUNTEER_FLAG"/>
+        <result property="heartTime" column="HEART_TIME"/>
+        <result property="points" column="POINTS"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcUserSummaryDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcUserSummaryDailyDao.xml
new file mode 100644
index 0000000000..d1c0e9dea2
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcUserSummaryDailyDao.xml
@@ -0,0 +1,99 @@
+<?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.dao.evaluationindex.screen.ScreenKcUserSummaryDailyDao">
+
+    <resultMap type="com.epmet.entity.evaluationindex.screen.ScreenKcUserSummaryDailyEntity" id="screenKcUserSummaryDailyMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="dateId" column="DATE_ID"/>
+        <result property="gridId" column="GRID_ID"/>
+        <result property="gridName" column="GRID_NAME"/>
+        <result property="parentAgencyId" column="PARENT_AGENCY_ID"/>
+        <result property="allParentIds" column="ALL_PARENT_IDS"/>
+        <result property="visitorCount" column="VISITOR_COUNT"/>
+        <result property="regUserCount" column="REG_USER_COUNT"/>
+        <result property="partyUserCount" column="PARTY_USER_COUNT"/>
+        <result property="ageLevel1" column="AGE_LEVEL_1"/>
+        <result property="ageLevel2" column="AGE_LEVEL_2"/>
+        <result property="ageLevel3" column="AGE_LEVEL_3"/>
+        <result property="ageLevel4" column="AGE_LEVEL_4"/>
+        <result property="ageLevel5" column="AGE_LEVEL_5"/>
+        <result property="ageLevel6" column="AGE_LEVEL_6"/>
+        <result property="malePartyUserCount" column="MALE_PARTY_USER_COUNT"/>
+        <result property="femalePartyUserCount" column="FEMALE_PARTY_USER_COUNT"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+    <delete id="deleteUserSummary">
+        delete from screen_kc_user_summary_daily
+        where CUSTOMER_ID = #{customerId} AND DATE_ID != #{dateId}
+        limit 1000;
+    </delete>
+
+    <insert id="batchInsertUserSummary" parameterType="map">
+        insert into screen_kc_user_summary_daily
+        (
+        ID,
+        CUSTOMER_ID,
+        DATE_ID,
+
+        GRID_ID,
+        GRID_NAME,
+        PARENT_AGENCY_ID,
+        ALL_PARENT_IDS,
+        VISITOR_COUNT,
+        REG_USER_COUNT,
+        PARTY_USER_COUNT,
+        AGE_LEVEL_1,
+        AGE_LEVEL_2,
+        AGE_LEVEL_3,
+        AGE_LEVEL_4,
+        AGE_LEVEL_5,
+        AGE_LEVEL_6,
+        MALE_PARTY_USER_COUNT,
+        FEMALE_PARTY_USER_COUNT,
+
+        DEL_FLAG,
+        REVISION,
+        CREATED_BY,
+        CREATED_TIME,
+        UPDATED_BY,
+        UPDATED_TIME
+        ) values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (
+            (SELECT REPLACE(UUID(), '-', '') AS id),
+            #{customerId},
+            #{dateId},
+            #{item.gridId},
+            #{item.gridName},
+            #{item.parentAgencyId},
+            #{item.allParentIds},
+            #{item.visitorCount},
+            #{item.regUserCount},
+            #{item.partyUserCount},
+            #{item.ageLevel1},
+            #{item.ageLevel2},
+            #{item.ageLevel3},
+            #{item.ageLevel4},
+            #{item.ageLevel5},
+            #{item.ageLevel6},
+            #{item.malePartyUserCount},
+            #{item.femalePartyUserCount},
+            0,
+            0,
+            'APP_USER',
+            now(),
+            'APP_USER',
+            now()
+            )
+        </foreach>
+    </insert>
+
+</mapper>
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcUserTrendGridMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcUserTrendGridMonthlyDao.xml
new file mode 100644
index 0000000000..4ba017252f
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcUserTrendGridMonthlyDao.xml
@@ -0,0 +1,72 @@
+<?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.dao.evaluationindex.screen.ScreenKcUserTrendGridMonthlyDao">
+
+    <resultMap type="com.epmet.entity.evaluationindex.screen.ScreenKcUserTrendGridMonthlyEntity" id="screenKcUserTrendGridMonthlyMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="monthId" column="MONTH_ID"/>
+        <result property="gridId" column="GRID_ID"/>
+        <result property="gridName" column="GRID_NAME"/>
+        <result property="parentAgencyId" column="PARENT_AGENCY_ID"/>
+        <result property="allParentIds" column="ALL_PARENT_IDS"/>
+        <result property="regUserCount" column="REG_USER_COUNT"/>
+        <result property="partyUserCount" column="PARTY_USER_COUNT"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+    <delete id="deleteUserTrendGrid">
+        delete from screen_kc_user_trend_grid_monthly
+        where CUSTOMER_ID = #{customerId} AND MONTH_ID = #{monthId}
+        limit 1000;
+    </delete>
+
+    <insert id="batchInsertUserTrendGrid" parameterType="map">
+        insert into screen_kc_user_trend_grid_monthly
+        (
+        ID,
+        CUSTOMER_ID,
+        MONTH_ID,
+
+        GRID_ID,
+        GRID_NAME,
+        PARENT_AGENCY_ID,
+        ALL_PARENT_IDS,
+        REG_USER_COUNT,
+        PARTY_USER_COUNT,
+
+        DEL_FLAG,
+        REVISION,
+        CREATED_BY,
+        CREATED_TIME,
+        UPDATED_BY,
+        UPDATED_TIME
+        ) values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (
+            (SELECT REPLACE(UUID(), '-', '') AS id),
+            #{customerId},
+            #{monthId},
+            #{item.gridId},
+            #{item.gridName},
+            #{item.parentAgencyId},
+            #{item.allParentIds},
+            #{item.regUserCount},
+            #{item.partyUserCount},
+            0,
+            0,
+            'APP_USER',
+            now(),
+            'APP_USER',
+            now()
+            )
+        </foreach>
+    </insert>
+
+</mapper>
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcVolunteerHeatRankGridDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcVolunteerHeatRankGridDailyDao.xml
new file mode 100644
index 0000000000..dffc71ae0c
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcVolunteerHeatRankGridDailyDao.xml
@@ -0,0 +1,81 @@
+<?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.dao.evaluationindex.screen.ScreenKcVolunteerHeatRankGridDailyDao">
+
+    <resultMap type="com.epmet.entity.evaluationindex.screen.ScreenKcVolunteerHeatRankGridDailyEntity" id="screenKcVolunteerHeatRankGridDailyMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="dateId" column="DATE_ID"/>
+        <result property="gridId" column="GRID_ID"/>
+        <result property="gridName" column="GRID_NAME"/>
+        <result property="parentAgencyId" column="PARENT_AGENCY_ID"/>
+        <result property="allParentIds" column="ALL_PARENT_IDS"/>
+        <result property="userId" column="USER_ID"/>
+        <result property="userName" column="USER_NAME"/>
+        <result property="heartTime" column="HEART_TIME"/>
+        <result property="points" column="POINTS"/>
+        <result property="volunteerId" column="VOLUNTEER_ID"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+    <delete id="deleteVolunteerHeatRankGrid">
+        delete from screen_kc_volunteer_heat_rank_grid_daily
+        where CUSTOMER_ID = #{customerId}
+        limit 1000;
+    </delete>
+
+    <insert id="batchInsertVolunteerHeatRankGrid" parameterType="map">
+        insert into screen_kc_volunteer_heat_rank_grid_daily
+        (
+        ID,
+        CUSTOMER_ID,
+        DATE_ID,
+
+        GRID_ID,
+        GRID_NAME,
+        PARENT_AGENCY_ID,
+        ALL_PARENT_IDS,
+        USER_ID,
+        USER_NAME,
+        HEART_TIME,
+        POINTS,
+        VOLUNTEER_ID,
+
+        DEL_FLAG,
+        REVISION,
+        CREATED_BY,
+        CREATED_TIME,
+        UPDATED_BY,
+        UPDATED_TIME
+        ) values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (
+            (SELECT REPLACE(UUID(), '-', '') AS id),
+            #{customerId},
+            #{dateId},
+            #{item.gridId},
+            #{item.gridName},
+            #{item.parentAgencyId},
+            #{item.allParentIds},
+            #{item.userId},
+            #{item.userName},
+            #{item.heartTime},
+            #{item.points},
+            #{item.volunteerId},
+            0,
+            0,
+            'APP_USER',
+            now(),
+            'APP_USER',
+            now()
+            )
+        </foreach>
+    </insert>
+
+</mapper>
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcVolunteerSummaryDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcVolunteerSummaryDailyDao.xml
new file mode 100644
index 0000000000..414ae85ecb
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenKcVolunteerSummaryDailyDao.xml
@@ -0,0 +1,91 @@
+<?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.dao.evaluationindex.screen.ScreenKcVolunteerSummaryDailyDao">
+
+    <resultMap type="com.epmet.entity.evaluationindex.screen.ScreenKcVolunteerSummaryDailyEntity" id="screenKcVolunteerSummaryDailyMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="dateId" column="DATE_ID"/>
+        <result property="gridId" column="GRID_ID"/>
+        <result property="gridName" column="GRID_NAME"/>
+        <result property="parentAgencyId" column="PARENT_AGENCY_ID"/>
+        <result property="allParentIds" column="ALL_PARENT_IDS"/>
+        <result property="ageLevel1" column="AGE_LEVEL_1"/>
+        <result property="ageLevel2" column="AGE_LEVEL_2"/>
+        <result property="ageLevel3" column="AGE_LEVEL_3"/>
+        <result property="ageLevel4" column="AGE_LEVEL_4"/>
+        <result property="ageLevel5" column="AGE_LEVEL_5"/>
+        <result property="ageLevel6" column="AGE_LEVEL_6"/>
+        <result property="maleCount" column="MALE_COUNT"/>
+        <result property="femaleCount" column="FEMALE_COUNT"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+    <delete id="deleteVolunteerSummary">
+        delete from screen_kc_volunteer_summary_daily
+        where CUSTOMER_ID = #{customerId} AND DATE_ID != #{dateId}
+        limit 1000;
+    </delete>
+
+    <insert id="batchInsertVolunteerSummary" parameterType="map">
+        insert into screen_kc_volunteer_summary_daily
+        (
+        ID,
+        CUSTOMER_ID,
+        DATE_ID,
+
+        GRID_ID,
+        GRID_NAME,
+        PARENT_AGENCY_ID,
+        ALL_PARENT_IDS,
+        AGE_LEVEL_1,
+        AGE_LEVEL_2,
+        AGE_LEVEL_3,
+        AGE_LEVEL_4,
+        AGE_LEVEL_5,
+        AGE_LEVEL_6,
+        MALE_COUNT,
+        FEMALE_COUNT,
+
+        DEL_FLAG,
+        REVISION,
+        CREATED_BY,
+        CREATED_TIME,
+        UPDATED_BY,
+        UPDATED_TIME
+        ) values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (
+            (SELECT REPLACE(UUID(), '-', '') AS id),
+            #{customerId},
+            #{dateId},
+            #{item.gridId},
+            #{item.gridName},
+            #{item.parentAgencyId},
+            #{item.allParentIds},
+            #{item.ageLevel1},
+            #{item.ageLevel2},
+            #{item.ageLevel3},
+            #{item.ageLevel4},
+            #{item.ageLevel5},
+            #{item.ageLevel6},
+            #{item.maleCount},
+            #{item.femaleCount},
+            0,
+            0,
+            'APP_USER',
+            now(),
+            'APP_USER',
+            now()
+            )
+        </foreach>
+    </insert>
+
+
+</mapper>
diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/Dockerfile b/epmet-module/epmet-activiti/epmet-activiti-server/Dockerfile
index a1d2ad6f1a..40a62488b2 100644
--- a/epmet-module/epmet-activiti/epmet-activiti-server/Dockerfile
+++ b/epmet-module/epmet-activiti/epmet-activiti-server/Dockerfile
@@ -4,7 +4,7 @@ RUN export LANG="zh_CN.UTF-8"
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 RUN echo 'Asia/Shanghai' > /etc/timezone
 
-COPY ./target/*.jar ./app.jar
+COPY ./target/*.jar ./epmet-activiti.jar
 
 EXPOSE 8086
 
diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-dev.yml
index 8c5dcd8823..d2925901c9 100644
--- a/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-dev.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-activiti.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-prod.yml
index ce9db6deb1..088bfeb2dd 100644
--- a/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-prod.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./epmet-activiti.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-test.yml b/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-test.yml
index aea13ac662..74e66105f0 100644
--- a/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-test.yml
+++ b/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-test.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-activiti.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/epmet-common-service/common-service-server/Dockerfile b/epmet-module/epmet-common-service/common-service-server/Dockerfile
index 46b45ca2e0..fe3d1a6f63 100644
--- a/epmet-module/epmet-common-service/common-service-server/Dockerfile
+++ b/epmet-module/epmet-common-service/common-service-server/Dockerfile
@@ -4,7 +4,7 @@ RUN export LANG="zh_CN.UTF-8"
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 RUN echo 'Asia/Shanghai' > /etc/timezone
 
-COPY ./target/*.jar ./app.jar
+COPY ./target/*.jar ./common-service.jar
 
 EXPOSE 8103
 
diff --git a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml
index 047408c5df..e575112640 100644
--- a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./common-service.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml
index 0e0b2609b9..acb3c62c2c 100644
--- a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./common-service.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-test.yml b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-test.yml
index 80cb75cbb5..c3ed2186f6 100644
--- a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-test.yml
+++ b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-test.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./common-service.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/epmet-common-service/common-service-server/pom.xml b/epmet-module/epmet-common-service/common-service-server/pom.xml
index c1927613c2..cc7fe0ba67 100644
--- a/epmet-module/epmet-common-service/common-service-server/pom.xml
+++ b/epmet-module/epmet-common-service/common-service-server/pom.xml
@@ -178,7 +178,7 @@
             </activation>-->
             <properties>
                 <server.port>8103</server.port>
-                <spring.profiles.active>dev</spring.profiles.active>
+                <spring.profiles.active>test</spring.profiles.active>
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/V0.0.6__add_anningejia_screenandcaiji.sql b/epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/V0.0.6__add_anningejia_screenandcaiji.sql
new file mode 100644
index 0000000000..388515832b
--- /dev/null
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/V0.0.6__add_anningejia_screenandcaiji.sql
@@ -0,0 +1,5 @@
+INSERT INTO `external_app`(`ID`, `APP_NAME`, `CUSTOMER_ID`, `CUSTOMER_TYPE`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`, `DEL_FLAG`) VALUES ('091a71fdc9e69b214bc32efb3508b4a7', '安宁e家大屏', '6c67e54f0ce4ba92a33f503082c92fc9', 'external', 0, 'APP_USER', '2020-09-11 13:14:20', 'APP_USER', '2020-09-11 13:14:20', 0);
+INSERT INTO `external_app`(`ID`, `APP_NAME`, `CUSTOMER_ID`, `CUSTOMER_TYPE`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`, `DEL_FLAG`) VALUES ('444c4fa4813bfe9414c0bb4609aea405', '安宁e家数据采集', '6c67e54f0ce4ba92a33f503082c92fc9', 'external', 0, 'APP_USER', '2020-09-11 13:28:24', 'APP_USER', '2020-09-11 13:28:24', 0);
+
+INSERT INTO `external_app_secret`(`ID`, `APP_ID`, `SECRET`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('184ff0e132550cc2563df0fdf34a204f', '091a71fdc9e69b214bc32efb3508b4a7', '3b7e7a865d4042e79079f4973e3e27b9401c11964a41402999b94f0b472c32b5', 0, 0, 'APP_USER', '2020-09-11 13:14:20', 'APP_USER', '2020-09-11 13:14:20');
+INSERT INTO `external_app_secret`(`ID`, `APP_ID`, `SECRET`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('f5ea18989511fc3d24d6dccd72faea25', '444c4fa4813bfe9414c0bb4609aea405', 'cd6e8859fd594204a9a6e8c1d50180f9c3746530211649d490030cbdd833182f', 0, 0, 'APP_USER', '2020-09-11 13:28:24', 'APP_USER', '2020-09-11 13:28:24');
\ No newline at end of file
diff --git a/epmet-module/epmet-ext/epmet-ext-server/Dockerfile b/epmet-module/epmet-ext/epmet-ext-server/Dockerfile
index 2a18b4bf3a..d6734953ee 100644
--- a/epmet-module/epmet-ext/epmet-ext-server/Dockerfile
+++ b/epmet-module/epmet-ext/epmet-ext-server/Dockerfile
@@ -4,7 +4,7 @@ RUN export LANG="zh_CN.UTF-8"
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 RUN echo 'Asia/Shanghai' > /etc/timezone
 
-COPY ./target/*.jar ./app.jar
+COPY ./target/*.jar ./epmet-ext.jar
 
 EXPOSE 8113
 
diff --git a/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml
index 392769e158..7792a04b31 100644
--- a/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-ext.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml
index 709b384c7a..bf71f1b198 100644
--- a/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./epmet-ext.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-test.yml b/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-test.yml
index 36c753627a..90c7053d1f 100644
--- a/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-test.yml
+++ b/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-test.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-ext.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/epmet-heart/epmet-heart-server/Dockerfile b/epmet-module/epmet-heart/epmet-heart-server/Dockerfile
index 696964e45a..94fd0f1809 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/Dockerfile
+++ b/epmet-module/epmet-heart/epmet-heart-server/Dockerfile
@@ -4,7 +4,7 @@ RUN export LANG="zh_CN.UTF-8"
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 RUN echo 'Asia/Shanghai' > /etc/timezone
 
-COPY ./target/*.jar ./app.jar
+COPY ./target/*.jar ./epmet-heart.jar
 
 EXPOSE 8090
 
diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml
index 4d32065b75..53e5098667 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-heart.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml
index 297fb4a40f..df1de492cb 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./epmet-heart.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml
index a5cef7fb1f..e259e170a4 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml
+++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-heart.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/epmet-job/epmet-job-server/Dockerfile b/epmet-module/epmet-job/epmet-job-server/Dockerfile
index 890caf7ec9..283ed5f94b 100644
--- a/epmet-module/epmet-job/epmet-job-server/Dockerfile
+++ b/epmet-module/epmet-job/epmet-job-server/Dockerfile
@@ -4,7 +4,7 @@ RUN export LANG="zh_CN.UTF-8"
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 RUN echo 'Asia/Shanghai' > /etc/timezone
 
-COPY ./target/*.jar ./app.jar
+COPY ./target/*.jar ./epmet-job.jar
 
 EXPOSE 8084
 
diff --git a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml
index eb9aa984f8..c9999c47d8 100644
--- a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-job.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml
index 4816a4cd30..7e5a917177 100644
--- a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./epmet-job.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml
index 5c02cae59e..a245199249 100644
--- a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml
+++ b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-job.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/epmet-message/epmet-message-server/Dockerfile b/epmet-module/epmet-message/epmet-message-server/Dockerfile
index 1a3aea849b..49f97b4c0e 100644
--- a/epmet-module/epmet-message/epmet-message-server/Dockerfile
+++ b/epmet-module/epmet-message/epmet-message-server/Dockerfile
@@ -4,7 +4,7 @@ RUN export LANG="zh_CN.UTF-8"
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 RUN echo 'Asia/Shanghai' > /etc/timezone
 
-COPY ./target/*.jar ./app.jar
+COPY ./target/*.jar ./epmet-message.jar
 
 EXPOSE 8085
 
diff --git a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml
index 6edefa45a8..5ab5ecb83d 100644
--- a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-message.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml
index 360d07d79e..67da25bdf4 100644
--- a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./epmet-message.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-test.yml b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-test.yml
index bbda7e873c..7630cefa81 100644
--- a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-test.yml
+++ b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-test.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-message.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/epmet-oss/epmet-oss-server/Dockerfile b/epmet-module/epmet-oss/epmet-oss-server/Dockerfile
index 678d2b3ff2..ca3830ee6c 100644
--- a/epmet-module/epmet-oss/epmet-oss-server/Dockerfile
+++ b/epmet-module/epmet-oss/epmet-oss-server/Dockerfile
@@ -4,7 +4,7 @@ RUN export LANG="zh_CN.UTF-8"
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 RUN echo 'Asia/Shanghai' > /etc/timezone
 
-COPY ./target/*.jar ./app.jar
+COPY ./target/*.jar ./epmet-oss.jar
 
 EXPOSE 8083
 
diff --git a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml
index 2a5fc11a89..2fa7b84b34 100644
--- a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml
@@ -10,7 +10,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-oss.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml
index dbb2282e8e..5fae8446ce 100644
--- a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml
@@ -10,7 +10,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./epmet-oss.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-test.yml b/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-test.yml
index 4dc76991bb..3a7181f4a8 100644
--- a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-test.yml
+++ b/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-test.yml
@@ -10,7 +10,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-oss.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/epmet-point/epmet-point-server/Dockerfile b/epmet-module/epmet-point/epmet-point-server/Dockerfile
index 696964e45a..eccf5af01b 100644
--- a/epmet-module/epmet-point/epmet-point-server/Dockerfile
+++ b/epmet-module/epmet-point/epmet-point-server/Dockerfile
@@ -4,7 +4,7 @@ RUN export LANG="zh_CN.UTF-8"
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 RUN echo 'Asia/Shanghai' > /etc/timezone
 
-COPY ./target/*.jar ./app.jar
+COPY ./target/*.jar ./epmet-point.jar
 
 EXPOSE 8090
 
diff --git a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml
index 615c0d0b94..f9c7734508 100644
--- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-point.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml
index 8fff39478d..9797b08b02 100644
--- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./epmet-point.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml
index 4a175b6c3f..a4cc8a4af1 100644
--- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml
+++ b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-point.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/epmet-third/epmet-third-server/Dockerfile b/epmet-module/epmet-third/epmet-third-server/Dockerfile
index d0fef3d421..af31808436 100644
--- a/epmet-module/epmet-third/epmet-third-server/Dockerfile
+++ b/epmet-module/epmet-third/epmet-third-server/Dockerfile
@@ -4,7 +4,7 @@ RUN export LANG="zh_CN.UTF-8"
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 RUN echo 'Asia/Shanghai' > /etc/timezone
 
-COPY ./target/*.jar ./app.jar
+COPY ./target/*.jar ./epmet-third.jar
 
 EXPOSE 8110
 
diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
index d9ab7469c0..c35cda57a7 100644
--- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-third.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml
index 135ec7b840..9a9e002ac7 100644
--- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./epmet-third.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml
index 9b72f3c260..13c5787cf7 100644
--- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml
+++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-third.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/gov-access/gov-access-server/Dockerfile b/epmet-module/gov-access/gov-access-server/Dockerfile
index 3ef453e6ca..660d423d2b 100644
--- a/epmet-module/gov-access/gov-access-server/Dockerfile
+++ b/epmet-module/gov-access/gov-access-server/Dockerfile
@@ -4,7 +4,7 @@ RUN export LANG="zh_CN.UTF-8"
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 RUN echo 'Asia/Shanghai' > /etc/timezone
 
-COPY ./target/*.jar ./app.jar
+COPY ./target/*.jar ./gov-access.jar
 
 EXPOSE 8099
 
diff --git a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml
index 6f7c7fe6d8..75fbb038c9 100644
--- a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./gov-access.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml
index 72ebb1216f..ababaa4a99 100644
--- a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./gov-access.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml
index 2bbc8ec394..b7e4bcfdf0 100644
--- a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml
+++ b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./gov-access.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/gov-grid/gov-grid-server/Dockerfile b/epmet-module/gov-grid/gov-grid-server/Dockerfile
index def4428089..0151c7accb 100644
--- a/epmet-module/gov-grid/gov-grid-server/Dockerfile
+++ b/epmet-module/gov-grid/gov-grid-server/Dockerfile
@@ -4,7 +4,7 @@ RUN export LANG="zh_CN.UTF-8"
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 RUN echo 'Asia/Shanghai' > /etc/timezone
 
-COPY ./target/*.jar ./app.jar
+COPY ./target/*.jar ./gov-grid.jar
 
 EXPOSE 8097
 
diff --git a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml
index d3ff3abf31..f9e02900e6 100644
--- a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./gov-grid.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-prod.yml b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-prod.yml
index f842a906c8..f595a8eb2a 100644
--- a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-prod.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./gov-grid.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml
index dfc9a03899..e01844b7fb 100644
--- a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml
+++ b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./gov-grid.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/gov-issue/gov-issue-server/Dockerfile b/epmet-module/gov-issue/gov-issue-server/Dockerfile
index c3261f957f..b40bf4b24e 100644
--- a/epmet-module/gov-issue/gov-issue-server/Dockerfile
+++ b/epmet-module/gov-issue/gov-issue-server/Dockerfile
@@ -4,7 +4,7 @@ RUN export LANG="zh_CN.UTF-8"
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 RUN echo 'Asia/Shanghai' > /etc/timezone
 
-COPY ./target/*.jar ./app.jar
+COPY ./target/*.jar ./gov-issue.jar
 
 EXPOSE 8101
 
diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml
index 1195217951..1f112f1abb 100644
--- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./gov-issue.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml
index dd8ce37dfa..a24f850367 100644
--- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./gov-issue.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml
index fc86765bf1..731ed393a6 100644
--- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml
+++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./gov-issue.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/gov-mine/gov-mine-server/Dockerfile b/epmet-module/gov-mine/gov-mine-server/Dockerfile
index 583d3041e9..61472572db 100644
--- a/epmet-module/gov-mine/gov-mine-server/Dockerfile
+++ b/epmet-module/gov-mine/gov-mine-server/Dockerfile
@@ -4,7 +4,7 @@ RUN export LANG="zh_CN.UTF-8"
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 RUN echo 'Asia/Shanghai' > /etc/timezone
 
-COPY ./target/*.jar ./app.jar
+COPY ./target/*.jar ./gov-mine.jar
 
 EXPOSE 8098
 
diff --git a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml
index 9fce06f6fd..3bc86de1dc 100644
--- a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./gov-mine.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml
index 7c1d15c36f..fb5899dbc5 100644
--- a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./gov-mine.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-test.yml b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-test.yml
index 3e88d5d67c..265d79c930 100644
--- a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-test.yml
+++ b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-test.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./gov-mine.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/gov-org/gov-org-server/Dockerfile b/epmet-module/gov-org/gov-org-server/Dockerfile
index b079f1ff77..57ac019c29 100644
--- a/epmet-module/gov-org/gov-org-server/Dockerfile
+++ b/epmet-module/gov-org/gov-org-server/Dockerfile
@@ -4,7 +4,7 @@ RUN export LANG="zh_CN.UTF-8"
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 RUN echo 'Asia/Shanghai' > /etc/timezone
 
-COPY ./target/*.jar ./app.jar
+COPY ./target/*.jar ./gov-org.jar
 
 EXPOSE 8092
 
diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml
index 4d59daef61..902ce5e8d0 100644
--- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./gov-org.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml
index a614f1baaf..f942a8fdb1 100644
--- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./gov-org.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml
index f2be2009e9..d8a3a119a0 100644
--- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml
+++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./gov-org.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml
index 405b05715e..1d61afd8af 100644
--- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./gov-project.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml
index e7aae13868..218398a4da 100644
--- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./gov-project.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml
index 3a8c39669b..d7bf5d6939 100644
--- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml
+++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./gov-project.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/gov-voice/gov-voice-server/Dockerfile b/epmet-module/gov-voice/gov-voice-server/Dockerfile
index 915e6100bc..3f3ecf336d 100644
--- a/epmet-module/gov-voice/gov-voice-server/Dockerfile
+++ b/epmet-module/gov-voice/gov-voice-server/Dockerfile
@@ -4,7 +4,7 @@ RUN export LANG="zh_CN.UTF-8"
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 RUN echo 'Asia/Shanghai' > /etc/timezone
 
-COPY ./target/*.jar ./app.jar
+COPY ./target/*.jar ./gov-voice.jar
 
 EXPOSE 8105
 
diff --git a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml
index a188027a21..b301615811 100644
--- a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./gov-voice.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml
index 1821a379dc..edf7b68936 100644
--- a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./gov-voice.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml
index f1de18f7ed..85cace2d57 100644
--- a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml
+++ b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./gov-voice.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/oper-access/oper-access-server/Dockerfile b/epmet-module/oper-access/oper-access-server/Dockerfile
index 48f2a3dea5..eb72900e52 100644
--- a/epmet-module/oper-access/oper-access-server/Dockerfile
+++ b/epmet-module/oper-access/oper-access-server/Dockerfile
@@ -4,7 +4,7 @@ RUN export LANG="zh_CN.UTF-8"
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 RUN echo 'Asia/Shanghai' > /etc/timezone
 
-COPY ./target/*.jar ./app.jar
+COPY ./target/*.jar ./oper-access.jar
 
 EXPOSE 8093
 
diff --git a/epmet-module/oper-access/oper-access-server/deploy/docker-compose-dev.yml b/epmet-module/oper-access/oper-access-server/deploy/docker-compose-dev.yml
index 1c81fdec99..c2fe2f3963 100644
--- a/epmet-module/oper-access/oper-access-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/oper-access/oper-access-server/deploy/docker-compose-dev.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./oper-access.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/oper-access/oper-access-server/deploy/docker-compose-prod.yml b/epmet-module/oper-access/oper-access-server/deploy/docker-compose-prod.yml
index 6c6bd28509..94231275a1 100644
--- a/epmet-module/oper-access/oper-access-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/oper-access/oper-access-server/deploy/docker-compose-prod.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./oper-access.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/oper-access/oper-access-server/deploy/docker-compose-test.yml b/epmet-module/oper-access/oper-access-server/deploy/docker-compose-test.yml
index 97fcbe7dbb..0ef28f8ed5 100644
--- a/epmet-module/oper-access/oper-access-server/deploy/docker-compose-test.yml
+++ b/epmet-module/oper-access/oper-access-server/deploy/docker-compose-test.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./oper-access.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/oper-crm/oper-crm-server/Dockerfile b/epmet-module/oper-crm/oper-crm-server/Dockerfile
index 696964e45a..98146177a2 100644
--- a/epmet-module/oper-crm/oper-crm-server/Dockerfile
+++ b/epmet-module/oper-crm/oper-crm-server/Dockerfile
@@ -4,7 +4,7 @@ RUN export LANG="zh_CN.UTF-8"
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 RUN echo 'Asia/Shanghai' > /etc/timezone
 
-COPY ./target/*.jar ./app.jar
+COPY ./target/*.jar ./oper-crm.jar
 
 EXPOSE 8090
 
diff --git a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml
index 1bc90fa0c0..ae71928e4e 100644
--- a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./oper-crm.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml
index a75df6848f..4f9efd0f12 100644
--- a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./oper-crm.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml
index a2ceb4d72e..f0c305d782 100644
--- a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml
+++ b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./oper-crm.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/oper-customize/oper-customize-server/Dockerfile b/epmet-module/oper-customize/oper-customize-server/Dockerfile
index 08eccce004..d9b10d355b 100644
--- a/epmet-module/oper-customize/oper-customize-server/Dockerfile
+++ b/epmet-module/oper-customize/oper-customize-server/Dockerfile
@@ -4,7 +4,7 @@ RUN export LANG="zh_CN.UTF-8"
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 RUN echo 'Asia/Shanghai' > /etc/timezone
 
-COPY ./target/*.jar ./app.jar
+COPY ./target/*.jar ./oper-customize.jar
 
 EXPOSE 8089
 
diff --git a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml
index 91e39f33c5..b0df052225 100644
--- a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./oper-customize.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-prod.yml b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-prod.yml
index f6bdf3827c..e95a43a4cd 100644
--- a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-prod.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./oper-customize.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-test.yml b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-test.yml
index 459037c1e6..ff15600fc8 100644
--- a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-test.yml
+++ b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-test.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./oper-customize.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/resi-group/resi-group-server/Dockerfile b/epmet-module/resi-group/resi-group-server/Dockerfile
index b4a767cfc8..b1fd9f6fab 100644
--- a/epmet-module/resi-group/resi-group-server/Dockerfile
+++ b/epmet-module/resi-group/resi-group-server/Dockerfile
@@ -4,7 +4,7 @@ RUN export LANG="zh_CN.UTF-8"
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 RUN echo 'Asia/Shanghai' > /etc/timezone
 
-COPY ./target/*.jar ./app.jar
+COPY ./target/*.jar ./resi-group.jar
 
 EXPOSE 8095
 
diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml
index 29a259a5d2..7a0d7418f8 100644
--- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./resi-group.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml
index a4aecd5dbf..1ac691b016 100644
--- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./resi-group.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml
index f88d341ad0..73a38f0279 100644
--- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml
+++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./resi-group.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/resi-guide/resi-guide-server/Dockerfile b/epmet-module/resi-guide/resi-guide-server/Dockerfile
index 10b908b3bf..b305936b9e 100644
--- a/epmet-module/resi-guide/resi-guide-server/Dockerfile
+++ b/epmet-module/resi-guide/resi-guide-server/Dockerfile
@@ -4,7 +4,7 @@ RUN export LANG="zh_CN.UTF-8"
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 RUN echo 'Asia/Shanghai' > /etc/timezone
 
-COPY ./target/*.jar ./app.jar
+COPY ./target/*.jar ./resi-guide.jar
 
 EXPOSE 8091
 
diff --git a/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml b/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml
index f65e0d6954..902a0e4bb6 100644
--- a/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./resi-guide.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-prod.yml b/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-prod.yml
index cfac504f95..9cadb53ff2 100644
--- a/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-prod.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./resi-guide.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-test.yml b/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-test.yml
index 2f769d6a98..c4a3d796f0 100644
--- a/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-test.yml
+++ b/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-test.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./resi-guide.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/resi-hall/resi-hall-server/Dockerfile b/epmet-module/resi-hall/resi-hall-server/Dockerfile
index 59cacab9be..c1ec1e0ba0 100644
--- a/epmet-module/resi-hall/resi-hall-server/Dockerfile
+++ b/epmet-module/resi-hall/resi-hall-server/Dockerfile
@@ -4,7 +4,7 @@ RUN export LANG="zh_CN.UTF-8"
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 RUN echo 'Asia/Shanghai' > /etc/timezone
 
-COPY ./target/*.jar ./app.jar
+COPY ./target/*.jar ./resi-hall.jar
 
 EXPOSE 8100
 
diff --git a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml
index 4ded433cc3..b85358a70e 100644
--- a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./resi-hall.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml
index 5effa21314..21b8308936 100644
--- a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./resi-hall.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-test.yml b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-test.yml
index 7727b4788c..6d675b03b8 100644
--- a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-test.yml
+++ b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-test.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./resi-hall.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/resi-home/resi-home-server/Dockerfile b/epmet-module/resi-home/resi-home-server/Dockerfile
index 00ce6c09fe..2917a9be89 100644
--- a/epmet-module/resi-home/resi-home-server/Dockerfile
+++ b/epmet-module/resi-home/resi-home-server/Dockerfile
@@ -4,7 +4,7 @@ RUN export LANG="zh_CN.UTF-8"
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 RUN echo 'Asia/Shanghai' > /etc/timezone
 
-COPY ./target/*.jar ./app.jar
+COPY ./target/*.jar ./resi-home.jar
 
 EXPOSE 8104
 
diff --git a/epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml b/epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml
index fa06f9f3c3..e0cdb9b16c 100644
--- a/epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./resi-home.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/resi-home/resi-home-server/deploy/docker-compose-prod.yml b/epmet-module/resi-home/resi-home-server/deploy/docker-compose-prod.yml
index e4dbbe5a60..50abf2bb7b 100644
--- a/epmet-module/resi-home/resi-home-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/resi-home/resi-home-server/deploy/docker-compose-prod.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./resi-home.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/resi-home/resi-home-server/deploy/docker-compose-test.yml b/epmet-module/resi-home/resi-home-server/deploy/docker-compose-test.yml
index 3374b39296..754c7d9398 100644
--- a/epmet-module/resi-home/resi-home-server/deploy/docker-compose-test.yml
+++ b/epmet-module/resi-home/resi-home-server/deploy/docker-compose-test.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./resi-home.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/resi-mine/resi-mine-server/Dockerfile b/epmet-module/resi-mine/resi-mine-server/Dockerfile
index 1278acc61a..5237c843ec 100644
--- a/epmet-module/resi-mine/resi-mine-server/Dockerfile
+++ b/epmet-module/resi-mine/resi-mine-server/Dockerfile
@@ -4,7 +4,7 @@ RUN export LANG="zh_CN.UTF-8"
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 RUN echo 'Asia/Shanghai' > /etc/timezone
 
-COPY ./target/*.jar ./app.jar
+COPY ./target/*.jar ./resi-mine.jar
 
 EXPOSE 8094
 
diff --git a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml
index 420beafcf5..57e2434372 100644
--- a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./resi-mine.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml
index 3c154c7eec..3f125978dc 100644
--- a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./resi-mine.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-test.yml b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-test.yml
index f5643beb81..2fa05668ea 100644
--- a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-test.yml
+++ b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-test.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./resi-mine.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/resi-partymember/resi-partymember-server/Dockerfile b/epmet-module/resi-partymember/resi-partymember-server/Dockerfile
index 98190f2cd2..11a783524f 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/Dockerfile
+++ b/epmet-module/resi-partymember/resi-partymember-server/Dockerfile
@@ -4,7 +4,7 @@ RUN export LANG="zh_CN.UTF-8"
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 RUN echo 'Asia/Shanghai' > /etc/timezone
 
-COPY ./target/*.jar ./app.jar
+COPY ./target/*.jar ./resi-partymember.jar
 
 EXPOSE 8096
 
diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml
index 80b020b242..680f45f751 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./resi-partymember.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml
index 380d5260a8..a6731f937b 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./resi-partymember.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml
index 6770043a38..8ca40ddf75 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml
+++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./resi-partymember.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/resi-voice/resi-voice-server/Dockerfile b/epmet-module/resi-voice/resi-voice-server/Dockerfile
index ae49b60d2b..abb56beb1c 100644
--- a/epmet-module/resi-voice/resi-voice-server/Dockerfile
+++ b/epmet-module/resi-voice/resi-voice-server/Dockerfile
@@ -4,7 +4,7 @@ RUN export LANG="zh_CN.UTF-8"
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 RUN echo 'Asia/Shanghai' > /etc/timezone
 
-COPY ./target/*.jar ./app.jar
+COPY ./target/*.jar ./resi-voice.jar
 
 EXPOSE 8106
 
diff --git a/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-dev.yml b/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-dev.yml
index 7a023873b2..b92e25f3c6 100644
--- a/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-dev.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./resi-voice.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-prod.yml b/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-prod.yml
index a32d313f2d..6962aaca73 100644
--- a/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-prod.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./resi-voice.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-test.yml b/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-test.yml
index 187294fb94..d37cc30473 100644
--- a/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-test.yml
+++ b/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-test.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./resi-voice.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-openapi/epmet-openapi-scan/Dockerfile b/epmet-openapi/epmet-openapi-scan/Dockerfile
index e619f718b9..972fb78535 100644
--- a/epmet-openapi/epmet-openapi-scan/Dockerfile
+++ b/epmet-openapi/epmet-openapi-scan/Dockerfile
@@ -4,7 +4,7 @@ RUN export LANG="zh_CN.UTF-8"
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 RUN echo 'Asia/Shanghai' > /etc/timezone
 
-COPY ./target/*.jar ./app.jar
+COPY ./target/*.jar ./epmet-openapi-scan.jar
 
 EXPOSE 8107
 
diff --git a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml
index 1e20c49e26..7593b66a08 100644
--- a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml
+++ b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-openapi-scan.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml
index 693ba1cb4c..69873777e7 100644
--- a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml
+++ b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./epmet-openapi-scan.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml
index 4c9bbec505..37c53b9557 100644
--- a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml
+++ b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-openapi-scan.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-user/epmet-user-server/Dockerfile b/epmet-user/epmet-user-server/Dockerfile
index 2495f36a46..a105a5bb0e 100644
--- a/epmet-user/epmet-user-server/Dockerfile
+++ b/epmet-user/epmet-user-server/Dockerfile
@@ -4,7 +4,7 @@ RUN export LANG="zh_CN.UTF-8"
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 RUN echo 'Asia/Shanghai' > /etc/timezone
 
-COPY ./target/*.jar ./app.jar
+COPY ./target/*.jar ./epmet-user.jar
 
 EXPOSE 8087
 
diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
index e1af81c0ce..0a8be8c147 100644
--- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
+++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-user.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml
index ff862845cc..62f03ab996 100644
--- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml
+++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./epmet-user.jar"
     restart: "unless-stopped"
     deploy:
       resources:
diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-test.yml b/epmet-user/epmet-user-server/deploy/docker-compose-test.yml
index 0dfe4fac89..eb18d181c1 100644
--- a/epmet-user/epmet-user-server/deploy/docker-compose-test.yml
+++ b/epmet-user/epmet-user-server/deploy/docker-compose-test.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-user.jar"
     restart: "unless-stopped"
     deploy:
       resources: