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

4 years ago · 3c816167cb
93 changed files with 903 additions and 701 deletions
--- a/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml
+++ b/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  epmet-admin-server:
    container_name: epmet-admin-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-admin-server:0.3.15
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-admin-server:0.3.28
    ports:
      - "8082:8082"
    network_mode: host # 使用现有网络
@ -15,4 +15,4 @@ services:
      resources:
        limits:
          cpus: '0.1'
-          memory: 600M
+          memory: 600M
--- a/epmet-admin/epmet-admin-server/pom.xml
+++ b/epmet-admin/epmet-admin-server/pom.xml
@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
-    <version>0.3.15</version>
+    <version>0.3.28</version>
    <parent>
        <groupId>com.epmet</groupId>
        <artifactId>epmet-admin</artifactId>
@ -246,7 +246,7 @@
                <nacos.ip/>

                <!--是否开启服务列表变更监听-->
-                <nacos.service-list-changed-listening.enable>false</nacos.service-list-changed-listening.enable>
+                <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>

                <spring.flyway.enabled>true</spring.flyway.enabled>

--- a/epmet-auth/deploy/docker-compose-prod.yml
+++ b/epmet-auth/deploy/docker-compose-prod.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  epmet-auth-server:
    container_name: epmet-auth-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-auth:0.3.70
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-auth:0.3.96
    ports:
      - "8081:8081"
    network_mode: host # 使用现有网络
@ -15,4 +15,4 @@ services:
      resources:
        limits:
          cpus: '0.1'
-          memory: 600M
+          memory: 600M
--- a/epmet-auth/pom.xml
+++ b/epmet-auth/pom.xml
@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
-    <version>0.3.70</version>
+    <version>0.3.96</version>
    <parent>
        <groupId>com.epmet</groupId>
        <artifactId>epmet-cloud</artifactId>
@ -352,7 +352,7 @@
                <nacos.ip/>

                <!--是否开启服务列表变更监听-->
-                <nacos.service-list-changed-listening.enable>false</nacos.service-list-changed-listening.enable>
+                <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>

                <!--公众号配置-->
                <wx.mp.configs.appId>wxcb6ce2ed0c5ae54c</wx.mp.configs.appId>
--- a/epmet-gateway/deploy/docker-compose-prod.yml
+++ b/epmet-gateway/deploy/docker-compose-prod.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  epmet-gateway-server:
    container_name: epmet-gateway-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:0.3.43
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:0.3.69
    ports:
      - "8080:8080"
    network_mode: host # 使用现有网络
@ -15,4 +15,4 @@ services:
      resources:
        limits:
          cpus: '0.1'
-          memory: 600M
+          memory: 600M
--- a/epmet-gateway/pom.xml
+++ b/epmet-gateway/pom.xml
@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
-    <version>0.3.43</version>
+    <version>0.3.69</version>
    <parent>
        <groupId>com.epmet</groupId>
        <artifactId>epmet-cloud</artifactId>
@ -347,8 +347,8 @@
                <gateway.routes.epmet-openapi-scan.uri>lb://epmet-openapi-scan</gateway.routes.epmet-openapi-scan.uri>
                <!--     <gateway.routes.epmet-openapi-scan.uri>http://localhost:8107</gateway.routes.epmet-openapi-scan.uri>-->
                <!-- 31、微信第三方平台 -->
-                <gateway.routes.epmet-third-server.uri>lb://epmet-third-server</gateway.routes.epmet-third-server.uri>
-                <!--                <gateway.routes.epmet-third-server.uri>http://localhost:8110</gateway.routes.epmet-third-server.uri>-->
+               <!-- <gateway.routes.epmet-third-server.uri>lb://epmet-third-server</gateway.routes.epmet-third-server.uri>-->
+                                <gateway.routes.epmet-third-server.uri>http://localhost:8110</gateway.routes.epmet-third-server.uri>

                <!-- 32、爱心互助            -->
                <gateway.routes.epmet-heart-server.url>lb://epmet-heart-server</gateway.routes.epmet-heart-server.url>
@ -508,7 +508,7 @@
                <nacos.ip/>

                <!--是否开启服务列表变更监听-->
-                <nacos.service-list-changed-listening.enable>false</nacos.service-list-changed-listening.enable>
+                <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>

                <!-- gateway routes -->
                <!--  1、认证服务  -->
--- a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  data-aggregator-server:
    container_name: data-aggregator-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.1
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.78
    ports:
      - "8114:8114"
    network_mode: host # 使用现有网络
--- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml
@ -2,6 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <version>0.3.78</version>
    <parent>
        <artifactId>data-aggregator</artifactId>
        <groupId>com.epmet</groupId>
@ -571,7 +572,7 @@
                <nacos.ip/>

                <!--是否开启服务列表变更监听-->
-                <nacos.service-list-changed-listening.enable>false</nacos.service-list-changed-listening.enable>
+                <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>

                <!--flyway migration 数据库迁移工具-->
                <spring.flyway.enabled>true</spring.flyway.enabled>
--- 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
@ -2,7 +2,7 @@ version: "3.7"
 services:
  data-report-server:
    container_name: data-report-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.59
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.195
    ports:
      - "8108:8108"
    network_mode: host # 使用现有网络
--- a/epmet-module/data-report/data-report-server/pom.xml
+++ b/epmet-module/data-report/data-report-server/pom.xml
@ -3,7 +3,7 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-    <version>0.3.59</version>
+    <version>0.3.195</version>
    <artifactId>data-report-server</artifactId>

    <parent>
@ -346,7 +346,7 @@
                <nacos.ip/>

                <!--是否开启服务列表变更监听-->
-                <nacos.service-list-changed-listening.enable>false</nacos.service-list-changed-listening.enable>
+                <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>

                <!--flyway migration 数据库迁移工具-->
                <spring.flyway.enabled>true</spring.flyway.enabled>
--- 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
@ -2,7 +2,7 @@ version: "3.7"
 services:
  data-statistical-server:
    container_name: data-statistical-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.81
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.300
    ports:
      - "8108:8108"
    network_mode: host # 使用现有网络
--- a/epmet-module/data-statistical/data-statistical-server/pom.xml
+++ b/epmet-module/data-statistical/data-statistical-server/pom.xml
@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.81</version>
+    <version>0.3.300</version>
    <parent>
        <artifactId>data-statistical</artifactId>
        <groupId>com.epmet</groupId>
@ -622,7 +622,7 @@
                <nacos.config-enabled>false</nacos.config-enabled>
                <nacos.ip/>
                <!--是否开启服务列表变更监听-->
-                <nacos.service-list-changed-listening.enable>false</nacos.service-list-changed-listening.enable>
+                <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>

                <!--flyway migration 数据库迁移工具-->
                <spring.flyway.enabled>false</spring.flyway.enabled>
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactOriginExtractController.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactOriginExtractController.java
@ -95,12 +95,16 @@ public class FactOriginExtractController {

    @PostMapping("project")
    public Result projectData(@RequestBody ExtractOriginFormDTO extractOriginFormDTO) {
-        List<String>  customerIds = dimCustomerService.selectCustomerIdPage(1, 100);
-        customerIds.forEach(customerId -> {
-            ExtractOriginFormDTO dto = new ExtractOriginFormDTO();
-            dto.setCustomerId(customerId);
-            projectExtractService.saveOriginProjectDaily(dto);
-        });
+        if (null != extractOriginFormDTO) {
+            projectExtractService.saveOriginProjectDaily(extractOriginFormDTO);
+        } else {
+            List<String> customerIds = dimCustomerService.selectCustomerIdPage(1, 100);
+            customerIds.forEach(customerId -> {
+                ExtractOriginFormDTO dto = new ExtractOriginFormDTO();
+                dto.setCustomerId(customerId);
+                projectExtractService.saveOriginProjectDaily(dto);
+            });
+        }
        return new Result();
    }

--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java
@ -224,7 +224,7 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
 			}));
 			//插入数据
 			if (!list.isEmpty()) {
-				factOriginProjectMainDailyService.insertBatch(list);
+				factOriginProjectMainDailyService.saveOrUpdateBatch(list);
 			}

 		}
@ -319,21 +319,14 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
 					entity.setOrgType(OrgTypeConstant.AGENCY);
 					entity.setOrgId(process.getAgencyId());
 					if (!process.getPids().contains(StrConstant.COLON)) {
-						entity.setPids("");
 						entity.setPid(NumConstant.ZERO_STR);
 					} else {
 						String[] orgArray = process.getPids().split(StrConstant.COLON);
 						if (orgArray.length > NumConstant.ONE) {
 							entity.setPid(orgArray[orgArray.length - NumConstant.TWO]);
-							String path = process.getPids().replaceAll(process.getAgencyId(), "");
-							if (path.endsWith(StrConstant.COLON)) {
-								path = path.substring(NumConstant.ZERO, path.length() - NumConstant.ONE);
-							}
-							entity.setPids(path);
 						} else {
 							log.warn("【data-statistical】业务数据抽取模块，ProjectExtractServiceImpl.saveOriginProjectDaily:查询出的项目节点发起人所属的orgIdPath不正确，agencyId->{},orgIdPath->{}", process.getAgencyId(), process.getPids());
 							entity.setPid(NumConstant.ZERO_STR);
-							entity.setPids("");
 						}
 					}
 				}
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerAgencyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerAgencyServiceImpl.java
@ -146,6 +146,13 @@ public class ScreenCustomerAgencyServiceImpl extends BaseServiceImpl<ScreenCusto
                    exists.setParentAreaCode(e.getParentAreaCode());
                    exists.setCode(e.getCode());
                    updateAgency(exists);
+
+                    // 已删除数据的处理
+                    if ("1".equals(e.getDelFlag())) {
+                        LambdaQueryWrapper<ScreenCustomerAgencyEntity> w = new LambdaQueryWrapper<>();
+                        w.eq(ScreenCustomerAgencyEntity::getAgencyId, e.getId());
+                        screenCustomerAgencyDao.delete(w);
+                    }
                }
            }
        }
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerDeptServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerDeptServiceImpl.java
@ -17,6 +17,7 @@

 package com.epmet.service.evaluationindex.screen.impl;

+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.utils.DateUtils;
@ -90,6 +91,13 @@ public class ScreenCustomerDeptServiceImpl extends BaseServiceImpl<ScreenCustome
                e.setCustomerId(dept.getCustomerId());
                e.setAreaCode(dept.getAreaCode());
                screenCustomerDeptDao.updateById(e);
+
+                // 已删除数据的处理
+                if ("1".equals(dept.getDelFlag())) {
+                    LambdaQueryWrapper<ScreenCustomerDeptEntity> w = new LambdaQueryWrapper<>();
+                    w.eq(ScreenCustomerDeptEntity::getDeptId, dept.getId());
+                    screenCustomerDeptDao.delete(w);
+                }
            }
        }
    }
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java
@ -220,8 +220,14 @@ public class DataReportingServiceImpl implements DataReportingService {
 					//如果是对应一级分类，则二级分类为空。如果对应平阴二级分类，则取对应的一级分类
 					CustomerProjectCategoryDictEntity epmetCode = epmetCodeMap.get(code);
 					if (NumConstant.ONE == epmetCode.getLevel()) {
-						categoryCode = null;
 						parentCode = code;
+						//如果项目为一级分类 则二级分类默认给第一个
+						epmetCode = epmetCodeMap.get(code.concat("01"));
+						if (epmetCode == null){
+							log.warn(" 分类下没有子分类，无法拼接2级分类 code:{}",code);
+						} else {
+							categoryCode = epmetCode.getCategoryCode();
+						}
 					} else {
 						categoryCode = code;
 						parentCode = epmetCode.getParentCategoryCode();
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDimServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDimServiceImpl.java
@ -106,6 +106,10 @@ public class StatsDimServiceImpl implements StatsDimService {
                    dimGrid.setGridName(updatedGrid.getGridName());
                    dimGrid.setUpdatedTime(now);
                    dimGrid.setUpdatedBy(RobotConstant.DIMENSION_ROBOT);
+                    dimGrid.setDelFlag(updatedGrid.getDelFlag());
+                    dimGrid.setAgencyId(updatedGrid.getPid());
+                    dimGrid.setAreaCode(updatedGrid.getAreaCode());
+                    dimGrid.setCustomerId(updatedGrid.getCustomerId());
                    dimGrid.setCode(updatedGrid.getCode());
                    dimGrids.add(dimGrid);
                }
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimAgencyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimAgencyServiceImpl.java
@ -139,10 +139,19 @@ public class DimAgencyServiceImpl extends BaseServiceImpl<DimAgencyDao, DimAgenc
            if (existsDimAgency != null) {
                //说明是已存在的，不是新增的
                existsDimAgency.setAgencyName(agency.getOrganizationName());
+                existsDimAgency.setAllParentName(agency.getAllParentName());
+                existsDimAgency.setCustomerId(agency.getCustomerId());
+                existsDimAgency.setLevel(agency.getLevel());
+                existsDimAgency.setPid(agency.getPid());
+                existsDimAgency.setPids(agency.getPids());
                existsDimAgency.setUpdatedTime(initTime);
                existsDimAgency.setUpdatedBy(RobotConstant.DIMENSION_ROBOT);
                existsDimAgency.setCode(agency.getCode());
                baseDao.updateById(existsDimAgency);
+
+                if ("1".equals(agency.getDelFlag())) {
+                    baseDao.deleteById(agency.getId());
+                }
            }
        }

--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimCustomerServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimCustomerServiceImpl.java
@ -146,6 +146,10 @@ public class DimCustomerServiceImpl extends BaseServiceImpl<DimCustomerDao, DimC
                existsCustomerDim.setUpdatedTime(initTime);
                existsCustomerDim.setAreaCode(updatedCustomer.getAreaCode());
                baseDao.updateById(existsCustomerDim);
+
+                if ("1".equals(updatedCustomer.getDelFlag())) {
+                    baseDao.deleteById(updatedCustomer.getId());
+                }
            }
        }

--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimDepartmentServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimDepartmentServiceImpl.java
@ -132,9 +132,15 @@ public class DimDepartmentServiceImpl extends BaseServiceImpl<DimDepartmentDao,
            DimDepartmentEntity dimDepartment = baseDao.selectById(updatedDepartment.getId());
            if (dimDepartment != null) {
                dimDepartment.setDepartmentName(updatedDepartment.getDepartmentName());
+                dimDepartment.setAgencyId(updatedDepartment.getAgencyId());
+                dimDepartment.setCustomerId(updatedDepartment.getCustomerId());
                dimDepartment.setUpdatedBy(RobotConstant.DIMENSION_ROBOT);
                dimDepartment.setUpdatedTime(initTime);
                baseDao.updateById(dimDepartment);
+
+                if ("1".equals(updatedDepartment.getDelFlag())) {
+                    baseDao.deleteById(updatedDepartment.getId());
+                }
            }
        }

--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimGridServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimGridServiceImpl.java
@ -128,6 +128,10 @@ public class DimGridServiceImpl extends BaseServiceImpl<DimGridDao, DimGridEntit

        for (DimGridEntity updatedGridDim : changedGrids) {
            baseDao.updateById(updatedGridDim);
+            if ("1".equals(updatedGridDim.getDelFlag())) {
+                // 如果已经被删除了，那么这里也做删除操作
+                baseDao.deleteById(updatedGridDim.getId());
+            }
        }

        lastExecRecordDao.updateExecTimeBySubject(new Date(), StatsSubject.DIM_GRID);
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.14__cpc_subscore_add_samplecount.sql
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.14__cpc_subscore_add_samplecount.sql
@ -1,5 +1,5 @@
-alter table fact_index_grid_sub_score add column SAMPLE_COUNT int(10) comment '参与统计的样本个数' after ORIGIN_VALUE;
-alter table fact_index_community_sub_score
-    add column SAMPLE_COUNT int(10) comment '参与统计的样本个数' after ORIGIN_VALUE;
-alter table fact_index_agency_sub_score
-    add column SAMPLE_COUNT int(10) comment '参与统计的样本个数' after ORIGIN_VALUE;
+# alter table fact_index_grid_sub_score add column SAMPLE_COUNT int(10) comment '参与统计的样本个数' after ORIGIN_VALUE;
+# alter table fact_index_community_sub_score
+#     add column SAMPLE_COUNT int(10) comment '参与统计的样本个数' after ORIGIN_VALUE;
+# alter table fact_index_agency_sub_score
+#     add column SAMPLE_COUNT int(10) comment '参与统计的样本个数' after ORIGIN_VALUE;
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.14__groupact_analysis.sql
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.14__groupact_analysis.sql
@ -1,47 +1,47 @@
-- epmet_data_statistical 库执行以下脚本
-CREATE TABLE `fact_group_act_daily` (
-  `ID` varchar(64) NOT NULL COMMENT '主键',
-  `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',
-  `DATE_ID` varchar(8) NOT NULL COMMENT '数据更新至日期Id：yyyyMMdd',
-  `ORG_ID` varchar(64) NOT NULL COMMENT '网格id',
-  `ORG_TYPE` varchar(10) NOT NULL COMMENT '网格：grid;组织：agency',
-  `PID` varchar(255) DEFAULT NULL COMMENT '1)orgType=grid: pid=网格所属组织id;\r\n2)orgType=agency： pid=当前组织的上级组织',
-  `PIDS` varchar(255) DEFAULT NULL COMMENT '1)orgType=grid: pids=网格所有上级组织，包括pid;\r\n2)orgType=agency： pids=当前组织的所有上级组织，包括pid.',
-  `CATEGORY_CODE` varchar(255) NOT NULL COMMENT '活动分类编码',
-  `PARENT_CODE` varchar(255) NOT NULL COMMENT '上级分类编码',
-  `LEVEL` int(11) NOT NULL COMMENT '分类等级',
-  `ORGANIZE_TOTAL` int(11) NOT NULL COMMENT '截止到dateId: 组织次数;包含dateId这一天的数据',
-  `PARTICIPATE_USER_TOTAL` int(11) NOT NULL COMMENT '截止到dateId: 参加人数;包含dateId这一天的数据',
-  `AVG_PARTICIPATE_USER_TOTAL` int(11) NOT NULL COMMENT '截止到dateId: 平均参加人数;包含dateId这一天的数据',
-  `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除；1已删除',
-  `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁',
-  `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人',
-  `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
-  `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人',
-  `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
-  PRIMARY KEY (`ID`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='组织活动(参加人数、组织次数、平均参加人数)按天累计值分析';
-
-
-CREATE TABLE `fact_group_act_monthly` (
-  `ID` varchar(64) NOT NULL COMMENT '主键',
-  `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',
-  `MONTH_ID` varchar(8) NOT NULL COMMENT '数据维度：yyyyMM',
-  `ORG_ID` varchar(64) NOT NULL COMMENT '网格id',
-  `ORG_TYPE` varchar(10) NOT NULL COMMENT '网格：grid;组织：agency',
-  `PID` varchar(255) DEFAULT NULL COMMENT '1)orgType=grid: pid=网格所属组织id;\r\n2)orgType=agency： pid=当前组织的上级组织',
-  `PIDS` varchar(255) DEFAULT NULL COMMENT '1)orgType=grid: pids=网格所有上级组织，包括pid;\r\n2)orgType=agency： pids=当前组织的所有上级组织，包括pid.',
-  `CATEGORY_CODE` varchar(255) NOT NULL COMMENT '活动分类编码',
-  `PARENT_CODE` varchar(255) NOT NULL COMMENT '上级分类编码',
-  `LEVEL` int(11) NOT NULL COMMENT '分类等级',
-  `ORGANIZE_INCR` int(11) NOT NULL COMMENT '本月内：活动组织次数',
-  `PARTICIPATE_USER__INCR` int(11) NOT NULL COMMENT '本月内：活动签到人数参加人数',
-  `AVG_PARTICIPATE_USER_INCR` int(11) NOT NULL COMMENT '本月内：平均参加人数',
-  `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除；1已删除',
-  `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁',
-  `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人',
-  `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
-  `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人',
-  `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
-  PRIMARY KEY (`ID`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='专项组活动(参加人数、组织次数、平均参加人数)按月增量分析';
+# -- epmet_data_statistical 库执行以下脚本
+# CREATE TABLE `fact_group_act_daily` (
+#   `ID` varchar(64) NOT NULL COMMENT '主键',
+#   `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',
+#   `DATE_ID` varchar(8) NOT NULL COMMENT '数据更新至日期Id：yyyyMMdd',
+#   `ORG_ID` varchar(64) NOT NULL COMMENT '网格id',
+#   `ORG_TYPE` varchar(10) NOT NULL COMMENT '网格：grid;组织：agency',
+#   `PID` varchar(255) DEFAULT NULL COMMENT '1)orgType=grid: pid=网格所属组织id;\r\n2)orgType=agency： pid=当前组织的上级组织',
+#   `PIDS` varchar(255) DEFAULT NULL COMMENT '1)orgType=grid: pids=网格所有上级组织，包括pid;\r\n2)orgType=agency： pids=当前组织的所有上级组织，包括pid.',
+#   `CATEGORY_CODE` varchar(255) NOT NULL COMMENT '活动分类编码',
+#   `PARENT_CODE` varchar(255) NOT NULL COMMENT '上级分类编码',
+#   `LEVEL` int(11) NOT NULL COMMENT '分类等级',
+#   `ORGANIZE_TOTAL` int(11) NOT NULL COMMENT '截止到dateId: 组织次数;包含dateId这一天的数据',
+#   `PARTICIPATE_USER_TOTAL` int(11) NOT NULL COMMENT '截止到dateId: 参加人数;包含dateId这一天的数据',
+#   `AVG_PARTICIPATE_USER_TOTAL` int(11) NOT NULL COMMENT '截止到dateId: 平均参加人数;包含dateId这一天的数据',
+#   `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除；1已删除',
+#   `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁',
+#   `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人',
+#   `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+#   `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人',
+#   `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+#   PRIMARY KEY (`ID`) USING BTREE
+# ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='组织活动(参加人数、组织次数、平均参加人数)按天累计值分析';
+#
+#
+# CREATE TABLE `fact_group_act_monthly` (
+#   `ID` varchar(64) NOT NULL COMMENT '主键',
+#   `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',
+#   `MONTH_ID` varchar(8) NOT NULL COMMENT '数据维度：yyyyMM',
+#   `ORG_ID` varchar(64) NOT NULL COMMENT '网格id',
+#   `ORG_TYPE` varchar(10) NOT NULL COMMENT '网格：grid;组织：agency',
+#   `PID` varchar(255) DEFAULT NULL COMMENT '1)orgType=grid: pid=网格所属组织id;\r\n2)orgType=agency： pid=当前组织的上级组织',
+#   `PIDS` varchar(255) DEFAULT NULL COMMENT '1)orgType=grid: pids=网格所有上级组织，包括pid;\r\n2)orgType=agency： pids=当前组织的所有上级组织，包括pid.',
+#   `CATEGORY_CODE` varchar(255) NOT NULL COMMENT '活动分类编码',
+#   `PARENT_CODE` varchar(255) NOT NULL COMMENT '上级分类编码',
+#   `LEVEL` int(11) NOT NULL COMMENT '分类等级',
+#   `ORGANIZE_INCR` int(11) NOT NULL COMMENT '本月内：活动组织次数',
+#   `PARTICIPATE_USER__INCR` int(11) NOT NULL COMMENT '本月内：活动签到人数参加人数',
+#   `AVG_PARTICIPATE_USER_INCR` int(11) NOT NULL COMMENT '本月内：平均参加人数',
+#   `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除；1已删除',
+#   `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁',
+#   `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人',
+#   `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+#   `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人',
+#   `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+#   PRIMARY KEY (`ID`) USING BTREE
+# ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='专项组活动(参加人数、组织次数、平均参加人数)按月增量分析';
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.15__govern.sql
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.15__govern.sql
@ -1,110 +1,110 @@
-- epmet_data_statistical新增两张表，治理指数网格按天统计，治理指数按组织按天统计
-
-CREATE TABLE `fact_agency_govern_daily` (
-  `ID` varchar(64) NOT NULL COMMENT '主键，customer_id+AGENCY_ID+date_id只有一条记录',
-  `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id',
-  `DATE_ID` varchar(8) NOT NULL COMMENT '数据更新至：yyyyMMdd; ',
-  `AGENCY_ID` varchar(64) NOT NULL COMMENT '组织id',
-  `LEVEL` varchar(30) NOT NULL COMMENT 'agency_id所属的机关级别（社区级：community，\r\n乡（镇、街道）级:street,\r\n区县级: district,\r\n市级: city\r\n省级:province）',
-  `PID` varchar(64) NOT NULL COMMENT '组织i所属的组织id',
-  `PIDS` varchar(255) NOT NULL COMMENT '组织i所有上级id',
-  `PROBLEM_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '界面展示：问题解决总数=1+2+3+4+5+6+7+8',
-  `GROUP_SELF_GOVERN_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：党群自治占比=（9+10）/PROBLEM_RESOLVED_COUNT; 此列存储的是小数',
-  `GRID_SELF_GOVERN_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：网格自治占比=GRID_SELF_GOVERN_PROJECT_TOTAL/PROBLEM_RESOLVED_COUNT；此列存储的是小数',
-  `COMMUNITY_CLOSED_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：社区解决占比=COMMUNITY_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数',
-  `STREET_CLOSED_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：街道解决占比=STREET_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数',
-  `DISTRICT_DEPT_CLOSED_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：区直部门解决占比=DISTRICT_DEPT_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数',
-  `TOPIC_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '1、当前组织内，话题关闭已解决数',
-  `TOPIC_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '2、当前组织内，话题关闭无需解决数',
-  `ISSUE_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '3、当前组织内，议题关闭已解决数',
-  `ISSUE_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '4、当前组织内，议题关闭无需解决数',
-  `ISSUE_PROJECT_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '5、当前组织内：来源于议题的项目：结案已解决数',
-  `ISSUE_PROJECT_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '6、当前组织内：来源于议题的项目：结案无需解决数',
-  `APPROVAL_PROJECT_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '7、当前组织内：项目立项，结案已解决数；默认为0，',
-  `APPROVAL_PROJECT_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '8、当前组织内：项目立项，结案无需解决数；默认为0，',
-  `IN_GROUP_TOPIC_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '9、当前组织内，未出小组即未转议题的：话题关闭已解决数',
-  `IN_GROUP_TOPIC_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '10、当前组织内，未出小组即未转议题的：话题关闭无需解决数',
-  `GRID_SELF_GOVERN_PROJECT_TOTAL` int(11) NOT NULL DEFAULT '0' COMMENT '11、未出当前网格的，结案项目数',
-  `COMMUNITY_CLOSED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '当前组织内结案的项目中：由社区结案的项目总数',
-  `STREET_CLOSED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '当前组织内结案的项目中：由街道结案的项目总数',
-  `DISTRICT_DEPT_CLOSED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '当前组织内结案的项目中：由区直部门结案的项目总数',
-  `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除、1已删除',
-  `REVISION` int(11) NOT NULL DEFAULT '0' 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 ROW_FORMAT=DYNAMIC COMMENT='组织的治理指数，按天统计';
-
-CREATE TABLE `fact_grid_govern_daily` (
-  `ID` varchar(64) NOT NULL COMMENT '主键，customer_id+grid_id+date_id只有一条记录',
-  `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id',
-  `DATE_ID` varchar(8) NOT NULL COMMENT '数据更新至：yyyyMMdd; ',
-  `GRID_ID` varchar(64) NOT NULL COMMENT '网格id',
-  `PID` varchar(64) NOT NULL COMMENT '网格所属的组织id',
-  `PIDS` varchar(255) NOT NULL COMMENT '网格所有上级id',
-  `PROBLEM_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '界面展示：问题解决总数=1+2+3+4+5+6+7+8',
-  `GROUP_SELF_GOVERN_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：党群自治占比=（9+10）/PROBLEM_RESOLVED_COUNT; 此列存储的是小数',
-  `GRID_SELF_GOVERN_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：网格自治占比=GRID_SELF_GOVERN_PROJECT_TOTAL/PROBLEM_RESOLVED_COUNT；此列存储的是小数',
-  `COMMUNITY_CLOSED_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：社区解决占比=COMMUNITY_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数',
-  `STREET_CLOSED_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：街道解决占比=STREET_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数',
-  `DISTRICT_DEPT_CLOSED_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：区直部门解决占比=DISTRICT_DEPT_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数',
-  `TOPIC_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '1、当前网格内，话题关闭已解决数',
-  `TOPIC_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '2、当前网格内，话题关闭无需解决数',
-  `ISSUE_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '3、当前网格内，议题关闭已解决数',
-  `ISSUE_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '4、当前网格内，议题关闭无需解决数',
-  `ISSUE_PROJECT_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '5、当前网格内：来源于议题的项目：结案已解决数',
-  `ISSUE_PROJECT_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '6、当前网格内：来源于议题的项目：结案无需解决数',
-  `APPROVAL_PROJECT_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '7、当前网格内：项目立项，结案已解决数；默认为0，',
-  `APPROVAL_PROJECT_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '8、当前网格内：项目立项，结案无需解决数；默认为0，',
-  `IN_GROUP_TOPIC_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '9、当前网格内，未出小组即未转议题的：话题关闭已解决数',
-  `IN_GROUP_TOPIC_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '10、当前网格内，未出小组即未转议题的：话题关闭无需解决数',
-  `FROM_ISSUE_RESOLVED_IN_GRID_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '11、来源于议题的项目，未出网格结案并且已解决的项目数',
-  `FROM_ISSUE_UN_RESOLVED_IN_GRID_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '12、来源于议题的项目，未出网格结案并且无需解决的项目数',
-  `FROM_AGENCY_RESOLVED_IN_GRID_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '13、来源于项目立项的项目，未出网格结案，并且已解决的项目数；因现在网格不能立项，所以此列默认为0',
-  `FROM_AGENCY_UN_RESOLVED_IN_GRID_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '14、来源于项目立项的项目，未出网格结案，并且无需解决的项目数；因现在网格不能立项，所以此列默认为0',
-  `GRID_SELF_GOVERN_PROJECT_TOTAL` int(11) NOT NULL COMMENT '15、未出当前网格的，结案项目数=11+12+13+14',
-  `COMMUNITY_CLOSED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '当前网格内出来的项目：由社区结案(已解决+未解决)的项目总数',
-  `STREET_CLOSED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '当前网格内出来的项目：由街道结案(已解决+未解决)的项目总数',
-  `DISTRICT_DEPT_CLOSED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '当前网格内出来的项目：由区直部门(已解决+未解决)结案的项目总数',
-  `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除、1已删除',
-  `REVISION` int(11) NOT NULL DEFAULT '0' 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 ROW_FORMAT=DYNAMIC COMMENT='网格的治理指数，按天统计';
-
-# 小组成员添加是否是党员
-ALTER TABLE `epmet_data_statistical`.`fact_origin_group_member_daily`
-    ADD COLUMN `IS_PARTY` tinyint(1) NULL DEFAULT 0 COMMENT '是否是党员' AFTER `ACTION_CODE`;
-
-# 项目主表添加结案项目是否满意
-ALTER TABLE `epmet_data_statistical`.`fact_origin_project_main_daily`
-    ADD COLUMN `IS_SATISFIED` tinyint(1) NULL COMMENT '是否满意 1:是' AFTER `IS_OVERDUE`;
-
-# 添加治理能力按日统计表
-CREATE TABLE `epmet_evaluation_index`.`screen_govern_rank_data_daily` (
-                                                 `ID` varchar(64) NOT NULL COMMENT 'ID 主键',
-                                                 `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id',
-                                                 `YEAR_ID` varchar(32) NOT NULL COMMENT '年Id',
-                                                 `MONTH_ID` varchar(32) NOT NULL COMMENT '月份Id',
-                                                 `DATE_ID` varchar(8) NOT NULL COMMENT '数据更新至：yyyyMMdd',
-                                                 `ORG_TYPE` varchar(32) NOT NULL DEFAULT 'agency' COMMENT '组织类别 agency：组织；部门：department；网格：grid',
-                                                 `ORG_ID` varchar(64) NOT NULL COMMENT '组织Id 可以为网格，机关id',
-                                                 `PARENT_ID` varchar(64) NOT NULL COMMENT '上级组织Id',
-                                                 `ORG_NAME` varchar(32) NOT NULL COMMENT '组织名称',
-                                                 `RESPONSE_RATIO` decimal(10,6) DEFAULT NULL COMMENT '响应率',
-                                                 `RESOLVED_RATIO` decimal(10,6) DEFAULT NULL COMMENT '解决率',
-                                                 `GOVERN_RATIO` decimal(10,6) DEFAULT NULL COMMENT '自治率',
-                                                 `SATISFACTION_RATIO` decimal(10,6) DEFAULT NULL COMMENT '满意率',
-                                                 `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除；1已删除',
-                                                 `REVISION` int(11) NOT NULL COMMENT '乐观锁',
-                                                 `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人',
-                                                 `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
-                                                 `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人',
-                                                 `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
-                                                 PRIMARY KEY (`ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='基层治理-治理能力排行数据(按日统计)';
+# -- epmet_data_statistical新增两张表，治理指数网格按天统计，治理指数按组织按天统计
+#
+# CREATE TABLE `fact_agency_govern_daily` (
+#   `ID` varchar(64) NOT NULL COMMENT '主键，customer_id+AGENCY_ID+date_id只有一条记录',
+#   `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id',
+#   `DATE_ID` varchar(8) NOT NULL COMMENT '数据更新至：yyyyMMdd; ',
+#   `AGENCY_ID` varchar(64) NOT NULL COMMENT '组织id',
+#   `LEVEL` varchar(30) NOT NULL COMMENT 'agency_id所属的机关级别（社区级：community，\r\n乡（镇、街道）级:street,\r\n区县级: district,\r\n市级: city\r\n省级:province）',
+#   `PID` varchar(64) NOT NULL COMMENT '组织i所属的组织id',
+#   `PIDS` varchar(255) NOT NULL COMMENT '组织i所有上级id',
+#   `PROBLEM_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '界面展示：问题解决总数=1+2+3+4+5+6+7+8',
+#   `GROUP_SELF_GOVERN_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：党群自治占比=（9+10）/PROBLEM_RESOLVED_COUNT; 此列存储的是小数',
+#   `GRID_SELF_GOVERN_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：网格自治占比=GRID_SELF_GOVERN_PROJECT_TOTAL/PROBLEM_RESOLVED_COUNT；此列存储的是小数',
+#   `COMMUNITY_CLOSED_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：社区解决占比=COMMUNITY_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数',
+#   `STREET_CLOSED_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：街道解决占比=STREET_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数',
+#   `DISTRICT_DEPT_CLOSED_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：区直部门解决占比=DISTRICT_DEPT_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数',
+#   `TOPIC_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '1、当前组织内，话题关闭已解决数',
+#   `TOPIC_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '2、当前组织内，话题关闭无需解决数',
+#   `ISSUE_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '3、当前组织内，议题关闭已解决数',
+#   `ISSUE_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '4、当前组织内，议题关闭无需解决数',
+#   `ISSUE_PROJECT_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '5、当前组织内：来源于议题的项目：结案已解决数',
+#   `ISSUE_PROJECT_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '6、当前组织内：来源于议题的项目：结案无需解决数',
+#   `APPROVAL_PROJECT_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '7、当前组织内：项目立项，结案已解决数；默认为0，',
+#   `APPROVAL_PROJECT_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '8、当前组织内：项目立项，结案无需解决数；默认为0，',
+#   `IN_GROUP_TOPIC_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '9、当前组织内，未出小组即未转议题的：话题关闭已解决数',
+#   `IN_GROUP_TOPIC_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '10、当前组织内，未出小组即未转议题的：话题关闭无需解决数',
+#   `GRID_SELF_GOVERN_PROJECT_TOTAL` int(11) NOT NULL DEFAULT '0' COMMENT '11、未出当前网格的，结案项目数',
+#   `COMMUNITY_CLOSED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '当前组织内结案的项目中：由社区结案的项目总数',
+#   `STREET_CLOSED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '当前组织内结案的项目中：由街道结案的项目总数',
+#   `DISTRICT_DEPT_CLOSED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '当前组织内结案的项目中：由区直部门结案的项目总数',
+#   `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除、1已删除',
+#   `REVISION` int(11) NOT NULL DEFAULT '0' 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 ROW_FORMAT=DYNAMIC COMMENT='组织的治理指数，按天统计';
+#
+# CREATE TABLE `fact_grid_govern_daily` (
+#   `ID` varchar(64) NOT NULL COMMENT '主键，customer_id+grid_id+date_id只有一条记录',
+#   `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id',
+#   `DATE_ID` varchar(8) NOT NULL COMMENT '数据更新至：yyyyMMdd; ',
+#   `GRID_ID` varchar(64) NOT NULL COMMENT '网格id',
+#   `PID` varchar(64) NOT NULL COMMENT '网格所属的组织id',
+#   `PIDS` varchar(255) NOT NULL COMMENT '网格所有上级id',
+#   `PROBLEM_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '界面展示：问题解决总数=1+2+3+4+5+6+7+8',
+#   `GROUP_SELF_GOVERN_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：党群自治占比=（9+10）/PROBLEM_RESOLVED_COUNT; 此列存储的是小数',
+#   `GRID_SELF_GOVERN_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：网格自治占比=GRID_SELF_GOVERN_PROJECT_TOTAL/PROBLEM_RESOLVED_COUNT；此列存储的是小数',
+#   `COMMUNITY_CLOSED_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：社区解决占比=COMMUNITY_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数',
+#   `STREET_CLOSED_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：街道解决占比=STREET_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数',
+#   `DISTRICT_DEPT_CLOSED_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：区直部门解决占比=DISTRICT_DEPT_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数',
+#   `TOPIC_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '1、当前网格内，话题关闭已解决数',
+#   `TOPIC_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '2、当前网格内，话题关闭无需解决数',
+#   `ISSUE_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '3、当前网格内，议题关闭已解决数',
+#   `ISSUE_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '4、当前网格内，议题关闭无需解决数',
+#   `ISSUE_PROJECT_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '5、当前网格内：来源于议题的项目：结案已解决数',
+#   `ISSUE_PROJECT_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '6、当前网格内：来源于议题的项目：结案无需解决数',
+#   `APPROVAL_PROJECT_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '7、当前网格内：项目立项，结案已解决数；默认为0，',
+#   `APPROVAL_PROJECT_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '8、当前网格内：项目立项，结案无需解决数；默认为0，',
+#   `IN_GROUP_TOPIC_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '9、当前网格内，未出小组即未转议题的：话题关闭已解决数',
+#   `IN_GROUP_TOPIC_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '10、当前网格内，未出小组即未转议题的：话题关闭无需解决数',
+#   `FROM_ISSUE_RESOLVED_IN_GRID_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '11、来源于议题的项目，未出网格结案并且已解决的项目数',
+#   `FROM_ISSUE_UN_RESOLVED_IN_GRID_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '12、来源于议题的项目，未出网格结案并且无需解决的项目数',
+#   `FROM_AGENCY_RESOLVED_IN_GRID_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '13、来源于项目立项的项目，未出网格结案，并且已解决的项目数；因现在网格不能立项，所以此列默认为0',
+#   `FROM_AGENCY_UN_RESOLVED_IN_GRID_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '14、来源于项目立项的项目，未出网格结案，并且无需解决的项目数；因现在网格不能立项，所以此列默认为0',
+#   `GRID_SELF_GOVERN_PROJECT_TOTAL` int(11) NOT NULL COMMENT '15、未出当前网格的，结案项目数=11+12+13+14',
+#   `COMMUNITY_CLOSED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '当前网格内出来的项目：由社区结案(已解决+未解决)的项目总数',
+#   `STREET_CLOSED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '当前网格内出来的项目：由街道结案(已解决+未解决)的项目总数',
+#   `DISTRICT_DEPT_CLOSED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '当前网格内出来的项目：由区直部门(已解决+未解决)结案的项目总数',
+#   `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除、1已删除',
+#   `REVISION` int(11) NOT NULL DEFAULT '0' 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 ROW_FORMAT=DYNAMIC COMMENT='网格的治理指数，按天统计';
+#
+# # 小组成员添加是否是党员
+# ALTER TABLE `epmet_data_statistical`.`fact_origin_group_member_daily`
+#     ADD COLUMN `IS_PARTY` tinyint(1) NULL DEFAULT 0 COMMENT '是否是党员' AFTER `ACTION_CODE`;
+#
+# # 项目主表添加结案项目是否满意
+# ALTER TABLE `epmet_data_statistical`.`fact_origin_project_main_daily`
+#     ADD COLUMN `IS_SATISFIED` tinyint(1) NULL COMMENT '是否满意 1:是' AFTER `IS_OVERDUE`;
+#
+# # 添加治理能力按日统计表
+# CREATE TABLE `epmet_evaluation_index`.`screen_govern_rank_data_daily` (
+#                                                  `ID` varchar(64) NOT NULL COMMENT 'ID 主键',
+#                                                  `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id',
+#                                                  `YEAR_ID` varchar(32) NOT NULL COMMENT '年Id',
+#                                                  `MONTH_ID` varchar(32) NOT NULL COMMENT '月份Id',
+#                                                  `DATE_ID` varchar(8) NOT NULL COMMENT '数据更新至：yyyyMMdd',
+#                                                  `ORG_TYPE` varchar(32) NOT NULL DEFAULT 'agency' COMMENT '组织类别 agency：组织；部门：department；网格：grid',
+#                                                  `ORG_ID` varchar(64) NOT NULL COMMENT '组织Id 可以为网格，机关id',
+#                                                  `PARENT_ID` varchar(64) NOT NULL COMMENT '上级组织Id',
+#                                                  `ORG_NAME` varchar(32) NOT NULL COMMENT '组织名称',
+#                                                  `RESPONSE_RATIO` decimal(10,6) DEFAULT NULL COMMENT '响应率',
+#                                                  `RESOLVED_RATIO` decimal(10,6) DEFAULT NULL COMMENT '解决率',
+#                                                  `GOVERN_RATIO` decimal(10,6) DEFAULT NULL COMMENT '自治率',
+#                                                  `SATISFACTION_RATIO` decimal(10,6) DEFAULT NULL COMMENT '满意率',
+#                                                  `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除；1已删除',
+#                                                  `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+#                                                  `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人',
+#                                                  `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+#                                                  `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人',
+#                                                  `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+#                                                  PRIMARY KEY (`ID`)
+# ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='基层治理-治理能力排行数据(按日统计)';
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.16__add_shiftIssue.sql
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.16__add_shiftIssue.sql
@ -1 +1 @@
-ALTER TABLE `fact_origin_topic_main_daily` ADD `SHIFT_ISSUE` tinyint(1) NOT NULL default '0' COMMENT '是否转为议题，0:false，1:true' AFTER `CREATE_TOPIC_USER_IS_PARTY`;
+# ALTER TABLE `fact_origin_topic_main_daily` ADD `SHIFT_ISSUE` tinyint(1) NOT NULL default '0' COMMENT '是否转为议题，0:false，1:true' AFTER `CREATE_TOPIC_USER_IS_PARTY`;
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.17__inxdex_explain.sql
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.17__inxdex_explain.sql
@ -1,113 +1,113 @@
-CREATE TABLE `index_explain` (
-                                 `ID` varchar(64) NOT NULL COMMENT '主键',
-                                 `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id',
-                                 `TITLE` varchar(32) NOT NULL COMMENT '名称',
-                                 `INDEX_CODE` varchar(256) NOT NULL COMMENT '指标code',
-                                 `MEANING` varchar(256) NOT NULL COMMENT '含义',
-                                 `ORG_LEVEL` varchar(16) NOT NULL COMMENT '组织级别（网格级：grid;社区级：community;乡（镇、街道）级:street;区县级: district;市级: city;省级:province）',
-                                 `PID` varchar(16) NOT NULL COMMENT '父ID',
-                                 `SORT` int(11) NOT NULL COMMENT '排序',
-                                 `IS_SEARCH` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否需要查询；1有；0:无；',
-                                 `TYPE` varchar(16) NOT NULL DEFAULT 'none' COMMENT '数据类型：none；本级：self；下级：sub',
-                                 `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标记 0：未删除，1：已删除',
-                                 `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁',
-                                 `CREATED_BY` varchar(32) NOT NULL DEFAULT 'app_user' 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='指标说明文案';
-
-#插入指标结束
-BEGIN;
-INSERT INTO `index_explain` VALUES ('1', 'default', '党建指数', '', '自然月周期内，党建指数得分=本级党建指数得分+下级党建指数得分', 'grid', '0', 1, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
-INSERT INTO `index_explain` VALUES ('10', 'default', '1/2下级党建指数得分', 'shequxiangguan:dangjiannengli', '下级党建指数得分=下级所有网格党建指数的平均值*相关权重', 'community', '8', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
-INSERT INTO `index_explain` VALUES ('11', 'default', '治理指数', '', '含义：自然月周期内，治理指数得分=本级治理指数得分+下级治理指数得分', 'community', '0', 4, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
-INSERT INTO `index_explain` VALUES ('12', 'default', '2/1本级治理指数得分', 'shequxiangguan:zhilinengli', '本级治理指数得分=网格各项治理指数指标数据得分*相关权重之和', 'community', '11', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
-INSERT INTO `index_explain` VALUES ('13', 'default', '2/2下级治理指数得分', 'shequxiangguan:zhilinengli', '下级治理指数得分=组织内党员的参与议事指数考评分（平均值）*相关权重', 'community', '11', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
-INSERT INTO `index_explain` VALUES ('14', 'default', '服务指数', '', '含义：自然月周期内，服务指数得分=本级服务指数得分+下级服务指数得分', 'community', '0', 3, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
-INSERT INTO `index_explain` VALUES ('15', 'default', '3/1本级服务指数得分', 'shequxiangguan:fuwunengli', '本级服务指数得分=社区活动组织次数得分*相关权重', 'community', '14', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
-INSERT INTO `index_explain` VALUES ('16', 'default', '3/2下级服务指数得分', 'shequxiangguan:fuwunengli', '下级服务指数得分=社区下级所有网格服务指数得分（平均值）*相关权重', 'community', '14', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
-INSERT INTO `index_explain` VALUES ('17', 'default', '党建指数', '', '自然月周期内，党建指数得分=本级党建指数得分+下级党建指数得分', 'street', '0', 5, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
-INSERT INTO `index_explain` VALUES ('18', 'default', '1/1本级党建指数得分', 'jiedaoxiangguan:dangjiannengli', '本级党建指数得分=社区名义发文数量得分*相关权重', 'street', '17', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
-INSERT INTO `index_explain` VALUES ('19', 'default', '1/2下级党建指数得分', 'jiedaoxiangguan:dangjiannengli', '下级党建指数得分=下级所有网格党建指数的平均值*相关权重', 'street', '17', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
-INSERT INTO `index_explain` VALUES ('2', 'default', '1/1本级党建指数得分', 'wanggexiangguan:dangjiannengli', '本级党建指数得分=网格各项党建指数指标数据得分*相关权重之和', 'grid', '1', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
-INSERT INTO `index_explain` VALUES ('20', 'default', '治理指数', '', '含义：自然月周期内，治理指数得分=本级治理指数得分+下级治理指数得分', 'street', '0', 6, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
-INSERT INTO `index_explain` VALUES ('21', 'default', '2/1本级治理指数得分', 'jiedaoxiangguan:zhilinengli', '本级治理指数得分=网格各项治理指数指标数据得分*相关权重之和', 'street', '20', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
-INSERT INTO `index_explain` VALUES ('22', 'default', '2/2下级治理指数得分', 'jiedaoxiangguan:zhilinengli', '下级治理指数得分=组织内党员的参与议事指数考评分（平均值）*相关权重', 'street', '20', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
-INSERT INTO `index_explain` VALUES ('23', 'default', '服务指数', '', '含义：自然月周期内，服务指数得分=本级服务指数得分+下级服务指数得分', 'street', '0', 7, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
-INSERT INTO `index_explain` VALUES ('24', 'default', '3/1本级服务指数得分', 'jiedaoxiangguan:fuwunengli', '本级服务指数得分=社区活动组织次数得分*相关权重', 'street', '23', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
-INSERT INTO `index_explain` VALUES ('25', 'default', '3/2下级服务指数得分', 'jiedaoxiangguan:fuwunengli', '下级服务指数得分=社区下级所有网格服务指数得分（平均值）*相关权重', 'street', '23', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
-INSERT INTO `index_explain` VALUES ('26', 'default', '党建指数', '', '含义：自然月周期内，党建指数得分=本级党建指数得分+下级党建指数得分', 'district', '0', 1, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
-INSERT INTO `index_explain` VALUES ('27', 'default', '1/1本级党建指数得分', 'quanquxiangguan:dangjiannengli', '本级党建指数得分=区名义发文数量得分*相关权重', 'district', '26', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
-INSERT INTO `index_explain` VALUES ('28', 'default', '1/2下级党建指数得分', 'quanquxiangguan:dangjiannengli', '下级党建指数得分=区下级街道党建指数汇总（平均值）*相关权重', 'district', '26', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
-INSERT INTO `index_explain` VALUES ('29', 'default', '治理指数', '', '含义：自然月周期内，治理指数得分=所有街道治理指数（平均值）*相关权重（d%）+所有直属部门治理指数（平均值）*相关权重（d%）', 'district', '0', 2, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
-INSERT INTO `index_explain` VALUES ('3', 'default', '1/2下级党建指数得分', 'dangyuanxiangguan:lianxiqunzhong', '下级党建指数得分=组织内党员的联系群众指数考评分（平均值）*相关权重', 'grid', '1', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
-INSERT INTO `index_explain` VALUES ('30', 'default', '2/1所有街道治理指数（平均值）', 'quanquxiangguan:zhilinengli', '所有街道治理指数（平均值）得分=区下级所有街道治理指数得分总和/街道总数', 'district', '29', 1, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
-INSERT INTO `index_explain` VALUES ('31', 'default', '2/2所有直属部门治理指数（平均值）', 'quzhibumen:zhilinengli', '所有指数部门治理指数（平均值）得分=区直部门各项治理指数指标数据平均分*相关权重之和', 'district', '29', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
-INSERT INTO `index_explain` VALUES ('32', 'default', '服务指数', 'quanquxiangguan:fuwunengli', '含义：自然月周期内，服务指数得分=区下属街道服务指数汇总（平均值）=区下属所有街道服务指数得分之和/街道总数', 'district', '0', 3, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
-INSERT INTO `index_explain` VALUES ('4', 'default', '治理指数', '', '含义：自然月周期内，治理指数得分=本级治理指数得分+下级治理指数得分', 'grid', '0', 2, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
-INSERT INTO `index_explain` VALUES ('5', 'default', '2/1本级治理指数得分', 'wanggexiangguan:zhilinengli', '本级治理指数得分=网格各项治理指数指标数据得分*相关权重之和', 'grid', '4', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
-INSERT INTO `index_explain` VALUES ('6', 'default', '2/2下级治理指数得分', 'dangyuanxiangguan:canyuyishi', '下级治理指数得分=组织内党员的参与议事指数考评分（平均值）*相关权重', 'grid', '4', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
-INSERT INTO `index_explain` VALUES ('7', 'default', '服务指数', 'wanggexiangguan:fuwunengli', '含义：自然月周期内，服务指数得分=活动组织次数得分*相关权重+志愿者占比得分*相关权重+党员志愿者率得分*相关权重', 'grid', '0', 3, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
-INSERT INTO `index_explain` VALUES ('8', 'default', '党建指数', '', '自然月周期内，党建指数得分=本级党建指数得分+下级党建指数得分', 'community', '0', 1, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
-INSERT INTO `index_explain` VALUES ('9', 'default', '1/1本级党建指数得分', 'shequxiangguan:dangjiannengli', '本级党建指数得分=社区名义发文数量得分*相关权重', 'community', '8', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
-COMMIT;
-
-#更新含义
-update index_dict SET INDEX_DESC='自然月周期内，网格内注册群众用户数。' WHERE INDEX_CODE = 'wanggequnzhongyhs';
-update index_dict SET INDEX_DESC='自然月周期内，网格内注册党员用户数。' WHERE INDEX_CODE = 'wanggedangyuanyhs';
-update index_dict SET INDEX_DESC='自然月周期内，参与话题、事件评论、点赞、点踩总次数大于给定阈值的群众用户。' WHERE INDEX_CODE = 'wanggehuoyueqzyhs';
-update index_dict SET INDEX_DESC='自然月周期内，参与话题、事件评论、点赞、点踩总次数大于给定阈值的党员用户。' WHERE INDEX_CODE = 'wanggehuoyuedyyhs';
-update index_dict SET INDEX_DESC='自然月周期内，网格内党员提出的总话题数与党员人数之比。' WHERE INDEX_CODE = 'wanggedangyuanrjtchts';
-update index_dict SET INDEX_DESC='自然月周期内，网格内群众提出的总话题数与群众人数之比。' WHERE INDEX_CODE = 'wanggequnzhongrjtchts';
-update index_dict SET INDEX_DESC='自然月周期内，网格内所有党员提出的议题转为项目的数目与党员人数之比。' WHERE INDEX_CODE = 'wanggedangyuanrjtcdytzxms';
-update index_dict SET INDEX_DESC='自然月周期内，网格内所有群众提出的议题转为项目的数目与群众人数之比。' WHERE INDEX_CODE = 'wanggequnzhongrjtcdytzxms';
-update index_dict SET INDEX_DESC='自然月周期内，党员自建群（群主）数量。' WHERE INDEX_CODE = 'jianqundangyuans';
-update index_dict SET INDEX_DESC='自然月周期内，党员自建群群众人数乘相关权重、党员自建群活跃群众人数乘相关权重、党员自建群活跃度-话题数乘相关权重与自建群活跃度-议题转项目率乘相关权重之和' WHERE INDEX_CODE = 'zuzhineidangydlxqznlkpfpjz';
-update index_dict SET INDEX_DESC='自然月周期内，网格内所有发文数量' WHERE INDEX_CODE = 'wanggedifawsl';
-update index_dict SET INDEX_DESC='自然月周期内，已转项目议题数与近两个自然月内议题总数之比' WHERE INDEX_CODE = 'wanggeyitizxml';
-update index_dict SET INDEX_DESC='自然月周期内，本网格内注册党员活动签到次数。' WHERE INDEX_CODE = 'dangyuancanjiashykrc';
-update index_dict SET INDEX_DESC='自然月周期内，社区下所有网格党建指数得分之和与网格总数之比' WHERE INDEX_CODE = 'xiashusuoyouwgddjnlpjz';
-update index_dict SET INDEX_DESC='自然月周期内，街道下所有社区党建指数得分之和与网格总数之比' WHERE INDEX_CODE = 'jiedaoxiashusysqdjnlhzpjz';
-update index_dict SET INDEX_DESC='自然月周期内，街道内所有发文数量' WHERE INDEX_CODE = 'jiedaomingyifwsl';
-update index_dict SET INDEX_DESC='自然月周期内，区下级所有街道党建指数得分之和与街道总数之比' WHERE INDEX_CODE = 'quxiajijieddjnlhzpjz';
-update index_dict SET INDEX_DESC='自然月周期内，区内所有发文数量' WHERE INDEX_CODE = 'qumingyifawsl';
-update index_dict SET INDEX_DESC='自然月周期内，党员提出话题数乘相关权重、党员参与话题数乘相关权重、党员提出的话题转议题数乘相关权重与党员提出的议题转项目数乘相关权重之和' WHERE INDEX_CODE = 'zuzhineidangydcyysnlkpfpjz';
-update index_dict SET INDEX_DESC='自然月周期内，网格内成员提出议题的总数量' WHERE INDEX_CODE = 'wanggezongyitsm';
-update index_dict SET INDEX_DESC='自然月周期内，新增议题数与发布议题人数去重之比' WHERE INDEX_CODE = 'wanggerenjunytsm';
-update index_dict SET INDEX_DESC='自然月周期内，议题转化的项目数' WHERE INDEX_CODE = 'wanggezongxiangms';
-update index_dict SET INDEX_DESC='自然月周期内，从议题创建到项目关闭，包括处理人，没有出过议题所属网格的项目数。' WHERE INDEX_CODE = 'wanggezizhixms';
-update index_dict SET INDEX_DESC='自然月周期内，办结的项目数' WHERE INDEX_CODE = 'wanggebanjiexms';
-update index_dict SET INDEX_DESC='自然月周期内，未被退回的项目数与项目总数之比' WHERE INDEX_CODE = 'wanggechuishaobmzql';
-update index_dict SET INDEX_DESC='自然月周期内，网格内自治办结项目的满意度评价的平均分（非常满意100，满意80，一般60）' WHERE INDEX_CODE = 'wanggeneijiejdxmdmyd';
-update index_dict SET INDEX_DESC='自然月周期内，社区下所有网格治理指数得分之和与网格总数之比' WHERE INDEX_CODE = 'shequxiashusywgzlnlhzpjz';
-update index_dict SET INDEX_DESC='自然月周期内，社区被吹哨的次数' WHERE INDEX_CODE = 'shequbeichuiscs';
-update index_dict SET INDEX_DESC='自然月周期内，社区办结项目数目' WHERE INDEX_CODE = 'shequbanjiexms';
-update index_dict SET INDEX_DESC='自然月周期内，项目受理时长（分钟）与项目数之比' WHERE INDEX_CODE = 'shequxiangmuxyd';
-update index_dict SET INDEX_DESC='自然月周期内，超期项目数与结案项目数之比' WHERE INDEX_CODE = 'shequchaoqixml';
-update index_dict SET INDEX_DESC='自然月周期内，社区办结项目数目' WHERE INDEX_CODE = 'shequbanjiexml';
-update index_dict SET INDEX_DESC='自然月周期内，社区级办结项目的满意度评价的平均分（非常满意100，满意80，一般60）' WHERE INDEX_CODE = 'shequbanjiexmmyd';
-update index_dict SET INDEX_DESC='自然月周期内，街道下所有社区治理指数得分之和与社区总数之比' WHERE INDEX_CODE = 'jiedaoxiashusysqzlnlhz';
-update index_dict SET INDEX_DESC='自然月周期内，街道被吹哨的次数' WHERE INDEX_CODE = 'jiedaobeichuiscs';
-update index_dict SET INDEX_DESC='自然月周期内，街道办结项目数目' WHERE INDEX_CODE = 'jiedaobanjiexms';
-update index_dict SET INDEX_DESC='自然月周期内，项目受理时长（分钟）与项目数之比' WHERE INDEX_CODE = 'jiedaoxiangmuxyd';
-update index_dict SET INDEX_DESC='自然月周期内，办结项目的平均处理时长的倒数' WHERE INDEX_CODE = 'jiedaobanjiexmdclxl';
-update index_dict SET INDEX_DESC='自然月周期内，街道级办结项目数目与街道级尚未办结的项目数的比例' WHERE INDEX_CODE = 'jiedaoxiangmubjl';
-update index_dict SET INDEX_DESC='自然月周期内，街道级办结项目的满意度评价的平均分（非常满意100，满意80，一般60）' WHERE INDEX_CODE = 'jiedaojixiangmmyd';
-update index_dict SET INDEX_DESC='自然月周期内，区直部门被吹哨的次数' WHERE INDEX_CODE = 'quzhibumenbcscs';
-update index_dict SET INDEX_DESC='自然月周期内，区直部门办结项目数目' WHERE INDEX_CODE = 'quzhibumenbjxms';
-update index_dict SET INDEX_DESC='自然月周期内，项目受理时长（分钟）与项目数之比' WHERE INDEX_CODE = 'quzhibumenxmxyd';
-update index_dict SET INDEX_DESC='自然月周期内，办结项目的平均处理时长的倒数' WHERE INDEX_CODE = 'quzhibumenbjxmdclxl';
-update index_dict SET INDEX_DESC='自然月周期内，区直部门办结项目数目与区直部门尚未办结的项目数的比例' WHERE INDEX_CODE = 'quzhibumenxmbjl';
-update index_dict SET INDEX_DESC='自然月周期内，区直部门办结项目的满意度评价的平均分（非常满意100，满意80，一般60）' WHERE INDEX_CODE = 'quzhibumenxmmyd';
-update index_dict SET INDEX_DESC='所有指数部门治理指数（平均值）得分=区直部门各项治理指数指标数据平均分*相关权重之和' WHERE INDEX_CODE = 'suoyouzhishubmzlnlpjz';
-update index_dict SET INDEX_DESC='自然月周期内，网格内爱心活动组织次数。' WHERE INDEX_CODE = 'wanggehuodongzzcs';
-update index_dict SET INDEX_DESC='自然月周期内，志愿者内党员数与志愿者总数之比' WHERE INDEX_CODE = 'wanggezhiyuanzzb';
-update index_dict SET INDEX_DESC='自然月周期内，网格内党员志愿者总数与网格党员总人数之比。' WHERE INDEX_CODE = 'wanggedangyuanzyzl';
-update index_dict SET INDEX_DESC='自然月周期内，社区下所有网格服务指数得分之和与网格总数之比' WHERE INDEX_CODE = 'shequxiajisywgfwnldfpjz';
-update index_dict SET INDEX_DESC='自然月周期内，社区内爱心活动组织次数。' WHERE INDEX_CODE = 'shequhuodongzzcs';
-update index_dict SET INDEX_DESC='自然月周期内，街道下所有社区服务指数得分之和与社区总数之比' WHERE INDEX_CODE = 'jiedaoxiashusqfwnldfpjz';
-update index_dict SET INDEX_DESC='自然月周期内，街道内爱心活动组织次数。' WHERE INDEX_CODE = 'jiedaohuodongzzcs';
-update index_dict SET INDEX_DESC='自然月周期内，区下级所有街道服务指数得分之和与街道总数之比' WHERE INDEX_CODE = 'quxiashujiedfwnlhzpjz';
-
+# CREATE TABLE `index_explain` (
+#                                  `ID` varchar(64) NOT NULL COMMENT '主键',
+#                                  `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id',
+#                                  `TITLE` varchar(32) NOT NULL COMMENT '名称',
+#                                  `INDEX_CODE` varchar(256) NOT NULL COMMENT '指标code',
+#                                  `MEANING` varchar(256) NOT NULL COMMENT '含义',
+#                                  `ORG_LEVEL` varchar(16) NOT NULL COMMENT '组织级别（网格级：grid;社区级：community;乡（镇、街道）级:street;区县级: district;市级: city;省级:province）',
+#                                  `PID` varchar(16) NOT NULL COMMENT '父ID',
+#                                  `SORT` int(11) NOT NULL COMMENT '排序',
+#                                  `IS_SEARCH` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否需要查询；1有；0:无；',
+#                                  `TYPE` varchar(16) NOT NULL DEFAULT 'none' COMMENT '数据类型：none；本级：self；下级：sub',
+#                                  `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标记 0：未删除，1：已删除',
+#                                  `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁',
+#                                  `CREATED_BY` varchar(32) NOT NULL DEFAULT 'app_user' 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='指标说明文案';
+#
+# #插入指标结束
+# BEGIN;
+# INSERT INTO `index_explain` VALUES ('1', 'default', '党建指数', '', '自然月周期内，党建指数得分=本级党建指数得分+下级党建指数得分', 'grid', '0', 1, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
+# INSERT INTO `index_explain` VALUES ('10', 'default', '1/2下级党建指数得分', 'shequxiangguan:dangjiannengli', '下级党建指数得分=下级所有网格党建指数的平均值*相关权重', 'community', '8', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
+# INSERT INTO `index_explain` VALUES ('11', 'default', '治理指数', '', '含义：自然月周期内，治理指数得分=本级治理指数得分+下级治理指数得分', 'community', '0', 4, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
+# INSERT INTO `index_explain` VALUES ('12', 'default', '2/1本级治理指数得分', 'shequxiangguan:zhilinengli', '本级治理指数得分=网格各项治理指数指标数据得分*相关权重之和', 'community', '11', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
+# INSERT INTO `index_explain` VALUES ('13', 'default', '2/2下级治理指数得分', 'shequxiangguan:zhilinengli', '下级治理指数得分=组织内党员的参与议事指数考评分（平均值）*相关权重', 'community', '11', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
+# INSERT INTO `index_explain` VALUES ('14', 'default', '服务指数', '', '含义：自然月周期内，服务指数得分=本级服务指数得分+下级服务指数得分', 'community', '0', 3, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
+# INSERT INTO `index_explain` VALUES ('15', 'default', '3/1本级服务指数得分', 'shequxiangguan:fuwunengli', '本级服务指数得分=社区活动组织次数得分*相关权重', 'community', '14', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
+# INSERT INTO `index_explain` VALUES ('16', 'default', '3/2下级服务指数得分', 'shequxiangguan:fuwunengli', '下级服务指数得分=社区下级所有网格服务指数得分（平均值）*相关权重', 'community', '14', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
+# INSERT INTO `index_explain` VALUES ('17', 'default', '党建指数', '', '自然月周期内，党建指数得分=本级党建指数得分+下级党建指数得分', 'street', '0', 5, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
+# INSERT INTO `index_explain` VALUES ('18', 'default', '1/1本级党建指数得分', 'jiedaoxiangguan:dangjiannengli', '本级党建指数得分=社区名义发文数量得分*相关权重', 'street', '17', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
+# INSERT INTO `index_explain` VALUES ('19', 'default', '1/2下级党建指数得分', 'jiedaoxiangguan:dangjiannengli', '下级党建指数得分=下级所有网格党建指数的平均值*相关权重', 'street', '17', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
+# INSERT INTO `index_explain` VALUES ('2', 'default', '1/1本级党建指数得分', 'wanggexiangguan:dangjiannengli', '本级党建指数得分=网格各项党建指数指标数据得分*相关权重之和', 'grid', '1', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
+# INSERT INTO `index_explain` VALUES ('20', 'default', '治理指数', '', '含义：自然月周期内，治理指数得分=本级治理指数得分+下级治理指数得分', 'street', '0', 6, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
+# INSERT INTO `index_explain` VALUES ('21', 'default', '2/1本级治理指数得分', 'jiedaoxiangguan:zhilinengli', '本级治理指数得分=网格各项治理指数指标数据得分*相关权重之和', 'street', '20', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
+# INSERT INTO `index_explain` VALUES ('22', 'default', '2/2下级治理指数得分', 'jiedaoxiangguan:zhilinengli', '下级治理指数得分=组织内党员的参与议事指数考评分（平均值）*相关权重', 'street', '20', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
+# INSERT INTO `index_explain` VALUES ('23', 'default', '服务指数', '', '含义：自然月周期内，服务指数得分=本级服务指数得分+下级服务指数得分', 'street', '0', 7, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
+# INSERT INTO `index_explain` VALUES ('24', 'default', '3/1本级服务指数得分', 'jiedaoxiangguan:fuwunengli', '本级服务指数得分=社区活动组织次数得分*相关权重', 'street', '23', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
+# INSERT INTO `index_explain` VALUES ('25', 'default', '3/2下级服务指数得分', 'jiedaoxiangguan:fuwunengli', '下级服务指数得分=社区下级所有网格服务指数得分（平均值）*相关权重', 'street', '23', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
+# INSERT INTO `index_explain` VALUES ('26', 'default', '党建指数', '', '含义：自然月周期内，党建指数得分=本级党建指数得分+下级党建指数得分', 'district', '0', 1, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
+# INSERT INTO `index_explain` VALUES ('27', 'default', '1/1本级党建指数得分', 'quanquxiangguan:dangjiannengli', '本级党建指数得分=区名义发文数量得分*相关权重', 'district', '26', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
+# INSERT INTO `index_explain` VALUES ('28', 'default', '1/2下级党建指数得分', 'quanquxiangguan:dangjiannengli', '下级党建指数得分=区下级街道党建指数汇总（平均值）*相关权重', 'district', '26', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
+# INSERT INTO `index_explain` VALUES ('29', 'default', '治理指数', '', '含义：自然月周期内，治理指数得分=所有街道治理指数（平均值）*相关权重（d%）+所有直属部门治理指数（平均值）*相关权重（d%）', 'district', '0', 2, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
+# INSERT INTO `index_explain` VALUES ('3', 'default', '1/2下级党建指数得分', 'dangyuanxiangguan:lianxiqunzhong', '下级党建指数得分=组织内党员的联系群众指数考评分（平均值）*相关权重', 'grid', '1', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
+# INSERT INTO `index_explain` VALUES ('30', 'default', '2/1所有街道治理指数（平均值）', 'quanquxiangguan:zhilinengli', '所有街道治理指数（平均值）得分=区下级所有街道治理指数得分总和/街道总数', 'district', '29', 1, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
+# INSERT INTO `index_explain` VALUES ('31', 'default', '2/2所有直属部门治理指数（平均值）', 'quzhibumen:zhilinengli', '所有指数部门治理指数（平均值）得分=区直部门各项治理指数指标数据平均分*相关权重之和', 'district', '29', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
+# INSERT INTO `index_explain` VALUES ('32', 'default', '服务指数', 'quanquxiangguan:fuwunengli', '含义：自然月周期内，服务指数得分=区下属街道服务指数汇总（平均值）=区下属所有街道服务指数得分之和/街道总数', 'district', '0', 3, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
+# INSERT INTO `index_explain` VALUES ('4', 'default', '治理指数', '', '含义：自然月周期内，治理指数得分=本级治理指数得分+下级治理指数得分', 'grid', '0', 2, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
+# INSERT INTO `index_explain` VALUES ('5', 'default', '2/1本级治理指数得分', 'wanggexiangguan:zhilinengli', '本级治理指数得分=网格各项治理指数指标数据得分*相关权重之和', 'grid', '4', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
+# INSERT INTO `index_explain` VALUES ('6', 'default', '2/2下级治理指数得分', 'dangyuanxiangguan:canyuyishi', '下级治理指数得分=组织内党员的参与议事指数考评分（平均值）*相关权重', 'grid', '4', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
+# INSERT INTO `index_explain` VALUES ('7', 'default', '服务指数', 'wanggexiangguan:fuwunengli', '含义：自然月周期内，服务指数得分=活动组织次数得分*相关权重+志愿者占比得分*相关权重+党员志愿者率得分*相关权重', 'grid', '0', 3, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
+# INSERT INTO `index_explain` VALUES ('8', 'default', '党建指数', '', '自然月周期内，党建指数得分=本级党建指数得分+下级党建指数得分', 'community', '0', 1, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
+# INSERT INTO `index_explain` VALUES ('9', 'default', '1/1本级党建指数得分', 'shequxiangguan:dangjiannengli', '本级党建指数得分=社区名义发文数量得分*相关权重', 'community', '8', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16');
+# COMMIT;
+#
+# #更新含义
+# update index_dict SET INDEX_DESC='自然月周期内，网格内注册群众用户数。' WHERE INDEX_CODE = 'wanggequnzhongyhs';
+# update index_dict SET INDEX_DESC='自然月周期内，网格内注册党员用户数。' WHERE INDEX_CODE = 'wanggedangyuanyhs';
+# update index_dict SET INDEX_DESC='自然月周期内，参与话题、事件评论、点赞、点踩总次数大于给定阈值的群众用户。' WHERE INDEX_CODE = 'wanggehuoyueqzyhs';
+# update index_dict SET INDEX_DESC='自然月周期内，参与话题、事件评论、点赞、点踩总次数大于给定阈值的党员用户。' WHERE INDEX_CODE = 'wanggehuoyuedyyhs';
+# update index_dict SET INDEX_DESC='自然月周期内，网格内党员提出的总话题数与党员人数之比。' WHERE INDEX_CODE = 'wanggedangyuanrjtchts';
+# update index_dict SET INDEX_DESC='自然月周期内，网格内群众提出的总话题数与群众人数之比。' WHERE INDEX_CODE = 'wanggequnzhongrjtchts';
+# update index_dict SET INDEX_DESC='自然月周期内，网格内所有党员提出的议题转为项目的数目与党员人数之比。' WHERE INDEX_CODE = 'wanggedangyuanrjtcdytzxms';
+# update index_dict SET INDEX_DESC='自然月周期内，网格内所有群众提出的议题转为项目的数目与群众人数之比。' WHERE INDEX_CODE = 'wanggequnzhongrjtcdytzxms';
+# update index_dict SET INDEX_DESC='自然月周期内，党员自建群（群主）数量。' WHERE INDEX_CODE = 'jianqundangyuans';
+# update index_dict SET INDEX_DESC='自然月周期内，党员自建群群众人数乘相关权重、党员自建群活跃群众人数乘相关权重、党员自建群活跃度-话题数乘相关权重与自建群活跃度-议题转项目率乘相关权重之和' WHERE INDEX_CODE = 'zuzhineidangydlxqznlkpfpjz';
+# update index_dict SET INDEX_DESC='自然月周期内，网格内所有发文数量' WHERE INDEX_CODE = 'wanggedifawsl';
+# update index_dict SET INDEX_DESC='自然月周期内，已转项目议题数与近两个自然月内议题总数之比' WHERE INDEX_CODE = 'wanggeyitizxml';
+# update index_dict SET INDEX_DESC='自然月周期内，本网格内注册党员活动签到次数。' WHERE INDEX_CODE = 'dangyuancanjiashykrc';
+# update index_dict SET INDEX_DESC='自然月周期内，社区下所有网格党建指数得分之和与网格总数之比' WHERE INDEX_CODE = 'xiashusuoyouwgddjnlpjz';
+# update index_dict SET INDEX_DESC='自然月周期内，街道下所有社区党建指数得分之和与网格总数之比' WHERE INDEX_CODE = 'jiedaoxiashusysqdjnlhzpjz';
+# update index_dict SET INDEX_DESC='自然月周期内，街道内所有发文数量' WHERE INDEX_CODE = 'jiedaomingyifwsl';
+# update index_dict SET INDEX_DESC='自然月周期内，区下级所有街道党建指数得分之和与街道总数之比' WHERE INDEX_CODE = 'quxiajijieddjnlhzpjz';
+# update index_dict SET INDEX_DESC='自然月周期内，区内所有发文数量' WHERE INDEX_CODE = 'qumingyifawsl';
+# update index_dict SET INDEX_DESC='自然月周期内，党员提出话题数乘相关权重、党员参与话题数乘相关权重、党员提出的话题转议题数乘相关权重与党员提出的议题转项目数乘相关权重之和' WHERE INDEX_CODE = 'zuzhineidangydcyysnlkpfpjz';
+# update index_dict SET INDEX_DESC='自然月周期内，网格内成员提出议题的总数量' WHERE INDEX_CODE = 'wanggezongyitsm';
+# update index_dict SET INDEX_DESC='自然月周期内，新增议题数与发布议题人数去重之比' WHERE INDEX_CODE = 'wanggerenjunytsm';
+# update index_dict SET INDEX_DESC='自然月周期内，议题转化的项目数' WHERE INDEX_CODE = 'wanggezongxiangms';
+# update index_dict SET INDEX_DESC='自然月周期内，从议题创建到项目关闭，包括处理人，没有出过议题所属网格的项目数。' WHERE INDEX_CODE = 'wanggezizhixms';
+# update index_dict SET INDEX_DESC='自然月周期内，办结的项目数' WHERE INDEX_CODE = 'wanggebanjiexms';
+# update index_dict SET INDEX_DESC='自然月周期内，未被退回的项目数与项目总数之比' WHERE INDEX_CODE = 'wanggechuishaobmzql';
+# update index_dict SET INDEX_DESC='自然月周期内，网格内自治办结项目的满意度评价的平均分（非常满意100，满意80，一般60）' WHERE INDEX_CODE = 'wanggeneijiejdxmdmyd';
+# update index_dict SET INDEX_DESC='自然月周期内，社区下所有网格治理指数得分之和与网格总数之比' WHERE INDEX_CODE = 'shequxiashusywgzlnlhzpjz';
+# update index_dict SET INDEX_DESC='自然月周期内，社区被吹哨的次数' WHERE INDEX_CODE = 'shequbeichuiscs';
+# update index_dict SET INDEX_DESC='自然月周期内，社区办结项目数目' WHERE INDEX_CODE = 'shequbanjiexms';
+# update index_dict SET INDEX_DESC='自然月周期内，项目受理时长（分钟）与项目数之比' WHERE INDEX_CODE = 'shequxiangmuxyd';
+# update index_dict SET INDEX_DESC='自然月周期内，超期项目数与结案项目数之比' WHERE INDEX_CODE = 'shequchaoqixml';
+# update index_dict SET INDEX_DESC='自然月周期内，社区办结项目数目' WHERE INDEX_CODE = 'shequbanjiexml';
+# update index_dict SET INDEX_DESC='自然月周期内，社区级办结项目的满意度评价的平均分（非常满意100，满意80，一般60）' WHERE INDEX_CODE = 'shequbanjiexmmyd';
+# update index_dict SET INDEX_DESC='自然月周期内，街道下所有社区治理指数得分之和与社区总数之比' WHERE INDEX_CODE = 'jiedaoxiashusysqzlnlhz';
+# update index_dict SET INDEX_DESC='自然月周期内，街道被吹哨的次数' WHERE INDEX_CODE = 'jiedaobeichuiscs';
+# update index_dict SET INDEX_DESC='自然月周期内，街道办结项目数目' WHERE INDEX_CODE = 'jiedaobanjiexms';
+# update index_dict SET INDEX_DESC='自然月周期内，项目受理时长（分钟）与项目数之比' WHERE INDEX_CODE = 'jiedaoxiangmuxyd';
+# update index_dict SET INDEX_DESC='自然月周期内，办结项目的平均处理时长的倒数' WHERE INDEX_CODE = 'jiedaobanjiexmdclxl';
+# update index_dict SET INDEX_DESC='自然月周期内，街道级办结项目数目与街道级尚未办结的项目数的比例' WHERE INDEX_CODE = 'jiedaoxiangmubjl';
+# update index_dict SET INDEX_DESC='自然月周期内，街道级办结项目的满意度评价的平均分（非常满意100，满意80，一般60）' WHERE INDEX_CODE = 'jiedaojixiangmmyd';
+# update index_dict SET INDEX_DESC='自然月周期内，区直部门被吹哨的次数' WHERE INDEX_CODE = 'quzhibumenbcscs';
+# update index_dict SET INDEX_DESC='自然月周期内，区直部门办结项目数目' WHERE INDEX_CODE = 'quzhibumenbjxms';
+# update index_dict SET INDEX_DESC='自然月周期内，项目受理时长（分钟）与项目数之比' WHERE INDEX_CODE = 'quzhibumenxmxyd';
+# update index_dict SET INDEX_DESC='自然月周期内，办结项目的平均处理时长的倒数' WHERE INDEX_CODE = 'quzhibumenbjxmdclxl';
+# update index_dict SET INDEX_DESC='自然月周期内，区直部门办结项目数目与区直部门尚未办结的项目数的比例' WHERE INDEX_CODE = 'quzhibumenxmbjl';
+# update index_dict SET INDEX_DESC='自然月周期内，区直部门办结项目的满意度评价的平均分（非常满意100，满意80，一般60）' WHERE INDEX_CODE = 'quzhibumenxmmyd';
+# update index_dict SET INDEX_DESC='所有指数部门治理指数（平均值）得分=区直部门各项治理指数指标数据平均分*相关权重之和' WHERE INDEX_CODE = 'suoyouzhishubmzlnlpjz';
+# update index_dict SET INDEX_DESC='自然月周期内，网格内爱心活动组织次数。' WHERE INDEX_CODE = 'wanggehuodongzzcs';
+# update index_dict SET INDEX_DESC='自然月周期内，志愿者内党员数与志愿者总数之比' WHERE INDEX_CODE = 'wanggezhiyuanzzb';
+# update index_dict SET INDEX_DESC='自然月周期内，网格内党员志愿者总数与网格党员总人数之比。' WHERE INDEX_CODE = 'wanggedangyuanzyzl';
+# update index_dict SET INDEX_DESC='自然月周期内，社区下所有网格服务指数得分之和与网格总数之比' WHERE INDEX_CODE = 'shequxiajisywgfwnldfpjz';
+# update index_dict SET INDEX_DESC='自然月周期内，社区内爱心活动组织次数。' WHERE INDEX_CODE = 'shequhuodongzzcs';
+# update index_dict SET INDEX_DESC='自然月周期内，街道下所有社区服务指数得分之和与社区总数之比' WHERE INDEX_CODE = 'jiedaoxiashusqfwnldfpjz';
+# update index_dict SET INDEX_DESC='自然月周期内，街道内爱心活动组织次数。' WHERE INDEX_CODE = 'jiedaohuodongzzcs';
+# update index_dict SET INDEX_DESC='自然月周期内，区下级所有街道服务指数得分之和与街道总数之比' WHERE INDEX_CODE = 'quxiashujiedfwnlhzpjz';
+#
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.18__modify_index_weight_for_3.0.sql
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.18__modify_index_weight_for_3.0.sql
@ -1,22 +1,22 @@
-#修改党员相关 三会一课权重
-UPDATE index_group_detail_template SET WEIGHT = 0.1 WHERE INDEX_CODE = 'dangwuhuodong';
-UPDATE index_group_detail_template SET WEIGHT = 0.45 WHERE INDEX_CODE = 'canyuyishi';
-UPDATE index_group_detail_template SET WEIGHT = 0.45 WHERE INDEX_CODE = 'lianxiqunzhong';
-UPDATE index_group_detail_template SET WEIGHT = 1 WHERE INDEX_CODE = 'canjiasanhykcs';
-
-UPDATE index_group_detail_template SET WEIGHT = 0.26 WHERE INDEX_CODE = 'zuzhineidangydlxqznlkpfpjz';
-UPDATE index_group_detail_template SET WEIGHT = 0.26 WHERE INDEX_CODE = 'wanggedifawsl';
-UPDATE index_group_detail_template SET WEIGHT = 0.04 WHERE INDEX_CODE = 'zuzhisanhykcs';
-UPDATE index_group_detail_template SET WEIGHT = 0.04 WHERE INDEX_CODE = 'dangyuancanjiashykrc';
-
-#开发和测试的 对应的客户已经修改执行完了
-#修改生产的 先给党群e事通和亿联员工互助会设置一下权重。再加上我们自己的 微笑崂山
-UPDATE index_group_detail SET WEIGHT = 0.1  WHERE CUSTOMER_ID IN ('7ae84f0ceb36397f5078187d72de3403','04c0d396e298f13e57aa5904a657eaa6','3fdd0380deff5b30f45376cdf995d1c1') AND INDEX_CODE = 'dangwuhuodong';
-UPDATE index_group_detail SET WEIGHT = 0.45 WHERE CUSTOMER_ID IN ('7ae84f0ceb36397f5078187d72de3403','04c0d396e298f13e57aa5904a657eaa6','3fdd0380deff5b30f45376cdf995d1c1') AND INDEX_CODE = 'canyuyishi';
-UPDATE index_group_detail SET WEIGHT = 0.45 WHERE CUSTOMER_ID IN ('7ae84f0ceb36397f5078187d72de3403','04c0d396e298f13e57aa5904a657eaa6','3fdd0380deff5b30f45376cdf995d1c1') AND INDEX_CODE = 'lianxiqunzhong';
-UPDATE index_group_detail SET WEIGHT = 1    WHERE CUSTOMER_ID IN ('7ae84f0ceb36397f5078187d72de3403','04c0d396e298f13e57aa5904a657eaa6','3fdd0380deff5b30f45376cdf995d1c1') AND INDEX_CODE = 'canjiasanhykcs';
-
-UPDATE index_group_detail SET WEIGHT = 0.26 WHERE CUSTOMER_ID IN ('7ae84f0ceb36397f5078187d72de3403','04c0d396e298f13e57aa5904a657eaa6','3fdd0380deff5b30f45376cdf995d1c1') AND INDEX_CODE = 'zuzhineidangydlxqznlkpfpjz';
-UPDATE index_group_detail SET WEIGHT = 0.26 WHERE CUSTOMER_ID IN ('7ae84f0ceb36397f5078187d72de3403','04c0d396e298f13e57aa5904a657eaa6','3fdd0380deff5b30f45376cdf995d1c1') AND INDEX_CODE = 'wanggedifawsl';
-UPDATE index_group_detail SET WEIGHT = 0.04 WHERE CUSTOMER_ID IN ('7ae84f0ceb36397f5078187d72de3403','04c0d396e298f13e57aa5904a657eaa6','3fdd0380deff5b30f45376cdf995d1c1') AND INDEX_CODE = 'zuzhisanhykcs';
-UPDATE index_group_detail SET WEIGHT = 0.04 WHERE CUSTOMER_ID IN ('7ae84f0ceb36397f5078187d72de3403','04c0d396e298f13e57aa5904a657eaa6','3fdd0380deff5b30f45376cdf995d1c1') AND INDEX_CODE = 'dangyuancanjiashykrc';
+# #修改党员相关 三会一课权重
+# UPDATE index_group_detail_template SET WEIGHT = 0.1 WHERE INDEX_CODE = 'dangwuhuodong';
+# UPDATE index_group_detail_template SET WEIGHT = 0.45 WHERE INDEX_CODE = 'canyuyishi';
+# UPDATE index_group_detail_template SET WEIGHT = 0.45 WHERE INDEX_CODE = 'lianxiqunzhong';
+# UPDATE index_group_detail_template SET WEIGHT = 1 WHERE INDEX_CODE = 'canjiasanhykcs';
+#
+# UPDATE index_group_detail_template SET WEIGHT = 0.26 WHERE INDEX_CODE = 'zuzhineidangydlxqznlkpfpjz';
+# UPDATE index_group_detail_template SET WEIGHT = 0.26 WHERE INDEX_CODE = 'wanggedifawsl';
+# UPDATE index_group_detail_template SET WEIGHT = 0.04 WHERE INDEX_CODE = 'zuzhisanhykcs';
+# UPDATE index_group_detail_template SET WEIGHT = 0.04 WHERE INDEX_CODE = 'dangyuancanjiashykrc';
+#
+# #开发和测试的 对应的客户已经修改执行完了
+# #修改生产的 先给党群e事通和亿联员工互助会设置一下权重。再加上我们自己的 微笑崂山
+# UPDATE index_group_detail SET WEIGHT = 0.1  WHERE CUSTOMER_ID IN ('7ae84f0ceb36397f5078187d72de3403','04c0d396e298f13e57aa5904a657eaa6','3fdd0380deff5b30f45376cdf995d1c1') AND INDEX_CODE = 'dangwuhuodong';
+# UPDATE index_group_detail SET WEIGHT = 0.45 WHERE CUSTOMER_ID IN ('7ae84f0ceb36397f5078187d72de3403','04c0d396e298f13e57aa5904a657eaa6','3fdd0380deff5b30f45376cdf995d1c1') AND INDEX_CODE = 'canyuyishi';
+# UPDATE index_group_detail SET WEIGHT = 0.45 WHERE CUSTOMER_ID IN ('7ae84f0ceb36397f5078187d72de3403','04c0d396e298f13e57aa5904a657eaa6','3fdd0380deff5b30f45376cdf995d1c1') AND INDEX_CODE = 'lianxiqunzhong';
+# UPDATE index_group_detail SET WEIGHT = 1    WHERE CUSTOMER_ID IN ('7ae84f0ceb36397f5078187d72de3403','04c0d396e298f13e57aa5904a657eaa6','3fdd0380deff5b30f45376cdf995d1c1') AND INDEX_CODE = 'canjiasanhykcs';
+#
+# UPDATE index_group_detail SET WEIGHT = 0.26 WHERE CUSTOMER_ID IN ('7ae84f0ceb36397f5078187d72de3403','04c0d396e298f13e57aa5904a657eaa6','3fdd0380deff5b30f45376cdf995d1c1') AND INDEX_CODE = 'zuzhineidangydlxqznlkpfpjz';
+# UPDATE index_group_detail SET WEIGHT = 0.26 WHERE CUSTOMER_ID IN ('7ae84f0ceb36397f5078187d72de3403','04c0d396e298f13e57aa5904a657eaa6','3fdd0380deff5b30f45376cdf995d1c1') AND INDEX_CODE = 'wanggedifawsl';
+# UPDATE index_group_detail SET WEIGHT = 0.04 WHERE CUSTOMER_ID IN ('7ae84f0ceb36397f5078187d72de3403','04c0d396e298f13e57aa5904a657eaa6','3fdd0380deff5b30f45376cdf995d1c1') AND INDEX_CODE = 'zuzhisanhykcs';
+# UPDATE index_group_detail SET WEIGHT = 0.04 WHERE CUSTOMER_ID IN ('7ae84f0ceb36397f5078187d72de3403','04c0d396e298f13e57aa5904a657eaa6','3fdd0380deff5b30f45376cdf995d1c1') AND INDEX_CODE = 'dangyuancanjiashykrc';
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.19__add_gridMemberToalColumn.sql
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.19__add_gridMemberToalColumn.sql
@ -1,4 +1,4 @@
-- 为了平阴大屏，显示网格员数，screen_user_total_data 新增GRID_MEMBER_TOTAL
-
-- epmet_evaluation_index 、 epmet_data_statistical_display  库执行以下：
-ALTER TABLE screen_user_total_data ADD COLUMN `GRID_MEMBER_TOTAL` INT ( 11 ) NOT NULL DEFAULT '0' COMMENT '06.01新增：orgType=agency或者grid的时候，此列赋值:当前组织或者当前网格内的网格员人数' AFTER PROJECT_TOTAL;
+# -- 为了平阴大屏，显示网格员数，screen_user_total_data 新增GRID_MEMBER_TOTAL
+#
+# -- epmet_evaluation_index 、 epmet_data_statistical_display  库执行以下：
+# ALTER TABLE screen_user_total_data ADD COLUMN `GRID_MEMBER_TOTAL` INT ( 11 ) NOT NULL DEFAULT '0' COMMENT '06.01新增：orgType=agency或者grid的时候，此列赋值:当前组织或者当前网格内的网格员人数' AFTER PROJECT_TOTAL;
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml
@ -539,58 +539,72 @@
            a.count AS "sum",
            IFNULL( b.count, 0 ) AS "count"
        FROM
-            ( SELECT
-                    GRID_ID,
-                    COUNT( ID ) AS "count"
-                FROM
-                    fact_origin_project_main_daily
-                WHERE
-                    CUSTOMER_ID = #{customerId}
-                    AND MONTH_ID = #{monthId}
-                    AND GRID_ID != ''
-                GROUP BY GRID_ID ) a
-        LEFT JOIN
-        ( SELECT
+            (
+            SELECT
                GRID_ID,
                COUNT( ID ) AS "count"
-            FROM fact_origin_project_main_daily
+            FROM
+                fact_origin_project_main_daily
            WHERE
-                PROJECT_STATUS = 'closed'
-                AND CUSTOMER_ID = #{customerId}
+                CUSTOMER_ID = #{customerId}
                AND MONTH_ID = #{monthId}
                AND GRID_ID != ''
-            GROUP BY GRID_ID ) b
-        ON a.GRID_ID = b.GRID_ID
+            GROUP BY
+            GRID_ID ) a
+        LEFT JOIN (
+            SELECT
+                a.GRID_ID,
+                COUNT( a.ID ) AS "count"
+            FROM
+                fact_origin_project_main_daily a
+                INNER JOIN fact_origin_project_log_daily b ON a.ID = b.PROJECT_ID
+                AND b.CUSTOMER_ID = #{customerId}
+                AND b.ACTION_CODE = 'close'
+                AND b.MONTH_ID = #{monthId}
+            WHERE
+                a.PROJECT_STATUS = 'closed'
+                AND a.CUSTOMER_ID = #{customerId}
+                AND a.MONTH_ID = #{monthId}
+                AND a.GRID_ID != ''
+            GROUP BY
+            GRID_ID) b ON a.GRID_ID = b.GRID_ID
    </select>

    <select id="selectAgencyClosed" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
        SELECT
-            a.AGENCY_ID AS "orgId",
-            a.count AS "sum",
-            IFNULL( b.count, 0 ) AS "count"
+                a.AGENCY_ID AS "orgId",
+                a.count AS "sum",
+                IFNULL( b.count, 0 ) AS "count"
        FROM
-            ( SELECT
-                    AGENCY_ID,
-                    COUNT( ID ) AS "count"
+                (
+                SELECT
+                        AGENCY_ID,
+                        COUNT( ID ) AS "count"
                FROM
-                    fact_origin_project_main_daily
+                        fact_origin_project_main_daily
                WHERE
-                    CUSTOMER_ID = #{customerId}
-                    AND MONTH_ID = #{monthId}
-                    AND AGENCY_ID != ''
-                GROUP BY AGENCY_ID ) a
-        LEFT JOIN
-        ( SELECT
-                AGENCY_ID,
-                COUNT( ID ) AS "count"
-            FROM fact_origin_project_main_daily
-            WHERE
-                PROJECT_STATUS = 'closed'
-                AND CUSTOMER_ID = #{customerId}
-                AND MONTH_ID = #{monthId}
-                AND AGENCY_ID != ''
-            GROUP BY AGENCY_ID ) b
-        ON a.AGENCY_ID = b.AGENCY_ID
+                        CUSTOMER_ID = #{customerId}
+                        AND MONTH_ID = #{monthId}
+                        AND AGENCY_ID != ''
+                GROUP BY
+                AGENCY_ID ) a
+        LEFT JOIN (
+                SELECT
+                        a.AGENCY_ID,
+                        COUNT( a.ID ) AS "count"
+                FROM
+                        fact_origin_project_main_daily a
+                        INNER JOIN fact_origin_project_log_daily b ON a.ID = b.PROJECT_ID
+                        AND b.CUSTOMER_ID = #{customerId}
+                        AND b.ACTION_CODE = 'close'
+                        AND b.MONTH_ID = #{monthId}
+                WHERE
+                        a.PROJECT_STATUS = 'closed'
+                        AND a.CUSTOMER_ID = #{customerId}
+                        AND a.MONTH_ID = #{monthId}
+                        AND a.AGENCY_ID != ''
+                GROUP BY
+                AGENCY_ID) b ON a.AGENCY_ID = b.AGENCY_ID
    </select>

    <select id="selectNotReturn" resultType="com.epmet.dto.extract.result.TransferRightRatioResultDTO">
@ -753,45 +767,57 @@
    </select>
    <select id="selectGridSelfDaily" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
        SELECT
-            GRID_ID AS "orgId",
-            COUNT( ID ) AS "sum",
-            IFNULL(a.count,0) AS "count"
+            fm.ORG_ID AS "orgId",
+            COUNT( fm.PROJECT_ID ) AS "sum",
+            IFNULL( a.count, 0 ) AS "count"
        FROM
-            fact_origin_project_main_daily fm
-                LEFT JOIN (
+            fact_origin_project_log_daily fm
+            LEFT JOIN (
+            SELECT
+                orgId,
+                COUNT( PROJECT_ID ) AS "count"
+            FROM
+                (
                SELECT
-                    orgId,
-                    COUNT( PROJECT_ID ) AS "count"
+                    ORG_ID AS orgId,
+                    PROJECT_ID
                FROM
-                    (
-                        SELECT
-                            ORG_ID AS orgId,
-                            PROJECT_ID
-                        FROM
-                            fact_origin_project_log_daily
-                        WHERE
-                            DEL_FLAG = 0
-                          AND CUSTOMER_ID = #{customerId}
-                          AND ( ACTION_CODE = 'response' OR ACTION_CODE = 'close' OR ACTION_CODE = 'transfer' OR ACTION_CODE = 'created' )
-                          AND PROJECT_ID IN (
-                              SELECT ID FROM fact_origin_project_main_daily WHERE DEL_FLAG = 0 AND PROJECT_STATUS = 'closed' AND ORIGIN = 'issue'
-                                                                              AND CUSTOMER_ID = #{customerId}
-                                                                              AND DATE_ID &lt;= #{dateId})
-                        GROUP BY
-                            PROJECT_ID
-                        HAVING
-                            COUNT(DISTINCT ( ORG_ID )) = 1) a
+                    fact_origin_project_log_daily log
+                WHERE
+                    DEL_FLAG = 0
+                    AND CUSTOMER_ID = #{customerId}
+                    AND ( ACTION_CODE = 'response' OR ACTION_CODE = 'close' OR ACTION_CODE = 'transfer' OR ACTION_CODE = 'created' )
+                    AND EXISTS (
+                    SELECT
+                        PROJECT_ID
+                    FROM
+                        fact_origin_project_log_daily
+                    WHERE
+                        DEL_FLAG = 0
+                        AND ACTION_CODE = 'close'
+                        AND ORG_TYPE = 'grid'
+                        AND CUSTOMER_ID = #{customerId}
+                        AND DATE_ID &lt;= #{dateId}
+                        AND log.PROJECT_ID = PROJECT_ID
+                    )
                GROUP BY
-                    orgId
-            ) a ON fm.GRID_ID = a.orgId
+                    PROJECT_ID
+                HAVING
+                    COUNT(
+                    DISTINCT ( ORG_ID )) = 1
+                ) a
+            GROUP BY
+                orgId
+            ) a ON fm.ORG_ID = a.orgId
        WHERE
-            PROJECT_STATUS = 'closed'
-          AND (ORIGIN = 'issue' OR ORIGIN = 'resi_event')
-          AND GRID_ID != ''
-          AND CUSTOMER_ID = #{customerId}
-         AND DATE_ID &lt;= #{dateId}
+            ACTION_CODE = 'close'
+            AND ORG_TYPE = 'grid'
+            AND CUSTOMER_ID = #{customerId}
+            AND DATE_ID &lt;= #{dateId}
        GROUP BY
-            GRID_ID
+            fm.ORG_ID
+        ORDER BY
+            ORG_ID
    </select>

    <!--     根据项目id， 查询处理明细-->
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml
@ -197,110 +197,158 @@
            </if>
    </select>
    <select id="getSelfProject" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
-        SELECT
-            a.AGENCY_ID,
-            a.count AS "sum",
-            IFNULL(b.count,0) AS "count"
-        FROM
-            (SELECT
-                 da.ID AS AGENCY_ID,
-                 COUNT( fm.ID ) AS "count"
-             FROM
-                 fact_origin_project_main_daily fm
-                     INNER JOIN dim_agency da ON fm.PIDS LIKE CONCAT( '%', da.ID, '%' )
-                     AND da.`LEVEL` = #{level}
-             WHERE
-                 fm.PROJECT_STATUS = 'closed'
-                   AND fm.CUSTOMER_ID = #{customerId}
-                   AND fm.MONTH_ID = #{monthId}
-             GROUP BY
-                 da.ID) a
-            LEFT JOIN
-            (SELECT
-                 da.ID AS AGENCY_ID,
-                 COUNT( fm.ID ) AS "count"
-             FROM
-                 fact_origin_project_main_daily fm
-                     INNER JOIN dim_agency da ON fm.PIDS LIKE CONCAT( '%', da.ID, '%' )
-                     AND da.`LEVEL` = #{level}
-             WHERE
-                 fm.PROJECT_STATUS = 'closed'
-               AND fm.CUSTOMER_ID = #{customerId}
-               AND fm.MONTH_ID = #{monthId}
-               AND fm.FINISH_ORG_IDS LIKE CONCAT('%', fm.AGENCY_ID,'%')
-             GROUP BY
-                 da.ID) b
-            ON a.AGENCY_ID = b.AGENCY_ID
+            SELECT
+                da.ID,
+                SUM( sum ) AS "sum",
+                SUM( count ) AS "count"
+            FROM
+                dim_agency da
+                INNER JOIN (
+                SELECT
+                    fm.AGENCY_ID AS "orgId",
+                    fm.PIDS,
+                    COUNT( fm.PROJECT_ID ) AS "sum",
+                    IFNULL( a.count, 0 ) AS "count"
+                FROM
+                    fact_origin_project_log_daily fm
+                    LEFT JOIN (
+                    SELECT
+                        orgId,
+                        COUNT( PROJECT_ID ) AS "count"
+                    FROM
+                        (
+                        SELECT
+                            AGENCY_ID AS orgId,
+                            PROJECT_ID
+                        FROM
+                            fact_origin_project_log_daily log
+                        WHERE
+                            DEL_FLAG = 0
+                            AND CUSTOMER_ID = #{customerId}
+                            AND ( ACTION_CODE = 'response' OR ACTION_CODE = 'close' OR ACTION_CODE = 'transfer' OR ACTION_CODE = 'created' )
+                            AND EXISTS ( SELECT PROJECT_ID FROM fact_origin_project_log_daily WHERE DEL_FLAG = 0 AND ACTION_CODE = 'close' AND CUSTOMER_ID = #{customerId} AND MONTH_ID = #{monthId} AND log.PROJECT_ID = PROJECT_ID )
+                        GROUP BY
+                            PROJECT_ID
+                        HAVING
+                            COUNT(
+                            DISTINCT ( ORG_ID )) = 1
+                        ) a
+                    GROUP BY
+                        orgId
+                    ) a ON fm.AGENCY_ID = a.orgId
+                WHERE
+                    ACTION_CODE = 'close'
+                    AND CUSTOMER_ID = #{customerId}
+                    AND MONTH_ID = #{monthId}
+                GROUP BY
+                    fm.AGENCY_ID
+                ) a ON a.PIDS LIKE CONCAT( '%', da.ID, '%' )
+                AND da.DEL_FLAG = '0'
+                AND da.`LEVEL` = #{level}
+                AND da.CUSTOMER_ID = #{customerId}
+                AND da.AGENCY_DIM_TYPE = 'all'
+            GROUP BY
+                da.ID
    </select>
    <select id="getResolveProject" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
-        SELECT
-            a.AGENCY_ID,
-            a.count AS "sum",
-            IFNULL(b.count,0) AS "count"
-        FROM
-            (SELECT
-                 da.ID AS AGENCY_ID,
-                 COUNT( fm.ID ) AS "count"
-             FROM
-                 fact_origin_project_main_daily fm
-                     INNER JOIN dim_agency da ON fm.PIDS LIKE CONCAT( '%', da.ID, '%' )
-                     AND da.`LEVEL` = #{level}
-             WHERE
-                 fm.PROJECT_STATUS = 'closed'
-               AND fm.CUSTOMER_ID = #{customerId}
-               AND fm.MONTH_ID = #{monthId}
-             GROUP BY
-                 da.ID) a
-                LEFT JOIN
-            (SELECT
-                 da.ID AS AGENCY_ID,
-                 COUNT( fm.ID ) AS "count"
-             FROM
-                 fact_origin_project_main_daily fm
-                     INNER JOIN dim_agency da ON fm.PIDS LIKE CONCAT( '%', da.ID, '%' )
-                     AND da.`LEVEL` = #{level}
-             WHERE
-                 fm.PROJECT_STATUS = 'closed'
-               AND fm.CUSTOMER_ID = #{customerId}
-               AND fm.MONTH_ID = #{monthId}
-               AND fm.IS_RESOLVED = 'resolved'
-             GROUP BY
-                 da.ID) b
-            ON a.AGENCY_ID = b.AGENCY_ID
+            SELECT
+                da.ID,
+                SUM( sum ) AS "sum",
+                SUM( count ) AS "count"
+            FROM
+                dim_agency da
+                INNER JOIN (
+                SELECT
+                    a.AGENCY_ID,
+                    a.PIDS,
+                    a.count AS "sum",
+                    IFNULL( b.count, 0 ) AS "count"
+                FROM
+                    (
+                    SELECT
+                        AGENCY_ID,
+                        PIDS,
+                        COUNT( fm.ID ) AS "count"
+                    FROM
+                        fact_origin_project_log_daily fm
+                    WHERE
+                        fm.DEL_FLAG = '0'
+                        AND fm.ACTION_CODE = 'close'
+                        AND fm.CUSTOMER_ID = #{customerId}
+                        AND fm.MONTH_ID = #{monthId}
+                        AND fm.IS_ACTIVE = 1
+                    GROUP BY
+                        AGENCY_ID
+                    ) a
+                    LEFT JOIN (
+                    SELECT
+                        log.AGENCY_ID,
+                        log.PIDS,
+                        COUNT( log.PROJECT_ID ) AS "count"
+                    FROM
+                        fact_origin_project_main_daily fm
+                        INNER JOIN fact_origin_project_log_daily log ON log.PROJECT_ID = fm.ID
+                        AND log.DEL_FLAG = '0'
+                        AND log.ACTION_CODE = 'close'
+                        AND log.CUSTOMER_ID = #{customerId}
+                        AND log.MONTH_ID = #{monthId}
+                        AND log.IS_ACTIVE = 1
+                    WHERE
+                        fm.DEL_FLAG = '0'
+                        AND fm.PROJECT_STATUS = 'closed'
+                        AND fm.CUSTOMER_ID = #{customerId}
+                        AND fm.IS_RESOLVED = 'resolved'
+                    GROUP BY
+                        log.AGENCY_ID
+                    ) b ON a.AGENCY_ID = b.AGENCY_ID
+                ) a ON a.PIDS LIKE CONCAT( '%', da.ID, '%' )
+                AND da.DEL_FLAG = '0'
+                AND da.`LEVEL` = #{level}
+                AND da.CUSTOMER_ID = #{customerId}
+                AND da.AGENCY_DIM_TYPE = 'all'
+            GROUP BY
+                da.ID
    </select>
    <select id="getGridResolveProject" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
        SELECT
-            a.GRID_ID AS "orgId",
+            a.ORG_ID AS "orgId",
            a.count AS "sum",
-            IFNULL(b.count,0) AS "count"
+            IFNULL( b.count, 0 ) AS "count"
        FROM
-            (SELECT
-                 fm.GRID_ID,
-                 COUNT( fm.ID ) AS "count"
-             FROM
-                 fact_origin_project_main_daily fm
-             WHERE
-                 fm.PROJECT_STATUS = 'closed'
-               AND fm.GRID_ID != ''
-               AND fm.CUSTOMER_ID = #{customerId}
-               AND fm.MONTH_ID = #{monthId}
-             GROUP BY
-                 fm.GRID_ID) a
-        LEFT JOIN
-            (SELECT
-                 fm.GRID_ID,
-                 COUNT( fm.ID ) AS "count"
-             FROM
-                 fact_origin_project_main_daily fm
-             WHERE
-                 fm.PROJECT_STATUS = 'closed'
-               AND fm.GRID_ID != ''
-               AND fm.CUSTOMER_ID = #{customerId}
-               AND fm.MONTH_ID = #{monthId}
-               AND fm.IS_RESOLVED = 'resolved'
-             GROUP BY
-                 fm.GRID_ID) b
-            ON a.GRID_ID = b.GRID_ID
+            (
+            SELECT
+                fm.ORG_ID,
+                COUNT( fm.PROJECT_ID ) AS "count"
+            FROM
+                fact_origin_project_log_daily fm
+            WHERE
+                fm.ACTION_CODE = 'close'
+                AND fm.CUSTOMER_ID = #{customerId}
+                AND fm.MONTH_ID = #{monthId}
+                AND fm.ORG_TYPE = 'grid'
+            GROUP BY
+                fm.ORG_ID
+            ) a
+            LEFT JOIN (
+            SELECT
+                log.ORG_ID,
+                COUNT( log.PROJECT_ID ) AS "count"
+            FROM
+                fact_origin_project_main_daily fm
+                INNER JOIN fact_origin_project_log_daily log ON fm.ID = log.PROJECT_ID
+                AND ACTION_CODE = 'close'
+                AND log.CUSTOMER_ID = #{customerId}
+                AND log.MONTH_ID = #{monthId}
+                AND log.ORG_TYPE = 'grid'
+            WHERE
+                fm.PROJECT_STATUS = 'closed'
+                AND fm.CUSTOMER_ID = #{customerId}
+                AND fm.IS_RESOLVED = 'resolved'
+            GROUP BY
+                log.ORG_ID
+            ) b ON a.ORG_ID = b.ORG_ID
+        ORDER BY
+            a.ORG_ID
    </select>
    <select id="getGridProjectCount" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
        SELECT
@ -885,42 +933,118 @@
             GROUP BY
                 da.ID) b
            ON a.AGENCY_ID = b.AGENCY_ID
+
+            SELECT
+                da.ID,
+                SUM( sum ) AS "sum",
+                SUM( count ) AS "count"
+            FROM
+                dim_agency da
+                INNER JOIN (
+                SELECT
+                    fm.AGENCY_ID AS "orgId",
+                    fm.PIDS,
+                    COUNT( fm.PROJECT_ID ) AS "sum",
+                    IFNULL( a.count, 0 ) AS "count"
+                FROM
+                    fact_origin_project_log_daily fm
+                    LEFT JOIN (
+                    SELECT
+                        orgId,
+                        COUNT( PROJECT_ID ) AS "count"
+                    FROM
+                        (
+                        SELECT
+                            AGENCY_ID AS orgId,
+                            PROJECT_ID
+                        FROM
+                            fact_origin_project_log_daily log
+                        WHERE
+                            DEL_FLAG = 0
+                            AND CUSTOMER_ID = #{customerId}
+                            AND ( ACTION_CODE = 'response' OR ACTION_CODE = 'close' OR ACTION_CODE = 'transfer' OR ACTION_CODE = 'created' )
+                            AND EXISTS ( SELECT PROJECT_ID FROM fact_origin_project_log_daily WHERE DEL_FLAG = 0 AND ACTION_CODE = 'close' AND CUSTOMER_ID = #{customerId} AND DATE_ID &lt;= #{dateId} AND log.PROJECT_ID = PROJECT_ID )
+                        GROUP BY
+                            PROJECT_ID
+                        HAVING
+                            COUNT(
+                            DISTINCT ( ORG_ID )) = 1
+                        ) a
+                    GROUP BY
+                        orgId
+                    ) a ON fm.AGENCY_ID = a.orgId
+                WHERE
+                    ACTION_CODE = 'close'
+                    AND CUSTOMER_ID = #{customerId}
+                    AND DATE_ID &lt;= #{dateId}
+                GROUP BY
+                    fm.AGENCY_ID
+                ) a ON a.PIDS LIKE CONCAT( '%', da.ID, '%' )
+                AND da.DEL_FLAG = '0'
+                AND da.`LEVEL` = #{level}
+                AND da.CUSTOMER_ID = #{customerId}
+                AND da.AGENCY_DIM_TYPE = 'all'
+            GROUP BY
+                da.ID
    </select>
    <select id="getResolveProjectDaily" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
        SELECT
-            a.AGENCY_ID,
-            a.count AS "sum",
-            IFNULL(b.count,0) AS "count"
+            da.ID,
+            SUM( sum ) AS "sum",
+            SUM( count ) AS "count"
        FROM
-            (SELECT
-                 da.ID AS AGENCY_ID,
-                 COUNT( fm.ID ) AS "count"
-             FROM
-                 fact_origin_project_main_daily fm
-                     INNER JOIN dim_agency da ON fm.PIDS LIKE CONCAT( '%', da.ID, '%' )
-                     AND da.`LEVEL` = #{level}
-             WHERE
-                 fm.PROJECT_STATUS = 'closed'
-               AND fm.CUSTOMER_ID = #{customerId}
-               AND fm.DATE_ID &lt;= #{dateId}
-             GROUP BY
-                 da.ID) a
-                LEFT JOIN
-            (SELECT
-                 da.ID AS AGENCY_ID,
-                 COUNT( fm.ID ) AS "count"
-             FROM
-                 fact_origin_project_main_daily fm
-                     INNER JOIN dim_agency da ON fm.PIDS LIKE CONCAT( '%', da.ID, '%' )
-                     AND da.`LEVEL` = #{level}
-             WHERE
-                 fm.PROJECT_STATUS = 'closed'
-               AND fm.CUSTOMER_ID = #{customerId}
-               AND fm.DATE_ID &lt;= #{dateId}
-               AND fm.IS_RESOLVED = 'resolved'
-             GROUP BY
-                 da.ID) b
-            ON a.AGENCY_ID = b.AGENCY_ID
+            dim_agency da
+            INNER JOIN (
+            SELECT
+                a.AGENCY_ID,
+                a.PIDS,
+                a.count AS "sum",
+                IFNULL( b.count, 0 ) AS "count"
+            FROM
+                (
+                SELECT
+                    AGENCY_ID,
+                    PIDS,
+                    COUNT( fm.ID ) AS "count"
+                FROM
+                    fact_origin_project_log_daily fm
+                WHERE
+                    fm.DEL_FLAG = '0'
+                    AND fm.ACTION_CODE = 'close'
+                    AND fm.CUSTOMER_ID = #{customerId}
+                    AND fm.DATE_ID &lt;= #{dateId}
+                    AND fm.IS_ACTIVE = 1
+                GROUP BY
+                    AGENCY_ID
+                ) a
+                LEFT JOIN (
+                SELECT
+                    log.AGENCY_ID,
+                    log.PIDS,
+                    COUNT( log.PROJECT_ID ) AS "count"
+                FROM
+                    fact_origin_project_main_daily fm
+                    INNER JOIN fact_origin_project_log_daily log ON log.PROJECT_ID = fm.ID
+                    AND log.DEL_FLAG = '0'
+                    AND log.ACTION_CODE = 'close'
+                    AND log.CUSTOMER_ID = #{customerId}
+                    AND log.DATE_ID &lt;= #{dateId}
+                    AND log.IS_ACTIVE = 1
+                WHERE
+                    fm.DEL_FLAG = '0'
+                    AND fm.PROJECT_STATUS = 'closed'
+                    AND fm.CUSTOMER_ID = #{customerId}
+                    AND fm.IS_RESOLVED = 'resolved'
+                GROUP BY
+                    log.AGENCY_ID
+                ) b ON a.AGENCY_ID = b.AGENCY_ID
+            ) a ON a.PIDS LIKE CONCAT( '%', da.ID, '%' )
+            AND da.DEL_FLAG = '0'
+            AND da.`LEVEL` = #{level}
+            AND da.CUSTOMER_ID = #{customerId}
+            AND da.AGENCY_DIM_TYPE = 'all'
+        GROUP BY
+            da.ID
    </select>

    <!--  5、当前网格内：来源于议题的项目：结案已解决数、6、当前网格内：来源于议题的项目：结案无需解决数、7、当前网格内：项目立项，结案已解决数；默认为0、8、当前网格内：项目立项，结案无需解决数；默认为0、  -->
--- 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
@ -2,7 +2,7 @@ version: "3.7"
 services:
  epmet-activiti-server:
    container_name: epmet-activiti-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-activiti-server:0.3.0
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-activiti-server:0.3.1
    ports:
      - "8086:8086"
    network_mode: host # 使用现有网络
--- a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml
+++ b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml
@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
    <parent>
        <groupId>com.epmet</groupId>
        <artifactId>epmet-activiti</artifactId>
@ -278,7 +278,7 @@
                <nacos.config-enabled>false</nacos.config-enabled>
                <nacos.ip/>
                <!--是否开启服务列表变更监听-->
-                <nacos.service-list-changed-listening.enable>false</nacos.service-list-changed-listening.enable>
+                <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>

                <spring.flyway.enabled>true</spring.flyway.enabled>
            </properties>
--- 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
@ -2,7 +2,7 @@ version: "3.7"
 services:
  common-service-server:
    container_name: common-service-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/common-service-server:0.3.26
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/common-service-server:0.3.41
    ports:
      - "8103:8103"
    network_mode: host # 使用现有网络
@ -15,4 +15,4 @@ services:
      resources:
        limits:
          cpus: '0.1'
-          memory: 600M
+          memory: 600M
--- a/epmet-module/epmet-common-service/common-service-server/pom.xml
+++ b/epmet-module/epmet-common-service/common-service-server/pom.xml
@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
-    <version>0.3.26</version>
+    <version>0.3.41</version>
    <parent>
        <groupId>com.epmet</groupId>
        <artifactId>epmet-common-service</artifactId>
@ -261,7 +261,7 @@
                <nacos.config-enabled>false</nacos.config-enabled>
                <nacos.ip/>
                <!--是否开启服务列表变更监听-->
-                <nacos.service-list-changed-listening.enable>false</nacos.service-list-changed-listening.enable>
+                <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>

                <spring.flyway.enabled>true</spring.flyway.enabled>
                <!--亿联云消息网关配置-->
--- 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
@ -2,7 +2,7 @@ version: "3.7"
 services:
  epmet-ext-server:
    container_name: epmet-ext-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-ext-server:0.0.13
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-ext-server:0.0.20
    ports:
      - "8113:8113"
    network_mode: host # 使用现有网络
--- a/epmet-module/epmet-ext/epmet-ext-server/pom.xml
+++ b/epmet-module/epmet-ext/epmet-ext-server/pom.xml
@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
-    <version>0.0.13</version>
+    <version>0.0.20</version>

    <parent>
        <groupId>com.epmet</groupId>
@ -340,7 +340,7 @@
                <nacos.config-enabled>false</nacos.config-enabled>
                <nacos.ip/>
                <!--是否开启服务列表变更监听-->
-                <nacos.service-list-changed-listening.enable>false</nacos.service-list-changed-listening.enable>
+                <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>

                <spring.flyway.enabled>true</spring.flyway.enabled>

--- 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
@ -2,7 +2,7 @@ version: "3.7"
 services:
  epmet-heart-server:
    container_name: epmet-heart-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.57
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.64
    ports:
      - "8111:8111"
    network_mode: host # 使用现有网络
@ -15,4 +15,4 @@ services:
      resources:
        limits:
          cpus: '0.1'
-          memory: 600M
+          memory: 600M
--- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml
@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
-    <version>0.0.57</version>
+    <version>0.0.64</version>
    <parent>
        <groupId>com.epmet</groupId>
        <artifactId>epmet-heart</artifactId>
@ -263,7 +263,7 @@
                <nacos.config-enabled>false</nacos.config-enabled>
                <nacos.ip/>
                <!--是否开启服务列表变更监听-->
-                <nacos.service-list-changed-listening.enable>false</nacos.service-list-changed-listening.enable>
+                <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>

                <spring.flyway.enabled>true</spring.flyway.enabled>
                <openapi.scan.server.url>https://epmet-open.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>
--- 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
@ -2,7 +2,7 @@ version: "3.7"
 services:
  epmet-job-server:
    container_name: epmet-job-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-job-server:0.3.29
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-job-server:0.3.43
    ports:
      - "8084:8084"
    network_mode: host # 使用现有网络
@ -15,4 +15,4 @@ services:
      resources:
        limits:
          cpus: '0.1'
-          memory: 600M
+          memory: 600M
--- a/epmet-module/epmet-job/epmet-job-server/pom.xml
+++ b/epmet-module/epmet-job/epmet-job-server/pom.xml
@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
-    <version>0.3.29</version>
+    <version>0.3.43</version>
    <parent>
        <groupId>com.epmet</groupId>
        <artifactId>epmet-job</artifactId>
@ -251,7 +251,7 @@
                <nacos.ip/>

                <!--是否开启服务列表变更监听-->
-                <nacos.service-list-changed-listening.enable>false</nacos.service-list-changed-listening.enable>
+                <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>

                <spring.flyway.enabled>true</spring.flyway.enabled>

--- 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
@ -2,7 +2,7 @@ version: "3.7"
 services:
  epmet-message-server:
    container_name: epmet-message-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-message-server:0.3.33
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-message-server:0.3.53
    ports:
      - "8085:8085"
    network_mode: host # 使用现有网络
@ -15,4 +15,4 @@ services:
      resources:
        limits:
          cpus: '0.1'
-          memory: 600M
+          memory: 600M
--- a/epmet-module/epmet-message/epmet-message-server/pom.xml
+++ b/epmet-module/epmet-message/epmet-message-server/pom.xml
@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
-    <version>0.3.33</version>
+    <version>0.3.53</version>
    <parent>
        <groupId>com.epmet</groupId>
        <artifactId>epmet-message</artifactId>
@ -332,7 +332,7 @@
                <nacos.ip/>

                <!--是否开启服务列表变更监听-->
-                <nacos.service-list-changed-listening.enable>false</nacos.service-list-changed-listening.enable>
+                <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>

                <spring.flyway.enabled>true</spring.flyway.enabled>

--- 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
@ -3,7 +3,7 @@ services:
  epmet-oss-server:
    container_name: epmet-oss-server-prod
 #    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-test/epmet-oss-server:0.3.2
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-oss-server:0.3.28
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-oss-server:0.3.38
    ports:
      - "8083:8083"
    network_mode: host # 使用现有网络
--- a/epmet-module/epmet-oss/epmet-oss-server/pom.xml
+++ b/epmet-module/epmet-oss/epmet-oss-server/pom.xml
@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
-    <version>0.3.28</version>
+    <version>0.3.38</version>
    <parent>
        <groupId>com.epmet</groupId>
        <artifactId>epmet-oss</artifactId>
@ -260,7 +260,7 @@
                <nacos.config-enabled>false</nacos.config-enabled>
                <nacos.ip/>
                <!--是否开启服务列表变更监听-->
-                <nacos.service-list-changed-listening.enable>false</nacos.service-list-changed-listening.enable>
+                <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>

                <spring.flyway.enabled>true</spring.flyway.enabled>
                <!--生产钉钉 机器人地址-->
--- 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
@ -2,7 +2,7 @@ version: "3.7"
 services:
  epmet-point-server:
    container_name: epmet-point-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-point-server:0.0.42
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-point-server:0.0.60
    ports:
      - "8112:8112"
    network_mode: host # 使用现有网络
@ -15,4 +15,4 @@ services:
      resources:
        limits:
          cpus: '0.1'
-          memory: 600M
+          memory: 600M
--- a/epmet-module/epmet-point/epmet-point-server/pom.xml
+++ b/epmet-module/epmet-point/epmet-point-server/pom.xml
@ -3,7 +3,7 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
-    <version>0.0.42</version>
+    <version>0.0.60</version>
    <parent>
        <artifactId>epmet-point</artifactId>
        <groupId>com.epmet</groupId>
@ -284,7 +284,7 @@
                <nacos.config-enabled>false</nacos.config-enabled>
                <nacos.ip/>
                <!--是否开启服务列表变更监听-->
-                <nacos.service-list-changed-listening.enable>false</nacos.service-list-changed-listening.enable>
+                <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>

                <spring.flyway.enabled>true</spring.flyway.enabled>

--- 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
@ -2,7 +2,7 @@ version: "3.7"
 services:
  epmet-third-server:
    container_name: epmet-third-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.157
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.179
    ports:
      - "8110:8110"
    network_mode: host # 使用现有网络
@ -15,4 +15,4 @@ services:
      resources:
        limits:
          cpus: '0.1'
-          memory: 600M
+          memory: 600M
--- a/epmet-module/epmet-third/epmet-third-server/pom.xml
+++ b/epmet-module/epmet-third/epmet-third-server/pom.xml
@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
-    <version>0.0.157</version>
+    <version>0.0.179</version>

    <parent>
        <groupId>com.epmet</groupId>
@ -320,7 +320,7 @@
                <nacos.config-enabled>false</nacos.config-enabled>
                <nacos.ip/>
                <!--是否开启服务列表变更监听-->
-                <nacos.service-list-changed-listening.enable>false</nacos.service-list-changed-listening.enable>
+                <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>

                <spring.flyway.enabled>true</spring.flyway.enabled>

--- 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
@ -2,7 +2,7 @@ version: "3.7"
 services:
  gov-access-server:
    container_name: gov-access-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-access-server:0.3.45
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-access-server:0.3.61
    ports:
      - "8099:8099"
    network_mode: host # 使用现有网络
@ -15,4 +15,4 @@ services:
      resources:
        limits:
          cpus: '0.1'
-          memory: 600M
+          memory: 600M
--- a/epmet-module/gov-access/gov-access-server/pom.xml
+++ b/epmet-module/gov-access/gov-access-server/pom.xml
@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.45</version>
+    <version>0.3.61</version>
    <parent>
        <artifactId>gov-access</artifactId>
        <groupId>com.epmet</groupId>
@ -239,7 +239,7 @@
                <nacos.config-enabled>false</nacos.config-enabled>
                <nacos.ip/>
                <!--是否开启服务列表变更监听-->
-                <nacos.service-list-changed-listening.enable>false</nacos.service-list-changed-listening.enable>
+                <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>

                <!--flyway migration 数据库迁移工具-->
                <spring.flyway.enabled>true</spring.flyway.enabled>
@ -251,4 +251,4 @@
        </profile>
    </profiles>

-</project>
+</project>
--- 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
@ -2,7 +2,7 @@ version: "3.7"
 services:
  gov-grid-server:
    container_name: gov-grid-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-grid-server:0.3.40
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-grid-server:0.3.49
    ports:
      - "8097:8097"
    network_mode: host # 使用现有网络
@ -15,4 +15,4 @@ services:
      resources:
        limits:
          cpus: '0.1'
-          memory: 600M
+          memory: 600M
--- a/epmet-module/gov-grid/gov-grid-server/pom.xml
+++ b/epmet-module/gov-grid/gov-grid-server/pom.xml
@ -3,7 +3,7 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
-    <version>0.3.40</version>
+    <version>0.3.49</version>
    <parent>
        <groupId>com.epmet</groupId>
        <artifactId>gov-grid</artifactId>
@ -219,7 +219,7 @@
                <nacos.config-enabled>false</nacos.config-enabled>
                <nacos.ip/>
                <!--是否开启服务列表变更监听-->
-                <nacos.service-list-changed-listening.enable>false</nacos.service-list-changed-listening.enable>
+                <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>

                <spring.flyway.enabled>true</spring.flyway.enabled>

--- 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
@ -2,7 +2,7 @@ version: "3.7"
 services:
  gov-issue-server:
    container_name: gov-issue-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.60
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.90
    ports:
      - "8101:8101"
    network_mode: host # 使用现有网络
@ -15,4 +15,4 @@ services:
      resources:
        limits:
          cpus: '0.1'
-          memory: 600M
+          memory: 600M
--- a/epmet-module/gov-issue/gov-issue-server/pom.xml
+++ b/epmet-module/gov-issue/gov-issue-server/pom.xml
@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.60</version>
+    <version>0.3.90</version>
    <parent>
        <artifactId>gov-issue</artifactId>
        <groupId>com.epmet</groupId>
@ -292,7 +292,7 @@
                <nacos.config-enabled>false</nacos.config-enabled>
                <nacos.ip/>
                <!--是否开启服务列表变更监听-->
-                <nacos.service-list-changed-listening.enable>false</nacos.service-list-changed-listening.enable>
+                <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>

                <spring.flyway.enabled>true</spring.flyway.enabled>
                <openapi.scan.server.url>https://epmet-open.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>
--- 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
@ -2,7 +2,7 @@ version: "3.7"
 services:
  gov-mine-server:
    container_name: gov-mine-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-mine-server:0.3.36
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-mine-server:0.3.47
    ports:
      - "8098:8098"
    network_mode: host # 使用现有网络
@ -15,4 +15,4 @@ services:
      resources:
        limits:
          cpus: '0.1'
-          memory: 600M
+          memory: 600M
--- a/epmet-module/gov-mine/gov-mine-server/pom.xml
+++ b/epmet-module/gov-mine/gov-mine-server/pom.xml
@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.36</version>
+    <version>0.3.47</version>
    <parent>
        <groupId>com.epmet</groupId>
        <artifactId>gov-mine</artifactId>
@ -233,7 +233,7 @@
                <nacos.config-enabled>false</nacos.config-enabled>
                <nacos.ip/>
                <!--是否开启服务列表变更监听-->
-                <nacos.service-list-changed-listening.enable>false</nacos.service-list-changed-listening.enable>
+                <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>

                <!--生产钉钉 机器人地址-->
                <dingTalk.robot.webHook>
--- 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
@ -2,7 +2,7 @@ version: "3.7"
 services:
  gov-org-server:
    container_name: gov-org-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.97
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.132
    ports:
      - "8092:8092"
    network_mode: host # 使用现有网络
@ -15,4 +15,4 @@ services:
      resources:
        limits:
          cpus: '0.1'
-          memory: 600M
+          memory: 600M
--- a/epmet-module/gov-org/gov-org-server/pom.xml
+++ b/epmet-module/gov-org/gov-org-server/pom.xml
@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
-    <version>0.3.97</version>
+    <version>0.3.132</version>
    <parent>
        <groupId>com.epmet</groupId>
        <artifactId>gov-org</artifactId>
@ -300,7 +300,7 @@
                <nacos.config-enabled>false</nacos.config-enabled>
                <nacos.ip/>
                <!--是否开启服务列表变更监听-->
-                <nacos.service-list-changed-listening.enable>false</nacos.service-list-changed-listening.enable>
+                <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>

                <spring.flyway.enabled>true</spring.flyway.enabled>

--- 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
@ -2,7 +2,7 @@ version: "3.7"
 services:
  gov-project-server:
    container_name: gov-project-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.48
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.83
    ports:
      - "8102:8102"
    network_mode: host # 使用现有网络
@ -15,4 +15,4 @@ services:
      resources:
        limits:
          cpus: '0.1'
-          memory: 600M
+          memory: 600M
--- a/epmet-module/gov-project/gov-project-server/pom.xml
+++ b/epmet-module/gov-project/gov-project-server/pom.xml
@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.48</version>
+    <version>0.3.83</version>
    <parent>
        <artifactId>gov-project</artifactId>
        <groupId>com.epmet</groupId>
@ -287,7 +287,7 @@
                <nacos.config-enabled>false</nacos.config-enabled>
                <nacos.ip/>
                <!--是否开启服务列表变更监听-->
-                <nacos.service-list-changed-listening.enable>false</nacos.service-list-changed-listening.enable>
+                <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>

                <spring.flyway.enabled>true</spring.flyway.enabled>
                <openapi.scan.server.url>https://epmet-open.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>
--- 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
@ -2,7 +2,7 @@ version: "3.7"
 services:
  gov-voice-server:
    container_name: gov-voice-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-voice-server:0.3.69
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-voice-server:0.3.78
    ports:
      - "8105:8105"
    network_mode: host # 使用现有网络
@ -15,4 +15,4 @@ services:
      resources:
        limits:
          cpus: '0.1'
-          memory: 600M
+          memory: 600M
--- a/epmet-module/gov-voice/gov-voice-server/pom.xml
+++ b/epmet-module/gov-voice/gov-voice-server/pom.xml
@ -3,7 +3,7 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
-    <version>0.3.69</version>
+    <version>0.3.78</version>
    <parent>
        <artifactId>gov-voice</artifactId>
        <groupId>com.epmet</groupId>
@ -250,7 +250,7 @@
                <nacos.config-enabled>false</nacos.config-enabled>
                <nacos.ip/>
                <!--是否开启服务列表变更监听-->
-                <nacos.service-list-changed-listening.enable>false</nacos.service-list-changed-listening.enable>
+                <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>

                <spring.flyway.enabled>true</spring.flyway.enabled>
                <openapi.scan.server.url>https://epmet-open.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>
--- a/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml
@ -2,9 +2,9 @@ version: "3.7"
 services:
  gov-voice-server:
    container_name: open-data-worker-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/open-data-worker-server:0.3.1
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/open-data-worker-server:0.3.13
    ports:
-      - "8107:8107"
+      - "8117:8117"
    network_mode: host # 使用现有网络
    volumes:
      - "/opt/epmet-cloud-logs/prod:/logs"
@ -15,4 +15,4 @@ services:
      resources:
        limits:
          cpus: '0.1'
-          memory: 600M
+          memory: 600M
--- a/epmet-module/open-data-worker/open-data-worker-server/pom.xml
+++ b/epmet-module/open-data-worker/open-data-worker-server/pom.xml
@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.1</version>
+    <version>0.3.13</version>
    <parent>
        <artifactId>open-data-worker</artifactId>
        <groupId>com.epmet</groupId>
--- 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
@ -2,7 +2,7 @@ version: "3.7"
 services:
  oper-access-server:
    container_name: oper-access-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-access-server:0.3.18
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-access-server:0.3.24
    ports:
      - "8093:8093"
    network_mode: host # 使用现有网络
@ -15,4 +15,4 @@ services:
      resources:
        limits:
          cpus: '0.1'
-          memory: 600M
+          memory: 600M
--- a/epmet-module/oper-access/oper-access-server/pom.xml
+++ b/epmet-module/oper-access/oper-access-server/pom.xml
@ -3,7 +3,7 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-    <version>0.3.18</version>
+    <version>0.3.24</version>
    <parent>
        <artifactId>oper-access</artifactId>
        <groupId>com.epmet</groupId>
@ -235,7 +235,7 @@
                <nacos.config-enabled>false</nacos.config-enabled>
                <nacos.ip/>
                <!--是否开启服务列表变更监听-->
-                <nacos.service-list-changed-listening.enable>false</nacos.service-list-changed-listening.enable>
+                <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>

                <spring.flyway.enabled>true</spring.flyway.enabled>

--- 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
@ -2,7 +2,7 @@ version: "3.7"
 services:
  oper-crm-server:
    container_name: oper-crm-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-crm-server:0.3.72
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-crm-server:0.3.87
    ports:
      - "8090:8090"
    network_mode: host # 使用现有网络
@ -15,4 +15,4 @@ services:
      resources:
        limits:
          cpus: '0.1'
-          memory: 600M
+          memory: 600M
--- a/epmet-module/oper-crm/oper-crm-server/pom.xml
+++ b/epmet-module/oper-crm/oper-crm-server/pom.xml
@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
-    <version>0.3.72</version>
+    <version>0.3.87</version>
    <parent>
        <groupId>com.epmet</groupId>
        <artifactId>oper-crm</artifactId>
@ -261,7 +261,7 @@
            </activation>-->
            <properties>
                <server.port>8090</server.port>
-                <spring.profiles.active>test</spring.profiles.active>
+                <spring.profiles.active>prod</spring.profiles.active>

                <!-- 数据库配置-->
                <spring.datasource.druid.url>
@ -283,7 +283,7 @@
                <nacos.config-enabled>false</nacos.config-enabled>
                <nacos.ip/>
                <!--是否开启服务列表变更监听-->
-                <nacos.service-list-changed-listening.enable>false</nacos.service-list-changed-listening.enable>
+                <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>

                <spring.flyway.enabled>true</spring.flyway.enabled>

--- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
@ -508,48 +508,48 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
            throw new RenException("发送(初始化客户信息)系统消息到message服务失败:{}", sendMsgResult.getInternalMsg());
        }

-        ////3.调用epmet-user服务，初始化客户对应的角色;调用access服务给角色分配权限信息
-        //Result initResult = epmetUserFeignClient.initGovStaffRolesForCustomer(formDTO.getCustomerId());
-        //if (!initResult.success()) {
-        //    throw new RenException("客户新增:调用user服务为客户初始化角色数据失败:".concat(initResult.toString()));
-        //}
-        //
-        ////4.调用oper-customize服务，初始化客户定制化首页模板数据
-        //CustomerHomeDTO initHomeForm = new CustomerHomeDTO();
-        //initHomeForm.setCustomerId(formDTO.getCustomerId());
-        //Result initHomeResult = operCustomizeFeignClient.init(initHomeForm);
-        //if (!initHomeResult.success()) {
-        //    throw new RenException("初始化客户首页数据失败:".concat(initHomeResult.getInternalMsg()));
-        //}
-        //
-        ////5.调用gov-org服务，初始化客户根级组织信息、客户管理员信息
-        //AddAgencyAndStaffFormDTO agencyAndStaff = new AddAgencyAndStaffFormDTO();
-        ////客户组织信息
-        //CustomerAgencyDTO agencyDTO = new CustomerAgencyDTO();
-        //agencyDTO.setId(paAgency.getId());
-        //agencyDTO.setCustomerId(formDTO.getCustomerId());
-        //agencyDTO.setOrganizationName(paAgency.getAgencyName());
-        //agencyDTO.setLevel(paAgency.getLevel());
-        //agencyDTO.setAreaCode(paAgency.getAreaCode());
-        //agencyDTO.setProvince(paAgency.getProvince());
-        //agencyDTO.setCity(paAgency.getCity());
-        //agencyDTO.setDistrict(paAgency.getDistrict());
-        //agencyAndStaff.setAgencyDTO(agencyDTO);
-        //
-        ////客户管理员信息
-        //AdminStaffFromDTO staffSubmitFrom = new AdminStaffFromDTO();
-        //staffSubmitFrom.setCustomerId(formDTO.getCustomerId());
-        //staffSubmitFrom.setAgencyId(paAgency.getId());
-        //staffSubmitFrom.setGender(Integer.parseInt(paUser.getGender()));
-        //staffSubmitFrom.setMobile(paUser.getPhone());
-        //staffSubmitFrom.setName(paUser.getRealName());
-        //staffSubmitFrom.setWorkType(UserWorkType.FULL_TIME);
-        //agencyAndStaff.setStaffDTO(staffSubmitFrom);
-        //
-        //Result agencyResult = govOrgOpenFeignClient.saveRootAgency(agencyAndStaff);
-        //if (!agencyResult.success()) {
-        //    throw new RenException(agencyResult.getCode(), agencyResult.getInternalMsg());
-        //}
+        /*//3.调用epmet-user服务，初始化客户对应的角色;调用access服务给角色分配权限信息
+        Result initResult = epmetUserFeignClient.initGovStaffRolesForCustomer(formDTO.getCustomerId());
+        if (!initResult.success()) {
+            throw new RenException("客户新增:调用user服务为客户初始化角色数据失败:".concat(initResult.toString()));
+        }
+
+        //4.调用oper-customize服务，初始化客户定制化首页模板数据
+        CustomerHomeDTO initHomeForm = new CustomerHomeDTO();
+        initHomeForm.setCustomerId(formDTO.getCustomerId());
+        Result initHomeResult = operCustomizeFeignClient.init(initHomeForm);
+        if (!initHomeResult.success()) {
+            throw new RenException("初始化客户首页数据失败:".concat(initHomeResult.getInternalMsg()));
+        }
+
+        //5.调用gov-org服务，初始化客户根级组织信息、客户管理员信息
+        AddAgencyAndStaffFormDTO agencyAndStaff = new AddAgencyAndStaffFormDTO();
+        //客户组织信息
+        CustomerAgencyDTO agencyDTO = new CustomerAgencyDTO();
+        agencyDTO.setId(paAgency.getId());
+        agencyDTO.setCustomerId(formDTO.getCustomerId());
+        agencyDTO.setOrganizationName(paAgency.getAgencyName());
+        agencyDTO.setLevel(paAgency.getLevel());
+        agencyDTO.setAreaCode(paAgency.getAreaCode());
+        agencyDTO.setProvince(paAgency.getProvince());
+        agencyDTO.setCity(paAgency.getCity());
+        agencyDTO.setDistrict(paAgency.getDistrict());
+        agencyAndStaff.setAgencyDTO(agencyDTO);
+
+        //客户管理员信息
+        AdminStaffFromDTO staffSubmitFrom = new AdminStaffFromDTO();
+        staffSubmitFrom.setCustomerId(formDTO.getCustomerId());
+        staffSubmitFrom.setAgencyId(paAgency.getId());
+        staffSubmitFrom.setGender(Integer.parseInt(paUser.getGender()));
+        staffSubmitFrom.setMobile(paUser.getPhone());
+        staffSubmitFrom.setName(paUser.getRealName());
+        staffSubmitFrom.setWorkType(UserWorkType.FULL_TIME);
+        agencyAndStaff.setStaffDTO(staffSubmitFrom);
+
+        Result agencyResult = govOrgOpenFeignClient.saveRootAgency(agencyAndStaff);
+        if (!agencyResult.success()) {
+            throw new RenException(agencyResult.getCode(), agencyResult.getInternalMsg());
+        }*/

        //6.更新第三方数据库中客户数据状态为已初始化
        String customerUrl = "https://epmet-cloud.elinkservice.cn/api/third/pacustomer/updatecustomer/" + formDTO.getCustomerId();
--- 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
@ -2,7 +2,7 @@ version: "3.7"
 services:
  oper-customize-server:
    container_name: oper-customize-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-customize-server:0.3.49
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-customize-server:0.3.64
    ports:
      - "8089:8089"
    network_mode: host # 使用现有网络
@ -15,4 +15,4 @@ services:
      resources:
        limits:
          cpus: '0.1'
-          memory: 600M
+          memory: 600M
--- a/epmet-module/oper-customize/oper-customize-server/pom.xml
+++ b/epmet-module/oper-customize/oper-customize-server/pom.xml
@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
-    <version>0.3.49</version>
+    <version>0.3.64</version>
    <parent>
        <groupId>com.epmet</groupId>
        <artifactId>oper-customize</artifactId>
@ -267,7 +267,7 @@
                <nacos.config-enabled>false</nacos.config-enabled>
                <nacos.ip/>
                <!--是否开启服务列表变更监听-->
-                <nacos.service-list-changed-listening.enable>false</nacos.service-list-changed-listening.enable>
+                <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>

                <spring.flyway.enabled>true</spring.flyway.enabled>

--- 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
@ -2,7 +2,7 @@ version: "3.7"
 services:
  resi-group-server:
    container_name: resi-group-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-group-server:0.3.82
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-group-server:0.3.127
    ports:
      - "8095:8095"
    network_mode: host # 使用现有网络
@ -15,4 +15,4 @@ services:
      resources:
        limits:
          cpus: '0.1'
-          memory: 600M
+          memory: 600M
--- a/epmet-module/resi-group/resi-group-server/pom.xml
+++ b/epmet-module/resi-group/resi-group-server/pom.xml
@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
-    <version>0.3.82</version>
+    <version>0.3.127</version>
    <parent>
        <groupId>com.epmet</groupId>
        <artifactId>resi-group</artifactId>
@ -354,7 +354,7 @@
                <nacos.ip/>

                <!--是否开启服务列表变更监听-->
-                <nacos.service-list-changed-listening.enable>false</nacos.service-list-changed-listening.enable>
+                <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>

                <spring.flyway.enabled>true</spring.flyway.enabled>

--- 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
@ -2,7 +2,7 @@ version: "3.7"
 services:
  resi-guide-server:
    container_name: resi-guide-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-guide-server:0.3.21
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-guide-server:0.3.33
    ports:
      - "8091:8091"
    network_mode: host # 使用现有网络
@ -15,4 +15,4 @@ services:
      resources:
        limits:
          cpus: '0.1'
-          memory: 600M
+          memory: 600M
--- a/epmet-module/resi-guide/resi-guide-server/pom.xml
+++ b/epmet-module/resi-guide/resi-guide-server/pom.xml
@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
-    <version>0.3.21</version>
+    <version>0.3.33</version>
    <parent>
        <groupId>com.epmet</groupId>
        <artifactId>resi-guide</artifactId>
@ -257,7 +257,7 @@
                <nacos.ip/>

                <!--是否开启服务列表变更监听-->
-                <nacos.service-list-changed-listening.enable>false</nacos.service-list-changed-listening.enable>
+                <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>

                <spring.flyway.enabled>true</spring.flyway.enabled>

--- 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
@ -2,7 +2,7 @@ version: "3.7"
 services:
  resi-hall-server:
    container_name: resi-hall-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-hall-server:0.3.24
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-hall-server:0.3.34
    ports:
      - "8100:8100"
    network_mode: host # 使用现有网络
@ -15,4 +15,4 @@ services:
      resources:
        limits:
          cpus: '0.1'
-          memory: 600M
+          memory: 600M
--- a/epmet-module/resi-hall/resi-hall-server/pom.xml
+++ b/epmet-module/resi-hall/resi-hall-server/pom.xml
@ -3,7 +3,7 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
-    <version>0.3.24</version>
+    <version>0.3.34</version>
    <parent>
        <artifactId>resi-hall</artifactId>
        <groupId>com.epmet</groupId>
@ -202,7 +202,7 @@
                <nacos.config-enabled>false</nacos.config-enabled>
                <nacos.ip/>
                <!--是否开启服务列表变更监听-->
-                <nacos.service-list-changed-listening.enable>false</nacos.service-list-changed-listening.enable>
+                <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>

                <spring.flyway.enabled>true</spring.flyway.enabled>

--- 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
@ -2,7 +2,7 @@ version: "3.7"
 services:
  resi-home-server:
    container_name: resi-home-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-home-server:0.3.16
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-home-server:0.3.23
    ports:
      - "8104:8104"
    network_mode: host # 使用现有网络
@ -15,4 +15,4 @@ services:
      resources:
        limits:
          cpus: '0.1'
-          memory: 600M
+          memory: 600M
--- a/epmet-module/resi-home/resi-home-server/pom.xml
+++ b/epmet-module/resi-home/resi-home-server/pom.xml
@ -3,7 +3,7 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
-    <version>0.3.16</version>
+    <version>0.3.23</version>

    <parent>
        <artifactId>resi-home</artifactId>
@ -224,7 +224,7 @@
                <nacos.ip/>

                <!--是否开启服务列表变更监听-->
-                <nacos.service-list-changed-listening.enable>false</nacos.service-list-changed-listening.enable>
+                <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>

                <!--生产钉钉 机器人地址-->
                <dingTalk.robot.webHook>
--- 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
@ -2,7 +2,7 @@ version: "3.7"
 services:
  resi-mine-server:
    container_name: resi-mine-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-mine-server:0.3.45
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-mine-server:0.3.53
    ports:
      - "8094:8094"
    network_mode: host # 使用现有网络
@ -15,4 +15,4 @@ services:
      resources:
        limits:
          cpus: '0.1'
-          memory: 600M
+          memory: 600M
--- a/epmet-module/resi-mine/resi-mine-server/pom.xml
+++ b/epmet-module/resi-mine/resi-mine-server/pom.xml
@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
-    <version>0.3.45</version>
+    <version>0.3.53</version>
    <parent>
        <groupId>com.epmet</groupId>
        <artifactId>resi-mine</artifactId>
@ -240,7 +240,7 @@
                <nacos.ip/>

                <!--是否开启服务列表变更监听-->
-                <nacos.service-list-changed-listening.enable>false</nacos.service-list-changed-listening.enable>
+                <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>

                <!--生产钉钉 机器人地址-->
                <dingTalk.robot.webHook>
--- 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
@ -2,7 +2,7 @@ version: "3.7"
 services:
  resi-partymember-server:
    container_name: resi-partymember-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-partymember-server:0.3.62
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-partymember-server:0.3.82
    ports:
      - "8096:8096"
    network_mode: host # 使用现有网络
@ -15,4 +15,4 @@ services:
      resources:
        limits:
          cpus: '0.1'
-          memory: 600M
+          memory: 600M
--- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml
@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
-    <version>0.3.62</version>
+    <version>0.3.82</version>
    <parent>
        <groupId>com.epmet</groupId>
        <artifactId>resi-partymember</artifactId>
@ -266,7 +266,7 @@
                <nacos.ip/>

                <!--是否开启服务列表变更监听-->
-                <nacos.service-list-changed-listening.enable>false</nacos.service-list-changed-listening.enable>
+                <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>

                <spring.flyway.enabled>true</spring.flyway.enabled>

--- 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
@ -2,7 +2,7 @@ version: "3.7"
 services:
  resi-voice-server:
    container_name: resi-voice-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-voice-server:0.3.7
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-voice-server:0.3.12
    ports:
      - "8106:8106"
    network_mode: host # 使用现有网络
@ -15,4 +15,4 @@ services:
      resources:
        limits:
          cpus: '0.1'
-          memory: 600M
+          memory: 600M
--- a/epmet-module/resi-voice/resi-voice-server/pom.xml
+++ b/epmet-module/resi-voice/resi-voice-server/pom.xml
@ -3,7 +3,7 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
-    <version>0.3.7</version>
+    <version>0.3.12</version>
    <parent>
        <artifactId>resi-voice</artifactId>
        <groupId>com.epmet</groupId>
@ -204,7 +204,7 @@
                <nacos.ip/>

                <!--是否开启服务列表变更监听-->
-                <nacos.service-list-changed-listening.enable>false</nacos.service-list-changed-listening.enable>
+                <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>


                <!--生产钉钉 机器人地址-->
--- a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/deploy/docker-compose-prod.yml
+++ b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/deploy/docker-compose-prod.yml
--- a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/pom.xml
+++ b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/pom.xml
--- a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml
+++ b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  epmet-openapi-scan:
    container_name: epmet-openapi-scan-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-openapi-scan:0.3.24
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-openapi-scan:0.3.31
    ports:
      - "8107:8107"
    network_mode: host # 不会创建新的网络
@ -15,4 +15,4 @@ services:
      resources:
        limits:
          cpus: '0.1'
-          memory: 600M
+          memory: 600M
--- a/epmet-openapi/epmet-openapi-scan/pom.xml
+++ b/epmet-openapi/epmet-openapi-scan/pom.xml
@ -4,7 +4,7 @@
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

    <modelVersion>4.0.0</modelVersion>
-    <version>0.3.24</version>
+    <version>0.3.31</version>
    <artifactId>epmet-openapi-scan</artifactId>
    <packaging>jar</packaging>

@ -205,7 +205,7 @@
                <nacos.ip/>

                <!--是否开启服务列表变更监听-->
-                <nacos.service-list-changed-listening.enable>false</nacos.service-list-changed-listening.enable>
+                <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>


                <!--生产钉钉 机器人地址-->
--- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml
+++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  epmet-user-server:
    container_name: epmet-user-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.138
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.197
    ports:
      - "8087:8087"
    network_mode: host # 不会创建新的网络
@ -15,4 +15,4 @@ services:
      resources:
        limits:
          cpus: '0.1'
-          memory: 600M
+          memory: 600M
--- a/epmet-user/epmet-user-server/pom.xml
+++ b/epmet-user/epmet-user-server/pom.xml
@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
-    <version>0.3.138</version>
+    <version>0.3.197</version>
    <parent>
        <groupId>com.epmet</groupId>
        <artifactId>epmet-user</artifactId>
@ -294,7 +294,7 @@
                <nacos.ip/>

                <!--是否开启服务列表变更监听-->
-                <nacos.service-list-changed-listening.enable>false</nacos.service-list-changed-listening.enable>
+                <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>

                <spring.flyway.enabled>true</spring.flyway.enabled>
                <openapi.scan.server.url>https://epmet-open.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java
@ -253,9 +253,15 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 		//微信昵称:nickname 头像:headImgUrl 性别:gender
 		List<UserWechatEntity> wechat = userWechatService.selectByUserId(userResiInfoDTO.getUserId());
 		if(null != wechat && !wechat.isEmpty()){
-			baseInfo.setHeadImgUrl(wechat.get(NumConstant.ZERO).getHeadImgUrl());
-			baseInfo.setGender(wechat.get(NumConstant.ZERO).getSex().toString());
-			baseInfo.setNickname(wechat.get(NumConstant.ZERO).getNickname());
+			UserWechatEntity wechatEntity = wechat.get(NumConstant.ZERO);
+			baseInfo.setHeadImgUrl(wechatEntity.getHeadImgUrl());
+			if (wechatEntity.getSex() == null){
+				//设置未知
+				baseInfo.setGender(NumConstant.ZERO_STR);
+			}else{
+				baseInfo.setGender(String.valueOf(wechatEntity.getSex()));
+			}
+			baseInfo.setNickname(wechatEntity.getNickname());
 		}
 		userBaseInfoService.insertOrUpdate(baseInfo);
 	}