From c4c4f1eeb8898d562cc443a882bdb47dc73f5e7e Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 11 May 2021 16:46:57 +0800
Subject: [PATCH 001/128] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E5=9F=BA=E7=A1=80?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1=E5=8F=8Afact=5Forigin=5Fgr?=
 =?UTF-8?q?oup=5Fmain=5Fdaily=E8=A1=A8=E6=96=B0=E5=A2=9EgroupType=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/commons/tools/utils/DateUtils.java  |  19 ++
 .../extract/FactOriginGroupMainDailyDTO.java  |   5 +
 .../dto/group/form/GroupTotalFormDTO.java     |  24 ++
 .../stats/FactGroupTotalAgencyDailyDTO.java   | 126 +++++++++
 .../dto/stats/FactGroupTotalGridDailyDTO.java | 126 +++++++++
 .../controller/StatsGroupController.java      |  28 +-
 .../com/epmet/dao/group/GroupDataDao.java     |   7 +
 .../stats/FactGroupTotalAgencyDailyDao.java   |  38 +++
 .../dao/stats/FactGroupTotalGridDailyDao.java |  39 +++
 .../epmet/entity/group/ResiGroupEntity.java   |  95 +++++++
 .../FactGroupTotalAgencyDailyEntity.java      |  96 +++++++
 .../stats/FactGroupTotalGridDailyEntity.java  |  96 +++++++
 .../com/epmet/service/StatsGroupService.java  |  12 +
 .../epmet/service/group/GroupDataService.java |   6 +
 .../group/impl/GroupDataServiceImpl.java      |  11 +
 .../service/impl/StatsGroupServiceImpl.java   | 250 ++++++++++++++++++
 .../FactGroupTotalAgencyDailyService.java     | 101 +++++++
 .../stats/FactGroupTotalGridDailyService.java | 101 +++++++
 .../FactGroupTotalAgencyDailyServiceImpl.java | 108 ++++++++
 .../FactGroupTotalGridDailyServiceImpl.java   | 108 ++++++++
 ...12__alter_fact_origin_group_main_daily.sql |   3 +
 .../extract/FactOriginGroupMainDailyDao.xml   |   2 +
 .../resources/mapper/group/GroupDataDao.xml   |  13 +-
 .../stats/FactGroupTotalAgencyDailyDao.xml    |  15 ++
 .../stats/FactGroupTotalGridDailyDao.xml      |  16 ++
 25 files changed, 1443 insertions(+), 2 deletions(-)
 create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/group/form/GroupTotalFormDTO.java
 create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactGroupTotalAgencyDailyDTO.java
 create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactGroupTotalGridDailyDTO.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactGroupTotalAgencyDailyDao.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactGroupTotalGridDailyDao.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/group/ResiGroupEntity.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGroupTotalAgencyDailyEntity.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGroupTotalGridDailyEntity.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactGroupTotalAgencyDailyService.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactGroupTotalGridDailyService.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactGroupTotalAgencyDailyServiceImpl.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactGroupTotalGridDailyServiceImpl.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.12__alter_fact_origin_group_main_daily.sql
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGroupTotalAgencyDailyDao.xml
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGroupTotalGridDailyDao.xml

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java
index 1886bd8300..c79f891d7c 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java
@@ -17,6 +17,7 @@ import org.joda.time.LocalDate;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 
+import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.ZoneId;
@@ -781,4 +782,22 @@ public class DateUtils {
         Date nowDate = c.getTime();
         return  com.epmet.commons.tools.utils.DateUtils.format(nowDate, com.epmet.commons.tools.utils.DateUtils.DATE_PATTERN_YYYYMM);
     }
+
+    /**
+     * @Author sun
+     * @Description 获取当前日期的前一天日期（yyyy-mm-dd）
+     **/
+    public static Date yesterDay() {
+        Date date = new Date();
+        try {
+            DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            Calendar calendar = Calendar.getInstance();
+            calendar.set(Calendar.HOUR_OF_DAY, -24);
+            String str = sdf.format(calendar.getTime());
+            date = sdf.parse(str);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return date;
+    }
 }
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactOriginGroupMainDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactOriginGroupMainDailyDTO.java
index 8292361039..818d5a399c 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactOriginGroupMainDailyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactOriginGroupMainDailyDTO.java
@@ -150,6 +150,11 @@ Ps: 如果一个小组被拒绝，当前小组的状态将永久停留在“审
      */
 	private Date updatedTime;
 
+    /**
+     * 小组类型(ordinary:楼院小组  branch:支部小组)
+     */
+	private String groupType;
+
 
 	private List<ExtractGroupMemberActionRecordResultDTO> members = new ArrayList();
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/group/form/GroupTotalFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/group/form/GroupTotalFormDTO.java
new file mode 100644
index 0000000000..ce3c23761d
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/group/form/GroupTotalFormDTO.java
@@ -0,0 +1,24 @@
+package com.epmet.dto.group.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author sun
+ * 小组总数-网格日统计-接口入参
+ */
+@Data
+public class GroupTotalFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -4527492073390715391L;
+
+    /**
+     * 客户Id
+     */
+    private String customerId = "";
+    /**
+     * 需要执行的日期（格式：yyyy-MM-dd）2020-01-01
+     */
+    private String date = "";
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactGroupTotalAgencyDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactGroupTotalAgencyDailyDTO.java
new file mode 100644
index 0000000000..d840d0510f
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactGroupTotalAgencyDailyDTO.java
@@ -0,0 +1,126 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 小组总数-机关日统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-10
+ */
+@Data
+public class FactGroupTotalAgencyDailyDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一标识
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 机构ID 关联机关dim表
+     */
+	private String agencyId;
+
+    /**
+     * 父级机关ID
+     */
+	private String pid;
+
+    /**
+     * 统计日期 关联日期dim表
+     */
+	private String dateId;
+
+    /**
+     * 周ID
+     */
+	private String weekId;
+
+    /**
+     * 月份ID
+     */
+	private String monthId;
+
+    /**
+     * 季度ID
+     */
+	private String quarterId;
+
+    /**
+     * 年ID
+     */
+	private String yearId;
+
+    /**
+     * 当前组织及下级小组总数
+     */
+	private Integer groupTotal;
+
+    /**
+     * 当前组织及下级楼院小组总数
+     */
+	private Integer ordinaryTotal;
+
+    /**
+     * 当前组织及下级支部小组总数
+     */
+	private Integer branchTotal;
+
+    /**
+     * 删除标识 未删除：0,已删除：1
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactGroupTotalGridDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactGroupTotalGridDailyDTO.java
new file mode 100644
index 0000000000..942888e0cb
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactGroupTotalGridDailyDTO.java
@@ -0,0 +1,126 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 小组总数-网格日统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-10
+ */
+@Data
+public class FactGroupTotalGridDailyDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一标识
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 机构ID 关联机关dim表
+     */
+	private String agencyId;
+
+    /**
+     * 网格ID
+     */
+	private String gridId;
+
+    /**
+     * 统计日期 关联日期dim表
+     */
+	private String dateId;
+
+    /**
+     * 周ID
+     */
+	private String weekId;
+
+    /**
+     * 月份ID
+     */
+	private String monthId;
+
+    /**
+     * 季度ID
+     */
+	private String quarterId;
+
+    /**
+     * 年ID
+     */
+	private String yearId;
+
+    /**
+     * 网格下小组总数
+     */
+	private Integer groupTotal;
+
+    /**
+     * 网格下楼院小组总数
+     */
+	private Integer ordinaryTotal;
+
+    /**
+     * 网格下支部小组总数
+     */
+	private Integer branchTotal;
+
+    /**
+     * 删除标识 未删除：0,已删除：1
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsGroupController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsGroupController.java
index e3e70ba31c..9896ae6290 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsGroupController.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsGroupController.java
@@ -1,10 +1,15 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.StatsFormDTO;
 import com.epmet.dto.group.form.GroupStatsFormDTO;
+import com.epmet.dto.group.form.GroupTotalFormDTO;
 import com.epmet.service.StatsGroupService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @Author zxc
@@ -56,4 +61,25 @@ public class StatsGroupController {
         return new Result();
     }
 
+    /**
+     * @Author sun
+     * @Description 小组总数-网格日统计
+     **/
+    @PostMapping("gridgrouptotal")
+    public Result gridGroupTotal(@RequestBody(required = false) GroupTotalFormDTO formDTO) {
+        statsGroupService.gridGroupTotal(formDTO);
+        return new Result();
+    }
+
+    /**
+     * @Author sun
+     * @Description 小组总数-机关日统计
+     **/
+    @PostMapping("agencygrouptotal")
+    public Result agencyGroupTotal(@RequestBody(required = false) GroupTotalFormDTO formDTO) {
+        statsGroupService.agencyGroupTotal(formDTO);
+        return new Result();
+    }
+
+
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/group/GroupDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/group/GroupDataDao.java
index 32059b58b3..0e29f1530a 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/group/GroupDataDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/group/GroupDataDao.java
@@ -6,6 +6,7 @@ import com.epmet.dto.group.form.GridGroupPeopleTotalFormDTO;
 import com.epmet.dto.group.form.GridGroupTotalFormDTO;
 import com.epmet.dto.group.form.GroupIncrFormDTO;
 import com.epmet.dto.group.result.*;
+import com.epmet.entity.group.ResiGroupEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -90,4 +91,10 @@ public interface GroupDataDao {
      * @date 2020.09.18 22:45
     **/
     List<FactOriginGroupMainDailyDTO> groupExtracting(@Param("customerId")String customerId,@Param("dateId") String dateId);
+
+    /**
+     * @Author sun
+     * @Description 查询客户下有效群组列表
+     **/
+    List<ResiGroupEntity> selectCustomerGroupList(@Param("customerId")String customerId);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactGroupTotalAgencyDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactGroupTotalAgencyDailyDao.java
new file mode 100644
index 0000000000..a38c1d00b5
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactGroupTotalAgencyDailyDao.java
@@ -0,0 +1,38 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.stats;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.stats.FactGroupTotalAgencyDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 小组总数-机关日统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-10
+ */
+@Mapper
+public interface FactGroupTotalAgencyDailyDao extends BaseDao<FactGroupTotalAgencyDailyEntity> {
+
+    /**
+     * @Author sun
+     * @Description 根据客户Id、日维度Id批量物理删除一下可能存在的历史数据
+     **/
+    void delDateGroupTotal(FactGroupTotalAgencyDailyEntity delEntity);
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactGroupTotalGridDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactGroupTotalGridDailyDao.java
new file mode 100644
index 0000000000..cf88536956
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactGroupTotalGridDailyDao.java
@@ -0,0 +1,39 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.stats;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.stats.FactGroupTotalGridDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 小组总数-网格日统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-10
+ */
+@Mapper
+public interface FactGroupTotalGridDailyDao extends BaseDao<FactGroupTotalGridDailyEntity> {
+
+    /**
+     * @Author sun
+     * @Description 根据客户Id、日维度Id批量物理删除一下可能存在的历史数据
+     **/
+    void delDateGroupTotal(FactGroupTotalGridDailyEntity delEntity);
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/group/ResiGroupEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/group/ResiGroupEntity.java
new file mode 100644
index 0000000000..138bfba563
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/group/ResiGroupEntity.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.group;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 群组信息表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-03-28
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("resi_group")
+public class ResiGroupEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 群头像（htt://地址）
+     */
+	private String groupHeadPhoto;
+
+    /**
+     * 小组名称
+     */
+	private String groupName;
+
+    /**
+     * 群介绍
+     */
+	private String groupIntroduction;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 网格id
+     */
+	private String gridId;
+
+    /**
+     * 状态：（审核通过 - approved 、 审核中 - under_auditting、 审核未通过 - rejected 、 已屏蔽 - hidden、 已关闭 - closed）
+Ps: 如果一个小组被拒绝，当前小组的状态将永久停留在“审核未通过”
+     */
+	private String state;
+
+    /**
+     * 最新话题时间
+     */
+	private Date latestTopicPublishDate;
+
+    /**
+     * 进组审核open开启；close关闭
+     */
+	private String auditSwitch;
+
+	/**
+	 * VISIT_SWITCH 小组是否允许参观:允许：open;不允许：closed
+	 */
+	private String visitSwitch;
+
+	/**
+	 * 小组类型(ordinary:楼院小组  branch:支部小组)
+	 */
+	private String groupType;
+
+	/**
+	 * 小组等级
+	 */
+	private Integer level;
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGroupTotalAgencyDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGroupTotalAgencyDailyEntity.java
new file mode 100644
index 0000000000..814c9abd6a
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGroupTotalAgencyDailyEntity.java
@@ -0,0 +1,96 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.stats;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 小组总数-机关日统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-10
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("fact_group_total_agency_daily")
+public class FactGroupTotalAgencyDailyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 机构ID 关联机关dim表
+     */
+	private String agencyId;
+
+    /**
+     * 父级机关ID
+     */
+	private String pid;
+
+    /**
+     * 统计日期 关联日期dim表
+     */
+	private String dateId;
+
+    /**
+     * 周ID
+     */
+	private String weekId;
+
+    /**
+     * 月份ID
+     */
+	private String monthId;
+
+    /**
+     * 季度ID
+     */
+	private String quarterId;
+
+    /**
+     * 年ID
+     */
+	private String yearId;
+
+    /**
+     * 当前组织及下级小组总数
+     */
+	private Integer groupTotal;
+
+    /**
+     * 当前组织及下级楼院小组总数
+     */
+	private Integer ordinaryTotal;
+
+    /**
+     * 当前组织及下级支部小组总数
+     */
+	private Integer branchTotal;
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGroupTotalGridDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGroupTotalGridDailyEntity.java
new file mode 100644
index 0000000000..995fe3fbb5
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactGroupTotalGridDailyEntity.java
@@ -0,0 +1,96 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.stats;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 小组总数-网格日统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-10
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("fact_group_total_grid_daily")
+public class FactGroupTotalGridDailyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 机构ID 关联机关dim表
+     */
+	private String agencyId;
+
+    /**
+     * 网格ID
+     */
+	private String gridId;
+
+    /**
+     * 统计日期 关联日期dim表
+     */
+	private String dateId;
+
+    /**
+     * 周ID
+     */
+	private String weekId;
+
+    /**
+     * 月份ID
+     */
+	private String monthId;
+
+    /**
+     * 季度ID
+     */
+	private String quarterId;
+
+    /**
+     * 年ID
+     */
+	private String yearId;
+
+    /**
+     * 网格下小组总数
+     */
+	private Integer groupTotal;
+
+    /**
+     * 网格下楼院小组总数
+     */
+	private Integer ordinaryTotal;
+
+    /**
+     * 网格下支部小组总数
+     */
+	private Integer branchTotal;
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsGroupService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsGroupService.java
index 10bb4f3a46..1fcb3da75b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsGroupService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsGroupService.java
@@ -1,6 +1,7 @@
 package com.epmet.service;
 
 import com.epmet.dto.group.form.GroupStatsFormDTO;
+import com.epmet.dto.group.form.GroupTotalFormDTO;
 
 /**
  * @Author zxc
@@ -26,4 +27,15 @@ public interface StatsGroupService {
      */
     void groupAgencyMonthly(GroupStatsFormDTO formDTO);
 
+    /**
+     * @Author sun
+     * @Description 小组总数-网格日统计
+     **/
+    void gridGroupTotal(GroupTotalFormDTO formDTO);
+
+    /**
+     * @Author sun
+     * @Description 小组总数-机关日统计
+     **/
+    void agencyGroupTotal(GroupTotalFormDTO formDTO);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/GroupDataService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/GroupDataService.java
index 38e291d420..e971566233 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/GroupDataService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/GroupDataService.java
@@ -2,6 +2,7 @@ package com.epmet.service.group;
 
 import com.epmet.dto.extract.FactOriginGroupMainDailyDTO;
 import com.epmet.dto.group.result.*;
+import com.epmet.entity.group.ResiGroupEntity;
 import com.epmet.util.DimIdGenerator;
 import org.apache.ibatis.annotations.Param;
 
@@ -66,4 +67,9 @@ public interface GroupDataService {
     **/
     List<FactOriginGroupMainDailyDTO> extractGroupData(Boolean isFirst,String customerId,String dateId);
 
+    /**
+     * @Author sun
+     * @Description 查询客户下有效群组列表
+     **/
+    List<ResiGroupEntity> getGroupListByCustomerId(String customerId);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java
index b7875982d5..ca2c54b87d 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java
@@ -10,6 +10,7 @@ import com.epmet.dto.group.form.GridGroupPeopleTotalFormDTO;
 import com.epmet.dto.group.form.GridGroupTotalFormDTO;
 import com.epmet.dto.group.form.GroupIncrFormDTO;
 import com.epmet.dto.group.result.*;
+import com.epmet.entity.group.ResiGroupEntity;
 import com.epmet.entity.stats.DimGridEntity;
 import com.epmet.service.group.GroupDataService;
 import com.epmet.util.DimIdGenerator;
@@ -211,4 +212,14 @@ public class GroupDataServiceImpl implements GroupDataService {
     }
 
 
+    /**
+     * @Author sun
+     * @Description 查询客户下有效群组列表
+     **/
+    @Override
+    public List<ResiGroupEntity> getGroupListByCustomerId(String customerId) {
+        return groupDataDao.selectCustomerGroupList(customerId);
+    }
+
+
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java
index 5e4fde3280..4be803a4a6 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java
@@ -6,9 +6,14 @@ import com.epmet.constant.GroupConstant;
 import com.epmet.dto.AgencySubTreeDto;
 import com.epmet.dto.group.form.AgencyMonthlyFormDTO;
 import com.epmet.dto.group.form.GroupStatsFormDTO;
+import com.epmet.dto.group.form.GroupTotalFormDTO;
 import com.epmet.dto.group.result.*;
 import com.epmet.dto.stats.DimAgencyDTO;
+import com.epmet.entity.group.ResiGroupEntity;
 import com.epmet.entity.stats.DimAgencyEntity;
+import com.epmet.entity.stats.DimGridEntity;
+import com.epmet.entity.stats.FactGroupTotalAgencyDailyEntity;
+import com.epmet.entity.stats.FactGroupTotalGridDailyEntity;
 import com.epmet.service.StatsGroupService;
 import com.epmet.service.group.GroupDataService;
 import com.epmet.service.org.CustomerGridService;
@@ -20,11 +25,13 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import java.time.LocalDate;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
@@ -50,6 +57,12 @@ public class StatsGroupServiceImpl implements StatsGroupService {
     private DimCustomerService dimCustomerService;
     @Autowired
     private CustomerGridService customerGridService;
+    @Autowired
+    private DimGridService dimGridService;
+    @Autowired
+    private FactGroupTotalGridDailyService factGroupTotalGridDailyService;
+    @Autowired
+    private FactGroupTotalAgencyDailyService factGroupTotalAgencyDailyService;
 
     /**
      * @param
@@ -333,4 +346,241 @@ public class StatsGroupServiceImpl implements StatsGroupService {
         return DimIdGenerator.getDimIdBean(result);
     }
 
+    /**
+     * @Author sun
+     * @Description 小组总数-网格日统计
+     **/
+    @Override
+    public void gridGroupTotal(GroupTotalFormDTO formDTO) {
+        Date date = DateUtils.yesterDay();
+        //入参有日期的则按具体时间执行,没有的则按当前时间前一天执行
+        if (null != formDTO && StringUtils.isNotBlank(formDTO.getDate())) {
+            date = DateUtils.parse(formDTO.getDate(), DateUtils.DATE_PATTERN);
+        }
+        //入参有客户Id的则按客户Id执行，没有的则全部客户都执行
+        if (null != formDTO && StringUtils.isNotBlank(formDTO.getCustomerId())) {
+            log.info("单独统计客户网格-小组总数日统计数据，当前统计的客户Id:" + formDTO.getCustomerId());
+            gridGroupStats(formDTO.getCustomerId(), date);
+        } else {
+            int pageNo = 1;
+            int pageSize = 100;
+            List<String> customerIdList = null;
+            do {
+                //获取有效客户列表
+                customerIdList = dimCustomerService.selectCustomerIdPage(pageNo++, pageSize);
+                if (!CollectionUtils.isEmpty(customerIdList)) {
+                    for (String customerId : customerIdList) {
+                        try {
+                            log.info("for循环统计网格-小组总数日统计数据，当前统计的客户Id:" + customerId);
+                            //遍历统计每一个客户数据
+                            gridGroupStats(customerId, date);
+                        } catch (Exception e) {
+                            log.error("小组总数-网格日统计-程序错误，对应客户Id:" + customerId, e);
+                            log.error("Error creating model JSON", e);
+                        }
+                    }
+                }
+            } while (!CollectionUtils.isEmpty(customerIdList) && customerIdList.size() == pageSize);
+        }
+
+    }
+
+    /**
+     * @Author sun
+     * @Description 小组总数-网格日统计数据
+     **/
+    private void gridGroupStats(String customerId, Date date) {
+        //1:查询各维度表Id,方便使用
+        DimIdGenerator.DimIdBean dimId = DimIdGenerator.getDimIdBean(date);
+
+        //2:根据客户Id查询网格维度表数据
+        log.info("StatsGroupServiceImpl.customerGridStats-根据客户Id查询网格维度数据，对应客户Id:" + customerId);
+        List<DimGridEntity> dimGridList = dimGridService.getGridListByCustomerId(customerId);
+
+        //3.根据客户Id查询客户下有效的群组列表数据
+        log.info("StatsGroupServiceImpl.customerGridStats-根据客户Id查询客户下有效的群组列表数据，对应客户Id:" + customerId);
+        List<ResiGroupEntity> groupList = groupDataService.getGroupListByCustomerId(customerId);
+
+        //4.分别计算每个网格下审核通过的小组数据
+        List<FactGroupTotalGridDailyEntity> list = new ArrayList<>();
+        dimGridList.forEach(grid -> {
+            FactGroupTotalGridDailyEntity entity = new FactGroupTotalGridDailyEntity();
+            AtomicInteger total = new AtomicInteger(0);
+            AtomicInteger ordinary = new AtomicInteger(0);
+            AtomicInteger branch = new AtomicInteger(0);
+            groupList.forEach(group -> {
+                if (grid.getId().equals(group.getGridId()) && "approved".equals(group.getState())) {
+
+                    total.addAndGet(1);
+                    if ("ordinary".equals(group.getGroupType())) {
+                        ordinary.addAndGet(1);
+                    }
+                    if ("branch".equals(group.getGroupType())) {
+                        branch.addAndGet(1);
+                    }
+                }
+            });
+            //封装数据
+            entity.setCustomerId(grid.getCustomerId());
+            entity.setAgencyId(grid.getAgencyId());
+            entity.setGridId(grid.getId());
+            entity.setDateId(dimId.getDateId());
+            entity.setWeekId(dimId.getWeekId());
+            entity.setMonthId(dimId.getMonthId());
+            entity.setQuarterId(dimId.getQuarterId());
+            entity.setYearId(dimId.getYearId());
+            entity.setGroupTotal(total.get());
+            entity.setOrdinaryTotal(ordinary.get());
+            entity.setBranchTotal(branch.get());
+            list.add(entity);
+        });
+
+        //5.批量插入数据库，先删后增的逻辑
+        if (!CollectionUtils.isEmpty(list)) {
+            //5.1:根据客户Id、日维度Id批量物理删除一下可能存在的历史数据
+            FactGroupTotalGridDailyEntity delEntity = new FactGroupTotalGridDailyEntity();
+            delEntity.setCustomerId(customerId);
+            delEntity.setDateId(dimId.getDateId());
+            log.info("StatsGroupServiceImpl.customerGridStats-根据客户Id、日维度Id批量删除小组总数网格日统计表数据,对应客户Id:" + customerId + ",日维度Id:" + dimId.getDateId());
+            factGroupTotalGridDailyService.delDateGroupTotal(delEntity);
+
+            //5.2:批量保存网格日统计数据
+            log.info("StatsGroupServiceImpl.customerGridStats-批量新增小组总数网格日统计表数据,对应客户Id:" + customerId + ",日维度Id:" + dimId.getDateId());
+            factGroupTotalGridDailyService.insertBatch(list);
+        }
+
+    }
+
+    /**
+     * @Author sun
+     * @Description 小组总数-机关日统计
+     **/
+    @Override
+    public void agencyGroupTotal(GroupTotalFormDTO formDTO) {
+        Date date = DateUtils.yesterDay();
+        //入参有时间的则按具体时间执行,没有的则按当前时间前一天执行
+        if (null != formDTO && StringUtils.isNotBlank(formDTO.getDate())) {
+            date = DateUtils.parse(formDTO.getDate(), DateUtils.DATE_PATTERN);
+        }
+        //入参有客户Id的则按客户Id执行，没有的则全部客户都执行
+        if (null != formDTO && StringUtils.isNotBlank(formDTO.getCustomerId())) {
+            log.info("单独统计客户组织下-小组总数日统计数据，当前统计的客户Id:" + formDTO.getCustomerId());
+            agencyGroupStats(formDTO.getCustomerId(), date);
+        } else {
+            int pageNo = 1;
+            int pageSize = 100;
+            List<String> customerIdList = null;
+            do {
+                customerIdList = dimCustomerService.selectCustomerIdPage(pageNo++, pageSize);
+                if (!CollectionUtils.isEmpty(customerIdList)) {
+                    for (String customerId : customerIdList) {
+                        try {
+                            log.info("for循环统计机关-小组总数日统计数据，当前统计的客户Id:" + customerId);
+                            //遍历统计每一个客户数据
+                            agencyGroupStats(customerId, date);
+                        } catch (Exception e) {
+                            log.error("小组总数-机关日统计程序错误，对应客户Id:" + customerId, e);
+                            log.error("Error creating model JSON", e);
+                        }
+                    }
+                }
+            } while (!CollectionUtils.isEmpty(customerIdList) && customerIdList.size() == pageSize);
+        }
+
+    }
+
+    /**
+     * @Author sun
+     * @Description 小组总数-机关日统计数据
+     **/
+    private void agencyGroupStats(String customerId, Date date) {
+        //1:查询各维度表Id,方便使用
+        DimIdGenerator.DimIdBean dimId = DimIdGenerator.getDimIdBean(date);
+
+        //2:根据客户Id查询机关维度表数据
+        log.info("StatsGroupServiceImpl.agencyGroupStats-根据客户Id查询机关维度数据，对应客户Id:" + customerId);
+        DimAgencyDTO dimAgencyDTO = new DimAgencyDTO();
+        dimAgencyDTO.setCustomerId(customerId);
+        List<DimAgencyDTO> agencyList = dimAgencyService.getDimAgencyList(dimAgencyDTO);
+
+        //3.根据客户Id查询网格维度表数据
+        List<DimGridEntity> gridList = dimGridService.getGridListByCustomerId(customerId);
+
+        //4.根据客户Id查询客户下有效的群组列表数据
+        log.info("StatsGroupServiceImpl.agencyGroupStats-根据客户Id查询客户下有效的群组列表数据，对应客户Id:" + customerId);
+        List<ResiGroupEntity> groupList = groupDataService.getGroupListByCustomerId(customerId);
+
+        List<FactGroupTotalAgencyDailyEntity> list = new ArrayList<>();
+        //5.遍历组织维度数据分别计算每个组织下群组数据
+        agencyList.forEach(agency->{
+            FactGroupTotalAgencyDailyEntity entity = new FactGroupTotalAgencyDailyEntity();
+           //5-1.汇总组织及所有下级组织列表
+            Map<String, String> map = new HashMap<>();
+            map.put(agency.getId(), agency.getId());
+            String subPids = ((null == agency.getPids() || "".equals(agency.getPids())) ? agency.getId() : agency.getPids() + ":" + agency.getId());
+            agencyList.forEach(sub -> {
+                if (sub.getPids().contains(subPids)) {
+                    map.put(sub.getId(), sub.getId());
+                }
+            });
+
+           //5-2.汇总组织及下级所有的网格列表
+            List<String> agencyGridList = new ArrayList<>();
+            gridList.forEach(grid->{
+                if (map.containsKey(grid.getAgencyId())) {
+                    agencyGridList.add(grid.getId());
+                }
+            });
+
+            AtomicInteger total = new AtomicInteger(0);
+            AtomicInteger ordinary = new AtomicInteger(0);
+            AtomicInteger branch = new AtomicInteger(0);
+           //5-3.根据汇总的网格列表统计对应的群组数据
+            agencyGridList.forEach(gridId -> {
+                groupList.forEach(group -> {
+                    if (gridId.equals(group.getGridId()) && "approved".equals(group.getState())) {
+                        total.addAndGet(1);
+                        if ("ordinary".equals(group.getGroupType())) {
+                            ordinary.addAndGet(1);
+                        }
+                        if ("branch".equals(group.getGroupType())) {
+                            branch.addAndGet(1);
+                        }
+                    }
+                });
+            });
+            //封装数据
+            entity.setCustomerId(agency.getCustomerId());
+            entity.setAgencyId(agency.getId());
+            entity.setPid(agency.getPid());
+            entity.setDateId(dimId.getDateId());
+            entity.setWeekId(dimId.getWeekId());
+            entity.setMonthId(dimId.getMonthId());
+            entity.setQuarterId(dimId.getQuarterId());
+            entity.setYearId(dimId.getYearId());
+            entity.setGroupTotal(total.get());
+            entity.setOrdinaryTotal(ordinary.get());
+            entity.setBranchTotal(branch.get());
+            list.add(entity);
+        });
+
+        //6.批量插入数据库，先删后增的逻辑
+        if (!CollectionUtils.isEmpty(list)) {
+            //5.1:根据客户Id、日维度Id批量物理删除一下可能存在的历史数据
+            FactGroupTotalAgencyDailyEntity delEntity = new FactGroupTotalAgencyDailyEntity();
+            delEntity.setCustomerId(customerId);
+            delEntity.setDateId(dimId.getDateId());
+            log.info("StatsGroupServiceImpl.agencyGroupStats-根据客户Id、日维度Id批量删除小组总数网格日统计表数据,对应客户Id:" + customerId + ",日维度Id:" + dimId.getDateId());
+            factGroupTotalAgencyDailyService.delDateGroupTotal(delEntity);
+
+            //5.2:批量保存网格日统计数据
+            log.info("StatsGroupServiceImpl.agencyGroupStats-批量新增小组总数网格日统计表数据,对应客户Id:" + customerId + ",日维度Id:" + dimId.getDateId());
+            factGroupTotalAgencyDailyService.insertBatch(list);
+        }
+
+
+    }
+
+
+
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactGroupTotalAgencyDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactGroupTotalAgencyDailyService.java
new file mode 100644
index 0000000000..602b0092f6
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactGroupTotalAgencyDailyService.java
@@ -0,0 +1,101 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.stats;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.FactGroupTotalAgencyDailyDTO;
+import com.epmet.entity.stats.FactGroupTotalAgencyDailyEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 小组总数-机关日统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-10
+ */
+public interface FactGroupTotalAgencyDailyService extends BaseService<FactGroupTotalAgencyDailyEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<FactGroupTotalAgencyDailyDTO>
+     * @author generator
+     * @date 2021-05-10
+     */
+    PageData<FactGroupTotalAgencyDailyDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<FactGroupTotalAgencyDailyDTO>
+     * @author generator
+     * @date 2021-05-10
+     */
+    List<FactGroupTotalAgencyDailyDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return FactGroupTotalAgencyDailyDTO
+     * @author generator
+     * @date 2021-05-10
+     */
+    FactGroupTotalAgencyDailyDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-05-10
+     */
+    void save(FactGroupTotalAgencyDailyDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-05-10
+     */
+    void update(FactGroupTotalAgencyDailyDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-05-10
+     */
+    void delete(String[] ids);
+
+    /**
+     * @Author sun
+     * @Description 根据客户Id、日维度Id批量物理删除一下可能存在的历史数据
+     **/
+    void delDateGroupTotal(FactGroupTotalAgencyDailyEntity delEntity);
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactGroupTotalGridDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactGroupTotalGridDailyService.java
new file mode 100644
index 0000000000..fef3b0328c
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactGroupTotalGridDailyService.java
@@ -0,0 +1,101 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.stats;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.FactGroupTotalGridDailyDTO;
+import com.epmet.entity.stats.FactGroupTotalGridDailyEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 小组总数-网格日统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-10
+ */
+public interface FactGroupTotalGridDailyService extends BaseService<FactGroupTotalGridDailyEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<FactGroupTotalGridDailyDTO>
+     * @author generator
+     * @date 2021-05-10
+     */
+    PageData<FactGroupTotalGridDailyDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<FactGroupTotalGridDailyDTO>
+     * @author generator
+     * @date 2021-05-10
+     */
+    List<FactGroupTotalGridDailyDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return FactGroupTotalGridDailyDTO
+     * @author generator
+     * @date 2021-05-10
+     */
+    FactGroupTotalGridDailyDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-05-10
+     */
+    void save(FactGroupTotalGridDailyDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-05-10
+     */
+    void update(FactGroupTotalGridDailyDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-05-10
+     */
+    void delete(String[] ids);
+
+    /**
+     * @Author sun
+     * @Description 根据客户Id、日维度Id批量物理删除一下可能存在的历史数据
+     **/
+    void delDateGroupTotal(FactGroupTotalGridDailyEntity delEntity);
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactGroupTotalAgencyDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactGroupTotalAgencyDailyServiceImpl.java
new file mode 100644
index 0000000000..d10940fcc3
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactGroupTotalAgencyDailyServiceImpl.java
@@ -0,0 +1,108 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.stats.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.dao.stats.FactGroupTotalAgencyDailyDao;
+import com.epmet.dto.FactGroupTotalAgencyDailyDTO;
+import com.epmet.entity.stats.FactGroupTotalAgencyDailyEntity;
+import com.epmet.service.stats.FactGroupTotalAgencyDailyService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 小组总数-机关日统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-10
+ */
+@Service
+public class FactGroupTotalAgencyDailyServiceImpl extends BaseServiceImpl<FactGroupTotalAgencyDailyDao, FactGroupTotalAgencyDailyEntity> implements FactGroupTotalAgencyDailyService {
+
+    @Override
+    public PageData<FactGroupTotalAgencyDailyDTO> page(Map<String, Object> params) {
+        IPage<FactGroupTotalAgencyDailyEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, FactGroupTotalAgencyDailyDTO.class);
+    }
+
+    @Override
+    public List<FactGroupTotalAgencyDailyDTO> list(Map<String, Object> params) {
+        List<FactGroupTotalAgencyDailyEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, FactGroupTotalAgencyDailyDTO.class);
+    }
+
+    private QueryWrapper<FactGroupTotalAgencyDailyEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<FactGroupTotalAgencyDailyEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public FactGroupTotalAgencyDailyDTO get(String id) {
+        FactGroupTotalAgencyDailyEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, FactGroupTotalAgencyDailyDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(FactGroupTotalAgencyDailyDTO dto) {
+        FactGroupTotalAgencyDailyEntity entity = ConvertUtils.sourceToTarget(dto, FactGroupTotalAgencyDailyEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(FactGroupTotalAgencyDailyDTO dto) {
+        FactGroupTotalAgencyDailyEntity entity = ConvertUtils.sourceToTarget(dto, FactGroupTotalAgencyDailyEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+    /**
+     * @Author sun
+     * @Description 根据客户Id、日维度Id批量物理删除一下可能存在的历史数据
+     **/
+    @Override
+    public void delDateGroupTotal(FactGroupTotalAgencyDailyEntity delEntity) {
+        baseDao.delDateGroupTotal(delEntity);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactGroupTotalGridDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactGroupTotalGridDailyServiceImpl.java
new file mode 100644
index 0000000000..f8aa5d5afe
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactGroupTotalGridDailyServiceImpl.java
@@ -0,0 +1,108 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.stats.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.dao.stats.FactGroupTotalGridDailyDao;
+import com.epmet.dto.FactGroupTotalGridDailyDTO;
+import com.epmet.entity.stats.FactGroupTotalGridDailyEntity;
+import com.epmet.service.stats.FactGroupTotalGridDailyService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 小组总数-网格日统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-10
+ */
+@Service
+public class FactGroupTotalGridDailyServiceImpl extends BaseServiceImpl<FactGroupTotalGridDailyDao, FactGroupTotalGridDailyEntity> implements FactGroupTotalGridDailyService {
+
+    @Override
+    public PageData<FactGroupTotalGridDailyDTO> page(Map<String, Object> params) {
+        IPage<FactGroupTotalGridDailyEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, FactGroupTotalGridDailyDTO.class);
+    }
+
+    @Override
+    public List<FactGroupTotalGridDailyDTO> list(Map<String, Object> params) {
+        List<FactGroupTotalGridDailyEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, FactGroupTotalGridDailyDTO.class);
+    }
+
+    private QueryWrapper<FactGroupTotalGridDailyEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<FactGroupTotalGridDailyEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public FactGroupTotalGridDailyDTO get(String id) {
+        FactGroupTotalGridDailyEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, FactGroupTotalGridDailyDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(FactGroupTotalGridDailyDTO dto) {
+        FactGroupTotalGridDailyEntity entity = ConvertUtils.sourceToTarget(dto, FactGroupTotalGridDailyEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(FactGroupTotalGridDailyDTO dto) {
+        FactGroupTotalGridDailyEntity entity = ConvertUtils.sourceToTarget(dto, FactGroupTotalGridDailyEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+    /**
+     * @Author sun
+     * @Description 根据客户Id、日维度Id批量物理删除一下可能存在的历史数据
+     **/
+    @Override
+    public void delDateGroupTotal(FactGroupTotalGridDailyEntity delEntity) {
+        baseDao.delDateGroupTotal(delEntity);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.12__alter_fact_origin_group_main_daily.sql b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.12__alter_fact_origin_group_main_daily.sql
new file mode 100644
index 0000000000..a4e1300cdb
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.12__alter_fact_origin_group_main_daily.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `fact_origin_group_main_daily`
+ADD COLUMN `GROUP_TYPE`  varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '小组类型(ordinary:楼院小组  branch:支部小组)' AFTER `GROUP_STATE`;
+
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml
index db5dc8b583..3107a108d9 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml
@@ -139,6 +139,7 @@
                 id,
                 customer_id,
                 group_state,
+                group_type,
                 grid_id,
                 agency_id,
                 parent_id,
@@ -165,6 +166,7 @@
               #{item.id},
             #{item.customerId},
             #{item.groupState},
+            #{item.groupType},
             #{item.gridId},
             #{item.agencyId},
             #{item.parentId},
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml
index 9b6da626dc..8ecfd3b72a 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml
@@ -186,7 +186,8 @@
         oper.UPDATED_TIME AS joinDate,
         IF(groupp.CREATED_BY = oper.CUSTOMER_USER_ID,'leader','member') AS leaderFlag,
         groupp.CREATED_BY AS groupOwnerId,
-        IF(groupp.CREATED_BY = oper.CUSTOMER_USER_ID,'join','create') AS actionCode
+        IF(groupp.CREATED_BY = oper.CUSTOMER_USER_ID,'join','create') AS actionCode,
+        groupp.group_type AS groupType
 
         FROM
         RESI_GROUP groupp
@@ -226,4 +227,14 @@
 
     </select>
 
+    <select id="selectCustomerGroupList" resultType="com.epmet.entity.group.ResiGroupEntity">
+        SELECT
+            *
+        FROM
+            resi_group
+        WHERE
+            del_flag = '0'
+        AND customer_id = #{customerId}
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGroupTotalAgencyDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGroupTotalAgencyDailyDao.xml
new file mode 100644
index 0000000000..618a957a95
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGroupTotalAgencyDailyDao.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.stats.FactGroupTotalAgencyDailyDao">
+
+    <delete id="delDateGroupTotal">
+        DELETE
+        FROM
+            fact_group_total_agency_daily
+        WHERE
+            customer_id = #{customerId}
+        AND date_id = #{dateId}
+    </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGroupTotalGridDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGroupTotalGridDailyDao.xml
new file mode 100644
index 0000000000..743f3af322
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGroupTotalGridDailyDao.xml
@@ -0,0 +1,16 @@
+
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.stats.FactGroupTotalGridDailyDao">
+
+    <delete id="delDateGroupTotal">
+        DELETE
+        FROM
+            fact_group_total_grid_daily
+        WHERE
+            customer_id = #{customerId}
+        AND date_id = #{dateId}
+    </delete>
+
+</mapper>
\ No newline at end of file

From 3d4560c155243d546b2ffced3461b2b4851f9216 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 11 May 2021 17:07:54 +0800
Subject: [PATCH 002/128] bug

---
 .../main/resources/mapper/stats/FactGroupTotalGridDailyDao.xml   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGroupTotalGridDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGroupTotalGridDailyDao.xml
index 743f3af322..689f3f5820 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGroupTotalGridDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGroupTotalGridDailyDao.xml
@@ -1,4 +1,3 @@
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 

From fd18dc33c74adaaefb0addadac2dde40669a8eea Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 11 May 2021 18:00:37 +0800
Subject: [PATCH 003/128] =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/group/GroupDataDao.xml             | 1 +
 1 file changed, 1 insertion(+)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml
index 8ecfd3b72a..1bf3357347 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml
@@ -162,6 +162,7 @@
         <result column="CUSTOMER_ID" property="customerId"/>
         <result column="groupState" property="groupState"/>
         <result column="GRID_ID" property="gridId"/>
+        <result column="groupType" property="groupType"/>
         <result column="createdTime" property="createdTime" />
         <result column="groupOwnerId" property="groupOwnerId"/>
         <collection property="members" ofType="com.epmet.dto.group.result.ExtractGroupMemberActionRecordResultDTO">

From 1d0f29b3fafe48814fa666ec728c4b2ac39b2ac3 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 12 May 2021 11:05:01 +0800
Subject: [PATCH 004/128] =?UTF-8?q?=E7=BE=A4=E7=BB=84=E6=95=B0=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/commons/tools/utils/DateUtils.java  | 18 +++++
 .../dto/group/form/GroupTotalFormDTO.java     |  4 +-
 .../extract/FactOriginGroupMainDailyDao.java  |  6 ++
 .../com/epmet/dao/group/GroupDataDao.java     |  5 --
 .../FactOriginGroupMainDailyEntity.java       |  5 ++
 .../com/epmet/service/StatsGroupService.java  |  2 +
 .../FactOriginGroupMainDailyService.java      |  6 ++
 .../FactOriginGroupMainDailyServiceImpl.java  |  9 +++
 .../epmet/service/group/GroupDataService.java |  5 --
 .../group/impl/GroupDataServiceImpl.java      | 11 ---
 .../service/impl/StatsGroupServiceImpl.java   | 69 +++++++++++--------
 .../extract/FactOriginGroupMainDailyDao.xml   | 11 +++
 .../resources/mapper/group/GroupDataDao.xml   | 10 ---
 13 files changed, 100 insertions(+), 61 deletions(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java
index c79f891d7c..a2f88e4133 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java
@@ -800,4 +800,22 @@ public class DateUtils {
         }
         return date;
     }
+
+    /**
+     * 格式化日期
+     * @param dateStr String 字符型日期
+     * @param format String 格式
+     * @return Date 日期
+     */
+    public static Date parseDate(String dateStr, String format) {
+        Date date = null;
+        try {
+            DateFormat dateFormat = new SimpleDateFormat(format);
+            date = dateFormat.parse(dateStr);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return date;
+    }
+
 }
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/group/form/GroupTotalFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/group/form/GroupTotalFormDTO.java
index ce3c23761d..7d91c9c3fc 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/group/form/GroupTotalFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/group/form/GroupTotalFormDTO.java
@@ -18,7 +18,7 @@ public class GroupTotalFormDTO implements Serializable {
      */
     private String customerId = "";
     /**
-     * 需要执行的日期（格式：yyyy-MM-dd）2020-01-01
+     * 需要执行的日期（格式：yyyyMMdd）
      */
-    private String date = "";
+    private String dateId = "";
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginGroupMainDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginGroupMainDailyDao.java
index 911d8b7993..7ffdf0c1f3 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginGroupMainDailyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginGroupMainDailyDao.java
@@ -199,4 +199,10 @@ public interface FactOriginGroupMainDailyDao extends BaseDao<FactOriginGroupMain
      */
     List<OrgStatisticsResultDTO> selectOrgGroupCount(@Param("customerId") String customerId, @Param("monthId") String monthId,
                                                      @Param("level") String level);
+
+    /**
+     * @Author sun
+     * @Description 查询客户小组维度下有效群组列表
+     **/
+    List<FactOriginGroupMainDailyEntity> selectCustomerGroupList(@Param("customerId") String customerId, @Param("dateId") String dateId);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/group/GroupDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/group/GroupDataDao.java
index 0e29f1530a..bf35e1fe88 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/group/GroupDataDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/group/GroupDataDao.java
@@ -92,9 +92,4 @@ public interface GroupDataDao {
     **/
     List<FactOriginGroupMainDailyDTO> groupExtracting(@Param("customerId")String customerId,@Param("dateId") String dateId);
 
-    /**
-     * @Author sun
-     * @Description 查询客户下有效群组列表
-     **/
-    List<ResiGroupEntity> selectCustomerGroupList(@Param("customerId")String customerId);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginGroupMainDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginGroupMainDailyEntity.java
index 8bb0ba12a1..34b01407d6 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginGroupMainDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginGroupMainDailyEntity.java
@@ -116,4 +116,9 @@ Ps: 如果一个小组被拒绝，当前小组的状态将永久停留在“审
      */
 	private Integer isOwnerParty;
 
+	/**
+	 * 小组类型(ordinary:楼院小组  branch:支部小组)
+	 */
+	private String groupType;
+
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsGroupService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsGroupService.java
index 1fcb3da75b..c6019d1490 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsGroupService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsGroupService.java
@@ -3,6 +3,8 @@ package com.epmet.service;
 import com.epmet.dto.group.form.GroupStatsFormDTO;
 import com.epmet.dto.group.form.GroupTotalFormDTO;
 
+import java.text.ParseException;
+
 /**
  * @Author zxc
  * @CreateTime 2020/6/16 14:14
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginGroupMainDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginGroupMainDailyService.java
index 730acde2c8..9b4350b1fb 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginGroupMainDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginGroupMainDailyService.java
@@ -105,4 +105,10 @@ public interface FactOriginGroupMainDailyService extends BaseService<FactOriginG
      * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
      */
     List<OrgStatisticsResultDTO> getOrgGroupCount(String customerId, String monthId, String level);
+
+    /**
+     * @Author sun
+     * @Description 查询客户小组维度下有效群组列表
+     **/
+    List<FactOriginGroupMainDailyEntity> getGroupListByCustomerId(String customerId, String dateId);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginGroupMainDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginGroupMainDailyServiceImpl.java
index 94fadea5fe..718a045131 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginGroupMainDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginGroupMainDailyServiceImpl.java
@@ -136,4 +136,13 @@ public class FactOriginGroupMainDailyServiceImpl extends BaseServiceImpl<FactOri
         return baseDao.selectOrgGroupCount(customerId, monthId, level);
     }
 
+    /**
+     * @Author sun
+     * @Description 查询客户小组维度下有效群组列表
+     **/
+    @Override
+    public List<FactOriginGroupMainDailyEntity> getGroupListByCustomerId(String customerId, String dateId) {
+        return baseDao.selectCustomerGroupList(customerId, dateId);
+    }
+
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/GroupDataService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/GroupDataService.java
index e971566233..76865ba242 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/GroupDataService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/GroupDataService.java
@@ -67,9 +67,4 @@ public interface GroupDataService {
     **/
     List<FactOriginGroupMainDailyDTO> extractGroupData(Boolean isFirst,String customerId,String dateId);
 
-    /**
-     * @Author sun
-     * @Description 查询客户下有效群组列表
-     **/
-    List<ResiGroupEntity> getGroupListByCustomerId(String customerId);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java
index ca2c54b87d..93d6b4a7db 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java
@@ -211,15 +211,4 @@ public class GroupDataServiceImpl implements GroupDataService {
         return  groupDataDao.groupExtracting(customerId,isFirst?null:dateId);
     }
 
-
-    /**
-     * @Author sun
-     * @Description 查询客户下有效群组列表
-     **/
-    @Override
-    public List<ResiGroupEntity> getGroupListByCustomerId(String customerId) {
-        return groupDataDao.selectCustomerGroupList(customerId);
-    }
-
-
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java
index 4be803a4a6..f222a9ee8e 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java
@@ -1,6 +1,7 @@
 package com.epmet.service.impl;
 
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.convert.DateConverter;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.GroupConstant;
 import com.epmet.dto.AgencySubTreeDto;
@@ -9,24 +10,29 @@ import com.epmet.dto.group.form.GroupStatsFormDTO;
 import com.epmet.dto.group.form.GroupTotalFormDTO;
 import com.epmet.dto.group.result.*;
 import com.epmet.dto.stats.DimAgencyDTO;
+import com.epmet.entity.evaluationindex.extract.FactOriginGroupMainDailyEntity;
 import com.epmet.entity.group.ResiGroupEntity;
 import com.epmet.entity.stats.DimAgencyEntity;
 import com.epmet.entity.stats.DimGridEntity;
 import com.epmet.entity.stats.FactGroupTotalAgencyDailyEntity;
 import com.epmet.entity.stats.FactGroupTotalGridDailyEntity;
 import com.epmet.service.StatsGroupService;
+import com.epmet.service.evaluationindex.extract.todata.FactOriginGroupMainDailyService;
 import com.epmet.service.group.GroupDataService;
 import com.epmet.service.org.CustomerGridService;
 import com.epmet.service.stats.*;
 import com.epmet.util.DimIdGenerator;
 import com.epmet.util.ModuleConstant;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
@@ -63,6 +69,8 @@ public class StatsGroupServiceImpl implements StatsGroupService {
     private FactGroupTotalGridDailyService factGroupTotalGridDailyService;
     @Autowired
     private FactGroupTotalAgencyDailyService factGroupTotalAgencyDailyService;
+    @Autowired
+    private FactOriginGroupMainDailyService factOriginGroupMainDailyService;
 
     /**
      * @param
@@ -352,15 +360,16 @@ public class StatsGroupServiceImpl implements StatsGroupService {
      **/
     @Override
     public void gridGroupTotal(GroupTotalFormDTO formDTO) {
-        Date date = DateUtils.yesterDay();
         //入参有日期的则按具体时间执行,没有的则按当前时间前一天执行
-        if (null != formDTO && StringUtils.isNotBlank(formDTO.getDate())) {
-            date = DateUtils.parse(formDTO.getDate(), DateUtils.DATE_PATTERN);
+        if (StringUtils.isBlank(formDTO.getDateId())) {
+            Date yesterday = DateUtils.addDateDays(new Date(), -1);
+            SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD);
+            formDTO.setDateId(format.format(yesterday));
         }
         //入参有客户Id的则按客户Id执行，没有的则全部客户都执行
         if (null != formDTO && StringUtils.isNotBlank(formDTO.getCustomerId())) {
             log.info("单独统计客户网格-小组总数日统计数据，当前统计的客户Id:" + formDTO.getCustomerId());
-            gridGroupStats(formDTO.getCustomerId(), date);
+            gridGroupStats(formDTO.getCustomerId(), formDTO.getDateId());
         } else {
             int pageNo = 1;
             int pageSize = 100;
@@ -373,7 +382,7 @@ public class StatsGroupServiceImpl implements StatsGroupService {
                         try {
                             log.info("for循环统计网格-小组总数日统计数据，当前统计的客户Id:" + customerId);
                             //遍历统计每一个客户数据
-                            gridGroupStats(customerId, date);
+                            gridGroupStats(customerId, formDTO.getDateId());
                         } catch (Exception e) {
                             log.error("小组总数-网格日统计-程序错误，对应客户Id:" + customerId, e);
                             log.error("Error creating model JSON", e);
@@ -389,8 +398,9 @@ public class StatsGroupServiceImpl implements StatsGroupService {
      * @Author sun
      * @Description 小组总数-网格日统计数据
      **/
-    private void gridGroupStats(String customerId, Date date) {
+    private void gridGroupStats(String customerId, String dateId) {
         //1:查询各维度表Id,方便使用
+        Date date = DateUtils.parseDate(dateId,DateUtils.DATE_PATTERN_YYYYMMDD);
         DimIdGenerator.DimIdBean dimId = DimIdGenerator.getDimIdBean(date);
 
         //2:根据客户Id查询网格维度表数据
@@ -399,18 +409,18 @@ public class StatsGroupServiceImpl implements StatsGroupService {
 
         //3.根据客户Id查询客户下有效的群组列表数据
         log.info("StatsGroupServiceImpl.customerGridStats-根据客户Id查询客户下有效的群组列表数据，对应客户Id:" + customerId);
-        List<ResiGroupEntity> groupList = groupDataService.getGroupListByCustomerId(customerId);
+        List<FactOriginGroupMainDailyEntity> groupList = factOriginGroupMainDailyService.getGroupListByCustomerId(customerId, dateId);
 
         //4.分别计算每个网格下审核通过的小组数据
         List<FactGroupTotalGridDailyEntity> list = new ArrayList<>();
+        DimIdGenerator.DimIdBean finalDimId = dimId;
         dimGridList.forEach(grid -> {
             FactGroupTotalGridDailyEntity entity = new FactGroupTotalGridDailyEntity();
             AtomicInteger total = new AtomicInteger(0);
             AtomicInteger ordinary = new AtomicInteger(0);
             AtomicInteger branch = new AtomicInteger(0);
             groupList.forEach(group -> {
-                if (grid.getId().equals(group.getGridId()) && "approved".equals(group.getState())) {
-
+                if (grid.getId().equals(group.getGridId()) && "approved".equals(group.getGroupState())) {
                     total.addAndGet(1);
                     if ("ordinary".equals(group.getGroupType())) {
                         ordinary.addAndGet(1);
@@ -424,11 +434,11 @@ public class StatsGroupServiceImpl implements StatsGroupService {
             entity.setCustomerId(grid.getCustomerId());
             entity.setAgencyId(grid.getAgencyId());
             entity.setGridId(grid.getId());
-            entity.setDateId(dimId.getDateId());
-            entity.setWeekId(dimId.getWeekId());
-            entity.setMonthId(dimId.getMonthId());
-            entity.setQuarterId(dimId.getQuarterId());
-            entity.setYearId(dimId.getYearId());
+            entity.setDateId(finalDimId.getDateId());
+            entity.setWeekId(finalDimId.getWeekId());
+            entity.setMonthId(finalDimId.getMonthId());
+            entity.setQuarterId(finalDimId.getQuarterId());
+            entity.setYearId(finalDimId.getYearId());
             entity.setGroupTotal(total.get());
             entity.setOrdinaryTotal(ordinary.get());
             entity.setBranchTotal(branch.get());
@@ -457,15 +467,16 @@ public class StatsGroupServiceImpl implements StatsGroupService {
      **/
     @Override
     public void agencyGroupTotal(GroupTotalFormDTO formDTO) {
-        Date date = DateUtils.yesterDay();
-        //入参有时间的则按具体时间执行,没有的则按当前时间前一天执行
-        if (null != formDTO && StringUtils.isNotBlank(formDTO.getDate())) {
-            date = DateUtils.parse(formDTO.getDate(), DateUtils.DATE_PATTERN);
+        //入参有日期的则按具体时间执行,没有的则按当前时间前一天执行
+        if (StringUtils.isBlank(formDTO.getDateId())) {
+            Date yesterday = DateUtils.addDateDays(new Date(), -1);
+            SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD);
+            formDTO.setDateId(format.format(yesterday));
         }
         //入参有客户Id的则按客户Id执行，没有的则全部客户都执行
         if (null != formDTO && StringUtils.isNotBlank(formDTO.getCustomerId())) {
             log.info("单独统计客户组织下-小组总数日统计数据，当前统计的客户Id:" + formDTO.getCustomerId());
-            agencyGroupStats(formDTO.getCustomerId(), date);
+            agencyGroupStats(formDTO.getCustomerId(), formDTO.getDateId());
         } else {
             int pageNo = 1;
             int pageSize = 100;
@@ -477,7 +488,7 @@ public class StatsGroupServiceImpl implements StatsGroupService {
                         try {
                             log.info("for循环统计机关-小组总数日统计数据，当前统计的客户Id:" + customerId);
                             //遍历统计每一个客户数据
-                            agencyGroupStats(customerId, date);
+                            agencyGroupStats(customerId, formDTO.getDateId());
                         } catch (Exception e) {
                             log.error("小组总数-机关日统计程序错误，对应客户Id:" + customerId, e);
                             log.error("Error creating model JSON", e);
@@ -493,8 +504,9 @@ public class StatsGroupServiceImpl implements StatsGroupService {
      * @Author sun
      * @Description 小组总数-机关日统计数据
      **/
-    private void agencyGroupStats(String customerId, Date date) {
+    private void agencyGroupStats(String customerId, String dateId) {
         //1:查询各维度表Id,方便使用
+        Date date = DateUtils.parseDate(dateId,DateUtils.DATE_PATTERN_YYYYMMDD);
         DimIdGenerator.DimIdBean dimId = DimIdGenerator.getDimIdBean(date);
 
         //2:根据客户Id查询机关维度表数据
@@ -508,10 +520,11 @@ public class StatsGroupServiceImpl implements StatsGroupService {
 
         //4.根据客户Id查询客户下有效的群组列表数据
         log.info("StatsGroupServiceImpl.agencyGroupStats-根据客户Id查询客户下有效的群组列表数据，对应客户Id:" + customerId);
-        List<ResiGroupEntity> groupList = groupDataService.getGroupListByCustomerId(customerId);
+        List<FactOriginGroupMainDailyEntity> groupList = factOriginGroupMainDailyService.getGroupListByCustomerId(customerId, dateId);
 
         List<FactGroupTotalAgencyDailyEntity> list = new ArrayList<>();
         //5.遍历组织维度数据分别计算每个组织下群组数据
+        DimIdGenerator.DimIdBean finalDimId = dimId;
         agencyList.forEach(agency->{
             FactGroupTotalAgencyDailyEntity entity = new FactGroupTotalAgencyDailyEntity();
            //5-1.汇总组织及所有下级组织列表
@@ -538,7 +551,7 @@ public class StatsGroupServiceImpl implements StatsGroupService {
            //5-3.根据汇总的网格列表统计对应的群组数据
             agencyGridList.forEach(gridId -> {
                 groupList.forEach(group -> {
-                    if (gridId.equals(group.getGridId()) && "approved".equals(group.getState())) {
+                    if (gridId.equals(group.getGridId()) && "approved".equals(group.getGroupState())) {
                         total.addAndGet(1);
                         if ("ordinary".equals(group.getGroupType())) {
                             ordinary.addAndGet(1);
@@ -553,11 +566,11 @@ public class StatsGroupServiceImpl implements StatsGroupService {
             entity.setCustomerId(agency.getCustomerId());
             entity.setAgencyId(agency.getId());
             entity.setPid(agency.getPid());
-            entity.setDateId(dimId.getDateId());
-            entity.setWeekId(dimId.getWeekId());
-            entity.setMonthId(dimId.getMonthId());
-            entity.setQuarterId(dimId.getQuarterId());
-            entity.setYearId(dimId.getYearId());
+            entity.setDateId(finalDimId.getDateId());
+            entity.setWeekId(finalDimId.getWeekId());
+            entity.setMonthId(finalDimId.getMonthId());
+            entity.setQuarterId(finalDimId.getQuarterId());
+            entity.setYearId(finalDimId.getYearId());
             entity.setGroupTotal(total.get());
             entity.setOrdinaryTotal(ordinary.get());
             entity.setBranchTotal(branch.get());
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml
index 3107a108d9..2f40e1de70 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml
@@ -340,4 +340,15 @@
           AND f.GROUP_STATE = 'approved'
         GROUP BY f.AGENCY_ID
     </select>
+
+    <select id="selectCustomerGroupList" resultType="com.epmet.entity.evaluationindex.extract.FactOriginGroupMainDailyEntity">
+        SELECT
+            *
+        FROM fact_origin_group_main_daily
+        WHERE
+            del_flag = '0'
+        AND customer_id = #{customerId}
+        <![CDATA[AND DATE_ID <= #{dateId}]]>
+    </select>
+
 </mapper>
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml
index 1bf3357347..a1b2b223ab 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml
@@ -228,14 +228,4 @@
 
     </select>
 
-    <select id="selectCustomerGroupList" resultType="com.epmet.entity.group.ResiGroupEntity">
-        SELECT
-            *
-        FROM
-            resi_group
-        WHERE
-            del_flag = '0'
-        AND customer_id = #{customerId}
-    </select>
-
 </mapper>
\ No newline at end of file

From 9108b5ef31596db5cdc3054b439605b8be1f5c5c Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 12 May 2021 14:10:18 +0800
Subject: [PATCH 005/128] =?UTF-8?q?=E5=85=9A=E5=91=98=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=EF=BC=9A=E5=8F=82=E5=8A=A0=E4=B8=89=E4=B8=80=E4=BC=9A=E4=B8=80?=
 =?UTF-8?q?=E8=AF=BE=E6=AC=A1=E6=95=B0joinThreeMeetsCount=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E8=B5=8B=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dao/group/GroupDataDao.java     | 10 +++++-
 .../impl/CalCpcIndexServiceImpl.java          | 31 +++++++++++++++++--
 .../epmet/service/group/GroupDataService.java | 10 +++++-
 .../group/impl/GroupDataServiceImpl.java      | 22 ++++++++++---
 .../resources/mapper/group/GroupDataDao.xml   | 24 +++++++-------
 5 files changed, 75 insertions(+), 22 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/group/GroupDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/group/GroupDataDao.java
index bf35e1fe88..8d4fb6f16a 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/group/GroupDataDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/group/GroupDataDao.java
@@ -6,7 +6,7 @@ import com.epmet.dto.group.form.GridGroupPeopleTotalFormDTO;
 import com.epmet.dto.group.form.GridGroupTotalFormDTO;
 import com.epmet.dto.group.form.GroupIncrFormDTO;
 import com.epmet.dto.group.result.*;
-import com.epmet.entity.group.ResiGroupEntity;
+import com.epmet.dto.indexcollect.result.CpcIndexCommonDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -92,4 +92,12 @@ public interface GroupDataDao {
     **/
     List<FactOriginGroupMainDailyDTO> groupExtracting(@Param("customerId")String customerId,@Param("dateId") String dateId);
 
+    /**
+     * 查询小组活动签到表，计算用户在本月内签到的活动次数
+     *
+     * @param customerId
+     * @param monthId
+     * @return com.epmet.dto.indexcollect.result.CpcIndexCommonDTO
+     */
+    List<CpcIndexCommonDTO> selectUserSignedCount(@Param("customerId")String customerId, @Param("monthId")String monthId);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/CalCpcIndexServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/CalCpcIndexServiceImpl.java
index 6c7fad11c7..5a30c84911 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/CalCpcIndexServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/CalCpcIndexServiceImpl.java
@@ -7,6 +7,7 @@ import com.epmet.entity.evaluationindex.indexcoll.FactIndexPartyAblityCpcMonthly
 import com.epmet.service.evaluationindex.extract.dataToIndex.CalCpcIndexService;
 import com.epmet.service.evaluationindex.extract.todata.*;
 import com.epmet.service.evaluationindex.indexcoll.FactIndexPartyAblityCpcMonthlyService;
+import com.epmet.service.group.GroupDataService;
 import com.epmet.service.stats.DimCustomerPartymemberService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -43,6 +44,8 @@ public class CalCpcIndexServiceImpl implements CalCpcIndexService {
     private FactIndexPartyAblityCpcMonthlyService factIndexPartyAblityCpcMonthlyService;
     @Autowired
     private FactOriginGroupMainDailyService factOriginGroupMainDailyService;
+    @Autowired
+    private GroupDataService groupDataService;
 
     /**
      * @param customerId 客户id
@@ -54,7 +57,7 @@ public class CalCpcIndexServiceImpl implements CalCpcIndexService {
      **/
     @Override
     public void calCpcPartyAbility(String customerId, String monthId) {
-        //1、构造初始值
+        //1、构造初始值 当前客户下所有的党员
         List<FactIndexPartyAblityCpcMonthlyEntity> indexPartyAblityCpcList = dimCustomerPartymemberService.selectPartyMemberList(customerId);
         if (CollectionUtils.isEmpty(indexPartyAblityCpcList)) {
             log.info("dim_customer_partymember do not any records customerId="+customerId);
@@ -71,7 +74,8 @@ public class CalCpcIndexServiceImpl implements CalCpcIndexService {
         Map<String, Integer> shiftIssueCountMap = calShiftIssueCount(customerId, monthId);
         //4、党员提出的议题转项目数
         Map<String, Integer> shiftProjectCountMap = calShiftProjectCount(customerId, monthId);
-        //5、参加“三会一课”次数 默认0
+        //5、参加“三会一课”次数 默认0 ：当前用户在本月内活动签到次数
+        Map<String,Integer> joinThreeMeetsCountMap=calJoinThreeMeetsCount(customerId,monthId);
 
         //可以先查询出每个党员的 自建群
         Map<String, List<String>> userCreatedGroups = queryUserCreatedGroups(customerId, indexPartyAblityCpcList);
@@ -105,7 +109,10 @@ public class CalCpcIndexServiceImpl implements CalCpcIndexService {
             if (shiftProjectCountMap.containsKey(indexPartyAblityCpcEntity.getUserId())) {
                 indexPartyAblityCpcEntity.setShiftProjectCount(shiftProjectCountMap.get(indexPartyAblityCpcEntity.getUserId()));
             }
-            //5、参加“三会一课”次数 目前没有此业务，默认0
+            //5、参加“三会一课”次数 目前没有此业务，默认0 : 当前用户在本月内活动签到次数
+            if(joinThreeMeetsCountMap.containsKey(indexPartyAblityCpcEntity.getUserId())){
+                indexPartyAblityCpcEntity.setJoinThreeMeetsCount(joinThreeMeetsCountMap.get(indexPartyAblityCpcEntity.getUserId()));
+            }
             //6、党员自建群群众人数
             if (groupUserCountMap.containsKey(indexPartyAblityCpcEntity.getUserId())) {
                 indexPartyAblityCpcEntity.setGroupUserCount(groupUserCountMap.get(indexPartyAblityCpcEntity.getUserId()));
@@ -220,6 +227,24 @@ public class CalCpcIndexServiceImpl implements CalCpcIndexService {
         return resultMap;
     }
 
+    /**
+     * @return java.util.Map<java.lang.String,java.lang.Integer>
+     * @param customerId
+     * @param monthId
+     * @author yinzuomei
+     * @description 5:参加“三会一课”次数 : 当前用户在本月内活动签到次数
+     * @Date 2021/5/12 13:38
+     **/
+    private Map<String, Integer> calJoinThreeMeetsCount(String customerId, String monthId) {
+        //查询小组活动签到表，计算用户在本月内签到的活动次数
+        List<CpcIndexCommonDTO> list=groupDataService.selectJoinThreeMeetsCount(customerId,monthId);
+        Map<String, Integer> resultMap = new HashMap<>();
+        for (CpcIndexCommonDTO cpcIndexCommonDTO : list) {
+            resultMap.put(cpcIndexCommonDTO.getUserId(), cpcIndexCommonDTO.getIndexValue());
+        }
+        return resultMap;
+    }
+
     /**
      * @param customerId
      * @param monthId
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/GroupDataService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/GroupDataService.java
index 76865ba242..6be5b22324 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/GroupDataService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/GroupDataService.java
@@ -2,7 +2,7 @@ package com.epmet.service.group;
 
 import com.epmet.dto.extract.FactOriginGroupMainDailyDTO;
 import com.epmet.dto.group.result.*;
-import com.epmet.entity.group.ResiGroupEntity;
+import com.epmet.dto.indexcollect.result.CpcIndexCommonDTO;
 import com.epmet.util.DimIdGenerator;
 import org.apache.ibatis.annotations.Param;
 
@@ -67,4 +67,12 @@ public interface GroupDataService {
     **/
     List<FactOriginGroupMainDailyDTO> extractGroupData(Boolean isFirst,String customerId,String dateId);
 
+    /**
+     * 查询小组活动签到表，计算用户在本月内签到的活动次数
+     *
+     * @param customerId
+     * @param monthId
+     * @return com.epmet.dto.indexcollect.result.CpcIndexCommonDTO
+     */
+    List<CpcIndexCommonDTO> selectJoinThreeMeetsCount(String customerId, String monthId);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java
index 93d6b4a7db..20927df80a 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java
@@ -10,16 +10,12 @@ import com.epmet.dto.group.form.GridGroupPeopleTotalFormDTO;
 import com.epmet.dto.group.form.GridGroupTotalFormDTO;
 import com.epmet.dto.group.form.GroupIncrFormDTO;
 import com.epmet.dto.group.result.*;
-import com.epmet.entity.group.ResiGroupEntity;
-import com.epmet.entity.stats.DimGridEntity;
+import com.epmet.dto.indexcollect.result.CpcIndexCommonDTO;
 import com.epmet.service.group.GroupDataService;
 import com.epmet.util.DimIdGenerator;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.util.StringUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -139,6 +135,7 @@ public class GroupDataServiceImpl implements GroupDataService {
      * @param
      * @author zxc
      */
+    @Override
     public List<AgencyGroupTotalCountResultDTO> getAgencyGroupTotalCount(String customerId,String dateId){
         /*if (allGrid.size() == NumConstant.ZERO){
             return new ArrayList<>();
@@ -164,6 +161,7 @@ public class GroupDataServiceImpl implements GroupDataService {
      * @param
      * @author zxc
      */
+    @Override
     public List<AgencyGridGroupPeopleResultDTO> selectAgencyEveryGroupPeopleCount(String customerId,String dateId){
         /*if (allGrid.size() == NumConstant.ZERO){
             return new ArrayList<>();
@@ -177,6 +175,7 @@ public class GroupDataServiceImpl implements GroupDataService {
      * @param dateId
      * @author zxc
      */
+    @Override
     public List<AgencyGroupIncrResultDTO> selectAgencyGroupIncr(String customerId,String dateId){
         /*if (allGrid.size() == NumConstant.ZERO){
             return new ArrayList<>();
@@ -211,4 +210,17 @@ public class GroupDataServiceImpl implements GroupDataService {
         return  groupDataDao.groupExtracting(customerId,isFirst?null:dateId);
     }
 
+    /**
+     * 查询小组活动签到表，计算用户在本月内签到的活动次数
+     *
+     * @param customerId
+     * @param monthId
+     * @return com.epmet.dto.indexcollect.result.CpcIndexCommonDTO
+     */
+    @Override
+    public List<CpcIndexCommonDTO> selectJoinThreeMeetsCount(String customerId, String monthId) {
+        return groupDataDao.selectUserSignedCount(customerId,monthId);
+    }
+
+
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml
index a1b2b223ab..08b32f97fe 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml
@@ -214,18 +214,18 @@
         </if>
     </select>
     
-    
-    <select id="selectTopicAttachments" resultType="com.epmet.entity.evaluationindex.screen.ScreenDifficultyImgDataEntity">
+    <!-- 查询小组活动签到表，计算用户在本月内签到的活动次数 -->
+    <select id="selectUserSignedCount" parameterType="map" resultType="com.epmet.dto.indexcollect.result.CpcIndexCommonDTO">
         SELECT
-
-            ATTACHMENT_URL AS eventImgUrl,
-            SORT
-
-            FROM
-            resi_topic_attachment
-            WHERE
-            DEL_FLAG = '0'
-
+            m.SIGN_USER_ID AS userId,
+            count( DISTINCT m.GROUP_ACT_ID ) AS indexValue
+        FROM
+            act_sign_in_record m
+        WHERE
+            m.DEL_FLAG = '0'
+            AND m.CUSTOMER_ID = #{customerId}
+            AND DATE_FORMAT( m.CREATED_TIME, '%Y%m')= #{monthId}
+        GROUP BY
+            m.SIGN_USER_ID
     </select>
-
 </mapper>
\ No newline at end of file

From 3640f3740b5306c652d0000dbd49a9c47103f28d Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 12 May 2021 14:18:22 +0800
Subject: [PATCH 006/128] =?UTF-8?q?=E5=85=9A=E5=91=98=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=EF=BC=9A=E5=8F=82=E5=8A=A0=E4=B8=89=E4=B8=80=E4=BC=9A=E4=B8=80?=
 =?UTF-8?q?=E8=AF=BE=E6=AC=A1=E6=95=B0joinThreeMeetsCount=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E8=B5=8B=E5=80=BC=20sql=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dao/group/GroupDataDao.java    |  2 +-
 .../dataToIndex/impl/CalCpcIndexServiceImpl.java       |  6 +++---
 .../epmet/service/group/impl/GroupDataServiceImpl.java |  2 +-
 .../src/main/resources/mapper/group/GroupDataDao.xml   | 10 ++++++++--
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/group/GroupDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/group/GroupDataDao.java
index 8d4fb6f16a..fae2cfd223 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/group/GroupDataDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/group/GroupDataDao.java
@@ -93,7 +93,7 @@ public interface GroupDataDao {
     List<FactOriginGroupMainDailyDTO> groupExtracting(@Param("customerId")String customerId,@Param("dateId") String dateId);
 
     /**
-     * 查询小组活动签到表，计算用户在本月内签到的活动次数
+     * 查询小组活动签到表，计算用户在本月内签到的活动次数 限制活动分类编码100001 三会一课
      *
      * @param customerId
      * @param monthId
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/CalCpcIndexServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/CalCpcIndexServiceImpl.java
index 5a30c84911..353c3ad882 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/CalCpcIndexServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/CalCpcIndexServiceImpl.java
@@ -74,7 +74,7 @@ public class CalCpcIndexServiceImpl implements CalCpcIndexService {
         Map<String, Integer> shiftIssueCountMap = calShiftIssueCount(customerId, monthId);
         //4、党员提出的议题转项目数
         Map<String, Integer> shiftProjectCountMap = calShiftProjectCount(customerId, monthId);
-        //5、参加“三会一课”次数 默认0 ：当前用户在本月内活动签到次数
+        //5、参加“三会一课”次数 默认0 ：当前用户在本月内活动签到次数 限制活动分类编码100001 三会一课
         Map<String,Integer> joinThreeMeetsCountMap=calJoinThreeMeetsCount(customerId,monthId);
 
         //可以先查询出每个党员的 自建群
@@ -109,7 +109,7 @@ public class CalCpcIndexServiceImpl implements CalCpcIndexService {
             if (shiftProjectCountMap.containsKey(indexPartyAblityCpcEntity.getUserId())) {
                 indexPartyAblityCpcEntity.setShiftProjectCount(shiftProjectCountMap.get(indexPartyAblityCpcEntity.getUserId()));
             }
-            //5、参加“三会一课”次数 目前没有此业务，默认0 : 当前用户在本月内活动签到次数
+            //5、参加“三会一课”次数 目前没有此业务，默认0 : 当前用户在本月内活动签到次数 限制活动分类编码100001 三会一课
             if(joinThreeMeetsCountMap.containsKey(indexPartyAblityCpcEntity.getUserId())){
                 indexPartyAblityCpcEntity.setJoinThreeMeetsCount(joinThreeMeetsCountMap.get(indexPartyAblityCpcEntity.getUserId()));
             }
@@ -232,7 +232,7 @@ public class CalCpcIndexServiceImpl implements CalCpcIndexService {
      * @param customerId
      * @param monthId
      * @author yinzuomei
-     * @description 5:参加“三会一课”次数 : 当前用户在本月内活动签到次数
+     * @description 5:参加“三会一课”次数 : 当前用户在本月内活动签到次数 限制活动分类编码100001 三会一课
      * @Date 2021/5/12 13:38
      **/
     private Map<String, Integer> calJoinThreeMeetsCount(String customerId, String monthId) {
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java
index 20927df80a..550c0d73e8 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java
@@ -211,7 +211,7 @@ public class GroupDataServiceImpl implements GroupDataService {
     }
 
     /**
-     * 查询小组活动签到表，计算用户在本月内签到的活动次数
+     * 查询小组活动签到表，计算用户在本月内签到的活动次数 限制活动分类编码100001 三会一课
      *
      * @param customerId
      * @param monthId
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml
index 08b32f97fe..a5de0e01ab 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml
@@ -214,17 +214,23 @@
         </if>
     </select>
     
-    <!-- 查询小组活动签到表，计算用户在本月内签到的活动次数 -->
+    <!-- 查询小组活动签到表，计算用户在本月内签到的活动次数 限制活动分类编码100001 三会一课 -->
     <select id="selectUserSignedCount" parameterType="map" resultType="com.epmet.dto.indexcollect.result.CpcIndexCommonDTO">
         SELECT
             m.SIGN_USER_ID AS userId,
             count( DISTINCT m.GROUP_ACT_ID ) AS indexValue
         FROM
             act_sign_in_record m
+        inner join group_act_info a
+        on(m.GROUP_ACT_ID=a.id and a.DEL_FLAG='0'
+        )
         WHERE
             m.DEL_FLAG = '0'
             AND m.CUSTOMER_ID = #{customerId}
-            AND DATE_FORMAT( m.CREATED_TIME, '%Y%m')= #{monthId}
+            AND DATE_FORMAT( m.CREATED_TIME, '%Y%m' )= #{monthId}
+            and a.CUSTOMER_ID=#{customerId}
+            and a.`STATUS`!='canceled'
+            and a.CATEGORY_CODE='100001'
         GROUP BY
             m.SIGN_USER_ID
     </select>

From 6cf0f40b6df066572bd1d91583bd94c541f7cc2b Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 12 May 2021 15:49:01 +0800
Subject: [PATCH 007/128] =?UTF-8?q?dada=5Faggregator=E5=BC=95=E5=85=A5data?=
 =?UTF-8?q?=5Fstatistical=E6=95=B0=E6=8D=AE=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../constant/DataSourceConstant.java          |  2 ++
 .../data-aggregator-server/pom.xml            | 28 ++++++++++++++++++
 .../controller/DataStatsController.java       | 20 +++++++++++++
 .../dataaggre/dao/datastats/DataStatsDao.java | 29 +++++++++++++++++++
 .../service/datastats/DataStatsService.java   |  9 ++++++
 .../datastats/impl/DataStatsServiceImpl.java  | 22 ++++++++++++++
 .../src/main/resources/bootstrap.yml          |  5 ++++
 .../mapper/datastats/DatsStatsDao.xml         |  7 +++++
 8 files changed, 122 insertions(+)
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java
index 07604c401d..b5395e65b6 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java
@@ -26,4 +26,6 @@ public interface DataSourceConstant {
     String EPMET_COMMON_SERVICE="commonservice";
 
     String OPER_CRM="opercrm";
+
+    String DATA_STATISTICAL="datastatistical";
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml
index 7b74f08a23..604d182cb8 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml
@@ -157,6 +157,13 @@
                 <datasource.druid.opercrm.username>epmet_oper_crm_user</datasource.druid.opercrm.username>
                 <datasource.druid.opercrm.password>EpmEt-db-UsEr</datasource.druid.opercrm.password>
 
+                <!-- data_statistical -->
+                <datasource.druid.opercrm.url>
+                    <![CDATA[jdbc:mysql://192.168.1.130:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.opercrm.url>
+                <datasource.druid.opercrm.username>epmet_data_statistical_user</datasource.druid.opercrm.username>
+                <datasource.druid.opercrm.password>EpmEt-db-UsEr</datasource.druid.opercrm.password>
+
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.130</spring.redis.host>
@@ -238,6 +245,13 @@
                 <datasource.druid.opercrm.username>epmet_oper_crm_user</datasource.druid.opercrm.username>
                 <datasource.druid.opercrm.password>EpmEt-db-UsEr</datasource.druid.opercrm.password>
 
+                <!-- data_statistical -->
+                <datasource.druid.opercrm.url>
+                    <![CDATA[jdbc:mysql://192.168.1.130:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.opercrm.url>
+                <datasource.druid.opercrm.username>epmet_data_statistical_user</datasource.druid.opercrm.username>
+                <datasource.druid.opercrm.password>EpmEt-db-UsEr</datasource.druid.opercrm.password>
+
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.130</spring.redis.host>
@@ -319,6 +333,13 @@
                 <datasource.druid.opercrm.username>epmet</datasource.druid.opercrm.username>
                 <datasource.druid.opercrm.password>elink@833066</datasource.druid.opercrm.password>
 
+                <!-- data_statistical -->
+                <datasource.druid.opercrm.url>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.opercrm.url>
+                <datasource.druid.opercrm.username>epmet_data_statistical_user</datasource.druid.opercrm.username>
+                <datasource.druid.opercrm.password>EpmEt-db-UsEr</datasource.druid.opercrm.password>
+
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
@@ -400,6 +421,13 @@
                 <datasource.druid.opercrm.username>epmet_oper_crm_user</datasource.druid.opercrm.username>
                 <datasource.druid.opercrm.password>EpmEt-db-UsEr</datasource.druid.opercrm.password>
 
+                <!-- data_statistical -->
+                <datasource.druid.opercrm.url>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.opercrm.url>
+                <datasource.druid.opercrm.username>epmet_data_statistical_user</datasource.druid.opercrm.username>
+                <datasource.druid.opercrm.password>EpmEt-db-UsEr</datasource.druid.opercrm.password>
+
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java
new file mode 100644
index 0000000000..2b2abc3b51
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java
@@ -0,0 +1,20 @@
+package com.epmet.dataaggre.controller;
+
+import com.epmet.dataaggre.service.datastats.DataStatsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Author sun
+ * @Description  数据统计服务
+ */
+@RestController
+@RequestMapping("datastats")
+public class DataStatsController {
+
+    @Autowired
+    private DataStatsService dataStatsService;
+
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
new file mode 100644
index 0000000000..475f62cdea
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
@@ -0,0 +1,29 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.dao.datastats;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @Author sun
+ * @Description  数据统计服务
+ */
+@Mapper
+public interface DataStatsDao {
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
new file mode 100644
index 0000000000..fca91d972e
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
@@ -0,0 +1,9 @@
+package com.epmet.dataaggre.service.datastats;
+
+/**
+ * @Author sun
+ * @Description  数据统计服务
+ */
+public interface DataStatsService {
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
new file mode 100644
index 0000000000..d83e73545e
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -0,0 +1,22 @@
+package com.epmet.dataaggre.service.datastats.impl;
+
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.dataaggre.constant.DataSourceConstant;
+import com.epmet.dataaggre.dao.datastats.DataStatsDao;
+import com.epmet.dataaggre.service.datastats.DataStatsService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author sun
+ * @Description  数据统计服务
+ */
+@Service
+@DataSource(DataSourceConstant.DATA_STATISTICAL)
+@Slf4j
+public class DataStatsServiceImpl implements DataStatsService {
+    @Autowired
+    private DataStatsDao dataStatsDao;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml
index 6e27140e97..cd8b7b8ef1 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml
@@ -129,6 +129,11 @@ dynamic:
       url: @datasource.druid.opercrm.url@
       username: @datasource.druid.opercrm.username@
       password: @datasource.druid.opercrm.password@
+    datastatistical:
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      url: @datasource.druid.opercrm.url@
+      username: @datasource.druid.opercrm.username@
+      password: @datasource.druid.opercrm.password@
 feign:
   hystrix:
     enabled: true
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
new file mode 100644
index 0000000000..8360ef814e
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dataaggre.dao.datastats.DataStatsDao">
+
+
+</mapper>
\ No newline at end of file

From bb2b3eede94da2570d885a42aabd6b83a3f42ce4 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 13 May 2021 09:11:35 +0800
Subject: [PATCH 008/128] zancun

---
 .../impl/CalGridIndexServiceImpl.java         | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/CalGridIndexServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/CalGridIndexServiceImpl.java
index fc3c7532d1..474456ec41 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/CalGridIndexServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/CalGridIndexServiceImpl.java
@@ -130,6 +130,11 @@ public class CalGridIndexServiceImpl implements CalGridIndexService {
             });
         }
 
+        // 组织“三会一课”次数 前网格下  满足【未取消的活动 and  签到记录>1 and 活动开始时间在当前时间维度内】 +1
+        // 党员参加“三会一课”人次 :本网格内注册的党员，在本月内活动签到次数
+        Map<String,Integer> createThreeMeetsCountMap=getCreateThreeMeetsCountMap(customerId,monthId);
+        Map<String,Integer> joinThreeMeetsCountMap=getJoinThreeMeetsCountMap(customerId,monthId);
+
         String quarterId = DateUtils.getQuarterId(monthId);
         String yearId = DateUtils.getYearId(monthId);
         result.forEach(r -> {
@@ -217,6 +222,14 @@ public class CalGridIndexServiceImpl implements CalGridIndexService {
                     }
                 });
             }
+            // 组织“三会一课”次数 前网格下  满足【未取消的活动 and  签到记录>1 and 活动开始时间在当前时间维度内】 +1
+            if (createThreeMeetsCountMap.containsKey(r.getGridId())) {
+                r.setCreateThreeMeetsCount(createThreeMeetsCountMap.get(r.getGridId()));
+            }
+            // 党员参加“三会一课”人次 :本网格内注册的党员，在本月内活动签到次数
+            if (joinThreeMeetsCountMap.containsKey(r.getGridId())) {
+                r.setJoinThreeMeetsCount(joinThreeMeetsCountMap.get(r.getGridId()));
+            }
         });
         delPartyAbility(customerId, monthId);
         List<List<PartyAbilityGridMonthlyFormDTO>> partition = ListUtils.partition(result, NumConstant.ONE_HUNDRED);
@@ -226,6 +239,19 @@ public class CalGridIndexServiceImpl implements CalGridIndexService {
         return true;
     }
 
+
+    private Map<String, Integer> getJoinThreeMeetsCountMap(String customerId, String monthId) {
+        // 组织“三会一课”次数 前网格下  满足【未取消的活动 and  签到记录>1 and 活动开始时间在当前时间维度内】 +1
+        //    todo
+        return null;
+    }
+
+    private Map<String, Integer> getCreateThreeMeetsCountMap(String customerId, String monthId) {
+        // 党员参加“三会一课”人次 :本网格内注册的党员，在本月内活动签到次数
+        //    todo
+        return null;
+    }
+
     /**
      * @Description  计算网格指标治理能力
      * @param customerId

From 3b9ca27d03a19872e8ee4851f60feed93c2e8f2c Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 13 May 2021 10:11:06 +0800
Subject: [PATCH 009/128] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=EF=BC=9A=E7=BB=84=E7=BB=87=E2=80=9D=E4=B8=89=E4=BC=9A=E4=B8=80?=
 =?UTF-8?q?=E8=AF=BE=E2=80=9C=E6=AC=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dao/group/GroupDataDao.java     | 10 +++++++
 .../impl/CalGridIndexServiceImpl.java         | 26 ++++++++++++++-----
 .../epmet/service/group/GroupDataService.java | 10 +++++++
 .../group/impl/GroupDataServiceImpl.java      | 13 ++++++++++
 .../resources/mapper/group/GroupDataDao.xml   | 18 +++++++++++++
 5 files changed, 70 insertions(+), 7 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/group/GroupDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/group/GroupDataDao.java
index fae2cfd223..80776d8798 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/group/GroupDataDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/group/GroupDataDao.java
@@ -7,6 +7,7 @@ import com.epmet.dto.group.form.GridGroupTotalFormDTO;
 import com.epmet.dto.group.form.GroupIncrFormDTO;
 import com.epmet.dto.group.result.*;
 import com.epmet.dto.indexcollect.result.CpcIndexCommonDTO;
+import com.epmet.dto.indexcollect.result.GridIndexCommonDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -100,4 +101,13 @@ public interface GroupDataDao {
      * @return com.epmet.dto.indexcollect.result.CpcIndexCommonDTO
      */
     List<CpcIndexCommonDTO> selectUserSignedCount(@Param("customerId")String customerId, @Param("monthId")String monthId);
+
+    /**
+     * 网格相关：组织“三会一课”次数： 当前网格下  满足【未取消的活动 and  签到记录>1 and 活动开始时间在当前时间维度内】 +1
+     *
+     * @param customerId
+     * @param monthId
+     * @return com.epmet.dto.indexcollect.result.CpcIndexCommonDTO
+     */
+    List<GridIndexCommonDTO> selectCountGridCreateThreeMeets(@Param("customerId")String customerId, @Param("monthId")String monthId);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/CalGridIndexServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/CalGridIndexServiceImpl.java
index 474456ec41..ef869f7941 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/CalGridIndexServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/CalGridIndexServiceImpl.java
@@ -8,6 +8,7 @@ import com.epmet.dto.extract.form.GovernAbilityGridMonthlyFormDTO;
 import com.epmet.dto.extract.form.GridIssueCountResultDTO;
 import com.epmet.dto.extract.form.PartyAbilityGridMonthlyFormDTO;
 import com.epmet.dto.extract.result.*;
+import com.epmet.dto.indexcollect.result.GridIndexCommonDTO;
 import com.epmet.entity.evaluationindex.indexcoll.FactIndexServiceAblityGridMonthlyEntity;
 import com.epmet.service.evaluationindex.extract.dataToIndex.CalGridIndexService;
 import com.epmet.service.evaluationindex.extract.todata.*;
@@ -15,6 +16,7 @@ import com.epmet.service.evaluationindex.indexcoll.FactIndexGovrnAblityOrgMonthl
 import com.epmet.service.evaluationindex.indexcoll.FactIndexPartyAblityOrgMonthlyService;
 import com.epmet.service.evaluationindex.indexcoll.FactIndexServiceAblityGridMonthlyService;
 import com.epmet.service.evaluationindex.screen.ScreenCustomerGridService;
+import com.epmet.service.group.GroupDataService;
 import com.epmet.service.heart.ActInfoService;
 import com.epmet.service.partymember.PartyMemberService;
 import com.epmet.service.stats.FactArticlePublishedGridDailyService;
@@ -29,7 +31,10 @@ import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
 import java.text.NumberFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
@@ -71,6 +76,8 @@ public class CalGridIndexServiceImpl implements CalGridIndexService {
     private PartyMemberService partyMemberService;
     @Autowired
     private ScreenCustomerGridService gridService;
+    @Autowired
+    private GroupDataService groupDataService;
 
     /**
      * @Description  计算网格指标党建能力
@@ -131,8 +138,8 @@ public class CalGridIndexServiceImpl implements CalGridIndexService {
         }
 
         // 组织“三会一课”次数 前网格下  满足【未取消的活动 and  签到记录>1 and 活动开始时间在当前时间维度内】 +1
-        // 党员参加“三会一课”人次 :本网格内注册的党员，在本月内活动签到次数
         Map<String,Integer> createThreeMeetsCountMap=getCreateThreeMeetsCountMap(customerId,monthId);
+        // 党员参加“三会一课”人次 :本网格内注册的党员，在本月内活动签到次数
         Map<String,Integer> joinThreeMeetsCountMap=getJoinThreeMeetsCountMap(customerId,monthId);
 
         String quarterId = DateUtils.getQuarterId(monthId);
@@ -239,19 +246,24 @@ public class CalGridIndexServiceImpl implements CalGridIndexService {
         return true;
     }
 
-
-    private Map<String, Integer> getJoinThreeMeetsCountMap(String customerId, String monthId) {
+    private Map<String, Integer> getCreateThreeMeetsCountMap(String customerId, String monthId) {
         // 组织“三会一课”次数 前网格下  满足【未取消的活动 and  签到记录>1 and 活动开始时间在当前时间维度内】 +1
-        //    todo
-        return null;
+        //查询小组活动签到表，计算用户在本月内签到的活动次数
+        List<GridIndexCommonDTO> list=groupDataService.selectCountGridCreateThreeMeets(customerId,monthId);
+        Map<String, Integer> resultMap = new HashMap<>();
+        for (GridIndexCommonDTO gridIndexCommonDTO : list) {
+            resultMap.put(gridIndexCommonDTO.getGridId(), gridIndexCommonDTO.getIndexValue());
+        }
+        return resultMap;
     }
 
-    private Map<String, Integer> getCreateThreeMeetsCountMap(String customerId, String monthId) {
+    private Map<String, Integer> getJoinThreeMeetsCountMap(String customerId, String monthId) {
         // 党员参加“三会一课”人次 :本网格内注册的党员，在本月内活动签到次数
         //    todo
         return null;
     }
 
+
     /**
      * @Description  计算网格指标治理能力
      * @param customerId
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/GroupDataService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/GroupDataService.java
index 6be5b22324..b1a07d9941 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/GroupDataService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/GroupDataService.java
@@ -3,6 +3,7 @@ package com.epmet.service.group;
 import com.epmet.dto.extract.FactOriginGroupMainDailyDTO;
 import com.epmet.dto.group.result.*;
 import com.epmet.dto.indexcollect.result.CpcIndexCommonDTO;
+import com.epmet.dto.indexcollect.result.GridIndexCommonDTO;
 import com.epmet.util.DimIdGenerator;
 import org.apache.ibatis.annotations.Param;
 
@@ -75,4 +76,13 @@ public interface GroupDataService {
      * @return com.epmet.dto.indexcollect.result.CpcIndexCommonDTO
      */
     List<CpcIndexCommonDTO> selectJoinThreeMeetsCount(String customerId, String monthId);
+
+    /**
+     * 网格相关：组织“三会一课”次数： 当前网格下  满足【未取消的活动 and  签到记录>1 and 活动开始时间在当前时间维度内】 +1
+     *
+     * @param customerId
+     * @param monthId
+     * @return com.epmet.dto.indexcollect.result.CpcIndexCommonDTO
+     */
+    List<GridIndexCommonDTO> selectCountGridCreateThreeMeets(String customerId, String monthId);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java
index 550c0d73e8..d0a87ed295 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java
@@ -11,6 +11,7 @@ import com.epmet.dto.group.form.GridGroupTotalFormDTO;
 import com.epmet.dto.group.form.GroupIncrFormDTO;
 import com.epmet.dto.group.result.*;
 import com.epmet.dto.indexcollect.result.CpcIndexCommonDTO;
+import com.epmet.dto.indexcollect.result.GridIndexCommonDTO;
 import com.epmet.service.group.GroupDataService;
 import com.epmet.util.DimIdGenerator;
 import org.springframework.beans.BeanUtils;
@@ -222,5 +223,17 @@ public class GroupDataServiceImpl implements GroupDataService {
         return groupDataDao.selectUserSignedCount(customerId,monthId);
     }
 
+    /**
+     * 网格相关：组织“三会一课”次数： 当前网格下  满足【未取消的活动 and  签到记录>1 and 活动开始时间在当前时间维度内】 +1
+     *
+     * @param customerId
+     * @param monthId
+     * @return com.epmet.dto.indexcollect.result.CpcIndexCommonDTO
+     */
+    @Override
+    public List<GridIndexCommonDTO> selectCountGridCreateThreeMeets(String customerId, String monthId) {
+        return groupDataDao.selectCountGridCreateThreeMeets(customerId,monthId);
+    }
+
 
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml
index a5de0e01ab..d8ed5a56df 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml
@@ -234,4 +234,22 @@
         GROUP BY
             m.SIGN_USER_ID
     </select>
+
+    <!--  网格相关：组织三会一课次数 -->
+    <select id="selectCountGridCreateThreeMeets" parameterType="map" resultType="com.epmet.dto.indexcollect.result.GridIndexCommonDTO">
+        SELECT
+            ga.GRID_ID as gridId,
+            count( 1 ) as indexValue
+        FROM
+            group_act_info ga
+        WHERE
+            ga.DEL_FLAG = '0'
+            AND ga.`STATUS` != 'canceled'
+            AND ga.CUSTOMER_ID = #{customerId}
+            AND DATE_FORMAT( ga.START_TIME, '%Y%m' )= #{monthId}
+            AND ga.SIGNED_IN_NUM > 0
+            AND ga.CATEGORY_CODE = '100001'
+        GROUP BY
+            ga.GRID_ID
+    </select>
 </mapper>
\ No newline at end of file

From 827b66b4cc7353af00361e04e1e7a90f3b46b6d4 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Thu, 13 May 2021 10:47:02 +0800
Subject: [PATCH 010/128] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E6=88=90=E5=91=98?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=98=AF=E5=90=A6=E5=85=9A=E5=91=98=E8=BA=AB?=
 =?UTF-8?q?=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FactOriginGroupMemberDailyDTO.java        | 146 ++++++++++++++
 .../FactAgencyOriginProjectDailyDTO.java      | 187 ++++++++++++++++++
 .../FactAgencyOriginProjectMonthlyDTO.java    | 172 ++++++++++++++++
 .../FactOriginExtractController.java          |   4 +-
 .../FactOriginGroupMemberDailyDao.java        |  33 ++++
 .../FactAgencyOriginProjectDailyDao.java      |  33 ++++
 .../FactAgencyOriginProjectMonthlyDao.java    |  33 ++++
 .../FactOriginGroupMemberDailyEntity.java     | 116 +++++++++++
 .../FactAgencyOriginProjectDailyEntity.java   | 157 +++++++++++++++
 .../FactAgencyOriginProjectMonthlyEntity.java | 142 +++++++++++++
 .../FactOriginGroupMainDailyService.java      |   3 +-
 .../FactOriginGroupMemberDailyService.java    |  95 +++++++++
 .../FactOriginGroupMainDailyServiceImpl.java  |  18 +-
 ...FactOriginGroupMemberDailyServiceImpl.java | 101 ++++++++++
 .../todata/impl/GroupExtractServiceImpl.java  |   7 +-
 .../FactAgencyOriginProjectDailyService.java  |  95 +++++++++
 ...FactAgencyOriginProjectMonthlyService.java |  95 +++++++++
 ...ctAgencyOriginProjectDailyServiceImpl.java | 101 ++++++++++
 ...AgencyOriginProjectMonthlyServiceImpl.java | 101 ++++++++++
 .../extract/FactOriginGroupMemberDailyDao.xml |  32 +++
 .../stats/FactAgencyOriginProjectDailyDao.xml |  40 ++++
 .../FactAgencyOriginProjectMonthlyDao.xml     |  37 ++++
 22 files changed, 1740 insertions(+), 8 deletions(-)
 create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactOriginGroupMemberDailyDTO.java
 create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactAgencyOriginProjectDailyDTO.java
 create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactAgencyOriginProjectMonthlyDTO.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginGroupMemberDailyDao.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactAgencyOriginProjectDailyDao.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactAgencyOriginProjectMonthlyDao.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginGroupMemberDailyEntity.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactAgencyOriginProjectDailyEntity.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactAgencyOriginProjectMonthlyEntity.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginGroupMemberDailyService.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginGroupMemberDailyServiceImpl.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactAgencyOriginProjectDailyService.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactAgencyOriginProjectMonthlyService.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactAgencyOriginProjectDailyServiceImpl.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactAgencyOriginProjectMonthlyServiceImpl.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMemberDailyDao.xml
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactAgencyOriginProjectDailyDao.xml
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactAgencyOriginProjectMonthlyDao.xml

diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactOriginGroupMemberDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactOriginGroupMemberDailyDTO.java
new file mode 100644
index 0000000000..42ec5cd2b7
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactOriginGroupMemberDailyDTO.java
@@ -0,0 +1,146 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.extract;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-12
+ */
+@Data
+public class FactOriginGroupMemberDailyDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 组Id
+     */
+	private String groupId;
+
+    /**
+     * 小组所在的网格id
+     */
+	private String gridId;
+
+    /**
+     * 小组所在的社区id
+     */
+	private String agencyId;
+
+    /**
+     * 小组所在的街道id
+     */
+	private String parentId;
+
+    /**
+     * 所有上级组织ID,英文:隔开
+     */
+	private String pids;
+
+    /**
+     * 成员Id（userId）
+     */
+	private String memberId;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * leader(群主)  member(成员)
+     */
+	private String leaderFlag;
+
+    /**
+     * 入群审核通过或自动加入群的日期 yyyyMMdd
+     */
+	private String dateId;
+
+    /**
+     * 入群周 2020W15
+     */
+	private String weekId;
+
+    /**
+     * 入群月 202004
+     */
+	private String monthId;
+
+    /**
+     * 入群季 2020Q2
+     */
+	private String quarterId;
+
+    /**
+     * 入群年 2020
+     */
+	private String yearId;
+
+    /**
+     * join（入群），群主建群自己入群也是join
+     */
+	private String actionCode;
+
+    /**
+     * 是否是党员
+     */
+	private Integer isParty;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 删除标识
+     */
+	private String delFlag;
+
+    /**
+     * 
+     */
+	private String createdBy;
+
+    /**
+     * 
+     */
+	private Date createdTime;
+
+    /**
+     * 
+     */
+	private String updatedBy;
+
+    /**
+     * 
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactAgencyOriginProjectDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactAgencyOriginProjectDailyDTO.java
new file mode 100644
index 0000000000..89809107e2
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactAgencyOriginProjectDailyDTO.java
@@ -0,0 +1,187 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.stats;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 机关下日项目数据统计 存放机关下截止到当前日期的各项总数据以及昨日新增各项数据，每日定时执行，先删后增
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-12
+ */
+@Data
+public class FactAgencyOriginProjectDailyDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一标识
+     */
+	private String id;
+
+    /**
+     * 客户Id 【dim_customer.id】
+     */
+	private String customerId;
+
+    /**
+     * 机关Id 【dim_agency.id】
+     */
+	private String agencyId;
+
+    /**
+     * 上级组织Id【dim_agency.pid】
+     */
+	private String parentId;
+
+    /**
+     * 日维度Id 【dim_date.id】
+     */
+	private String dateId;
+
+    /**
+     * 周维度Id 【dim_week.id】
+     */
+	private String weekId;
+
+    /**
+     * 月维度Id 【dim_month.id】
+     */
+	private String monthId;
+
+    /**
+     * 季度ID
+     */
+	private String quarterId;
+
+    /**
+     * 年维度Id 【dim_year.id】
+     */
+	private String yearId;
+
+    /**
+     * 项目来源 来源：议题issue 组织agency
+     */
+	private String origin;
+
+    /**
+     * 截止当日项目总数 【当前组织及下级项目总数】
+     */
+	private Integer projectTotal;
+
+    /**
+     * 截止当日处理中项目数 【当前组织及下级所有未结案项目总数】
+     */
+	private Integer pendingTotal;
+
+    /**
+     * 截止当日处理中项目占比 【当前组织及下级未结案项目百分比（存百分比数，小数点后两位）】
+     */
+	private BigDecimal pendingRatio;
+
+    /**
+     * 截止当日已结案项目数 【当前组织及下级已结案项目总数】
+     */
+	private Integer closedTotal;
+
+    /**
+     * 截止当日已结案项目占比 【当前组织及下级已结案项目百分比（存百分比数，小数点后两位）】
+     */
+	private BigDecimal closedRatio;
+
+    /**
+     * 截止当日已结案中已解决项目数 【当前组织及下级已结案项目中已解决总数】
+     */
+	private Integer resolvedTotal;
+
+    /**
+     * 截止当日已结案中已解决项目占比 【当前组织及下级已结案项目中已解决占比】
+     */
+	private BigDecimal resolvedRatio;
+
+    /**
+     * 截止当日已结案中未解决项目数 【当前组织及下级已结案项目中未解决总数】
+     */
+	private Integer unresolvedTotal;
+
+    /**
+     * 截止当日已结案中未解决项目占比 【当前组织及下级已结案项目中未解决占比】
+     */
+	private BigDecimal unresolvedRatio;
+
+    /**
+     * 当日项目总数 【当前组织及下级项目总数】
+     */
+	private Integer projectIncr;
+
+    /**
+     * 当日处理中项目数 【当前组织及下级前一日新增处理中项目数】
+     */
+	private Integer pendingIncr;
+
+    /**
+     * 当日已结案项目数 【当前组织及下级前一日新增结案项目数】
+     */
+	private Integer closedIncr;
+
+    /**
+     * 当日已结案项目中已解决数 【当前组织及下级前一日新增结案中已解决项目数】
+     */
+	private Integer resolvedIncr;
+
+    /**
+     * 当日已结案项目组未解决数 【当前组织及下级前一日新增结案中未解决项目数】
+     */
+	private Integer unresolvedIncr;
+
+    /**
+     * 删除标识 【0.未删除 1.已删除】
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactAgencyOriginProjectMonthlyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactAgencyOriginProjectMonthlyDTO.java
new file mode 100644
index 0000000000..b35d5f30dc
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactAgencyOriginProjectMonthlyDTO.java
@@ -0,0 +1,172 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.stats;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 机关下月项目数据统计 存放机关下截止到当前月份的各项总数据以及上月新增各项数据，每月月初定时执行，先删后增
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-12
+ */
+@Data
+public class FactAgencyOriginProjectMonthlyDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一标识
+     */
+	private String id;
+
+    /**
+     * 客户Id 【dim_customer.id】
+     */
+	private String customerId;
+
+    /**
+     * 机关Id 【dim_agency.id】
+     */
+	private String agencyId;
+
+    /**
+     * 上级组织Id【dim_agency.pid】
+     */
+	private String parentId;
+
+    /**
+     * 月维度Id 【dim_month.id】
+     */
+	private String monthId;
+
+    /**
+     * 季维度Id 【dim_quarter.id】
+     */
+	private String quarterId;
+
+    /**
+     * 年维度Id 【dim_year.id】
+     */
+	private String yearId;
+
+    /**
+     * 截止当月项目总数 【当前组织及下级项目总数】
+     */
+	private Integer projectTotal;
+
+    /**
+     * 截止当月处理中项目数 【当前组织及下级所有未结案项目总数】
+     */
+	private Integer pendingTotal;
+
+    /**
+     * 截止当月处理中项目占比 【当前组织及下级未结案项目百分比（存百分比数，小数点后两位）】
+     */
+	private BigDecimal pendingRatio;
+
+    /**
+     * 截止当月已结案项目数 【当前组织及下级已结案项目总数】
+     */
+	private Integer closedTotal;
+
+    /**
+     * 截止当月已结案项目占比 【当前组织及下级已结案项目百分比（存百分比数，小数点后两位）】
+     */
+	private BigDecimal closedRatio;
+
+    /**
+     * 截止当月已结案中已解决项目数 【当前组织及下级已结案项目中已解决总数】
+     */
+	private Integer resolvedTotal;
+
+    /**
+     * 截止当月已结案中已解决项目占比 【当前组织及下级已结案项目中已解决占比】
+     */
+	private BigDecimal resolvedRatio;
+
+    /**
+     * 截止当月已结案中未解决项目数 【当前组织及下级已结案项目中未解决总数】
+     */
+	private Integer unresolvedTotal;
+
+    /**
+     * 截止当月已结案中未解决项目占比 【当前组织及下级已结案项目中未解决占比】
+     */
+	private BigDecimal unresolvedRatio;
+
+    /**
+     * 当月项目总数 【当前组织及下级前一月新增项目数】
+     */
+	private Integer projectIncr;
+
+    /**
+     * 当月处理中项目数 【当前组织及下级前一月新增处理中项目数】
+     */
+	private Integer pendingIncr;
+
+    /**
+     * 当月已结案项目数 【当前组织及下级前一月新增结案项目数】
+     */
+	private Integer closedIncr;
+
+    /**
+     * 当月已结案项目中已解决数 【当前组织及下级前一日新增结案中已解决项目数】
+     */
+	private Integer resolvedIncr;
+
+    /**
+     * 当月已结案项目组未解决数 【当前组织及下级前一日新增结案中未解决项目数】
+     */
+	private Integer unresolvedIncr;
+
+    /**
+     * 删除标识 【0.未删除 1.已删除】
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git 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
index 9542bdc580..2cce1d4a19 100644
--- 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
@@ -126,7 +126,9 @@ public class FactOriginExtractController {
                 paramNew.setDateId(dateDimId);
                 groupExtractService.extractGroupData(paramNew);
             }
-        }else groupExtractService.extractGroupData(param);
+        }else {
+            groupExtractService.extractGroupData(param);
+        }
         return new Result();
     }
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginGroupMemberDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginGroupMemberDailyDao.java
new file mode 100644
index 0000000000..662f2a14c5
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginGroupMemberDailyDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.evaluationindex.extract;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.evaluationindex.extract.FactOriginGroupMemberDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-12
+ */
+@Mapper
+public interface FactOriginGroupMemberDailyDao extends BaseDao<FactOriginGroupMemberDailyEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactAgencyOriginProjectDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactAgencyOriginProjectDailyDao.java
new file mode 100644
index 0000000000..6428ba8104
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactAgencyOriginProjectDailyDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.stats;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.stats.FactAgencyOriginProjectDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 机关下日项目数据统计 存放机关下截止到当前日期的各项总数据以及昨日新增各项数据，每日定时执行，先删后增
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-12
+ */
+@Mapper
+public interface FactAgencyOriginProjectDailyDao extends BaseDao<FactAgencyOriginProjectDailyEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactAgencyOriginProjectMonthlyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactAgencyOriginProjectMonthlyDao.java
new file mode 100644
index 0000000000..2848f6e90b
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactAgencyOriginProjectMonthlyDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.stats;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.stats.FactAgencyOriginProjectMonthlyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 机关下月项目数据统计 存放机关下截止到当前月份的各项总数据以及上月新增各项数据，每月月初定时执行，先删后增
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-12
+ */
+@Mapper
+public interface FactAgencyOriginProjectMonthlyDao extends BaseDao<FactAgencyOriginProjectMonthlyEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginGroupMemberDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginGroupMemberDailyEntity.java
new file mode 100644
index 0000000000..97317f5868
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginGroupMemberDailyEntity.java
@@ -0,0 +1,116 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.evaluationindex.extract;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-12
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("fact_origin_group_member_daily")
+public class FactOriginGroupMemberDailyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 组Id
+     */
+	private String groupId;
+
+    /**
+     * 小组所在的网格id
+     */
+	private String gridId;
+
+    /**
+     * 小组所在的社区id
+     */
+	private String agencyId;
+
+    /**
+     * 小组所在的街道id
+     */
+	private String parentId;
+
+    /**
+     * 所有上级组织ID,英文:隔开
+     */
+	private String pids;
+
+    /**
+     * 成员Id（userId）
+     */
+	private String memberId;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * leader(群主)  member(成员)
+     */
+	private String leaderFlag;
+
+    /**
+     * 入群审核通过或自动加入群的日期 yyyyMMdd
+     */
+	private String dateId;
+
+    /**
+     * 入群周 2020W15
+     */
+	private String weekId;
+
+    /**
+     * 入群月 202004
+     */
+	private String monthId;
+
+    /**
+     * 入群季 2020Q2
+     */
+	private String quarterId;
+
+    /**
+     * 入群年 2020
+     */
+	private String yearId;
+
+    /**
+     * join（入群），群主建群自己入群也是join
+     */
+	private String actionCode;
+
+    /**
+     * 是否是党员
+     */
+	private Integer isParty;
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactAgencyOriginProjectDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactAgencyOriginProjectDailyEntity.java
new file mode 100644
index 0000000000..cb239df727
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactAgencyOriginProjectDailyEntity.java
@@ -0,0 +1,157 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.stats;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 机关下日项目数据统计 存放机关下截止到当前日期的各项总数据以及昨日新增各项数据，每日定时执行，先删后增
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-12
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("fact_agency_origin_project_daily")
+public class FactAgencyOriginProjectDailyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id 【dim_customer.id】
+     */
+	private String customerId;
+
+    /**
+     * 机关Id 【dim_agency.id】
+     */
+	private String agencyId;
+
+    /**
+     * 上级组织Id【dim_agency.pid】
+     */
+	private String parentId;
+
+    /**
+     * 日维度Id 【dim_date.id】
+     */
+	private String dateId;
+
+    /**
+     * 周维度Id 【dim_week.id】
+     */
+	private String weekId;
+
+    /**
+     * 月维度Id 【dim_month.id】
+     */
+	private String monthId;
+
+    /**
+     * 季度ID
+     */
+	private String quarterId;
+
+    /**
+     * 年维度Id 【dim_year.id】
+     */
+	private String yearId;
+
+    /**
+     * 项目来源 来源：议题issue 组织agency
+     */
+	private String origin;
+
+    /**
+     * 截止当日项目总数 【当前组织及下级项目总数】
+     */
+	private Integer projectTotal;
+
+    /**
+     * 截止当日处理中项目数 【当前组织及下级所有未结案项目总数】
+     */
+	private Integer pendingTotal;
+
+    /**
+     * 截止当日处理中项目占比 【当前组织及下级未结案项目百分比（存百分比数，小数点后两位）】
+     */
+	private BigDecimal pendingRatio;
+
+    /**
+     * 截止当日已结案项目数 【当前组织及下级已结案项目总数】
+     */
+	private Integer closedTotal;
+
+    /**
+     * 截止当日已结案项目占比 【当前组织及下级已结案项目百分比（存百分比数，小数点后两位）】
+     */
+	private BigDecimal closedRatio;
+
+    /**
+     * 截止当日已结案中已解决项目数 【当前组织及下级已结案项目中已解决总数】
+     */
+	private Integer resolvedTotal;
+
+    /**
+     * 截止当日已结案中已解决项目占比 【当前组织及下级已结案项目中已解决占比】
+     */
+	private BigDecimal resolvedRatio;
+
+    /**
+     * 截止当日已结案中未解决项目数 【当前组织及下级已结案项目中未解决总数】
+     */
+	private Integer unresolvedTotal;
+
+    /**
+     * 截止当日已结案中未解决项目占比 【当前组织及下级已结案项目中未解决占比】
+     */
+	private BigDecimal unresolvedRatio;
+
+    /**
+     * 当日项目总数 【当前组织及下级项目总数】
+     */
+	private Integer projectIncr;
+
+    /**
+     * 当日处理中项目数 【当前组织及下级前一日新增处理中项目数】
+     */
+	private Integer pendingIncr;
+
+    /**
+     * 当日已结案项目数 【当前组织及下级前一日新增结案项目数】
+     */
+	private Integer closedIncr;
+
+    /**
+     * 当日已结案项目中已解决数 【当前组织及下级前一日新增结案中已解决项目数】
+     */
+	private Integer resolvedIncr;
+
+    /**
+     * 当日已结案项目组未解决数 【当前组织及下级前一日新增结案中未解决项目数】
+     */
+	private Integer unresolvedIncr;
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactAgencyOriginProjectMonthlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactAgencyOriginProjectMonthlyEntity.java
new file mode 100644
index 0000000000..2acda24617
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactAgencyOriginProjectMonthlyEntity.java
@@ -0,0 +1,142 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.stats;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 机关下月项目数据统计 存放机关下截止到当前月份的各项总数据以及上月新增各项数据，每月月初定时执行，先删后增
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-12
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("fact_agency_origin_project_monthly")
+public class FactAgencyOriginProjectMonthlyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id 【dim_customer.id】
+     */
+	private String customerId;
+
+    /**
+     * 机关Id 【dim_agency.id】
+     */
+	private String agencyId;
+
+    /**
+     * 上级组织Id【dim_agency.pid】
+     */
+	private String parentId;
+
+    /**
+     * 月维度Id 【dim_month.id】
+     */
+	private String monthId;
+
+    /**
+     * 季维度Id 【dim_quarter.id】
+     */
+	private String quarterId;
+
+    /**
+     * 年维度Id 【dim_year.id】
+     */
+	private String yearId;
+
+    /**
+     * 截止当月项目总数 【当前组织及下级项目总数】
+     */
+	private Integer projectTotal;
+
+    /**
+     * 截止当月处理中项目数 【当前组织及下级所有未结案项目总数】
+     */
+	private Integer pendingTotal;
+
+    /**
+     * 截止当月处理中项目占比 【当前组织及下级未结案项目百分比（存百分比数，小数点后两位）】
+     */
+	private BigDecimal pendingRatio;
+
+    /**
+     * 截止当月已结案项目数 【当前组织及下级已结案项目总数】
+     */
+	private Integer closedTotal;
+
+    /**
+     * 截止当月已结案项目占比 【当前组织及下级已结案项目百分比（存百分比数，小数点后两位）】
+     */
+	private BigDecimal closedRatio;
+
+    /**
+     * 截止当月已结案中已解决项目数 【当前组织及下级已结案项目中已解决总数】
+     */
+	private Integer resolvedTotal;
+
+    /**
+     * 截止当月已结案中已解决项目占比 【当前组织及下级已结案项目中已解决占比】
+     */
+	private BigDecimal resolvedRatio;
+
+    /**
+     * 截止当月已结案中未解决项目数 【当前组织及下级已结案项目中未解决总数】
+     */
+	private Integer unresolvedTotal;
+
+    /**
+     * 截止当月已结案中未解决项目占比 【当前组织及下级已结案项目中未解决占比】
+     */
+	private BigDecimal unresolvedRatio;
+
+    /**
+     * 当月项目总数 【当前组织及下级前一月新增项目数】
+     */
+	private Integer projectIncr;
+
+    /**
+     * 当月处理中项目数 【当前组织及下级前一月新增处理中项目数】
+     */
+	private Integer pendingIncr;
+
+    /**
+     * 当月已结案项目数 【当前组织及下级前一月新增结案项目数】
+     */
+	private Integer closedIncr;
+
+    /**
+     * 当月已结案项目中已解决数 【当前组织及下级前一日新增结案中已解决项目数】
+     */
+	private Integer resolvedIncr;
+
+    /**
+     * 当月已结案项目组未解决数 【当前组织及下级前一日新增结案中未解决项目数】
+     */
+	private Integer unresolvedIncr;
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginGroupMainDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginGroupMainDailyService.java
index 9b4350b1fb..21d55ac87e 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginGroupMainDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginGroupMainDailyService.java
@@ -64,7 +64,8 @@ public interface FactOriginGroupMainDailyService extends BaseService<FactOriginG
      * @author wangc
      * @date 2020.09.23 16:30
     **/
-    boolean insertExtractedData(boolean isFirst, String customerId, String dateId, List<FactOriginGroupMainDailyDTO> originGroupData, List<ExtractGroupMemberActionRecordResultDTO> memberList, List<String> missing);
+    boolean insertExtractedData(boolean isFirst, String customerId, String dateId, List<FactOriginGroupMainDailyDTO> originGroupData,
+                                List<ExtractGroupMemberActionRecordResultDTO> memberList, List<String> missing, List<String> partyIds);
 
     /**
      * @param customerId
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginGroupMemberDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginGroupMemberDailyService.java
new file mode 100644
index 0000000000..618c340d66
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginGroupMemberDailyService.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.evaluationindex.extract.todata;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.extract.FactOriginGroupMemberDailyDTO;
+import com.epmet.entity.evaluationindex.extract.FactOriginGroupMemberDailyEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-12
+ */
+public interface FactOriginGroupMemberDailyService extends BaseService<FactOriginGroupMemberDailyEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<FactOriginGroupMemberDailyDTO>
+     * @author generator
+     * @date 2021-05-12
+     */
+    PageData<FactOriginGroupMemberDailyDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<FactOriginGroupMemberDailyDTO>
+     * @author generator
+     * @date 2021-05-12
+     */
+    List<FactOriginGroupMemberDailyDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return FactOriginGroupMemberDailyDTO
+     * @author generator
+     * @date 2021-05-12
+     */
+    FactOriginGroupMemberDailyDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-05-12
+     */
+    void save(FactOriginGroupMemberDailyDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-05-12
+     */
+    void update(FactOriginGroupMemberDailyDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-05-12
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginGroupMainDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginGroupMainDailyServiceImpl.java
index 718a045131..d7819f31b1 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginGroupMainDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginGroupMainDailyServiceImpl.java
@@ -18,15 +18,21 @@
 package com.epmet.service.evaluationindex.extract.todata.impl;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dao.evaluationindex.extract.FactOriginGroupMainDailyDao;
+import com.epmet.dao.evaluationindex.extract.FactOriginGroupMemberDailyDao;
 import com.epmet.dto.extract.FactOriginGroupMainDailyDTO;
 import com.epmet.dto.extract.form.ScreenPartyLinkMassesDataFormDTO;
 import com.epmet.dto.extract.result.GridGroupUserCountResultDTO;
 import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
 import com.epmet.dto.group.result.ExtractGroupMemberActionRecordResultDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginGroupMainDailyEntity;
+import com.epmet.entity.evaluationindex.extract.FactOriginGroupMemberDailyEntity;
 import com.epmet.service.evaluationindex.extract.todata.FactOriginGroupMainDailyService;
+import com.epmet.service.evaluationindex.extract.todata.FactOriginGroupMemberDailyService;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -45,6 +51,8 @@ import java.util.stream.Collectors;
 @Service
 public class FactOriginGroupMainDailyServiceImpl extends BaseServiceImpl<FactOriginGroupMainDailyDao, FactOriginGroupMainDailyEntity> implements FactOriginGroupMainDailyService {
 
+    @Autowired
+    private FactOriginGroupMemberDailyService factOriginGroupMemberDailyService;
 
     /**
      * @return java.util.List<java.lang.String>
@@ -84,7 +92,7 @@ public class FactOriginGroupMainDailyServiceImpl extends BaseServiceImpl<FactOri
      **/
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean insertExtractedData(boolean isFirst, String customerId, String dateId,List<FactOriginGroupMainDailyDTO> originGroupData, List<ExtractGroupMemberActionRecordResultDTO> memberList,List<String> missing) {
+    public boolean insertExtractedData(boolean isFirst, String customerId, String dateId,List<FactOriginGroupMainDailyDTO> originGroupData, List<ExtractGroupMemberActionRecordResultDTO> memberList,List<String> missing, List<String> partyIds) {
         if(!CollectionUtils.isEmpty(originGroupData)) {
             if (isFirst) {
                 //isFirst
@@ -96,9 +104,15 @@ public class FactOriginGroupMainDailyServiceImpl extends BaseServiceImpl<FactOri
             }
             //删除要插入的组主表数据
             baseDao.deleteBatchByGroupId(customerId, originGroupData.stream().map(FactOriginGroupMainDailyDTO::getId).distinct().collect(Collectors.toList()));
+            List<FactOriginGroupMemberDailyEntity> members = ConvertUtils.sourceToTarget(memberList, FactOriginGroupMemberDailyEntity.class);
+            members.forEach(item -> {
+                if (partyIds.contains(item.getMemberId())) {
+                    item.setIsParty(NumConstant.ONE);
+                }
+            });
 
             baseDao.insertBatchMain(originGroupData);
-            baseDao.insertBatchMembers(memberList);
+            factOriginGroupMemberDailyService.insertBatch(members);
         }
         if(!CollectionUtils.isEmpty(missing)){
             baseDao.deleteBatchByGroupId(customerId,missing);
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginGroupMemberDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginGroupMemberDailyServiceImpl.java
new file mode 100644
index 0000000000..aea9baa4bc
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginGroupMemberDailyServiceImpl.java
@@ -0,0 +1,101 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.evaluationindex.extract.todata.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dao.evaluationindex.extract.FactOriginGroupMemberDailyDao;
+import com.epmet.dto.extract.FactOriginGroupMemberDailyDTO;
+import com.epmet.entity.evaluationindex.extract.FactOriginGroupMemberDailyEntity;
+import com.epmet.service.evaluationindex.extract.todata.FactOriginGroupMemberDailyService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-12
+ */
+@Service
+public class FactOriginGroupMemberDailyServiceImpl extends BaseServiceImpl<FactOriginGroupMemberDailyDao, FactOriginGroupMemberDailyEntity> implements FactOriginGroupMemberDailyService {
+
+
+    @Override
+    public PageData<FactOriginGroupMemberDailyDTO> page(Map<String, Object> params) {
+        IPage<FactOriginGroupMemberDailyEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, FactOriginGroupMemberDailyDTO.class);
+    }
+
+    @Override
+    public List<FactOriginGroupMemberDailyDTO> list(Map<String, Object> params) {
+        List<FactOriginGroupMemberDailyEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, FactOriginGroupMemberDailyDTO.class);
+    }
+
+    private QueryWrapper<FactOriginGroupMemberDailyEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<FactOriginGroupMemberDailyEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public FactOriginGroupMemberDailyDTO get(String id) {
+        FactOriginGroupMemberDailyEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, FactOriginGroupMemberDailyDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(FactOriginGroupMemberDailyDTO dto) {
+        FactOriginGroupMemberDailyEntity entity = ConvertUtils.sourceToTarget(dto, FactOriginGroupMemberDailyEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(FactOriginGroupMemberDailyDTO dto) {
+        FactOriginGroupMemberDailyEntity entity = ConvertUtils.sourceToTarget(dto, FactOriginGroupMemberDailyEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/GroupExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/GroupExtractServiceImpl.java
index 6f6451114d..209588d464 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/GroupExtractServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/GroupExtractServiceImpl.java
@@ -89,7 +89,7 @@ public class GroupExtractServiceImpl implements GroupExtractService {
         List<ExtractGroupMemberActionRecordResultDTO> memberList = new LinkedList<>();
         if (!CollectionUtils.isEmpty(originGroupData)) {
         List<GridAttributesResultDTO> gridList = dimGridService.getGridAttributes(param.getCustomerId(),null);
-
+        List<String> partyIds = userService.getPartymembersByCustomerId(param.getCustomerId());
         if (!CollectionUtils.isEmpty(gridList)) {
             Map<String, GridAttributesResultDTO> gridMap =
                     gridList.stream().collect(Collectors.toMap(GridAttributesResultDTO::getGridId, Function.identity(), (key1, key2) -> key2));
@@ -166,14 +166,13 @@ public class GroupExtractServiceImpl implements GroupExtractService {
                     param.getDateId(),
                     originGroupData,
                     memberList,
-                    missingGroups
+                    missingGroups,
+                    partyIds
             );
 
 
         }
 
-
-        List<String> partyIds = userService.getPartymembersByCustomerId(param.getCustomerId());
         List<GridHeartedFormDTO> heartedIds = userService.getWarmHeartedByCustomerId(param.getCustomerId());
         if(!partyIds.isEmpty()) {
             factOriginGroupMainDailyDao.updatePartyFlag(partyIds, param.getCustomerId());
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactAgencyOriginProjectDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactAgencyOriginProjectDailyService.java
new file mode 100644
index 0000000000..6a3e24b5f6
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactAgencyOriginProjectDailyService.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.stats;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.stats.FactAgencyOriginProjectDailyDTO;
+import com.epmet.entity.stats.FactAgencyOriginProjectDailyEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 机关下日项目数据统计 存放机关下截止到当前日期的各项总数据以及昨日新增各项数据，每日定时执行，先删后增
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-12
+ */
+public interface FactAgencyOriginProjectDailyService extends BaseService<FactAgencyOriginProjectDailyEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<FactAgencyOriginProjectDailyDTO>
+     * @author generator
+     * @date 2021-05-12
+     */
+    PageData<FactAgencyOriginProjectDailyDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<FactAgencyOriginProjectDailyDTO>
+     * @author generator
+     * @date 2021-05-12
+     */
+    List<FactAgencyOriginProjectDailyDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return FactAgencyOriginProjectDailyDTO
+     * @author generator
+     * @date 2021-05-12
+     */
+    FactAgencyOriginProjectDailyDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-05-12
+     */
+    void save(FactAgencyOriginProjectDailyDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-05-12
+     */
+    void update(FactAgencyOriginProjectDailyDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-05-12
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactAgencyOriginProjectMonthlyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactAgencyOriginProjectMonthlyService.java
new file mode 100644
index 0000000000..5d3a4fdb19
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactAgencyOriginProjectMonthlyService.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.stats;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.stats.FactAgencyOriginProjectMonthlyDTO;
+import com.epmet.entity.stats.FactAgencyOriginProjectMonthlyEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 机关下月项目数据统计 存放机关下截止到当前月份的各项总数据以及上月新增各项数据，每月月初定时执行，先删后增
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-12
+ */
+public interface FactAgencyOriginProjectMonthlyService extends BaseService<FactAgencyOriginProjectMonthlyEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<FactAgencyOriginProjectMonthlyDTO>
+     * @author generator
+     * @date 2021-05-12
+     */
+    PageData<FactAgencyOriginProjectMonthlyDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<FactAgencyOriginProjectMonthlyDTO>
+     * @author generator
+     * @date 2021-05-12
+     */
+    List<FactAgencyOriginProjectMonthlyDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return FactAgencyOriginProjectMonthlyDTO
+     * @author generator
+     * @date 2021-05-12
+     */
+    FactAgencyOriginProjectMonthlyDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-05-12
+     */
+    void save(FactAgencyOriginProjectMonthlyDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-05-12
+     */
+    void update(FactAgencyOriginProjectMonthlyDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-05-12
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactAgencyOriginProjectDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactAgencyOriginProjectDailyServiceImpl.java
new file mode 100644
index 0000000000..ef08dc5cbf
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactAgencyOriginProjectDailyServiceImpl.java
@@ -0,0 +1,101 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.stats.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dao.stats.FactAgencyOriginProjectDailyDao;
+import com.epmet.dto.stats.FactAgencyOriginProjectDailyDTO;
+import com.epmet.entity.stats.FactAgencyOriginProjectDailyEntity;
+import com.epmet.service.stats.FactAgencyOriginProjectDailyService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 机关下日项目数据统计 存放机关下截止到当前日期的各项总数据以及昨日新增各项数据，每日定时执行，先删后增
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-12
+ */
+@Service
+public class FactAgencyOriginProjectDailyServiceImpl extends BaseServiceImpl<FactAgencyOriginProjectDailyDao, FactAgencyOriginProjectDailyEntity> implements FactAgencyOriginProjectDailyService {
+
+
+    @Override
+    public PageData<FactAgencyOriginProjectDailyDTO> page(Map<String, Object> params) {
+        IPage<FactAgencyOriginProjectDailyEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, FactAgencyOriginProjectDailyDTO.class);
+    }
+
+    @Override
+    public List<FactAgencyOriginProjectDailyDTO> list(Map<String, Object> params) {
+        List<FactAgencyOriginProjectDailyEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, FactAgencyOriginProjectDailyDTO.class);
+    }
+
+    private QueryWrapper<FactAgencyOriginProjectDailyEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<FactAgencyOriginProjectDailyEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public FactAgencyOriginProjectDailyDTO get(String id) {
+        FactAgencyOriginProjectDailyEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, FactAgencyOriginProjectDailyDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(FactAgencyOriginProjectDailyDTO dto) {
+        FactAgencyOriginProjectDailyEntity entity = ConvertUtils.sourceToTarget(dto, FactAgencyOriginProjectDailyEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(FactAgencyOriginProjectDailyDTO dto) {
+        FactAgencyOriginProjectDailyEntity entity = ConvertUtils.sourceToTarget(dto, FactAgencyOriginProjectDailyEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactAgencyOriginProjectMonthlyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactAgencyOriginProjectMonthlyServiceImpl.java
new file mode 100644
index 0000000000..55a965b5d3
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactAgencyOriginProjectMonthlyServiceImpl.java
@@ -0,0 +1,101 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.stats.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dao.stats.FactAgencyOriginProjectMonthlyDao;
+import com.epmet.dto.stats.FactAgencyOriginProjectMonthlyDTO;
+import com.epmet.entity.stats.FactAgencyOriginProjectMonthlyEntity;
+import com.epmet.service.stats.FactAgencyOriginProjectMonthlyService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 机关下月项目数据统计 存放机关下截止到当前月份的各项总数据以及上月新增各项数据，每月月初定时执行，先删后增
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-12
+ */
+@Service
+public class FactAgencyOriginProjectMonthlyServiceImpl extends BaseServiceImpl<FactAgencyOriginProjectMonthlyDao, FactAgencyOriginProjectMonthlyEntity> implements FactAgencyOriginProjectMonthlyService {
+
+
+    @Override
+    public PageData<FactAgencyOriginProjectMonthlyDTO> page(Map<String, Object> params) {
+        IPage<FactAgencyOriginProjectMonthlyEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, FactAgencyOriginProjectMonthlyDTO.class);
+    }
+
+    @Override
+    public List<FactAgencyOriginProjectMonthlyDTO> list(Map<String, Object> params) {
+        List<FactAgencyOriginProjectMonthlyEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, FactAgencyOriginProjectMonthlyDTO.class);
+    }
+
+    private QueryWrapper<FactAgencyOriginProjectMonthlyEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<FactAgencyOriginProjectMonthlyEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public FactAgencyOriginProjectMonthlyDTO get(String id) {
+        FactAgencyOriginProjectMonthlyEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, FactAgencyOriginProjectMonthlyDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(FactAgencyOriginProjectMonthlyDTO dto) {
+        FactAgencyOriginProjectMonthlyEntity entity = ConvertUtils.sourceToTarget(dto, FactAgencyOriginProjectMonthlyEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(FactAgencyOriginProjectMonthlyDTO dto) {
+        FactAgencyOriginProjectMonthlyEntity entity = ConvertUtils.sourceToTarget(dto, FactAgencyOriginProjectMonthlyEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMemberDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMemberDailyDao.xml
new file mode 100644
index 0000000000..1c0a1d4edb
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMemberDailyDao.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.evaluationindex.extract.FactOriginGroupMemberDailyDao">
+
+    <resultMap type="com.epmet.entity.evaluationindex.extract.FactOriginGroupMemberDailyEntity" id="factOriginGroupMemberDailyMap">
+        <result property="id" column="ID"/>
+        <result property="groupId" column="GROUP_ID"/>
+        <result property="gridId" column="GRID_ID"/>
+        <result property="agencyId" column="AGENCY_ID"/>
+        <result property="parentId" column="PARENT_ID"/>
+        <result property="pids" column="PIDS"/>
+        <result property="memberId" column="MEMBER_ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="leaderFlag" column="LEADER_FLAG"/>
+        <result property="dateId" column="DATE_ID"/>
+        <result property="weekId" column="WEEK_ID"/>
+        <result property="monthId" column="MONTH_ID"/>
+        <result property="quarterId" column="QUARTER_ID"/>
+        <result property="yearId" column="YEAR_ID"/>
+        <result property="actionCode" column="ACTION_CODE"/>
+        <result property="isParty" column="IS_PARTY"/>
+        <result property="revision" column="REVISION"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactAgencyOriginProjectDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactAgencyOriginProjectDailyDao.xml
new file mode 100644
index 0000000000..bcc0f98ef5
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactAgencyOriginProjectDailyDao.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.stats.FactAgencyOriginProjectDailyDao">
+
+    <resultMap type="com.epmet.entity.stats.FactAgencyOriginProjectDailyEntity" id="factAgencyOriginProjectDailyMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="agencyId" column="AGENCY_ID"/>
+        <result property="parentId" column="PARENT_ID"/>
+        <result property="dateId" column="DATE_ID"/>
+        <result property="weekId" column="WEEK_ID"/>
+        <result property="monthId" column="MONTH_ID"/>
+        <result property="quarterId" column="QUARTER_ID"/>
+        <result property="yearId" column="YEAR_ID"/>
+        <result property="origin" column="ORIGIN"/>
+        <result property="projectTotal" column="PROJECT_TOTAL"/>
+        <result property="pendingTotal" column="PENDING_TOTAL"/>
+        <result property="pendingRatio" column="PENDING_RATIO"/>
+        <result property="closedTotal" column="CLOSED_TOTAL"/>
+        <result property="closedRatio" column="CLOSED_RATIO"/>
+        <result property="resolvedTotal" column="RESOLVED_TOTAL"/>
+        <result property="resolvedRatio" column="RESOLVED_RATIO"/>
+        <result property="unresolvedTotal" column="UNRESOLVED_TOTAL"/>
+        <result property="unresolvedRatio" column="UNRESOLVED_RATIO"/>
+        <result property="projectIncr" column="PROJECT_INCR"/>
+        <result property="pendingIncr" column="PENDING_INCR"/>
+        <result property="closedIncr" column="CLOSED_INCR"/>
+        <result property="resolvedIncr" column="RESOLVED_INCR"/>
+        <result property="unresolvedIncr" column="UNRESOLVED_INCR"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactAgencyOriginProjectMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactAgencyOriginProjectMonthlyDao.xml
new file mode 100644
index 0000000000..8fd44cba67
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactAgencyOriginProjectMonthlyDao.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.stats.FactAgencyOriginProjectMonthlyDao">
+
+    <resultMap type="com.epmet.entity.stats.FactAgencyOriginProjectMonthlyEntity" id="factAgencyOriginProjectMonthlyMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="agencyId" column="AGENCY_ID"/>
+        <result property="parentId" column="PARENT_ID"/>
+        <result property="monthId" column="MONTH_ID"/>
+        <result property="quarterId" column="QUARTER_ID"/>
+        <result property="yearId" column="YEAR_ID"/>
+        <result property="projectTotal" column="PROJECT_TOTAL"/>
+        <result property="pendingTotal" column="PENDING_TOTAL"/>
+        <result property="pendingRatio" column="PENDING_RATIO"/>
+        <result property="closedTotal" column="CLOSED_TOTAL"/>
+        <result property="closedRatio" column="CLOSED_RATIO"/>
+        <result property="resolvedTotal" column="RESOLVED_TOTAL"/>
+        <result property="resolvedRatio" column="RESOLVED_RATIO"/>
+        <result property="unresolvedTotal" column="UNRESOLVED_TOTAL"/>
+        <result property="unresolvedRatio" column="UNRESOLVED_RATIO"/>
+        <result property="projectIncr" column="PROJECT_INCR"/>
+        <result property="pendingIncr" column="PENDING_INCR"/>
+        <result property="closedIncr" column="CLOSED_INCR"/>
+        <result property="resolvedIncr" column="RESOLVED_INCR"/>
+        <result property="unresolvedIncr" column="UNRESOLVED_INCR"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>
\ No newline at end of file

From df72dae3658534416016361b34503d824082c419 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 13 May 2021 11:07:23 +0800
Subject: [PATCH 011/128] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BB=B7?=
 =?UTF-8?q?=E5=88=86=E6=95=B0DTO?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/form/ProjectEvaluateScoreFormDTO.java | 22 +++++++++++++++++++
 .../result/ProjectEvaluateScoreResultDTO.java | 21 ++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectEvaluateScoreFormDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectEvaluateScoreResultDTO.java

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectEvaluateScoreFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectEvaluateScoreFormDTO.java
new file mode 100644
index 0000000000..df4c02015d
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectEvaluateScoreFormDTO.java
@@ -0,0 +1,22 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/5/13 11:05 上午
+ * @DESC
+ */
+@Data
+public class ProjectEvaluateScoreFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -8126781510521211570L;
+
+    public interface ProjectEvaluateScoreForm{}
+
+    @NotBlank(message = "projectId不能为空",groups = ProjectEvaluateScoreForm.class)
+    private String projectId;
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectEvaluateScoreResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectEvaluateScoreResultDTO.java
new file mode 100644
index 0000000000..6d92acd594
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectEvaluateScoreResultDTO.java
@@ -0,0 +1,21 @@
+package com.epmet.dto.result;
+
+import com.epmet.commons.tools.constant.NumConstant;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/5/13 10:57 上午
+ * @DESC
+ */
+public class ProjectEvaluateScoreResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 3317308221138082162L;
+
+    /**
+     * 项目评价分数
+     */
+    private Integer score = NumConstant.ZERO;
+
+}

From ca96a3f34874ff134c2257018150c723598dd9d0 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 13 May 2021 11:18:48 +0800
Subject: [PATCH 012/128] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=EF=BC=9A=E5=85=9A=E5=91=98=E5=8F=82=E5=8A=A0=E2=80=9C=E4=B8=89?=
 =?UTF-8?q?=E4=BC=9A=E4=B8=80=E8=AF=BE=E2=80=9D=E4=BA=BA=E6=AC=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../result/PartyMemberInfoResultDTO.java      |  5 +++
 .../result/PartyJoinThreeMeetDTO.java         | 20 +++++++++
 .../dao/stats/DimCustomerPartymemberDao.java  |  8 ++++
 .../impl/CalGridIndexServiceImpl.java         | 41 +++++++++++++++----
 .../stats/DimCustomerPartymemberService.java  |  8 ++++
 .../DimCustomerPartymemberServiceImpl.java    | 11 +++++
 .../stats/DimCustomerPartymemberDao.xml       | 12 ++++++
 7 files changed, 98 insertions(+), 7 deletions(-)
 create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/result/PartyJoinThreeMeetDTO.java

diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/PartyMemberInfoResultDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/PartyMemberInfoResultDTO.java
index 24e5ec021a..d0f56ff909 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/PartyMemberInfoResultDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/PartyMemberInfoResultDTO.java
@@ -48,4 +48,9 @@ public class PartyMemberInfoResultDTO implements Serializable {
      * 机关名称
      */
     private String agencyName;
+
+    /**
+     * 党员的用户id
+     */
+    private String userId;
 }
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/result/PartyJoinThreeMeetDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/result/PartyJoinThreeMeetDTO.java
new file mode 100644
index 0000000000..b59fd8a969
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/result/PartyJoinThreeMeetDTO.java
@@ -0,0 +1,20 @@
+package com.epmet.dto.indexcollect.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 网格相关：党员参加“三会一课”人次 用
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/5/13 10:50
+ */
+@Data
+public class PartyJoinThreeMeetDTO implements Serializable {
+    private static final long serialVersionUID = 3027535602832948917L;
+    private String gridId;
+    private String userId;
+    private Integer joinThreeMeetsCount;
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/DimCustomerPartymemberDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/DimCustomerPartymemberDao.java
index 0d614b2e4a..3e69bc2837 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/DimCustomerPartymemberDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/DimCustomerPartymemberDao.java
@@ -100,4 +100,12 @@ public interface DimCustomerPartymemberDao extends BaseDao<DimCustomerPartymembe
      * @Date 2020/9/24 14:31
      **/
     List<String> selectPartyMemberUserIdsByPids(@Param("customerId") String customerId, @Param("pids")String pids);
+
+    /**
+     * 查询当前客户下所有注册的党员
+     *
+     * @param customerId
+     * @return  返回网格id、用户id
+     */
+    List<PartyMemberInfoResultDTO> selectPartyMemberInfoByCustomerId(@Param("customerId")String customerId);
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/CalGridIndexServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/CalGridIndexServiceImpl.java
index ef869f7941..f0c009064f 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/CalGridIndexServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/CalGridIndexServiceImpl.java
@@ -1,6 +1,7 @@
 package com.epmet.service.evaluationindex.extract.dataToIndex.impl;
 
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.ExtractConstant;
 import com.epmet.constant.ProjectEvaluateConstant;
@@ -8,7 +9,9 @@ import com.epmet.dto.extract.form.GovernAbilityGridMonthlyFormDTO;
 import com.epmet.dto.extract.form.GridIssueCountResultDTO;
 import com.epmet.dto.extract.form.PartyAbilityGridMonthlyFormDTO;
 import com.epmet.dto.extract.result.*;
+import com.epmet.dto.indexcollect.result.CpcIndexCommonDTO;
 import com.epmet.dto.indexcollect.result.GridIndexCommonDTO;
+import com.epmet.dto.indexcollect.result.PartyJoinThreeMeetDTO;
 import com.epmet.entity.evaluationindex.indexcoll.FactIndexServiceAblityGridMonthlyEntity;
 import com.epmet.service.evaluationindex.extract.dataToIndex.CalGridIndexService;
 import com.epmet.service.evaluationindex.extract.todata.*;
@@ -19,6 +22,7 @@ import com.epmet.service.evaluationindex.screen.ScreenCustomerGridService;
 import com.epmet.service.group.GroupDataService;
 import com.epmet.service.heart.ActInfoService;
 import com.epmet.service.partymember.PartyMemberService;
+import com.epmet.service.stats.DimCustomerPartymemberService;
 import com.epmet.service.stats.FactArticlePublishedGridDailyService;
 import com.epmet.service.stats.user.FactRegUserGridMonthlyService;
 import com.epmet.service.user.UserService;
@@ -78,6 +82,8 @@ public class CalGridIndexServiceImpl implements CalGridIndexService {
     private ScreenCustomerGridService gridService;
     @Autowired
     private GroupDataService groupDataService;
+    @Autowired
+    private DimCustomerPartymemberService dimCustomerPartymemberService;
 
     /**
      * @Description  计算网格指标党建能力
@@ -140,7 +146,7 @@ public class CalGridIndexServiceImpl implements CalGridIndexService {
         // 组织“三会一课”次数 前网格下  满足【未取消的活动 and  签到记录>1 and 活动开始时间在当前时间维度内】 +1
         Map<String,Integer> createThreeMeetsCountMap=getCreateThreeMeetsCountMap(customerId,monthId);
         // 党员参加“三会一课”人次 :本网格内注册的党员，在本月内活动签到次数
-        Map<String,Integer> joinThreeMeetsCountMap=getJoinThreeMeetsCountMap(customerId,monthId);
+        List<PartyJoinThreeMeetDTO> joinThreeMeetsCountList=getJoinThreeMeetsCountMap(customerId,monthId);
 
         String quarterId = DateUtils.getQuarterId(monthId);
         String yearId = DateUtils.getYearId(monthId);
@@ -234,8 +240,14 @@ public class CalGridIndexServiceImpl implements CalGridIndexService {
                 r.setCreateThreeMeetsCount(createThreeMeetsCountMap.get(r.getGridId()));
             }
             // 党员参加“三会一课”人次 :本网格内注册的党员，在本月内活动签到次数
-            if (joinThreeMeetsCountMap.containsKey(r.getGridId())) {
-                r.setJoinThreeMeetsCount(joinThreeMeetsCountMap.get(r.getGridId()));
+            if (!CollectionUtils.isEmpty(joinThreeMeetsCountList)) {
+                Integer joinThreeMeetsCount = NumConstant.ZERO;
+                for (PartyJoinThreeMeetDTO dto : joinThreeMeetsCountList) {
+                    if (dto.getGridId().equals(r.getGridId())) {
+                        joinThreeMeetsCount += dto.getJoinThreeMeetsCount();
+                    }
+                }
+                r.setJoinThreeMeetsCount(joinThreeMeetsCount);
             }
         });
         delPartyAbility(customerId, monthId);
@@ -257,13 +269,28 @@ public class CalGridIndexServiceImpl implements CalGridIndexService {
         return resultMap;
     }
 
-    private Map<String, Integer> getJoinThreeMeetsCountMap(String customerId, String monthId) {
+    private List<PartyJoinThreeMeetDTO> getJoinThreeMeetsCountMap(String customerId, String monthId) {
+        List<PartyJoinThreeMeetDTO> partyJoinThreeMeetDTOList = new ArrayList<>();
         // 党员参加“三会一课”人次 :本网格内注册的党员，在本月内活动签到次数
-        //    todo
-        return null;
+        //1、查询出当前客户下注册的党员
+        List<PartyMemberInfoResultDTO> list = dimCustomerPartymemberService.selectPartyMemberInfoByCustomerId(customerId);
+        if (!CollectionUtils.isEmpty(list)) {
+            partyJoinThreeMeetDTOList = ConvertUtils.sourceToTarget(list, PartyJoinThreeMeetDTO.class);
+            //2、查询出所有用户本月签到次数
+            List<CpcIndexCommonDTO> userList = groupDataService.selectJoinThreeMeetsCount(customerId, monthId);
+            for (PartyJoinThreeMeetDTO partyJoinThreeMeetDTO : partyJoinThreeMeetDTOList) {
+                partyJoinThreeMeetDTO.setJoinThreeMeetsCount(NumConstant.ZERO);
+                for (CpcIndexCommonDTO cpcIndexCommonDTO : userList) {
+                    if (partyJoinThreeMeetDTO.getUserId().equals(cpcIndexCommonDTO.getUserId())) {
+                        partyJoinThreeMeetDTO.setJoinThreeMeetsCount(cpcIndexCommonDTO.getIndexValue());
+                        break;
+                    }
+                }
+            }
+        }
+        return partyJoinThreeMeetDTOList;
     }
 
-
     /**
      * @Description  计算网格指标治理能力
      * @param customerId
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimCustomerPartymemberService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimCustomerPartymemberService.java
index d231065d66..d93248f4f5 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimCustomerPartymemberService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimCustomerPartymemberService.java
@@ -131,4 +131,12 @@ public interface DimCustomerPartymemberService extends BaseService<DimCustomerPa
      * @Date 2020/9/23 14:18
      **/
     List<String> getPartyMemberUserIds(String customerId, String type,String orgId);
+
+    /**
+     * 查询当前客户下所有注册的党员
+     *
+     * @param customerId
+     * @return  返回网格id、用户id
+     */
+    List<PartyMemberInfoResultDTO> selectPartyMemberInfoByCustomerId(String customerId);
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimCustomerPartymemberServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimCustomerPartymemberServiceImpl.java
index 5aa8fb1d26..cec5da65e6 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimCustomerPartymemberServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimCustomerPartymemberServiceImpl.java
@@ -246,4 +246,15 @@ public class DimCustomerPartymemberServiceImpl extends BaseServiceImpl<DimCustom
         }
         return partyMemberUserIds;
     }
+
+    /**
+     * 查询当前客户下所有注册的党员
+     *
+     * @param customerId
+     * @return  返回网格id、用户id
+     */
+    @Override
+    public List<PartyMemberInfoResultDTO> selectPartyMemberInfoByCustomerId(String customerId) {
+        return baseDao.selectPartyMemberInfoByCustomerId(customerId);
+    }
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/DimCustomerPartymemberDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/DimCustomerPartymemberDao.xml
index 2d92d5d61b..564aca5628 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/DimCustomerPartymemberDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/DimCustomerPartymemberDao.xml
@@ -140,4 +140,16 @@
             AND dcp.CUSTOMER_ID =#{customerId}
             and dcp.PIDS LIKE CONCAT(#{pids},'%')
     </select>
+
+
+    <!--     查询当前客户下所有注册的党员 -->
+    <select id="selectPartyMemberInfoByCustomerId" resultType="com.epmet.dto.extract.result.PartyMemberInfoResultDTO">
+        SELECT
+        dcp.GRID_ID,
+        dcp.USER_ID
+        FROM dim_customer_partymember dcp
+        WHERE
+        dcp.DEL_FLAG = '0'
+        AND dcp.CUSTOMER_ID = #{customerId}
+    </select>
 </mapper>
\ No newline at end of file

From 3b36db48a350237c17bf0118d8f784887f24456a Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 13 May 2021 13:40:05 +0800
Subject: [PATCH 013/128] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE-?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=B8=8B=E4=BA=94=E9=A1=B9=E5=9F=BA=E7=A1=80?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=B1=87=E6=80=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/AgenctBasicDataFormDTO.java          | 29 ++++++
 .../result/AgencyBasicDataResultDTO.java      | 96 +++++++++++++++++++
 .../controller/DataStatsController.java       | 21 +++-
 .../dataaggre/dao/datastats/DataStatsDao.java | 40 ++++++++
 .../service/datastats/DataStatsService.java   | 10 ++
 .../datastats/impl/DataStatsServiceImpl.java  | 94 +++++++++++++++++-
 .../mapper/datastats/DatsStatsDao.xml         | 89 +++++++++++++++++
 7 files changed, 377 insertions(+), 2 deletions(-)
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/AgenctBasicDataFormDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/AgencyBasicDataResultDTO.java

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/AgenctBasicDataFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/AgenctBasicDataFormDTO.java
new file mode 100644
index 0000000000..0b79c2da2c
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/AgenctBasicDataFormDTO.java
@@ -0,0 +1,29 @@
+package com.epmet.dataaggre.dto.datastats.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import com.epmet.dataaggre.dto.resigroup.form.CandidateListFormDTO;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 基础数据-组织各种数据汇总-接口入参
+ * @Auth sun
+ */
+@Data
+public class AgenctBasicDataFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -3381286960911634231L;
+    /**
+     * 组织Id
+     */
+    @NotBlank(message = "组织ID不能为空",groups = AgenctBasicDataFormDTO.Agency.class)
+    private String agencyId;
+    /**
+     * 客户Id
+     */
+    private String customerId;
+    public interface Agency extends CustomerClientShowGroup{}
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/AgencyBasicDataResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/AgencyBasicDataResultDTO.java
new file mode 100644
index 0000000000..25509719c4
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/AgencyBasicDataResultDTO.java
@@ -0,0 +1,96 @@
+package com.epmet.dataaggre.dto.datastats.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @Description 基础数据-组织各种数据汇总-接口返参
+ * @Auth sun
+ */
+@Data
+public class AgencyBasicDataResultDTO implements Serializable {
+    private static final long serialVersionUID = 466974582608407121L;
+    BigDecimal bi = new BigDecimal(0);
+    /**
+     * 客户Id
+     */
+    private String customerId;
+    /**
+     * 组织Id
+     */
+    private String agencyId;
+    //用户总数
+    private Integer userTotal = 0;
+    //党员总数
+    private Integer partyMemberTotal = 0;
+    //党员总数占比
+    private BigDecimal partyMemberRatio = bi;
+    //居民总数
+    private Integer resiTotal = 0;
+    //居民总数占比
+    private BigDecimal resiRatio = bi;
+    //党群小组总数
+    private Integer groupTotal = 0;
+    //楼院小组总数
+    private Integer ordinaryTotal = 0;
+    //楼院小组总数占比
+    private BigDecimal ordinaryRatio = bi;
+    //支部小组总数
+    private Integer branchTotal = 0;
+    //支部小组总数占比
+    private BigDecimal branchRatio = bi;
+    //话题总数
+    private Integer topicTotal = 0;
+    //热议中总数
+    private Integer discussingTotal = 0;
+    //热议中总数占比
+    private BigDecimal discussingRatio = bi;
+    //已处理总数
+    private Integer closedTopicTotal = 0;
+    //已处理总数占比
+    private BigDecimal closedTopicRatio = bi;
+    //转议题总数
+    private Integer shiftIssueTotal = 0;
+    //转议题总数占比
+    private BigDecimal shiftIssueRatio = bi;
+    //议题总数
+    private Integer issueTotal = 0;
+    //表决中总数
+    private Integer votingTotal = 0;
+    //表决中总数占比
+    private BigDecimal votingRatio = bi;
+    //已处理总数
+    private Integer closedIssueTotal = 0;
+    //已处理总数占比
+    private BigDecimal closedIssueRatio = bi;
+    //已转项目总数
+    private Integer shiftProjectTotal = 0;
+    //已转项目总数占比
+    private BigDecimal shiftProjectRatio = bi;
+    //项目总数
+    private Integer projectTotal = 0;
+    //处理中总数
+    private Integer pendingTotal = 0;
+    //处理中总数占比
+    private BigDecimal pendingRatio = bi;
+    //已结案总数
+    private Integer closedProjectTotal = 0;
+    //已结案总数占比
+    private BigDecimal closedProjectRatio = bi;
+
+
+    @Data
+    public static class Topic implements Serializable {
+        //话题数量
+        private Integer topicCount;
+        //话题状态 已关闭：closed、已屏蔽：hidden、 讨论中：discussing
+        private String topicStatus;
+        //话题已转议题数量
+        private Integer shiftedIssueTotal;
+        //数据更新至 时间
+        private String deadline;
+    }
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java
index 2b2abc3b51..f5919caac5 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java
@@ -1,13 +1,21 @@
 package com.epmet.dataaggre.controller;
 
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dataaggre.dto.datastats.form.AgenctBasicDataFormDTO;
+import com.epmet.dataaggre.dto.datastats.result.AgencyBasicDataResultDTO;
 import com.epmet.dataaggre.service.datastats.DataStatsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @Author sun
- * @Description  数据统计服务
+ * @Description 数据统计服务
  */
 @RestController
 @RequestMapping("datastats")
@@ -16,5 +24,16 @@ public class DataStatsController {
     @Autowired
     private DataStatsService dataStatsService;
 
+    /**
+     * @Param formDTO
+     * @Description 组织下五项基础数据汇总
+     * @author sun
+     */
+    @PostMapping("agencybasicdata")
+    public Result<AgencyBasicDataResultDTO> agencyBasicData(@LoginUser TokenDto tokenDto, @RequestBody AgenctBasicDataFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, AgenctBasicDataFormDTO.Agency.class);
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        return new Result<AgencyBasicDataResultDTO>().ok(dataStatsService.agencyBasicData(formDTO));
+    }
 
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
index 475f62cdea..7918222a52 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
@@ -17,7 +17,11 @@
 
 package com.epmet.dataaggre.dao.datastats;
 
+import com.epmet.dataaggre.dto.datastats.result.AgencyBasicDataResultDTO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * @Author sun
@@ -26,4 +30,40 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface DataStatsDao {
 
+    /**
+     * @Description 查询组织下注册用户最新日统计数据
+     * @author sun
+     */
+    AgencyBasicDataResultDTO getAgnecyRegUser(@Param("agencyId") String agencyId);
+
+    /**
+     * @Description 查询组织下最新群组日统计数据
+     * @author sun
+     */
+    AgencyBasicDataResultDTO getAgnecyGroup(@Param("agencyId") String agencyId);
+
+    /**
+     * @Description 查询组织下最新状态话题-机关日统计数据表
+     * @author sun
+     */
+    List<AgencyBasicDataResultDTO.Topic> getAgencyTopic(@Param("agencyId") String agencyId);
+
+    /**
+     * @Description 查询组织下最新转议题话题-机关日统计数据表
+     * @author sun
+     */
+    AgencyBasicDataResultDTO.Topic getAgencyTopicShiftIssue(@Param("agencyId") String agencyId);
+
+    /**
+     * @Description 查询组织下最新议题日统计数据
+     * @author sun
+     */
+    AgencyBasicDataResultDTO getAgencyIssue(@Param("agencyId") String agencyId);
+
+    /**
+     * @Description 查询组织下最新项目日统计数据
+     * @author sun
+     */
+    AgencyBasicDataResultDTO getAgencyProject(@Param("agencyId") String agencyId);
+
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
index fca91d972e..566d849255 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
@@ -1,9 +1,19 @@
 package com.epmet.dataaggre.service.datastats;
 
+import com.epmet.dataaggre.dto.datastats.form.AgenctBasicDataFormDTO;
+import com.epmet.dataaggre.dto.datastats.result.AgencyBasicDataResultDTO;
+
 /**
  * @Author sun
  * @Description  数据统计服务
  */
 public interface DataStatsService {
 
+    /**
+     * @Param formDTO
+     * @Description 组织下五项基础数据汇总
+     * @author sun
+     */
+    AgencyBasicDataResultDTO agencyBasicData(AgenctBasicDataFormDTO formDTO);
+
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index d83e73545e..688a2d6a91 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -1,16 +1,25 @@
 package com.epmet.dataaggre.service.datastats.impl;
 
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.datastats.DataStatsDao;
+import com.epmet.dataaggre.dto.datastats.form.AgenctBasicDataFormDTO;
+import com.epmet.dataaggre.dto.datastats.result.AgencyBasicDataResultDTO;
 import com.epmet.dataaggre.service.datastats.DataStatsService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.text.NumberFormat;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
+
 /**
  * @Author sun
- * @Description  数据统计服务
+ * @Description 数据统计服务
  */
 @Service
 @DataSource(DataSourceConstant.DATA_STATISTICAL)
@@ -19,4 +28,87 @@ public class DataStatsServiceImpl implements DataStatsService {
     @Autowired
     private DataStatsDao dataStatsDao;
 
+
+    /**
+     * @Param formDTO
+     * @Description 组织下五项基础数据汇总
+     * @author sun
+     */
+    @Override
+    public AgencyBasicDataResultDTO agencyBasicData(AgenctBasicDataFormDTO formDTO) {
+        AgencyBasicDataResultDTO resultDTO = new AgencyBasicDataResultDTO();
+        resultDTO.setCustomerId(formDTO.getCustomerId());
+        resultDTO.setAgencyId(formDTO.getAgencyId());
+        NumberFormat numberFormat = NumberFormat.getInstance();
+        numberFormat.setMaximumFractionDigits(NumConstant.SIX);
+
+        //1.查询组织下注册用户最新日统计数据【只查询注册用户的统计数据，不涉及参与用户的】
+        AgencyBasicDataResultDTO user = dataStatsDao.getAgnecyRegUser(formDTO.getAgencyId());
+        if (null != user) {
+            resultDTO.setUserTotal(user.getUserTotal());
+            resultDTO.setResiTotal(user.getResiTotal());
+            resultDTO.setResiRatio(user.getResiTotal() == 0 || user.getUserTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) user.getResiTotal() / (float) user.getUserTotal())));
+            resultDTO.setPartyMemberTotal(user.getPartyMemberTotal());
+            resultDTO.setPartyMemberRatio(user.getPartyMemberTotal() == 0 || user.getUserTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) user.getPartyMemberTotal() / (float) user.getUserTotal())));
+        }
+
+        //2.查询组织下最新群组日统计数据
+        AgencyBasicDataResultDTO group = dataStatsDao.getAgnecyGroup(formDTO.getAgencyId());
+        if (null != user) {
+            resultDTO.setGroupTotal(group.getGroupTotal());
+            resultDTO.setOrdinaryTotal(group.getOrdinaryTotal());
+            resultDTO.setOrdinaryRatio(group.getOrdinaryTotal() == 0 || group.getGroupTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) group.getOrdinaryTotal() / (float) group.getGroupTotal())));
+            resultDTO.setBranchTotal(group.getBranchTotal());
+            resultDTO.setBranchRatio(group.getBranchTotal() == 0 || group.getGroupTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) group.getBranchTotal() / (float) group.getGroupTotal())));
+        }
+
+        //3.查询组织下最新话题日统计数据
+        //状态话题-机关日统计数据表最新日期三种状态数据
+        //机关日表里三种类型数据之和就是话题总量，讨论中数量与热议中不是一个概念，热议中=总量-关闭数-屏蔽数-转议题数
+        List<AgencyBasicDataResultDTO.Topic> topic = dataStatsDao.getAgencyTopic(formDTO.getAgencyId());
+        //转议题话题-机关日统计数据表
+        AgencyBasicDataResultDTO.Topic topicSHiftIssue = dataStatsDao.getAgencyTopicShiftIssue(formDTO.getAgencyId());
+        AtomicReference<Integer> closedTotal = new AtomicReference<>(0);
+        AtomicReference<Integer> hiddenTotal = new AtomicReference<>(0);
+        if (topic.size()>NumConstant.ZERO) {
+            resultDTO.setTopicTotal(topic.stream().collect(Collectors.summingInt(AgencyBasicDataResultDTO.Topic::getTopicCount)));
+            topic.forEach(t -> {
+                if (t.getTopicStatus().equals("closed")){ closedTotal.set(t.getTopicCount()); }
+                if (t.getTopicStatus().equals("hidden")){ hiddenTotal.set(t.getTopicCount()); }
+            });
+        }
+        if (null != topicSHiftIssue) {
+            resultDTO.setShiftIssueTotal(topicSHiftIssue.getShiftedIssueTotal());
+            resultDTO.setShiftIssueRatio(resultDTO.getShiftIssueTotal() == 0 || resultDTO.getTopicTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getShiftIssueTotal() / (float) resultDTO.getTopicTotal())));
+        }
+        resultDTO.setDiscussingTotal(resultDTO.getTopicTotal()-closedTotal.get()-hiddenTotal.get()-resultDTO.getShiftIssueTotal());
+        resultDTO.setDiscussingRatio(resultDTO.getDiscussingTotal() == 0 || resultDTO.getTopicTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getDiscussingTotal() / (float) resultDTO.getTopicTotal())));
+        resultDTO.setClosedTopicTotal(closedTotal.get());
+        resultDTO.setClosedTopicRatio(resultDTO.getClosedTopicTotal() == 0 || resultDTO.getTopicTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getClosedTopicTotal() / (float) resultDTO.getTopicTotal())));
+
+        //4.查询组织下最新议题日统计数据
+        AgencyBasicDataResultDTO issue = dataStatsDao.getAgencyIssue(formDTO.getAgencyId());
+        if (null != issue) {
+            resultDTO.setIssueTotal(issue.getIssueTotal());
+            resultDTO.setVotingTotal(issue.getVotingTotal());
+            resultDTO.setVotingRatio(resultDTO.getVotingTotal() == 0 || resultDTO.getIssueTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getVotingTotal() / (float) resultDTO.getIssueTotal())));
+            resultDTO.setClosedIssueTotal(issue.getClosedIssueTotal());
+            resultDTO.setClosedIssueRatio(resultDTO.getClosedIssueTotal() == 0 || resultDTO.getIssueTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getClosedIssueTotal() / (float) resultDTO.getIssueTotal())));
+            resultDTO.setShiftProjectTotal(issue.getShiftProjectTotal());
+            resultDTO.setShiftProjectRatio(resultDTO.getShiftProjectTotal() == 0 || resultDTO.getIssueTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getShiftProjectTotal() / (float) resultDTO.getIssueTotal())));
+        }
+
+        //5.查询组织下最新项目日统计数据
+        AgencyBasicDataResultDTO project = dataStatsDao.getAgencyProject(formDTO.getAgencyId());
+        if (null != project) {
+            resultDTO.setProjectTotal(project.getProjectTotal());
+            resultDTO.setPendingTotal(project.getPendingTotal());
+            resultDTO.setPendingRatio(resultDTO.getPendingTotal() == 0 || resultDTO.getProjectTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getPendingTotal() / (float) resultDTO.getProjectTotal())));
+            resultDTO.setClosedProjectTotal(project.getClosedProjectTotal());
+            resultDTO.setClosedProjectRatio(resultDTO.getClosedProjectTotal() == 0 || resultDTO.getProjectTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getClosedProjectTotal() / (float) resultDTO.getProjectTotal())));
+        }
+
+        return resultDTO;
+    }
+
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
index 8360ef814e..07f4f4b448 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
@@ -3,5 +3,94 @@
 
 <mapper namespace="com.epmet.dataaggre.dao.datastats.DataStatsDao">
 
+    <select id="getAgnecyRegUser" resultType="com.epmet.dataaggre.dto.datastats.result.AgencyBasicDataResultDTO">
+        SELECT
+            reg_total AS userTotal,
+            partymember_total AS partyMemberTotal,
+            (reg_total - partymember_total) AS resiTotal
+        FROM
+            fact_reg_user_agency_daily
+        WHERE
+            del_flag = '0'
+        AND agency_id = #{agencyId}
+        ORDER BY
+            date_id DESC
+        LIMIT 1
+    </select>
+
+    <select id="getAgnecyGroup" resultType="com.epmet.dataaggre.dto.datastats.result.AgencyBasicDataResultDTO">
+        SELECT
+            group_total AS groupTotal,
+            ordinary_total AS ordinaryTotal,
+            branch_total AS branchTotal
+        FROM
+            fact_group_total_agency_daily
+        WHERE
+            del_flag = '0'
+        AND agency_id = #{agencyId}
+        ORDER BY
+            date_id DESC
+        LIMIT 1
+    </select>
+
+    <select id="getAgencyTopic" resultType="com.epmet.dataaggre.dto.datastats.result.AgencyBasicDataResultDTO$Topic">
+        SELECT
+            topic_count AS topicCount,
+            topic_status_id AS topicStatus
+        FROM
+            fact_topic_status_agency_daily
+        WHERE
+            del_flag = '0'
+        AND topic_status_id in('discussing','closed','hidden')<!-- 讨论中(热议中！=讨论中)、已处理、已屏蔽 -->
+        AND agency_id = #{agencyId}
+        ORDER BY
+            date_id DESC
+        LIMIT 3
+    </select>
+
+    <select id="getAgencyTopicShiftIssue" resultType="com.epmet.dataaggre.dto.datastats.result.AgencyBasicDataResultDTO$Topic">
+        SELECT
+            issue_total AS shiftedIssueTotal,
+            DATE_FORMAT(date_id, '%Y-%m-%d') AS deadline
+        FROM
+            fact_topic_issue_agency_daily
+        WHERE
+            del_flag = '0'
+        AND agency_id = #{agencyId}
+        ORDER BY
+            date_id DESC
+        LIMIT 1
+    </select>
+
+    <select id="getAgencyIssue" resultType="com.epmet.dataaggre.dto.datastats.result.AgencyBasicDataResultDTO">
+        SELECT
+            issue_total AS issueTotal,
+            voting_total AS votingTotal,
+            closed_total AS closedIssueTotal,
+            shift_project_total AS shiftProjectTotal
+        FROM
+            fact_issue_agency_daily fiad
+        WHERE
+            del_flag = '0'
+        AND agency_id = #{agencyId}
+        ORDER BY
+            date_id DESC
+        LIMIT 1
+    </select>
+
+    <select id="getAgencyProject" resultType="com.epmet.dataaggre.dto.datastats.result.AgencyBasicDataResultDTO">
+        SELECT
+            IFNULL(project_total, 0) AS "projectTotal",
+            IFNULL(pending_total, 0) AS "pendingTotal",
+            IFNULL(closed_total, 0) AS "closedProjectTotal"
+        FROM
+            fact_agency_project_daily
+        WHERE
+            del_flag = '0'
+        AND agency_id = '8631fa4b22e88fdc259b3f51b5de2be2'
+        ORDER BY
+            date_id DESC
+        LIMIT 1
+    </select>
 
 </mapper>
\ No newline at end of file

From 356451982ccaf4ca040ec28fa2b02edc188098bf Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 13 May 2021 15:59:50 +0800
Subject: [PATCH 014/128] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=EF=BC=8C=E6=9F=A5=E8=AF=A2=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BB=B7?=
 =?UTF-8?q?=E5=BE=97=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../result/ProjectEvaluateScoreResultDTO.java |  6 +++++
 ...ojectSatisfactionStatisticsController.java | 14 +++++++++++
 .../dao/ProjectSatisfactionStatisticsDao.java | 11 ++++++++-
 .../ProjectSatisfactionStatisticsEntity.java  | 13 ++++++++++
 .../ProjectSatisfactionStatisticsService.java | 10 ++++++++
 ...jectSatisfactionStatisticsServiceImpl.java | 24 +++++++++++++++++++
 .../ProjectSatisfactionStatisticsDao.xml      | 17 ++++---------
 7 files changed, 81 insertions(+), 14 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectEvaluateScoreResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectEvaluateScoreResultDTO.java
index 6d92acd594..06bf349809 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectEvaluateScoreResultDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectEvaluateScoreResultDTO.java
@@ -1,6 +1,9 @@
 package com.epmet.dto.result;
 
 import com.epmet.commons.tools.constant.NumConstant;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
@@ -9,6 +12,9 @@ import java.io.Serializable;
  * @DateTime 2021/5/13 10:57 上午
  * @DESC
  */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class ProjectEvaluateScoreResultDTO implements Serializable {
 
     private static final long serialVersionUID = 3317308221138082162L;
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectSatisfactionStatisticsController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectSatisfactionStatisticsController.java
index 8857e92695..78fed6b459 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectSatisfactionStatisticsController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectSatisfactionStatisticsController.java
@@ -26,6 +26,8 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.ProjectSatisfactionStatisticsDTO;
+import com.epmet.dto.form.ProjectEvaluateScoreFormDTO;
+import com.epmet.dto.result.ProjectEvaluateScoreResultDTO;
 import com.epmet.excel.ProjectSatisfactionStatisticsExcel;
 import com.epmet.service.ProjectSatisfactionStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -91,4 +93,16 @@ public class ProjectSatisfactionStatisticsController {
         ExcelUtils.exportExcelToTarget(response, null, list, ProjectSatisfactionStatisticsExcel.class);
     }
 
+    /**
+     * @Description  项目评价分数
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/5/13 11:18 上午
+     */
+    @PostMapping("projectevaluatescore")
+    public Result<ProjectEvaluateScoreResultDTO> projectEvaluateScore(@RequestBody ProjectEvaluateScoreFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, ProjectEvaluateScoreFormDTO.ProjectEvaluateScoreForm.class);
+        return new Result<ProjectEvaluateScoreResultDTO>().ok(projectSatisfactionStatisticsService.projectEvaluateScore(formDTO));
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSatisfactionStatisticsDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSatisfactionStatisticsDao.java
index 1b05ef5788..60a2852e8f 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSatisfactionStatisticsDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSatisfactionStatisticsDao.java
@@ -20,6 +20,7 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.entity.ProjectSatisfactionStatisticsEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 项目满意度调查统计表
@@ -29,5 +30,13 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface ProjectSatisfactionStatisticsDao extends BaseDao<ProjectSatisfactionStatisticsEntity> {
-	
+
+    /**
+     * @Description  根据项目ID查询此项目评价信息
+     * @Param projectId
+     * @author zxc
+     * @date 2021/5/13 1:28 下午
+     */
+    ProjectSatisfactionStatisticsEntity selectInfoByProjectId(@Param("projectId")String projectId);
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectSatisfactionStatisticsEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectSatisfactionStatisticsEntity.java
index 5474b38c88..d943a4a6cf 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectSatisfactionStatisticsEntity.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectSatisfactionStatisticsEntity.java
@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import com.epmet.commons.tools.constant.NumConstant;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -60,9 +61,21 @@ public class ProjectSatisfactionStatisticsEntity extends BaseEpmetEntity {
      */
 	private Integer badCount;
 
+	/**
+	 * 应评价人数【等于实际表决人数】
+	 */
+	private Integer shouldEvaluateCount;
+
 	/**
 	 * 客户ID
 	 */
 	@TableField(fill = FieldFill.INSERT)
 	private String customerId;
+
+	public ProjectSatisfactionStatisticsEntity() {
+		this.goodCount = NumConstant.ZERO;
+		this.perfectCount = NumConstant.ZERO;
+		this.badCount = NumConstant.ZERO;
+		this.shouldEvaluateCount = NumConstant.ZERO;
+	}
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSatisfactionStatisticsService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSatisfactionStatisticsService.java
index 770a98d174..fa035d53f6 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSatisfactionStatisticsService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSatisfactionStatisticsService.java
@@ -20,6 +20,8 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.ProjectSatisfactionStatisticsDTO;
+import com.epmet.dto.form.ProjectEvaluateScoreFormDTO;
+import com.epmet.dto.result.ProjectEvaluateScoreResultDTO;
 import com.epmet.entity.ProjectSatisfactionStatisticsEntity;
 
 import java.util.List;
@@ -92,4 +94,12 @@ public interface ProjectSatisfactionStatisticsService extends BaseService<Projec
      * @date 2020-05-11
      */
     void delete(String[] ids);
+
+    /**
+     * @Description  项目评价分数
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/5/13 11:18 上午
+     */
+    ProjectEvaluateScoreResultDTO projectEvaluateScore(ProjectEvaluateScoreFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionStatisticsServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionStatisticsServiceImpl.java
index 7769eb2ef4..222a96644a 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionStatisticsServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionStatisticsServiceImpl.java
@@ -20,11 +20,14 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.ProjectSatisfactionStatisticsDao;
 import com.epmet.dto.ProjectSatisfactionStatisticsDTO;
+import com.epmet.dto.form.ProjectEvaluateScoreFormDTO;
+import com.epmet.dto.result.ProjectEvaluateScoreResultDTO;
 import com.epmet.entity.ProjectSatisfactionStatisticsEntity;
 import com.epmet.redis.ProjectSatisfactionStatisticsRedis;
 import com.epmet.service.ProjectSatisfactionStatisticsService;
@@ -101,4 +104,25 @@ public class ProjectSatisfactionStatisticsServiceImpl extends BaseServiceImpl<Pr
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * @Description  项目评价分数
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/5/13 11:18 上午
+     */
+    @Override
+    public ProjectEvaluateScoreResultDTO projectEvaluateScore(ProjectEvaluateScoreFormDTO formDTO) {
+        ProjectSatisfactionStatisticsEntity entity = baseDao.selectInfoByProjectId(formDTO.getProjectId());
+        Integer realEvalCount  = entity.getBadCount() + entity.getGoodCount() + entity.getPerfectCount();
+        Integer shouldEvaluateCount = entity.getShouldEvaluateCount();
+        if (shouldEvaluateCount == NumConstant.ZERO){
+            return new ProjectEvaluateScoreResultDTO(NumConstant.ZERO);
+        }
+        // 未评价的给80分
+        Integer noEval = shouldEvaluateCount - realEvalCount;
+        Integer noEvalScore = noEval * NumConstant.EIGHTY;
+        Integer realEvalScore = entity.getBadCount() * NumConstant.SIXTY + entity.getGoodCount() * NumConstant.EIGHTY + entity.getPerfectCount() * NumConstant.ONE_HUNDRED;
+        return new ProjectEvaluateScoreResultDTO((noEvalScore + realEvalScore) / shouldEvaluateCount);
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSatisfactionStatisticsDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSatisfactionStatisticsDao.xml
index 65324c0d07..90be9c1c62 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSatisfactionStatisticsDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSatisfactionStatisticsDao.xml
@@ -3,19 +3,10 @@
 
 <mapper namespace="com.epmet.dao.ProjectSatisfactionStatisticsDao">
 
-    <resultMap type="com.epmet.entity.ProjectSatisfactionStatisticsEntity" id="projectSatisfactionStatisticsMap">
-        <result property="id" column="ID"/>
-        <result property="projectId" column="PROJECT_ID"/>
-        <result property="goodCount" column="GOOD_COUNT"/>
-        <result property="perfectCount" column="PERFECT_COUNT"/>
-        <result property="badCount" column="BAD_COUNT"/>
-        <result property="delFlag" column="DEL_FLAG"/>
-        <result property="revision" column="REVISION"/>
-        <result property="createdBy" column="CREATED_BY"/>
-        <result property="createdTime" column="CREATED_TIME"/>
-        <result property="updatedBy" column="UPDATED_BY"/>
-        <result property="updatedTime" column="UPDATED_TIME"/>
-    </resultMap>
+    <!-- 根据项目ID查询此项目评价信息 -->
+    <select id="selectInfoByProjectId" resultType="com.epmet.entity.ProjectSatisfactionStatisticsEntity">
+        select * from project_satisfaction_statistics where DEL_FLAG = '0' AND PROJECT_ID = #{projectId}
+    </select>
 
 
 </mapper>
\ No newline at end of file

From 4ca51fec88d79b51d6bdd4953b24a9396ff19580 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 13 May 2021 17:27:58 +0800
Subject: [PATCH 015/128] =?UTF-8?q?=E7=BB=84=E7=BB=87=E3=80=81=E7=BD=91?=
 =?UTF-8?q?=E6=A0=BC=E5=B1=82=E7=BA=A7=E7=94=A8=E6=88=B7=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/AgenctBasicDataFormDTO.java          |  4 -
 .../dto/datastats/form/SubAgencyFormDTO.java  | 28 ++++++
 .../dto/datastats/form/SubGridFormDTO.java    | 28 ++++++
 .../result/AgencyBasicDataResultDTO.java      |  6 +-
 .../result/SubAgencyUserResultDTO.java        | 33 +++++++
 .../result/SubGridUserResultDTO.java          | 33 +++++++
 .../controller/DataStatsController.java       | 33 ++++++-
 .../dataaggre/dao/datastats/DataStatsDao.java | 27 ++++++
 .../entity/datastats/DimAgencyEntity.java     | 78 +++++++++++++++
 .../entity/datastats/DimCustomerEntity.java   | 49 ++++++++++
 .../entity/datastats/DimGridEntity.java       | 59 +++++++++++
 .../service/datastats/DataStatsService.java   | 19 ++++
 .../datastats/impl/DataStatsServiceImpl.java  | 97 ++++++++++++++++++-
 .../mapper/datastats/DatsStatsDao.xml         | 57 +++++++++++
 14 files changed, 538 insertions(+), 13 deletions(-)
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubAgencyFormDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubGridFormDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubAgencyUserResultDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubGridUserResultDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/datastats/DimAgencyEntity.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/datastats/DimCustomerEntity.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/datastats/DimGridEntity.java

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/AgenctBasicDataFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/AgenctBasicDataFormDTO.java
index 0b79c2da2c..609cf1729a 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/AgenctBasicDataFormDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/AgenctBasicDataFormDTO.java
@@ -20,10 +20,6 @@ public class AgenctBasicDataFormDTO implements Serializable {
      */
     @NotBlank(message = "组织ID不能为空",groups = AgenctBasicDataFormDTO.Agency.class)
     private String agencyId;
-    /**
-     * 客户Id
-     */
-    private String customerId;
     public interface Agency extends CustomerClientShowGroup{}
 
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubAgencyFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubAgencyFormDTO.java
new file mode 100644
index 0000000000..c70db44b6e
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubAgencyFormDTO.java
@@ -0,0 +1,28 @@
+package com.epmet.dataaggre.dto.datastats.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 基础数据-组织直属下级数据汇总-接口入参
+ * @Auth sun
+ */
+@Data
+public class SubAgencyFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -3381286960911634231L;
+    /**
+     * 组织Id
+     */
+    @NotBlank(message = "组织ID不能为空",groups = SubAgencyFormDTO.Agency.class)
+    private String agencyId;
+    /**
+     * 日维度Id
+     */
+    private String dateId;
+    public interface Agency extends CustomerClientShowGroup{}
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubGridFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubGridFormDTO.java
new file mode 100644
index 0000000000..e21141e22a
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubGridFormDTO.java
@@ -0,0 +1,28 @@
+package com.epmet.dataaggre.dto.datastats.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 基础数据-组织直属网格数据汇总-接口入参
+ * @Auth sun
+ */
+@Data
+public class SubGridFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -3381286960911634231L;
+    /**
+     * 组织Id
+     */
+    @NotBlank(message = "组织ID不能为空",groups = SubGridFormDTO.Agency.class)
+    private String agencyId;
+    /**
+     * 日维度Id
+     */
+    private String dateId;
+    public interface Agency extends CustomerClientShowGroup{}
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/AgencyBasicDataResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/AgencyBasicDataResultDTO.java
index 25509719c4..ad7869fd0b 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/AgencyBasicDataResultDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/AgencyBasicDataResultDTO.java
@@ -1,5 +1,6 @@
 package com.epmet.dataaggre.dto.datastats.result;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -12,11 +13,8 @@ import java.math.BigDecimal;
 @Data
 public class AgencyBasicDataResultDTO implements Serializable {
     private static final long serialVersionUID = 466974582608407121L;
+    @JsonIgnore
     BigDecimal bi = new BigDecimal(0);
-    /**
-     * 客户Id
-     */
-    private String customerId;
     /**
      * 组织Id
      */
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubAgencyUserResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubAgencyUserResultDTO.java
new file mode 100644
index 0000000000..a60c3ad76b
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubAgencyUserResultDTO.java
@@ -0,0 +1,33 @@
+package com.epmet.dataaggre.dto.datastats.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @Description 基础数据-查询当前组织的直属下级组织用户数据-接口返参
+ * @Auth sun
+ */
+@Data
+public class SubAgencyUserResultDTO implements Serializable {
+    private static final long serialVersionUID = 466974582608407121L;
+    @JsonIgnore
+    BigDecimal bi = new BigDecimal(0);
+    //组织Id
+    private String agencyId;
+    //组织名称
+    private String agencyName;
+    //用户总数
+    private Integer userTotal = 0;
+    //党员总数
+    private Integer partyMemberTotal = 0;
+    //党员总数占比
+    private BigDecimal partyMemberRatio = bi;
+    //居民总数
+    private Integer resiTotal = 0;
+    //居民总数占比
+    private BigDecimal resiRatio = bi;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubGridUserResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubGridUserResultDTO.java
new file mode 100644
index 0000000000..243ae23961
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubGridUserResultDTO.java
@@ -0,0 +1,33 @@
+package com.epmet.dataaggre.dto.datastats.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @Description 基础数据-查询当前组织下直属网格列表用户数据-接口返参
+ * @Auth sun
+ */
+@Data
+public class SubGridUserResultDTO implements Serializable {
+    private static final long serialVersionUID = 466974582608407121L;
+    @JsonIgnore
+    BigDecimal bi = new BigDecimal(0);
+    //网格Id
+    private String gridId;
+    //网格名称
+    private String gridName;
+    //用户总数
+    private Integer userTotal = 0;
+    //党员总数
+    private Integer partyMemberTotal = 0;
+    //党员总数占比
+    private BigDecimal partyMemberRatio = bi;
+    //居民总数
+    private Integer resiTotal = 0;
+    //居民总数占比
+    private BigDecimal resiRatio = bi;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java
index f5919caac5..81188aee40 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java
@@ -1,11 +1,13 @@
 package com.epmet.dataaggre.controller;
 
-import com.epmet.commons.tools.annotation.LoginUser;
-import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dataaggre.dto.datastats.form.AgenctBasicDataFormDTO;
+import com.epmet.dataaggre.dto.datastats.form.SubAgencyFormDTO;
+import com.epmet.dataaggre.dto.datastats.form.SubGridFormDTO;
 import com.epmet.dataaggre.dto.datastats.result.AgencyBasicDataResultDTO;
+import com.epmet.dataaggre.dto.datastats.result.SubAgencyUserResultDTO;
+import com.epmet.dataaggre.dto.datastats.result.SubGridUserResultDTO;
 import com.epmet.dataaggre.service.datastats.DataStatsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -13,6 +15,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Author sun
  * @Description 数据统计服务
@@ -30,10 +34,31 @@ public class DataStatsController {
      * @author sun
      */
     @PostMapping("agencybasicdata")
-    public Result<AgencyBasicDataResultDTO> agencyBasicData(@LoginUser TokenDto tokenDto, @RequestBody AgenctBasicDataFormDTO formDTO) {
+    public Result<AgencyBasicDataResultDTO> agencyBasicData(@RequestBody AgenctBasicDataFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, AgenctBasicDataFormDTO.Agency.class);
-        formDTO.setCustomerId(tokenDto.getCustomerId());
         return new Result<AgencyBasicDataResultDTO>().ok(dataStatsService.agencyBasicData(formDTO));
     }
 
+    /**
+     * @Param formDTO
+     * @Description 查询当前组织的直属下级组织用户数据
+     * @author sun
+     */
+    @PostMapping("subagencyuser")
+    public Result<List<SubAgencyUserResultDTO>> subAgencyUser(@RequestBody SubAgencyFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, SubAgencyFormDTO.Agency.class);
+        return new Result<List<SubAgencyUserResultDTO>>().ok(dataStatsService.subAgencyUser(formDTO));
+    }
+
+    /**
+     * @Param formDTO
+     * @Description 查询当前组织下直属网格列表用户数据
+     * @author sun
+     */
+    @PostMapping("subgriduser")
+    public Result<List<SubGridUserResultDTO>> subGridUser(@RequestBody SubGridFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, SubGridFormDTO.Agency.class);
+        return new Result<List<SubGridUserResultDTO>>().ok(dataStatsService.subGridUser(formDTO));
+    }
+
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
index 7918222a52..cfc28bc839 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
@@ -18,6 +18,10 @@
 package com.epmet.dataaggre.dao.datastats;
 
 import com.epmet.dataaggre.dto.datastats.result.AgencyBasicDataResultDTO;
+import com.epmet.dataaggre.dto.datastats.result.SubAgencyUserResultDTO;
+import com.epmet.dataaggre.dto.datastats.result.SubGridUserResultDTO;
+import com.epmet.dataaggre.entity.datastats.DimAgencyEntity;
+import com.epmet.dataaggre.entity.datastats.DimGridEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -66,4 +70,27 @@ public interface DataStatsDao {
      */
     AgencyBasicDataResultDTO getAgencyProject(@Param("agencyId") String agencyId);
 
+    /**
+     * @Description 查询当前组织的直属下级组织信息
+     * @author sun
+     */
+    List<DimAgencyEntity> getSubAgencyList(@Param("pid") String pid);
+
+    /**
+     * @Description 查询当前组织的直属下级组织信息
+     * @author sun
+     */
+    List<SubAgencyUserResultDTO> getSubAgencyUser(@Param("agencyIds") List<String> agencyIds, @Param("dateId") String dateId);
+
+    /**
+     * @Description 查询组织下网格列表
+     * @author sun
+     */
+    List<DimGridEntity> getSubGridList(@Param("agencyId") String agencyId);
+
+    /**
+     * @Description 查询网格层级注册用户日统计数据
+     * @author sun
+     */
+    List<SubGridUserResultDTO> getSubGridUser(@Param("gridIds") List<String> gridIds, @Param("dateId") String dateId);
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/datastats/DimAgencyEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/datastats/DimAgencyEntity.java
new file mode 100644
index 0000000000..efec2115db
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/datastats/DimAgencyEntity.java
@@ -0,0 +1,78 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.entity.datastats;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+/**
+ * 机关维度
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-16
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("dim_agency")
+public class DimAgencyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 组织名称
+     */
+	private String agencyName;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 上级组织机构ID，根组织为0
+     */
+	private String pid;
+
+    /**
+     * 所有上级组织机构ID(以英文:隔开)
+     */
+	private String pids;
+
+	/**
+	 * 机关维度类型。self:机关本身自己,all:机关自己+下级+网格+部门等
+	 */
+	private String agencyDimType;
+
+    /**
+     * 所有上级名称,以-连接
+     */
+	private String allParentName;
+
+    /**
+	 * 机关级别（社区级：community，
+	 * 乡（镇、街道）级:street,
+	 * 区县级: district,
+	 * 市级: city
+	 * 省级:province）
+	 */
+	private String level;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/datastats/DimCustomerEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/datastats/DimCustomerEntity.java
new file mode 100644
index 0000000000..7037fe122a
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/datastats/DimCustomerEntity.java
@@ -0,0 +1,49 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.entity.datastats;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+/**
+ * 客户维度
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-16
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("dim_customer")
+public class DimCustomerEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户名称
+     */
+	private String customerName;
+
+	/**
+	 * 客户所属行政地区编码，取值来自客户根组织的area_code（01.14 add）
+	 */
+	private String areaCode;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/datastats/DimGridEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/datastats/DimGridEntity.java
new file mode 100644
index 0000000000..fcb170a9e2
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/datastats/DimGridEntity.java
@@ -0,0 +1,59 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.entity.datastats;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+/**
+ * 客户网格维度
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-16
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("dim_grid")
+public class DimGridEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 网格名称
+     */
+	private String gridName;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 所属组织机构ID（customer_agency.id）
+     */
+	private String agencyId;
+
+    /**
+     * 所属地区码（所属组织地区码）
+     */
+	private String areaCode;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
index 566d849255..a69361e18a 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
@@ -1,7 +1,13 @@
 package com.epmet.dataaggre.service.datastats;
 
 import com.epmet.dataaggre.dto.datastats.form.AgenctBasicDataFormDTO;
+import com.epmet.dataaggre.dto.datastats.form.SubAgencyFormDTO;
+import com.epmet.dataaggre.dto.datastats.form.SubGridFormDTO;
 import com.epmet.dataaggre.dto.datastats.result.AgencyBasicDataResultDTO;
+import com.epmet.dataaggre.dto.datastats.result.SubAgencyUserResultDTO;
+import com.epmet.dataaggre.dto.datastats.result.SubGridUserResultDTO;
+
+import java.util.List;
 
 /**
  * @Author sun
@@ -16,4 +22,17 @@ public interface DataStatsService {
      */
     AgencyBasicDataResultDTO agencyBasicData(AgenctBasicDataFormDTO formDTO);
 
+    /**
+     * @Param formDTO
+     * @Description 查询当前组织的直属下级组织用户数据
+     * @author sun
+     */
+    List<SubAgencyUserResultDTO> subAgencyUser(SubAgencyFormDTO formDTO);
+
+    /**
+     * @Param formDTO
+     * @Description 查询当前组织下直属网格列表用户数据
+     * @author sun
+     */
+    List<SubGridUserResultDTO> subGridUser(SubGridFormDTO formDTO);
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index 688a2d6a91..1587588412 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -1,18 +1,30 @@
 package com.epmet.dataaggre.service.datastats.impl;
 
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.datastats.DataStatsDao;
 import com.epmet.dataaggre.dto.datastats.form.AgenctBasicDataFormDTO;
+import com.epmet.dataaggre.dto.datastats.form.SubAgencyFormDTO;
+import com.epmet.dataaggre.dto.datastats.form.SubGridFormDTO;
 import com.epmet.dataaggre.dto.datastats.result.AgencyBasicDataResultDTO;
+import com.epmet.dataaggre.dto.datastats.result.SubAgencyUserResultDTO;
+import com.epmet.dataaggre.dto.datastats.result.SubGridUserResultDTO;
+import com.epmet.dataaggre.entity.datastats.DimAgencyEntity;
+import com.epmet.dataaggre.entity.datastats.DimGridEntity;
 import com.epmet.dataaggre.service.datastats.DataStatsService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.text.NumberFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
@@ -37,7 +49,6 @@ public class DataStatsServiceImpl implements DataStatsService {
     @Override
     public AgencyBasicDataResultDTO agencyBasicData(AgenctBasicDataFormDTO formDTO) {
         AgencyBasicDataResultDTO resultDTO = new AgencyBasicDataResultDTO();
-        resultDTO.setCustomerId(formDTO.getCustomerId());
         resultDTO.setAgencyId(formDTO.getAgencyId());
         NumberFormat numberFormat = NumberFormat.getInstance();
         numberFormat.setMaximumFractionDigits(NumConstant.SIX);
@@ -111,4 +122,88 @@ public class DataStatsServiceImpl implements DataStatsService {
         return resultDTO;
     }
 
+    /**
+     * @Param formDTO
+     * @Description 查询当前组织的直属下级组织用户数据
+     * @author sun
+     */
+    @Override
+    public List<SubAgencyUserResultDTO> subAgencyUser(SubAgencyFormDTO formDTO) {
+        List<SubAgencyUserResultDTO> resultList = new ArrayList<>();
+        NumberFormat numberFormat = NumberFormat.getInstance();
+        numberFormat.setMaximumFractionDigits(NumConstant.SIX);
+
+        //入参有日期的则按具体时间执行,没有的则按当前时间前一天执行
+        if (StringUtils.isBlank(formDTO.getDateId())) {
+            Date yesterday = DateUtils.addDateDays(new Date(), -1);
+            SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD);
+            formDTO.setDateId(format.format(yesterday));
+        }
+
+        //1.查询当前组织的直属下级组织信息【机关维度】
+        List<DimAgencyEntity> subAgencyList = dataStatsDao.getSubAgencyList(formDTO.getAgencyId());
+        if(subAgencyList.size()<NumConstant.ONE){
+            return resultList;
+        }
+        List<String> agencyIds = subAgencyList.stream().map(DimAgencyEntity::getId).collect(Collectors.toList());
+
+        //2.查询直属下级组织注册用户日统计数据，默认按用户总数降序
+        resultList = dataStatsDao.getSubAgencyUser(agencyIds, formDTO.getDateId());
+
+        //3.封装数据并返回
+        resultList.forEach(re->{
+            re.setPartyMemberRatio(re.getPartyMemberTotal() == 0 || re.getUserTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getPartyMemberTotal() / (float) re.getUserTotal())));
+            re.setResiRatio(re.getResiTotal() == 0 || re.getUserTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getResiTotal() / (float) re.getUserTotal())));
+            subAgencyList.forEach(sub->{
+                if(re.getAgencyId().equals(sub.getId())){
+                    re.setAgencyName(sub.getAgencyName());
+                }
+            });
+        });
+
+        return resultList;
+    }
+
+    /**
+     * @Param formDTO
+     * @Description 查询当前组织下直属网格列表用户数据
+     * @author sun
+     */
+    @Override
+    public List<SubGridUserResultDTO> subGridUser(SubGridFormDTO formDTO) {
+        List<SubGridUserResultDTO> resultList = new ArrayList<>();
+        NumberFormat numberFormat = NumberFormat.getInstance();
+        numberFormat.setMaximumFractionDigits(NumConstant.SIX);
+
+        //入参有日期的则按具体时间执行,没有的则按当前时间前一天执行
+        if (StringUtils.isBlank(formDTO.getDateId())) {
+            Date yesterday = DateUtils.addDateDays(new Date(), -1);
+            SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD);
+            formDTO.setDateId(format.format(yesterday));
+        }
+
+        //1.查询组织直属网格列表【网格维度】
+        List<DimGridEntity> gridList = dataStatsDao.getSubGridList(formDTO.getAgencyId());
+        if(gridList.size()<NumConstant.ONE){
+            return resultList;
+        }
+        List<String> gridIds = gridList.stream().map(DimGridEntity::getId).collect(Collectors.toList());
+
+        //2.查询网格层级注册用户日统计数据，默认按用户总数降序
+        resultList = dataStatsDao.getSubGridUser(gridIds, formDTO.getDateId());
+
+        //3.封装数据并返回
+        resultList.forEach(re->{
+            re.setPartyMemberRatio(re.getPartyMemberTotal() == 0 || re.getUserTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getPartyMemberTotal() / (float) re.getUserTotal())));
+            re.setResiRatio(re.getResiTotal() == 0 || re.getUserTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getResiTotal() / (float) re.getUserTotal())));
+            gridList.forEach(sub->{
+                if(re.getGridId().equals(sub.getId())){
+                    re.setGridName(sub.getGridName());
+                }
+            });
+        });
+
+        return resultList;
+    }
+
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
index 07f4f4b448..b07c649371 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
@@ -93,4 +93,61 @@
         LIMIT 1
     </select>
 
+    <select id="getSubAgencyList" resultType="com.epmet.dataaggre.entity.datastats.DimAgencyEntity">
+        SELECT
+            *
+        FROM
+            dim_agency
+        WHERE
+            del_flag = '0'
+        AND agency_dim_type = 'all'
+        AND pid = #{pid}
+    </select>
+
+    <select id="getSubAgencyUser" resultType="com.epmet.dataaggre.dto.datastats.result.SubAgencyUserResultDTO">
+        SELECT
+            agency_id AS agencyId,
+            reg_total AS userTotal,
+            partymember_total AS partyMemberTotal,
+            (reg_total - partymember_total) AS resiTotal
+        FROM
+            fact_reg_user_agency_daily
+        WHERE
+            del_flag = '0'
+        AND date_id = #{dateId}
+        <foreach item="agencyId" collection="agencyIds" open="AND (" separator="or" close=")" index="">
+            agency_id = #{agencyId}
+        </foreach>
+        ORDER BY
+            reg_total DESC
+    </select>
+
+    <select id="getSubGridList" resultType="com.epmet.dataaggre.entity.datastats.DimGridEntity">
+        SELECT
+            *
+        FROM
+            dim_grid
+        WHERE
+            del_flag = '0'
+        AND agency_id = #{agencyId}
+    </select>
+
+    <select id="getSubGridUser" resultType="com.epmet.dataaggre.dto.datastats.result.SubGridUserResultDTO">
+        SELECT
+            grid_id AS gridId,
+            reg_total AS userTotal,
+            partymember_total AS partyMemberTotal,
+            (reg_total - partymember_total) AS resiTotal
+        FROM
+            fact_reg_user_grid_daily
+        WHERE
+            del_flag = '0'
+        AND date_id = #{dateId}
+        <foreach item="gridId" collection="gridIds" open="AND (" separator="or" close=")" index="">
+            grid_id = #{gridId}
+        </foreach>
+        ORDER BY
+            reg_total DESC
+    </select>
+
 </mapper>
\ No newline at end of file

From 183977481f50b760c5b746fde6cd5232bd8ca15b Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Thu, 13 May 2021 18:10:08 +0800
Subject: [PATCH 016/128] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9A=82=E5=AD=98=20?=
 =?UTF-8?q?=E6=80=95=E4=B8=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/renren/GeneratorApplication.java  |   1 +
 .../index/dto/IndexExplainDTO.java            | 122 ++++++++++++
 .../index/dto/IndexExplainTreeDTO.java        |  97 ++++++++++
 .../index/form/IndexExplainFormDTO.java       |  52 +++++
 .../index/result/IndexExplainChildResult.java |  25 +++
 .../index/result/IndexExplainResult.java      |  48 +++++
 .../index/result/IndexGroupDetailResult.java  |  92 +++++++++
 .../index/result/IndexScoreDetailResult.java  |  44 +++++
 .../datareport/constant/IndexConstant.java    |  74 +++++++
 .../index/IndexExplainController.java         |  62 ++++++
 .../java/com/epmet/datareport/dao/.gitignore  |   0
 .../index/IndexExplainDao.java                |  36 ++++
 .../evaluationindex/index/IndexGroupDao.java  |  33 ++++
 .../index/IndexGroupDetailDao.java            |  45 +++++
 .../IndexGroupDetailEntity.java               |  90 +++++++++
 .../evaluationindex/IndexGroupEntity.java     |  68 +++++++
 .../index/IndexExplainService.java            |  42 ++++
 .../index/impl/IndexExplainServiceImpl.java   | 181 ++++++++++++++++++
 .../mapper/{fact => index}/IndexDictDao.xml   |   0
 .../mapper/index/IndexExplainDao.xml          |  41 ++++
 .../resources/mapper/index/IndexGroupDao.xml  |  23 +++
 .../mapper/index/IndexGroupDetailDao.xml      |  36 ++++
 22 files changed, 1212 insertions(+)
 create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/dto/IndexExplainDTO.java
 create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/dto/IndexExplainTreeDTO.java
 create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/form/IndexExplainFormDTO.java
 create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexExplainChildResult.java
 create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexExplainResult.java
 create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexGroupDetailResult.java
 create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexScoreDetailResult.java
 create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/constant/IndexConstant.java
 create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/index/IndexExplainController.java
 delete mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/.gitignore
 create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/index/IndexExplainDao.java
 create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/index/IndexGroupDao.java
 create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/index/IndexGroupDetailDao.java
 create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/evaluationindex/IndexGroupDetailEntity.java
 create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/evaluationindex/IndexGroupEntity.java
 create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/IndexExplainService.java
 create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
 rename epmet-module/data-report/data-report-server/src/main/resources/mapper/{fact => index}/IndexDictDao.xml (100%)
 create mode 100644 epmet-module/data-report/data-report-server/src/main/resources/mapper/index/IndexExplainDao.xml
 create mode 100644 epmet-module/data-report/data-report-server/src/main/resources/mapper/index/IndexGroupDao.xml
 create mode 100644 epmet-module/data-report/data-report-server/src/main/resources/mapper/index/IndexGroupDetailDao.xml

diff --git a/epmet-cloud-generator/src/main/java/io/renren/GeneratorApplication.java b/epmet-cloud-generator/src/main/java/io/renren/GeneratorApplication.java
index 143c4bda3a..caad8b0869 100644
--- a/epmet-cloud-generator/src/main/java/io/renren/GeneratorApplication.java
+++ b/epmet-cloud-generator/src/main/java/io/renren/GeneratorApplication.java
@@ -8,5 +8,6 @@ public class GeneratorApplication {
 
 	public static void main(String[] args) {
 		SpringApplication.run(GeneratorApplication.class, args);
+		System.out.println("http://localhost:8070/epmet-cloud-generator/#generator.html");
 	}
 }
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/dto/IndexExplainDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/dto/IndexExplainDTO.java
new file mode 100644
index 0000000000..9980f5500d
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/dto/IndexExplainDTO.java
@@ -0,0 +1,122 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.evaluationindex.index.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 指标说明文案
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-12
+ */
+@Data
+public class IndexExplainDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 标题
+     */
+	private String title;
+
+    /**
+     * 指标code
+     */
+	private String indexCode;
+
+    /**
+     * 含义
+     */
+	private String meaning;
+
+    /**
+     * 组织级别（网格级：grid;社区级：community;乡（镇、街道）级:street;区县级: district;市级: city;省级:province）
+     */
+	private String orgLevel;
+
+    /**
+     * 父ID
+     */
+	private String pid;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+    /**
+     * 是否需要查询；1有；0:无；
+     */
+	private Integer isSearch;
+
+    /**
+     * 数据类型：none；本级：self；下级：sub
+     */
+	private String type;
+
+    /**
+     * 是否下钻：1 是；0否；eg：网格的下级分数 下钻到党员
+     */
+	private Integer goDown;
+
+    /**
+     * 删除标记 0：未删除，1：已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/dto/IndexExplainTreeDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/dto/IndexExplainTreeDTO.java
new file mode 100644
index 0000000000..e50b466e9d
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/dto/IndexExplainTreeDTO.java
@@ -0,0 +1,97 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.evaluationindex.index.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * 指标说明文案
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-12
+ */
+@Data
+public class IndexExplainTreeDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 标题
+     */
+	private String title;
+
+    /**
+     * 含义
+     */
+	private String meaning;
+
+    /**
+     * 指标code
+     */
+    private String indexCode;
+
+    /**
+     * 组织级别（网格级：grid;社区级：community;乡（镇、街道）级:street;区县级: district;市级: city;省级:province）
+     */
+	private String orgLevel;
+
+    /**
+     * 父ID
+     */
+	private String pid;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+    /**
+     * 是否需要查询；1有；0:无；
+     */
+	private Integer isSearch;
+
+    /**
+     * 数据类型：none；本级：self；下级：sub
+     */
+	private String type;
+
+    /**
+     * 是否下钻：1 是；0否；eg：网格的下级分数 下钻到党员
+     */
+	private Integer goDown;
+
+    /**
+     * 子节点
+     */
+    List<IndexExplainTreeDTO> children;
+
+}
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/form/IndexExplainFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/form/IndexExplainFormDTO.java
new file mode 100644
index 0000000000..7d17b128d1
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/form/IndexExplainFormDTO.java
@@ -0,0 +1,52 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.evaluationindex.index.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 指标说明文案查询参数
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-12
+ */
+@Data
+public class IndexExplainFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 组织级别（网格级：grid;社区级：community;乡（镇、街道）级:street;区县级: district;市级: city;省级:province）
+     */
+	private String orgLevel;
+
+    /**
+     * 组织id
+     */
+    private String orgId;
+
+}
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexExplainChildResult.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexExplainChildResult.java
new file mode 100644
index 0000000000..261c8b775d
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexExplainChildResult.java
@@ -0,0 +1,25 @@
+package com.epmet.evaluationindex.index.result;
+
+import com.epmet.evaluationindex.index.dto.IndexExplainDTO;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * desc:得分明细说明结果类
+ *
+ * @author: LiuJanJun
+ * @date: 2021/5/12 4:19 下午
+ * @version: 1.0
+ */
+@Data
+public class IndexExplainChildResult extends IndexExplainDTO {
+
+    private static final long serialVersionUID = -3997821113617472317L;
+
+
+
+
+
+
+}
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexExplainResult.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexExplainResult.java
new file mode 100644
index 0000000000..5e37adf827
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexExplainResult.java
@@ -0,0 +1,48 @@
+package com.epmet.evaluationindex.index.result;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * desc:得分明细说明结果类
+ *
+ * @author: LiuJanJun
+ * @date: 2021/5/12 4:19 下午
+ * @version: 1.0
+ */
+@Data
+public class IndexExplainResult {
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 含义
+     */
+    private String meaning;
+
+    /**
+     * 子节点 list
+     */
+    private List<IndexExplainResult> children = new ArrayList<>();
+
+    /**
+     * 子节点data list
+     */
+    private List<IndexScoreDetailResult> tableDataList = new ArrayList<>();
+    /**
+     * 子节点标题 list
+     */
+    private List<String> tableTileList = new ArrayList<>();
+
+    /**
+     * 阈值说明列表
+     */
+    private List<String> thresholdList = new ArrayList<>();
+
+
+}
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexGroupDetailResult.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexGroupDetailResult.java
new file mode 100644
index 0000000000..170aed8ec9
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexGroupDetailResult.java
@@ -0,0 +1,92 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.evaluationindex.index.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 客户指标详情
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-12
+ */
+@Data
+
+public class IndexGroupDetailResult implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * index_group.id
+     */
+	private String indexGroupId;
+
+    /**
+     * 指标id
+     */
+	private String indexId;
+
+    /**
+     * 指标code
+     */
+	private String indexCode;
+
+	/**
+	 * 指标名称
+	 */
+	private String indexName;
+
+    /**
+     * 所有有权重的指标code拼接的字符串 冒号隔开
+     */
+	private String allParentIndexCode;
+
+    /**
+     * 所有指标code拼接的字符串 冒号隔开
+     */
+	private String allIndexCodePath;
+
+    /**
+     * 权重（同一组权重总和=1）
+     */
+	private BigDecimal weight;
+
+    /**
+     * 计算阈值，-1:没有阈值；如果是百分数则 为0.00几；如果为数据则直接填数值
+     */
+	private BigDecimal threshold;
+
+    /**
+     * 是否启用：启用：enable 禁用：disabled
+     */
+	private String status;
+
+    /**
+     * 正相关：positive；负相关：negative
+     */
+	private String correlation;
+
+}
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexScoreDetailResult.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexScoreDetailResult.java
new file mode 100644
index 0000000000..8eb5fb8ecb
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexScoreDetailResult.java
@@ -0,0 +1,44 @@
+package com.epmet.evaluationindex.index.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * desc:得分明细说明结果类
+ *
+ * @author: LiuJanJun
+ * @date: 2021/5/12 4:19 下午
+ * @version: 1.0
+ */
+@Data
+public class IndexScoreDetailResult implements Serializable {
+
+    private static final long serialVersionUID = -3997821113617472317L;
+    /**
+     * 指标code
+     */
+    private String indexCode;
+    /**
+     * 指标名称
+     */
+    private String indexName;
+
+    /**
+     * 原始值(如果是平均分的话 则为 参与平均的个数)
+     */
+    private String originValue;
+
+    /**
+     * 分值
+     */
+    private String score;
+
+    /**
+     * 分值
+     */
+    private String weight;
+
+
+
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/constant/IndexConstant.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/constant/IndexConstant.java
new file mode 100644
index 0000000000..df3239962b
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/constant/IndexConstant.java
@@ -0,0 +1,74 @@
+package com.epmet.datareport.constant;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @author sun
+ * @dscription 数据
+ */
+public class IndexConstant {
+
+    /**
+     * 评价指标类型-百分比
+     */
+    public static final List<String> ScoreLastHeader = Arrays.asList("指标值", "得分", "权重");
+    public static final List<String> QuantityLastHeader = Arrays.asList("数量", "平均值", "权重");
+
+    private static final String DJZS_CN = "党建指数";
+    private static final String FWZS_CN = "服务指数";
+    private static final String ZLZS_CN = "治理指数";
+    private static final String ZB_CN = "指标";
+    private static final String BEN_JI = "本级";
+    private static final String XIA_JI = "下级";
+
+
+    /**
+     * desc: 根据indexCode 获取表格表头
+     *
+     * @param allIndexCode
+     * @return java.util.List<java.lang.String>
+     * @author LiuJanJun
+     * @date 2021/5/13 11:06 上午
+     */
+    public static List<String> getStandardSelfHeaders(String allIndexCode) {
+        List<String> result = new ArrayList<>(8);
+        if (StringUtils.isBlank(allIndexCode)) {
+            return null;
+        }
+
+        if (allIndexCode.contains(FactConstant.DJNL)) {
+            result.add(BEN_JI + DJZS_CN + ZB_CN);
+        } else if (allIndexCode.contains(FactConstant.FWNL)) {
+            result.add(BEN_JI + FWZS_CN + ZB_CN);
+        } else if (allIndexCode.contains(FactConstant.ZLNL)) {
+            result.add(BEN_JI + ZLZS_CN + ZB_CN);
+        }
+        result.addAll(ScoreLastHeader);
+        return result;
+    }
+
+    /**
+     * desc: 根据indexCode 获取表格表头
+     *
+     * @param allIndexCode
+     * @return java.util.List<java.lang.String>
+     * @author LiuJanJun
+     * @date 2021/5/13 11:06 上午
+     */
+    public static List<String> getStandardSubHeaders(String allIndexCode) {
+        List<String> result = new ArrayList<>(8);
+        if (allIndexCode.contains(FactConstant.DJNL)) {
+            result.add(XIA_JI + DJZS_CN + ZB_CN);
+        } else if (allIndexCode.contains(FactConstant.FWNL)) {
+            result.add(XIA_JI + FWZS_CN + ZB_CN);
+        } else if (allIndexCode.contains(FactConstant.ZLNL)) {
+            result.add(XIA_JI + ZLZS_CN + ZB_CN);
+        }
+        result.addAll(QuantityLastHeader);
+        return result;
+    }
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/index/IndexExplainController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/index/IndexExplainController.java
new file mode 100644
index 0000000000..14ab225481
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/index/IndexExplainController.java
@@ -0,0 +1,62 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.controller.index;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.datareport.service.evaluationindex.index.IndexExplainService;
+import com.epmet.evaluationindex.index.form.IndexExplainFormDTO;
+import com.epmet.evaluationindex.index.result.IndexExplainResult;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+
+/**
+ * 指标说明文案
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-12
+ */
+@RestController
+@RequestMapping("indexexplain")
+public class IndexExplainController {
+
+    @Autowired
+    private IndexExplainService indexExplainService;
+
+
+    /**
+     * desc: 获取得分说明明细
+     *
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.group.dto.result.GroupSummaryInfoResultDTO>
+     * @author LiuJanJun
+     * @date 2021/5/12 4:12 下午
+     */
+    @PostMapping("detail")
+    public Result<List<IndexExplainResult>> getScoreDetail(@RequestBody IndexExplainFormDTO formDTO){
+        Result<List<IndexExplainResult>> ok = new Result<List<IndexExplainResult>>().ok(indexExplainService.getScoreDetail(formDTO));
+        return ok;
+    }
+
+
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/.gitignore b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/index/IndexExplainDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/index/IndexExplainDao.java
new file mode 100644
index 0000000000..64fc30bac1
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/index/IndexExplainDao.java
@@ -0,0 +1,36 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.evaluationindex.index;
+
+import com.epmet.evaluationindex.index.dto.IndexExplainTreeDTO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 指标说明文案
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-12
+ */
+@Mapper
+public interface IndexExplainDao {
+
+    List<IndexExplainTreeDTO> getIndexExplainTreeByOrgType(@Param("orgLevel") String orgLevel);
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/index/IndexGroupDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/index/IndexGroupDao.java
new file mode 100644
index 0000000000..31a4dd6030
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/index/IndexGroupDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.evaluationindex.index;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.datareport.entity.evaluationindex.IndexGroupEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 客户指标分组
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-12
+ */
+@Mapper
+public interface IndexGroupDao extends BaseDao<IndexGroupEntity> {
+
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/index/IndexGroupDetailDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/index/IndexGroupDetailDao.java
new file mode 100644
index 0000000000..06cfac4493
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/index/IndexGroupDetailDao.java
@@ -0,0 +1,45 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.evaluationindex.index;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.datareport.entity.evaluationindex.IndexGroupDetailEntity;
+import com.epmet.evaluationindex.index.result.IndexGroupDetailResult;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 客户指标详情
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-12
+ */
+@Mapper
+public interface IndexGroupDetailDao extends BaseDao<IndexGroupDetailEntity> {
+
+    /**
+     * desc: 根据客户Id获取客户所有指标数据
+     *
+     * @param customerId
+     * @return java.util.List<com.epmet.evaluationindex.index.result.IndexGroupDetailResult>
+     * @author LiuJanJun
+     * @date 2021/5/13 2:41 下午
+     */
+    List<IndexGroupDetailResult> getAllIndexByCId(String customerId);
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/evaluationindex/IndexGroupDetailEntity.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/evaluationindex/IndexGroupDetailEntity.java
new file mode 100644
index 0000000000..9e73f700a7
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/evaluationindex/IndexGroupDetailEntity.java
@@ -0,0 +1,90 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.entity.evaluationindex;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+
+/**
+ * 客户指标详情
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-12
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("index_group_detail")
+public class IndexGroupDetailEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * index_group.id
+     */
+	private String indexGroupId;
+
+    /**
+     * 指标id
+     */
+	private String indexId;
+
+    /**
+     * 指标code
+     */
+	private String indexCode;
+
+    /**
+     * 所有有权重的指标code拼接的字符串 冒号隔开
+     */
+	private String allParentIndexCode;
+
+    /**
+     * 所有指标code拼接的字符串 冒号隔开
+     */
+	private String allIndexCodePath;
+
+    /**
+     * 权重（同一组权重总和=1）
+     */
+	private BigDecimal weight;
+
+    /**
+     * 计算阈值，-1:没有阈值；如果是百分数则 为0.00几；如果为数据则直接填数值
+     */
+	private BigDecimal threshold;
+
+    /**
+     * 是否启用：启用：enable 禁用：disabled
+     */
+	private String status;
+
+    /**
+     * 正相关：positive；负相关：negative
+     */
+	private String correlation;
+
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/evaluationindex/IndexGroupEntity.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/evaluationindex/IndexGroupEntity.java
new file mode 100644
index 0000000000..31716ee9ec
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/evaluationindex/IndexGroupEntity.java
@@ -0,0 +1,68 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.entity.evaluationindex;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 客户指标分组
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-12
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("index_group")
+public class IndexGroupEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 指标id
+     */
+	private String indexId;
+
+    /**
+     * 指标code
+     */
+	private String indexCode;
+
+    /**
+     * 是否启用：启用：enable 禁用：disabled
+     */
+	private String status;
+
+    /**
+     * 当前指标关联的上一级指标分组，如果没有上一级，则为0
+     */
+	private String parentIndexGroupId;
+
+    /**
+     * 所有指标code拼接的字符串 冒号隔开
+     */
+	private String allIndexCodePath;
+
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/IndexExplainService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/IndexExplainService.java
new file mode 100644
index 0000000000..54c12aed09
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/IndexExplainService.java
@@ -0,0 +1,42 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.service.evaluationindex.index;
+
+import com.epmet.evaluationindex.index.form.IndexExplainFormDTO;
+import com.epmet.evaluationindex.index.result.IndexExplainResult;
+
+import java.util.List;
+
+/**
+ * 指标说明文案
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-12
+ */
+public interface IndexExplainService {
+
+    /**
+     * desc: 获取指标得分说明
+     *
+     * @param formDTO
+     * @return java.util.List<com.epmet.evaluationindex.index.result.IndexExplainResult>
+     * @author LiuJanJun
+     * @date 2021/5/12 4:38 下午
+     */
+    List<IndexExplainResult> getScoreDetail(IndexExplainFormDTO formDTO);
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
new file mode 100644
index 0000000000..b21d3f0ec4
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
@@ -0,0 +1,181 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.service.evaluationindex.index.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.utils.DateUtils;
+import com.epmet.constant.DataSourceConstant;
+import com.epmet.datareport.constant.IndexConstant;
+import com.epmet.datareport.dao.evaluationindex.index.IndexExplainDao;
+import com.epmet.datareport.dao.evaluationindex.index.IndexGroupDetailDao;
+import com.epmet.datareport.dao.fact.FactIndexGridSubScoreDao;
+import com.epmet.datareport.service.evaluationindex.index.IndexExplainService;
+import com.epmet.evaluationindex.index.dto.IndexExplainTreeDTO;
+import com.epmet.evaluationindex.index.form.IndexExplainFormDTO;
+import com.epmet.evaluationindex.index.result.IndexExplainResult;
+import com.epmet.evaluationindex.index.result.IndexGroupDetailResult;
+import com.epmet.evaluationindex.index.result.IndexScoreDetailResult;
+import com.epmet.evaluationindex.screen.dto.form.AblityListFormDTO;
+import com.epmet.evaluationindex.screen.dto.result.AblityListResultDTO;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 指标说明文案
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-12
+ */
+@Service
+@DataSource(DataSourceConstant.EVALUATION_INDEX)
+public class IndexExplainServiceImpl implements IndexExplainService {
+
+    @Autowired
+    private IndexExplainDao indexExplainDao;
+    @Autowired
+    private IndexGroupDetailDao indexGroupDetailDao;
+    @Autowired
+    private FactIndexGridSubScoreDao gridSubScoreDao;
+
+
+    @Override
+    public List<IndexExplainResult> getScoreDetail(IndexExplainFormDTO formDTO) {
+        List<IndexExplainResult> results = new ArrayList<>();
+        List<IndexExplainTreeDTO> explainDTOList = indexExplainDao.getIndexExplainTreeByOrgType(formDTO.getOrgLevel());
+        if (CollectionUtils.isEmpty(explainDTOList)) {
+            return null;
+        }
+        List<IndexGroupDetailResult> groupDetailEntities = indexGroupDetailDao.getAllIndexByCId(formDTO.getCustomerId());
+        if (CollectionUtils.isEmpty(groupDetailEntities)) {
+            return null;
+        }
+        Map<String, List<IndexGroupDetailResult>> detailEntityMap = groupDetailEntities.stream().collect(Collectors.groupingBy(IndexGroupDetailResult::getAllParentIndexCode));
+
+
+        for (IndexExplainTreeDTO explainDTO : explainDTOList) {
+            //根节点
+            IndexExplainResult result = new IndexExplainResult();
+            results.add(result);
+            result.setTitle(explainDTO.getTitle());
+            result.setMeaning(explainDTO.getMeaning());
+
+            setTableData(formDTO, detailEntityMap, explainDTO, result);
+
+
+            setChildren(formDTO, detailEntityMap, result, explainDTO, explainDTO.getChildren());
+            System.out.println(JSON.toJSONString(result));
+        }
+
+
+        return results;
+    }
+
+    private void setTableData(IndexExplainFormDTO formDTO, Map<String, List<IndexGroupDetailResult>> detailEntityMap, IndexExplainTreeDTO explainDTO, IndexExplainResult result) {
+        Integer goDown = explainDTO.getGoDown();
+        if (NumConstant.ONE == explainDTO.getIsSearch()) {
+            List<String> tableHeaders = getTableHeaders(explainDTO);
+            result.setTableTileList(tableHeaders);
+            switch (explainDTO.getOrgLevel()) {
+                case "grid":
+                    String type = explainDTO.getType();
+                    String allIndexCodePath = explainDTO.getIndexCode();
+                    List<IndexGroupDetailResult> indexGroupDetailEntities = detailEntityMap.get(allIndexCodePath);
+                    List<IndexScoreDetailResult> tableList = new ArrayList<>();
+                    indexGroupDetailEntities.forEach(index -> {
+                        //设置默认值
+                        if (!index.getAllIndexCodePath().contains(type)) {
+                            return;
+                        }
+                        IndexScoreDetailResult table = new IndexScoreDetailResult();
+                        table.setIndexCode(index.getIndexCode());
+                        table.setIndexName(index.getIndexName());
+                        table.setOriginValue(NumConstant.ZERO_STR);
+                        table.setScore(NumConstant.ZERO_STR);
+                        table.setWeight(index.getWeight().multiply(new BigDecimal(100)).setScale(NumConstant.TWO, BigDecimal.ROUND_HALF_UP) + "%");
+                        tableList.add(table);
+
+
+                    });
+                    result.setTableDataList(tableList);
+                    //set Target value
+                    if (goDown == 1) {
+                        AblityListFormDTO ablityListFormDTO = new AblityListFormDTO();
+                        ablityListFormDTO.setCustomerId(formDTO.getCustomerId());
+                        ablityListFormDTO.setOrgId(formDTO.getOrgId());
+                        ablityListFormDTO.setOrgType(formDTO.getOrgLevel());
+                        ablityListFormDTO.setMonthId(DateUtils.getCurrentTimeBeforeMonthId());
+                        ablityListFormDTO.setAllParentIndexCode(allIndexCodePath);
+
+                        List<AblityListResultDTO> scoreList = gridSubScoreDao.selectGridAblityList(ablityListFormDTO);
+                        scoreList.forEach(score -> {
+                            for (IndexScoreDetailResult tb : tableList) {
+                                if (tb.getIndexCode().equals(score.getKey())) {
+                                    tb.setOriginValue(score.getValue());
+                                    tb.setScore(String.valueOf(score.getScore()));
+                                    tb.setWeight(score.getWeight().multiply(new BigDecimal(100)).setScale(NumConstant.TWO, BigDecimal.ROUND_HALF_UP) + "%");
+                                }
+                            }
+                        });
+                    }
+                    break;
+                default:
+
+            }
+        }
+    }
+
+    private void setChildren(IndexExplainFormDTO formDTO, Map<String, List<IndexGroupDetailResult>> detailEntityMap, IndexExplainResult result, IndexExplainTreeDTO parentNode, List<IndexExplainTreeDTO> children) {
+        List<IndexExplainResult> childrenList = new ArrayList<>();
+        children.forEach(child -> {
+            IndexExplainResult ch = new IndexExplainResult();
+            ch.setTitle(child.getTitle());
+            ch.setMeaning(child.getMeaning());
+            if (CollectionUtils.isNotEmpty(child.getChildren())) {
+                setChildren(formDTO, detailEntityMap, ch, child, child.getChildren());
+            }
+            setTableData(formDTO, detailEntityMap, child, ch);
+            childrenList.add(ch);
+        });
+        result.setChildren(childrenList);
+    }
+
+    public static void main(String[] args) {
+
+    }
+
+    private List<String> getTableHeaders(IndexExplainTreeDTO explain) {
+        String type = explain.getType();
+        List<String> headers = new ArrayList<>();
+        if ("zishen".equals(type)) {
+            headers = IndexConstant.getStandardSelfHeaders(explain.getIndexCode());
+
+        } else if ("xiaji".equals(type)) {
+            headers = IndexConstant.getStandardSubHeaders(explain.getIndexCode());
+        }
+        return headers;
+    }
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/IndexDictDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/index/IndexDictDao.xml
similarity index 100%
rename from epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/IndexDictDao.xml
rename to epmet-module/data-report/data-report-server/src/main/resources/mapper/index/IndexDictDao.xml
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/index/IndexExplainDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/index/IndexExplainDao.xml
new file mode 100644
index 0000000000..392ba21ddd
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/index/IndexExplainDao.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.datareport.dao.evaluationindex.index.IndexExplainDao">
+
+    <resultMap id="explainTreeResultMap" type="com.epmet.evaluationindex.index.dto.IndexExplainTreeDTO">
+         <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="title" column="TITLE"/>
+        <result property="meaning" column="MEANING"/>
+        <result property="indexCode" column="INDEX_CODE"/>
+        <result property="orgLevel" column="ORG_LEVEL"/>
+        <result property="pid" column="PID"/>
+        <result property="sort" column="SORT"/>
+        <result property="isSearch" column="IS_SEARCH"/>
+        <result property="type" column="TYPE"/>
+        <result property="goDown" column="GO_DOWN"/>
+       <collection property="children" ofType="com.epmet.evaluationindex.index.dto.IndexExplainTreeDTO" column="ID"  select="getIndexExplainTreeByPid">
+
+</collection>
+    </resultMap>
+    <select id="getIndexExplainTreeByOrgType" resultMap="explainTreeResultMap">
+        SELECT
+            ID, CUSTOMER_ID, TITLE, MEANING, INDEX_CODE, ORG_LEVEL, PID, SORT, IS_SEARCH, TYPE, GO_DOWN
+        FROM  index_explain
+        WHERE
+            ORG_LEVEL = #{orgLevel}
+            and DEL_FLAG = '0'
+            AND PID = '0'
+        ORDER BY SORT
+    </select>
+    <select id="getIndexExplainTreeByPid" resultMap="explainTreeResultMap">
+        SELECT
+            ID, CUSTOMER_ID, TITLE, MEANING, INDEX_CODE, ORG_LEVEL, PID, SORT, IS_SEARCH, TYPE, GO_DOWN
+        FROM  index_explain
+        WHERE
+            DEL_FLAG = '0'
+            AND PID = #{pid}
+        ORDER BY SORT
+    </select>
+</mapper>
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/index/IndexGroupDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/index/IndexGroupDao.xml
new file mode 100644
index 0000000000..e91cf12796
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/index/IndexGroupDao.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.datareport.dao.evaluationindex.index.IndexGroupDao">
+
+    <!--<resultMap type="com.epmet.entity.IndexGroupEntity" id="indexGroupMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="indexId" column="INDEX_ID"/>
+        <result property="indexCode" column="INDEX_CODE"/>
+        <result property="status" column="STATUS"/>
+        <result property="parentIndexGroupId" column="PARENT_INDEX_GROUP_ID"/>
+        <result property="allIndexCodePath" column="ALL_INDEX_CODE_PATH"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>-->
+
+
+</mapper>
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/index/IndexGroupDetailDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/index/IndexGroupDetailDao.xml
new file mode 100644
index 0000000000..741df34cfb
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/index/IndexGroupDetailDao.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.datareport.dao.evaluationindex.index.IndexGroupDetailDao">
+
+    <!--<resultMap type="com.epmet.entity.IndexGroupDetailEntity" id="indexGroupDetailMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="indexGroupId" column="INDEX_GROUP_ID"/>
+        <result property="indexId" column="INDEX_ID"/>
+        <result property="indexCode" column="INDEX_CODE"/>
+        <result property="allParentIndexCode" column="ALL_PARENT_INDEX_CODE"/>
+        <result property="allIndexCodePath" column="ALL_INDEX_CODE_PATH"/>
+        <result property="weight" column="WEIGHT"/>
+        <result property="threshold" column="THRESHOLD"/>
+        <result property="status" column="STATUS"/>
+        <result property="correlation" column="CORRELATION"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>-->
+
+
+    <select id="getAllIndexByCId" resultType="com.epmet.evaluationindex.index.result.IndexGroupDetailResult">
+        SELECT
+            d.ID, d.CUSTOMER_ID, d.INDEX_GROUP_ID, d.INDEX_ID, d.INDEX_CODE, d.ALL_PARENT_INDEX_CODE,
+            d.ALL_INDEX_CODE_PATH, d.WEIGHT, d.THRESHOLD, d.STATUS, d.CORRELATION,
+            id.INDEX_NAME
+        FROM index_group_detail d LEFT JOIN index_dict id ON d.index_code = id.index_code
+        WHERE
+            d.DEL_FLAG = 0 AND id.DEL_FLAG = 0 AND d.CUSTOMER_ID = #{customerId}
+    </select>
+</mapper>

From 443a1a26a4261af7b3f401c96a9645f0509dda0c Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 14 May 2021 10:01:59 +0800
Subject: [PATCH 017/128] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/AgenctBasicDataFormDTO.java          |  4 ++++
 .../dataaggre/dao/datastats/DataStatsDao.java | 12 ++++++------
 .../datastats/impl/DataStatsServiceImpl.java  | 19 +++++++++++++------
 .../mapper/datastats/DatsStatsDao.xml         | 18 ++++++------------
 4 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/AgenctBasicDataFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/AgenctBasicDataFormDTO.java
index 609cf1729a..9f8c5fd1b1 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/AgenctBasicDataFormDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/AgenctBasicDataFormDTO.java
@@ -20,6 +20,10 @@ public class AgenctBasicDataFormDTO implements Serializable {
      */
     @NotBlank(message = "组织ID不能为空",groups = AgenctBasicDataFormDTO.Agency.class)
     private String agencyId;
+    /**
+     * 日维度Id
+     */
+    private String dateId;
     public interface Agency extends CustomerClientShowGroup{}
 
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
index cfc28bc839..c0ef0d6e14 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
@@ -38,37 +38,37 @@ public interface DataStatsDao {
      * @Description 查询组织下注册用户最新日统计数据
      * @author sun
      */
-    AgencyBasicDataResultDTO getAgnecyRegUser(@Param("agencyId") String agencyId);
+    AgencyBasicDataResultDTO getAgnecyRegUser(@Param("agencyId") String agencyId, @Param("dateId") String dateId);
 
     /**
      * @Description 查询组织下最新群组日统计数据
      * @author sun
      */
-    AgencyBasicDataResultDTO getAgnecyGroup(@Param("agencyId") String agencyId);
+    AgencyBasicDataResultDTO getAgnecyGroup(@Param("agencyId") String agencyId, @Param("dateId") String dateId);
 
     /**
      * @Description 查询组织下最新状态话题-机关日统计数据表
      * @author sun
      */
-    List<AgencyBasicDataResultDTO.Topic> getAgencyTopic(@Param("agencyId") String agencyId);
+    List<AgencyBasicDataResultDTO.Topic> getAgencyTopic(@Param("agencyId") String agencyId, @Param("dateId") String dateId);
 
     /**
      * @Description 查询组织下最新转议题话题-机关日统计数据表
      * @author sun
      */
-    AgencyBasicDataResultDTO.Topic getAgencyTopicShiftIssue(@Param("agencyId") String agencyId);
+    AgencyBasicDataResultDTO.Topic getAgencyTopicShiftIssue(@Param("agencyId") String agencyId, @Param("dateId") String dateId);
 
     /**
      * @Description 查询组织下最新议题日统计数据
      * @author sun
      */
-    AgencyBasicDataResultDTO getAgencyIssue(@Param("agencyId") String agencyId);
+    AgencyBasicDataResultDTO getAgencyIssue(@Param("agencyId") String agencyId, @Param("dateId") String dateId);
 
     /**
      * @Description 查询组织下最新项目日统计数据
      * @author sun
      */
-    AgencyBasicDataResultDTO getAgencyProject(@Param("agencyId") String agencyId);
+    AgencyBasicDataResultDTO getAgencyProject(@Param("agencyId") String agencyId, @Param("dateId") String dateId);
 
     /**
      * @Description 查询当前组织的直属下级组织信息
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index 1587588412..0c4465b7fe 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -53,8 +53,15 @@ public class DataStatsServiceImpl implements DataStatsService {
         NumberFormat numberFormat = NumberFormat.getInstance();
         numberFormat.setMaximumFractionDigits(NumConstant.SIX);
 
+        //入参有日期的则按具体时间执行,没有的则按当前时间前一天执行
+        if (StringUtils.isBlank(formDTO.getDateId())) {
+            Date yesterday = DateUtils.addDateDays(new Date(), -1);
+            SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD);
+            formDTO.setDateId(format.format(yesterday));
+        }
+
         //1.查询组织下注册用户最新日统计数据【只查询注册用户的统计数据，不涉及参与用户的】
-        AgencyBasicDataResultDTO user = dataStatsDao.getAgnecyRegUser(formDTO.getAgencyId());
+        AgencyBasicDataResultDTO user = dataStatsDao.getAgnecyRegUser(formDTO.getAgencyId(), formDTO.getDateId());
         if (null != user) {
             resultDTO.setUserTotal(user.getUserTotal());
             resultDTO.setResiTotal(user.getResiTotal());
@@ -64,7 +71,7 @@ public class DataStatsServiceImpl implements DataStatsService {
         }
 
         //2.查询组织下最新群组日统计数据
-        AgencyBasicDataResultDTO group = dataStatsDao.getAgnecyGroup(formDTO.getAgencyId());
+        AgencyBasicDataResultDTO group = dataStatsDao.getAgnecyGroup(formDTO.getAgencyId(), formDTO.getDateId());
         if (null != user) {
             resultDTO.setGroupTotal(group.getGroupTotal());
             resultDTO.setOrdinaryTotal(group.getOrdinaryTotal());
@@ -76,9 +83,9 @@ public class DataStatsServiceImpl implements DataStatsService {
         //3.查询组织下最新话题日统计数据
         //状态话题-机关日统计数据表最新日期三种状态数据
         //机关日表里三种类型数据之和就是话题总量，讨论中数量与热议中不是一个概念，热议中=总量-关闭数-屏蔽数-转议题数
-        List<AgencyBasicDataResultDTO.Topic> topic = dataStatsDao.getAgencyTopic(formDTO.getAgencyId());
+        List<AgencyBasicDataResultDTO.Topic> topic = dataStatsDao.getAgencyTopic(formDTO.getAgencyId(), formDTO.getDateId());
         //转议题话题-机关日统计数据表
-        AgencyBasicDataResultDTO.Topic topicSHiftIssue = dataStatsDao.getAgencyTopicShiftIssue(formDTO.getAgencyId());
+        AgencyBasicDataResultDTO.Topic topicSHiftIssue = dataStatsDao.getAgencyTopicShiftIssue(formDTO.getAgencyId(), formDTO.getDateId());
         AtomicReference<Integer> closedTotal = new AtomicReference<>(0);
         AtomicReference<Integer> hiddenTotal = new AtomicReference<>(0);
         if (topic.size()>NumConstant.ZERO) {
@@ -98,7 +105,7 @@ public class DataStatsServiceImpl implements DataStatsService {
         resultDTO.setClosedTopicRatio(resultDTO.getClosedTopicTotal() == 0 || resultDTO.getTopicTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getClosedTopicTotal() / (float) resultDTO.getTopicTotal())));
 
         //4.查询组织下最新议题日统计数据
-        AgencyBasicDataResultDTO issue = dataStatsDao.getAgencyIssue(formDTO.getAgencyId());
+        AgencyBasicDataResultDTO issue = dataStatsDao.getAgencyIssue(formDTO.getAgencyId(), formDTO.getDateId());
         if (null != issue) {
             resultDTO.setIssueTotal(issue.getIssueTotal());
             resultDTO.setVotingTotal(issue.getVotingTotal());
@@ -110,7 +117,7 @@ public class DataStatsServiceImpl implements DataStatsService {
         }
 
         //5.查询组织下最新项目日统计数据
-        AgencyBasicDataResultDTO project = dataStatsDao.getAgencyProject(formDTO.getAgencyId());
+        AgencyBasicDataResultDTO project = dataStatsDao.getAgencyProject(formDTO.getAgencyId(), formDTO.getDateId());
         if (null != project) {
             resultDTO.setProjectTotal(project.getProjectTotal());
             resultDTO.setPendingTotal(project.getPendingTotal());
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
index b07c649371..43ea7b7e85 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
@@ -13,8 +13,7 @@
         WHERE
             del_flag = '0'
         AND agency_id = #{agencyId}
-        ORDER BY
-            date_id DESC
+        AND date_id = #{dateId}
         LIMIT 1
     </select>
 
@@ -28,8 +27,7 @@
         WHERE
             del_flag = '0'
         AND agency_id = #{agencyId}
-        ORDER BY
-            date_id DESC
+        AND date_id = #{dateId}
         LIMIT 1
     </select>
 
@@ -43,8 +41,7 @@
             del_flag = '0'
         AND topic_status_id in('discussing','closed','hidden')<!-- 讨论中(热议中！=讨论中)、已处理、已屏蔽 -->
         AND agency_id = #{agencyId}
-        ORDER BY
-            date_id DESC
+        AND date_id = #{dateId}
         LIMIT 3
     </select>
 
@@ -57,8 +54,7 @@
         WHERE
             del_flag = '0'
         AND agency_id = #{agencyId}
-        ORDER BY
-            date_id DESC
+        AND date_id = #{dateId}
         LIMIT 1
     </select>
 
@@ -73,8 +69,7 @@
         WHERE
             del_flag = '0'
         AND agency_id = #{agencyId}
-        ORDER BY
-            date_id DESC
+        AND date_id = #{dateId}
         LIMIT 1
     </select>
 
@@ -88,8 +83,7 @@
         WHERE
             del_flag = '0'
         AND agency_id = '8631fa4b22e88fdc259b3f51b5de2be2'
-        ORDER BY
-            date_id DESC
+        AND date_id = #{dateId}
         LIMIT 1
     </select>
 

From 5cd2ff433fea9563f7c5146ca443b5281f9f5152 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 14 May 2021 14:48:21 +0800
Subject: [PATCH 018/128] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E6=8C=87=E6=A0=87=E6=98=8E=E7=BB=86=20=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../index/form/IndexScoreFormDTO.java         | 40 ++++++++
 .../index/result/IndexScoreDetailResult.java  |  5 +
 .../index/result/IndexScoreResult.java        | 40 ++++++++
 .../dao/fact/FactIndexCpcScoreDao.java        | 33 +++++++
 .../dao/fact/FactIndexCpcSubScoreDao.java     | 38 +++++++
 .../dao/fact/FactIndexGridSubScoreDao.java    | 12 +++
 .../FactIndexCpcScoreEntity.java              | 98 +++++++++++++++++++
 .../FactIndexCpcSubScoreEntity.java           | 98 +++++++++++++++++++
 .../index/impl/IndexExplainServiceImpl.java   | 96 ++++++++++--------
 .../mapper/fact/FactIndexCpcScoreDao.xml      | 28 ++++++
 .../mapper/fact/FactIndexCpcSubScoreDao.xml   | 43 ++++++++
 .../mapper/fact/FactIndexGridSubScoreDao.xml  | 32 ++++++
 12 files changed, 520 insertions(+), 43 deletions(-)
 create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/form/IndexScoreFormDTO.java
 create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexScoreResult.java
 create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexCpcScoreDao.java
 create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexCpcSubScoreDao.java
 create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/evaluationindex/FactIndexCpcScoreEntity.java
 create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/evaluationindex/FactIndexCpcSubScoreEntity.java
 create mode 100644 epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCpcScoreDao.xml
 create mode 100644 epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCpcSubScoreDao.xml

diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/form/IndexScoreFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/form/IndexScoreFormDTO.java
new file mode 100644
index 0000000000..0ee464a9b5
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/form/IndexScoreFormDTO.java
@@ -0,0 +1,40 @@
+package com.epmet.evaluationindex.index.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *  指标分数 返回结果
+ * @Author sun
+ */
+@Data
+public class IndexScoreFormDTO implements Serializable {
+
+
+    private static final long serialVersionUID = 6225580299239889980L;
+
+    private String customerId;
+    /**
+     * 组织或网格Id
+     */
+    private String orgId;
+    /**
+     * 组织或网格类型
+     */
+    private String orgType;
+
+    /**
+     * 月份Id（格式：202009）
+     */
+    private String monthId;
+    /**
+     * 类型（党建能力：dangjiannengli；治理能力：zhilinengli；服务能力：fuwunengli；）
+     */
+    private String indexCode;
+    /**
+     * 所有有权重的指标code拼接的字符串 冒号隔开
+     */
+    private String allParentIndexCode;
+
+}
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexScoreDetailResult.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexScoreDetailResult.java
index 8eb5fb8ecb..8b30af940f 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexScoreDetailResult.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexScoreDetailResult.java
@@ -39,6 +39,11 @@ public class IndexScoreDetailResult implements Serializable {
      */
     private String weight;
 
+    /**
+     * 数量
+     */
+    private String quantity;
+
 
 
 }
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexScoreResult.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexScoreResult.java
new file mode 100644
index 0000000000..c817b5de55
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexScoreResult.java
@@ -0,0 +1,40 @@
+package com.epmet.evaluationindex.index.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ *  指标分数 返回结果
+ * @Author sun
+ */
+@Data
+public class IndexScoreResult implements Serializable {
+
+
+    private static final long serialVersionUID = -8458272574625683349L;
+    /**
+     * 指标code
+     */
+    private String indexCode;
+    /**
+     * 指标对应值（数值或百分比）原始值
+     */
+    private BigDecimal score;
+
+    /**
+     * 指标对应的权重
+     */
+    private BigDecimal weight;
+
+    /**
+     * 原始值
+     */
+    private String originValue;
+    /**
+     * 数量
+     */
+    private String quantity;
+
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexCpcScoreDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexCpcScoreDao.java
new file mode 100644
index 0000000000..1bd10bd84c
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexCpcScoreDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.fact;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.datareport.entity.evaluationindex.FactIndexCpcScoreEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 党员相关分值
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-14
+ */
+@Mapper
+public interface FactIndexCpcScoreDao extends BaseDao<FactIndexCpcScoreEntity> {
+
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexCpcSubScoreDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexCpcSubScoreDao.java
new file mode 100644
index 0000000000..cc59f410ba
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexCpcSubScoreDao.java
@@ -0,0 +1,38 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.fact;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.datareport.entity.evaluationindex.FactIndexCpcSubScoreEntity;
+import com.epmet.evaluationindex.index.form.IndexScoreFormDTO;
+import com.epmet.evaluationindex.index.result.IndexScoreResult;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 党员相关分值
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-14
+ */
+@Mapper
+public interface FactIndexCpcSubScoreDao extends BaseDao<FactIndexCpcSubScoreEntity> {
+
+    List<IndexScoreResult> selecCpcAvgScore(IndexScoreFormDTO ablityListFormDTO);
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexGridSubScoreDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexGridSubScoreDao.java
index 8900171322..b71adcdd4e 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexGridSubScoreDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexGridSubScoreDao.java
@@ -17,6 +17,8 @@
 
 package com.epmet.datareport.dao.fact;
 
+import com.epmet.evaluationindex.index.form.IndexScoreFormDTO;
+import com.epmet.evaluationindex.index.result.IndexScoreResult;
 import com.epmet.evaluationindex.screen.dto.form.AblityListFormDTO;
 import com.epmet.evaluationindex.screen.dto.form.MonthAblityListFormDTO;
 import com.epmet.evaluationindex.screen.dto.result.AblityListResultDTO;
@@ -48,4 +50,14 @@ public interface FactIndexGridSubScoreDao {
      * @author sun
      */
     LinkedList<MonthAblityListResultDTO> selectGridMonthAblityList(MonthAblityListFormDTO formDTO);
+
+    /**
+     * desc: 查询分数
+     *
+     * @param ablityListFormDTO
+     * @return java.util.List<com.epmet.evaluationindex.index.result.IndexScoreResult>
+     * @author LiuJanJun
+     * @date 2021/5/14 2:07 下午
+     */
+    List<IndexScoreResult> selectGridSubScore(IndexScoreFormDTO ablityListFormDTO);
 }
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/evaluationindex/FactIndexCpcScoreEntity.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/evaluationindex/FactIndexCpcScoreEntity.java
new file mode 100644
index 0000000000..5a4455b069
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/evaluationindex/FactIndexCpcScoreEntity.java
@@ -0,0 +1,98 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.entity.evaluationindex;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+
+/**
+ * 党员相关分值
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-14
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("fact_index_cpc_score")
+public class FactIndexCpcScoreEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 网格所属的机关Id
+     */
+	private String agencyId;
+
+    /**
+     * 网格Id
+     */
+	private String gridId;
+
+    /**
+     * 年度ID: yyyy
+     */
+	private String yearId;
+
+    /**
+     * 月维度Id: yyyyMM
+     */
+	private String monthId;
+
+    /**
+     * 用户id
+     */
+	private String userId;
+
+    /**
+     * 1：总分；0不是 默认0
+     */
+	private String isTotal;
+
+    /**
+     * 分值
+     */
+	private BigDecimal score;
+
+    /**
+     * 参与议事分值：canyuyishi；
+党务活动分值：dangwuhuodong；
+联系群众分值：lianxiqunzhong；
+党建能力分值：dangjiannengli
+     */
+	private String indexCode;
+
+    /**
+     * 所有指标code拼接的字符串 冒号隔开
+     */
+	private String allParentIndexCode;
+
+    /**
+     * 权重（同一组权重总和=1）
+     */
+	private BigDecimal weight;
+
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/evaluationindex/FactIndexCpcSubScoreEntity.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/evaluationindex/FactIndexCpcSubScoreEntity.java
new file mode 100644
index 0000000000..737633648c
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/evaluationindex/FactIndexCpcSubScoreEntity.java
@@ -0,0 +1,98 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.entity.evaluationindex;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+
+/**
+ * 党员相关分值
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-14
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("fact_index_cpc_sub_score")
+public class FactIndexCpcSubScoreEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 网格所属的机关Id
+     */
+	private String agencyId;
+
+    /**
+     * 网格Id
+     */
+	private String gridId;
+
+    /**
+     * 年度ID: yyyy
+     */
+	private String yearId;
+
+    /**
+     * 月维度Id: yyyyMM
+     */
+	private String monthId;
+
+    /**
+     * 用户id
+     */
+	private String userId;
+
+    /**
+     * 计算指标时的原始值 字符串类型
+     */
+	private String originValue;
+
+    /**
+     * 分值
+     */
+	private BigDecimal score;
+
+    /**
+     * 参与议事分值：canyuyishi；
+党务活动分值：dangwuhuodong；
+联系群众分值：lianxiqunzhong；
+党建能力分值：dangjiannengli
+     */
+	private String indexCode;
+
+    /**
+     * 所有指标code拼接的字符串 冒号隔开
+     */
+	private String allParentIndexCode;
+
+    /**
+     * 权重（同一组权重总和=1）
+     */
+	private BigDecimal weight;
+
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
index b21d3f0ec4..ac2e998e2e 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
@@ -17,7 +17,6 @@
 
 package com.epmet.datareport.service.evaluationindex.index.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.DateUtils;
@@ -25,15 +24,16 @@ import com.epmet.constant.DataSourceConstant;
 import com.epmet.datareport.constant.IndexConstant;
 import com.epmet.datareport.dao.evaluationindex.index.IndexExplainDao;
 import com.epmet.datareport.dao.evaluationindex.index.IndexGroupDetailDao;
+import com.epmet.datareport.dao.fact.FactIndexCpcSubScoreDao;
 import com.epmet.datareport.dao.fact.FactIndexGridSubScoreDao;
 import com.epmet.datareport.service.evaluationindex.index.IndexExplainService;
 import com.epmet.evaluationindex.index.dto.IndexExplainTreeDTO;
 import com.epmet.evaluationindex.index.form.IndexExplainFormDTO;
+import com.epmet.evaluationindex.index.form.IndexScoreFormDTO;
 import com.epmet.evaluationindex.index.result.IndexExplainResult;
 import com.epmet.evaluationindex.index.result.IndexGroupDetailResult;
 import com.epmet.evaluationindex.index.result.IndexScoreDetailResult;
-import com.epmet.evaluationindex.screen.dto.form.AblityListFormDTO;
-import com.epmet.evaluationindex.screen.dto.result.AblityListResultDTO;
+import com.epmet.evaluationindex.index.result.IndexScoreResult;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -60,6 +60,8 @@ public class IndexExplainServiceImpl implements IndexExplainService {
     private IndexGroupDetailDao indexGroupDetailDao;
     @Autowired
     private FactIndexGridSubScoreDao gridSubScoreDao;
+    @Autowired
+    private FactIndexCpcSubScoreDao factIndexCpcSubScoreDao;
 
 
     @Override
@@ -82,15 +84,12 @@ public class IndexExplainServiceImpl implements IndexExplainService {
             results.add(result);
             result.setTitle(explainDTO.getTitle());
             result.setMeaning(explainDTO.getMeaning());
-
+            //设置表格数据
             setTableData(formDTO, detailEntityMap, explainDTO, result);
-
-
+            //子节点
             setChildren(formDTO, detailEntityMap, result, explainDTO, explainDTO.getChildren());
-            System.out.println(JSON.toJSONString(result));
         }
 
-
         return results;
     }
 
@@ -102,44 +101,40 @@ public class IndexExplainServiceImpl implements IndexExplainService {
             switch (explainDTO.getOrgLevel()) {
                 case "grid":
                     String type = explainDTO.getType();
-                    String allIndexCodePath = explainDTO.getIndexCode();
-                    List<IndexGroupDetailResult> indexGroupDetailEntities = detailEntityMap.get(allIndexCodePath);
-                    List<IndexScoreDetailResult> tableList = new ArrayList<>();
-                    indexGroupDetailEntities.forEach(index -> {
-                        //设置默认值
-                        if (!index.getAllIndexCodePath().contains(type)) {
-                            return;
-                        }
-                        IndexScoreDetailResult table = new IndexScoreDetailResult();
-                        table.setIndexCode(index.getIndexCode());
-                        table.setIndexName(index.getIndexName());
-                        table.setOriginValue(NumConstant.ZERO_STR);
-                        table.setScore(NumConstant.ZERO_STR);
-                        table.setWeight(index.getWeight().multiply(new BigDecimal(100)).setScale(NumConstant.TWO, BigDecimal.ROUND_HALF_UP) + "%");
-                        tableList.add(table);
-
-
-                    });
-                    result.setTableDataList(tableList);
+                    String allIndexCodePath = null;
+                    List<IndexScoreDetailResult> tableList = null;
+                    if ("zishen".equals(type)) {
+                        allIndexCodePath = "wanggexiangguan:dangjiannengli";
+                        tableList = setDefaultTableData(detailEntityMap, type, allIndexCodePath);
+                        result.setTableDataList(tableList);
+                    } else if ("xiaji".equals(type)) {
+                        allIndexCodePath = "dangyuanxiangguan:lianxiqunzhong";
+                        tableList = setDefaultTableData(detailEntityMap, type, allIndexCodePath);
+                        result.setTableDataList(tableList);
+                    }
                     //set Target value
+                    IndexScoreFormDTO ablityListFormDTO = new IndexScoreFormDTO();
+                    ablityListFormDTO.setCustomerId(formDTO.getCustomerId());
+                    ablityListFormDTO.setOrgId(formDTO.getOrgId());
+                    ablityListFormDTO.setMonthId(DateUtils.getCurrentTimeBeforeMonthId());
+                    ablityListFormDTO.setAllParentIndexCode(allIndexCodePath);
+                    //下钻到党员
+                    List<IndexScoreResult> scoreList = null;
                     if (goDown == 1) {
-                        AblityListFormDTO ablityListFormDTO = new AblityListFormDTO();
-                        ablityListFormDTO.setCustomerId(formDTO.getCustomerId());
-                        ablityListFormDTO.setOrgId(formDTO.getOrgId());
-                        ablityListFormDTO.setOrgType(formDTO.getOrgLevel());
-                        ablityListFormDTO.setMonthId(DateUtils.getCurrentTimeBeforeMonthId());
-                        ablityListFormDTO.setAllParentIndexCode(allIndexCodePath);
-
-                        List<AblityListResultDTO> scoreList = gridSubScoreDao.selectGridAblityList(ablityListFormDTO);
-                        scoreList.forEach(score -> {
-                            for (IndexScoreDetailResult tb : tableList) {
-                                if (tb.getIndexCode().equals(score.getKey())) {
-                                    tb.setOriginValue(score.getValue());
-                                    tb.setScore(String.valueOf(score.getScore()));
-                                    tb.setWeight(score.getWeight().multiply(new BigDecimal(100)).setScale(NumConstant.TWO, BigDecimal.ROUND_HALF_UP) + "%");
-                                }
+                        scoreList = factIndexCpcSubScoreDao.selecCpcAvgScore(ablityListFormDTO);
+                    } else {
+                        //不下钻
+                        scoreList = gridSubScoreDao.selectGridSubScore(ablityListFormDTO);
+                    }
+                    for (IndexScoreResult score : scoreList) {
+                        for (IndexScoreDetailResult tb : tableList) {
+                            if (tb.getIndexCode().equals(score.getIndexCode())) {
+                                tb.setOriginValue(score.getOriginValue());
+                                tb.setScore(String.valueOf(score.getScore()));
+                                tb.setQuantity(score.getQuantity());
+                                tb.setWeight(score.getWeight().multiply(new BigDecimal(100)).setScale(NumConstant.TWO, BigDecimal.ROUND_HALF_UP) + "%");
                             }
-                        });
+                        }
                     }
                     break;
                 default:
@@ -148,6 +143,21 @@ public class IndexExplainServiceImpl implements IndexExplainService {
         }
     }
 
+    private List<IndexScoreDetailResult> setDefaultTableData(Map<String, List<IndexGroupDetailResult>> detailEntityMap, String type, String allIndexCodePath) {
+        List<IndexGroupDetailResult> indexGroupDetailEntities = detailEntityMap.get(allIndexCodePath);
+        List<IndexScoreDetailResult> tableList = new ArrayList<>();
+        indexGroupDetailEntities.forEach(index -> {
+            IndexScoreDetailResult table = new IndexScoreDetailResult();
+            table.setIndexCode(index.getIndexCode());
+            table.setIndexName(index.getIndexName());
+            table.setOriginValue(NumConstant.ZERO_STR);
+            table.setScore(NumConstant.ZERO_STR);
+            table.setWeight(index.getWeight().multiply(new BigDecimal(100)).setScale(NumConstant.TWO, BigDecimal.ROUND_HALF_UP) + "%");
+            tableList.add(table);
+        });
+        return tableList;
+    }
+
     private void setChildren(IndexExplainFormDTO formDTO, Map<String, List<IndexGroupDetailResult>> detailEntityMap, IndexExplainResult result, IndexExplainTreeDTO parentNode, List<IndexExplainTreeDTO> children) {
         List<IndexExplainResult> childrenList = new ArrayList<>();
         children.forEach(child -> {
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCpcScoreDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCpcScoreDao.xml
new file mode 100644
index 0000000000..316e2f60e3
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCpcScoreDao.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.datareport.dao.fact.FactIndexCpcScoreDao">
+
+    <!--<resultMap type="com.epmet.entity.FactIndexCpcScoreEntity" id="factIndexCpcScoreMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="agencyId" column="AGENCY_ID"/>
+        <result property="gridId" column="GRID_ID"/>
+        <result property="yearId" column="YEAR_ID"/>
+        <result property="monthId" column="MONTH_ID"/>
+        <result property="userId" column="USER_ID"/>
+        <result property="isTotal" column="IS_TOTAL"/>
+        <result property="score" column="SCORE"/>
+        <result property="indexCode" column="INDEX_CODE"/>
+        <result property="allParentIndexCode" column="ALL_PARENT_INDEX_CODE"/>
+        <result property="weight" column="WEIGHT"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>-->
+
+
+</mapper>
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCpcSubScoreDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCpcSubScoreDao.xml
new file mode 100644
index 0000000000..acf9b5a874
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCpcSubScoreDao.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.datareport.dao.fact.FactIndexCpcSubScoreDao">
+
+    <!--<resultMap type="com.epmet.entity.FactIndexCpcSubScoreEntity" id="factIndexCpcSubScoreMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="agencyId" column="AGENCY_ID"/>
+        <result property="gridId" column="GRID_ID"/>
+        <result property="yearId" column="YEAR_ID"/>
+        <result property="monthId" column="MONTH_ID"/>
+        <result property="userId" column="USER_ID"/>
+        <result property="originValue" column="ORIGIN_VALUE"/>
+        <result property="score" column="SCORE"/>
+        <result property="indexCode" column="INDEX_CODE"/>
+        <result property="allParentIndexCode" column="ALL_PARENT_INDEX_CODE"/>
+        <result property="weight" column="WEIGHT"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>-->
+
+
+
+    <select id="selecCpcAvgScore" resultType="com.epmet.evaluationindex.index.result.IndexScoreResult">
+            SELECT
+                id, customer_id, agency_id, grid_id, year_id, month_id, user_id,
+                COUNT(*) quantity,
+                ROUND(AVG(score),2) score,
+                index_code, all_parent_index_code, weight
+            FROM  fact_index_cpc_sub_score
+            WHERE ALL_PARENT_INDEX_CODE = #{allParentIndexCode}
+            AND CUSTOMER_ID = #{customerId}
+            and GRID_ID = #{orgId}
+            and MONTH_ID = #{monthId}
+            GROUP BY INDEX_CODE;
+    </select>
+
+ </mapper>
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridSubScoreDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridSubScoreDao.xml
index eda1991759..eb2312455a 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridSubScoreDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridSubScoreDao.xml
@@ -40,5 +40,37 @@
         ORDER BY
             fact.month_id ASC
     </select>
+    <select id="selectGridSubScore" resultType="com.epmet.evaluationindex.index.result.IndexScoreResult">
+     <!--   SELECT
+            fact.index_code,
+            IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS origin_value,
+            round(fact.SCORE,2） AS score,
+            round(fact.WEIGHT,2) AS weight
+        FROM
+            fact_index_grid_sub_score fact
+        WHERE
+            fact.del_flag = '0'
+        AND fact.all_parent_index_code = #{allParentIndexCode}
+        AND customer_id = #{customerId}
+        AND grid_id = #{orgId}
+        AND month_id = #{monthId}-->
+
+         SELECT
+            fact.index_code,
+            IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS origin_value,
+            round(fact.score,2) AS score,
+            round(fact.WEIGHT,2) AS weight
+        FROM
+            fact_index_grid_sub_score fact
+        WHERE
+            fact.del_flag = '0'
+            AND fact.all_parent_index_code = #{allParentIndexCode}
+            AND customer_id = #{customerId}
+            AND grid_id = #{orgId}
+            AND month_id = #{monthId}
+
+
+
+    </select>
 
 </mapper>

From b666def7083ba7e47677567951bc9e76767652fa Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 14 May 2021 15:44:54 +0800
Subject: [PATCH 019/128] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=8C=89=E5=A4=A9=E7=B4=AF=E8=AE=A1=E5=80=BC?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commons/tools/constant/Constant.java      |   3 +
 .../epmet/dto/group/ActCategoryDictDTO.java   |  70 ++++++++
 .../com/epmet/controller/DemoController.java  |   9 +
 .../extract/FactGroupActDailyDao.java         |  38 ++++
 .../extract/FactGroupActMonthlyDao.java       |  33 ++++
 .../com/epmet/dao/group/GroupDataDao.java     |  28 +++
 .../epmet/dao/org/StatsCustomerAgencyDao.java |   2 +
 .../extract/FactGroupActDailyEntity.java      | 100 +++++++++++
 .../extract/FactGroupActMonthlyEntity.java    | 100 +++++++++++
 .../todata/FactGroupActDailyService.java      |  48 +++++
 .../todata/FactGroupActMonthlyService.java    |  31 ++++
 .../impl/FactGroupActDailyServiceImpl.java    | 165 ++++++++++++++++++
 .../impl/FactGroupActMonthlyServiceImpl.java  |  41 +++++
 .../impl/FactOriginExtractServiceImpl.java    |  42 +++++
 .../epmet/service/group/GroupDataService.java |  30 ++++
 .../group/impl/GroupDataServiceImpl.java      |  53 ++++++
 .../service/org/CustomerAgencyService.java    |   3 +
 .../org/impl/CustomerAgencyServiceImpl.java   |   5 +
 .../extract/FactGroupActDailyDao.xml          |  15 ++
 .../extract/FactGroupActMonthlyDao.xml        |   8 +
 .../resources/mapper/group/GroupDataDao.xml   |  61 +++++++
 .../mapper/org/StatsCustomerAgencyDao.xml     |   7 +
 22 files changed, 892 insertions(+)
 create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/group/ActCategoryDictDTO.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactGroupActDailyDao.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactGroupActMonthlyDao.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactGroupActDailyEntity.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactGroupActMonthlyEntity.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactGroupActDailyService.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactGroupActMonthlyService.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGroupActDailyServiceImpl.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGroupActMonthlyServiceImpl.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactGroupActDailyDao.xml
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactGroupActMonthlyDao.xml

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/Constant.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/Constant.java
index 3636e2942d..9ff138efe7 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/Constant.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/Constant.java
@@ -8,6 +8,7 @@
 
 package com.epmet.commons.tools.constant;
 
+
 /**
  * 常量
  *
@@ -133,4 +134,6 @@ public interface Constant {
      * 创建时间字段名
      */
     String CREATED_TIME = "created_time";
+
+    String DEFAULT_CUSTOMER = "default";
 }
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/group/ActCategoryDictDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/group/ActCategoryDictDTO.java
new file mode 100644
index 0000000000..f75e5dc1b7
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/group/ActCategoryDictDTO.java
@@ -0,0 +1,70 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.group;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 活动类别字典
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Data
+public class ActCategoryDictDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 类别编码
+     */
+	private String categoryCode;
+
+    /**
+     * 活动类别名称；eg：支部建设、联建共建
+     */
+	private String categoryName;
+
+    /**
+     * 等级1,2......
+     */
+	private Integer level;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+    /**
+     * 上级类别编码
+     */
+	private String parentCode;
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
index b47d3cc8ef..1037de6af4 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
@@ -35,6 +35,7 @@ import com.epmet.entity.stats.DimDateEntity;
 import com.epmet.entity.stats.DimMonthEntity;
 import com.epmet.service.StatsDemoService;
 import com.epmet.service.evaluationindex.extract.dataToIndex.*;
+import com.epmet.service.evaluationindex.extract.todata.FactGroupActDailyService;
 import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectCategoryDailyService;
 import com.epmet.service.evaluationindex.extract.todata.FactOriginTopicMainDailyService;
 import com.epmet.service.evaluationindex.extract.toscreen.*;
@@ -109,6 +110,8 @@ public class DemoController {
     private ScreenProjectCategoryGridDailyService projectCategoryGridDailyService;
     @Autowired
     private FactOriginProjectCategoryDailyService originProjectCategoryDailyService;
+    @Autowired
+    private FactGroupActDailyService factGroupActDailyService;
 
     @GetMapping("testAlarm")
     public void testAlarm() {
@@ -870,4 +873,10 @@ public class DemoController {
         return new Result().ok(ndddYhjfService.difficultyDataExtract(param));
     }
 
+    @PostMapping("extractgroupact")
+    public Result extractGroupAct(@RequestParam("customerId") String customerId,@RequestParam("dateId")String dateId){
+        factGroupActDailyService.extractGridGroupActDaily(customerId,dateId);
+        factGroupActDailyService.extractAgencyGroupActDaily(customerId,dateId);
+        return new Result();
+    }
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactGroupActDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactGroupActDailyDao.java
new file mode 100644
index 0000000000..37d3d4e144
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactGroupActDailyDao.java
@@ -0,0 +1,38 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.evaluationindex.extract;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.evaluationindex.extract.FactGroupActDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 组织活动(参加人数、组织次数、平均参加人数)按天累计值分析
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-13
+ */
+@Mapper
+public interface FactGroupActDailyDao extends BaseDao<FactGroupActDailyEntity> {
+
+    int deleteBatch(@Param("customerId") String customerId,
+                    @Param("dateId") String dateId,
+                    @Param("limit") Integer limit,
+                    @Param("orgType")String orgType);
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactGroupActMonthlyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactGroupActMonthlyDao.java
new file mode 100644
index 0000000000..e7b179ef70
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactGroupActMonthlyDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.evaluationindex.extract;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.evaluationindex.extract.FactGroupActMonthlyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 专项组活动(参加人数、组织次数、平均参加人数)按月增量分析
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-13
+ */
+@Mapper
+public interface FactGroupActMonthlyDao extends BaseDao<FactGroupActMonthlyEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/group/GroupDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/group/GroupDataDao.java
index 80776d8798..2cbd65788c 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/group/GroupDataDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/group/GroupDataDao.java
@@ -1,6 +1,7 @@
 package com.epmet.dao.group;
 
 import com.epmet.dto.extract.FactOriginGroupMainDailyDTO;
+import com.epmet.dto.group.ActCategoryDictDTO;
 import com.epmet.dto.group.form.GridGroupPeopleFormDTO;
 import com.epmet.dto.group.form.GridGroupPeopleTotalFormDTO;
 import com.epmet.dto.group.form.GridGroupTotalFormDTO;
@@ -8,6 +9,7 @@ import com.epmet.dto.group.form.GroupIncrFormDTO;
 import com.epmet.dto.group.result.*;
 import com.epmet.dto.indexcollect.result.CpcIndexCommonDTO;
 import com.epmet.dto.indexcollect.result.GridIndexCommonDTO;
+import com.epmet.entity.evaluationindex.extract.FactGroupActDailyEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -110,4 +112,30 @@ public interface GroupDataDao {
      * @return com.epmet.dto.indexcollect.result.CpcIndexCommonDTO
      */
     List<GridIndexCommonDTO> selectCountGridCreateThreeMeets(@Param("customerId")String customerId, @Param("monthId")String monthId);
+
+    /**
+     * 网格相关：组织“三会一课”次数： 当前网格下  满足【未取消的活动 and  签到记录>1 and 活动开始时间在当前时间维度内】 +1
+     *
+     * @param customerId
+     * @return com.epmet.dto.group.ActCategoryDictDTO
+     */
+    List<ActCategoryDictDTO> queryCustomerActCategoryDict(String customerId);
+
+    /**
+     * 查询某个分类截止到dateId,组织次数、参与人数、平均参与人数
+     *
+     * @param customerId
+     * @param dateId
+     * @param categoryCode
+     * @return com.epmet.entity.evaluationindex.extract.FactGroupActDailyEntity
+     */
+    List<FactGroupActDailyEntity> selectCountGridGroupActDaily(@Param("customerId") String customerId,
+                                                     @Param("dateId") String dateId,
+                                                     @Param("categoryCode") String categoryCode,
+                                                     @Param("gridId")String gridId);
+
+    List<FactGroupActDailyEntity> selectCountAgencyGroupActDaily(@Param("customerId") String customerId,
+                                                                 @Param("agencyId")String agencyId,
+                                                                 @Param("dateId") String dateId,
+                                                                 @Param("categoryCode") String categoryCode);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java
index 05a85d3d7c..aa0f78f087 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java
@@ -33,4 +33,6 @@ public interface StatsCustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
     List<CustomerAreaCodeResultDTO> selectCustomerAreaCodeById(@Param("customerIds") List<String> customerIds);
 
     CustomerAgencyEntity getRootAgencyInfo(String customerId);
+
+    List<CustomerAgencyEntity> queryAgencyListByCustomerId(String customerId);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactGroupActDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactGroupActDailyEntity.java
new file mode 100644
index 0000000000..f128f25d3c
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactGroupActDailyEntity.java
@@ -0,0 +1,100 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.evaluationindex.extract;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 组织活动(参加人数、组织次数、平均参加人数)按天累计值分析
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-13
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("fact_group_act_daily")
+public class FactGroupActDailyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 数据更新至日期Id：yyyyMMdd
+     */
+	private String dateId;
+
+    /**
+     * 网格id
+     */
+	private String orgId;
+
+    /**
+     * 网格：grid;组织：agency
+     */
+	private String orgType;
+
+    /**
+     * 1)orgType=grid: pid=网格所属组织id;
+2)orgType=agency： pid=当前组织的上级组织
+     */
+	private String pid;
+
+    /**
+     * 1)orgType=grid: pids=网格所有上级组织，包括pid;
+2)orgType=agency： pids=当前组织的所有上级组织，包括pid.
+     */
+	private String pids;
+
+    /**
+     * 活动分类编码
+     */
+	private String categoryCode;
+
+    /**
+     * 上级分类编码
+     */
+	private String parentCode;
+
+    /**
+     * 分类等级
+     */
+	private Integer level;
+
+    /**
+     * 截止到dateId: 组织次数;包含dateId这一天的数据
+     */
+	private Integer organizeTotal;
+
+    /**
+     * 截止到dateId: 参加人数;包含dateId这一天的数据
+     */
+	private Integer participateUserTotal;
+
+    /**
+     * 截止到dateId: 平均参加人数;包含dateId这一天的数据
+     */
+	private Integer avgParticipateUserTotal;
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactGroupActMonthlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactGroupActMonthlyEntity.java
new file mode 100644
index 0000000000..d90918a643
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactGroupActMonthlyEntity.java
@@ -0,0 +1,100 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.evaluationindex.extract;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 专项组活动(参加人数、组织次数、平均参加人数)按月增量分析
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-13
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("fact_group_act_monthly")
+public class FactGroupActMonthlyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 数据维度：yyyyMM
+     */
+	private String monthId;
+
+    /**
+     * 网格id
+     */
+	private String orgId;
+
+    /**
+     * 网格：grid;组织：agency
+     */
+	private String orgType;
+
+    /**
+     * 1)orgType=grid: pid=网格所属组织id;
+2)orgType=agency： pid=当前组织的上级组织
+     */
+	private String pid;
+
+    /**
+     * 1)orgType=grid: pids=网格所有上级组织，包括pid;
+2)orgType=agency： pids=当前组织的所有上级组织，包括pid.
+     */
+	private String pids;
+
+    /**
+     * 活动分类编码
+     */
+	private String categoryCode;
+
+    /**
+     * 上级分类编码
+     */
+	private String parentCode;
+
+    /**
+     * 分类等级
+     */
+	private Integer level;
+
+    /**
+     * 本月内：活动组织次数
+     */
+	private Integer organizeIncr;
+
+    /**
+     * 本月内：活动签到人数参加人数
+     */
+	private Integer participateUserIncr;
+
+    /**
+     * 本月内：平均参加人数
+     */
+	private Integer avgParticipateUserIncr;
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactGroupActDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactGroupActDailyService.java
new file mode 100644
index 0000000000..6c8ee23cd7
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactGroupActDailyService.java
@@ -0,0 +1,48 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.evaluationindex.extract.todata;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.entity.evaluationindex.extract.FactGroupActDailyEntity;
+
+/**
+ * 组织活动(参加人数、组织次数、平均参加人数)按天累计值分析
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-13
+ */
+public interface FactGroupActDailyService extends BaseService<FactGroupActDailyEntity> {
+
+    /**
+     * 当前客户截止到dateId,网格下  各个分类的 参加人数，组织次数，平均参加人数
+     *
+     * @param customerId
+     * @param dateId
+     * @return
+     */
+    void extractGridGroupActDaily(String customerId, String dateId);
+
+    /**
+     * 当前客户截止到dateId,组织下 各个分类的 参加人数，组织次数，平均参加人数
+     *
+     * @param customerId
+     * @param dateId
+     * @return
+     */
+    void extractAgencyGroupActDaily(String customerId, String dateId);
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactGroupActMonthlyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactGroupActMonthlyService.java
new file mode 100644
index 0000000000..1d7391b8b4
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactGroupActMonthlyService.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.evaluationindex.extract.todata;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.entity.evaluationindex.extract.FactGroupActMonthlyEntity;
+
+/**
+ * 专项组活动(参加人数、组织次数、平均参加人数)按月增量分析
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-13
+ */
+public interface FactGroupActMonthlyService extends BaseService<FactGroupActMonthlyEntity> {
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGroupActDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGroupActDailyServiceImpl.java
new file mode 100644
index 0000000000..3212ad6dc0
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGroupActDailyServiceImpl.java
@@ -0,0 +1,165 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.evaluationindex.extract.todata.impl;
+
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.constant.DataSourceConstant;
+import com.epmet.dao.evaluationindex.extract.FactGroupActDailyDao;
+import com.epmet.dto.group.ActCategoryDictDTO;
+import com.epmet.dto.org.GridInfoDTO;
+import com.epmet.entity.evaluationindex.extract.FactGroupActDailyEntity;
+import com.epmet.entity.org.CustomerAgencyEntity;
+import com.epmet.service.evaluationindex.extract.todata.FactGroupActDailyService;
+import com.epmet.service.group.GroupDataService;
+import com.epmet.service.org.CustomerAgencyService;
+import com.epmet.service.org.CustomerGridService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 组织活动(参加人数、组织次数、平均参加人数)按天累计值分析
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-13
+ */
+@Slf4j
+@DataSource(DataSourceConstant.STATS)
+@Service
+public class FactGroupActDailyServiceImpl extends BaseServiceImpl<FactGroupActDailyDao, FactGroupActDailyEntity> implements FactGroupActDailyService {
+
+    @Autowired
+    private GroupDataService groupDataService;
+    @Autowired
+    private CustomerAgencyService customerAgencyService;
+    @Autowired
+    private CustomerGridService customerGridService;
+
+    /**
+     * 当前客户截止到dateId,网格下 各个分类的 参加人数，组织次数，平均参加人数
+     *
+     * @param customerId
+     * @param dateId
+     * @return
+     */
+    @Override
+    public void extractGridGroupActDaily(String customerId, String dateId) {
+        if(StringUtils.isBlank(customerId)||StringUtils.isBlank(dateId)){
+            return;
+        }
+        // 1、查询出当前客户的组织分类；如果没有直接返回
+        List<ActCategoryDictDTO> actCategoryDictDTOList = groupDataService.queryCustomerActCategoryDict(customerId);
+        if (CollectionUtils.isEmpty(actCategoryDictDTOList)) {
+            return;
+        }
+
+        // 2、当前客户下所有的网格
+        List<GridInfoDTO> gridInfoDTOList=customerGridService.queryGridInfoList(customerId);
+        // 2、遍历每个分类，查询组织次数、参与人数、平均参与人数
+        List<FactGroupActDailyEntity> insertList = new ArrayList<>();
+        for(GridInfoDTO gridInfoDTO:gridInfoDTOList){
+
+            for (ActCategoryDictDTO actCategoryDictDTO : actCategoryDictDTOList) {
+                List<FactGroupActDailyEntity> list = groupDataService.selectCountGridGroupActDaily(customerId, dateId, actCategoryDictDTO.getCategoryCode(),gridInfoDTO.getGridId());
+                if (CollectionUtils.isNotEmpty(list)) {
+                    list.forEach(dto->{
+                        dto.setCategoryCode(actCategoryDictDTO.getCategoryCode());
+                        dto.setParentCode(actCategoryDictDTO.getParentCode());
+                        dto.setLevel(actCategoryDictDTO.getLevel());
+                        dto.setOrgType("grid");
+                        dto.setDateId(dateId);
+                    });
+                    insertList.addAll(list);
+                }
+            }
+        }
+
+        // 3、批量删除
+        int deleteNum;
+        do {
+            deleteNum = baseDao.deleteBatch(customerId, dateId, NumConstant.TWO_HUNDRED,"grid");
+        } while (deleteNum > NumConstant.ZERO);
+
+        // 4、插入数据
+        insertList.forEach(insertEntity -> {
+            baseDao.insert(insertEntity);
+        });
+        log.info("extractGridGroupActDaily completed");
+    }
+
+    /**
+     * 当前客户截止到dateId,组织下 各个分类的 参加人数，组织次数，平均参加人数
+     *
+     * @param customerId
+     * @param dateId
+     * @return
+     */
+    @Override
+    public void extractAgencyGroupActDaily(String customerId, String dateId) {
+        // 1、查询出当前客户的组织分类；如果没有直接返回
+        List<ActCategoryDictDTO> actCategoryDictDTOList = groupDataService.queryCustomerActCategoryDict(customerId);
+        if (CollectionUtils.isEmpty(actCategoryDictDTOList)) {
+            return;
+        }
+        // 2、当前客户下所有的组织
+        List<CustomerAgencyEntity> agencyEntityList=customerAgencyService.queryAgencyListByCustomerId(customerId);
+        List<FactGroupActDailyEntity> insertList = new ArrayList<>();
+        for(CustomerAgencyEntity agencyEntity:agencyEntityList){
+            for(ActCategoryDictDTO categoryDict:actCategoryDictDTOList){
+                List<FactGroupActDailyEntity> list = groupDataService.selectCountAgencyGroupActDaily(customerId,
+                                                                        agencyEntity.getId(),
+                                                                        dateId,
+                                                                        categoryDict.getCategoryCode());
+                if (CollectionUtils.isNotEmpty(list)) {
+                    list.forEach(dto->{
+                        dto.setCategoryCode(categoryDict.getCategoryCode());
+                        dto.setParentCode(categoryDict.getParentCode());
+                        dto.setLevel(categoryDict.getLevel());
+                        dto.setOrgId(agencyEntity.getId());
+                        dto.setOrgType("agency");
+                        dto.setPid(agencyEntity.getPid());
+                        dto.setPids(agencyEntity.getPids());
+                        dto.setDateId(dateId);
+                    });
+                    insertList.addAll(list);
+                }
+            }
+        }
+
+        // 3、批量删除
+        int deleteNum;
+        do {
+            deleteNum = baseDao.deleteBatch(customerId, dateId, NumConstant.TWO_HUNDRED,"agency");
+        } while (deleteNum > NumConstant.ZERO);
+
+        // 4、插入数据
+        insertList.forEach(insertEntity->{
+            baseDao.insert(insertEntity);
+        });
+        log.info("extractAgencyGroupActDaily completed");
+    }
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGroupActMonthlyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGroupActMonthlyServiceImpl.java
new file mode 100644
index 0000000000..3cb14a7e31
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGroupActMonthlyServiceImpl.java
@@ -0,0 +1,41 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.evaluationindex.extract.todata.impl;
+
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.constant.DataSourceConstant;
+import com.epmet.dao.evaluationindex.extract.FactGroupActMonthlyDao;
+import com.epmet.entity.evaluationindex.extract.FactGroupActMonthlyEntity;
+import com.epmet.service.evaluationindex.extract.todata.FactGroupActMonthlyService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * 专项组活动(参加人数、组织次数、平均参加人数)按月增量分析
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-13
+ */
+@DataSource(DataSourceConstant.STATS)
+@Slf4j
+@Service
+public class FactGroupActMonthlyServiceImpl extends BaseServiceImpl<FactGroupActMonthlyDao, FactGroupActMonthlyEntity> implements FactGroupActMonthlyService {
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginExtractServiceImpl.java
index 1cd62fd24a..9b8a74548e 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginExtractServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginExtractServiceImpl.java
@@ -48,6 +48,9 @@ public class FactOriginExtractServiceImpl implements FactOriginExtractService {
     private DimCustomerPartymemberService dimCustomerPartymemberService;
     @Autowired
     private FactOriginProjectCategoryDailyService originProjectCategoryDailyService;
+    @Autowired
+    private  FactGroupActDailyService factGroupActDailyService;
+
 
     @Override
     public void extractAll(ExtractOriginFormDTO extractOriginFormDTO) {
@@ -188,6 +191,45 @@ public class FactOriginExtractServiceImpl implements FactOriginExtractService {
                 }
             }
         });
+        //小组活动
+        threadPool.submit(() -> {
+            ExtractOriginFormDTO extractOriginFormDTO = ConvertUtils.sourceToTarget(param, ExtractOriginFormDTO.class);
+            if (!isRange) {
+                //截止到当前dateId
+                try {
+                    factGroupActDailyService.extractGridGroupActDaily(extractOriginFormDTO.getCustomerId(), extractOriginFormDTO.getDateId());
+                } catch (Exception e) {
+                    log.error("抽取【fact_group_act_daily】发生异常,参数:" + JSON.toJSONString(extractOriginFormDTO), e);
+                }
+                try {
+                    factGroupActDailyService.extractAgencyGroupActDaily(extractOriginFormDTO.getCustomerId(), extractOriginFormDTO.getDateId());
+                } catch (Exception e) {
+                    log.error("抽取【fact_group_act_daily】发生异常,参数:" + JSON.toJSONString(extractOriginFormDTO), e);
+                }
+            } else {
+                //参数指定日期内，比如startDate=20210501,endDate=20210513;依次计算截止到20210501的数据.....截止到20210513的数据
+                try {
+                    for (int i = 0; i < finalDaysBetween.size(); i++) {
+                        String dateDimId = finalDaysBetween.get(i);
+                        extractOriginFormDTO.setDateId(dateDimId);
+                        factGroupActDailyService.extractGridGroupActDaily(extractOriginFormDTO.getCustomerId(), extractOriginFormDTO.getDateId());
+                    }
+                } catch (Exception e) {
+                    log.error("抽取【fact_group_act_daily】发生异常,参数:" + JSON.toJSONString(extractOriginFormDTO), e);
+                }
+                try {
+                    for (int i = 0; i < finalDaysBetween.size(); i++) {
+                        String dateDimId = finalDaysBetween.get(i);
+                        extractOriginFormDTO.setDateId(dateDimId);
+                        factGroupActDailyService.extractAgencyGroupActDaily(extractOriginFormDTO.getCustomerId(), extractOriginFormDTO.getDateId());
+                    }
+                } catch (Exception e) {
+                    log.error("抽取【fact_group_act_daily】发生异常,参数:" + JSON.toJSONString(extractOriginFormDTO), e);
+                }
+            }
+        });
+
+
         submitProjectRelationData(param, finalDaysBetween);
     }
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/GroupDataService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/GroupDataService.java
index b1a07d9941..89cc949ea6 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/GroupDataService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/GroupDataService.java
@@ -1,9 +1,11 @@
 package com.epmet.service.group;
 
 import com.epmet.dto.extract.FactOriginGroupMainDailyDTO;
+import com.epmet.dto.group.ActCategoryDictDTO;
 import com.epmet.dto.group.result.*;
 import com.epmet.dto.indexcollect.result.CpcIndexCommonDTO;
 import com.epmet.dto.indexcollect.result.GridIndexCommonDTO;
+import com.epmet.entity.evaluationindex.extract.FactGroupActDailyEntity;
 import com.epmet.util.DimIdGenerator;
 import org.apache.ibatis.annotations.Param;
 
@@ -85,4 +87,32 @@ public interface GroupDataService {
      * @return com.epmet.dto.indexcollect.result.CpcIndexCommonDTO
      */
     List<GridIndexCommonDTO> selectCountGridCreateThreeMeets(String customerId, String monthId);
+
+    /**
+     * 查询出当前客户的组织分类；如果没有直接返回
+     *
+     * @param customerId
+     */
+    List<ActCategoryDictDTO> queryCustomerActCategoryDict(String customerId);
+
+    /**
+     * 查询某个分类截止到dateId,组织次数、参与人数、平均参与人数
+     * 网格按天
+     * @param customerId
+     * @param dateId
+     * @param categoryCode
+     * @return com.epmet.entity.evaluationindex.extract.FactGroupActDailyEntity
+     */
+    List<FactGroupActDailyEntity> selectCountGridGroupActDaily(String customerId, String dateId, String categoryCode,String gridId);
+
+    /**
+     * 查询某个分类截止到dateId,组织次数、参与人数、平均参与人数
+     * 组织按天
+     * @param customerId
+     * @param agencyId
+     * @param dateId
+     * @param categoryCode
+     * @return com.epmet.entity.evaluationindex.extract.FactGroupActDailyEntity
+     */
+    List<FactGroupActDailyEntity> selectCountAgencyGroupActDaily(String customerId, String agencyId, String dateId, String categoryCode);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java
index d0a87ed295..a7a596ca10 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java
@@ -1,10 +1,12 @@
 package com.epmet.service.group.impl;
 
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.commons.tools.constant.Constant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.group.GroupDataDao;
 import com.epmet.dto.extract.FactOriginGroupMainDailyDTO;
+import com.epmet.dto.group.ActCategoryDictDTO;
 import com.epmet.dto.group.form.GridGroupPeopleFormDTO;
 import com.epmet.dto.group.form.GridGroupPeopleTotalFormDTO;
 import com.epmet.dto.group.form.GridGroupTotalFormDTO;
@@ -12,8 +14,11 @@ import com.epmet.dto.group.form.GroupIncrFormDTO;
 import com.epmet.dto.group.result.*;
 import com.epmet.dto.indexcollect.result.CpcIndexCommonDTO;
 import com.epmet.dto.indexcollect.result.GridIndexCommonDTO;
+import com.epmet.entity.evaluationindex.extract.FactGroupActDailyEntity;
 import com.epmet.service.group.GroupDataService;
 import com.epmet.util.DimIdGenerator;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -25,6 +30,7 @@ import java.util.stream.Collectors;
  * @Author zxc
  * @CreateTime 2020/6/16 13:23
  */
+@Slf4j
 @Service
 @DataSource(DataSourceConstant.RESI_GROUP)
 public class GroupDataServiceImpl implements GroupDataService {
@@ -235,5 +241,52 @@ public class GroupDataServiceImpl implements GroupDataService {
         return groupDataDao.selectCountGridCreateThreeMeets(customerId,monthId);
     }
 
+    /**
+     * 查询出当前客户的组织分类；如果没有直接返回
+     *
+     * @param customerId
+     */
+    @DataSource(DataSourceConstant.RESI_GROUP)
+    @Override
+    public List<ActCategoryDictDTO> queryCustomerActCategoryDict(String customerId) {
+        List<ActCategoryDictDTO> resultList=groupDataDao.queryCustomerActCategoryDict(customerId);
+        if(CollectionUtils.isNotEmpty(resultList)){
+            log.info("当前客户下有自己的项目分类");
+            return resultList;
+        }
+        log.info("----------------------------------------------------");
+        return groupDataDao.queryCustomerActCategoryDict(Constant.DEFAULT_CUSTOMER);
+    }
+
+    /**
+     * 查询某个分类截止到dateId,组织次数、参与人数、平均参与人数
+     *
+     * @param customerId
+     * @param dateId
+     * @param categoryCode
+     * @return
+     */
+    @DataSource(DataSourceConstant.RESI_GROUP)
+    @Override
+    public List<FactGroupActDailyEntity> selectCountGridGroupActDaily(String customerId, String dateId, String categoryCode,String gridId) {
+        return groupDataDao.selectCountGridGroupActDaily(customerId,dateId,categoryCode,gridId);
+    }
+
+    /**
+     * 查询某个分类截止到dateId,组织次数、参与人数、平均参与人数
+     * 组织按天
+     *
+     * @param customerId
+     * @param agencyId
+     * @param dateId
+     * @param categoryCode
+     * @return com.epmet.entity.evaluationindex.extract.FactGroupActDailyEntity
+     */
+    @DataSource(DataSourceConstant.RESI_GROUP)
+    @Override
+    public List<FactGroupActDailyEntity> selectCountAgencyGroupActDaily(String customerId, String agencyId, String dateId, String categoryCode) {
+        return groupDataDao.selectCountAgencyGroupActDaily(customerId,agencyId,dateId,categoryCode);
+    }
+
 
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java
index b3aa943ada..fd611edf23 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java
@@ -20,4 +20,7 @@ public interface CustomerAgencyService {
     List<CustomerAreaCodeResultDTO> selectCustomerAreaCodeById(List<String> customerIds);
 
     CustomerAgencyEntity getRootAgencyInfo(String customerId);
+
+
+    List<CustomerAgencyEntity> queryAgencyListByCustomerId(String customerId);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java
index 8a8fae83b8..5c6b5175b0 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java
@@ -50,4 +50,9 @@ public class CustomerAgencyServiceImpl implements CustomerAgencyService {
     public CustomerAgencyEntity getRootAgencyInfo(String customerId) {
         return customerAgencyDao.getRootAgencyInfo(customerId);
     }
+
+    @Override
+    public List<CustomerAgencyEntity> queryAgencyListByCustomerId(String customerId) {
+        return customerAgencyDao.queryAgencyListByCustomerId(customerId);
+    }
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactGroupActDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactGroupActDailyDao.xml
new file mode 100644
index 0000000000..91897851f9
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactGroupActDailyDao.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.evaluationindex.extract.FactGroupActDailyDao">
+
+    <delete id="deleteBatch" parameterType="map">
+        delete from fact_group_act_daily
+        where CUSTOMER_ID = #{customerId}
+        AND DATE_ID = #{dateId}
+        and org_type=#{orgType}
+        limit #{limit}
+    </delete>
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactGroupActMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactGroupActMonthlyDao.xml
new file mode 100644
index 0000000000..085c49ab2a
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactGroupActMonthlyDao.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.evaluationindex.extract.FactGroupActMonthlyDao">
+
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml
index d8ed5a56df..ebd75dc9dd 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml
@@ -252,4 +252,65 @@
         GROUP BY
             ga.GRID_ID
     </select>
+
+    <!--    查询出当前客户的组织分类；如果没有直接返回 -->
+    <select id="queryCustomerActCategoryDict" resultType="com.epmet.dto.group.ActCategoryDictDTO">
+        SELECT
+            *
+        FROM
+            act_category_dict acd
+        WHERE
+            acd.DEL_FLAG = '0'
+            AND acd.CUSTOMER_ID = #{customerId}
+        ORDER BY
+            acd.`LEVEL` DESC,
+            acd.PARENT_CODE ASC,
+            acd.SORT ASC
+    </select>
+
+    <select id="selectCountGridGroupActDaily" parameterType="map" resultType="com.epmet.entity.evaluationindex.extract.FactGroupActDailyEntity">
+        SELECT
+            gai.CUSTOMER_ID AS customerId,
+            gai.GRID_ID AS orgId,
+            gai.AGENCY_ID AS pid,
+            gai.GRID_PIDS AS pids,
+            count(1) AS organizeTotal,
+            sum(gai.SIGNED_IN_NUM)as participateUserTotal,
+            round(sum(gai.SIGNED_IN_NUM)/count(1)) as avgParticipateUserTotal
+        FROM
+            group_act_info gai
+        WHERE
+            gai.DEL_FLAG = '0'
+            AND gai.CUSTOMER_ID = #{customerId}
+            AND gai.`STATUS` != 'canceled'
+            AND gai.SIGNED_IN_NUM > 0
+            and DATE_FORMAT(gai.CREATED_TIME,'%Y%m%d') &lt; #{dateId}
+            and gai.CATEGORY_CODE like concat(#{categoryCode},'%')
+            and gai.GRID_ID=#{gridId}
+        GROUP BY
+            gai.CUSTOMER_ID,
+            gai.GRID_ID,
+            gai.AGENCY_ID,
+            gai.GRID_PIDS
+    </select>
+
+    <select id="selectCountAgencyGroupActDaily" parameterType="map" resultType="com.epmet.entity.evaluationindex.extract.FactGroupActDailyEntity">
+        SELECT
+            gai.CUSTOMER_ID AS customerId,
+            count(1) AS organizeTotal,
+            sum(gai.SIGNED_IN_NUM)as participateUserTotal,
+            round(sum(gai.SIGNED_IN_NUM)/count(1)) as avgParticipateUserTotal
+        FROM
+            group_act_info gai
+        WHERE
+            gai.DEL_FLAG = '0'
+            AND gai.CUSTOMER_ID = #{customerId}
+            AND gai.`STATUS` != 'canceled'
+            AND gai.SIGNED_IN_NUM > 0
+            and gai.GRID_PIDS like concat('%',#{agencyId},'%')
+            and DATE_FORMAT(gai.CREATED_TIME,'%Y%m%d') &lt; #{dateId}
+            and gai.CATEGORY_CODE like concat(#{categoryCode},'%')
+        GROUP BY
+            gai.CUSTOMER_ID
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml
index d5ead92c47..a7b6c09ae2 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml
@@ -125,4 +125,11 @@
         and ca.pid='0'
         and ca.CUSTOMER_ID=#{customerId}
     </select>
+
+    <select id="queryAgencyListByCustomerId" parameterType="java.lang.String" resultType="com.epmet.entity.org.CustomerAgencyEntity">
+        select *
+        from customer_agency ca
+        where ca.del_flag='0'
+        and ca.CUSTOMER_ID=#{customerId}
+    </select>
 </mapper>
\ No newline at end of file

From 598828cad6ecc0755aadab06b678551c6dfc4a71 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 14 May 2021 17:39:19 +0800
Subject: [PATCH 020/128] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E5=8F=8A?=
 =?UTF-8?q?=E5=B0=8F=E7=BB=84=E6=80=BB=E6=95=B0=E5=AE=9A=E6=97=B6=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/datastats/form/SubAgencyFormDTO.java  |  12 +
 .../dto/datastats/form/SubGridFormDTO.java    |  12 +
 .../result/SubAgencyGroupResultDTO.java       |  33 ++
 .../result/SubAgencyIssueResultDTO.java       |  37 ++
 .../result/SubAgencyProjectResultDTO.java     |  33 ++
 .../result/SubAgencyTopicResultDTO.java       |  37 ++
 .../result/SubGridGroupResultDTO.java         |  33 ++
 .../result/SubGridIssueResultDTO.java         |  37 ++
 .../result/SubGridProjectResultDTO.java       |  33 ++
 .../result/SubGridTopicResultDTO.java         |  37 ++
 .../controller/DataStatsController.java       |  92 +++-
 .../dataaggre/dao/datastats/DataStatsDao.java |  69 ++-
 .../service/datastats/DataStatsService.java   |  62 ++-
 .../datastats/impl/DataStatsServiceImpl.java  | 438 +++++++++++++++++-
 .../mapper/datastats/DatsStatsDao.xml         | 172 ++++++-
 .../impl/FactOriginExtractServiceImpl.java    |  33 ++
 16 files changed, 1148 insertions(+), 22 deletions(-)
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubAgencyGroupResultDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubAgencyIssueResultDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubAgencyProjectResultDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubAgencyTopicResultDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubGridGroupResultDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubGridIssueResultDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubGridProjectResultDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubGridTopicResultDTO.java

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubAgencyFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubAgencyFormDTO.java
index c70db44b6e..a02a39456c 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubAgencyFormDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubAgencyFormDTO.java
@@ -25,4 +25,16 @@ public class SubAgencyFormDTO implements Serializable {
     private String dateId;
     public interface Agency extends CustomerClientShowGroup{}
 
+    @Data
+    public static class Topic implements Serializable {
+        //组织Id
+        private String agencyId;
+        //话题数量
+        private Integer topicCount;
+        //话题状态 已关闭：closed、已屏蔽：hidden、 讨论中：discussing
+        private String topicStatus;
+        //话题已转议题数量
+        private Integer shiftedIssueTotal;
+    }
+
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubGridFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubGridFormDTO.java
index e21141e22a..d7da58385e 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubGridFormDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubGridFormDTO.java
@@ -25,4 +25,16 @@ public class SubGridFormDTO implements Serializable {
     private String dateId;
     public interface Agency extends CustomerClientShowGroup{}
 
+    @Data
+    public static class Topic implements Serializable {
+        //网格Id
+        private String gridId;
+        //话题数量
+        private Integer topicCount;
+        //话题状态 已关闭：closed、已屏蔽：hidden、 讨论中：discussing
+        private String topicStatus;
+        //话题已转议题数量
+        private Integer shiftedIssueTotal;
+    }
+
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubAgencyGroupResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubAgencyGroupResultDTO.java
new file mode 100644
index 0000000000..144368c26e
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubAgencyGroupResultDTO.java
@@ -0,0 +1,33 @@
+package com.epmet.dataaggre.dto.datastats.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @Description 基础数据-查询当前组织的直属下级组织群组数据-接口返参
+ * @Auth sun
+ */
+@Data
+public class SubAgencyGroupResultDTO implements Serializable {
+    private static final long serialVersionUID = 466974582608407121L;
+    @JsonIgnore
+    BigDecimal bi = new BigDecimal(0);
+    //组织Id
+    private String agencyId;
+    //组织名称
+    private String agencyName;
+    //党群小组总数
+    private Integer groupTotal = 0;
+    //楼院小组总数
+    private Integer ordinaryTotal = 0;
+    //楼院小组总数占比
+    private BigDecimal ordinaryRatio = bi;
+    //支部小组总数
+    private Integer branchTotal = 0;
+    //支部小组总数占比
+    private BigDecimal branchRatio = bi;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubAgencyIssueResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubAgencyIssueResultDTO.java
new file mode 100644
index 0000000000..5bece9dab4
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubAgencyIssueResultDTO.java
@@ -0,0 +1,37 @@
+package com.epmet.dataaggre.dto.datastats.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @Description 基础数据-查询当前组织的直属下级组织议题数据-接口返参
+ * @Auth sun
+ */
+@Data
+public class SubAgencyIssueResultDTO implements Serializable {
+    private static final long serialVersionUID = 466974582608407121L;
+    @JsonIgnore
+    BigDecimal bi = new BigDecimal(0);
+    //组织Id
+    private String agencyId;
+    //组织名称
+    private String agencyName;
+    //议题总数
+    private Integer issueTotal = 0;
+    //表决中总数
+    private Integer votingTotal = 0;
+    //表决中总数占比
+    private BigDecimal votingRatio = bi;
+    //已处理总数
+    private Integer closedIssueTotal = 0;
+    //已处理总数占比
+    private BigDecimal closedIssueRatio = bi;
+    //已转项目总数
+    private Integer shiftProjectTotal = 0;
+    //已转项目总数占比
+    private BigDecimal shiftProjectRatio = bi;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubAgencyProjectResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubAgencyProjectResultDTO.java
new file mode 100644
index 0000000000..33aa889ad4
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubAgencyProjectResultDTO.java
@@ -0,0 +1,33 @@
+package com.epmet.dataaggre.dto.datastats.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @Description 基础数据-查询当前组织的直属下级组织项目数据-接口返参
+ * @Auth sun
+ */
+@Data
+public class SubAgencyProjectResultDTO implements Serializable {
+    private static final long serialVersionUID = 466974582608407121L;
+    @JsonIgnore
+    BigDecimal bi = new BigDecimal(0);
+    //组织Id
+    private String agencyId;
+    //组织名称
+    private String agencyName;
+    //项目总数
+    private Integer projectTotal = 0;
+    //处理中总数
+    private Integer pendingTotal = 0;
+    //处理中总数占比
+    private BigDecimal pendingRatio = bi;
+    //已结案总数
+    private Integer closedProjectTotal = 0;
+    //已结案总数占比
+    private BigDecimal closedProjectRatio = bi;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubAgencyTopicResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubAgencyTopicResultDTO.java
new file mode 100644
index 0000000000..bad0896389
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubAgencyTopicResultDTO.java
@@ -0,0 +1,37 @@
+package com.epmet.dataaggre.dto.datastats.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @Description 基础数据-查询当前组织的直属下级组织话题数据-接口返参
+ * @Auth sun
+ */
+@Data
+public class SubAgencyTopicResultDTO implements Serializable {
+    private static final long serialVersionUID = 466974582608407121L;
+    @JsonIgnore
+    BigDecimal bi = new BigDecimal(0);
+    //组织Id
+    private String agencyId;
+    //组织名称
+    private String agencyName;
+    //话题总数
+    private Integer topicTotal = 0;
+    //热议中总数
+    private Integer discussingTotal = 0;
+    //热议中总数占比
+    private BigDecimal discussingRatio = bi;
+    //已处理总数
+    private Integer closedTopicTotal = 0;
+    //已处理总数占比
+    private BigDecimal closedTopicRatio = bi;
+    //转议题总数
+    private Integer shiftIssueTotal = 0;
+    //转议题总数占比
+    private BigDecimal shiftIssueRatio = bi;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubGridGroupResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubGridGroupResultDTO.java
new file mode 100644
index 0000000000..eff29276d7
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubGridGroupResultDTO.java
@@ -0,0 +1,33 @@
+package com.epmet.dataaggre.dto.datastats.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @Description 基础数据-查询当前组织下直属网格列表群组数据-接口返参
+ * @Auth sun
+ */
+@Data
+public class SubGridGroupResultDTO implements Serializable {
+    private static final long serialVersionUID = 466974582608407121L;
+    @JsonIgnore
+    BigDecimal bi = new BigDecimal(0);
+    //网格Id
+    private String gridId;
+    //网格名称
+    private String gridName;
+    //党群小组总数
+    private Integer groupTotal = 0;
+    //楼院小组总数
+    private Integer ordinaryTotal = 0;
+    //楼院小组总数占比
+    private BigDecimal ordinaryRatio = bi;
+    //支部小组总数
+    private Integer branchTotal = 0;
+    //支部小组总数占比
+    private BigDecimal branchRatio = bi;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubGridIssueResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubGridIssueResultDTO.java
new file mode 100644
index 0000000000..e6131de173
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubGridIssueResultDTO.java
@@ -0,0 +1,37 @@
+package com.epmet.dataaggre.dto.datastats.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @Description 基础数据-查询当前组织下直属网格列表议题数据-接口返参
+ * @Auth sun
+ */
+@Data
+public class SubGridIssueResultDTO implements Serializable {
+    private static final long serialVersionUID = 466974582608407121L;
+    @JsonIgnore
+    BigDecimal bi = new BigDecimal(0);
+    //网格Id
+    private String gridId;
+    //网格名称
+    private String gridName;
+    //议题总数
+    private Integer issueTotal = 0;
+    //表决中总数
+    private Integer votingTotal = 0;
+    //表决中总数占比
+    private BigDecimal votingRatio = bi;
+    //已处理总数
+    private Integer closedIssueTotal = 0;
+    //已处理总数占比
+    private BigDecimal closedIssueRatio = bi;
+    //已转项目总数
+    private Integer shiftProjectTotal = 0;
+    //已转项目总数占比
+    private BigDecimal shiftProjectRatio = bi;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubGridProjectResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubGridProjectResultDTO.java
new file mode 100644
index 0000000000..d548cbe0a0
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubGridProjectResultDTO.java
@@ -0,0 +1,33 @@
+package com.epmet.dataaggre.dto.datastats.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @Description 基础数据-查询当前组织下直属网格列表项目数据-接口返参
+ * @Auth sun
+ */
+@Data
+public class SubGridProjectResultDTO implements Serializable {
+    private static final long serialVersionUID = 466974582608407121L;
+    @JsonIgnore
+    BigDecimal bi = new BigDecimal(0);
+    //网格Id
+    private String gridId;
+    //网格名称
+    private String gridName;
+    //项目总数
+    private Integer projectTotal = 0;
+    //处理中总数
+    private Integer pendingTotal = 0;
+    //处理中总数占比
+    private BigDecimal pendingRatio = bi;
+    //已结案总数
+    private Integer closedProjectTotal = 0;
+    //已结案总数占比
+    private BigDecimal closedProjectRatio = bi;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubGridTopicResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubGridTopicResultDTO.java
new file mode 100644
index 0000000000..88d4850f13
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubGridTopicResultDTO.java
@@ -0,0 +1,37 @@
+package com.epmet.dataaggre.dto.datastats.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @Description 基础数据-查询当前组织下直属网格列表话题数据-接口返参
+ * @Auth sun
+ */
+@Data
+public class SubGridTopicResultDTO implements Serializable {
+    private static final long serialVersionUID = 466974582608407121L;
+    @JsonIgnore
+    BigDecimal bi = new BigDecimal(0);
+    //网格Id
+    private String gridId;
+    //网格名称
+    private String gridName;
+    //话题总数
+    private Integer topicTotal = 0;
+    //热议中总数
+    private Integer discussingTotal = 0;
+    //热议中总数占比
+    private BigDecimal discussingRatio = bi;
+    //已处理总数
+    private Integer closedTopicTotal = 0;
+    //已处理总数占比
+    private BigDecimal closedTopicRatio = bi;
+    //转议题总数
+    private Integer shiftIssueTotal = 0;
+    //转议题总数占比
+    private BigDecimal shiftIssueRatio = bi;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java
index 81188aee40..951696b919 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java
@@ -5,9 +5,7 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dataaggre.dto.datastats.form.AgenctBasicDataFormDTO;
 import com.epmet.dataaggre.dto.datastats.form.SubAgencyFormDTO;
 import com.epmet.dataaggre.dto.datastats.form.SubGridFormDTO;
-import com.epmet.dataaggre.dto.datastats.result.AgencyBasicDataResultDTO;
-import com.epmet.dataaggre.dto.datastats.result.SubAgencyUserResultDTO;
-import com.epmet.dataaggre.dto.datastats.result.SubGridUserResultDTO;
+import com.epmet.dataaggre.dto.datastats.result.*;
 import com.epmet.dataaggre.service.datastats.DataStatsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -61,4 +59,92 @@ public class DataStatsController {
         return new Result<List<SubGridUserResultDTO>>().ok(dataStatsService.subGridUser(formDTO));
     }
 
+    /**
+     * @Param formDTO
+     * @Description 查询当前组织的直属下级组织群组数据
+     * @author sun
+     */
+    @PostMapping("subagencygroup")
+    public Result<List<SubAgencyGroupResultDTO>> subAgencyGroup(@RequestBody SubAgencyFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, SubAgencyFormDTO.Agency.class);
+        return new Result<List<SubAgencyGroupResultDTO>>().ok(dataStatsService.subAgencyGroup(formDTO));
+    }
+
+    /**
+     * @Param formDTO
+     * @Description 查询当前组织下直属网格列表群组数据
+     * @author sun
+     */
+    @PostMapping("subgridgroup")
+    public Result<List<SubGridGroupResultDTO>> subGridGroup(@RequestBody SubGridFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, SubGridFormDTO.Agency.class);
+        return new Result<List<SubGridGroupResultDTO>>().ok(dataStatsService.subGridGroup(formDTO));
+    }
+
+    /**
+     * @Param formDTO
+     * @Description 查询当前组织的直属下级组织话题数据
+     * @author sun
+     */
+    @PostMapping("subagencytopic")
+    public Result<List<SubAgencyTopicResultDTO>> subAgencyTopic(@RequestBody SubAgencyFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, SubAgencyFormDTO.Agency.class);
+        return new Result<List<SubAgencyTopicResultDTO>>().ok(dataStatsService.subAgencyTopic(formDTO));
+    }
+
+    /**
+     * @Param formDTO
+     * @Description 查询当前组织下直属网格列表话题数据
+     * @author sun
+     */
+    @PostMapping("subgridtopic")
+    public Result<List<SubGridTopicResultDTO>> subGridTopic(@RequestBody SubGridFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, SubGridFormDTO.Agency.class);
+        return new Result<List<SubGridTopicResultDTO>>().ok(dataStatsService.subGridTopic(formDTO));
+    }
+
+    /**
+     * @Param formDTO
+     * @Description 查询当前组织的直属下级组织议题数据
+     * @author sun
+     */
+    @PostMapping("subagencyissue")
+    public Result<List<SubAgencyIssueResultDTO>> subAgencyIssue(@RequestBody SubAgencyFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, SubAgencyFormDTO.Agency.class);
+        return new Result<List<SubAgencyIssueResultDTO>>().ok(dataStatsService.subAgencyIssue(formDTO));
+    }
+
+    /**
+     * @Param formDTO
+     * @Description 查询当前组织下直属网格列表议题数据
+     * @author sun
+     */
+    @PostMapping("subgridissue")
+    public Result<List<SubGridIssueResultDTO>> subGridIssue(@RequestBody SubGridFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, SubGridFormDTO.Agency.class);
+        return new Result<List<SubGridIssueResultDTO>>().ok(dataStatsService.subGridIssue(formDTO));
+    }
+
+    /**
+     * @Param formDTO
+     * @Description 查询当前组织的直属下级组织项目数据
+     * @author sun
+     */
+    @PostMapping("subagencyproject")
+    public Result<List<SubAgencyProjectResultDTO>> subAgencyProject(@RequestBody SubAgencyFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, SubAgencyFormDTO.Agency.class);
+        return new Result<List<SubAgencyProjectResultDTO>>().ok(dataStatsService.subAgencyProject(formDTO));
+    }
+
+    /**
+     * @Param formDTO
+     * @Description 查询当前组织下直属网格列表项目数据
+     * @author sun
+     */
+    @PostMapping("subgridproject")
+    public Result<List<SubGridProjectResultDTO>> subGridProject(@RequestBody SubGridFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, SubGridFormDTO.Agency.class);
+        return new Result<List<SubGridProjectResultDTO>>().ok(dataStatsService.subGridProject(formDTO));
+    }
+
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
index c0ef0d6e14..c96b053cba 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
@@ -17,9 +17,9 @@
 
 package com.epmet.dataaggre.dao.datastats;
 
-import com.epmet.dataaggre.dto.datastats.result.AgencyBasicDataResultDTO;
-import com.epmet.dataaggre.dto.datastats.result.SubAgencyUserResultDTO;
-import com.epmet.dataaggre.dto.datastats.result.SubGridUserResultDTO;
+import com.epmet.dataaggre.dto.datastats.form.SubAgencyFormDTO;
+import com.epmet.dataaggre.dto.datastats.form.SubGridFormDTO;
+import com.epmet.dataaggre.dto.datastats.result.*;
 import com.epmet.dataaggre.entity.datastats.DimAgencyEntity;
 import com.epmet.dataaggre.entity.datastats.DimGridEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -77,7 +77,7 @@ public interface DataStatsDao {
     List<DimAgencyEntity> getSubAgencyList(@Param("pid") String pid);
 
     /**
-     * @Description 查询当前组织的直属下级组织信息
+     * @Description 查询直属下级组织注册用户日统计数据，默认按用户总数降序
      * @author sun
      */
     List<SubAgencyUserResultDTO> getSubAgencyUser(@Param("agencyIds") List<String> agencyIds, @Param("dateId") String dateId);
@@ -93,4 +93,65 @@ public interface DataStatsDao {
      * @author sun
      */
     List<SubGridUserResultDTO> getSubGridUser(@Param("gridIds") List<String> gridIds, @Param("dateId") String dateId);
+
+    /**
+     * @Description 查询直属下级组织小组日统计数据，默认按群组总数降序
+     * @author sun
+     */
+    List<SubAgencyGroupResultDTO> getSubAgencyGroup(@Param("agencyIds") List<String> agencyIds, @Param("dateId") String dateId);
+
+    /**
+     * @Description 查询网格层级小组日统计数据，默认按群组总数降序
+     * @author sun
+     */
+    List<SubGridGroupResultDTO> getSubGridGroup(@Param("gridIds") List<String> gridIds, @Param("dateId") String dateId);
+
+    /**
+     * @Description 查询直属下级组织状态话题-日统计数据
+     * @author sun
+     */
+    List<SubAgencyFormDTO.Topic> getSubAgencyTopic(@Param("agencyIds") List<String> agencyIds, @Param("dateId") String dateId);
+
+    /**
+     * @Description 查询直属下级组织转议题话题-日统计数据表
+     * @author sun
+     */
+    List<SubAgencyFormDTO.Topic> getSubAgencyTopicShiftIssue(@Param("agencyIds") List<String> agencyIds, @Param("dateId") String dateId);
+
+    /**
+     * @Description 查询网格层级状态话题-日统计数据
+     * @author sun
+     */
+    List<SubGridFormDTO.Topic> getSubGridTopic(@Param("gridIds") List<String> gridIds, @Param("dateId") String dateId);
+
+    /**
+     * @Description 查询网格层级转议题话题-日统计数据表
+     * @author sun
+     */
+    List<SubGridFormDTO.Topic> getSubGridTopicShiftIssue(@Param("gridIds") List<String> gridIds, @Param("dateId") String dateId);
+
+    /**
+     * @Description 查询直属下级组织议题日统计数据，默认按议题总数降序
+     * @author sun
+     */
+    List<SubAgencyIssueResultDTO> getSubAgencyIssue(@Param("agencyIds") List<String> agencyIds, @Param("dateId") String dateId);
+
+    /**
+     * @Description 查询网格层级议题日统计数据，默认按议题总数降序
+     * @author sun
+     */
+    List<SubGridIssueResultDTO> getSubGridIssue(@Param("gridIds") List<String> gridIds, @Param("dateId") String dateId);
+
+    /**
+     * @Description 查询直属下级组织项目日统计数据，默认按项目总数降序
+     * @author sun
+     */
+    List<SubAgencyProjectResultDTO> getSubAgencyProject(@Param("agencyIds") List<String> agencyIds, @Param("dateId") String dateId);
+
+    /**
+     * @Description 查询网格层级项目日统计数据，默认按项目总数降序
+     * @author sun
+     */
+    List<SubGridProjectResultDTO> getSubGridProject(@Param("gridIds") List<String> gridIds, @Param("dateId") String dateId);
+
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
index a69361e18a..6eb826dc8d 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
@@ -3,9 +3,7 @@ package com.epmet.dataaggre.service.datastats;
 import com.epmet.dataaggre.dto.datastats.form.AgenctBasicDataFormDTO;
 import com.epmet.dataaggre.dto.datastats.form.SubAgencyFormDTO;
 import com.epmet.dataaggre.dto.datastats.form.SubGridFormDTO;
-import com.epmet.dataaggre.dto.datastats.result.AgencyBasicDataResultDTO;
-import com.epmet.dataaggre.dto.datastats.result.SubAgencyUserResultDTO;
-import com.epmet.dataaggre.dto.datastats.result.SubGridUserResultDTO;
+import com.epmet.dataaggre.dto.datastats.result.*;
 
 import java.util.List;
 
@@ -35,4 +33,62 @@ public interface DataStatsService {
      * @author sun
      */
     List<SubGridUserResultDTO> subGridUser(SubGridFormDTO formDTO);
+
+    /**
+     * @Param formDTO
+     * @Description 查询当前组织的直属下级组织群组数据
+     * @author sun
+     */
+    List<SubAgencyGroupResultDTO> subAgencyGroup(SubAgencyFormDTO formDTO);
+
+    /**
+     * @Param formDTO
+     * @Description 查询当前组织下直属网格列表群组数据
+     * @author sun
+     */
+    List<SubGridGroupResultDTO> subGridGroup(SubGridFormDTO formDTO);
+
+    /**
+     * @Param formDTO
+     * @Description 查询当前组织的直属下级组织话题数据
+     * @author sun
+     * @return
+     */
+    List<SubAgencyTopicResultDTO> subAgencyTopic(SubAgencyFormDTO formDTO);
+
+    /**
+     * @Param formDTO
+     * @Description 查询当前组织下直属网格列表话题数据
+     * @author sun
+     * @return
+     */
+    List<SubGridTopicResultDTO> subGridTopic(SubGridFormDTO formDTO);
+
+    /**
+     * @Param formDTO
+     * @Description 查询当前组织的直属下级组织议题数据
+     * @author sun
+     */
+    List<SubAgencyIssueResultDTO> subAgencyIssue(SubAgencyFormDTO formDTO);
+
+    /**
+     * @Param formDTO
+     * @Description 查询当前组织下直属网格列表议题数据
+     * @author sun
+     */
+    List<SubGridIssueResultDTO> subGridIssue(SubGridFormDTO formDTO);
+
+    /**
+     * @Param formDTO
+     * @Description 查询当前组织的直属下级组织项目数据
+     * @author sun
+     */
+    List<SubAgencyProjectResultDTO> subAgencyProject(SubAgencyFormDTO formDTO);
+
+    /**
+     * @Param formDTO
+     * @Description 查询当前组织下直属网格列表项目数据
+     * @author sun
+     */
+    List<SubGridProjectResultDTO> subGridProject(SubGridFormDTO formDTO);
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index 0c4465b7fe..f289a4abc9 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -1,7 +1,6 @@
 package com.epmet.dataaggre.service.datastats.impl;
 
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
-import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.dataaggre.constant.DataSourceConstant;
@@ -9,9 +8,7 @@ import com.epmet.dataaggre.dao.datastats.DataStatsDao;
 import com.epmet.dataaggre.dto.datastats.form.AgenctBasicDataFormDTO;
 import com.epmet.dataaggre.dto.datastats.form.SubAgencyFormDTO;
 import com.epmet.dataaggre.dto.datastats.form.SubGridFormDTO;
-import com.epmet.dataaggre.dto.datastats.result.AgencyBasicDataResultDTO;
-import com.epmet.dataaggre.dto.datastats.result.SubAgencyUserResultDTO;
-import com.epmet.dataaggre.dto.datastats.result.SubGridUserResultDTO;
+import com.epmet.dataaggre.dto.datastats.result.*;
 import com.epmet.dataaggre.entity.datastats.DimAgencyEntity;
 import com.epmet.dataaggre.entity.datastats.DimGridEntity;
 import com.epmet.dataaggre.service.datastats.DataStatsService;
@@ -23,9 +20,8 @@ import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
 import java.text.NumberFormat;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
@@ -51,7 +47,7 @@ public class DataStatsServiceImpl implements DataStatsService {
         AgencyBasicDataResultDTO resultDTO = new AgencyBasicDataResultDTO();
         resultDTO.setAgencyId(formDTO.getAgencyId());
         NumberFormat numberFormat = NumberFormat.getInstance();
-        numberFormat.setMaximumFractionDigits(NumConstant.SIX);
+        numberFormat.setMaximumFractionDigits(NumConstant.FOUR);
 
         //入参有日期的则按具体时间执行,没有的则按当前时间前一天执行
         if (StringUtils.isBlank(formDTO.getDateId())) {
@@ -72,7 +68,7 @@ public class DataStatsServiceImpl implements DataStatsService {
 
         //2.查询组织下最新群组日统计数据
         AgencyBasicDataResultDTO group = dataStatsDao.getAgnecyGroup(formDTO.getAgencyId(), formDTO.getDateId());
-        if (null != user) {
+        if (null != group) {
             resultDTO.setGroupTotal(group.getGroupTotal());
             resultDTO.setOrdinaryTotal(group.getOrdinaryTotal());
             resultDTO.setOrdinaryRatio(group.getOrdinaryTotal() == 0 || group.getGroupTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) group.getOrdinaryTotal() / (float) group.getGroupTotal())));
@@ -138,7 +134,7 @@ public class DataStatsServiceImpl implements DataStatsService {
     public List<SubAgencyUserResultDTO> subAgencyUser(SubAgencyFormDTO formDTO) {
         List<SubAgencyUserResultDTO> resultList = new ArrayList<>();
         NumberFormat numberFormat = NumberFormat.getInstance();
-        numberFormat.setMaximumFractionDigits(NumConstant.SIX);
+        numberFormat.setMaximumFractionDigits(NumConstant.FOUR);
 
         //入参有日期的则按具体时间执行,没有的则按当前时间前一天执行
         if (StringUtils.isBlank(formDTO.getDateId())) {
@@ -180,7 +176,7 @@ public class DataStatsServiceImpl implements DataStatsService {
     public List<SubGridUserResultDTO> subGridUser(SubGridFormDTO formDTO) {
         List<SubGridUserResultDTO> resultList = new ArrayList<>();
         NumberFormat numberFormat = NumberFormat.getInstance();
-        numberFormat.setMaximumFractionDigits(NumConstant.SIX);
+        numberFormat.setMaximumFractionDigits(NumConstant.FOUR);
 
         //入参有日期的则按具体时间执行,没有的则按当前时间前一天执行
         if (StringUtils.isBlank(formDTO.getDateId())) {
@@ -213,4 +209,424 @@ public class DataStatsServiceImpl implements DataStatsService {
         return resultList;
     }
 
+    /**
+     * @Param formDTO
+     * @Description 查询当前组织的直属下级组织群组数据
+     * @author sun
+     */
+    @Override
+    public List<SubAgencyGroupResultDTO> subAgencyGroup(SubAgencyFormDTO formDTO) {
+        List<SubAgencyGroupResultDTO> resultList = new ArrayList<>();
+        NumberFormat numberFormat = NumberFormat.getInstance();
+        numberFormat.setMaximumFractionDigits(NumConstant.FOUR);
+
+        //入参有日期的则按具体时间执行,没有的则按当前时间前一天执行
+        if (StringUtils.isBlank(formDTO.getDateId())) {
+            Date yesterday = DateUtils.addDateDays(new Date(), -1);
+            SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD);
+            formDTO.setDateId(format.format(yesterday));
+        }
+
+        //1.查询当前组织的直属下级组织信息【机关维度】
+        List<DimAgencyEntity> subAgencyList = dataStatsDao.getSubAgencyList(formDTO.getAgencyId());
+        if(subAgencyList.size()<NumConstant.ONE){
+            return resultList;
+        }
+        List<String> agencyIds = subAgencyList.stream().map(DimAgencyEntity::getId).collect(Collectors.toList());
+
+        //2.查询直属下级组织小组日统计数据，默认按群组总数降序
+        resultList = dataStatsDao.getSubAgencyGroup(agencyIds, formDTO.getDateId());
+
+        //3.封装数据并返回
+        resultList.forEach(re->{
+            re.setOrdinaryRatio(re.getOrdinaryTotal() == 0 || re.getGroupTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getOrdinaryTotal() / (float) re.getGroupTotal())));
+            re.setBranchRatio(re.getBranchTotal() == 0 || re.getGroupTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getBranchTotal() / (float) re.getGroupTotal())));
+            subAgencyList.forEach(sub->{
+                if(re.getAgencyId().equals(sub.getId())){
+                    re.setAgencyName(sub.getAgencyName());
+                }
+            });
+        });
+
+        return resultList;
+    }
+
+    /**
+     * @Param formDTO
+     * @Description 查询当前组织下直属网格列表群组数据
+     * @author sun
+     */
+    @Override
+    public List<SubGridGroupResultDTO> subGridGroup(SubGridFormDTO formDTO) {
+        List<SubGridGroupResultDTO> resultList = new ArrayList<>();
+        NumberFormat numberFormat = NumberFormat.getInstance();
+        numberFormat.setMaximumFractionDigits(NumConstant.FOUR);
+
+        //入参有日期的则按具体时间执行,没有的则按当前时间前一天执行
+        if (StringUtils.isBlank(formDTO.getDateId())) {
+            Date yesterday = DateUtils.addDateDays(new Date(), -1);
+            SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD);
+            formDTO.setDateId(format.format(yesterday));
+        }
+
+        //1.查询组织直属网格列表【网格维度】
+        List<DimGridEntity> gridList = dataStatsDao.getSubGridList(formDTO.getAgencyId());
+        if(gridList.size()<NumConstant.ONE){
+            return resultList;
+        }
+        List<String> gridIds = gridList.stream().map(DimGridEntity::getId).collect(Collectors.toList());
+
+        //2.查询网格层级小组日统计数据，默认按群组总数降序
+        resultList = dataStatsDao.getSubGridGroup(gridIds, formDTO.getDateId());
+
+        //3.封装数据并返回
+        resultList.forEach(re->{
+            re.setOrdinaryRatio(re.getOrdinaryTotal() == 0 || re.getGroupTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getOrdinaryTotal() / (float) re.getGroupTotal())));
+            re.setBranchRatio(re.getBranchTotal() == 0 || re.getGroupTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getBranchTotal() / (float) re.getGroupTotal())));
+            gridList.forEach(sub->{
+                if(re.getGridId().equals(sub.getId())){
+                    re.setGridName(sub.getGridName());
+                }
+            });
+        });
+
+        return resultList;
+    }
+
+    /**
+     * @Param formDTO
+     * @Description 查询当前组织的直属下级组织话题数据
+     * @author sun
+     * @return
+     */
+    @Override
+    public List<SubAgencyTopicResultDTO> subAgencyTopic(SubAgencyFormDTO formDTO) {
+        List<SubAgencyTopicResultDTO> resultList = new ArrayList<>();
+        NumberFormat numberFormat = NumberFormat.getInstance();
+        numberFormat.setMaximumFractionDigits(NumConstant.FOUR);
+
+        //入参有日期的则按具体时间执行,没有的则按当前时间前一天执行
+        if (StringUtils.isBlank(formDTO.getDateId())) {
+            Date yesterday = DateUtils.addDateDays(new Date(), -1);
+            SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD);
+            formDTO.setDateId(format.format(yesterday));
+        }
+
+        //1.查询当前组织的直属下级组织信息【机关维度】
+        List<DimAgencyEntity> subAgencyList = dataStatsDao.getSubAgencyList(formDTO.getAgencyId());
+        if(subAgencyList.size()<NumConstant.ONE){
+            return resultList;
+        }
+        List<String> agencyIds = subAgencyList.stream().map(DimAgencyEntity::getId).collect(Collectors.toList());
+
+        //2.查询直属下级组织状态话题-日统计数据
+        //机关日表里三种类型数据之和就是话题总量，讨论中数量与热议中不是一个概念，热议中=总量-关闭数-屏蔽数-转议题数
+        List<SubAgencyFormDTO.Topic> topic = dataStatsDao.getSubAgencyTopic(agencyIds, formDTO.getDateId());
+        //查询直属下级组织转议题话题-日统计数据表
+        List<SubAgencyFormDTO.Topic> topicShiftIssue = dataStatsDao.getSubAgencyTopicShiftIssue(agencyIds, formDTO.getDateId());
+        agencyIds.forEach(agencyId->{
+            SubAgencyTopicResultDTO resultDTO = new SubAgencyTopicResultDTO();
+            AtomicInteger topicTotal = new AtomicInteger(0);
+            AtomicInteger closedTotal = new AtomicInteger(0);
+            AtomicInteger hiddenTotal = new AtomicInteger(0);
+            AtomicInteger shiftIssueTotal = new AtomicInteger(0);
+            AtomicReference<String> agencyName = new AtomicReference<>("");
+            topic.forEach(t->{
+                if(t.getAgencyId().equals(agencyId)){
+                    topicTotal.addAndGet(t.getTopicCount());
+                    if (t.getTopicStatus().equals("closed")){ closedTotal.set(t.getTopicCount()); }
+                    if (t.getTopicStatus().equals("hidden")){ hiddenTotal.set(t.getTopicCount()); }
+                }
+            });
+            topicShiftIssue.forEach(t->{
+                if(t.getAgencyId().equals(agencyId)){
+                    shiftIssueTotal.addAndGet(t.getShiftedIssueTotal());
+                }
+            });
+            subAgencyList.forEach(sub->{
+                if(agencyId.equals(sub.getId())){
+                    agencyName.set(sub.getAgencyName());
+                }
+            });
+
+            resultDTO.setAgencyId(agencyId);
+            resultDTO.setAgencyName(agencyName.get());
+            resultDTO.setTopicTotal(topicTotal.get());
+            resultDTO.setDiscussingTotal(topicTotal.get()-closedTotal.get()-hiddenTotal.get()-shiftIssueTotal.get());
+            resultDTO.setDiscussingRatio(resultDTO.getDiscussingTotal() == 0 || resultDTO.getTopicTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getDiscussingTotal() / (float) resultDTO.getTopicTotal())));
+            resultDTO.setClosedTopicTotal(closedTotal.get());
+            resultDTO.setClosedTopicRatio(resultDTO.getClosedTopicTotal() == 0 || resultDTO.getTopicTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getClosedTopicTotal() / (float) resultDTO.getTopicTotal())));
+            resultDTO.setShiftIssueTotal(shiftIssueTotal.get());
+            resultDTO.setShiftIssueRatio(resultDTO.getShiftIssueTotal() == 0 || resultDTO.getTopicTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getShiftIssueTotal() / (float) resultDTO.getTopicTotal())));
+
+            resultList.add(resultDTO);
+        });
+
+        //3.默认按话题总数降序
+        Collections.sort(resultList, new Comparator<SubAgencyTopicResultDTO>() {
+            @Override
+            public int compare(SubAgencyTopicResultDTO o1, SubAgencyTopicResultDTO o2) {
+                //升序
+                //return o1.getTopicTotal().compareTo(o2.getTopicTotal());
+                //降序
+                return o2.getTopicTotal().compareTo(o1.getTopicTotal());
+            }
+        });
+
+        return resultList;
+    }
+
+    /**
+     * @Param formDTO
+     * @Description 查询当前组织下直属网格列表话题数据
+     * @author sun
+     * @return
+     */
+    @Override
+    public List<SubGridTopicResultDTO> subGridTopic(SubGridFormDTO formDTO) {
+        List<SubGridTopicResultDTO> resultList = new ArrayList<>();
+        NumberFormat numberFormat = NumberFormat.getInstance();
+        numberFormat.setMaximumFractionDigits(NumConstant.FOUR);
+
+        //入参有日期的则按具体时间执行,没有的则按当前时间前一天执行
+        if (StringUtils.isBlank(formDTO.getDateId())) {
+            Date yesterday = DateUtils.addDateDays(new Date(), -1);
+            SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD);
+            formDTO.setDateId(format.format(yesterday));
+        }
+
+        //1.查询组织直属网格列表【网格维度】
+        List<DimGridEntity> gridList = dataStatsDao.getSubGridList(formDTO.getAgencyId());
+        if(gridList.size()<NumConstant.ONE){
+            return resultList;
+        }
+        List<String> gridIds = gridList.stream().map(DimGridEntity::getId).collect(Collectors.toList());
+
+        //2.查询网格层级话题数据
+        //查询网格层级状态话题-日统计数据  机关日表里三种类型数据之和就是话题总量，讨论中数量与热议中不是一个概念，热议中=总量-关闭数-屏蔽数-转议题数
+        List<SubGridFormDTO.Topic> topic = dataStatsDao.getSubGridTopic(gridIds, formDTO.getDateId());
+        //查询网格层级转议题话题-日统计数据表
+        List<SubGridFormDTO.Topic> topicShiftIssue = dataStatsDao.getSubGridTopicShiftIssue(gridIds, formDTO.getDateId());
+        gridIds.forEach(gridId->{
+            SubGridTopicResultDTO resultDTO = new SubGridTopicResultDTO();
+            AtomicInteger topicTotal = new AtomicInteger(0);
+            AtomicInteger closedTotal = new AtomicInteger(0);
+            AtomicInteger hiddenTotal = new AtomicInteger(0);
+            AtomicInteger shiftIssueTotal = new AtomicInteger(0);
+            AtomicReference<String> gridName = new AtomicReference<>("");
+            topic.forEach(t->{
+                if(t.getGridId().equals(gridId)){
+                    topicTotal.addAndGet(t.getTopicCount());
+                    if (t.getTopicStatus().equals("closed")){ closedTotal.set(t.getTopicCount()); }
+                    if (t.getTopicStatus().equals("hidden")){ hiddenTotal.set(t.getTopicCount()); }
+                }
+            });
+            topicShiftIssue.forEach(t->{
+                if(t.getGridId().equals(gridId)){
+                    shiftIssueTotal.addAndGet(t.getShiftedIssueTotal());
+                }
+            });
+            gridList.forEach(sub->{
+                if(gridId.equals(sub.getId())){
+                    gridName.set(sub.getGridName());
+                }
+            });
+
+            resultDTO.setGridId(gridId);
+            resultDTO.setGridName(gridName.get());
+            resultDTO.setTopicTotal(topicTotal.get());
+            resultDTO.setDiscussingTotal(topicTotal.get()-closedTotal.get()-hiddenTotal.get()-shiftIssueTotal.get());
+            resultDTO.setDiscussingRatio(resultDTO.getDiscussingTotal() == 0 || resultDTO.getTopicTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getDiscussingTotal() / (float) resultDTO.getTopicTotal())));
+            resultDTO.setClosedTopicTotal(closedTotal.get());
+            resultDTO.setClosedTopicRatio(resultDTO.getClosedTopicTotal() == 0 || resultDTO.getTopicTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getClosedTopicTotal() / (float) resultDTO.getTopicTotal())));
+            resultDTO.setShiftIssueTotal(shiftIssueTotal.get());
+            resultDTO.setShiftIssueRatio(resultDTO.getShiftIssueTotal() == 0 || resultDTO.getTopicTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getShiftIssueTotal() / (float) resultDTO.getTopicTotal())));
+
+            resultList.add(resultDTO);
+        });
+
+        //3.默认按话题总数降序
+        Collections.sort(resultList, new Comparator<SubGridTopicResultDTO>() {
+            @Override
+            public int compare(SubGridTopicResultDTO o1, SubGridTopicResultDTO o2) {
+                //升序
+                //return o1.getTopicTotal().compareTo(o2.getTopicTotal());
+                //降序
+                return o2.getTopicTotal().compareTo(o1.getTopicTotal());
+            }
+        });
+
+        return resultList;
+    }
+
+    /**
+     * @Param formDTO
+     * @Description 查询当前组织的直属下级组织议题数据
+     * @author sun
+     */
+    @Override
+    public List<SubAgencyIssueResultDTO> subAgencyIssue(SubAgencyFormDTO formDTO) {
+        List<SubAgencyIssueResultDTO> resultList = new ArrayList<>();
+        NumberFormat numberFormat = NumberFormat.getInstance();
+        numberFormat.setMaximumFractionDigits(NumConstant.FOUR);
+
+        //入参有日期的则按具体时间执行,没有的则按当前时间前一天执行
+        if (StringUtils.isBlank(formDTO.getDateId())) {
+            Date yesterday = DateUtils.addDateDays(new Date(), -1);
+            SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD);
+            formDTO.setDateId(format.format(yesterday));
+        }
+
+        //1.查询当前组织的直属下级组织信息【机关维度】
+        List<DimAgencyEntity> subAgencyList = dataStatsDao.getSubAgencyList(formDTO.getAgencyId());
+        if(subAgencyList.size()<NumConstant.ONE){
+            return resultList;
+        }
+        List<String> agencyIds = subAgencyList.stream().map(DimAgencyEntity::getId).collect(Collectors.toList());
+
+        //2.查询直属下级组织议题日统计数据，默认按议题总数降序
+        resultList = dataStatsDao.getSubAgencyIssue(agencyIds, formDTO.getDateId());
+
+        //3.封装数据并返回
+        resultList.forEach(re->{
+            re.setVotingRatio(re.getVotingTotal() == 0 || re.getIssueTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getVotingTotal() / (float) re.getIssueTotal())));
+            re.setClosedIssueRatio(re.getClosedIssueTotal() == 0 || re.getIssueTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getClosedIssueTotal() / (float) re.getIssueTotal())));
+            re.setShiftProjectRatio(re.getShiftProjectTotal() == 0 || re.getIssueTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getShiftProjectTotal() / (float) re.getIssueTotal())));
+            subAgencyList.forEach(sub->{
+                if(re.getAgencyId().equals(sub.getId())){
+                    re.setAgencyName(sub.getAgencyName());
+                }
+            });
+        });
+
+        return resultList;
+    }
+
+    /**
+     * @Param formDTO
+     * @Description 查询当前组织下直属网格列表议题数据
+     * @author sun
+     */
+    @Override
+    public List<SubGridIssueResultDTO> subGridIssue(SubGridFormDTO formDTO) {
+        List<SubGridIssueResultDTO> resultList = new ArrayList<>();
+        NumberFormat numberFormat = NumberFormat.getInstance();
+        numberFormat.setMaximumFractionDigits(NumConstant.FOUR);
+
+        //入参有日期的则按具体时间执行,没有的则按当前时间前一天执行
+        if (StringUtils.isBlank(formDTO.getDateId())) {
+            Date yesterday = DateUtils.addDateDays(new Date(), -1);
+            SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD);
+            formDTO.setDateId(format.format(yesterday));
+        }
+
+        //1.查询组织直属网格列表【网格维度】
+        List<DimGridEntity> gridList = dataStatsDao.getSubGridList(formDTO.getAgencyId());
+        if(gridList.size()<NumConstant.ONE){
+            return resultList;
+        }
+        List<String> gridIds = gridList.stream().map(DimGridEntity::getId).collect(Collectors.toList());
+
+        //2.查询网格层级议题日统计数据，默认按议题总数降序
+        resultList = dataStatsDao.getSubGridIssue(gridIds, formDTO.getDateId());
+
+        //3.封装数据并返回
+        resultList.forEach(re->{
+            re.setVotingRatio(re.getVotingTotal() == 0 || re.getIssueTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getVotingTotal() / (float) re.getIssueTotal())));
+            re.setClosedIssueRatio(re.getClosedIssueTotal() == 0 || re.getIssueTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getClosedIssueTotal() / (float) re.getIssueTotal())));
+            re.setShiftProjectRatio(re.getShiftProjectTotal() == 0 || re.getIssueTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getShiftProjectTotal() / (float) re.getIssueTotal())));
+            gridList.forEach(sub->{
+                if(re.getGridId().equals(sub.getId())){
+                    re.setGridName(sub.getGridName());
+                }
+            });
+        });
+
+        return resultList;
+    }
+
+    /**
+     * @Param formDTO
+     * @Description 查询当前组织的直属下级组织项目数据
+     * @author sun
+     */
+    @Override
+    public List<SubAgencyProjectResultDTO> subAgencyProject(SubAgencyFormDTO formDTO) {
+        List<SubAgencyProjectResultDTO> resultList = new ArrayList<>();
+        NumberFormat numberFormat = NumberFormat.getInstance();
+        numberFormat.setMaximumFractionDigits(NumConstant.FOUR);
+
+        //入参有日期的则按具体时间执行,没有的则按当前时间前一天执行
+        if (StringUtils.isBlank(formDTO.getDateId())) {
+            Date yesterday = DateUtils.addDateDays(new Date(), -1);
+            SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD);
+            formDTO.setDateId(format.format(yesterday));
+        }
+
+        //1.查询当前组织的直属下级组织信息【机关维度】
+        List<DimAgencyEntity> subAgencyList = dataStatsDao.getSubAgencyList(formDTO.getAgencyId());
+        if(subAgencyList.size()<NumConstant.ONE){
+            return resultList;
+        }
+        List<String> agencyIds = subAgencyList.stream().map(DimAgencyEntity::getId).collect(Collectors.toList());
+
+        //2.查询直属下级组织项目日统计数据，默认按项目总数降序
+        resultList = dataStatsDao.getSubAgencyProject(agencyIds, formDTO.getDateId());
+
+        //3.封装数据并返回
+        resultList.forEach(re->{
+            re.setPendingRatio(re.getPendingTotal() == 0 || re.getProjectTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getPendingTotal() / (float) re.getProjectTotal())));
+            re.setClosedProjectRatio(re.getClosedProjectTotal() == 0 || re.getProjectTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getClosedProjectTotal() / (float) re.getProjectTotal())));
+            subAgencyList.forEach(sub->{
+                if(re.getAgencyId().equals(sub.getId())){
+                    re.setAgencyName(sub.getAgencyName());
+                }
+            });
+        });
+
+        return resultList;
+    }
+
+    /**
+     * @Param formDTO
+     * @Description 查询当前组织下直属网格列表项目数据
+     * @author sun
+     */
+    @Override
+    public List<SubGridProjectResultDTO> subGridProject(SubGridFormDTO formDTO) {
+        List<SubGridProjectResultDTO> resultList = new ArrayList<>();
+        NumberFormat numberFormat = NumberFormat.getInstance();
+        numberFormat.setMaximumFractionDigits(NumConstant.FOUR);
+
+        //入参有日期的则按具体时间执行,没有的则按当前时间前一天执行
+        if (StringUtils.isBlank(formDTO.getDateId())) {
+            Date yesterday = DateUtils.addDateDays(new Date(), -1);
+            SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD);
+            formDTO.setDateId(format.format(yesterday));
+        }
+
+        //1.查询组织直属网格列表【网格维度】
+        List<DimGridEntity> gridList = dataStatsDao.getSubGridList(formDTO.getAgencyId());
+        if(gridList.size()<NumConstant.ONE){
+            return resultList;
+        }
+        List<String> gridIds = gridList.stream().map(DimGridEntity::getId).collect(Collectors.toList());
+
+        //2.查询网格层级项目日统计数据，默认按项目总数降序
+        resultList = dataStatsDao.getSubGridProject(gridIds, formDTO.getDateId());
+
+        //3.封装数据并返回
+        resultList.forEach(re->{
+            re.setPendingRatio(re.getPendingTotal() == 0 || re.getProjectTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getPendingTotal() / (float) re.getProjectTotal())));
+            re.setClosedProjectRatio(re.getClosedProjectTotal() == 0 || re.getProjectTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getClosedProjectTotal() / (float) re.getProjectTotal())));
+            gridList.forEach(sub->{
+                if(re.getGridId().equals(sub.getId())){
+                    re.setGridName(sub.getGridName());
+                }
+            });
+        });
+
+        return resultList;
+    }
+
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
index 43ea7b7e85..06967cceab 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
@@ -65,7 +65,7 @@
             closed_total AS closedIssueTotal,
             shift_project_total AS shiftProjectTotal
         FROM
-            fact_issue_agency_daily fiad
+            fact_issue_agency_daily
         WHERE
             del_flag = '0'
         AND agency_id = #{agencyId}
@@ -144,4 +144,174 @@
             reg_total DESC
     </select>
 
+    <select id="getSubAgencyGroup" resultType="com.epmet.dataaggre.dto.datastats.result.SubAgencyGroupResultDTO">
+        SELECT
+            agency_id AS agencyId,
+            group_total AS groupTotal,
+            ordinary_total AS ordinaryTotal,
+            branch_total AS branchTotal
+        FROM
+            fact_group_total_agency_daily
+        WHERE
+            del_flag = '0'
+        AND date_id = #{dateId}
+        <foreach item="agencyId" collection="agencyIds" open="AND (" separator="or" close=")" index="">
+            agency_id = #{agencyId}
+        </foreach>
+        ORDER BY
+            group_total DESC
+    </select>
+
+    <select id="getSubGridGroup" resultType="com.epmet.dataaggre.dto.datastats.result.SubGridGroupResultDTO">
+        SELECT
+            grid_id AS gridId,
+            group_total AS groupTotal,
+            ordinary_total AS ordinaryTotal,
+            branch_total AS branchTotal
+        FROM
+            fact_group_total_grid_daily
+        WHERE
+            del_flag = '0'
+        AND date_id = #{dateId}
+        <foreach item="gridId" collection="gridIds" open="AND (" separator="or" close=")" index="">
+            grid_id = #{gridId}
+        </foreach>
+        ORDER BY
+            group_total DESC
+    </select>
+
+    <select id="getSubAgencyTopic" resultType="com.epmet.dataaggre.dto.datastats.form.SubAgencyFormDTO$Topic">
+        SELECT
+        agency_id AS agencyId,
+        topic_count AS topicCount,
+        topic_status_id AS topicStatus
+        FROM
+        fact_topic_status_agency_daily
+        WHERE
+        del_flag = '0'
+        AND topic_status_id in('discussing','closed','hidden')<!-- 讨论中(热议中！=讨论中)、已处理、已屏蔽 -->
+        AND date_id = #{dateId}
+        <foreach item="agencyId" collection="agencyIds" open="AND (" separator="or" close=")" index="">
+            agency_id = #{agencyId}
+        </foreach>
+    </select>
+
+    <select id="getSubAgencyTopicShiftIssue" resultType="com.epmet.dataaggre.dto.datastats.form.SubAgencyFormDTO$Topic">
+        SELECT
+        agency_id AS agencyId,
+        issue_total AS shiftedIssueTotal
+        FROM
+        fact_topic_issue_agency_daily
+        WHERE
+        del_flag = '0'
+        AND date_id = #{dateId}
+        <foreach item="agencyId" collection="agencyIds" open="AND (" separator="or" close=")" index="">
+            agency_id = #{agencyId}
+        </foreach>
+    </select>
+
+    <select id="getSubGridTopic" resultType="com.epmet.dataaggre.dto.datastats.form.SubGridFormDTO$Topic">
+        SELECT
+        grid_id AS gridId,
+        topic_count AS topicCount,
+        topic_status_id AS topicStatus
+        FROM
+        fact_topic_status_grid_daily
+        WHERE
+        del_flag = '0'
+        AND topic_status_id in('discussing','closed','hidden')<!-- 讨论中(热议中！=讨论中)、已处理、已屏蔽 -->
+        AND date_id = #{dateId}
+        <foreach item="gridId" collection="gridIds" open="AND (" separator="or" close=")" index="">
+            grid_id = #{gridId}
+        </foreach>
+    </select>
+
+    <select id="getSubGridTopicShiftIssue" resultType="com.epmet.dataaggre.dto.datastats.form.SubGridFormDTO$Topic">
+        SELECT
+        grid_id AS gridId,
+        issue_total AS shiftedIssueTotal
+        FROM
+        fact_topic_issue_grid_daily
+        WHERE
+        del_flag = '0'
+        AND date_id = #{dateId}
+        <foreach item="gridId" collection="gridIds" open="AND (" separator="or" close=")" index="">
+            grid_id = #{gridId}
+        </foreach>
+    </select>
+
+    <select id="getSubAgencyIssue" resultType="com.epmet.dataaggre.dto.datastats.result.SubAgencyIssueResultDTO">
+        SELECT
+            agency_id AS agencyId,
+            issue_total AS issueTotal,
+            voting_total AS votingTotal,
+            closed_total AS closedIssueTotal,
+            shift_project_total AS shiftProjectTotal
+        FROM
+            fact_issue_agency_daily
+        WHERE
+            del_flag = '0'
+        AND date_id = #{dateId}
+        <foreach item="agencyId" collection="agencyIds" open="AND (" separator="or" close=")" index="">
+            agency_id = #{agencyId}
+        </foreach>
+        ORDER BY
+            issue_total DESC
+    </select>
+
+    <select id="getSubGridIssue" resultType="com.epmet.dataaggre.dto.datastats.result.SubGridIssueResultDTO">
+        SELECT
+            grid_id AS gridId,
+            issue_total AS issueTotal,
+            voting_total AS votingTotal,
+            closed_total AS closedIssueTotal,
+            shift_project_total AS shiftProjectTotal
+        FROM
+            fact_issue_grid_daily
+        WHERE
+            del_flag = '0'
+        AND date_id = #{dateId}
+        <foreach item="gridId" collection="gridIds" open="AND (" separator="or" close=")" index="">
+            grid_id = #{gridId}
+        </foreach>
+        ORDER BY
+            issue_total DESC
+    </select>
+
+    <select id="getSubAgencyProject" resultType="com.epmet.dataaggre.dto.datastats.result.SubAgencyProjectResultDTO">
+        SELECT
+            agency_id AS agencyId,
+            IFNULL(project_total, 0) AS "projectTotal",
+            IFNULL(pending_total, 0) AS "pendingTotal",
+            IFNULL(closed_total, 0) AS "closedProjectTotal"
+        FROM
+            fact_agency_project_daily
+        WHERE
+            del_flag = '0'
+        AND date_id = #{dateId}
+        <foreach item="agencyId" collection="agencyIds" open="AND (" separator="or" close=")" index="">
+            agency_id = #{agencyId}
+        </foreach>
+        ORDER BY
+            project_total DESC
+    </select>
+
+    <select id="getSubGridProject" resultType="com.epmet.dataaggre.dto.datastats.result.SubGridProjectResultDTO">
+        SELECT
+            grid_id AS gridId,
+            IFNULL(project_total, 0) AS "projectTotal",
+            IFNULL(pending_total, 0) AS "pendingTotal",
+            IFNULL(closed_total, 0) AS "closedProjectTotal"
+        FROM
+            fact_grid_project_daily
+        WHERE
+            del_flag = '0'
+        AND date_id = #{dateId}
+        <foreach item="gridId" collection="gridIds" open="AND (" separator="or" close=")" index="">
+            grid_id = #{gridId}
+        </foreach>
+        ORDER BY
+            project_total DESC
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginExtractServiceImpl.java
index 9b8a74548e..62a4950f7b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginExtractServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginExtractServiceImpl.java
@@ -5,7 +5,9 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.dto.extract.form.ExtractOriginFormDTO;
+import com.epmet.dto.group.form.GroupTotalFormDTO;
 import com.epmet.dto.stats.form.CustomerIdAndDateIdFormDTO;
+import com.epmet.service.StatsGroupService;
 import com.epmet.service.evaluationindex.extract.todata.*;
 import com.epmet.service.stats.DimCustomerPartymemberService;
 import com.epmet.service.stats.DimCustomerService;
@@ -50,6 +52,8 @@ public class FactOriginExtractServiceImpl implements FactOriginExtractService {
     private FactOriginProjectCategoryDailyService originProjectCategoryDailyService;
     @Autowired
     private  FactGroupActDailyService factGroupActDailyService;
+    @Autowired
+    private StatsGroupService statsGroupService;
 
 
     @Override
@@ -229,6 +233,35 @@ public class FactOriginExtractServiceImpl implements FactOriginExtractService {
             }
         });
 
+        //网格、组织小组总数日统计
+        threadPool.submit(() -> {
+            GroupTotalFormDTO formDTO = new GroupTotalFormDTO();
+            formDTO.setCustomerId(param.getCustomerId());
+            if (!isRange) {
+                formDTO.setDateId(param.getDateId());
+                try {
+                    statsGroupService.gridGroupTotal(formDTO);
+                } catch (Exception e) {
+                    log.error("小组总数-网格日统计计算错误,参数:" + JSON.toJSONString(formDTO), e);
+                }
+                try {
+                    statsGroupService.agencyGroupTotal(formDTO);
+                } catch (Exception e) {
+                    log.error("小组总数-机关日统计计算错误,参数:" + JSON.toJSONString(formDTO), e);
+                }
+            } else {
+                try {
+                    statsGroupService.gridGroupTotal(formDTO);
+                } catch (Exception e) {
+                    log.error("小组总数-网格日统计计算错误,参数:" + JSON.toJSONString(formDTO), e);
+                }
+                try {
+                    statsGroupService.agencyGroupTotal(formDTO);
+                } catch (Exception e) {
+                    log.error("小组总数-机关日统计计算错误,参数:" + JSON.toJSONString(formDTO), e);
+                }
+            }
+        });
 
         submitProjectRelationData(param, finalDaysBetween);
     }

From 2176fdba6fbb2b0e2d6a097c5468cb0269a3b436 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 14 May 2021 17:47:05 +0800
Subject: [PATCH 021/128] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../index/form/IndexExplainFormDTO.java       |  6 ++++++
 .../datareport/constant/IndexConstant.java    | 19 +++++++++++--------
 .../index/impl/IndexExplainServiceImpl.java   |  4 ++--
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/form/IndexExplainFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/form/IndexExplainFormDTO.java
index 7d17b128d1..b97139c8ff 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/form/IndexExplainFormDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/form/IndexExplainFormDTO.java
@@ -48,5 +48,11 @@ public class IndexExplainFormDTO implements Serializable {
      * 组织id
      */
     private String orgId;
+    /**
+     * 月份Id
+     */
+    private String monthId;
+
+
 
 }
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/constant/IndexConstant.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/constant/IndexConstant.java
index df3239962b..4e2c5e01e1 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/constant/IndexConstant.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/constant/IndexConstant.java
@@ -22,8 +22,11 @@ public class IndexConstant {
     private static final String FWZS_CN = "服务指数";
     private static final String ZLZS_CN = "治理指数";
     private static final String ZB_CN = "指标";
-    private static final String BEN_JI = "本级";
-    private static final String XIA_JI = "下级";
+    private static final String BEN_JI_CN = "本级";
+    private static final String XIA_JI_CN = "下级";
+
+    public static final String ZI_SHEN = "ZISHEN";
+    public static final String XIA_JI = "xiaji";
 
 
     /**
@@ -41,11 +44,11 @@ public class IndexConstant {
         }
 
         if (allIndexCode.contains(FactConstant.DJNL)) {
-            result.add(BEN_JI + DJZS_CN + ZB_CN);
+            result.add(BEN_JI_CN + DJZS_CN + ZB_CN);
         } else if (allIndexCode.contains(FactConstant.FWNL)) {
-            result.add(BEN_JI + FWZS_CN + ZB_CN);
+            result.add(BEN_JI_CN + FWZS_CN + ZB_CN);
         } else if (allIndexCode.contains(FactConstant.ZLNL)) {
-            result.add(BEN_JI + ZLZS_CN + ZB_CN);
+            result.add(BEN_JI_CN + ZLZS_CN + ZB_CN);
         }
         result.addAll(ScoreLastHeader);
         return result;
@@ -62,11 +65,11 @@ public class IndexConstant {
     public static List<String> getStandardSubHeaders(String allIndexCode) {
         List<String> result = new ArrayList<>(8);
         if (allIndexCode.contains(FactConstant.DJNL)) {
-            result.add(XIA_JI + DJZS_CN + ZB_CN);
+            result.add(XIA_JI_CN + DJZS_CN + ZB_CN);
         } else if (allIndexCode.contains(FactConstant.FWNL)) {
-            result.add(XIA_JI + FWZS_CN + ZB_CN);
+            result.add(XIA_JI_CN + FWZS_CN + ZB_CN);
         } else if (allIndexCode.contains(FactConstant.ZLNL)) {
-            result.add(XIA_JI + ZLZS_CN + ZB_CN);
+            result.add(XIA_JI_CN + ZLZS_CN + ZB_CN);
         }
         result.addAll(QuantityLastHeader);
         return result;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
index ac2e998e2e..0734fadda1 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
@@ -103,11 +103,11 @@ public class IndexExplainServiceImpl implements IndexExplainService {
                     String type = explainDTO.getType();
                     String allIndexCodePath = null;
                     List<IndexScoreDetailResult> tableList = null;
-                    if ("zishen".equals(type)) {
+                    if (IndexConstant.ZI_SHEN.equals(type)) {
                         allIndexCodePath = "wanggexiangguan:dangjiannengli";
                         tableList = setDefaultTableData(detailEntityMap, type, allIndexCodePath);
                         result.setTableDataList(tableList);
-                    } else if ("xiaji".equals(type)) {
+                    } else if (IndexConstant.XIA_JI.equals(type)) {
                         allIndexCodePath = "dangyuanxiangguan:lianxiqunzhong";
                         tableList = setDefaultTableData(detailEntityMap, type, allIndexCodePath);
                         result.setTableDataList(tableList);

From fa5303ec97c0887e35dedb2221c243f1760ac265 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 14 May 2021 17:50:39 +0800
Subject: [PATCH 022/128] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../evaluationindex/index/impl/IndexExplainServiceImpl.java  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
index 0734fadda1..0f79d225e2 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
@@ -126,6 +126,9 @@ public class IndexExplainServiceImpl implements IndexExplainService {
                         //不下钻
                         scoreList = gridSubScoreDao.selectGridSubScore(ablityListFormDTO);
                     }
+                    if (scoreList == null || tableList == null) {
+                        return;
+                    }
                     for (IndexScoreResult score : scoreList) {
                         for (IndexScoreDetailResult tb : tableList) {
                             if (tb.getIndexCode().equals(score.getIndexCode())) {
@@ -136,6 +139,8 @@ public class IndexExplainServiceImpl implements IndexExplainService {
                             }
                         }
                     }
+
+
                     break;
                 default:
 

From 054e20801d28fd8ae86dbfdfce21b12a260f5922 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 17 May 2021 11:04:33 +0800
Subject: [PATCH 023/128] =?UTF-8?q?=E9=83=A8=E5=88=86=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/datastats/form/SubAgencyFormDTO.java  |   9 +
 .../dto/datastats/form/SubGridFormDTO.java    |   9 +
 .../datastats/impl/DataStatsServiceImpl.java  | 336 ++++++++++++++----
 3 files changed, 277 insertions(+), 77 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubAgencyFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubAgencyFormDTO.java
index a02a39456c..d5d3d8a66a 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubAgencyFormDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubAgencyFormDTO.java
@@ -23,6 +23,15 @@ public class SubAgencyFormDTO implements Serializable {
      * 日维度Id
      */
     private String dateId;
+    /**
+     * 排序类型字段
+     * 用户【用户:user  党员:party  居民:resi】
+     * 党群【党群:group 楼院小组:ordinary 支部小组:branch】
+     * 话题【话题:topic 热议中:discussing 已处理:closed 已转议题:shiftIssue】
+     * 议题【议题:issue 表决中:voting 已转项目:shiftProject 已处理:closed】
+     * 项目【项目:project 处理中:pending 已结案:closed】
+     */
+    private String type;
     public interface Agency extends CustomerClientShowGroup{}
 
     @Data
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubGridFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubGridFormDTO.java
index d7da58385e..d429b47b7c 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubGridFormDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubGridFormDTO.java
@@ -23,6 +23,15 @@ public class SubGridFormDTO implements Serializable {
      * 日维度Id
      */
     private String dateId;
+    /**
+     * 排序类型字段
+     * 用户【用户:user  党员:party  居民:resi】
+     * 党群【党群:group 楼院小组:ordinary 支部小组:branch】
+     * 话题【话题:topic 热议中:discussing 已处理:closed 已转议题:shiftIssue】
+     * 议题【议题:issue 表决中:voting 已转项目:shiftProject 已处理:closed】
+     * 项目【项目:project 处理中:pending 已结案:closed】
+     */
+    private String type;
     public interface Agency extends CustomerClientShowGroup{}
 
     @Data
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index f289a4abc9..900144795e 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -84,18 +84,22 @@ public class DataStatsServiceImpl implements DataStatsService {
         AgencyBasicDataResultDTO.Topic topicSHiftIssue = dataStatsDao.getAgencyTopicShiftIssue(formDTO.getAgencyId(), formDTO.getDateId());
         AtomicReference<Integer> closedTotal = new AtomicReference<>(0);
         AtomicReference<Integer> hiddenTotal = new AtomicReference<>(0);
-        if (topic.size()>NumConstant.ZERO) {
+        if (topic.size() > NumConstant.ZERO) {
             resultDTO.setTopicTotal(topic.stream().collect(Collectors.summingInt(AgencyBasicDataResultDTO.Topic::getTopicCount)));
             topic.forEach(t -> {
-                if (t.getTopicStatus().equals("closed")){ closedTotal.set(t.getTopicCount()); }
-                if (t.getTopicStatus().equals("hidden")){ hiddenTotal.set(t.getTopicCount()); }
+                if (t.getTopicStatus().equals("closed")) {
+                    closedTotal.set(t.getTopicCount());
+                }
+                if (t.getTopicStatus().equals("hidden")) {
+                    hiddenTotal.set(t.getTopicCount());
+                }
             });
         }
         if (null != topicSHiftIssue) {
             resultDTO.setShiftIssueTotal(topicSHiftIssue.getShiftedIssueTotal());
             resultDTO.setShiftIssueRatio(resultDTO.getShiftIssueTotal() == 0 || resultDTO.getTopicTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getShiftIssueTotal() / (float) resultDTO.getTopicTotal())));
         }
-        resultDTO.setDiscussingTotal(resultDTO.getTopicTotal()-closedTotal.get()-hiddenTotal.get()-resultDTO.getShiftIssueTotal());
+        resultDTO.setDiscussingTotal(resultDTO.getTopicTotal() - closedTotal.get() - hiddenTotal.get() - resultDTO.getShiftIssueTotal());
         resultDTO.setDiscussingRatio(resultDTO.getDiscussingTotal() == 0 || resultDTO.getTopicTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getDiscussingTotal() / (float) resultDTO.getTopicTotal())));
         resultDTO.setClosedTopicTotal(closedTotal.get());
         resultDTO.setClosedTopicRatio(resultDTO.getClosedTopicTotal() == 0 || resultDTO.getTopicTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getClosedTopicTotal() / (float) resultDTO.getTopicTotal())));
@@ -142,10 +146,14 @@ public class DataStatsServiceImpl implements DataStatsService {
             SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD);
             formDTO.setDateId(format.format(yesterday));
         }
+        //排序类型，默认按用户总数降序
+        if (StringUtils.isBlank(formDTO.getDateId())) {
+            formDTO.setType("user");
+        }
 
         //1.查询当前组织的直属下级组织信息【机关维度】
         List<DimAgencyEntity> subAgencyList = dataStatsDao.getSubAgencyList(formDTO.getAgencyId());
-        if(subAgencyList.size()<NumConstant.ONE){
+        if (subAgencyList.size() < NumConstant.ONE) {
             return resultList;
         }
         List<String> agencyIds = subAgencyList.stream().map(DimAgencyEntity::getId).collect(Collectors.toList());
@@ -153,17 +161,34 @@ public class DataStatsServiceImpl implements DataStatsService {
         //2.查询直属下级组织注册用户日统计数据，默认按用户总数降序
         resultList = dataStatsDao.getSubAgencyUser(agencyIds, formDTO.getDateId());
 
-        //3.封装数据并返回
-        resultList.forEach(re->{
+        //3.封装数据
+        resultList.forEach(re -> {
             re.setPartyMemberRatio(re.getPartyMemberTotal() == 0 || re.getUserTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getPartyMemberTotal() / (float) re.getUserTotal())));
             re.setResiRatio(re.getResiTotal() == 0 || re.getUserTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getResiTotal() / (float) re.getUserTotal())));
-            subAgencyList.forEach(sub->{
-                if(re.getAgencyId().equals(sub.getId())){
+            subAgencyList.forEach(sub -> {
+                if (re.getAgencyId().equals(sub.getId())) {
                     re.setAgencyName(sub.getAgencyName());
                 }
             });
         });
 
+        //4.按要求排序并返回
+        Collections.sort(resultList, new Comparator<SubAgencyUserResultDTO>() {
+            @Override
+            public int compare(SubAgencyUserResultDTO o1, SubAgencyUserResultDTO o2) {
+                if ("party".equals(formDTO.getType())) {
+                    //升序
+                    //return o1.getPartyMemberTotal().compareTo(o2.getPartyMemberTotal());
+                    //降序
+                    return o2.getPartyMemberTotal().compareTo(o1.getPartyMemberTotal());
+                } else if ("resi".equals(formDTO.getType())) {
+                    return o2.getResiTotal().compareTo(o1.getResiTotal());
+                } else {
+                    return o2.getUserTotal().compareTo(o1.getUserTotal());
+                }
+            }
+        });
+
         return resultList;
     }
 
@@ -184,10 +209,14 @@ public class DataStatsServiceImpl implements DataStatsService {
             SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD);
             formDTO.setDateId(format.format(yesterday));
         }
+        //排序类型，默认按用户总数降序
+        if (StringUtils.isBlank(formDTO.getDateId())) {
+            formDTO.setType("user");
+        }
 
         //1.查询组织直属网格列表【网格维度】
         List<DimGridEntity> gridList = dataStatsDao.getSubGridList(formDTO.getAgencyId());
-        if(gridList.size()<NumConstant.ONE){
+        if (gridList.size() < NumConstant.ONE) {
             return resultList;
         }
         List<String> gridIds = gridList.stream().map(DimGridEntity::getId).collect(Collectors.toList());
@@ -195,17 +224,32 @@ public class DataStatsServiceImpl implements DataStatsService {
         //2.查询网格层级注册用户日统计数据，默认按用户总数降序
         resultList = dataStatsDao.getSubGridUser(gridIds, formDTO.getDateId());
 
-        //3.封装数据并返回
-        resultList.forEach(re->{
+        //3.封装数据
+        resultList.forEach(re -> {
             re.setPartyMemberRatio(re.getPartyMemberTotal() == 0 || re.getUserTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getPartyMemberTotal() / (float) re.getUserTotal())));
             re.setResiRatio(re.getResiTotal() == 0 || re.getUserTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getResiTotal() / (float) re.getUserTotal())));
-            gridList.forEach(sub->{
-                if(re.getGridId().equals(sub.getId())){
+            gridList.forEach(sub -> {
+                if (re.getGridId().equals(sub.getId())) {
                     re.setGridName(sub.getGridName());
                 }
             });
         });
 
+        //4.按要求排序并返回
+        Collections.sort(resultList, new Comparator<SubGridUserResultDTO>() {
+            @Override
+            public int compare(SubGridUserResultDTO o1, SubGridUserResultDTO o2) {
+                if ("party".equals(formDTO.getType())) {
+                    //降序
+                    return o2.getPartyMemberTotal().compareTo(o1.getPartyMemberTotal());
+                } else if ("resi".equals(formDTO.getType())) {
+                    return o2.getResiTotal().compareTo(o1.getResiTotal());
+                } else {
+                    return o2.getUserTotal().compareTo(o1.getUserTotal());
+                }
+            }
+        });
+
         return resultList;
     }
 
@@ -226,10 +270,14 @@ public class DataStatsServiceImpl implements DataStatsService {
             SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD);
             formDTO.setDateId(format.format(yesterday));
         }
+        //排序类型，默认按用户总数降序
+        if (StringUtils.isBlank(formDTO.getDateId())) {
+            formDTO.setType("group");
+        }
 
         //1.查询当前组织的直属下级组织信息【机关维度】
         List<DimAgencyEntity> subAgencyList = dataStatsDao.getSubAgencyList(formDTO.getAgencyId());
-        if(subAgencyList.size()<NumConstant.ONE){
+        if (subAgencyList.size() < NumConstant.ONE) {
             return resultList;
         }
         List<String> agencyIds = subAgencyList.stream().map(DimAgencyEntity::getId).collect(Collectors.toList());
@@ -237,17 +285,31 @@ public class DataStatsServiceImpl implements DataStatsService {
         //2.查询直属下级组织小组日统计数据，默认按群组总数降序
         resultList = dataStatsDao.getSubAgencyGroup(agencyIds, formDTO.getDateId());
 
-        //3.封装数据并返回
-        resultList.forEach(re->{
+        //3.封装数据
+        resultList.forEach(re -> {
             re.setOrdinaryRatio(re.getOrdinaryTotal() == 0 || re.getGroupTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getOrdinaryTotal() / (float) re.getGroupTotal())));
             re.setBranchRatio(re.getBranchTotal() == 0 || re.getGroupTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getBranchTotal() / (float) re.getGroupTotal())));
-            subAgencyList.forEach(sub->{
-                if(re.getAgencyId().equals(sub.getId())){
+            subAgencyList.forEach(sub -> {
+                if (re.getAgencyId().equals(sub.getId())) {
                     re.setAgencyName(sub.getAgencyName());
                 }
             });
         });
 
+        //4.按要求排序并返回
+        Collections.sort(resultList, new Comparator<SubAgencyGroupResultDTO>() {
+            @Override
+            public int compare(SubAgencyGroupResultDTO o1, SubAgencyGroupResultDTO o2) {
+                if ("ordinary".equals(formDTO.getType())) {
+                    return o2.getOrdinaryTotal().compareTo(o1.getOrdinaryTotal());
+                } else if ("branch".equals(formDTO.getType())) {
+                    return o2.getBranchTotal().compareTo(o1.getBranchTotal());
+                } else {
+                    return o2.getGroupTotal().compareTo(o1.getGroupTotal());
+                }
+            }
+        });
+
         return resultList;
     }
 
@@ -268,10 +330,14 @@ public class DataStatsServiceImpl implements DataStatsService {
             SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD);
             formDTO.setDateId(format.format(yesterday));
         }
+        //排序类型，默认按用户总数降序
+        if (StringUtils.isBlank(formDTO.getDateId())) {
+            formDTO.setType("group");
+        }
 
         //1.查询组织直属网格列表【网格维度】
         List<DimGridEntity> gridList = dataStatsDao.getSubGridList(formDTO.getAgencyId());
-        if(gridList.size()<NumConstant.ONE){
+        if (gridList.size() < NumConstant.ONE) {
             return resultList;
         }
         List<String> gridIds = gridList.stream().map(DimGridEntity::getId).collect(Collectors.toList());
@@ -280,24 +346,38 @@ public class DataStatsServiceImpl implements DataStatsService {
         resultList = dataStatsDao.getSubGridGroup(gridIds, formDTO.getDateId());
 
         //3.封装数据并返回
-        resultList.forEach(re->{
+        resultList.forEach(re -> {
             re.setOrdinaryRatio(re.getOrdinaryTotal() == 0 || re.getGroupTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getOrdinaryTotal() / (float) re.getGroupTotal())));
             re.setBranchRatio(re.getBranchTotal() == 0 || re.getGroupTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getBranchTotal() / (float) re.getGroupTotal())));
-            gridList.forEach(sub->{
-                if(re.getGridId().equals(sub.getId())){
+            gridList.forEach(sub -> {
+                if (re.getGridId().equals(sub.getId())) {
                     re.setGridName(sub.getGridName());
                 }
             });
         });
 
+        //4.按要求排序并返回
+        Collections.sort(resultList, new Comparator<SubGridGroupResultDTO>() {
+            @Override
+            public int compare(SubGridGroupResultDTO o1, SubGridGroupResultDTO o2) {
+                if ("ordinary".equals(formDTO.getType())) {
+                    return o2.getOrdinaryTotal().compareTo(o1.getOrdinaryTotal());
+                } else if ("branch".equals(formDTO.getType())) {
+                    return o2.getBranchTotal().compareTo(o1.getBranchTotal());
+                } else {
+                    return o2.getGroupTotal().compareTo(o1.getGroupTotal());
+                }
+            }
+        });
+
         return resultList;
     }
 
     /**
+     * @return
      * @Param formDTO
      * @Description 查询当前组织的直属下级组织话题数据
      * @author sun
-     * @return
      */
     @Override
     public List<SubAgencyTopicResultDTO> subAgencyTopic(SubAgencyFormDTO formDTO) {
@@ -311,10 +391,14 @@ public class DataStatsServiceImpl implements DataStatsService {
             SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD);
             formDTO.setDateId(format.format(yesterday));
         }
+        //排序类型，默认按用户总数降序
+        if (StringUtils.isBlank(formDTO.getDateId())) {
+            formDTO.setType("topic");
+        }
 
         //1.查询当前组织的直属下级组织信息【机关维度】
         List<DimAgencyEntity> subAgencyList = dataStatsDao.getSubAgencyList(formDTO.getAgencyId());
-        if(subAgencyList.size()<NumConstant.ONE){
+        if (subAgencyList.size() < NumConstant.ONE) {
             return resultList;
         }
         List<String> agencyIds = subAgencyList.stream().map(DimAgencyEntity::getId).collect(Collectors.toList());
@@ -324,27 +408,31 @@ public class DataStatsServiceImpl implements DataStatsService {
         List<SubAgencyFormDTO.Topic> topic = dataStatsDao.getSubAgencyTopic(agencyIds, formDTO.getDateId());
         //查询直属下级组织转议题话题-日统计数据表
         List<SubAgencyFormDTO.Topic> topicShiftIssue = dataStatsDao.getSubAgencyTopicShiftIssue(agencyIds, formDTO.getDateId());
-        agencyIds.forEach(agencyId->{
+        agencyIds.forEach(agencyId -> {
             SubAgencyTopicResultDTO resultDTO = new SubAgencyTopicResultDTO();
             AtomicInteger topicTotal = new AtomicInteger(0);
             AtomicInteger closedTotal = new AtomicInteger(0);
             AtomicInteger hiddenTotal = new AtomicInteger(0);
             AtomicInteger shiftIssueTotal = new AtomicInteger(0);
             AtomicReference<String> agencyName = new AtomicReference<>("");
-            topic.forEach(t->{
-                if(t.getAgencyId().equals(agencyId)){
+            topic.forEach(t -> {
+                if (t.getAgencyId().equals(agencyId)) {
                     topicTotal.addAndGet(t.getTopicCount());
-                    if (t.getTopicStatus().equals("closed")){ closedTotal.set(t.getTopicCount()); }
-                    if (t.getTopicStatus().equals("hidden")){ hiddenTotal.set(t.getTopicCount()); }
+                    if (t.getTopicStatus().equals("closed")) {
+                        closedTotal.set(t.getTopicCount());
+                    }
+                    if (t.getTopicStatus().equals("hidden")) {
+                        hiddenTotal.set(t.getTopicCount());
+                    }
                 }
             });
-            topicShiftIssue.forEach(t->{
-                if(t.getAgencyId().equals(agencyId)){
+            topicShiftIssue.forEach(t -> {
+                if (t.getAgencyId().equals(agencyId)) {
                     shiftIssueTotal.addAndGet(t.getShiftedIssueTotal());
                 }
             });
-            subAgencyList.forEach(sub->{
-                if(agencyId.equals(sub.getId())){
+            subAgencyList.forEach(sub -> {
+                if (agencyId.equals(sub.getId())) {
                     agencyName.set(sub.getAgencyName());
                 }
             });
@@ -352,7 +440,7 @@ public class DataStatsServiceImpl implements DataStatsService {
             resultDTO.setAgencyId(agencyId);
             resultDTO.setAgencyName(agencyName.get());
             resultDTO.setTopicTotal(topicTotal.get());
-            resultDTO.setDiscussingTotal(topicTotal.get()-closedTotal.get()-hiddenTotal.get()-shiftIssueTotal.get());
+            resultDTO.setDiscussingTotal(topicTotal.get() - closedTotal.get() - hiddenTotal.get() - shiftIssueTotal.get());
             resultDTO.setDiscussingRatio(resultDTO.getDiscussingTotal() == 0 || resultDTO.getTopicTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getDiscussingTotal() / (float) resultDTO.getTopicTotal())));
             resultDTO.setClosedTopicTotal(closedTotal.get());
             resultDTO.setClosedTopicRatio(resultDTO.getClosedTopicTotal() == 0 || resultDTO.getTopicTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getClosedTopicTotal() / (float) resultDTO.getTopicTotal())));
@@ -362,14 +450,19 @@ public class DataStatsServiceImpl implements DataStatsService {
             resultList.add(resultDTO);
         });
 
-        //3.默认按话题总数降序
+        //3.按要求排序并返回
         Collections.sort(resultList, new Comparator<SubAgencyTopicResultDTO>() {
             @Override
             public int compare(SubAgencyTopicResultDTO o1, SubAgencyTopicResultDTO o2) {
-                //升序
-                //return o1.getTopicTotal().compareTo(o2.getTopicTotal());
-                //降序
-                return o2.getTopicTotal().compareTo(o1.getTopicTotal());
+                if ("discussing".equals(formDTO.getType())) {
+                    return o2.getDiscussingTotal().compareTo(o1.getDiscussingTotal());
+                } else if ("closed".equals(formDTO.getType())) {
+                    return o2.getClosedTopicTotal().compareTo(o1.getClosedTopicTotal());
+                } else if ("shiftIssue".equals(formDTO.getType())) {
+                    return o2.getShiftIssueTotal().compareTo(o1.getShiftIssueTotal());
+                } else {
+                    return o2.getTopicTotal().compareTo(o1.getTopicTotal());
+                }
             }
         });
 
@@ -377,10 +470,10 @@ public class DataStatsServiceImpl implements DataStatsService {
     }
 
     /**
+     * @return
      * @Param formDTO
      * @Description 查询当前组织下直属网格列表话题数据
      * @author sun
-     * @return
      */
     @Override
     public List<SubGridTopicResultDTO> subGridTopic(SubGridFormDTO formDTO) {
@@ -394,10 +487,14 @@ public class DataStatsServiceImpl implements DataStatsService {
             SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD);
             formDTO.setDateId(format.format(yesterday));
         }
+        //排序类型，默认按用户总数降序
+        if (StringUtils.isBlank(formDTO.getDateId())) {
+            formDTO.setType("topic");
+        }
 
         //1.查询组织直属网格列表【网格维度】
         List<DimGridEntity> gridList = dataStatsDao.getSubGridList(formDTO.getAgencyId());
-        if(gridList.size()<NumConstant.ONE){
+        if (gridList.size() < NumConstant.ONE) {
             return resultList;
         }
         List<String> gridIds = gridList.stream().map(DimGridEntity::getId).collect(Collectors.toList());
@@ -407,27 +504,31 @@ public class DataStatsServiceImpl implements DataStatsService {
         List<SubGridFormDTO.Topic> topic = dataStatsDao.getSubGridTopic(gridIds, formDTO.getDateId());
         //查询网格层级转议题话题-日统计数据表
         List<SubGridFormDTO.Topic> topicShiftIssue = dataStatsDao.getSubGridTopicShiftIssue(gridIds, formDTO.getDateId());
-        gridIds.forEach(gridId->{
+        gridIds.forEach(gridId -> {
             SubGridTopicResultDTO resultDTO = new SubGridTopicResultDTO();
             AtomicInteger topicTotal = new AtomicInteger(0);
             AtomicInteger closedTotal = new AtomicInteger(0);
             AtomicInteger hiddenTotal = new AtomicInteger(0);
             AtomicInteger shiftIssueTotal = new AtomicInteger(0);
             AtomicReference<String> gridName = new AtomicReference<>("");
-            topic.forEach(t->{
-                if(t.getGridId().equals(gridId)){
+            topic.forEach(t -> {
+                if (t.getGridId().equals(gridId)) {
                     topicTotal.addAndGet(t.getTopicCount());
-                    if (t.getTopicStatus().equals("closed")){ closedTotal.set(t.getTopicCount()); }
-                    if (t.getTopicStatus().equals("hidden")){ hiddenTotal.set(t.getTopicCount()); }
+                    if (t.getTopicStatus().equals("closed")) {
+                        closedTotal.set(t.getTopicCount());
+                    }
+                    if (t.getTopicStatus().equals("hidden")) {
+                        hiddenTotal.set(t.getTopicCount());
+                    }
                 }
             });
-            topicShiftIssue.forEach(t->{
-                if(t.getGridId().equals(gridId)){
+            topicShiftIssue.forEach(t -> {
+                if (t.getGridId().equals(gridId)) {
                     shiftIssueTotal.addAndGet(t.getShiftedIssueTotal());
                 }
             });
-            gridList.forEach(sub->{
-                if(gridId.equals(sub.getId())){
+            gridList.forEach(sub -> {
+                if (gridId.equals(sub.getId())) {
                     gridName.set(sub.getGridName());
                 }
             });
@@ -435,7 +536,7 @@ public class DataStatsServiceImpl implements DataStatsService {
             resultDTO.setGridId(gridId);
             resultDTO.setGridName(gridName.get());
             resultDTO.setTopicTotal(topicTotal.get());
-            resultDTO.setDiscussingTotal(topicTotal.get()-closedTotal.get()-hiddenTotal.get()-shiftIssueTotal.get());
+            resultDTO.setDiscussingTotal(topicTotal.get() - closedTotal.get() - hiddenTotal.get() - shiftIssueTotal.get());
             resultDTO.setDiscussingRatio(resultDTO.getDiscussingTotal() == 0 || resultDTO.getTopicTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getDiscussingTotal() / (float) resultDTO.getTopicTotal())));
             resultDTO.setClosedTopicTotal(closedTotal.get());
             resultDTO.setClosedTopicRatio(resultDTO.getClosedTopicTotal() == 0 || resultDTO.getTopicTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getClosedTopicTotal() / (float) resultDTO.getTopicTotal())));
@@ -445,14 +546,19 @@ public class DataStatsServiceImpl implements DataStatsService {
             resultList.add(resultDTO);
         });
 
-        //3.默认按话题总数降序
+        //3.按要求排序并返回
         Collections.sort(resultList, new Comparator<SubGridTopicResultDTO>() {
             @Override
             public int compare(SubGridTopicResultDTO o1, SubGridTopicResultDTO o2) {
-                //升序
-                //return o1.getTopicTotal().compareTo(o2.getTopicTotal());
-                //降序
-                return o2.getTopicTotal().compareTo(o1.getTopicTotal());
+                if ("discussing".equals(formDTO.getType())) {
+                    return o2.getDiscussingTotal().compareTo(o1.getDiscussingTotal());
+                } else if ("closed".equals(formDTO.getType())) {
+                    return o2.getClosedTopicTotal().compareTo(o1.getClosedTopicTotal());
+                } else if ("shiftIssue".equals(formDTO.getType())) {
+                    return o2.getShiftIssueTotal().compareTo(o1.getShiftIssueTotal());
+                } else {
+                    return o2.getTopicTotal().compareTo(o1.getTopicTotal());
+                }
             }
         });
 
@@ -476,10 +582,14 @@ public class DataStatsServiceImpl implements DataStatsService {
             SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD);
             formDTO.setDateId(format.format(yesterday));
         }
+        //排序类型，默认按用户总数降序
+        if (StringUtils.isBlank(formDTO.getDateId())) {
+            formDTO.setType("issue");
+        }
 
         //1.查询当前组织的直属下级组织信息【机关维度】
         List<DimAgencyEntity> subAgencyList = dataStatsDao.getSubAgencyList(formDTO.getAgencyId());
-        if(subAgencyList.size()<NumConstant.ONE){
+        if (subAgencyList.size() < NumConstant.ONE) {
             return resultList;
         }
         List<String> agencyIds = subAgencyList.stream().map(DimAgencyEntity::getId).collect(Collectors.toList());
@@ -487,18 +597,34 @@ public class DataStatsServiceImpl implements DataStatsService {
         //2.查询直属下级组织议题日统计数据，默认按议题总数降序
         resultList = dataStatsDao.getSubAgencyIssue(agencyIds, formDTO.getDateId());
 
-        //3.封装数据并返回
-        resultList.forEach(re->{
+        //3.封装数据
+        resultList.forEach(re -> {
             re.setVotingRatio(re.getVotingTotal() == 0 || re.getIssueTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getVotingTotal() / (float) re.getIssueTotal())));
             re.setClosedIssueRatio(re.getClosedIssueTotal() == 0 || re.getIssueTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getClosedIssueTotal() / (float) re.getIssueTotal())));
             re.setShiftProjectRatio(re.getShiftProjectTotal() == 0 || re.getIssueTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getShiftProjectTotal() / (float) re.getIssueTotal())));
-            subAgencyList.forEach(sub->{
-                if(re.getAgencyId().equals(sub.getId())){
+            subAgencyList.forEach(sub -> {
+                if (re.getAgencyId().equals(sub.getId())) {
                     re.setAgencyName(sub.getAgencyName());
                 }
             });
         });
 
+        //4.按要求排序并返回
+        Collections.sort(resultList, new Comparator<SubAgencyIssueResultDTO>() {
+            @Override
+            public int compare(SubAgencyIssueResultDTO o1, SubAgencyIssueResultDTO o2) {
+                if ("voting".equals(formDTO.getType())) {
+                    return o2.getVotingTotal().compareTo(o1.getVotingTotal());
+                } else if ("shiftProject".equals(formDTO.getType())) {
+                    return o2.getShiftProjectTotal().compareTo(o1.getShiftProjectTotal());
+                } else if ("closed".equals(formDTO.getType())) {
+                    return o2.getClosedIssueTotal().compareTo(o1.getClosedIssueTotal());
+                } else {
+                    return o2.getIssueTotal().compareTo(o1.getIssueTotal());
+                }
+            }
+        });
+
         return resultList;
     }
 
@@ -519,10 +645,14 @@ public class DataStatsServiceImpl implements DataStatsService {
             SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD);
             formDTO.setDateId(format.format(yesterday));
         }
+        //排序类型，默认按用户总数降序
+        if (StringUtils.isBlank(formDTO.getDateId())) {
+            formDTO.setType("issue");
+        }
 
         //1.查询组织直属网格列表【网格维度】
         List<DimGridEntity> gridList = dataStatsDao.getSubGridList(formDTO.getAgencyId());
-        if(gridList.size()<NumConstant.ONE){
+        if (gridList.size() < NumConstant.ONE) {
             return resultList;
         }
         List<String> gridIds = gridList.stream().map(DimGridEntity::getId).collect(Collectors.toList());
@@ -530,18 +660,34 @@ public class DataStatsServiceImpl implements DataStatsService {
         //2.查询网格层级议题日统计数据，默认按议题总数降序
         resultList = dataStatsDao.getSubGridIssue(gridIds, formDTO.getDateId());
 
-        //3.封装数据并返回
-        resultList.forEach(re->{
+        //3.封装数据
+        resultList.forEach(re -> {
             re.setVotingRatio(re.getVotingTotal() == 0 || re.getIssueTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getVotingTotal() / (float) re.getIssueTotal())));
             re.setClosedIssueRatio(re.getClosedIssueTotal() == 0 || re.getIssueTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getClosedIssueTotal() / (float) re.getIssueTotal())));
             re.setShiftProjectRatio(re.getShiftProjectTotal() == 0 || re.getIssueTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getShiftProjectTotal() / (float) re.getIssueTotal())));
-            gridList.forEach(sub->{
-                if(re.getGridId().equals(sub.getId())){
+            gridList.forEach(sub -> {
+                if (re.getGridId().equals(sub.getId())) {
                     re.setGridName(sub.getGridName());
                 }
             });
         });
 
+        //4.按要求排序并返回
+        Collections.sort(resultList, new Comparator<SubGridIssueResultDTO>() {
+            @Override
+            public int compare(SubGridIssueResultDTO o1, SubGridIssueResultDTO o2) {
+                if ("voting".equals(formDTO.getType())) {
+                    return o2.getVotingTotal().compareTo(o1.getVotingTotal());
+                } else if ("shiftProject".equals(formDTO.getType())) {
+                    return o2.getShiftProjectTotal().compareTo(o1.getShiftProjectTotal());
+                } else if ("closed".equals(formDTO.getType())) {
+                    return o2.getClosedIssueTotal().compareTo(o1.getClosedIssueTotal());
+                } else {
+                    return o2.getIssueTotal().compareTo(o1.getIssueTotal());
+                }
+            }
+        });
+
         return resultList;
     }
 
@@ -562,10 +708,14 @@ public class DataStatsServiceImpl implements DataStatsService {
             SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD);
             formDTO.setDateId(format.format(yesterday));
         }
+        //排序类型，默认按用户总数降序
+        if (StringUtils.isBlank(formDTO.getDateId())) {
+            formDTO.setType("project");
+        }
 
         //1.查询当前组织的直属下级组织信息【机关维度】
         List<DimAgencyEntity> subAgencyList = dataStatsDao.getSubAgencyList(formDTO.getAgencyId());
-        if(subAgencyList.size()<NumConstant.ONE){
+        if (subAgencyList.size() < NumConstant.ONE) {
             return resultList;
         }
         List<String> agencyIds = subAgencyList.stream().map(DimAgencyEntity::getId).collect(Collectors.toList());
@@ -573,17 +723,31 @@ public class DataStatsServiceImpl implements DataStatsService {
         //2.查询直属下级组织项目日统计数据，默认按项目总数降序
         resultList = dataStatsDao.getSubAgencyProject(agencyIds, formDTO.getDateId());
 
-        //3.封装数据并返回
-        resultList.forEach(re->{
+        //3.封装数据
+        resultList.forEach(re -> {
             re.setPendingRatio(re.getPendingTotal() == 0 || re.getProjectTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getPendingTotal() / (float) re.getProjectTotal())));
             re.setClosedProjectRatio(re.getClosedProjectTotal() == 0 || re.getProjectTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getClosedProjectTotal() / (float) re.getProjectTotal())));
-            subAgencyList.forEach(sub->{
-                if(re.getAgencyId().equals(sub.getId())){
+            subAgencyList.forEach(sub -> {
+                if (re.getAgencyId().equals(sub.getId())) {
                     re.setAgencyName(sub.getAgencyName());
                 }
             });
         });
 
+        //4.按要求排序并返回
+        Collections.sort(resultList, new Comparator<SubAgencyProjectResultDTO>() {
+            @Override
+            public int compare(SubAgencyProjectResultDTO o1, SubAgencyProjectResultDTO o2) {
+                if ("pending".equals(formDTO.getType())) {
+                    return o2.getPendingTotal().compareTo(o1.getPendingTotal());
+                } else if ("closed".equals(formDTO.getType())) {
+                    return o2.getClosedProjectTotal().compareTo(o1.getClosedProjectTotal());
+                } else {
+                    return o2.getProjectTotal().compareTo(o1.getProjectTotal());
+                }
+            }
+        });
+
         return resultList;
     }
 
@@ -604,10 +768,14 @@ public class DataStatsServiceImpl implements DataStatsService {
             SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD);
             formDTO.setDateId(format.format(yesterday));
         }
+        //排序类型，默认按用户总数降序
+        if (StringUtils.isBlank(formDTO.getDateId())) {
+            formDTO.setType("project");
+        }
 
         //1.查询组织直属网格列表【网格维度】
         List<DimGridEntity> gridList = dataStatsDao.getSubGridList(formDTO.getAgencyId());
-        if(gridList.size()<NumConstant.ONE){
+        if (gridList.size() < NumConstant.ONE) {
             return resultList;
         }
         List<String> gridIds = gridList.stream().map(DimGridEntity::getId).collect(Collectors.toList());
@@ -615,17 +783,31 @@ public class DataStatsServiceImpl implements DataStatsService {
         //2.查询网格层级项目日统计数据，默认按项目总数降序
         resultList = dataStatsDao.getSubGridProject(gridIds, formDTO.getDateId());
 
-        //3.封装数据并返回
-        resultList.forEach(re->{
+        //3.封装数据
+        resultList.forEach(re -> {
             re.setPendingRatio(re.getPendingTotal() == 0 || re.getProjectTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getPendingTotal() / (float) re.getProjectTotal())));
             re.setClosedProjectRatio(re.getClosedProjectTotal() == 0 || re.getProjectTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getClosedProjectTotal() / (float) re.getProjectTotal())));
-            gridList.forEach(sub->{
-                if(re.getGridId().equals(sub.getId())){
+            gridList.forEach(sub -> {
+                if (re.getGridId().equals(sub.getId())) {
                     re.setGridName(sub.getGridName());
                 }
             });
         });
 
+        //4.按要求排序并返回
+        Collections.sort(resultList, new Comparator<SubGridProjectResultDTO>() {
+            @Override
+            public int compare(SubGridProjectResultDTO o1, SubGridProjectResultDTO o2) {
+                if ("pending".equals(formDTO.getType())) {
+                    return o2.getPendingTotal().compareTo(o1.getPendingTotal());
+                } else if ("closed".equals(formDTO.getType())) {
+                    return o2.getClosedProjectTotal().compareTo(o1.getClosedProjectTotal());
+                } else {
+                    return o2.getProjectTotal().compareTo(o1.getProjectTotal());
+                }
+            }
+        });
+
         return resultList;
     }
 

From 77e2146f220b4601b10333e1056cd9a99182e2db Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Mon, 17 May 2021 14:08:20 +0800
Subject: [PATCH 024/128] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=85=88?=
 =?UTF-8?q?=E8=BF=9B=E6=8E=92=E8=A1=8C->=E5=B1=85=E6=B0=91=E7=A7=AF?=
 =?UTF-8?q?=E5=88=86=E6=8E=92=E8=A1=8C=E5=88=97=E8=A1=A8(=E4=B8=8D?=
 =?UTF-8?q?=E5=90=AB=E5=85=9A=E5=91=98)=20=E6=96=B0=E5=A2=9E=EF=BC=9A?=
 =?UTF-8?q?=E5=85=88=E8=BF=9B=E6=8E=92=E8=A1=8C->=E5=85=9A=E5=91=98?=
 =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=8E=92=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/form/PartyPointRankFormDTO.java       | 35 ++++++++++++
 .../dto/result/PartyPointRankResultDTO.java   | 35 ++++++++++++
 .../screen/ScreenUserController.java          | 28 +++++++++-
 .../screen/ScreenPartyUserRankDataDao.java    | 20 +++++--
 .../screen/ScreenUserService.java             | 11 ++++
 .../screen/impl/ScreenUserServiceImpl.java    | 28 ++++++++++
 .../screen/ScreenPartyUserRankDataDao.xml     | 56 +++++++++++++++++++
 7 files changed, 207 insertions(+), 6 deletions(-)
 create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/PartyPointRankFormDTO.java
 create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PartyPointRankResultDTO.java

diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/PartyPointRankFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/PartyPointRankFormDTO.java
new file mode 100644
index 0000000000..5e4d3e9cc4
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/PartyPointRankFormDTO.java
@@ -0,0 +1,35 @@
+package com.epmet.evaluationindex.screen.dto.form;
+
+
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ *  党员（积分）排行--接口入参
+ * @Author sun
+ */
+@Data
+public class PartyPointRankFormDTO implements Serializable {
+    private static final long serialVersionUID = -2880432640584616651L;
+    /**
+     * 组织或网格Id
+     */
+    @NotBlank(message = "组织或网格ID不能为空",groups = {PartyPointRankFormDTO.AddUserInternalGroup.class})
+    private String orgId;
+    /**
+     * 类型（组织：agency  网格：grid）
+     */
+    @NotBlank(message = "数据类型不能为空",groups = {PartyPointRankFormDTO.AddUserInternalGroup.class})
+    private String orgType;
+    /**
+     * 默认显示前5名
+     */
+    @Min(value = 1, message = "查询条数必须大于0", groups = {PartyPointRankFormDTO.AddUserInternalGroup.class })
+    private Integer topNum;
+    public interface AddUserInternalGroup {}
+
+
+}
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PartyPointRankResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PartyPointRankResultDTO.java
new file mode 100644
index 0000000000..c6a11b1ea3
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PartyPointRankResultDTO.java
@@ -0,0 +1,35 @@
+package com.epmet.evaluationindex.screen.dto.result;
+
+import lombok.Data;
+
+@Data
+public class PartyPointRankResultDTO {
+    /**
+     * 组织ID
+     */
+    private String agencyId;
+    /**
+     * 组织名称
+     */
+    private String agencyName;
+    /**
+     * 用户Id
+     */
+    private String userId;
+    /**
+     * 用户名称
+     */
+    private String userName;
+    /**
+     * 网格Id
+     */
+    private String gridId;
+    /**
+     * 网格名称
+     */
+    private String gridName;
+    /**
+     * 党员积分
+     */
+    private Double pointTotal;
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenUserController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenUserController.java
index 84d586306f..9add2dd4d1 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenUserController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenUserController.java
@@ -1,13 +1,13 @@
 package com.epmet.datareport.controller.screen;
 
-import com.epmet.commons.tools.annotation.LoginUser;
-import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.datareport.service.evaluationindex.screen.ScreenUserService;
 import com.epmet.evaluationindex.screen.dto.form.PartIndexScroeRankFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.PartyPointRankFormDTO;
 import com.epmet.evaluationindex.screen.dto.form.UserPointRankFormDTO;
 import com.epmet.evaluationindex.screen.dto.result.PartIndexScroeRankResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.PartyPointRankResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.UserPointRankListResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -40,6 +40,18 @@ public class ScreenUserController {
         return new Result<List<UserPointRankListResultDTO>>().ok(screenUserService.userPointRank(formDTO));
     }
 
+    /**
+     * 热心市民积分排行列表(不包含党员)
+     * @param formDTO
+     * @return
+     * @author wxz
+     */
+    @PostMapping("userpointrank/withoutpartymember")
+    public Result<List<UserPointRankListResultDTO>> userPointRankWithoutPartyMem(@RequestBody UserPointRankFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, UserPointRankFormDTO.AddUserInternalGroup.class);
+        return new Result<List<UserPointRankListResultDTO>>().ok(screenUserService.userPointRankWithoutPartyMem(formDTO));
+    }
+
     /**
      * @param formDTO
      * @Description  党员（指标得分）排行
@@ -52,5 +64,17 @@ public class ScreenUserController {
     }
 
 
+    /**
+     * @param formDTO
+     * @Description  党员（积分）排行
+     * @author wxz
+     */
+    @PostMapping("partypointrank")
+    public Result<List<PartyPointRankResultDTO>> partyPointRank(@RequestBody PartyPointRankFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, PartIndexScroeRankFormDTO.AddUserInternalGroup.class);
+        return new Result<List<PartyPointRankResultDTO>>().ok(screenUserService.partyPointRank(formDTO));
+    }
+
+
 
 }
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenPartyUserRankDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenPartyUserRankDataDao.java
index fe5adc1a77..9dff1c7f68 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenPartyUserRankDataDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenPartyUserRankDataDao.java
@@ -19,11 +19,9 @@ package com.epmet.datareport.dao.evaluationindex.screen;
 
 import com.epmet.dto.result.user.KcUserPointRankResultDTO;
 import com.epmet.evaluationindex.screen.dto.form.PartIndexScroeRankFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.PartyPointRankFormDTO;
 import com.epmet.evaluationindex.screen.dto.form.UserPointRankFormDTO;
-import com.epmet.evaluationindex.screen.dto.result.PartIndexScroeRankResultDTO;
-import com.epmet.evaluationindex.screen.dto.result.PartyUserPointResultDTO;
-import com.epmet.evaluationindex.screen.dto.result.UserPointRankListResultDTO;
-import com.epmet.evaluationindex.screen.dto.result.UserPointResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -65,6 +63,13 @@ public interface ScreenPartyUserRankDataDao{
      */
     List<UserPointRankListResultDTO> selectAgencyUserPointList(UserPointRankFormDTO formDTO);
 
+    /**
+     * 查询组织下居民(不包含党员)积分排行，按积分值降序
+     * @param formDTO
+     * @return
+     */
+    List<UserPointRankListResultDTO> selectAgencyResiPointListWithoutPartyMem(UserPointRankFormDTO formDTO);
+
     /**
      * @param formDTO
      * @Description  查询组织下党员的积分排行，按积分值降序
@@ -75,4 +80,11 @@ public interface ScreenPartyUserRankDataDao{
     List<PartyUserPointResultDTO> selectPartymemberPointOrderByAreaCode(@Param("areaCode") String areaCode);
 
     List<UserPointResultDTO> selectUserPointOrderByAreaCode(@Param("areaCode") String areaCode);
+
+    /**
+     * 党员积分排行
+     * @param formDTO
+     * @return
+     */
+    List<PartyPointRankResultDTO> listPartymemberPointRank(PartyPointRankFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/ScreenUserService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/ScreenUserService.java
index f5e2428f09..85366a3db6 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/ScreenUserService.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/ScreenUserService.java
@@ -1,8 +1,10 @@
 package com.epmet.datareport.service.evaluationindex.screen;
 
 import com.epmet.evaluationindex.screen.dto.form.PartIndexScroeRankFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.PartyPointRankFormDTO;
 import com.epmet.evaluationindex.screen.dto.form.UserPointRankFormDTO;
 import com.epmet.evaluationindex.screen.dto.result.PartIndexScroeRankResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.PartyPointRankResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.UserPointRankListResultDTO;
 
 import java.util.List;
@@ -21,10 +23,19 @@ public interface ScreenUserService {
      */
     List<UserPointRankListResultDTO> userPointRank(UserPointRankFormDTO formDTO);
 
+    List<UserPointRankListResultDTO> userPointRankWithoutPartyMem(UserPointRankFormDTO formDTO);
+
     /**
      * @param formDTO
      * @Description  党员（指标得分）排行
      * @author sun
      */
     List<PartIndexScroeRankResultDTO> partIndexScroeRank(PartIndexScroeRankFormDTO formDTO);
+
+    /**
+     * 党员积分排行
+     * @param formDTO
+     * @return
+     */
+    List<PartyPointRankResultDTO> partyPointRank(PartyPointRankFormDTO formDTO);
 }
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenUserServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenUserServiceImpl.java
index 7721876c58..31f3ee8d3e 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenUserServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenUserServiceImpl.java
@@ -7,8 +7,10 @@ import com.epmet.datareport.constant.FactConstant;
 import com.epmet.datareport.dao.evaluationindex.screen.ScreenPartyUserRankDataDao;
 import com.epmet.datareport.service.evaluationindex.screen.ScreenUserService;
 import com.epmet.evaluationindex.screen.dto.form.PartIndexScroeRankFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.PartyPointRankFormDTO;
 import com.epmet.evaluationindex.screen.dto.form.UserPointRankFormDTO;
 import com.epmet.evaluationindex.screen.dto.result.PartIndexScroeRankResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.PartyPointRankResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.UserPointRankListResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -43,6 +45,22 @@ public class ScreenUserServiceImpl implements ScreenUserService {
         return screenPartyUserRankDataDao.selectAgencyUserPointList(formDTO);
     }
 
+    /**
+     * @param formDTO
+     * @Description 热心市民积分排行列表（不包含党员）
+     * @author sun
+     */
+    @Override
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
+    public List<UserPointRankListResultDTO> userPointRankWithoutPartyMem(UserPointRankFormDTO formDTO) {
+        //1.参数校验
+        if (!FactConstant.AGENCY.equals(formDTO.getOrgType()) && !FactConstant.GRID.equals(formDTO.getOrgType())) {
+            throw new RenException(String.format("入参格式错误,错误的组织或网格类型:%s", formDTO.getOrgType()));
+        }
+        //2.查询组织下居民积分排行，按积分值降序  screen_party_user_rank_data
+        return screenPartyUserRankDataDao.selectAgencyResiPointListWithoutPartyMem(formDTO);
+    }
+
     /**
      * @param formDTO
      * @Description 党员（指标得分）排行
@@ -59,4 +77,14 @@ public class ScreenUserServiceImpl implements ScreenUserService {
         return screenPartyUserRankDataDao.selectPartymemberPointList(formDTO);
     }
 
+    @Override
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
+    public List<PartyPointRankResultDTO> partyPointRank(PartyPointRankFormDTO formDTO) {
+        //1.参数校验
+        if (!FactConstant.AGENCY.equals(formDTO.getOrgType()) && !FactConstant.GRID.equals(formDTO.getOrgType())) {
+            throw new RenException(String.format("入参格式错误,错误的组织或网格类型:%s", formDTO.getOrgType()));
+        }
+        return screenPartyUserRankDataDao.listPartymemberPointRank(formDTO);
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
index 30fb7bd125..aa584adbae 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
@@ -131,4 +131,60 @@
                 m.POINT_TOTAL DESC,
                 m.user_name
     </select>
+
+    <select id="selectAgencyResiPointListWithoutPartyMem"
+            resultType="com.epmet.evaluationindex.screen.dto.result.UserPointRankListResultDTO">
+        SELECT
+        org_id AS "agencyId",
+        org_name AS "agencyName",
+        grid_id AS "gridId",
+        grid_name AS "gridName",
+        user_id AS "userId",
+        user_name AS "userName",
+        point_total AS "pointTotal"
+        FROM
+        screen_party_user_rank_data
+        WHERE
+        del_flag = '0'
+        AND PARTY_FLAG = 0
+        <if test="orgType != null and orgType !=''">
+            <if test="orgType == 'agency'">
+                AND all_parent_ids LIKE CONCAT('%',#{orgId},'%')
+            </if>
+            <if test="orgType == 'grid'">
+                AND grid_id = #{orgId}
+            </if>
+        </if>
+        ORDER BY
+        point_total DESC
+        LIMIT #{topNum}
+    </select>
+
+    <!--党员积分排行-->
+    <select id="listPartymemberPointRank" resultType="com.epmet.evaluationindex.screen.dto.result.PartyPointRankResultDTO">
+        SELECT
+            org_id AS "agencyId",
+            org_name AS "agencyName",
+            grid_id AS "gridId",
+            grid_name AS "gridName",
+            user_id AS "userId",
+            user_name AS "userName",
+            point_total AS "pointTotal"
+            FROM
+            screen_party_user_rank_data
+            WHERE
+            del_flag = '0'
+            AND party_flag = '1'<!-- 是否是党员标志：1是。0不是党员 -->
+            <if test="orgType != null and orgType !=''">
+                <if test="orgType == 'agency'">
+                    AND all_parent_ids LIKE CONCAT('%',#{orgId},'%')
+                </if>
+                <if test="orgType == 'grid'">
+                    AND grid_id = #{orgId}
+                </if>
+            </if>
+            ORDER BY
+            point_total DESC
+            LIMIT #{topNum}
+    </select>
 </mapper>
\ No newline at end of file

From 985765b0164037265ddf8aab70fb955ec6e2ec02 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Mon, 17 May 2021 17:58:16 +0800
Subject: [PATCH 025/128] =?UTF-8?q?=E5=85=9A=E5=91=98=E5=85=88=E9=94=8B?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...FactPartyMemberVanguardAgencyDailyDTO.java | 179 ++++++++
 .../FactPartyMemberVanguardGridDailyDTO.java  | 179 ++++++++
 .../com/epmet/controller/DemoController.java  |  11 +
 .../extract/FactOriginGroupMainDailyDao.java  |  20 +
 .../FactOriginGroupMemberDailyDao.java        |  24 +
 .../extract/FactOriginIssueMainDailyDao.java  |  20 +
 .../FactOriginProjectMainDailyDao.java        |  41 ++
 .../extract/FactOriginTopicMainDailyDao.java  |  20 +
 ...FactPartyMemberVanguardAgencyDailyDao.java |  44 ++
 .../FactPartyMemberVanguardGridDailyDao.java  |  42 ++
 ...tPartyMemberVanguardAgencyDailyEntity.java | 149 +++++++
 ...actPartyMemberVanguardGridDailyEntity.java | 149 +++++++
 .../StatsPartyMemberVanguardService.java      |  31 ++
 .../FactOriginGroupMainDailyService.java      |  13 +
 .../FactOriginGroupMemberDailyService.java    |  12 +
 .../FactOriginIssueMainDailyService.java      |  12 +
 .../FactOriginProjectMainDailyService.java    |  23 +
 .../FactOriginTopicMainDailyService.java      |  12 +
 .../FactOriginGroupMainDailyServiceImpl.java  |  39 ++
 ...FactOriginGroupMemberDailyServiceImpl.java |  44 ++
 .../FactOriginIssueMainDailyServiceImpl.java  |  42 ++
 ...FactOriginProjectMainDailyServiceImpl.java |  75 +++-
 .../FactOriginTopicMainDailyServiceImpl.java  |  42 +-
 .../StatsPartyMemberVanguardServiceImpl.java  | 414 ++++++++++++++++++
 ...PartyMemberVanguardAgencyDailyService.java | 105 +++++
 ...ctPartyMemberVanguardGridDailyService.java | 105 +++++
 ...yMemberVanguardAgencyDailyServiceImpl.java | 118 +++++
 ...rtyMemberVanguardGridDailyServiceImpl.java | 118 +++++
 .../extract/FactOriginGroupMainDailyDao.xml   |  26 ++
 .../extract/FactOriginGroupMemberDailyDao.xml |  44 ++
 .../extract/FactOriginIssueMainDailyDao.xml   |  20 +
 .../extract/FactOriginProjectMainDailyDao.xml |  42 ++
 .../extract/FactOriginTopicMainDailyDao.xml   |  20 +
 .../FactPartyMemberVanguardAgencyDailyDao.xml |  40 ++
 .../FactPartyMemberVanguardGridDailyDao.xml   |  40 ++
 35 files changed, 2307 insertions(+), 8 deletions(-)
 create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactPartyMemberVanguardAgencyDailyDTO.java
 create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactPartyMemberVanguardGridDailyDTO.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactPartyMemberVanguardAgencyDailyDao.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactPartyMemberVanguardGridDailyDao.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactPartyMemberVanguardAgencyDailyEntity.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactPartyMemberVanguardGridDailyEntity.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsPartyMemberVanguardService.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPartyMemberVanguardServiceImpl.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactPartyMemberVanguardAgencyDailyService.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactPartyMemberVanguardGridDailyService.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactPartyMemberVanguardAgencyDailyServiceImpl.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactPartyMemberVanguardGridDailyServiceImpl.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactPartyMemberVanguardAgencyDailyDao.xml
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactPartyMemberVanguardGridDailyDao.xml

diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactPartyMemberVanguardAgencyDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactPartyMemberVanguardAgencyDailyDTO.java
new file mode 100644
index 0000000000..434775abd2
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactPartyMemberVanguardAgencyDailyDTO.java
@@ -0,0 +1,179 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.stats;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 党员先锋-机关日统计数据
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-13
+ */
+@Data
+public class FactPartyMemberVanguardAgencyDailyDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一标识
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 机构ID
+     */
+	private String agencyId;
+
+    /**
+     * 父级机关ID
+     */
+	private String pid;
+
+    /**
+     * 统计日期 关联日期dim表
+     */
+	private String dateId;
+
+    /**
+     * 周ID
+     */
+	private String weekId;
+
+    /**
+     * 月ID
+     */
+	private String monthId;
+
+    /**
+     * 季ID
+     */
+	private String quarterId;
+
+    /**
+     * 年ID
+     */
+	private String yearId;
+
+    /**
+     * 党员建组数
+     */
+	private Integer groupCount;
+
+    /**
+     * 党员建组数占比
+     */
+	private BigDecimal groupRatio;
+
+    /**
+     * 组内党员人数
+     */
+	private Integer groupMemberCount;
+
+    /**
+     * 组内党员人数占比
+     */
+	private BigDecimal groupMemberRatio;
+
+    /**
+     * 党员发布话题数
+     */
+	private Integer topicCount;
+
+    /**
+     * 党员发布话题数占比
+     */
+	private BigDecimal topicRatio;
+
+    /**
+     * 党员发布话题转议题数
+     */
+	private Integer issueCount;
+
+    /**
+     * 党员发布话题转议题数占比
+     */
+	private BigDecimal issueRatio;
+
+    /**
+     * 党员发布话题转项目数
+     */
+	private Integer projectCount;
+
+    /**
+     * 党员发布话题转项目数占比
+     */
+	private BigDecimal projectRatio;
+
+    /**
+     * 党员发布话题转项目结案数
+     */
+	private Integer projectClosedCount;
+
+    /**
+     * 党员发布话题转项目结案数占比
+     */
+	private BigDecimal projectClosedRatio;
+
+	private Integer groupTotal;
+	private Integer groupMemberTotal;
+	private Integer topicTotal;
+	private Integer issueTotal;
+	private Integer projectTotal;
+	private Integer projectClosedTotal;
+
+    /**
+     * 删除标识 未删除：0,已删除：1
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactPartyMemberVanguardGridDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactPartyMemberVanguardGridDailyDTO.java
new file mode 100644
index 0000000000..7d28a3e095
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactPartyMemberVanguardGridDailyDTO.java
@@ -0,0 +1,179 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.stats;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 党员先锋-网格日统计数据
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-13
+ */
+@Data
+public class FactPartyMemberVanguardGridDailyDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一标识
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 机构ID
+     */
+	private String agencyId;
+
+    /**
+     * 网格ID
+     */
+	private String gridId;
+
+    /**
+     * 统计日期 关联日期dim表
+     */
+	private String dateId;
+
+    /**
+     * 周ID
+     */
+	private String weekId;
+
+    /**
+     * 月ID
+     */
+	private String monthId;
+
+    /**
+     * 季ID
+     */
+	private String quarterId;
+
+    /**
+     * 年ID
+     */
+	private String yearId;
+
+    /**
+     * 党员建组数
+     */
+	private Integer groupCount;
+
+    /**
+     * 党员建组数占比
+     */
+	private BigDecimal groupRatio;
+
+    /**
+     * 组内党员人数
+     */
+	private Integer groupMemberCount;
+
+    /**
+     * 组内党员人数占比
+     */
+	private BigDecimal groupMemberRatio;
+
+    /**
+     * 党员发布话题数
+     */
+	private Integer topicCount;
+
+    /**
+     * 党员发布话题数占比
+     */
+	private BigDecimal topicRatio;
+
+    /**
+     * 党员发布话题转议题数
+     */
+	private Integer issueCount;
+
+    /**
+     * 党员发布话题转议题数占比
+     */
+	private BigDecimal issueRatio;
+
+    /**
+     * 党员发布话题转项目数
+     */
+	private Integer projectCount;
+
+    /**
+     * 党员发布话题转项目数占比
+     */
+	private BigDecimal projectRatio;
+
+    /**
+     * 党员发布话题转项目结案数
+     */
+	private Integer projectClosedCount;
+
+    /**
+     * 党员发布话题转项目结案数占比
+     */
+	private BigDecimal projectClosedRatio;
+
+	private Integer groupTotal;
+	private Integer groupMemberTotal;
+	private Integer topicTotal;
+	private Integer issueTotal;
+	private Integer projectTotal;
+	private Integer projectClosedTotal;
+
+    /**
+     * 删除标识 未删除：0,已删除：1
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
index 1037de6af4..018dc35102 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
@@ -18,6 +18,7 @@ import com.epmet.dao.stats.DimCustomerDao;
 import com.epmet.dao.stats.DimDateDao;
 import com.epmet.dao.stats.DimMonthDao;
 import com.epmet.dto.AgencySubTreeDto;
+import com.epmet.dto.StatsFormDTO;
 import com.epmet.dto.extract.form.ExtractOriginFormDTO;
 import com.epmet.dto.extract.form.ExtractScreenFormDTO;
 import com.epmet.dto.indexcal.CalculateCommonFormDTO;
@@ -34,6 +35,7 @@ import com.epmet.entity.stats.DimCustomerEntity;
 import com.epmet.entity.stats.DimDateEntity;
 import com.epmet.entity.stats.DimMonthEntity;
 import com.epmet.service.StatsDemoService;
+import com.epmet.service.StatsPartyMemberVanguardService;
 import com.epmet.service.evaluationindex.extract.dataToIndex.*;
 import com.epmet.service.evaluationindex.extract.todata.FactGroupActDailyService;
 import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectCategoryDailyService;
@@ -111,6 +113,8 @@ public class DemoController {
     @Autowired
     private FactOriginProjectCategoryDailyService originProjectCategoryDailyService;
     @Autowired
+    private StatsPartyMemberVanguardService statsPartyMemberVanguardService;
+    @Autowired
     private FactGroupActDailyService factGroupActDailyService;
 
     @GetMapping("testAlarm")
@@ -873,6 +877,13 @@ public class DemoController {
         return new Result().ok(ndddYhjfService.difficultyDataExtract(param));
     }
 
+    @PostMapping("vanguard")
+    public Result partyMemberVanguard(StatsFormDTO formDTO) {
+        statsPartyMemberVanguardService.agencyStats(formDTO);
+        statsPartyMemberVanguardService.gridStats(formDTO);
+        return new Result();
+    }
+
     @PostMapping("extractgroupact")
     public Result extractGroupAct(@RequestParam("customerId") String customerId,@RequestParam("dateId")String dateId){
         factGroupActDailyService.extractGridGroupActDaily(customerId,dateId);
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginGroupMainDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginGroupMainDailyDao.java
index 7ffdf0c1f3..1533d70143 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginGroupMainDailyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginGroupMainDailyDao.java
@@ -205,4 +205,24 @@ public interface FactOriginGroupMainDailyDao extends BaseDao<FactOriginGroupMain
      * @Description 查询客户小组维度下有效群组列表
      **/
     List<FactOriginGroupMainDailyEntity> selectCustomerGroupList(@Param("customerId") String customerId, @Param("dateId") String dateId);
+
+    /**
+     * 获取组织级别党员建组统计
+     * @author zhaoqifeng
+     * @date 2021/5/13 17:06
+     * @param customerId
+     * @param dateId
+     * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     */
+    List<OrgStatisticsResultDTO> selectPartyMemberGroupStaticByAgency(@Param("customerId") String customerId, @Param("dateId") String dateId);
+
+    /**
+     * 获取网格级别党员建组统计
+     * @author zhaoqifeng
+     * @date 2021/5/13 17:07
+     * @param customerId
+     * @param dateId
+     * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     */
+    List<OrgStatisticsResultDTO> selectPartyMemberGroupStaticByGrid(@Param("customerId") String customerId, @Param("dateId") String dateId);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginGroupMemberDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginGroupMemberDailyDao.java
index 662f2a14c5..81a0dd3303 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginGroupMemberDailyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginGroupMemberDailyDao.java
@@ -18,8 +18,12 @@
 package com.epmet.dao.evaluationindex.extract;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginGroupMemberDailyEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 
@@ -29,5 +33,25 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface FactOriginGroupMemberDailyDao extends BaseDao<FactOriginGroupMemberDailyEntity> {
+
+	/**
+	 * 获取组织级别党员建组统计
+	 * @author zhaoqifeng
+	 * @date 2021/5/13 17:06
+	 * @param customerId
+	 * @param dateId
+	 * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+	 */
+	List<OrgStatisticsResultDTO> selectGroupPartyMemberStaticByAgency(@Param("customerId") String customerId, @Param("dateId") String dateId);
+
+	/**
+	 * 获取网格级别党员建组统计
+	 * @author zhaoqifeng
+	 * @date 2021/5/13 17:07
+	 * @param customerId
+	 * @param dateId
+	 * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+	 */
+	List<OrgStatisticsResultDTO> selectGroupPartyMemberStaticByGrid(@Param("customerId") String customerId, @Param("dateId") String dateId);
 	
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginIssueMainDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginIssueMainDailyDao.java
index c8969fea56..280e38213e 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginIssueMainDailyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginIssueMainDailyDao.java
@@ -205,4 +205,24 @@ public interface FactOriginIssueMainDailyDao extends BaseDao<FactOriginIssueMain
      */
     List<OrgStatisticsResultDTO> selectOrgIssueCount(@Param("customerId") String customerId, @Param("monthId") String monthId,
                                                      @Param("level") String level);
+
+    /**
+     * 获取组织级别党员发布话题转议题统计
+     * @author zhaoqifeng
+     * @date 2021/5/17 15:02
+     * @param customerId
+     * @param dateId
+     * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     */
+    List<OrgStatisticsResultDTO> selectPartyMemberIssueStaticByAgency(@Param("customerId") String customerId, @Param("dateId") String dateId);
+
+    /**
+     * 获取组织级别党员发布话题转议题统计
+     * @author zhaoqifeng
+     * @date 2021/5/17 15:03
+     * @param customerId
+     * @param dateId
+     * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     */
+    List<OrgStatisticsResultDTO> selectPartyMemberIssueStaticByGrid(@Param("customerId") String customerId, @Param("dateId") String dateId);
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java
index dbc532b90c..179574ae7a 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java
@@ -370,4 +370,45 @@ public interface FactOriginProjectMainDailyDao extends BaseDao<FactOriginProject
 	List<FactOriginProjectOrgPeriodDailyEntity> getProjectPeriodForDiff(@Param("customerId") String customerId, @Param("dateId") String dateId);
 
 	List<ScreenProjectDataDTO> selectResponseCount(@Param("customerId") String customerId);
+
+
+	/**
+	 * 获取组织级别党员发布话题转项目统计
+	 * @author zhaoqifeng
+	 * @date 2021/5/17 15:02
+	 * @param customerId
+	 * @param dateId
+	 * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+	 */
+	List<OrgStatisticsResultDTO> selectPartyMemberProjectStaticByAgency(@Param("customerId") String customerId, @Param("dateId") String dateId);
+
+	/**
+	 * 获取组织级别党员发布话题转项目统计
+	 * @author zhaoqifeng
+	 * @date 2021/5/17 15:03
+	 * @param customerId
+	 * @param dateId
+	 * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+	 */
+	List<OrgStatisticsResultDTO> selectPartyMemberProjectStaticByGrid(@Param("customerId") String customerId, @Param("dateId") String dateId);
+
+	/**
+	 * 获取组织级别党员发布话题结案统计
+	 * @author zhaoqifeng
+	 * @date 2021/5/17 15:02
+	 * @param customerId
+	 * @param dateId
+	 * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+	 */
+	List<OrgStatisticsResultDTO> selectPartyMemberClosedProjectStaticByAgency(@Param("customerId") String customerId, @Param("dateId") String dateId);
+
+	/**
+	 * 获取组织级别党员发布话题结案统计
+	 * @author zhaoqifeng
+	 * @date 2021/5/17 15:03
+	 * @param customerId
+	 * @param dateId
+	 * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+	 */
+	List<OrgStatisticsResultDTO> selectPartyMemberClosedProjectStaticByGrid(@Param("customerId") String customerId, @Param("dateId") String dateId);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginTopicMainDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginTopicMainDailyDao.java
index ae3ad01fd5..f34fbf3a4b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginTopicMainDailyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginTopicMainDailyDao.java
@@ -139,4 +139,24 @@ public interface FactOriginTopicMainDailyDao extends BaseDao<FactOriginTopicMain
      */
     List<OrgStatisticsResultDTO> selectOrgTopicCount(@Param("customerId") String customerId, @Param("monthId") String monthId,
                                                      @Param("level") String level);
+
+    /**
+     * 组织内党员发布话题占比统计
+     * @author zhaoqifeng
+     * @date 2021/5/17 10:29
+     * @param customerId
+     * @param dateId
+     * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     */
+    List<OrgStatisticsResultDTO> selectPartyMemberTopicStaticByAgency(@Param("customerId") String customerId, @Param("dateId") String dateId);
+
+    /**
+     * 网格内党员发布话题占比统计
+     * @author zhaoqifeng
+     * @date 2021/5/17 10:31
+     * @param customerId
+     * @param dateId
+     * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     */
+    List<OrgStatisticsResultDTO> selectPartyMemberTopicStaticByGrid(@Param("customerId") String customerId, @Param("dateId") String dateId);
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactPartyMemberVanguardAgencyDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactPartyMemberVanguardAgencyDailyDao.java
new file mode 100644
index 0000000000..812935ef6e
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactPartyMemberVanguardAgencyDailyDao.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.stats;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.stats.FactPartyMemberVanguardAgencyDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 党员先锋-机关日统计数据
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-13
+ */
+@Mapper
+public interface FactPartyMemberVanguardAgencyDailyDao extends BaseDao<FactPartyMemberVanguardAgencyDailyEntity> {
+
+	/**
+	 * 删除日统计数据
+	 * @author zhaoqifeng
+	 * @date 2021/5/17 17:19
+	 * @param customerId
+	 * @param dateId
+	 * @return int
+	 */
+	int deleteDailyData(@Param("customerId") String customerId, @Param("dateId")  String dateId);
+	
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactPartyMemberVanguardGridDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactPartyMemberVanguardGridDailyDao.java
new file mode 100644
index 0000000000..310bcabdef
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactPartyMemberVanguardGridDailyDao.java
@@ -0,0 +1,42 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.stats;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.stats.FactPartyMemberVanguardGridDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 党员先锋-网格日统计数据
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-13
+ */
+@Mapper
+public interface FactPartyMemberVanguardGridDailyDao extends BaseDao<FactPartyMemberVanguardGridDailyEntity> {
+	/**
+	 * 删除日统计数据
+	 * @author zhaoqifeng
+	 * @date 2021/5/17 17:19
+	 * @param customerId
+	 * @param dateId
+	 * @return int
+	 */
+	int deleteDailyData(@Param("customerId") String customerId, @Param("dateId")  String dateId);
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactPartyMemberVanguardAgencyDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactPartyMemberVanguardAgencyDailyEntity.java
new file mode 100644
index 0000000000..44666ec1d9
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactPartyMemberVanguardAgencyDailyEntity.java
@@ -0,0 +1,149 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.stats;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 党员先锋-机关日统计数据
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-13
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("fact_party_member_vanguard_agency_daily")
+public class FactPartyMemberVanguardAgencyDailyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 机构ID
+     */
+	private String agencyId;
+
+    /**
+     * 父级机关ID
+     */
+	private String pid;
+
+    /**
+     * 统计日期 关联日期dim表
+     */
+	private String dateId;
+
+    /**
+     * 周ID
+     */
+	private String weekId;
+
+    /**
+     * 月ID
+     */
+	private String monthId;
+
+    /**
+     * 季ID
+     */
+	private String quarterId;
+
+    /**
+     * 年ID
+     */
+	private String yearId;
+
+    /**
+     * 党员建组数
+     */
+	private Integer groupCount;
+
+	private Integer groupTotal;
+	private Integer groupMemberTotal;
+	private Integer topicTotal;
+	private Integer issueTotal;
+	private Integer projectTotal;
+	private Integer projectClosedTotal;
+
+    /**
+     * 党员建组数占比
+     */
+	private BigDecimal groupRatio;
+
+    /**
+     * 组内党员人数
+     */
+	private Integer groupMemberCount;
+
+    /**
+     * 组内党员人数占比
+     */
+	private BigDecimal groupMemberRatio;
+
+    /**
+     * 党员发布话题数
+     */
+	private Integer topicCount;
+
+    /**
+     * 党员发布话题数占比
+     */
+	private BigDecimal topicRatio;
+
+    /**
+     * 党员发布话题转议题数
+     */
+	private Integer issueCount;
+
+    /**
+     * 党员发布话题转议题数占比
+     */
+	private BigDecimal issueRatio;
+
+    /**
+     * 党员发布话题转项目数
+     */
+	private Integer projectCount;
+
+    /**
+     * 党员发布话题转项目数占比
+     */
+	private BigDecimal projectRatio;
+
+    /**
+     * 党员发布话题转项目结案数
+     */
+	private Integer projectClosedCount;
+
+    /**
+     * 党员发布话题转项目结案数占比
+     */
+	private BigDecimal projectClosedRatio;
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactPartyMemberVanguardGridDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactPartyMemberVanguardGridDailyEntity.java
new file mode 100644
index 0000000000..5b591a8e7e
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactPartyMemberVanguardGridDailyEntity.java
@@ -0,0 +1,149 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.stats;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 党员先锋-网格日统计数据
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-13
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("fact_party_member_vanguard_grid_daily")
+public class FactPartyMemberVanguardGridDailyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 机构ID
+     */
+	private String agencyId;
+
+    /**
+     * 网格ID
+     */
+	private String gridId;
+
+    /**
+     * 统计日期 关联日期dim表
+     */
+	private String dateId;
+
+    /**
+     * 周ID
+     */
+	private String weekId;
+
+    /**
+     * 月ID
+     */
+	private String monthId;
+
+    /**
+     * 季ID
+     */
+	private String quarterId;
+
+    /**
+     * 年ID
+     */
+	private String yearId;
+
+    /**
+     * 党员建组数
+     */
+	private Integer groupCount;
+
+	private Integer groupTotal;
+	private Integer groupMemberTotal;
+	private Integer topicTotal;
+	private Integer issueTotal;
+	private Integer projectTotal;
+	private Integer projectClosedTotal;
+
+    /**
+     * 党员建组数占比
+     */
+	private BigDecimal groupRatio;
+
+    /**
+     * 组内党员人数
+     */
+	private Integer groupMemberCount;
+
+    /**
+     * 组内党员人数占比
+     */
+	private BigDecimal groupMemberRatio;
+
+    /**
+     * 党员发布话题数
+     */
+	private Integer topicCount;
+
+    /**
+     * 党员发布话题数占比
+     */
+	private BigDecimal topicRatio;
+
+    /**
+     * 党员发布话题转议题数
+     */
+	private Integer issueCount;
+
+    /**
+     * 党员发布话题转议题数占比
+     */
+	private BigDecimal issueRatio;
+
+    /**
+     * 党员发布话题转项目数
+     */
+	private Integer projectCount;
+
+    /**
+     * 党员发布话题转项目数占比
+     */
+	private BigDecimal projectRatio;
+
+    /**
+     * 党员发布话题转项目结案数
+     */
+	private Integer projectClosedCount;
+
+    /**
+     * 党员发布话题转项目结案数占比
+     */
+	private BigDecimal projectClosedRatio;
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsPartyMemberVanguardService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsPartyMemberVanguardService.java
new file mode 100644
index 0000000000..c4ba1d4fe2
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsPartyMemberVanguardService.java
@@ -0,0 +1,31 @@
+package com.epmet.service;
+
+import com.epmet.dto.StatsFormDTO;
+import com.epmet.dto.group.form.GroupStatsFormDTO;
+import com.epmet.dto.group.form.GroupTotalFormDTO;
+
+/**
+ * 党员先锋相关统计
+ * @author zhaoqifeng
+ * @date 2021/5/13 15:07
+ */
+public interface StatsPartyMemberVanguardService {
+    /**
+     * 组织统计
+     * @author zhaoqifeng
+     * @date 2021/5/13 15:13
+     * @param formDTO
+     * @return void
+     */
+    void agencyStats(StatsFormDTO formDTO);
+
+    /**
+     * 网格统计
+     * @author zhaoqifeng
+     * @date 2021/5/13 15:13
+     * @param formDTO
+     * @return void
+     */
+    void gridStats(StatsFormDTO formDTO);
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginGroupMainDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginGroupMainDailyService.java
index 21d55ac87e..89beadf503 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginGroupMainDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginGroupMainDailyService.java
@@ -26,6 +26,7 @@ import com.epmet.dto.group.result.ExtractGroupMemberActionRecordResultDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginGroupMainDailyEntity;
 
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -112,4 +113,16 @@ public interface FactOriginGroupMainDailyService extends BaseService<FactOriginG
      * @Description 查询客户小组维度下有效群组列表
      **/
     List<FactOriginGroupMainDailyEntity> getGroupListByCustomerId(String customerId, String dateId);
+
+    /**
+     * 获取组织/网格级别党员建组统计
+     * @author zhaoqifeng
+     * @date 2021/5/13 16:55
+     * @param customerId
+     * @param dateId
+     * @param type agency grid
+     * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     */
+    Map<String, OrgStatisticsResultDTO> getPartyMemberGroupStatic(String customerId, String dateId, String type);
+
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginGroupMemberDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginGroupMemberDailyService.java
index 618c340d66..53ff5cf084 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginGroupMemberDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginGroupMemberDailyService.java
@@ -20,6 +20,7 @@ package com.epmet.service.evaluationindex.extract.todata;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.extract.FactOriginGroupMemberDailyDTO;
+import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginGroupMemberDailyEntity;
 
 import java.util.List;
@@ -92,4 +93,15 @@ public interface FactOriginGroupMemberDailyService extends BaseService<FactOrigi
      * @date 2021-05-12
      */
     void delete(String[] ids);
+
+    /**
+     * 获取小组党员统计
+     * @author zhaoqifeng
+     * @date 2021/5/14 10:33
+     * @param customerId
+     * @param dateId
+     * @param type
+     * @return java.util.Map<java.lang.String,com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     */
+    Map<String, OrgStatisticsResultDTO> getGroupPartyMemberStatic(String customerId, String dateId, String type);
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginIssueMainDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginIssueMainDailyService.java
index de2ac6f8c7..a1e4ac55de 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginIssueMainDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginIssueMainDailyService.java
@@ -22,6 +22,7 @@ import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginIssueMainDailyEntity;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  *  议题主表
@@ -110,4 +111,15 @@ public interface FactOriginIssueMainDailyService extends BaseService<FactOriginI
      * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
      */
     List<OrgStatisticsResultDTO> getOrgIssueCount(String customerId, String monthId, String level);
+
+    /**
+     * 获取组织/网格级别党员发布话题转议题统计
+     * @author zhaoqifeng
+     * @date 2021/5/17 14:52
+     * @param customerId
+     * @param dateId
+     * @param type
+     * @return java.util.Map<java.lang.String,com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     */
+    Map<String, OrgStatisticsResultDTO> getPartyMemberIssueStatic(String customerId, String dateId, String type);
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java
index 449e546658..b160131db7 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java
@@ -32,6 +32,7 @@ import com.epmet.entity.evaluationindex.extract.FactOriginProjectOrgPeriodDailyE
 import com.epmet.entity.evaluationindex.screen.ScreenDifficultyDataEntity;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 项目主表_日统计
@@ -367,4 +368,26 @@ public interface FactOriginProjectMainDailyService extends BaseService<FactOrigi
      */
     void setProjectLevel(List<ScreenProjectDataDTO> list, String customerId);
 
+    /**
+     * 获取组织/网格级别党员发布话题转项目统计
+     * @author zhaoqifeng
+     * @date 2021/5/17 15:25
+     * @param customerId
+     * @param dateId
+     * @param type
+     * @return java.util.Map<java.lang.String,com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     */
+    Map<String, OrgStatisticsResultDTO> getPartyMemberProjectStatic(String customerId, String dateId, String type);
+
+    /**
+     * 获取组织/网格级别党员发布话题结案统计
+     * @author zhaoqifeng
+     * @date 2021/5/17 15:39
+     * @param customerId
+     * @param dateId
+     * @param type
+     * @return java.util.Map<java.lang.String,com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     */
+    Map<String, OrgStatisticsResultDTO> getPartyMemberClosedProjectStatic(String customerId, String dateId, String type);
+
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginTopicMainDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginTopicMainDailyService.java
index 5c4f8da390..aa66fc44e0 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginTopicMainDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginTopicMainDailyService.java
@@ -25,6 +25,7 @@ import com.epmet.dto.indexcollect.result.CpcIndexCommonDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginTopicMainDailyEntity;
 
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -111,4 +112,15 @@ public interface FactOriginTopicMainDailyService extends BaseService<FactOriginT
      * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
      */
     List<OrgStatisticsResultDTO> getOrgTopicCount(String customerId, String monthId, String level);
+
+    /**
+     * 获取组织/网格级别党员发布话题统计
+     * @author zhaoqifeng
+     * @date 2021/5/17 14:25
+     * @param customerId
+     * @param dateId
+     * @param type
+     * @return java.util.Map<java.lang.String,com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     */
+    Map<String, OrgStatisticsResultDTO> getPartyMemberTopicStatic(String customerId, String dateId, String type);
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginGroupMainDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginGroupMainDailyServiceImpl.java
index d7819f31b1..164b0b76dc 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginGroupMainDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginGroupMainDailyServiceImpl.java
@@ -20,6 +20,7 @@ package com.epmet.service.evaluationindex.extract.todata.impl;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.constant.OrgTypeConstant;
 import com.epmet.dao.evaluationindex.extract.FactOriginGroupMainDailyDao;
 import com.epmet.dao.evaluationindex.extract.FactOriginGroupMemberDailyDao;
 import com.epmet.dto.extract.FactOriginGroupMainDailyDTO;
@@ -37,8 +38,13 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 
@@ -159,4 +165,37 @@ public class FactOriginGroupMainDailyServiceImpl extends BaseServiceImpl<FactOri
         return baseDao.selectCustomerGroupList(customerId, dateId);
     }
 
+    /**
+     * 获取组织/网格级别党员建组统计
+     *
+     * @param customerId
+     * @param dateId
+     * @param type       agency grid
+     * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     * @author zhaoqifeng
+     * @date 2021/5/13 16:55
+     */
+    @Override
+    public Map<String, OrgStatisticsResultDTO> getPartyMemberGroupStatic(String customerId, String dateId, String type) {
+        List<OrgStatisticsResultDTO> result;
+        if (OrgTypeConstant.AGENCY.equals(type)) {
+            result = baseDao.selectPartyMemberGroupStaticByAgency(customerId, dateId);
+        } else {
+            result = baseDao.selectPartyMemberGroupStaticByGrid(customerId, dateId);
+        }
+        if (CollectionUtils.isEmpty(result)) {
+            return Collections.emptyMap();
+        }
+        result.forEach(item -> {
+            BigDecimal count = new BigDecimal(item.getCount());
+            BigDecimal sum = new BigDecimal(item.getSum());
+            item.setRatio(count.divide(sum, NumConstant.SIX, RoundingMode.HALF_UP));
+        });
+        if (OrgTypeConstant.AGENCY.equals(type)) {
+            return result.stream().collect(Collectors.toMap(OrgStatisticsResultDTO::getAgencyId, Function.identity()));
+        } else {
+            return result.stream().collect(Collectors.toMap(OrgStatisticsResultDTO::getOrgId, Function.identity()));
+        }
+    }
+
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginGroupMemberDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginGroupMemberDailyServiceImpl.java
index aea9baa4bc..e8ab17e4d1 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginGroupMemberDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginGroupMemberDailyServiceImpl.java
@@ -20,21 +20,30 @@ package com.epmet.service.evaluationindex.extract.todata.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.constant.OrgTypeConstant;
 import com.epmet.dao.evaluationindex.extract.FactOriginGroupMemberDailyDao;
 import com.epmet.dto.extract.FactOriginGroupMemberDailyDTO;
+import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginGroupMemberDailyEntity;
 import com.epmet.service.evaluationindex.extract.todata.FactOriginGroupMemberDailyService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
  * 
@@ -98,4 +107,39 @@ public class FactOriginGroupMemberDailyServiceImpl extends BaseServiceImpl<FactO
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * 获取小组党员统计
+     *
+     * @param customerId
+     * @param dateId
+     * @param type
+     * @return java.util.Map<java.lang.String, com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     * @author zhaoqifeng
+     * @date 2021/5/14 10:33
+     */
+    @Override
+    public Map<String, OrgStatisticsResultDTO> getGroupPartyMemberStatic(String customerId, String dateId, String type) {
+        List<OrgStatisticsResultDTO> staticsList;
+        if (OrgTypeConstant.AGENCY.equals(type)) {
+            //组织级别统计
+            staticsList = baseDao.selectGroupPartyMemberStaticByAgency(customerId, dateId);
+        } else {
+            //网格级别统计
+            staticsList = baseDao.selectGroupPartyMemberStaticByGrid(customerId, dateId);
+        }
+        if (CollectionUtils.isEmpty(staticsList)) {
+            return Collections.emptyMap();
+        }
+        staticsList.forEach(item -> {
+            BigDecimal count = new BigDecimal(item.getCount());
+            BigDecimal sum = new BigDecimal(item.getSum());
+            item.setRatio(count.divide(sum, NumConstant.SIX, RoundingMode.HALF_UP));
+        });
+        if (OrgTypeConstant.AGENCY.equals(type)) {
+            return staticsList.stream().collect(Collectors.toMap(OrgStatisticsResultDTO::getAgencyId, Function.identity()));
+        } else {
+            return staticsList.stream().collect(Collectors.toMap(OrgStatisticsResultDTO::getOrgId, Function.identity()));
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginIssueMainDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginIssueMainDailyServiceImpl.java
index 0eac851c63..86e60734b7 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginIssueMainDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginIssueMainDailyServiceImpl.java
@@ -19,15 +19,24 @@ package com.epmet.service.evaluationindex.extract.todata.impl;
 
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.constant.DataSourceConstant;
+import com.epmet.constant.OrgTypeConstant;
 import com.epmet.dao.evaluationindex.extract.FactOriginIssueMainDailyDao;
 import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginIssueMainDailyEntity;
 import com.epmet.service.evaluationindex.extract.todata.FactOriginIssueMainDailyService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
  *  议题主表
@@ -127,4 +136,37 @@ public class FactOriginIssueMainDailyServiceImpl extends BaseServiceImpl<FactOri
     public List<OrgStatisticsResultDTO> getOrgIssueCount(String customerId, String monthId, String level) {
         return baseDao.selectOrgIssueCount(customerId, monthId, level);
     }
+
+    /**
+     * 获取组织/网格级别党员发布话题转议题统计
+     *
+     * @param customerId
+     * @param dateId
+     * @param type
+     * @return java.util.Map<java.lang.String, com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     * @author zhaoqifeng
+     * @date 2021/5/17 14:52
+     */
+    @Override
+    public Map<String, OrgStatisticsResultDTO> getPartyMemberIssueStatic(String customerId, String dateId, String type) {
+        List<OrgStatisticsResultDTO> result;
+        if (OrgTypeConstant.AGENCY.equals(type)) {
+            result = baseDao.selectPartyMemberIssueStaticByAgency(customerId, dateId);
+        } else {
+            result = baseDao.selectPartyMemberIssueStaticByGrid(customerId, dateId);
+        }
+        if (CollectionUtils.isEmpty(result)) {
+            return Collections.emptyMap();
+        }
+        result.forEach(item -> {
+            BigDecimal count = new BigDecimal(item.getCount());
+            BigDecimal sum = new BigDecimal(item.getSum());
+            item.setRatio(count.divide(sum, NumConstant.SIX, RoundingMode.HALF_UP));
+        });
+        if (OrgTypeConstant.AGENCY.equals(type)) {
+            return result.stream().collect(Collectors.toMap(OrgStatisticsResultDTO::getAgencyId, Function.identity()));
+        } else {
+            return result.stream().collect(Collectors.toMap(OrgStatisticsResultDTO::getOrgId, Function.identity()));
+        }
+    }
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java
index 00f8ecbb9c..73830ce377 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java
@@ -23,6 +23,7 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.DataSourceConstant;
+import com.epmet.constant.OrgTypeConstant;
 import com.epmet.constant.ProjectConstant;
 import com.epmet.dao.evaluationindex.extract.FactOriginProjectMainDailyDao;
 import com.epmet.dao.evaluationindex.extract.FactOriginProjectOrgPeriodDailyDao;
@@ -47,10 +48,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -528,5 +529,71 @@ public class FactOriginProjectMainDailyServiceImpl extends BaseServiceImpl<FactO
         });
     }
 
+    /**
+     * 获取组织/网格级别党员发布话题转项目统计
+     *
+     * @param customerId
+     * @param dateId
+     * @param type
+     * @return java.util.Map<java.lang.String, com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     * @author zhaoqifeng
+     * @date 2021/5/17 15:25
+     */
+    @Override
+    public Map<String, OrgStatisticsResultDTO> getPartyMemberProjectStatic(String customerId, String dateId, String type) {
+        List<OrgStatisticsResultDTO> result;
+        if (OrgTypeConstant.AGENCY.equals(type)) {
+            result = baseDao.selectPartyMemberProjectStaticByAgency(customerId, dateId);
+        } else {
+            result = baseDao.selectPartyMemberProjectStaticByGrid(customerId, dateId);
+        }
+        if (CollectionUtils.isEmpty(result)) {
+            return Collections.emptyMap();
+        }
+        result.forEach(item -> {
+            BigDecimal count = new BigDecimal(item.getCount());
+            BigDecimal sum = new BigDecimal(item.getSum());
+            item.setRatio(count.divide(sum, NumConstant.SIX, RoundingMode.HALF_UP));
+        });
+        if (OrgTypeConstant.AGENCY.equals(type)) {
+            return result.stream().collect(Collectors.toMap(OrgStatisticsResultDTO::getAgencyId, Function.identity()));
+        } else {
+            return result.stream().collect(Collectors.toMap(OrgStatisticsResultDTO::getOrgId, Function.identity()));
+        }
+    }
+
+    /**
+     * 获取组织/网格级别党员发布话题结案统计
+     *
+     * @param customerId
+     * @param dateId
+     * @param type
+     * @return java.util.Map<java.lang.String, com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     * @author zhaoqifeng
+     * @date 2021/5/17 15:39
+     */
+    @Override
+    public Map<String, OrgStatisticsResultDTO> getPartyMemberClosedProjectStatic(String customerId, String dateId, String type) {
+        List<OrgStatisticsResultDTO> result;
+        if (OrgTypeConstant.AGENCY.equals(type)) {
+            result = baseDao.selectPartyMemberClosedProjectStaticByAgency(customerId, dateId);
+        } else {
+            result = baseDao.selectPartyMemberClosedProjectStaticByGrid(customerId, dateId);
+        }
+        if (CollectionUtils.isEmpty(result)) {
+            return Collections.emptyMap();
+        }
+        result.forEach(item -> {
+            BigDecimal count = new BigDecimal(item.getCount());
+            BigDecimal sum = new BigDecimal(item.getSum());
+            item.setRatio(count.divide(sum, NumConstant.SIX, RoundingMode.HALF_UP));
+        });
+        if (OrgTypeConstant.AGENCY.equals(type)) {
+            return result.stream().collect(Collectors.toMap(OrgStatisticsResultDTO::getAgencyId, Function.identity()));
+        } else {
+            return result.stream().collect(Collectors.toMap(OrgStatisticsResultDTO::getOrgId, Function.identity()));
+        }
+    }
+
 
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginTopicMainDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginTopicMainDailyServiceImpl.java
index 7519d9496d..ac1e8af7a3 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginTopicMainDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginTopicMainDailyServiceImpl.java
@@ -26,6 +26,7 @@ import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.constant.DimObjectActionConstant;
 import com.epmet.constant.IndexCalConstant;
+import com.epmet.constant.OrgTypeConstant;
 import com.epmet.dao.evaluationindex.extract.FactOriginTopicLogDailyDao;
 import com.epmet.dao.evaluationindex.extract.FactOriginTopicMainDailyDao;
 import com.epmet.dto.extract.form.ExtractOriginFormDTO;
@@ -46,10 +47,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 
@@ -325,4 +326,37 @@ public class FactOriginTopicMainDailyServiceImpl extends BaseServiceImpl<FactOri
         return baseDao.selectOrgTopicCount(customerId, monthId, level);
     }
 
+    /**
+     * 获取组织/网格级别党员发布话题统计
+     *
+     * @param customerId
+     * @param dateId
+     * @param type
+     * @return java.util.Map<java.lang.String, com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     * @author zhaoqifeng
+     * @date 2021/5/17 14:25
+     */
+    @Override
+    public Map<String, OrgStatisticsResultDTO> getPartyMemberTopicStatic(String customerId, String dateId, String type) {
+        List<OrgStatisticsResultDTO> result;
+        if (OrgTypeConstant.AGENCY.equals(type)) {
+            result = baseDao.selectPartyMemberTopicStaticByAgency(customerId, dateId);
+        } else {
+            result = baseDao.selectPartyMemberTopicStaticByGrid(customerId, dateId);
+        }
+        if (CollectionUtils.isEmpty(result)) {
+            return Collections.emptyMap();
+        }
+        result.forEach(item -> {
+            BigDecimal count = new BigDecimal(item.getCount());
+            BigDecimal sum = new BigDecimal(item.getSum());
+            item.setRatio(count.divide(sum, NumConstant.SIX, RoundingMode.HALF_UP));
+        });
+        if (OrgTypeConstant.AGENCY.equals(type)) {
+            return result.stream().collect(Collectors.toMap(OrgStatisticsResultDTO::getAgencyId, Function.identity()));
+        } else {
+            return result.stream().collect(Collectors.toMap(OrgStatisticsResultDTO::getOrgId, Function.identity()));
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPartyMemberVanguardServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPartyMemberVanguardServiceImpl.java
new file mode 100644
index 0000000000..080a168591
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPartyMemberVanguardServiceImpl.java
@@ -0,0 +1,414 @@
+package com.epmet.service.impl;
+
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.utils.DateUtils;
+import com.epmet.constant.OrgTypeConstant;
+import com.epmet.dto.StatsFormDTO;
+import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
+import com.epmet.dto.stats.DimAgencyDTO;
+import com.epmet.dto.stats.DimGridDTO;
+import com.epmet.entity.stats.DimGridEntity;
+import com.epmet.entity.stats.FactPartyMemberVanguardAgencyDailyEntity;
+import com.epmet.entity.stats.FactPartyMemberVanguardGridDailyEntity;
+import com.epmet.service.StatsPartyMemberVanguardService;
+import com.epmet.service.evaluationindex.extract.todata.*;
+import com.epmet.service.stats.*;
+import com.epmet.util.DimIdGenerator;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2021/5/13 15:13
+ */
+@Slf4j
+@Service
+public class StatsPartyMemberVanguardServiceImpl implements StatsPartyMemberVanguardService {
+
+	@Resource
+	private DimCustomerService dimCustomerService;
+	@Resource
+	private DimAgencyService dimAgencyService;
+	@Resource
+	private DimGridService dimGridService;
+	@Resource
+	private FactPartyMemberVanguardAgencyDailyService factPartyMemberVanguardAgencyDailyService;
+	@Resource
+	private FactPartyMemberVanguardGridDailyService factPartyMemberVanguardGridDailyService;
+	@Resource
+	private FactOriginGroupMainDailyService factOriginGroupMainDailyService;
+	@Resource
+	private FactOriginGroupMemberDailyService factOriginGroupMemberDailyService;
+	@Resource
+	private FactOriginTopicMainDailyService factOriginTopicMainDailyService;
+	@Resource
+	private FactOriginIssueMainDailyService factOriginIssueMainDailyService;
+	@Resource
+	private FactOriginProjectMainDailyService factOriginProjectMainDailyService;
+
+
+
+
+	/**
+	 * 组织统计
+	 *
+	 * @param formDTO
+	 * @return void
+	 * @author zhaoqifeng
+	 * @date 2021/5/13 15:13
+	 */
+	@Override
+	public void agencyStats(StatsFormDTO formDTO) {
+		Date date = yesterday();
+		//入参有时间的则按具体时间执行,没有的则按当前时间前一天执行
+		if (null != formDTO && StringUtils.isNotBlank(formDTO.getDate())) {
+			date = DateUtils.parse(formDTO.getDate(), DateUtils.DATE_PATTERN_YYYYMMDD);
+		}
+		//入参有客户Id的则按客户Id执行，没有的则全部客户都执行
+		if (null != formDTO && StringUtils.isNotBlank(formDTO.getCustomerId())) {
+			customerAgencyStats(formDTO.getCustomerId(), date);
+		} else {
+			int pageNo = 1;
+			int pageSize = 100;
+			List<String> customerIdList;
+			do {
+				customerIdList = dimCustomerService.selectCustomerIdPage(pageNo++, pageSize);
+				if (CollectionUtils.isNotEmpty(customerIdList)) {
+					for (String customerId : customerIdList) {
+						try {
+							//遍历统计每一个客户数据
+							customerAgencyStats(customerId, date);
+						} catch (Exception e) {
+							log.error("Error creating model JSON", e);
+						}
+					}
+				}
+			} while (CollectionUtils.isNotEmpty(customerIdList) && customerIdList.size() == pageSize);
+		}
+	}
+
+	private void customerAgencyStats(String customerId, Date date) {
+		//1:查询日期各维度表Id
+		DimIdGenerator.DimIdBean dimId = DimIdGenerator.getDimIdBean(date);
+
+		//2:根据客户Id查询机关维度表数据
+		log.info("根据客户Id查询机关维度数据，对应客户Id:" + customerId);
+		DimAgencyDTO dimAgencyDTO = new DimAgencyDTO();
+		dimAgencyDTO.setCustomerId(customerId);
+		List<DimAgencyDTO> dimAgencyList = dimAgencyService.getDimAgencyList(dimAgencyDTO);
+
+		if (CollectionUtils.isNotEmpty(dimAgencyList)) {
+			List<FactPartyMemberVanguardAgencyDailyEntity> vanguardList = dimAgencyList.stream().map(item -> initAgencyDailyEntity(item, dimId)).collect(Collectors.toList());
+			//党员建组占比统计
+			Map<String, OrgStatisticsResultDTO> groupStatic = factOriginGroupMainDailyService.getPartyMemberGroupStatic(customerId,
+					dimId.getDateId(), OrgTypeConstant.AGENCY);
+			if (!groupStatic.isEmpty()) {
+				vanguardList.forEach(item -> {
+					OrgStatisticsResultDTO dto = groupStatic.get(item.getAgencyId());
+					if (null != dto) {
+						item.setGroupCount(dto.getCount());
+						item.setGroupRatio(dto.getRatio());
+						item.setGroupTotal(dto.getSum());
+					}
+				});
+			}
+
+			//小组成员党员占比统计
+			Map<String, OrgStatisticsResultDTO> memberStatic = factOriginGroupMemberDailyService.getGroupPartyMemberStatic(customerId,
+					dimId.getDateId(), OrgTypeConstant.AGENCY);
+			if (!memberStatic.isEmpty()) {
+				vanguardList.forEach(item -> {
+					OrgStatisticsResultDTO dto = memberStatic.get(item.getAgencyId());
+					if (null != dto) {
+						item.setGroupMemberCount(dto.getCount());
+						item.setGroupMemberRatio(dto.getRatio());
+						item.setGroupMemberTotal(dto.getSum());
+					}
+				});
+			}
+			//党员发布话题占比统计
+			Map<String, OrgStatisticsResultDTO> topicStatic = factOriginTopicMainDailyService.getPartyMemberTopicStatic(customerId,
+					dimId.getDateId(), OrgTypeConstant.AGENCY);
+			if (!topicStatic.isEmpty()) {
+				vanguardList.forEach(item -> {
+					OrgStatisticsResultDTO dto = topicStatic.get(item.getAgencyId());
+					if (null != dto) {
+						item.setGroupMemberCount(dto.getCount());
+						item.setGroupMemberRatio(dto.getRatio());
+						item.setGroupMemberTotal(dto.getSum());
+					}
+				});
+			}
+			//党员发布话题转议题占比统计
+			Map<String, OrgStatisticsResultDTO> issueStatic = factOriginIssueMainDailyService.getPartyMemberIssueStatic(customerId,
+					dimId.getDateId(), OrgTypeConstant.AGENCY);
+			if (!issueStatic.isEmpty()) {
+				vanguardList.forEach(item -> {
+					OrgStatisticsResultDTO dto = issueStatic.get(item.getAgencyId());
+					if (null != dto) {
+						item.setGroupMemberCount(dto.getCount());
+						item.setGroupMemberRatio(dto.getRatio());
+						item.setGroupMemberTotal(dto.getSum());
+					}
+				});
+			}
+			//党员发布话题转项目占比统计
+			Map<String, OrgStatisticsResultDTO> projectStatic = factOriginProjectMainDailyService.getPartyMemberProjectStatic(customerId,
+					dimId.getDateId(), OrgTypeConstant.AGENCY);
+			if (!projectStatic.isEmpty()) {
+				vanguardList.forEach(item -> {
+					OrgStatisticsResultDTO dto = projectStatic.get(item.getAgencyId());
+					if (null != dto) {
+						item.setGroupMemberCount(dto.getCount());
+						item.setGroupMemberRatio(dto.getRatio());
+						item.setGroupMemberTotal(dto.getSum());
+					}
+				});
+			}
+			//项目结案占比统计
+			Map<String, OrgStatisticsResultDTO> closedStatic = factOriginProjectMainDailyService.getPartyMemberClosedProjectStatic(customerId,
+					dimId.getDateId(), OrgTypeConstant.AGENCY);
+			if (!closedStatic.isEmpty()) {
+				vanguardList.forEach(item -> {
+					OrgStatisticsResultDTO dto = closedStatic.get(item.getAgencyId());
+					if (null != dto) {
+						item.setGroupMemberCount(dto.getCount());
+						item.setGroupMemberRatio(dto.getRatio());
+						item.setGroupMemberTotal(dto.getSum());
+					}
+				});
+			}
+			//删除旧数据
+			factPartyMemberVanguardAgencyDailyService.deleteDailyData(customerId, dimId.getDateId());
+			//批量插入
+			factPartyMemberVanguardAgencyDailyService.insertBatch(vanguardList);
+		}
+	}
+	/**
+	 * 网格统计
+	 *
+	 * @param formDTO
+	 * @return void
+	 * @author zhaoqifeng
+	 * @date 2021/5/13 15:13
+	 */
+	@Override
+	public void gridStats(StatsFormDTO formDTO) {
+		Date date = yesterday();
+		//入参有时间的则按具体时间执行,没有的则按当前时间前一天执行
+		if (null != formDTO && StringUtils.isNotBlank(formDTO.getDate())) {
+			date = DateUtils.parse(formDTO.getDate(), DateUtils.DATE_PATTERN_YYYYMMDD);
+		}
+		//入参有客户Id的则按客户Id执行，没有的则全部客户都执行
+		if (null != formDTO && StringUtils.isNotBlank(formDTO.getCustomerId())) {
+			customerAgencyStats(formDTO.getCustomerId(), date);
+		} else {
+			int pageNo = 1;
+			int pageSize = 100;
+			List<String> customerIdList;
+			do {
+				customerIdList = dimCustomerService.selectCustomerIdPage(pageNo++, pageSize);
+				if (CollectionUtils.isNotEmpty(customerIdList)) {
+					for (String customerId : customerIdList) {
+						try {
+							//遍历统计每一个客户数据
+							customerGridStats(customerId, date);
+						} catch (Exception e) {
+							log.error("Error creating model JSON", e);
+						}
+					}
+				}
+			} while (CollectionUtils.isNotEmpty(customerIdList) && customerIdList.size() == pageSize);
+		}
+	}
+
+	private void customerGridStats(String customerId, Date date) {
+		//1:查询日期各维度表Id
+		DimIdGenerator.DimIdBean dimId = DimIdGenerator.getDimIdBean(date);
+
+		//2:根据客户Id查询机关维度表数据
+		log.info("根据客户Id查询网格维度数据，对应客户Id:" + customerId);
+		DimAgencyDTO dimAgencyDTO = new DimAgencyDTO();
+		dimAgencyDTO.setCustomerId(customerId);
+		List<DimGridEntity> dimGridList = dimGridService.getGridListByCustomerId(customerId);
+
+		if (CollectionUtils.isNotEmpty(dimGridList)) {
+			List<FactPartyMemberVanguardGridDailyEntity> vanguardList =
+					dimGridList.stream().map(item -> initGridDailyEntity(item, dimId)).collect(Collectors.toList());
+			//党员建组占比统计
+			Map<String, OrgStatisticsResultDTO> groupStatic = factOriginGroupMainDailyService.getPartyMemberGroupStatic(customerId,
+					dimId.getDateId(), OrgTypeConstant.GRID);
+			if (!groupStatic.isEmpty()) {
+				vanguardList.forEach(item -> {
+					OrgStatisticsResultDTO dto = groupStatic.get(item.getGridId());
+					if (null != dto) {
+						item.setGroupCount(dto.getCount());
+						item.setGroupRatio(dto.getRatio());
+						item.setGroupTotal(dto.getSum());
+					}
+				});
+			}
+
+			//小组成员党员占比统计
+			Map<String, OrgStatisticsResultDTO> memberStatic = factOriginGroupMemberDailyService.getGroupPartyMemberStatic(customerId,
+					dimId.getDateId(), OrgTypeConstant.GRID);
+			if (!memberStatic.isEmpty()) {
+				vanguardList.forEach(item -> {
+					OrgStatisticsResultDTO dto = memberStatic.get(item.getGridId());
+					if (null != dto) {
+						item.setGroupMemberCount(dto.getCount());
+						item.setGroupMemberRatio(dto.getRatio());
+						item.setGroupMemberTotal(dto.getSum());
+					}
+				});
+			}
+			//党员发布话题占比统计
+			Map<String, OrgStatisticsResultDTO> topicStatic = factOriginTopicMainDailyService.getPartyMemberTopicStatic(customerId,
+					dimId.getDateId(), OrgTypeConstant.GRID);
+			if (!topicStatic.isEmpty()) {
+				vanguardList.forEach(item -> {
+					OrgStatisticsResultDTO dto = topicStatic.get(item.getGridId());
+					if (null != dto) {
+						item.setGroupMemberCount(dto.getCount());
+						item.setGroupMemberRatio(dto.getRatio());
+						item.setGroupMemberTotal(dto.getSum());
+					}
+				});
+			}
+			//党员发布话题转议题占比统计
+			Map<String, OrgStatisticsResultDTO> issueStatic = factOriginIssueMainDailyService.getPartyMemberIssueStatic(customerId,
+					dimId.getDateId(), OrgTypeConstant.GRID);
+			if (!issueStatic.isEmpty()) {
+				vanguardList.forEach(item -> {
+					OrgStatisticsResultDTO dto = issueStatic.get(item.getGridId());
+					if (null != dto) {
+						item.setGroupMemberCount(dto.getCount());
+						item.setGroupMemberRatio(dto.getRatio());
+						item.setGroupMemberTotal(dto.getSum());
+					}
+				});
+			}
+			//党员发布话题转项目占比统计
+			Map<String, OrgStatisticsResultDTO> projectStatic = factOriginProjectMainDailyService.getPartyMemberProjectStatic(customerId,
+					dimId.getDateId(), OrgTypeConstant.GRID);
+			if (!projectStatic.isEmpty()) {
+				vanguardList.forEach(item -> {
+					OrgStatisticsResultDTO dto = projectStatic.get(item.getGridId());
+					if (null != dto) {
+						item.setGroupMemberCount(dto.getCount());
+						item.setGroupMemberRatio(dto.getRatio());
+						item.setGroupMemberTotal(dto.getSum());
+					}
+				});
+			}
+			//项目结案占比统计
+			Map<String, OrgStatisticsResultDTO> closedStatic = factOriginProjectMainDailyService.getPartyMemberClosedProjectStatic(customerId,
+					dimId.getDateId(), OrgTypeConstant.GRID);
+			if (!closedStatic.isEmpty()) {
+				vanguardList.forEach(item -> {
+					OrgStatisticsResultDTO dto = closedStatic.get(item.getGridId());
+					if (null != dto) {
+						item.setGroupMemberCount(dto.getCount());
+						item.setGroupMemberRatio(dto.getRatio());
+						item.setGroupMemberTotal(dto.getSum());
+					}
+				});
+			}
+			//删除旧数据
+			factPartyMemberVanguardGridDailyService.deleteDailyData(customerId, dimId.getDateId());
+			//批量插入
+			factPartyMemberVanguardGridDailyService.insertBatch(vanguardList);
+		}
+	}
+
+
+	private Date yesterday() {
+		Date date = new Date();
+		try {
+			DateFormat sdf = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD);
+			Calendar calendar = Calendar.getInstance();
+			calendar.set(Calendar.HOUR_OF_DAY, -24);
+			String str = sdf.format(calendar.getTime());
+			date = sdf.parse(str);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return date;
+	}
+
+	private FactPartyMemberVanguardAgencyDailyEntity initAgencyDailyEntity(DimAgencyDTO agency, DimIdGenerator.DimIdBean dimId) {
+		FactPartyMemberVanguardAgencyDailyEntity entity = new FactPartyMemberVanguardAgencyDailyEntity();
+		entity.setCustomerId(agency.getCustomerId());
+		entity.setAgencyId(agency.getId());
+		entity.setPid(agency.getPid());
+		entity.setDateId(dimId.getDateId());
+		entity.setWeekId(dimId.getWeekId());
+		entity.setMonthId(dimId.getMonthId());
+		entity.setQuarterId(dimId.getQuarterId());
+		entity.setYearId(dimId.getYearId());
+		entity.setGroupCount(NumConstant.ZERO);
+		entity.setGroupRatio(new BigDecimal(NumConstant.ZERO));
+		entity.setGroupTotal(NumConstant.ZERO);
+		entity.setGroupMemberCount(NumConstant.ZERO);
+		entity.setGroupMemberRatio(new BigDecimal(NumConstant.ZERO));
+		entity.setGroupMemberTotal(NumConstant.ZERO);
+		entity.setTopicCount(NumConstant.ZERO);
+		entity.setTopicRatio(new BigDecimal(NumConstant.ZERO));
+		entity.setTopicTotal(NumConstant.ZERO);
+		entity.setIssueCount(NumConstant.ZERO);
+		entity.setIssueRatio(new BigDecimal(NumConstant.ZERO));
+		entity.setIssueTotal(NumConstant.ZERO);
+		entity.setProjectCount(NumConstant.ZERO);
+		entity.setProjectRatio(new BigDecimal(NumConstant.ZERO));
+		entity.setProjectTotal(NumConstant.ZERO);
+		entity.setProjectClosedCount(NumConstant.ZERO);
+		entity.setProjectClosedRatio(new BigDecimal(NumConstant.ZERO));
+		entity.setProjectClosedTotal(NumConstant.ZERO);
+		return entity;
+	}
+
+
+	private FactPartyMemberVanguardGridDailyEntity initGridDailyEntity(DimGridEntity grid, DimIdGenerator.DimIdBean dimId) {
+		FactPartyMemberVanguardGridDailyEntity entity = new FactPartyMemberVanguardGridDailyEntity();
+		entity.setCustomerId(grid.getCustomerId());
+		entity.setAgencyId(grid.getAgencyId());
+		entity.setGridId(grid.getId());
+		entity.setDateId(dimId.getDateId());
+		entity.setWeekId(dimId.getWeekId());
+		entity.setMonthId(dimId.getMonthId());
+		entity.setQuarterId(dimId.getQuarterId());
+		entity.setYearId(dimId.getYearId());
+		entity.setGroupCount(NumConstant.ZERO);
+		entity.setGroupRatio(new BigDecimal(NumConstant.ZERO));
+		entity.setGroupTotal(NumConstant.ZERO);
+		entity.setGroupMemberCount(NumConstant.ZERO);
+		entity.setGroupMemberRatio(new BigDecimal(NumConstant.ZERO));
+		entity.setGroupMemberTotal(NumConstant.ZERO);
+		entity.setTopicCount(NumConstant.ZERO);
+		entity.setTopicRatio(new BigDecimal(NumConstant.ZERO));
+		entity.setTopicTotal(NumConstant.ZERO);
+		entity.setIssueCount(NumConstant.ZERO);
+		entity.setIssueRatio(new BigDecimal(NumConstant.ZERO));
+		entity.setIssueTotal(NumConstant.ZERO);
+		entity.setProjectCount(NumConstant.ZERO);
+		entity.setProjectRatio(new BigDecimal(NumConstant.ZERO));
+		entity.setProjectTotal(NumConstant.ZERO);
+		entity.setProjectClosedCount(NumConstant.ZERO);
+		entity.setProjectClosedRatio(new BigDecimal(NumConstant.ZERO));
+		entity.setProjectClosedTotal(NumConstant.ZERO);
+		return entity;
+	}
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactPartyMemberVanguardAgencyDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactPartyMemberVanguardAgencyDailyService.java
new file mode 100644
index 0000000000..385b615549
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactPartyMemberVanguardAgencyDailyService.java
@@ -0,0 +1,105 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.stats;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.stats.FactPartyMemberVanguardAgencyDailyDTO;
+import com.epmet.entity.stats.FactPartyMemberVanguardAgencyDailyEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 党员先锋-机关日统计数据
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-13
+ */
+public interface FactPartyMemberVanguardAgencyDailyService extends BaseService<FactPartyMemberVanguardAgencyDailyEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<FactPartyMemberVanguardAgencyDailyDTO>
+     * @author generator
+     * @date 2021-05-13
+     */
+    PageData<FactPartyMemberVanguardAgencyDailyDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<FactPartyMemberVanguardAgencyDailyDTO>
+     * @author generator
+     * @date 2021-05-13
+     */
+    List<FactPartyMemberVanguardAgencyDailyDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return FactPartyMemberVanguardAgencyDailyDTO
+     * @author generator
+     * @date 2021-05-13
+     */
+    FactPartyMemberVanguardAgencyDailyDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-05-13
+     */
+    void save(FactPartyMemberVanguardAgencyDailyDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-05-13
+     */
+    void update(FactPartyMemberVanguardAgencyDailyDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-05-13
+     */
+    void delete(String[] ids);
+
+    /**
+     * 清除日数据
+     * @author zhaoqifeng
+     * @date 2021/5/17 15:55
+     * @param customerId
+     * @param dateId
+     * @return void
+     */
+    void deleteDailyData(String customerId, String dateId);
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactPartyMemberVanguardGridDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactPartyMemberVanguardGridDailyService.java
new file mode 100644
index 0000000000..bfe7d258ce
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactPartyMemberVanguardGridDailyService.java
@@ -0,0 +1,105 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.stats;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.stats.FactPartyMemberVanguardGridDailyDTO;
+import com.epmet.entity.stats.FactPartyMemberVanguardGridDailyEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 党员先锋-网格日统计数据
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-13
+ */
+public interface FactPartyMemberVanguardGridDailyService extends BaseService<FactPartyMemberVanguardGridDailyEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<FactPartyMemberVanguardGridDailyDTO>
+     * @author generator
+     * @date 2021-05-13
+     */
+    PageData<FactPartyMemberVanguardGridDailyDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<FactPartyMemberVanguardGridDailyDTO>
+     * @author generator
+     * @date 2021-05-13
+     */
+    List<FactPartyMemberVanguardGridDailyDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return FactPartyMemberVanguardGridDailyDTO
+     * @author generator
+     * @date 2021-05-13
+     */
+    FactPartyMemberVanguardGridDailyDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-05-13
+     */
+    void save(FactPartyMemberVanguardGridDailyDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-05-13
+     */
+    void update(FactPartyMemberVanguardGridDailyDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-05-13
+     */
+    void delete(String[] ids);
+
+    /**
+     * 清除日数据
+     * @author zhaoqifeng
+     * @date 2021/5/17 15:55
+     * @param customerId
+     * @param dateId
+     * @return void
+     */
+    void deleteDailyData(String customerId, String dateId);
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactPartyMemberVanguardAgencyDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactPartyMemberVanguardAgencyDailyServiceImpl.java
new file mode 100644
index 0000000000..9c951b7b2f
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactPartyMemberVanguardAgencyDailyServiceImpl.java
@@ -0,0 +1,118 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.stats.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.constant.DataSourceConstant;
+import com.epmet.dao.stats.FactPartyMemberVanguardAgencyDailyDao;
+import com.epmet.dto.stats.FactPartyMemberVanguardAgencyDailyDTO;
+import com.epmet.entity.stats.FactPartyMemberVanguardAgencyDailyEntity;
+import com.epmet.service.stats.FactPartyMemberVanguardAgencyDailyService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 党员先锋-机关日统计数据
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-13
+ */
+@Service
+@DataSource(DataSourceConstant.STATS)
+public class FactPartyMemberVanguardAgencyDailyServiceImpl extends BaseServiceImpl<FactPartyMemberVanguardAgencyDailyDao, FactPartyMemberVanguardAgencyDailyEntity> implements FactPartyMemberVanguardAgencyDailyService {
+
+
+    @Override
+    public PageData<FactPartyMemberVanguardAgencyDailyDTO> page(Map<String, Object> params) {
+        IPage<FactPartyMemberVanguardAgencyDailyEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, FactPartyMemberVanguardAgencyDailyDTO.class);
+    }
+
+    @Override
+    public List<FactPartyMemberVanguardAgencyDailyDTO> list(Map<String, Object> params) {
+        List<FactPartyMemberVanguardAgencyDailyEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, FactPartyMemberVanguardAgencyDailyDTO.class);
+    }
+
+    private QueryWrapper<FactPartyMemberVanguardAgencyDailyEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<FactPartyMemberVanguardAgencyDailyEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public FactPartyMemberVanguardAgencyDailyDTO get(String id) {
+        FactPartyMemberVanguardAgencyDailyEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, FactPartyMemberVanguardAgencyDailyDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(FactPartyMemberVanguardAgencyDailyDTO dto) {
+        FactPartyMemberVanguardAgencyDailyEntity entity = ConvertUtils.sourceToTarget(dto, FactPartyMemberVanguardAgencyDailyEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(FactPartyMemberVanguardAgencyDailyDTO dto) {
+        FactPartyMemberVanguardAgencyDailyEntity entity = ConvertUtils.sourceToTarget(dto, FactPartyMemberVanguardAgencyDailyEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+    /**
+     * 清除日数据
+     *
+     * @param customerId
+     * @param dateId
+     * @return void
+     * @author zhaoqifeng
+     * @date 2021/5/17 15:55
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteDailyData(String customerId, String dateId) {
+        baseDao.deleteDailyData(customerId, dateId);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactPartyMemberVanguardGridDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactPartyMemberVanguardGridDailyServiceImpl.java
new file mode 100644
index 0000000000..235cf53e23
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactPartyMemberVanguardGridDailyServiceImpl.java
@@ -0,0 +1,118 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.stats.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.constant.DataSourceConstant;
+import com.epmet.dao.stats.FactPartyMemberVanguardGridDailyDao;
+import com.epmet.dto.stats.FactPartyMemberVanguardGridDailyDTO;
+import com.epmet.entity.stats.FactPartyMemberVanguardGridDailyEntity;
+import com.epmet.service.stats.FactPartyMemberVanguardGridDailyService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 党员先锋-网格日统计数据
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-13
+ */
+@Service
+@DataSource(DataSourceConstant.STATS)
+public class FactPartyMemberVanguardGridDailyServiceImpl extends BaseServiceImpl<FactPartyMemberVanguardGridDailyDao, FactPartyMemberVanguardGridDailyEntity> implements FactPartyMemberVanguardGridDailyService {
+
+
+    @Override
+    public PageData<FactPartyMemberVanguardGridDailyDTO> page(Map<String, Object> params) {
+        IPage<FactPartyMemberVanguardGridDailyEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, FactPartyMemberVanguardGridDailyDTO.class);
+    }
+
+    @Override
+    public List<FactPartyMemberVanguardGridDailyDTO> list(Map<String, Object> params) {
+        List<FactPartyMemberVanguardGridDailyEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, FactPartyMemberVanguardGridDailyDTO.class);
+    }
+
+    private QueryWrapper<FactPartyMemberVanguardGridDailyEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<FactPartyMemberVanguardGridDailyEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public FactPartyMemberVanguardGridDailyDTO get(String id) {
+        FactPartyMemberVanguardGridDailyEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, FactPartyMemberVanguardGridDailyDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(FactPartyMemberVanguardGridDailyDTO dto) {
+        FactPartyMemberVanguardGridDailyEntity entity = ConvertUtils.sourceToTarget(dto, FactPartyMemberVanguardGridDailyEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(FactPartyMemberVanguardGridDailyDTO dto) {
+        FactPartyMemberVanguardGridDailyEntity entity = ConvertUtils.sourceToTarget(dto, FactPartyMemberVanguardGridDailyEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+    /**
+     * 清除日数据
+     *
+     * @param customerId
+     * @param dateId
+     * @return void
+     * @author zhaoqifeng
+     * @date 2021/5/17 15:55
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteDailyData(String customerId, String dateId) {
+        baseDao.deleteDailyData(customerId, dateId);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml
index 2f40e1de70..eeec0fa8e5 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml
@@ -350,5 +350,31 @@
         AND customer_id = #{customerId}
         <![CDATA[AND DATE_ID <= #{dateId}]]>
     </select>
+    <select id="selectPartyMemberGroupStaticByAgency" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
+        SELECT
+        AGENCY_ID,
+        count( ID ) AS "sum",
+        sum(IF( IS_OWNER_PARTY = 1, 1, 0 )) AS "count"
+        FROM
+        fact_origin_group_main_daily
+        WHERE CUSTOMER_ID = #{customerId}
+        AND DATE_ID &lt;= #{dateId}
+        AND (GROUP_STATE = 'approved' OR GROUP_STATE = 'hidden')
+        GROUP BY
+        AGENCY_ID
+    </select>
+    <select id="selectPartyMemberGroupStaticByGrid" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
+        SELECT
+        GRID_ID AS "orgId",
+        count( ID ) AS "sum",
+        sum(IF( IS_OWNER_PARTY = 1, 1, 0 )) AS "count"
+        FROM
+        fact_origin_group_main_daily
+        WHERE CUSTOMER_ID = #{customerId}
+        AND DATE_ID &lt;= #{dateId}
+        AND ( GROUP_STATE = 'approved' OR GROUP_STATE = 'hidden' )
+        GROUP BY
+        GRID_ID
+    </select>
 
 </mapper>
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMemberDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMemberDailyDao.xml
index 1c0a1d4edb..c0fb2fb43c 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMemberDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMemberDailyDao.xml
@@ -27,6 +27,50 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
+    <select id="selectGroupPartyMemberStaticByAgency" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
+        SELECT
+            a.AGENCY_ID,
+            COUNT( DISTINCT MEMBER_ID ) AS "sum",
+            IFNULL( b.partyCount, 0 ) AS "count"
+        FROM
+            fact_origin_group_member_daily a
+                LEFT JOIN
+            (SELECT
+                 AGENCY_ID,
+                 COUNT( DISTINCT MEMBER_ID ) AS partyCount
+             FROM fact_origin_group_member_daily
+             WHERE IS_PARTY = 1
+                 AND CUSTOMER_ID = #{customerId}
+                 AND DATE_ID &lt;= #{dateId}
+             GROUP BY AGENCY_ID
+            ) b ON a.AGENCY_ID = b.AGENCY_ID
+        WHERE a.CUSTOMER_ID = #{customerId}
+          AND a.DATE_ID &lt;= #{dateId}
+        GROUP BY
+            a.AGENCY_ID
+    </select>
+    <select id="selectGroupPartyMemberStaticByGrid" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
+        SELECT
+            a.GRID_ID AS "orgId",
+            COUNT( DISTINCT MEMBER_ID ) AS "sum",
+            IFNULL( b.partyCount, 0 ) AS "count"
+        FROM
+            fact_origin_group_member_daily a
+                LEFT JOIN
+            (SELECT
+                 GRID_ID,
+                 COUNT( DISTINCT MEMBER_ID ) AS partyCount
+             FROM fact_origin_group_member_daily
+             WHERE IS_PARTY = 1
+               AND CUSTOMER_ID = #{customerId}
+               AND DATE_ID &lt;= #{dateId}
+             GROUP BY GRID_ID
+            ) b ON a.GRID_ID = b.GRID_ID
+        WHERE a.CUSTOMER_ID = #{customerId}
+          AND a.DATE_ID &lt;= #{dateId}
+        GROUP BY
+            a.GRID_ID
+    </select>
 
 
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml
index 42949df17b..259e46c150 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml
@@ -291,4 +291,24 @@
           AND f.MONTH_ID = #{monthId}
         GROUP BY f.AGENCY_ID
     </select>
+    <select id="selectPartyMemberIssueStaticByAgency" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
+        SELECT
+            AGENCY_ID,
+            COUNT(ID) AS "sum",
+            SUM(IF(IS_PARTY = 1 ,1, 0)) AS "count"
+        FROM fact_origin_issue_main_daily
+        WHERE CUSTOMER_ID = #{customerId}
+          AND DATE_ID &lt;= #{dateId}
+        GROUP BY AGENCY_ID
+    </select>
+    <select id="selectPartyMemberIssueStaticByGrid" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
+        SELECT
+            GRID_ID AS "orgId",
+            COUNT(ID) AS "sum",
+            SUM(IF(IS_PARTY = 1 ,1, 0)) AS "count"
+        FROM fact_origin_issue_main_daily
+        WHERE CUSTOMER_ID = #{customerId}
+          AND DATE_ID &lt;= #{dateId}
+        GROUP BY GRID_ID
+    </select>
 </mapper>
\ No newline at end of file
diff --git 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
index 18aa1d5123..92fe50a99c 100644
--- 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
@@ -761,5 +761,47 @@
         WHERE CUSTOMER_ID = #{customerId}
           AND DEL_FLAG = '0'
     </select>
+    <select id="selectPartyMemberProjectStaticByAgency" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
+        SELECT
+            AGENCY_ID,
+            COUNT(ID) AS "sum",
+            SUM(IF(IS_PARTY = 1 ,1, 0)) AS "count"
+        FROM fact_origin_project_main_daily
+        WHERE CUSTOMER_ID = #{customerId}
+          AND DATE_ID &lt;= #{dateId}
+        GROUP BY AGENCY_ID
+    </select>
+    <select id="selectPartyMemberProjectStaticByGrid" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
+        SELECT
+            GRID_ID AS "orgId",
+            COUNT(ID) AS "sum",
+            SUM(IF(IS_PARTY = 1 ,1, 0)) AS "count"
+        FROM fact_origin_project_main_daily
+        WHERE CUSTOMER_ID = #{customerId}
+          AND DATE_ID &lt;= #{dateId}
+        GROUP BY GRID_ID
+    </select>
+    <select id="selectPartyMemberClosedProjectStaticByAgency" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
+        SELECT
+            AGENCY_ID,
+            COUNT(ID) AS "sum",
+            SUM(IF(IS_PARTY = 1 ,1, 0)) AS "count"
+        FROM fact_origin_project_main_daily
+        WHERE CUSTOMER_ID = #{customerId}
+          AND DATE_ID &lt;= #{dateId}
+          AND PROJECT_STATUS = 'closed'
+        GROUP BY AGENCY_ID
+    </select>
+    <select id="selectPartyMemberClosedProjectStaticByGrid" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
+        SELECT
+            GRID_ID AS "orgId",
+            COUNT(ID) AS "sum",
+            SUM(IF(IS_PARTY = 1 ,1, 0)) AS "count"
+        FROM fact_origin_project_main_daily
+        WHERE CUSTOMER_ID = #{customerId}
+          AND DATE_ID &lt;= #{dateId}
+          AND PROJECT_STATUS = 'closed'
+        GROUP BY GRID_ID
+    </select>
 
 </mapper>
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml
index a4f2d9bbaa..c8136df35a 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml
@@ -177,4 +177,24 @@
           AND f.MONTH_ID = #{monthId}
         GROUP BY f.AGENCY_ID
     </select>
+    <select id="selectPartyMemberTopicStaticByAgency" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
+        SELECT
+            AGENCY_ID,
+            COUNT(ID) as "sum",
+            SUM(IF(CREATE_TOPIC_USER_IS_PARTY = 1 ,1, 0)) as "count"
+        FROM fact_origin_topic_main_daily
+        WHERE CUSTOMER_ID = #{customerId}
+          AND DATE_ID &lt;= #{dateId}
+        GROUP BY AGENCY_ID
+    </select>
+    <select id="selectPartyMemberTopicStaticByGrid" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
+        SELECT
+            GRID_ID AS "orgId",
+            COUNT(ID) as "sum",
+            SUM(IF(CREATE_TOPIC_USER_IS_PARTY = 1 ,1, 0)) as "count"
+        FROM fact_origin_topic_main_daily
+        WHERE CUSTOMER_ID = #{customerId}
+          AND DATE_ID &lt;= #{dateId}
+        GROUP BY GRID_ID
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactPartyMemberVanguardAgencyDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactPartyMemberVanguardAgencyDailyDao.xml
new file mode 100644
index 0000000000..f6de9644d1
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactPartyMemberVanguardAgencyDailyDao.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.stats.FactPartyMemberVanguardAgencyDailyDao">
+
+    <resultMap type="com.epmet.entity.stats.FactPartyMemberVanguardAgencyDailyEntity" id="factPartyMemberVanguardAgencyDailyMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="agencyId" column="AGENCY_ID"/>
+        <result property="pid" column="PID"/>
+        <result property="dateId" column="DATE_ID"/>
+        <result property="weekId" column="WEEK_ID"/>
+        <result property="monthId" column="MONTH_ID"/>
+        <result property="quarterId" column="QUARTER_ID"/>
+        <result property="yearId" column="YEAR_ID"/>
+        <result property="groupCount" column="GROUP_COUNT"/>
+        <result property="groupRatio" column="GROUP_RATIO"/>
+        <result property="groupMemberCount" column="GROUP_MEMBER_COUNT"/>
+        <result property="groupMemberRatio" column="GROUP_MEMBER_RATIO"/>
+        <result property="topicCount" column="TOPIC_COUNT"/>
+        <result property="topicRatio" column="TOPIC_RATIO"/>
+        <result property="issueCount" column="ISSUE_COUNT"/>
+        <result property="issueRatio" column="ISSUE_RATIO"/>
+        <result property="projectCount" column="PROJECT_COUNT"/>
+        <result property="projectRatio" column="PROJECT_RATIO"/>
+        <result property="projectClosedCount" column="PROJECT_CLOSED_COUNT"/>
+        <result property="projectClosedRatio" column="PROJECT_CLOSED_RATIO"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+    <delete id="deleteDailyData">
+        delete from fact_party_member_vanguard_agency_daily where customer_id = #{customerId} and DATE_ID = #{dateId}
+    </delete>
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactPartyMemberVanguardGridDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactPartyMemberVanguardGridDailyDao.xml
new file mode 100644
index 0000000000..311262a04f
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactPartyMemberVanguardGridDailyDao.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.stats.FactPartyMemberVanguardGridDailyDao">
+
+    <resultMap type="com.epmet.entity.stats.FactPartyMemberVanguardGridDailyEntity" id="factPartyMemberVanguardGridDailyMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="agencyId" column="AGENCY_ID"/>
+        <result property="gridId" column="GRID_ID"/>
+        <result property="dateId" column="DATE_ID"/>
+        <result property="weekId" column="WEEK_ID"/>
+        <result property="monthId" column="MONTH_ID"/>
+        <result property="quarterId" column="QUARTER_ID"/>
+        <result property="yearId" column="YEAR_ID"/>
+        <result property="groupCount" column="GROUP_COUNT"/>
+        <result property="groupRatio" column="GROUP_RATIO"/>
+        <result property="groupMemberCount" column="GROUP_MEMBER_COUNT"/>
+        <result property="groupMemberRatio" column="GROUP_MEMBER_RATIO"/>
+        <result property="topicCount" column="TOPIC_COUNT"/>
+        <result property="topicRatio" column="TOPIC_RATIO"/>
+        <result property="issueCount" column="ISSUE_COUNT"/>
+        <result property="issueRatio" column="ISSUE_RATIO"/>
+        <result property="projectCount" column="PROJECT_COUNT"/>
+        <result property="projectRatio" column="PROJECT_RATIO"/>
+        <result property="projectClosedCount" column="PROJECT_CLOSED_COUNT"/>
+        <result property="projectClosedRatio" column="PROJECT_CLOSED_RATIO"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+    <delete id="deleteDailyData">
+        delete from fact_party_member_vanguard_grid_daily where customer_id = #{customerId} and DATE_ID = #{dateId}
+    </delete>
+
+
+</mapper>
\ No newline at end of file

From abc72c6be96212ebfa0f54a612492418ce9d5475 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Tue, 18 May 2021 10:24:49 +0800
Subject: [PATCH 026/128] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E6=88=90=E5=91=98?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=98=AF=E5=90=A6=E5=85=9A=E5=91=98=E8=BA=AB?=
 =?UTF-8?q?=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../feign/DataStatisticalOpenFeignClient.java | 20 ++++++++
 ...ataStatisticalOpenFeignClientFallBack.java | 26 ++++++++++
 .../StatsPartyMemberVanguardController.java   | 49 +++++++++++++++++++
 .../StatsPartyMemberVanguardService.java      | 29 +++++++++++
 .../StatsPartyMemberVanguardServiceImpl.java  | 47 ++++++++++++++++++
 .../task/StatsPartyMemberVanguardTask.java    | 46 +++++++++++++++++
 6 files changed, 217 insertions(+)
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsPartyMemberVanguardController.java
 create mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/StatsPartyMemberVanguardService.java
 create mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsPartyMemberVanguardServiceImpl.java
 create mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsPartyMemberVanguardTask.java

diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java
index 27a471f2d4..e6a46879f4 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java
@@ -236,4 +236,24 @@ public interface DataStatisticalOpenFeignClient {
     @PostMapping(value = "/data/stats/indexdict/initCustomerIndex")
     Result<Boolean> initCustomerIndex(@RequestBody InitCustomerIndexForm formDTO);
 
+    /**
+     * 党员先锋统计-机关
+     * @author zhaoqifeng
+     * @date 2021/5/18 9:26
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result
+     */
+    @PostMapping("/data/stats/vanguard/agencyvanguardstats")
+    Result agencyVanguardStats(StatsFormDTO formDTO);
+
+    /**
+     * 党员先锋统计-网格
+     * @author zhaoqifeng
+     * @date 2021/5/18 9:27
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result
+     */
+    @PostMapping("/data/stats/vanguard/gridvanguardstats")
+    Result gridVanguardStats(StatsFormDTO formDTO);
+
 }
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java
index 88574dbd8d..d842746b35 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java
@@ -230,4 +230,30 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp
     public Result<Boolean> initCustomerIndex(InitCustomerIndexForm formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "initCustomerIndex", formDTO);
     }
+
+    /**
+     * 党员先锋统计-机关
+     *
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result
+     * @author zhaoqifeng
+     * @date 2021/5/18 9:26
+     */
+    @Override
+    public Result agencyVanguardStats(StatsFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "agencyVanguardStats", formDTO);
+    }
+
+    /**
+     * 党员先锋统计-网格
+     *
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result
+     * @author zhaoqifeng
+     * @date 2021/5/18 9:27
+     */
+    @Override
+    public Result gridVanguardStats(StatsFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "gridVanguardStats", formDTO);
+    }
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsPartyMemberVanguardController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsPartyMemberVanguardController.java
new file mode 100644
index 0000000000..a8dd3c8892
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsPartyMemberVanguardController.java
@@ -0,0 +1,49 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.StatsFormDTO;
+import com.epmet.service.StatsPartyMemberVanguardService;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2021/5/18 9:23
+ */
+@RequestMapping("vanguard")
+@RestController
+public class StatsPartyMemberVanguardController {
+	@Resource
+	private StatsPartyMemberVanguardService statsPartyMemberVanguardService;
+
+	/**
+	 * 党员先锋统计-机关
+	 * @author zhaoqifeng
+	 * @date 2021/5/18 9:26
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result
+	 */
+	@PostMapping("agencyvanguardstats")
+	public Result agencyVanguardStats(StatsFormDTO formDTO) {
+		statsPartyMemberVanguardService.agencyStats(formDTO);
+		return new Result();
+	}
+
+	/**
+	 * 党员先锋统计-网格
+	 * @author zhaoqifeng
+	 * @date 2021/5/18 9:27
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result
+	 */
+	@PostMapping("gridvanguardstats")
+	public Result gridVanguardStats(StatsFormDTO formDTO) {
+		statsPartyMemberVanguardService.gridStats(formDTO);
+		return new Result();
+	}
+
+}
diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/StatsPartyMemberVanguardService.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/StatsPartyMemberVanguardService.java
new file mode 100644
index 0000000000..d6c0543b9c
--- /dev/null
+++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/StatsPartyMemberVanguardService.java
@@ -0,0 +1,29 @@
+package com.epmet.service;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.StatsFormDTO;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2021/5/18 9:56
+ */
+public interface StatsPartyMemberVanguardService {
+	/**
+	 * 党员先锋统计-机关
+	 * @author zhaoqifeng
+	 * @date 2021/5/18 9:58
+	 * @param params
+	 * @return com.epmet.commons.tools.utils.Result
+	 */
+	Result agencyVanguardStats(StatsFormDTO params);
+
+	/**
+	 * 党员先锋统计-网格
+	 * @author zhaoqifeng
+	 * @date 2021/5/18 9:58
+	 * @param params
+	 * @return com.epmet.commons.tools.utils.Result
+	 */
+	Result gridVanguardStats(StatsFormDTO params);
+}
diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsPartyMemberVanguardServiceImpl.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsPartyMemberVanguardServiceImpl.java
new file mode 100644
index 0000000000..0db94fcfb7
--- /dev/null
+++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsPartyMemberVanguardServiceImpl.java
@@ -0,0 +1,47 @@
+package com.epmet.service.impl;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.StatsFormDTO;
+import com.epmet.feign.DataStatisticalOpenFeignClient;
+import com.epmet.service.StatsPartyMemberVanguardService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2021/5/18 9:56
+ */
+@Service
+public class StatsPartyMemberVanguardServiceImpl implements StatsPartyMemberVanguardService {
+	@Resource
+	private DataStatisticalOpenFeignClient dataStatisticalOpenFeignClient;
+
+
+	/**
+	 * 党员先锋统计-机关
+	 *
+	 * @param params
+	 * @return com.epmet.commons.tools.utils.Result
+	 * @author zhaoqifeng
+	 * @date 2021/5/18 9:58
+	 */
+	@Override
+	public Result agencyVanguardStats(StatsFormDTO params) {
+		return dataStatisticalOpenFeignClient.agencyVanguardStats(params);
+	}
+
+	/**
+	 * 党员先锋统计-网格
+	 *
+	 * @param params
+	 * @return com.epmet.commons.tools.utils.Result
+	 * @author zhaoqifeng
+	 * @date 2021/5/18 9:58
+	 */
+	@Override
+	public Result gridVanguardStats(StatsFormDTO params) {
+		return dataStatisticalOpenFeignClient.gridVanguardStats(params);
+	}
+}
diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsPartyMemberVanguardTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsPartyMemberVanguardTask.java
new file mode 100644
index 0000000000..8972bd1832
--- /dev/null
+++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsPartyMemberVanguardTask.java
@@ -0,0 +1,46 @@
+package com.epmet.task;
+
+import com.alibaba.fastjson.JSON;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.StatsFormDTO;
+import com.epmet.service.StatsPartyMemberVanguardService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2021/5/18 9:55
+ */
+@Component("statsVanguardTask")
+@Slf4j
+public class StatsPartyMemberVanguardTask implements ITask {
+
+	@Resource
+	private StatsPartyMemberVanguardService statsPartyMemberVanguardService;
+
+	@Override
+	public void run(String params) {
+		log.info("statsVanguardTask定时任务正在执行，参数为：{}", params);
+		StatsFormDTO statsFormDTO = new StatsFormDTO();
+		if (StringUtils.isNotBlank(params)) {
+			statsFormDTO = JSON.parseObject(params, StatsFormDTO.class);
+		}
+		Result result = statsPartyMemberVanguardService.agencyVanguardStats(statsFormDTO);
+		if (result.success()) {
+			log.info("statsVanguardTask组织级别定时任务执行成功");
+		} else {
+			log.error("statsVanguardTask组织级别定时任务执行失败:" + result.getMsg());
+		}
+
+		result = statsPartyMemberVanguardService.gridVanguardStats(statsFormDTO);
+		if (result.success()) {
+			log.info("statsVanguardTask网格级别定时任务执行成功");
+		} else {
+			log.error("statsVanguardTask网格级别定时任务执行失败:" + result.getMsg());
+		}
+	}
+}

From fc195cdf7972ac3df74380ed4a2dc788318cca36 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 18 May 2021 10:50:07 +0800
Subject: [PATCH 027/128] =?UTF-8?q?=E7=83=AD=E8=AE=AE=E4=B8=AD=E8=AF=9D?=
 =?UTF-8?q?=E9=A2=98=E7=BD=91=E6=A0=BC=E3=80=81=E6=9C=BA=E5=85=B3=E6=97=A5?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E7=A8=8B=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FactTopicHotdiscussAgencyDailyDTO.java    | 126 +++++++++
 .../FactTopicHotdiscussGridDailyDTO.java      | 126 +++++++++
 .../stats/topic/form/TopicStatusFormDTO.java  |  24 ++
 .../topic/result/TopicListResultDTO.java      |  39 +++
 .../controller/StatsTopicController.java      |  23 ++
 .../FactTopicHotdiscussAgencyDailyDao.java    |  38 +++
 .../FactTopicHotdiscussGridDailyDao.java      |  38 +++
 .../java/com/epmet/dao/topic/TopicDao.java    |   7 +
 .../FactTopicHotdiscussAgencyDailyEntity.java |  96 +++++++
 .../FactTopicHotdiscussGridDailyEntity.java   |  96 +++++++
 .../com/epmet/service/StatsTopicService.java  |  13 +
 .../impl/FactOriginExtractServiceImpl.java    |  34 +++
 .../service/impl/StatsGroupServiceImpl.java   |   6 +-
 .../service/impl/StatsTopicServiceImpl.java   | 250 +++++++++++++++++-
 ...FactTopicHotdiscussAgencyDailyService.java | 101 +++++++
 .../FactTopicHotdiscussGridDailyService.java  | 101 +++++++
 ...TopicHotdiscussAgencyDailyServiceImpl.java | 109 ++++++++
 ...ctTopicHotdiscussGridDailyServiceImpl.java | 109 ++++++++
 .../com/epmet/service/topic/TopicService.java |   7 +
 .../service/topic/impl/TopicServiceImpl.java  |  11 +
 .../FactTopicHotdiscussAgencyDailyDao.xml     |  15 ++
 .../stats/FactTopicHotdiscussGridDailyDao.xml |  15 ++
 .../main/resources/mapper/topic/TopicDao.xml  |  19 ++
 23 files changed, 1392 insertions(+), 11 deletions(-)
 create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicHotdiscussAgencyDailyDTO.java
 create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicHotdiscussGridDailyDTO.java
 create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/form/TopicStatusFormDTO.java
 create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/result/TopicListResultDTO.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactTopicHotdiscussAgencyDailyDao.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactTopicHotdiscussGridDailyDao.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactTopicHotdiscussAgencyDailyEntity.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactTopicHotdiscussGridDailyEntity.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactTopicHotdiscussAgencyDailyService.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactTopicHotdiscussGridDailyService.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactTopicHotdiscussAgencyDailyServiceImpl.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactTopicHotdiscussGridDailyServiceImpl.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactTopicHotdiscussAgencyDailyDao.xml
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactTopicHotdiscussGridDailyDao.xml

diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicHotdiscussAgencyDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicHotdiscussAgencyDailyDTO.java
new file mode 100644
index 0000000000..c5c5eeaa21
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicHotdiscussAgencyDailyDTO.java
@@ -0,0 +1,126 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.stats.topic;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 热议中话题机关日统计表【热议中指的没有被关闭、屏蔽、转议题的话题】
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-17
+ */
+@Data
+public class FactTopicHotdiscussAgencyDailyDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一标识
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 机构ID 关联机关dm表
+     */
+	private String agencyId;
+
+    /**
+     * 父级机关ID
+     */
+	private String pid;
+
+    /**
+     * 统计日期 关联日期dm表
+     */
+	private String dateId;
+
+    /**
+     * 周ID
+     */
+	private String weekId;
+
+    /**
+     * 月ID
+     */
+	private String monthId;
+
+    /**
+     * 季度ID
+     */
+	private String quarterId;
+
+    /**
+     * 年ID
+     */
+	private String yearId;
+
+    /**
+     * 话题总数
+     */
+	private Integer topicTotal;
+
+    /**
+     * 话题状态【热议中:hot_discuss】
+     */
+	private String status;
+
+    /**
+     * 状态话题数量
+     */
+	private Integer topicCount;
+
+    /**
+     * 删除标识
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicHotdiscussGridDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicHotdiscussGridDailyDTO.java
new file mode 100644
index 0000000000..340f07dc49
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/FactTopicHotdiscussGridDailyDTO.java
@@ -0,0 +1,126 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.stats.topic;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 热议中话题网格日统计表【热议中指的没有被关闭、屏蔽、转议题的话题】
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-17
+ */
+@Data
+public class FactTopicHotdiscussGridDailyDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一标识
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 机关ID
+     */
+	private String agencyId;
+
+    /**
+     * 网格ID 关联网格dm表
+     */
+	private String gridId;
+
+    /**
+     * 日期ID
+     */
+	private String dateId;
+
+    /**
+     * 周ID
+     */
+	private String weekId;
+
+    /**
+     * 月ID
+     */
+	private String monthId;
+
+    /**
+     * 季度ID
+     */
+	private String quarterId;
+
+    /**
+     * 年ID
+     */
+	private String yearId;
+
+    /**
+     * 话题总数
+     */
+	private Integer topicTotal;
+
+    /**
+     * 话题状态【热议中:hot_discuss】
+     */
+	private String status;
+
+    /**
+     * 状态话题数量
+     */
+	private Integer topicCount;
+
+    /**
+     * 删除标识
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/form/TopicStatusFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/form/TopicStatusFormDTO.java
new file mode 100644
index 0000000000..4fd7830330
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/form/TopicStatusFormDTO.java
@@ -0,0 +1,24 @@
+package com.epmet.dto.stats.topic.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author sun
+ * 热议中话题-网格、机关日统计-接口入参
+ */
+@Data
+public class TopicStatusFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -4527492073390715391L;
+
+    /**
+     * 客户Id
+     */
+    private String customerId = "";
+    /**
+     * 需要执行的日期（格式：yyyyMMdd）
+     */
+    private String dateId = "";
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/result/TopicListResultDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/result/TopicListResultDTO.java
new file mode 100644
index 0000000000..01c5f60075
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/topic/result/TopicListResultDTO.java
@@ -0,0 +1,39 @@
+package com.epmet.dto.stats.topic.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author sun
+ * 热议中话题-网格、机关日统计-接口返参
+ */
+@Data
+public class TopicListResultDTO implements Serializable {
+    private static final long serialVersionUID = -7427128491727512781L;
+
+    /**
+     * 客户Id
+     */
+    private String customerId;
+    /**
+     * 话题Id
+     */
+    private String topicId;
+    /**
+     * 网格id
+     */
+    private String gridId;
+    /**
+     * 小组Id
+     */
+    private String groupId;
+    /**
+     * 话题状态（讨论中 - discussing、 已屏蔽 - hidden、  已关闭 - closed）
+     */
+    private String status;
+    /**
+     * 是否转为议题，0:false，1:true
+     * */
+    private Boolean shiftIssue;
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsTopicController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsTopicController.java
index e76badc8a3..6fffd887bc 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsTopicController.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsTopicController.java
@@ -2,6 +2,8 @@ package com.epmet.controller;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.StatsFormDTO;
+import com.epmet.dto.group.form.GroupTotalFormDTO;
+import com.epmet.dto.stats.topic.form.TopicStatusFormDTO;
 import com.epmet.service.StatsTopicService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -27,4 +29,25 @@ public class StatsTopicController {
         statsTopicService.partition(formDTO);
         return new Result();
     }
+
+    /**
+     * @Author sun
+     * @Description 热议中话题-网格日统计
+     **/
+    @PostMapping("gridtopicstatus")
+    public Result gridTopicStatus(@RequestBody(required = false) TopicStatusFormDTO formDTO) {
+        statsTopicService.gridTopicStatus(formDTO);
+        return new Result();
+    }
+
+    /**
+     * @Author sun
+     * @Description 热议中话题-机关日统计
+     **/
+    @PostMapping("agencytopicstatus")
+    public Result agencyTopicStatus(@RequestBody(required = false) TopicStatusFormDTO formDTO) {
+        statsTopicService.agencyTopicStatus(formDTO);
+        return new Result();
+    }
+
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactTopicHotdiscussAgencyDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactTopicHotdiscussAgencyDailyDao.java
new file mode 100644
index 0000000000..a0ea409d91
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactTopicHotdiscussAgencyDailyDao.java
@@ -0,0 +1,38 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.stats;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.stats.FactTopicHotdiscussAgencyDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 热议中话题机关日统计表【热议中指的没有被关闭、屏蔽、转议题的话题】
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-17
+ */
+@Mapper
+public interface FactTopicHotdiscussAgencyDailyDao extends BaseDao<FactTopicHotdiscussAgencyDailyEntity> {
+
+    /**
+     * @Author sun
+     * @Description 根据客户Id、日维度Id批量物理删除一下可能存在的历史数据
+     **/
+    void delTopicAgency(FactTopicHotdiscussAgencyDailyEntity delEntity);
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactTopicHotdiscussGridDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactTopicHotdiscussGridDailyDao.java
new file mode 100644
index 0000000000..6a2237cee6
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactTopicHotdiscussGridDailyDao.java
@@ -0,0 +1,38 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.stats;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.stats.FactTopicHotdiscussGridDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 热议中话题网格日统计表【热议中指的没有被关闭、屏蔽、转议题的话题】
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-17
+ */
+@Mapper
+public interface FactTopicHotdiscussGridDailyDao extends BaseDao<FactTopicHotdiscussGridDailyEntity> {
+
+    /**
+     * @Author sun
+     * @Description 根据客户Id、日维度Id批量物理删除一下可能存在的历史数据
+     **/
+    void delTopicGrid(FactTopicHotdiscussGridDailyEntity delEntity);
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/topic/TopicDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/topic/TopicDao.java
index d9b11ddc6a..4f37200359 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/topic/TopicDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/topic/TopicDao.java
@@ -11,6 +11,7 @@ import com.epmet.dto.group.result.TopicContentResultDTO;
 import com.epmet.dto.screen.ScreenProjectDataDTO;
 import com.epmet.dto.screen.ScreenProjectImgDataDTO;
 import com.epmet.dto.screen.form.ProjectSourceMapFormDTO;
+import com.epmet.dto.stats.topic.result.TopicListResultDTO;
 import com.epmet.dto.topic.ResiTopicDTO;
 import com.epmet.dto.extract.result.TopicInfoResultDTO;
 import com.epmet.dto.topic.TopicOriginInfoDTO;
@@ -142,4 +143,10 @@ public interface TopicDao {
     List<ScreenProjectImgDataDTO> initNewScreenProjectImgData(@Param("customerId") String customerId, @Param("list") List<ScreenProjectDataDTO> list);
 
     ResiTopicAndImgResultDTO getTopicAndImgs(@Param("topicId") String topicId);
+
+    /**
+     * @Author sun
+     * @Description 根据客户Id和截止日期查询话题业务数据
+     **/
+    List<TopicListResultDTO> selectTopicList(@Param("customerId") String customerId, @Param("dateId") String dateId);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactTopicHotdiscussAgencyDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactTopicHotdiscussAgencyDailyEntity.java
new file mode 100644
index 0000000000..4590334147
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactTopicHotdiscussAgencyDailyEntity.java
@@ -0,0 +1,96 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.stats;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 热议中话题机关日统计表【热议中指的没有被关闭、屏蔽、转议题的话题】
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-17
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("fact_topic_hotdiscuss_agency_daily")
+public class FactTopicHotdiscussAgencyDailyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 机构ID 关联机关dm表
+     */
+	private String agencyId;
+
+    /**
+     * 父级机关ID
+     */
+	private String pid;
+
+    /**
+     * 统计日期 关联日期dm表
+     */
+	private String dateId;
+
+    /**
+     * 周ID
+     */
+	private String weekId;
+
+    /**
+     * 月ID
+     */
+	private String monthId;
+
+    /**
+     * 季度ID
+     */
+	private String quarterId;
+
+    /**
+     * 年ID
+     */
+	private String yearId;
+
+    /**
+     * 话题总数
+     */
+	private Integer topicTotal;
+
+    /**
+     * 话题状态【热议中:hot_discuss】
+     */
+	private String status;
+
+    /**
+     * 状态话题数量
+     */
+	private Integer topicCount;
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactTopicHotdiscussGridDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactTopicHotdiscussGridDailyEntity.java
new file mode 100644
index 0000000000..9b1fde9b74
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactTopicHotdiscussGridDailyEntity.java
@@ -0,0 +1,96 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.stats;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 热议中话题网格日统计表【热议中指的没有被关闭、屏蔽、转议题的话题】
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-17
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("fact_topic_hotdiscuss_grid_daily")
+public class FactTopicHotdiscussGridDailyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 机关ID
+     */
+	private String agencyId;
+
+    /**
+     * 网格ID 关联网格dm表
+     */
+	private String gridId;
+
+    /**
+     * 日期ID
+     */
+	private String dateId;
+
+    /**
+     * 周ID
+     */
+	private String weekId;
+
+    /**
+     * 月ID
+     */
+	private String monthId;
+
+    /**
+     * 季度ID
+     */
+	private String quarterId;
+
+    /**
+     * 年ID
+     */
+	private String yearId;
+
+    /**
+     * 话题总数
+     */
+	private Integer topicTotal;
+
+    /**
+     * 话题状态【热议中:hot_discuss】
+     */
+	private String status;
+
+    /**
+     * 状态话题数量
+     */
+	private Integer topicCount;
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsTopicService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsTopicService.java
index 0c17e21420..8a6464c255 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsTopicService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsTopicService.java
@@ -1,6 +1,7 @@
 package com.epmet.service;
 
 import com.epmet.dto.StatsFormDTO;
+import com.epmet.dto.stats.topic.form.TopicStatusFormDTO;
 
 /**
  * @Description 话题统计Service接口
@@ -18,4 +19,16 @@ public interface StatsTopicService {
      * @date 2020.06.28 14:38
      **/
     void partition(StatsFormDTO formDTO);
+
+    /**
+     * @Author sun
+     * @Description 热议中话题-网格日统计
+     **/
+    void gridTopicStatus(TopicStatusFormDTO formDTO);
+
+    /**
+     * @Author sun
+     * @Description 热议中话题-机关日统计
+     **/
+    void agencyTopicStatus(TopicStatusFormDTO formDTO);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginExtractServiceImpl.java
index 62a4950f7b..2ec8212d21 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginExtractServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginExtractServiceImpl.java
@@ -7,7 +7,9 @@ import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.dto.extract.form.ExtractOriginFormDTO;
 import com.epmet.dto.group.form.GroupTotalFormDTO;
 import com.epmet.dto.stats.form.CustomerIdAndDateIdFormDTO;
+import com.epmet.dto.stats.topic.form.TopicStatusFormDTO;
 import com.epmet.service.StatsGroupService;
+import com.epmet.service.StatsTopicService;
 import com.epmet.service.evaluationindex.extract.todata.*;
 import com.epmet.service.stats.DimCustomerPartymemberService;
 import com.epmet.service.stats.DimCustomerService;
@@ -54,6 +56,8 @@ public class FactOriginExtractServiceImpl implements FactOriginExtractService {
     private  FactGroupActDailyService factGroupActDailyService;
     @Autowired
     private StatsGroupService statsGroupService;
+    @Autowired
+    private StatsTopicService statsTopicService;
 
 
     @Override
@@ -263,6 +267,36 @@ public class FactOriginExtractServiceImpl implements FactOriginExtractService {
             }
         });
 
+        //热议中话题网格、机关日统计
+        threadPool.submit(() -> {
+            TopicStatusFormDTO formDTO = new TopicStatusFormDTO();
+            formDTO.setCustomerId(param.getCustomerId());
+            if (!isRange) {
+                formDTO.setDateId(param.getDateId());
+                try {
+                    statsTopicService.gridTopicStatus(formDTO);
+                } catch (Exception e) {
+                    log.error("热议中话题-网格日统计计算错误,参数:" + JSON.toJSONString(formDTO), e);
+                }
+                try {
+                    statsTopicService.agencyTopicStatus(formDTO);
+                } catch (Exception e) {
+                    log.error("热议中话题-机关日统计计算错误,参数:" + JSON.toJSONString(formDTO), e);
+                }
+            } else {
+                try {
+                    statsTopicService.gridTopicStatus(formDTO);
+                } catch (Exception e) {
+                    log.error("热议中话题-网格日统计计算错误,参数:" + JSON.toJSONString(formDTO), e);
+                }
+                try {
+                    statsTopicService.agencyTopicStatus(formDTO);
+                } catch (Exception e) {
+                    log.error("热议中话题-机关日统计计算错误,参数:" + JSON.toJSONString(formDTO), e);
+                }
+            }
+        });
+
         submitProjectRelationData(param, finalDaysBetween);
     }
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java
index f222a9ee8e..50382aa75e 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java
@@ -583,11 +583,11 @@ public class StatsGroupServiceImpl implements StatsGroupService {
             FactGroupTotalAgencyDailyEntity delEntity = new FactGroupTotalAgencyDailyEntity();
             delEntity.setCustomerId(customerId);
             delEntity.setDateId(dimId.getDateId());
-            log.info("StatsGroupServiceImpl.agencyGroupStats-根据客户Id、日维度Id批量删除小组总数网格日统计表数据,对应客户Id:" + customerId + ",日维度Id:" + dimId.getDateId());
+            log.info("StatsGroupServiceImpl.agencyGroupStats-根据客户Id、日维度Id批量删除小组总数机关日统计表数据,对应客户Id:" + customerId + ",日维度Id:" + dimId.getDateId());
             factGroupTotalAgencyDailyService.delDateGroupTotal(delEntity);
 
-            //5.2:批量保存网格日统计数据
-            log.info("StatsGroupServiceImpl.agencyGroupStats-批量新增小组总数网格日统计表数据,对应客户Id:" + customerId + ",日维度Id:" + dimId.getDateId());
+            //5.2:批量保存机关日统计数据
+            log.info("StatsGroupServiceImpl.agencyGroupStats-批量新增小组总数机关日统计表数据,对应客户Id:" + customerId + ",日维度Id:" + dimId.getDateId());
             factGroupTotalAgencyDailyService.insertBatch(list);
         }
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsTopicServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsTopicServiceImpl.java
index 423c47174e..74e0c8615b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsTopicServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsTopicServiceImpl.java
@@ -6,12 +6,15 @@ import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.ProjectConstant;
 import com.epmet.dto.AgencySubTreeDto;
 import com.epmet.dto.StatsFormDTO;
+import com.epmet.dto.stats.DimAgencyDTO;
 import com.epmet.dto.stats.DimTopicStatusDTO;
+import com.epmet.dto.stats.topic.form.TopicStatusFormDTO;
+import com.epmet.dto.stats.topic.result.TopicListResultDTO;
 import com.epmet.dto.stats.topic.result.TopicStatisticalData;
+import com.epmet.entity.evaluationindex.extract.FactOriginGroupMainDailyEntity;
+import com.epmet.entity.stats.*;
 import com.epmet.service.StatsTopicService;
-import com.epmet.service.stats.DimAgencyService;
-import com.epmet.service.stats.DimCustomerService;
-import com.epmet.service.stats.DimTopicStatusService;
+import com.epmet.service.stats.*;
 import com.epmet.service.stats.topic.TopicStatisticalService;
 import com.epmet.service.topic.TopicService;
 import com.epmet.util.DimIdGenerator;
@@ -23,7 +26,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * @Description 话题统计Service
@@ -35,21 +40,22 @@ import java.util.*;
 public class StatsTopicServiceImpl implements StatsTopicService {
 
     protected static final Logger log = LoggerFactory.getLogger(StatsTopicServiceImpl.class);
-
     @Autowired
     private DimCustomerService dimCustomerService;
-
     @Autowired
     private DimAgencyService dimAgencyService;
-
     @Autowired
     private DimTopicStatusService dimTopicStatusService;
-
     @Autowired
     private TopicService topicService;
-
     @Autowired
     private TopicStatisticalService topicStatisticalService;
+    @Autowired
+    private DimGridService dimGridService;
+    @Autowired
+    private FactTopicHotdiscussGridDailyService factTopicHotdiscussGridDailyService;
+    @Autowired
+    private FactTopicHotdiscussAgencyDailyService factTopicHotdiscussAgencyDailyService;
 
     /**
      * @param formDTO 如果目标日期为空，则自动计算为T-1天
@@ -122,4 +128,232 @@ public class StatsTopicServiceImpl implements StatsTopicService {
         }
 
     }
+
+    /**
+     * @Author sun
+     * @Description 热议中话题-网格日统计
+     **/
+    @Override
+    public void gridTopicStatus(TopicStatusFormDTO formDTO) {
+        //入参有日期的则按具体时间执行,没有的则按当前时间前一天执行
+        if (StringUtils.isBlank(formDTO.getDateId())) {
+            Date yesterday = DateUtils.addDateDays(new Date(), -1);
+            SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD);
+            formDTO.setDateId(format.format(yesterday));
+        }
+        //入参有客户Id的则按客户Id执行，没有的则全部客户都执行
+        if (null != formDTO && StringUtils.isNotBlank(formDTO.getCustomerId())) {
+            log.info("热议中话题网格日统计数据，当前统计的客户Id:" + formDTO.getCustomerId());
+            gridTopic(formDTO.getCustomerId(), formDTO.getDateId());
+        } else {
+            int pageNo = 1;
+            int pageSize = 100;
+            List<String> customerIdList = null;
+            do {
+                //获取有效客户列表
+                customerIdList = dimCustomerService.selectCustomerIdPage(pageNo++, pageSize);
+                if (!CollectionUtils.isEmpty(customerIdList)) {
+                    for (String customerId : customerIdList) {
+                        try {
+                            log.info("for循环统计热议中话题网格日统计数据，当前统计的客户Id:" + customerId);
+                            //遍历统计每一个客户数据
+                            gridTopic(customerId, formDTO.getDateId());
+                        } catch (Exception e) {
+                            log.error("热议中话题-网格日统计-程序错误，对应客户Id:" + customerId, e);
+                            log.error("Error creating model JSON", e);
+                        }
+                    }
+                }
+            } while (!CollectionUtils.isEmpty(customerIdList) && customerIdList.size() == pageSize);
+        }
+
+    }
+
+    /**
+     * @Author sun
+     * @Description 热议中话题-网格日统计
+     **/
+    private void gridTopic(String customerId, String dateId) {
+        //1:查询各维度表Id,方便使用
+        Date date = DateUtils.parseDate(dateId,DateUtils.DATE_PATTERN_YYYYMMDD);
+        DimIdGenerator.DimIdBean dimId = DimIdGenerator.getDimIdBean(date);
+
+        //2:根据客户Id查询网格维度表数据
+        log.info("StatsGroupServiceImpl.customerGridStats-根据客户Id查询网格维度数据，对应客户Id:" + customerId);
+        List<DimGridEntity> dimGridList = dimGridService.getGridListByCustomerId(customerId);
+
+        //3.根据客户Id查询客户下有效的话题数据,查询dateId之前的数据
+        List<TopicListResultDTO> list = topicService.getTopicList(customerId, dateId);
+
+        //4.遍历封装数据
+        List<FactTopicHotdiscussGridDailyEntity> saveList = new ArrayList<>();
+        dimGridList.forEach(grid->{
+            FactTopicHotdiscussGridDailyEntity entity = new FactTopicHotdiscussGridDailyEntity();
+            AtomicInteger total = new AtomicInteger(0);
+            AtomicInteger num = new AtomicInteger(0);
+            list.forEach(l->{
+                if(grid.getId().equals(l.getGridId()) ){
+                    total.addAndGet(1);
+                    if(l.getStatus().equals("discussing") && !l.getShiftIssue()){
+                        num.addAndGet(1);
+                    }
+                }
+            });
+            entity.setCustomerId(customerId);
+            entity.setAgencyId(grid.getAgencyId());
+            entity.setGridId(grid.getId());
+            entity.setDateId(dimId.getDateId());
+            entity.setWeekId(dimId.getWeekId());
+            entity.setMonthId(dimId.getMonthId());
+            entity.setQuarterId(dimId.getQuarterId());
+            entity.setYearId(dimId.getYearId());
+            entity.setTopicTotal(total.get());
+            entity.setStatus("hot_discuss");
+            entity.setTopicCount(num.get());
+            saveList.add(entity);
+        });
+
+        //5.批量插入数据库，先删后增的逻辑
+        if (!CollectionUtils.isEmpty(saveList)) {
+            //5.1:根据客户Id、日维度Id批量物理删除一下可能存在的历史数据
+            FactTopicHotdiscussGridDailyEntity delEntity = new FactTopicHotdiscussGridDailyEntity();
+            delEntity.setCustomerId(customerId);
+            delEntity.setDateId(dimId.getDateId());
+            factTopicHotdiscussGridDailyService.delTopicGrid(delEntity);
+
+            //5.2:批量保存网格日统计数据
+            log.info("StatsTopicServiceImpl.gridTopic-批量新增热议中话题网格日统计表数据,对应客户Id:" + customerId + ",日维度Id:" + dimId.getDateId());
+            factTopicHotdiscussGridDailyService.insertBatch(saveList);
+        }
+
+    }
+
+    /**
+     * @Author sun
+     * @Description 热议中话题-机关日统计
+     **/
+    @Override
+    public void agencyTopicStatus(TopicStatusFormDTO formDTO) {
+        //入参有日期的则按具体时间执行,没有的则按当前时间前一天执行
+        if (StringUtils.isBlank(formDTO.getDateId())) {
+            Date yesterday = DateUtils.addDateDays(new Date(), -1);
+            SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD);
+            formDTO.setDateId(format.format(yesterday));
+        }
+        //入参有客户Id的则按客户Id执行，没有的则全部客户都执行
+        if (null != formDTO && StringUtils.isNotBlank(formDTO.getCustomerId())) {
+            log.info("单独统计客户组织下热议中话题日统计数据，当前统计的客户Id:" + formDTO.getCustomerId());
+            agencyTopic(formDTO.getCustomerId(), formDTO.getDateId());
+        } else {
+            int pageNo = 1;
+            int pageSize = 100;
+            List<String> customerIdList = null;
+            do {
+                customerIdList = dimCustomerService.selectCustomerIdPage(pageNo++, pageSize);
+                if (!CollectionUtils.isEmpty(customerIdList)) {
+                    for (String customerId : customerIdList) {
+                        try {
+                            log.info("for循环统计机关热议中话题日统计数据，当前统计的客户Id:" + customerId);
+                            //遍历统计每一个客户数据
+                            agencyTopic(customerId, formDTO.getDateId());
+                        } catch (Exception e) {
+                            log.error("热议中话题机关日统计程序错误，对应客户Id:" + customerId, e);
+                            log.error("Error creating model JSON", e);
+                        }
+                    }
+                }
+            } while (!CollectionUtils.isEmpty(customerIdList) && customerIdList.size() == pageSize);
+        }
+
+    }
+
+    /**
+     * @Author sun
+     * @Description 热议中话题-机关日统计数据
+     **/
+    private void agencyTopic(String customerId, String dateId) {
+        //1:查询各维度表Id,方便使用
+        Date date = DateUtils.parseDate(dateId,DateUtils.DATE_PATTERN_YYYYMMDD);
+        DimIdGenerator.DimIdBean dimId = DimIdGenerator.getDimIdBean(date);
+
+        //2:根据客户Id查询机关维度表数据
+        log.info("StatsTopicServiceImpl.agencyTopic-根据客户Id查询机关维度数据，对应客户Id:" + customerId);
+        DimAgencyDTO dimAgencyDTO = new DimAgencyDTO();
+        dimAgencyDTO.setCustomerId(customerId);
+        List<DimAgencyDTO> agencyList = dimAgencyService.getDimAgencyList(dimAgencyDTO);
+
+        //3.根据客户Id查询网格维度表数据
+        List<DimGridEntity> gridList = dimGridService.getGridListByCustomerId(customerId);
+
+        //4..根据客户Id查询客户下有效的话题数据,查询dateId之前的数据
+        List<TopicListResultDTO> groupList = topicService.getTopicList(customerId, dateId);
+
+        List<FactTopicHotdiscussAgencyDailyEntity> list = new ArrayList<>();
+        //5.遍历组织维度数据分别计算每个组织下话题数据
+        DimIdGenerator.DimIdBean finalDimId = dimId;
+        agencyList.forEach(agency->{
+            FactTopicHotdiscussAgencyDailyEntity entity = new FactTopicHotdiscussAgencyDailyEntity();
+            //5-1.汇总组织及所有下级组织列表
+            Map<String, String> map = new HashMap<>();
+            map.put(agency.getId(), agency.getId());
+            String subPids = ((null == agency.getPids() || "".equals(agency.getPids())) ? agency.getId() : agency.getPids() + ":" + agency.getId());
+            agencyList.forEach(sub -> {
+                if (sub.getPids().contains(subPids)) {
+                    map.put(sub.getId(), sub.getId());
+                }
+            });
+
+            //5-2.汇总组织及下级所有的网格列表
+            List<String> agencyGridList = new ArrayList<>();
+            gridList.forEach(grid->{
+                if (map.containsKey(grid.getAgencyId())) {
+                    agencyGridList.add(grid.getId());
+                }
+            });
+
+            AtomicInteger total = new AtomicInteger(0);
+            AtomicInteger num = new AtomicInteger(0);
+            //5-3.根据汇总的网格列表统计对应的群组数据
+            agencyGridList.forEach(gridId -> {
+                groupList.forEach(l -> {
+                    if (gridId.equals(l.getGridId())) {
+                        total.addAndGet(1);
+                        if(l.getStatus().equals("discussing") && !l.getShiftIssue()){
+                            num.addAndGet(1);
+                        }
+                    }
+                });
+            });
+            //封装数据
+            entity.setCustomerId(agency.getCustomerId());
+            entity.setAgencyId(agency.getId());
+            entity.setPid(agency.getPid());
+            entity.setDateId(finalDimId.getDateId());
+            entity.setWeekId(finalDimId.getWeekId());
+            entity.setMonthId(finalDimId.getMonthId());
+            entity.setQuarterId(finalDimId.getQuarterId());
+            entity.setYearId(finalDimId.getYearId());
+            entity.setTopicTotal(total.get());
+            entity.setStatus("hot_discuss");
+            entity.setTopicCount(num.get());
+            list.add(entity);
+        });
+
+        //6.批量插入数据库，先删后增的逻辑
+        if (!CollectionUtils.isEmpty(list)) {
+            //5.1:根据客户Id、日维度Id批量物理删除一下可能存在的历史数据
+            FactTopicHotdiscussAgencyDailyEntity delEntity = new FactTopicHotdiscussAgencyDailyEntity();
+            delEntity.setCustomerId(customerId);
+            delEntity.setDateId(dimId.getDateId());
+            log.info("StatsTopicServiceImpl.agencyTopic-根据客户Id、日维度Id批量删除热议中话题机关日统计表数据,对应客户Id:" + customerId + ",日维度Id:" + dimId.getDateId());
+            factTopicHotdiscussAgencyDailyService.delTopicAgency(delEntity);
+
+            //5.2:批量保存机关日统计数据
+            log.info("StatsTopicServiceImpl.agencyTopic-批量新增小组总数网格日统计表数据,对应客户Id:" + customerId + ",日维度Id:" + dimId.getDateId());
+            factTopicHotdiscussAgencyDailyService.insertBatch(list);
+        }
+
+    }
+
+
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactTopicHotdiscussAgencyDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactTopicHotdiscussAgencyDailyService.java
new file mode 100644
index 0000000000..7e60409a73
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactTopicHotdiscussAgencyDailyService.java
@@ -0,0 +1,101 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.stats;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.stats.topic.FactTopicHotdiscussAgencyDailyDTO;
+import com.epmet.entity.stats.FactTopicHotdiscussAgencyDailyEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 热议中话题机关日统计表【热议中指的没有被关闭、屏蔽、转议题的话题】
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-17
+ */
+public interface FactTopicHotdiscussAgencyDailyService extends BaseService<FactTopicHotdiscussAgencyDailyEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<FactTopicHotdiscussAgencyDailyDTO>
+     * @author generator
+     * @date 2021-05-17
+     */
+    PageData<FactTopicHotdiscussAgencyDailyDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<FactTopicHotdiscussAgencyDailyDTO>
+     * @author generator
+     * @date 2021-05-17
+     */
+    List<FactTopicHotdiscussAgencyDailyDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return FactTopicHotdiscussAgencyDailyDTO
+     * @author generator
+     * @date 2021-05-17
+     */
+    FactTopicHotdiscussAgencyDailyDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-05-17
+     */
+    void save(FactTopicHotdiscussAgencyDailyDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-05-17
+     */
+    void update(FactTopicHotdiscussAgencyDailyDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-05-17
+     */
+    void delete(String[] ids);
+
+    /**
+     * @Author sun
+     * @Description 根据客户Id、日维度Id批量物理删除一下可能存在的历史数据
+     **/
+    void delTopicAgency(FactTopicHotdiscussAgencyDailyEntity delEntity);
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactTopicHotdiscussGridDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactTopicHotdiscussGridDailyService.java
new file mode 100644
index 0000000000..e7a3fbfe0a
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactTopicHotdiscussGridDailyService.java
@@ -0,0 +1,101 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.stats;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.stats.topic.FactTopicHotdiscussGridDailyDTO;
+import com.epmet.entity.stats.FactTopicHotdiscussGridDailyEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 热议中话题网格日统计表【热议中指的没有被关闭、屏蔽、转议题的话题】
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-17
+ */
+public interface FactTopicHotdiscussGridDailyService extends BaseService<FactTopicHotdiscussGridDailyEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<FactTopicHotdiscussGridDailyDTO>
+     * @author generator
+     * @date 2021-05-17
+     */
+    PageData<FactTopicHotdiscussGridDailyDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<FactTopicHotdiscussGridDailyDTO>
+     * @author generator
+     * @date 2021-05-17
+     */
+    List<FactTopicHotdiscussGridDailyDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return FactTopicHotdiscussGridDailyDTO
+     * @author generator
+     * @date 2021-05-17
+     */
+    FactTopicHotdiscussGridDailyDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-05-17
+     */
+    void save(FactTopicHotdiscussGridDailyDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-05-17
+     */
+    void update(FactTopicHotdiscussGridDailyDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-05-17
+     */
+    void delete(String[] ids);
+
+    /**
+     * @Author sun
+     * @Description 根据客户Id、日维度Id批量物理删除一下可能存在的历史数据
+     **/
+    void delTopicGrid(FactTopicHotdiscussGridDailyEntity delEntity);
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactTopicHotdiscussAgencyDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactTopicHotdiscussAgencyDailyServiceImpl.java
new file mode 100644
index 0000000000..af5f866943
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactTopicHotdiscussAgencyDailyServiceImpl.java
@@ -0,0 +1,109 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.stats.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.dao.stats.FactTopicHotdiscussAgencyDailyDao;
+import com.epmet.dto.stats.topic.FactTopicHotdiscussAgencyDailyDTO;
+import com.epmet.entity.stats.FactTopicHotdiscussAgencyDailyEntity;
+import com.epmet.service.stats.FactTopicHotdiscussAgencyDailyService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 热议中话题机关日统计表【热议中指的没有被关闭、屏蔽、转议题的话题】
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-17
+ */
+@Service
+public class FactTopicHotdiscussAgencyDailyServiceImpl extends BaseServiceImpl<FactTopicHotdiscussAgencyDailyDao, FactTopicHotdiscussAgencyDailyEntity> implements FactTopicHotdiscussAgencyDailyService {
+
+
+    @Override
+    public PageData<FactTopicHotdiscussAgencyDailyDTO> page(Map<String, Object> params) {
+        IPage<FactTopicHotdiscussAgencyDailyEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, FactTopicHotdiscussAgencyDailyDTO.class);
+    }
+
+    @Override
+    public List<FactTopicHotdiscussAgencyDailyDTO> list(Map<String, Object> params) {
+        List<FactTopicHotdiscussAgencyDailyEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, FactTopicHotdiscussAgencyDailyDTO.class);
+    }
+
+    private QueryWrapper<FactTopicHotdiscussAgencyDailyEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<FactTopicHotdiscussAgencyDailyEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public FactTopicHotdiscussAgencyDailyDTO get(String id) {
+        FactTopicHotdiscussAgencyDailyEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, FactTopicHotdiscussAgencyDailyDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(FactTopicHotdiscussAgencyDailyDTO dto) {
+        FactTopicHotdiscussAgencyDailyEntity entity = ConvertUtils.sourceToTarget(dto, FactTopicHotdiscussAgencyDailyEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(FactTopicHotdiscussAgencyDailyDTO dto) {
+        FactTopicHotdiscussAgencyDailyEntity entity = ConvertUtils.sourceToTarget(dto, FactTopicHotdiscussAgencyDailyEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+    /**
+     * @Author sun
+     * @Description 根据客户Id、日维度Id批量物理删除一下可能存在的历史数据
+     **/
+    @Override
+    public void delTopicAgency(FactTopicHotdiscussAgencyDailyEntity delEntity) {
+        baseDao.delTopicAgency(delEntity);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactTopicHotdiscussGridDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactTopicHotdiscussGridDailyServiceImpl.java
new file mode 100644
index 0000000000..697143bfd2
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactTopicHotdiscussGridDailyServiceImpl.java
@@ -0,0 +1,109 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.stats.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.dao.stats.FactTopicHotdiscussGridDailyDao;
+import com.epmet.dto.stats.topic.FactTopicHotdiscussGridDailyDTO;
+import com.epmet.entity.stats.FactTopicHotdiscussGridDailyEntity;
+import com.epmet.service.stats.FactTopicHotdiscussGridDailyService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 热议中话题网格日统计表【热议中指的没有被关闭、屏蔽、转议题的话题】
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-17
+ */
+@Service
+public class FactTopicHotdiscussGridDailyServiceImpl extends BaseServiceImpl<FactTopicHotdiscussGridDailyDao, FactTopicHotdiscussGridDailyEntity> implements FactTopicHotdiscussGridDailyService {
+
+
+    @Override
+    public PageData<FactTopicHotdiscussGridDailyDTO> page(Map<String, Object> params) {
+        IPage<FactTopicHotdiscussGridDailyEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, FactTopicHotdiscussGridDailyDTO.class);
+    }
+
+    @Override
+    public List<FactTopicHotdiscussGridDailyDTO> list(Map<String, Object> params) {
+        List<FactTopicHotdiscussGridDailyEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, FactTopicHotdiscussGridDailyDTO.class);
+    }
+
+    private QueryWrapper<FactTopicHotdiscussGridDailyEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<FactTopicHotdiscussGridDailyEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public FactTopicHotdiscussGridDailyDTO get(String id) {
+        FactTopicHotdiscussGridDailyEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, FactTopicHotdiscussGridDailyDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(FactTopicHotdiscussGridDailyDTO dto) {
+        FactTopicHotdiscussGridDailyEntity entity = ConvertUtils.sourceToTarget(dto, FactTopicHotdiscussGridDailyEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(FactTopicHotdiscussGridDailyDTO dto) {
+        FactTopicHotdiscussGridDailyEntity entity = ConvertUtils.sourceToTarget(dto, FactTopicHotdiscussGridDailyEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+    /**
+     * @Author sun
+     * @Description 根据客户Id、日维度Id批量物理删除一下可能存在的历史数据
+     **/
+    @Override
+    public void delTopicGrid(FactTopicHotdiscussGridDailyEntity delEntity) {
+        baseDao.delTopicGrid(delEntity);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/topic/TopicService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/topic/TopicService.java
index 475fb886c7..78a823b155 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/topic/TopicService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/topic/TopicService.java
@@ -6,6 +6,7 @@ import com.epmet.dto.screen.ScreenProjectDataDTO;
 import com.epmet.dto.screen.ScreenProjectImgDataDTO;
 import com.epmet.dto.screen.form.ProjectSourceMapFormDTO;
 import com.epmet.dto.stats.DimTopicStatusDTO;
+import com.epmet.dto.stats.topic.result.TopicListResultDTO;
 import com.epmet.dto.stats.topic.result.TopicStatisticalData;
 import com.epmet.dto.topic.ResiTopicDTO;
 import com.epmet.dto.topic.TopicOriginInfoDTO;
@@ -116,4 +117,10 @@ public interface TopicService {
      * @date 2021/4/13 5:39 下午
      */
     ResiTopicAndImgResultDTO getTopicAndImgs(String topicId,String attachmentType);
+
+    /**
+     * @Author sun
+     * @Description 根据客户Id和截止日期查询话题业务数据
+     **/
+    List<TopicListResultDTO> getTopicList(String customerId, String dateId);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java
index 0b74adba49..a47baa85bd 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java
@@ -14,6 +14,7 @@ import com.epmet.dto.screen.form.ProjectSourceMapFormDTO;
 import com.epmet.dto.stats.DimTopicStatusDTO;
 import com.epmet.dto.stats.topic.*;
 import com.epmet.dto.stats.topic.result.GroupTopicData;
+import com.epmet.dto.stats.topic.result.TopicListResultDTO;
 import com.epmet.dto.stats.topic.result.TopicStatisticalData;
 import com.epmet.dto.topic.ResiTopicDTO;
 import com.epmet.dto.topic.TopicOriginInfoDTO;
@@ -1413,4 +1414,14 @@ public class TopicServiceImpl implements TopicService {
     public List<TopicOriginInfoDTO> queryTopicOriginInfoList(String customerId, String dateId) {
         return topicDao.selectListTopicOriginInfo(customerId, dateId);
     }
+
+    /**
+     * @Author sun
+     * @Description 根据客户Id和截止日期查询话题业务数据
+     **/
+    @Override
+    public List<TopicListResultDTO> getTopicList(String customerId, String dateId) {
+        return topicDao.selectTopicList(customerId, dateId);
+    }
+
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactTopicHotdiscussAgencyDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactTopicHotdiscussAgencyDailyDao.xml
new file mode 100644
index 0000000000..27d63b02e0
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactTopicHotdiscussAgencyDailyDao.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.stats.FactTopicHotdiscussAgencyDailyDao">
+
+    <delete id="delTopicAgency">
+        DELETE
+        FROM
+            fact_topic_hotdiscuss_agency_daily
+        WHERE
+            customer_id = #{customerId}
+        AND date_id = #{dateId}
+    </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactTopicHotdiscussGridDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactTopicHotdiscussGridDailyDao.xml
new file mode 100644
index 0000000000..f82d421f42
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactTopicHotdiscussGridDailyDao.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.stats.FactTopicHotdiscussGridDailyDao">
+
+    <delete id="delTopicGrid">
+        DELETE
+        FROM
+            fact_topic_hotdiscuss_grid_daily
+        WHERE
+            customer_id = #{customerId}
+        AND date_id = #{dateId}
+    </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/topic/TopicDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/topic/TopicDao.xml
index 8dfb2aae2e..ae18ea2b7c 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/topic/TopicDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/topic/TopicDao.xml
@@ -307,4 +307,23 @@
             AND ATTACHMENT_TYPE = 'image'
             and TOPIC_ID = #{topicId}
     </select>
+
+    <select id="selectTopicList" resultType="com.epmet.dto.stats.topic.result.TopicListResultDTO">
+        SELECT
+            rt.id AS topicId,
+            rt.group_id AS groupId,
+            rt.`status` AS STATUS,
+            rt.shift_issue AS shiftIssue,
+            rg.grid_id AS gridId,
+            rg.customer_id AS customerId
+        FROM
+            resi_topic rt
+        INNER JOIN resi_group rg ON rt.group_id = rg.id
+        WHERE
+            rt.del_flag = '0'
+        AND rg.del_flag = '0'
+        AND rg.customer_id = #{customerId}
+        AND DATE_FORMAT(rt.created_time ,'%Y%m%d') <![CDATA[ <= ]]> #{dateId}
+    </select>
+
 </mapper>

From 417f41056480f578ea013598c06e3aa8f4d602c1 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 18 May 2021 10:59:21 +0800
Subject: [PATCH 028/128] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E6=80=BB=E6=95=B0?=
 =?UTF-8?q?=E3=80=81=E7=83=AD=E8=AE=AE=E8=AF=9D=E9=A2=98=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?sql=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../V0.0.13__group_and_topic_stats.sql        | 87 +++++++++++++++++++
 1 file changed, 87 insertions(+)
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.13__group_and_topic_stats.sql

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.13__group_and_topic_stats.sql b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.13__group_and_topic_stats.sql
new file mode 100644
index 0000000000..5e2b260221
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.13__group_and_topic_stats.sql
@@ -0,0 +1,87 @@
+CREATE TABLE `fact_group_total_agency_daily` (
+  `ID` varchar(64) NOT NULL COMMENT '唯一标识',
+  `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',
+  `AGENCY_ID` varchar(64) NOT NULL COMMENT '机构ID 关联机关dim表',
+  `PID` varchar(64) DEFAULT NULL COMMENT '父级机关ID',
+  `DATE_ID` varchar(32) NOT NULL COMMENT '统计日期 关联日期dim表',
+  `WEEK_ID` varchar(32) NOT NULL COMMENT '周ID',
+  `MONTH_ID` varchar(32) NOT NULL COMMENT '月份ID',
+  `QUARTER_ID` varchar(32) NOT NULL COMMENT '季度ID',
+  `YEAR_ID` varchar(32) NOT NULL COMMENT '年ID',
+  `GROUP_TOTAL` int(11) DEFAULT '0' COMMENT '当前组织及下级小组总数',
+  `ORDINARY_TOTAL` int(11) DEFAULT NULL COMMENT '当前组织及下级楼院小组总数',
+  `BRANCH_TOTAL` int(11) DEFAULT NULL COMMENT '当前组织及下级支部小组总数',
+  `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识 未删除：0,已删除：1',
+  `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁',
+  `CREATED_BY` varchar(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='小组总数-机关日统计表';
+
+CREATE TABLE `fact_group_total_grid_daily` (
+  `ID` varchar(64) NOT NULL COMMENT '唯一标识',
+  `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',
+  `AGENCY_ID` varchar(64) NOT NULL COMMENT '机构ID 关联机关dim表',
+  `GRID_ID` varchar(64) NOT NULL COMMENT '网格ID',
+  `DATE_ID` varchar(32) NOT NULL COMMENT '统计日期 关联日期dim表',
+  `WEEK_ID` varchar(32) NOT NULL COMMENT '周ID',
+  `MONTH_ID` varchar(32) NOT NULL COMMENT '月份ID',
+  `QUARTER_ID` varchar(32) NOT NULL COMMENT '季度ID',
+  `YEAR_ID` varchar(32) NOT NULL COMMENT '年ID',
+  `GROUP_TOTAL` int(11) DEFAULT '0' COMMENT '网格下小组总数',
+  `ORDINARY_TOTAL` int(11) DEFAULT NULL COMMENT '网格下楼院小组总数',
+  `BRANCH_TOTAL` int(11) DEFAULT NULL COMMENT '网格下支部小组总数',
+  `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识 未删除：0,已删除：1',
+  `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁',
+  `CREATED_BY` varchar(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='小组总数-网格日统计表';
+
+CREATE TABLE `fact_topic_hotdiscuss_agency_daily` (
+  `ID` varchar(64) NOT NULL COMMENT '唯一标识',
+  `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',
+  `AGENCY_ID` varchar(64) NOT NULL COMMENT '机构ID 关联机关dm表',
+  `PID` varchar(64) NOT NULL COMMENT '父级机关ID',
+  `DATE_ID` varchar(32) NOT NULL COMMENT '统计日期 关联日期dm表',
+  `WEEK_ID` varchar(32) NOT NULL COMMENT '周ID',
+  `MONTH_ID` varchar(32) NOT NULL COMMENT '月ID',
+  `QUARTER_ID` varchar(32) NOT NULL COMMENT '季度ID',
+  `YEAR_ID` varchar(32) NOT NULL COMMENT '年ID',
+  `TOPIC_TOTAL` int(11) DEFAULT '0' COMMENT '话题总数',
+  `STATUS` varchar(32) DEFAULT NULL COMMENT '话题状态【热议中:hot_discuss】',
+  `TOPIC_COUNT` int(11) DEFAULT '0' COMMENT '状态话题数量',
+  `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识',
+  `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`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='热议中话题机关日统计表【热议中指的没有被关闭、屏蔽、转议题的话题】';
+
+CREATE TABLE `fact_topic_hotdiscuss_grid_daily` (
+  `ID` varchar(64) NOT NULL COMMENT '唯一标识',
+  `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',
+  `AGENCY_ID` varchar(64) NOT NULL COMMENT '机关ID',
+  `GRID_ID` varchar(64) NOT NULL COMMENT '网格ID 关联网格dm表',
+  `DATE_ID` varchar(32) NOT NULL COMMENT '日期ID',
+  `WEEK_ID` varchar(32) NOT NULL COMMENT '周ID',
+  `MONTH_ID` varchar(32) NOT NULL COMMENT '月ID',
+  `QUARTER_ID` varchar(32) NOT NULL COMMENT '季度ID',
+  `YEAR_ID` varchar(32) NOT NULL COMMENT '年ID',
+  `TOPIC_TOTAL` int(11) DEFAULT '0' COMMENT '话题总数',
+  `STATUS` varchar(32) DEFAULT NULL COMMENT '话题状态【热议中:hot_discuss】',
+  `TOPIC_COUNT` int(11) DEFAULT '0' COMMENT '状态话题数量',
+  `DEL_FLAG` varchar(32) NOT NULL DEFAULT '0' COMMENT '删除标识',
+  `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`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='热议中话题网格日统计表【热议中指的没有被关闭、屏蔽、转议题的话题】';
\ No newline at end of file

From a54d1ce689e3750daee37e0090c111c969297324 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 18 May 2021 14:06:30 +0800
Subject: [PATCH 029/128] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE-?=
 =?UTF-8?q?=E6=B6=89=E5=8F=8A=E8=AF=9D=E9=A2=98=E6=95=B0=E6=8D=AE=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E7=9A=84=E9=87=8D=E6=96=B0=E8=B0=83=E6=95=B4=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/datastats/form/SubAgencyFormDTO.java  |  2 +
 .../dto/datastats/form/SubGridFormDTO.java    |  2 +
 .../result/AgencyBasicDataResultDTO.java      |  2 +
 .../dataaggre/dao/datastats/DataStatsDao.java | 18 +++++++
 .../datastats/impl/DataStatsServiceImpl.java  | 47 ++++++++++++-------
 .../mapper/datastats/DatsStatsDao.xml         | 43 +++++++++++++++++
 6 files changed, 96 insertions(+), 18 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubAgencyFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubAgencyFormDTO.java
index d5d3d8a66a..4789d534dd 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubAgencyFormDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubAgencyFormDTO.java
@@ -38,6 +38,8 @@ public class SubAgencyFormDTO implements Serializable {
     public static class Topic implements Serializable {
         //组织Id
         private String agencyId;
+        //话题总量
+        private Integer topicTotal;
         //话题数量
         private Integer topicCount;
         //话题状态 已关闭：closed、已屏蔽：hidden、 讨论中：discussing
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubGridFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubGridFormDTO.java
index d429b47b7c..51e790560c 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubGridFormDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubGridFormDTO.java
@@ -38,6 +38,8 @@ public class SubGridFormDTO implements Serializable {
     public static class Topic implements Serializable {
         //网格Id
         private String gridId;
+        //话题总量
+        private Integer topicTotal;
         //话题数量
         private Integer topicCount;
         //话题状态 已关闭：closed、已屏蔽：hidden、 讨论中：discussing
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/AgencyBasicDataResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/AgencyBasicDataResultDTO.java
index ad7869fd0b..d2202643c8 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/AgencyBasicDataResultDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/AgencyBasicDataResultDTO.java
@@ -81,6 +81,8 @@ public class AgencyBasicDataResultDTO implements Serializable {
 
     @Data
     public static class Topic implements Serializable {
+        //话题总量
+        private Integer topicTotal;
         //话题数量
         private Integer topicCount;
         //话题状态 已关闭：closed、已屏蔽：hidden、 讨论中：discussing
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
index c96b053cba..d84e733e50 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
@@ -58,6 +58,12 @@ public interface DataStatsDao {
      */
     AgencyBasicDataResultDTO.Topic getAgencyTopicShiftIssue(@Param("agencyId") String agencyId, @Param("dateId") String dateId);
 
+    /**
+     * @Description 热议中话题-机关日统计数据
+     * @author sun
+     */
+    AgencyBasicDataResultDTO.Topic getAgencyTopicHotDiscuss(@Param("agencyId") String agencyId, @Param("dateId") String dateId);
+
     /**
      * @Description 查询组织下最新议题日统计数据
      * @author sun
@@ -118,6 +124,12 @@ public interface DataStatsDao {
      */
     List<SubAgencyFormDTO.Topic> getSubAgencyTopicShiftIssue(@Param("agencyIds") List<String> agencyIds, @Param("dateId") String dateId);
 
+    /**
+     * @Description 查询直属下级组织热议中话题-机关日统计数据
+     * @author sun
+     */
+    List<SubAgencyFormDTO.Topic> getSubAgencyTopicHotDiscuss(@Param("agencyIds") List<String> agencyIds, @Param("dateId") String dateId);
+
     /**
      * @Description 查询网格层级状态话题-日统计数据
      * @author sun
@@ -130,6 +142,12 @@ public interface DataStatsDao {
      */
     List<SubGridFormDTO.Topic> getSubGridTopicShiftIssue(@Param("gridIds") List<String> gridIds, @Param("dateId") String dateId);
 
+    /**
+     * @Description 查询网格层级热议中话题-日统计数据
+     * @author sun
+     */
+    List<SubGridFormDTO.Topic> getSubGridTopicHotDiscuss(@Param("gridIds") List<String> gridIds, @Param("dateId") String dateId);
+
     /**
      * @Description 查询直属下级组织议题日统计数据，默认按议题总数降序
      * @author sun
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index 900144795e..cf3eefefb7 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -78,29 +78,32 @@ public class DataStatsServiceImpl implements DataStatsService {
 
         //3.查询组织下最新话题日统计数据
         //状态话题-机关日统计数据表最新日期三种状态数据
-        //机关日表里三种类型数据之和就是话题总量，讨论中数量与热议中不是一个概念，热议中=总量-关闭数-屏蔽数-转议题数
+        //机关日表里三种类型数据之和就是话题总量，讨论中数量与热议中不是一个概念
         List<AgencyBasicDataResultDTO.Topic> topic = dataStatsDao.getAgencyTopic(formDTO.getAgencyId(), formDTO.getDateId());
         //转议题话题-机关日统计数据表
         AgencyBasicDataResultDTO.Topic topicSHiftIssue = dataStatsDao.getAgencyTopicShiftIssue(formDTO.getAgencyId(), formDTO.getDateId());
+        //热议中话题-机关日统计数据
+        AgencyBasicDataResultDTO.Topic hotdiscuss = dataStatsDao.getAgencyTopicHotDiscuss(formDTO.getAgencyId(), formDTO.getDateId());
         AtomicReference<Integer> closedTotal = new AtomicReference<>(0);
-        AtomicReference<Integer> hiddenTotal = new AtomicReference<>(0);
         if (topic.size() > NumConstant.ZERO) {
             resultDTO.setTopicTotal(topic.stream().collect(Collectors.summingInt(AgencyBasicDataResultDTO.Topic::getTopicCount)));
             topic.forEach(t -> {
                 if (t.getTopicStatus().equals("closed")) {
                     closedTotal.set(t.getTopicCount());
                 }
-                if (t.getTopicStatus().equals("hidden")) {
-                    hiddenTotal.set(t.getTopicCount());
-                }
             });
         }
+        //转议题
         if (null != topicSHiftIssue) {
             resultDTO.setShiftIssueTotal(topicSHiftIssue.getShiftedIssueTotal());
             resultDTO.setShiftIssueRatio(resultDTO.getShiftIssueTotal() == 0 || resultDTO.getTopicTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getShiftIssueTotal() / (float) resultDTO.getTopicTotal())));
         }
-        resultDTO.setDiscussingTotal(resultDTO.getTopicTotal() - closedTotal.get() - hiddenTotal.get() - resultDTO.getShiftIssueTotal());
-        resultDTO.setDiscussingRatio(resultDTO.getDiscussingTotal() == 0 || resultDTO.getTopicTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getDiscussingTotal() / (float) resultDTO.getTopicTotal())));
+        //热议中
+        if (null != hotdiscuss) {
+            resultDTO.setDiscussingTotal(hotdiscuss.getTopicCount());
+            resultDTO.setDiscussingRatio(resultDTO.getDiscussingTotal() == 0 || resultDTO.getTopicTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getDiscussingTotal() / (float) resultDTO.getTopicTotal())));
+        }
+        //已处理
         resultDTO.setClosedTopicTotal(closedTotal.get());
         resultDTO.setClosedTopicRatio(resultDTO.getClosedTopicTotal() == 0 || resultDTO.getTopicTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getClosedTopicTotal() / (float) resultDTO.getTopicTotal())));
 
@@ -404,16 +407,18 @@ public class DataStatsServiceImpl implements DataStatsService {
         List<String> agencyIds = subAgencyList.stream().map(DimAgencyEntity::getId).collect(Collectors.toList());
 
         //2.查询直属下级组织状态话题-日统计数据
-        //机关日表里三种类型数据之和就是话题总量，讨论中数量与热议中不是一个概念，热议中=总量-关闭数-屏蔽数-转议题数
+        //机关日表里三种类型数据之和就是话题总量，讨论中数量与热议中不是一个概念
         List<SubAgencyFormDTO.Topic> topic = dataStatsDao.getSubAgencyTopic(agencyIds, formDTO.getDateId());
         //查询直属下级组织转议题话题-日统计数据表
         List<SubAgencyFormDTO.Topic> topicShiftIssue = dataStatsDao.getSubAgencyTopicShiftIssue(agencyIds, formDTO.getDateId());
+        //查询直属下级组织热议中话题-机关日统计数据
+        List<SubAgencyFormDTO.Topic> hotdiscuss = dataStatsDao.getSubAgencyTopicHotDiscuss(agencyIds, formDTO.getDateId());
         agencyIds.forEach(agencyId -> {
             SubAgencyTopicResultDTO resultDTO = new SubAgencyTopicResultDTO();
             AtomicInteger topicTotal = new AtomicInteger(0);
             AtomicInteger closedTotal = new AtomicInteger(0);
-            AtomicInteger hiddenTotal = new AtomicInteger(0);
             AtomicInteger shiftIssueTotal = new AtomicInteger(0);
+            AtomicInteger hotdiscussTotal = new AtomicInteger(0);
             AtomicReference<String> agencyName = new AtomicReference<>("");
             topic.forEach(t -> {
                 if (t.getAgencyId().equals(agencyId)) {
@@ -421,9 +426,6 @@ public class DataStatsServiceImpl implements DataStatsService {
                     if (t.getTopicStatus().equals("closed")) {
                         closedTotal.set(t.getTopicCount());
                     }
-                    if (t.getTopicStatus().equals("hidden")) {
-                        hiddenTotal.set(t.getTopicCount());
-                    }
                 }
             });
             topicShiftIssue.forEach(t -> {
@@ -431,6 +433,11 @@ public class DataStatsServiceImpl implements DataStatsService {
                     shiftIssueTotal.addAndGet(t.getShiftedIssueTotal());
                 }
             });
+            hotdiscuss.forEach(t -> {
+                if (t.getAgencyId().equals(agencyId)) {
+                    hotdiscussTotal.addAndGet(t.getTopicCount());
+                }
+            });
             subAgencyList.forEach(sub -> {
                 if (agencyId.equals(sub.getId())) {
                     agencyName.set(sub.getAgencyName());
@@ -440,7 +447,7 @@ public class DataStatsServiceImpl implements DataStatsService {
             resultDTO.setAgencyId(agencyId);
             resultDTO.setAgencyName(agencyName.get());
             resultDTO.setTopicTotal(topicTotal.get());
-            resultDTO.setDiscussingTotal(topicTotal.get() - closedTotal.get() - hiddenTotal.get() - shiftIssueTotal.get());
+            resultDTO.setDiscussingTotal(hotdiscussTotal.get());
             resultDTO.setDiscussingRatio(resultDTO.getDiscussingTotal() == 0 || resultDTO.getTopicTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getDiscussingTotal() / (float) resultDTO.getTopicTotal())));
             resultDTO.setClosedTopicTotal(closedTotal.get());
             resultDTO.setClosedTopicRatio(resultDTO.getClosedTopicTotal() == 0 || resultDTO.getTopicTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getClosedTopicTotal() / (float) resultDTO.getTopicTotal())));
@@ -504,12 +511,14 @@ public class DataStatsServiceImpl implements DataStatsService {
         List<SubGridFormDTO.Topic> topic = dataStatsDao.getSubGridTopic(gridIds, formDTO.getDateId());
         //查询网格层级转议题话题-日统计数据表
         List<SubGridFormDTO.Topic> topicShiftIssue = dataStatsDao.getSubGridTopicShiftIssue(gridIds, formDTO.getDateId());
+        //查询网格层级热议中话题-日统计数据
+        List<SubGridFormDTO.Topic> hotdiscuss = dataStatsDao.getSubGridTopicHotDiscuss(gridIds, formDTO.getDateId());
         gridIds.forEach(gridId -> {
             SubGridTopicResultDTO resultDTO = new SubGridTopicResultDTO();
             AtomicInteger topicTotal = new AtomicInteger(0);
             AtomicInteger closedTotal = new AtomicInteger(0);
-            AtomicInteger hiddenTotal = new AtomicInteger(0);
             AtomicInteger shiftIssueTotal = new AtomicInteger(0);
+            AtomicInteger hotdiscussTotal = new AtomicInteger(0);
             AtomicReference<String> gridName = new AtomicReference<>("");
             topic.forEach(t -> {
                 if (t.getGridId().equals(gridId)) {
@@ -517,9 +526,6 @@ public class DataStatsServiceImpl implements DataStatsService {
                     if (t.getTopicStatus().equals("closed")) {
                         closedTotal.set(t.getTopicCount());
                     }
-                    if (t.getTopicStatus().equals("hidden")) {
-                        hiddenTotal.set(t.getTopicCount());
-                    }
                 }
             });
             topicShiftIssue.forEach(t -> {
@@ -527,6 +533,11 @@ public class DataStatsServiceImpl implements DataStatsService {
                     shiftIssueTotal.addAndGet(t.getShiftedIssueTotal());
                 }
             });
+            hotdiscuss.forEach(t -> {
+                if (t.getGridId().equals(gridId)) {
+                    hotdiscussTotal.addAndGet(t.getTopicCount());
+                }
+            });
             gridList.forEach(sub -> {
                 if (gridId.equals(sub.getId())) {
                     gridName.set(sub.getGridName());
@@ -536,7 +547,7 @@ public class DataStatsServiceImpl implements DataStatsService {
             resultDTO.setGridId(gridId);
             resultDTO.setGridName(gridName.get());
             resultDTO.setTopicTotal(topicTotal.get());
-            resultDTO.setDiscussingTotal(topicTotal.get() - closedTotal.get() - hiddenTotal.get() - shiftIssueTotal.get());
+            resultDTO.setDiscussingTotal(hotdiscussTotal.get());
             resultDTO.setDiscussingRatio(resultDTO.getDiscussingTotal() == 0 || resultDTO.getTopicTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getDiscussingTotal() / (float) resultDTO.getTopicTotal())));
             resultDTO.setClosedTopicTotal(closedTotal.get());
             resultDTO.setClosedTopicRatio(resultDTO.getClosedTopicTotal() == 0 || resultDTO.getTopicTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getClosedTopicTotal() / (float) resultDTO.getTopicTotal())));
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
index 06967cceab..4096010837 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
@@ -58,6 +58,19 @@
         LIMIT 1
     </select>
 
+    <select id="getAgencyTopicHotDiscuss" resultType="com.epmet.dataaggre.dto.datastats.result.AgencyBasicDataResultDTO$Topic">
+        SELECT
+            IFNULL(topic_total, 0) AS topicTotal,
+            IFNULL(topic_count, 0) AS topicCount
+        FROM
+            fact_topic_hotdiscuss_agency_daily
+        WHERE
+            del_flag = '0'
+        AND agency_id = #{agencyId}
+        AND date_id = #{dateId}
+        LIMIT 1
+    </select>
+
     <select id="getAgencyIssue" resultType="com.epmet.dataaggre.dto.datastats.result.AgencyBasicDataResultDTO">
         SELECT
             issue_total AS issueTotal,
@@ -210,6 +223,21 @@
         </foreach>
     </select>
 
+    <select id="getSubAgencyTopicHotDiscuss" resultType="com.epmet.dataaggre.dto.datastats.form.SubAgencyFormDTO$Topic">
+        SELECT
+            agency_id AS agencyId,
+            topic_total AS topicTotal,
+            topic_count AS topicCount
+        FROM
+            fact_topic_hotdiscuss_agency_daily
+        WHERE
+            del_flag = '0'
+        AND date_id = #{dateId}
+        <foreach item="agencyId" collection="agencyIds" open="AND (" separator="or" close=")" index="">
+            agency_id = #{agencyId}
+        </foreach>
+    </select>
+
     <select id="getSubGridTopic" resultType="com.epmet.dataaggre.dto.datastats.form.SubGridFormDTO$Topic">
         SELECT
         grid_id AS gridId,
@@ -240,6 +268,21 @@
         </foreach>
     </select>
 
+    <select id="getSubGridTopicHotDiscuss" resultType="com.epmet.dataaggre.dto.datastats.form.SubGridFormDTO$Topic">
+        SELECT
+            grid_id AS gridId,
+            topic_total AS topicTotal,
+            topic_count AS topicCount
+        FROM
+            fact_topic_hotdiscuss_grid_daily
+        WHERE
+            del_flag = '0'
+        AND date_id = #{dateId}
+        <foreach item="gridId" collection="gridIds" open="AND (" separator="or" close=")" index="">
+            grid_id = #{gridId}
+        </foreach>
+    </select>
+
     <select id="getSubAgencyIssue" resultType="com.epmet.dataaggre.dto.datastats.result.SubAgencyIssueResultDTO">
         SELECT
             agency_id AS agencyId,

From b6cb2fc5b5154837085440203b24c9078316c17d Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 18 May 2021 14:50:22 +0800
Subject: [PATCH 030/128] =?UTF-8?q?=E7=BE=A4=E4=BC=97=E4=B8=8D=E6=BB=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commons/tools/constant/NumConstant.java   |   4 +
 .../ProjectCategoryDisPoseResultDTO.java      |  41 +++++++
 .../epmet/feign/GovIssueOpenFeignClient.java  |   9 ++
 .../GovIssueOpenFeignClientFallBack.java      |   5 +
 .../IssueProjectCategoryDictController.java   |  17 ++-
 .../dao/IssueProjectCategoryDictDao.java      |  10 ++
 .../IssueProjectCategoryDictService.java      |  13 ++-
 .../IssueProjectCategoryDictServiceImpl.java  |  39 +++++++
 .../mapper/IssueProjectCategoryDictDao.xml    |  14 +++
 .../dto/form/MassesDiscontentFormDTO.java     |  43 ++++++++
 .../dto/result/MassesDiscontentResultDTO.java |  62 +++++++++++
 .../dto/result/ProjectScoreResultDTO.java     |  31 ++++++
 .../com/epmet/constant/ProjectConstant.java   |  14 +++
 ...ojectSatisfactionStatisticsController.java |  14 +++
 .../com/epmet/dao/ProjectCategoryDao.java     |   9 ++
 .../main/java/com/epmet/dao/ProjectDao.java   |  10 ++
 .../dao/ProjectSatisfactionStatisticsDao.java |  12 +++
 .../ProjectSatisfactionStatisticsService.java |  10 ++
 ...jectSatisfactionStatisticsServiceImpl.java | 102 ++++++++++++++++++
 .../resources/mapper/ProjectCategoryDao.xml   |  15 +++
 .../src/main/resources/mapper/ProjectDao.xml  |  14 +++
 .../ProjectSatisfactionStatisticsDao.xml      |  24 +++++
 .../dto/topic/result/TopicInfoResultDTO.java  |  42 ++++++++
 .../group/feign/ResiGroupOpenFeignClient.java |  11 ++
 .../ResiGroupOpenFeignClientFallback.java     |   6 ++
 .../topic/controller/ResiTopicController.java |  11 ++
 .../epmet/modules/topic/dao/ResiTopicDao.java |   8 ++
 .../topic/service/ResiTopicService.java       |   8 ++
 .../service/impl/ResiTopicServiceImpl.java    |  27 +++++
 .../resources/mapper/topic/ResiTopicDao.xml   |  25 +++++
 30 files changed, 642 insertions(+), 8 deletions(-)
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ProjectCategoryDisPoseResultDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MassesDiscontentFormDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MassesDiscontentResultDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectScoreResultDTO.java
 create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/TopicInfoResultDTO.java

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java
index 8cdcc9c0a2..2010b316d3 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java
@@ -48,6 +48,10 @@ public interface NumConstant {
     int MAX = 99999999;
     int EIGHTY_EIGHT = 88;
     int EIGHTY = 80;
+    int NINETY = 90;
+    int ONE_HUNDRED_AND_EIGHTY = 180;
+    int THREE_HUNDRED_AND_SIXTY_FIVE = 365;
+    int SEVENTY_FIVE = 75;
 
     double ZERO_DOT_ZERO = 0.0;
 
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ProjectCategoryDisPoseResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ProjectCategoryDisPoseResultDTO.java
new file mode 100644
index 0000000000..478c656627
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ProjectCategoryDisPoseResultDTO.java
@@ -0,0 +1,41 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/5/17 10:36 上午
+ * @DESC
+ */
+@Data
+public class ProjectCategoryDisPoseResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -2434579745274187160L;
+
+    /**
+     * 项目ID
+     */
+    private String projectId;
+
+    /**
+     * 查询传参
+     */
+    private String categoryCode;
+
+    /**
+     * mysql查询接收结果
+     */
+    private String categoryName;
+
+    /**
+     * 反参
+     */
+    private String projectCategory;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
+}
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java
index 190cbaf2f8..b0e0fef141 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java
@@ -309,4 +309,13 @@ public interface GovIssueOpenFeignClient {
 	 **/
 	@PostMapping(value = "/gov/issue/issue/getissuelist")
 	Result<List<IssueDTO>> getIssueList(@RequestParam String customerId);
+
+	/**
+	 * @Description  查询项目分类标签
+	 * @Param list
+	 * @author zxc
+	 * @date 2021/5/17 1:51 下午
+	 */
+	@PostMapping(value = "/gov/issue/issueprojectcategorydict/getprojectcategory")
+	Result<List<ProjectCategoryDisPoseResultDTO>> getProjectCategory(@RequestBody List<ProjectCategoryDisPoseResultDTO> list);
 }
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java
index 67e41d309a..ef83b497e2 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java
@@ -261,4 +261,9 @@ public class GovIssueOpenFeignClientFallBack implements GovIssueOpenFeignClient
 	public Result<List<IssueDTO>> getIssueList(String customerId) {
 		return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "getIssueList", customerId);
 	}
+
+    @Override
+    public Result<List<ProjectCategoryDisPoseResultDTO>> getProjectCategory(List<ProjectCategoryDisPoseResultDTO> list) {
+		return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "getProjectCategory", list);
+    }
 }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectCategoryDictController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectCategoryDictController.java
index b28f0b352d..4a684d8ef2 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectCategoryDictController.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectCategoryDictController.java
@@ -32,10 +32,7 @@ import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IssueProjectCategoryDictDTO;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.CategoryTagResultDTO;
-import com.epmet.dto.result.CustomerCategoryListResultDTO;
-import com.epmet.dto.result.CustomerCategoryResultDTO;
-import com.epmet.dto.result.ProjectIssueCategoryResultDTO;
+import com.epmet.dto.result.*;
 import com.epmet.entity.IssueProjectCategoryDictEntity;
 import com.epmet.excel.IssueProjectCategoryDictExcel;
 import com.epmet.project.dto.CustomerCategoryDTO;
@@ -268,5 +265,17 @@ public class IssueProjectCategoryDictController {
         return new Result<CategoryTagResultDTO>().ok(issueProjectCategoryDictService.getCategoryTagList(formDTO));
     }
 
+
+    /**
+     * @Description  查询项目分类标签
+     * @Param list
+     * @author zxc
+     * @date 2021/5/17 1:51 下午
+     */
+    @PostMapping("getprojectcategory")
+    public Result<List<ProjectCategoryDisPoseResultDTO>> getProjectCategory(@RequestBody List<ProjectCategoryDisPoseResultDTO> list){
+        return new Result<List<ProjectCategoryDisPoseResultDTO>>().ok(issueProjectCategoryDictService.getProjectCategory(list));
+    }
+
 }
 
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectCategoryDictDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectCategoryDictDao.java
index f9be70d073..6d2ad46fa8 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectCategoryDictDao.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectCategoryDictDao.java
@@ -24,6 +24,7 @@ import com.epmet.dto.form.IsDisableCategoryFormDTO;
 import com.epmet.dto.form.IssueProjectCategoryDictListFormDTO;
 import com.epmet.dto.result.CustomerCategoryListResultDTO;
 import com.epmet.dto.result.CustomerCategoryResultDTO;
+import com.epmet.dto.result.ProjectCategoryDisPoseResultDTO;
 import com.epmet.entity.IssueProjectCategoryDictEntity;
 import com.epmet.project.dto.result.ProjectCategoryDictResultDTO;
 import org.apache.ibatis.annotations.Mapper;
@@ -173,4 +174,13 @@ public interface IssueProjectCategoryDictDao extends BaseDao<IssueProjectCategor
      * @Author sun
      **/
     List<IssueProjectCategoryDictDTO> getCategoryList(@Param("customerId") String customerId, @Param("categoryIdList") List<String> categoryIdList);
+
+    /**
+     * @Description  查询项目分类标签
+     * @Param list
+     * @author zxc
+     * @date 2021/5/17 1:51 下午
+     */
+    List<ProjectCategoryDisPoseResultDTO> getProjectCategory(@Param("list") List<ProjectCategoryDisPoseResultDTO> list,@Param("customerId") String customerId);
+
 }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectCategoryDictService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectCategoryDictService.java
index 00ebcc18ca..abd4e63d38 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectCategoryDictService.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectCategoryDictService.java
@@ -22,10 +22,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.IssueProjectCategoryDictDTO;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.CategoryTagResultDTO;
-import com.epmet.dto.result.CustomerCategoryListResultDTO;
-import com.epmet.dto.result.CustomerCategoryResultDTO;
-import com.epmet.dto.result.ProjectIssueCategoryResultDTO;
+import com.epmet.dto.result.*;
 import com.epmet.entity.IssueProjectCategoryDictEntity;
 import com.epmet.project.dto.result.ProjectCategoryDictResultDTO;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -216,4 +213,12 @@ public interface IssueProjectCategoryDictService extends BaseService<IssueProjec
      * @Author sun
      **/
     CategoryTagResultDTO getCategoryTagList(CategoryTagListFormDTO formDTO);
+
+    /**
+     * @Description  查询项目分类标签
+     * @Param list
+     * @author zxc
+     * @date 2021/5/17 1:51 下午
+     */
+    List<ProjectCategoryDisPoseResultDTO> getProjectCategory(List<ProjectCategoryDisPoseResultDTO> list);
 }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java
index 8db5944db0..46bed8859f 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java
@@ -472,4 +472,43 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
         return resultDTO;
     }
 
+    /**
+     * @Description  查询项目分类标签
+     * @Param list
+     * @author zxc
+     * @date 2021/5/17 1:51 下午
+     */
+    @Override
+    public List<ProjectCategoryDisPoseResultDTO> getProjectCategory(List<ProjectCategoryDisPoseResultDTO> list) {
+        String customerId = list.get(NumConstant.ZERO).getCustomerId();
+        List<ProjectCategoryDisPoseResultDTO> projectCategory = baseDao.getProjectCategory(list, customerId);
+        if (CollectionUtils.isEmpty(projectCategory)){
+            return new ArrayList<>();
+        }
+        List<ProjectCategoryDisPoseResultDTO> result = new ArrayList<>();
+        Map<String, List<ProjectCategoryDisPoseResultDTO>> groupByProject = projectCategory.stream().collect(Collectors.groupingBy(ProjectCategoryDisPoseResultDTO::getProjectId));
+        groupByProject.forEach((projectId,categoryList) -> {
+            ProjectCategoryDisPoseResultDTO p = new ProjectCategoryDisPoseResultDTO();
+            p.setProjectId(projectId);
+            p.setProjectCategory(disposeCategory(categoryList));
+            result.add(p);
+        });
+        return result;
+    }
+
+    /**
+     * @Description  项目分类处理
+     * @Param list
+     * @author zxc
+     * @date 2021/5/17 2:16 下午
+     */
+    public String disposeCategory(List<ProjectCategoryDisPoseResultDTO> list){
+        String result = "";
+        if (!CollectionUtils.isEmpty(list)){
+            list.forEach(l -> {
+                result.concat(l.getCategoryName()).concat(",");
+            });
+        }
+        return result.substring(NumConstant.ZERO,result.length()-NumConstant.ONE);
+    }
 }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml
index 0d6adbd065..4a7b073b73 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml
@@ -230,6 +230,20 @@
             sort ASC
     </select>
 
+    <!-- 查询项目分类标签 -->
+    <select id="getProjectCategory" resultType="com.epmet.dto.result.ProjectCategoryDisPoseResultDTO">
+        <foreach collection="list" item="l" separator=" UNION ALL ">
+            SELECT
+            #{l.projectId} AS projectId,
+            CATEGORY_NAME
+            FROM issue_project_category_dict
+            WHERE DEL_FLAG = '0'
+            AND IS_DISABLE = 'enable'
+            AND CUSTOMER_ID = #{customerId}
+            AND CATEGORY_CODE = #{l.categoryCode}
+        </foreach>
+    </select>
+
     <update id="updateIssueProjectCategoryDict">
         UPDATE issue_project_category_dict
         SET
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MassesDiscontentFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MassesDiscontentFormDTO.java
new file mode 100644
index 0000000000..5a2e934a99
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MassesDiscontentFormDTO.java
@@ -0,0 +1,43 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/5/13 5:16 下午
+ * @DESC
+ */
+@Data
+public class MassesDiscontentFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -9104774532905137856L;
+
+    public interface MassesDiscontentForm{}
+
+    /**
+     * 时间区间,三个月：threeMonth；半年：sixMonth；一年：twelveMonth
+     * 一个月按照30天，三个月90天，半年180天，一年365天
+     */
+    private String timeSection;
+
+    /**
+     * asc:分数由低到高
+     * desc:分数由高到低
+     */
+    private String sortType;
+
+    /**
+     * 组织ID
+     */
+    private String agencyId;
+
+    @NotNull(message = "pageNo不能为空",groups = MassesDiscontentForm.class)
+    private Integer pageNo;
+
+    @NotNull(message = "pageSize不能为空",groups = MassesDiscontentForm.class)
+    private Integer pageSize;
+
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MassesDiscontentResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MassesDiscontentResultDTO.java
new file mode 100644
index 0000000000..905dd0be8d
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MassesDiscontentResultDTO.java
@@ -0,0 +1,62 @@
+package com.epmet.dto.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/5/14 9:04 上午
+ * @DESC
+ */
+@Data
+public class MassesDiscontentResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 8954504790464516198L;
+
+    /**
+     * 项目ID
+     */
+    private String projectId;
+
+    /**
+     * 议题ID
+     */
+    private String issueId;
+
+    /**
+     * 话题所在网格
+     */
+    private String gridName;
+
+    /**
+     * 话题图片
+     */
+    private List<String> photos;
+
+    /**
+     * 话题内容
+     */
+    private String topicContent;
+
+    /**
+     * 项目分类标签
+     */
+    private String projectCategory;
+
+    /**
+     * 项目评价分数
+     */
+    @JsonIgnore
+    private Integer score;
+
+    public MassesDiscontentResultDTO() {
+        this.gridName = "";
+        this.photos = new ArrayList<>();
+        this.topicContent = "";
+        this.projectCategory = "";
+    }
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectScoreResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectScoreResultDTO.java
new file mode 100644
index 0000000000..9b2127224b
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectScoreResultDTO.java
@@ -0,0 +1,31 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/5/18 1:29 下午
+ * @DESC
+ */
+@Data
+public class ProjectScoreResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 8559486245200043097L;
+
+    /**
+     * 项目ID
+     */
+    private String projectId;
+
+    /**
+     * 项目评价分数
+     */
+    private Integer score;
+
+    /**
+     * 议题ID
+     */
+    private String issueId;
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java
index 71402799e8..992871d265 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java
@@ -174,4 +174,18 @@ public interface ProjectConstant {
 	String NOT_EXIST_PROJECT = "未查询带此项目信息......";
 
 	String EXTERNAL_SYSTEM = "third_platform_project_send";
+
+	/**
+	 * 三个月，六个月，12个月
+	 */
+	String THREE_MONTH = "threeMonth";
+	String SIX_MONTH = "sixMonth";
+	String TWELVE_MONTH = "twelveMonth";
+
+	/**
+	 * 排序
+	 */
+	String SORT_ASC = "asc";
+	String SORT_DESC = "desc";
+
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectSatisfactionStatisticsController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectSatisfactionStatisticsController.java
index 78fed6b459..62fbe24a59 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectSatisfactionStatisticsController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectSatisfactionStatisticsController.java
@@ -26,7 +26,9 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.ProjectSatisfactionStatisticsDTO;
+import com.epmet.dto.form.MassesDiscontentFormDTO;
 import com.epmet.dto.form.ProjectEvaluateScoreFormDTO;
+import com.epmet.dto.result.MassesDiscontentResultDTO;
 import com.epmet.dto.result.ProjectEvaluateScoreResultDTO;
 import com.epmet.excel.ProjectSatisfactionStatisticsExcel;
 import com.epmet.service.ProjectSatisfactionStatisticsService;
@@ -105,4 +107,16 @@ public class ProjectSatisfactionStatisticsController {
         return new Result<ProjectEvaluateScoreResultDTO>().ok(projectSatisfactionStatisticsService.projectEvaluateScore(formDTO));
     }
 
+    /**
+     * @Description  群众不满
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/5/14 10:46 上午
+     */
+    @PostMapping("massesdiscontent")
+    public Result<List<MassesDiscontentResultDTO>> massesDiscontent(@RequestBody MassesDiscontentFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, MassesDiscontentFormDTO.MassesDiscontentForm.class);
+        return new Result<List<MassesDiscontentResultDTO>>().ok(projectSatisfactionStatisticsService.massesDiscontent(formDTO));
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectCategoryDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectCategoryDao.java
index 247f239261..cc2d336344 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectCategoryDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectCategoryDao.java
@@ -20,6 +20,7 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.ProjectCategoryDTO;
 import com.epmet.dto.form.DelCategoryFormDTO;
+import com.epmet.dto.result.ProjectCategoryDisPoseResultDTO;
 import com.epmet.entity.ProjectCategoryEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -52,4 +53,12 @@ public interface ProjectCategoryDao extends BaseDao<ProjectCategoryEntity> {
      * @Author sun
      **/
     List<ProjectCategoryDTO> selectProjectCategoryList(DelCategoryFormDTO formDTO);
+
+    /**
+     * @Description  根据项目ID查询项目分类
+     * @Param projectIds
+     * @author zxc
+     * @date 2021/5/17 10:47 上午
+     */
+    List<ProjectCategoryDisPoseResultDTO> selectCategoryByIds(@Param("projectIds")List<String> projectIds);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java
index 5eccc08f67..ed73518a58 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java
@@ -147,4 +147,14 @@ public interface ProjectDao extends BaseDao<ProjectEntity> {
 																			@Param("customerId") String customerId);
 
 	ProjectInfoDTO queryProjectInfoByProjectId(String projectId);
+
+	/**
+	 * @Description  查询时间段内的项目ID
+	 * @Param agencyId
+	 * @Param startDate
+	 * @Param endDate
+	 * @author zxc
+	 * @date 2021/5/14 1:59 下午
+	 */
+	List<MassesDiscontentResultDTO> selectProjectIdByTime(@Param("agencyId")String agencyId,@Param("endDate")Integer endDate,@Param("startDate")Integer startDate);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSatisfactionStatisticsDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSatisfactionStatisticsDao.java
index 60a2852e8f..b174075bcd 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSatisfactionStatisticsDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSatisfactionStatisticsDao.java
@@ -18,10 +18,14 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.result.MassesDiscontentResultDTO;
+import com.epmet.dto.result.ProjectScoreResultDTO;
 import com.epmet.entity.ProjectSatisfactionStatisticsEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 项目满意度调查统计表
  *
@@ -39,4 +43,12 @@ public interface ProjectSatisfactionStatisticsDao extends BaseDao<ProjectSatisfa
      */
     ProjectSatisfactionStatisticsEntity selectInfoByProjectId(@Param("projectId")String projectId);
 
+    /**
+     * @Description  查询评价分数小于xx分的项目
+     * @Param projectIds
+     * @author zxc
+     * @date 2021/5/17 9:59 上午
+     */
+    List<MassesDiscontentResultDTO> selectProjectByScore(@Param("projectIds")List<String> projectIds, @Param("setScore")Integer setScore, @Param("sortType")String sortType);
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSatisfactionStatisticsService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSatisfactionStatisticsService.java
index fa035d53f6..24b4f24b5b 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSatisfactionStatisticsService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSatisfactionStatisticsService.java
@@ -20,7 +20,9 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.ProjectSatisfactionStatisticsDTO;
+import com.epmet.dto.form.MassesDiscontentFormDTO;
 import com.epmet.dto.form.ProjectEvaluateScoreFormDTO;
+import com.epmet.dto.result.MassesDiscontentResultDTO;
 import com.epmet.dto.result.ProjectEvaluateScoreResultDTO;
 import com.epmet.entity.ProjectSatisfactionStatisticsEntity;
 
@@ -102,4 +104,12 @@ public interface ProjectSatisfactionStatisticsService extends BaseService<Projec
      * @date 2021/5/13 11:18 上午
      */
     ProjectEvaluateScoreResultDTO projectEvaluateScore(ProjectEvaluateScoreFormDTO formDTO);
+
+    /**
+     * @Description  群众不满
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/5/14 10:46 上午
+     */
+    List<MassesDiscontentResultDTO> massesDiscontent(MassesDiscontentFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionStatisticsServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionStatisticsServiceImpl.java
index 222a96644a..ed20dfd167 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionStatisticsServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionStatisticsServiceImpl.java
@@ -21,24 +21,42 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.utils.DateUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.constant.ProjectConstant;
+import com.epmet.dao.ProjectCategoryDao;
+import com.epmet.dao.ProjectDao;
 import com.epmet.dao.ProjectSatisfactionStatisticsDao;
 import com.epmet.dto.ProjectSatisfactionStatisticsDTO;
+import com.epmet.dto.form.MassesDiscontentFormDTO;
 import com.epmet.dto.form.ProjectEvaluateScoreFormDTO;
+import com.epmet.dto.result.MassesDiscontentResultDTO;
+import com.epmet.dto.result.ProjectCategoryDisPoseResultDTO;
 import com.epmet.dto.result.ProjectEvaluateScoreResultDTO;
+import com.epmet.dto.result.ProjectScoreResultDTO;
 import com.epmet.entity.ProjectSatisfactionStatisticsEntity;
+import com.epmet.feign.GovIssueOpenFeignClient;
 import com.epmet.redis.ProjectSatisfactionStatisticsRedis;
+import com.epmet.resi.group.dto.topic.result.TopicInfoResultDTO;
+import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
 import com.epmet.service.ProjectSatisfactionStatisticsService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 项目满意度调查统计表
@@ -51,6 +69,14 @@ public class ProjectSatisfactionStatisticsServiceImpl extends BaseServiceImpl<Pr
 
     @Autowired
     private ProjectSatisfactionStatisticsRedis projectSatisfactionStatisticsRedis;
+    @Autowired
+    private ProjectDao projectDao;
+    @Autowired
+    private ProjectCategoryDao projectCategoryDao;
+    @Autowired
+    private GovIssueOpenFeignClient issueOpenFeignClient;
+    @Autowired
+    private ResiGroupOpenFeignClient resiGroupOpenFeignClient;
 
     @Override
     public PageData<ProjectSatisfactionStatisticsDTO> page(Map<String, Object> params) {
@@ -125,4 +151,80 @@ public class ProjectSatisfactionStatisticsServiceImpl extends BaseServiceImpl<Pr
         return new ProjectEvaluateScoreResultDTO((noEvalScore + realEvalScore) / shouldEvaluateCount);
     }
 
+    /**
+     * @Description  群众不满
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/5/14 10:46 上午
+     */
+    @Override
+    public List<MassesDiscontentResultDTO> massesDiscontent(MassesDiscontentFormDTO formDTO) {
+        List<MassesDiscontentResultDTO> projectIds = projectDao.selectProjectIdByTime(formDTO.getAgencyId(), getDateId("yesterday"), getDateId(formDTO.getTimeSection()));
+        if (CollectionUtils.isEmpty(projectIds)){
+            return new ArrayList<>();
+        }
+        PageInfo<MassesDiscontentResultDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectProjectByScore(projectIds.stream().map(m -> m.getProjectId()).collect(Collectors.toList()), NumConstant.SEVENTY_FIVE, formDTO.getSortType()));
+        List<MassesDiscontentResultDTO> projects = pageInfo.getList();
+        if (CollectionUtils.isEmpty(projects)){
+            return new ArrayList<>();
+        }
+        List<ProjectCategoryDisPoseResultDTO> projectCategoryDisPoseResultDTOS = projectCategoryDao.selectCategoryByIds(projects.stream().map(m -> m.getProjectId()).collect(Collectors.toList()));
+        List<ProjectCategoryDisPoseResultDTO> projectCategoryData = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(projectCategoryDisPoseResultDTOS)){
+            Result<List<ProjectCategoryDisPoseResultDTO>> projectCategory = issueOpenFeignClient.getProjectCategory(projectCategoryDisPoseResultDTOS);
+            if (!projectCategory.success()){
+                throw new RenException("查询项目分类标签失败".concat(projectCategory.getMsg()));
+            }
+            projectCategoryData = projectCategory.getData();
+        }
+        Result<List<TopicInfoResultDTO>> topicInfos = resiGroupOpenFeignClient.getTopicInfos(projects.stream().map(m -> m.getIssueId()).collect(Collectors.toList()));
+        if (!topicInfos.success()){
+            throw new RenException("查询话题信息失败".concat(topicInfos.getMsg()));
+        }
+        List<ProjectCategoryDisPoseResultDTO> finalProjectCategoryData = projectCategoryData;
+        projects.forEach(p -> {
+            if (!CollectionUtils.isEmpty(finalProjectCategoryData)){
+                finalProjectCategoryData.forEach(cate -> {
+                    if (p.getProjectId().equals(cate.getProjectId())){
+                        p.setProjectCategory(cate.getProjectCategory());
+                    }
+                });
+            }
+            if (!CollectionUtils.isEmpty(topicInfos.getData())){
+                topicInfos.getData().forEach(t -> {
+                    if (p.getIssueId().equals(t.getIssueId())){
+                        p.setGridName(t.getGridName());
+                        p.setTopicContent(t.getTopicContent());
+                        p.setPhotos(t.getPhotos());
+                    }
+                });
+            }
+        });
+        return projects;
+    }
+
+    /**
+     * @Description  处理时间
+     * @Param dateType
+     * @author zxc
+     * @date 2021/5/18 2:28 下午
+     */
+    public Integer getDateId(String dateType){
+        String beforeNDay = DateUtils.getBeforeNDay(NumConstant.ONE);
+        Integer result = Integer.valueOf(beforeNDay);
+        switch (dateType) {
+            case ProjectConstant.THREE_MONTH:
+                result = Integer.valueOf(DateUtils.getBeforeNDay(NumConstant.NINETY));
+                break;
+            case ProjectConstant.SIX_MONTH:
+                result = Integer.valueOf(DateUtils.getBeforeNDay(NumConstant.ONE_HUNDRED_AND_EIGHTY));
+                break;
+            case ProjectConstant.TWELVE_MONTH:
+                result = Integer.valueOf(DateUtils.getBeforeNDay(NumConstant.THREE_HUNDRED_AND_SIXTY_FIVE));
+                break;
+            default:
+        }
+        return result;
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml
index 30033c620e..3f9c27f6d2 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml
@@ -35,4 +35,19 @@
             project_id = #{projectId}
     </delete>
 
+    <!-- 根据项目ID查询项目分类 -->
+    <select id="selectCategoryByIds" resultType="com.epmet.dto.result.ProjectCategoryDisPoseResultDTO">
+        SELECT
+            PROJECT_ID,
+            CATEGORY_CODE,
+            CUSTOMER_ID
+        FROM project_category
+        WHERE DEL_FLAG = '0'
+            AND (
+                <foreach collection="projectIds" item="projectId" separator=" OR ">
+                    PROJECT_ID = #{projectId}
+                </foreach>
+            )
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
index 0a430eab87..4a8c18c125 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
@@ -269,4 +269,18 @@
         where P.DEL_FLAG='0'
         AND p.id=#{projectId}
     </select>
+
+    <!-- 查询时间段内的项目ID -->
+    <select id="selectProjectIdByTime" resultType="com.epmet.dto.result.MassesDiscontentResultDTO">
+        SELECT
+               ID AS projectId,
+               ORIGIN_ID AS issueId
+        FROM project
+        WHERE
+            DEL_FLAG = '0'
+          AND DATE_FORMAT(CREATED_TIME,'%Y%m%d') >= #{startDate}
+          AND DATE_FORMAT(CREATED_TIME,'%Y%m%d') <![CDATA[ <= ]]> #{endDate}
+          AND ORG_ID_PATH LIKE CONCAT('%',#{agencyId},'%')
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSatisfactionStatisticsDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSatisfactionStatisticsDao.xml
index 90be9c1c62..9a194a2db4 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSatisfactionStatisticsDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSatisfactionStatisticsDao.xml
@@ -8,5 +8,29 @@
         select * from project_satisfaction_statistics where DEL_FLAG = '0' AND PROJECT_ID = #{projectId}
     </select>
 
+    <!-- 查询评价分数小于xx分的项目 -->
+    <select id="selectProjectByScore" resultType="com.epmet.dto.result.MassesDiscontentResultDTO">
+        select a.* from
+        (SELECT
+        s.PROJECT_ID,
+        p.ORIGIN_ID AS issueId,
+        IFNULL((((s.SHOULD_EVALUATE_COUNT - s.GOOD_COUNT - s.BAD_COUNT - s.PERFECT_COUNT) * 80 + s.BAD_COUNT * 60 + s.GOOD_COUNT * 80 + s.PERFECT_COUNT * 100 )/ s.SHOULD_EVALUATE_COUNT),0) AS score
+        FROM project_satisfaction_statistics s
+        LEFT JOIN project p on p.id = s.PROJECT_ID AND p.DEL_FLAG = '0'
+        WHERE s.DEL_FLAG = '0'
+        AND (
+        <foreach collection="projectIds" item="projectId" separator=" OR ">
+            s.PROJECT_ID = #{projectId}
+        </foreach>
+        )) a
+        where score <![CDATA[ < ]]> #{setScore}
+        <if test="sortType == 'desc' ">
+            ORDER BY score DESC
+        </if>
+        <if test="sortType == 'asc' ">
+            ORDER BY score ASC
+        </if>
+    </select>
+
 
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/TopicInfoResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/TopicInfoResultDTO.java
new file mode 100644
index 0000000000..4a2d43ea8e
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/TopicInfoResultDTO.java
@@ -0,0 +1,42 @@
+package com.epmet.resi.group.dto.topic.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/5/17 2:44 下午
+ * @DESC
+ */
+@Data
+public class TopicInfoResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 4068679301595597877L;
+
+    /**
+     * 议题ID
+     */
+    private String issueId;
+
+    /**
+     * 话题所在网格
+     */
+    private String gridName;
+
+    /**
+     * 网格ID
+     */
+    private String gridId;
+
+    /**
+     * 话题图片
+     */
+    private List<String> photos;
+
+    /**
+     * 话题内容
+     */
+    private String topicContent;
+}
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
index 292972c45e..64879dc601 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
@@ -10,6 +10,7 @@ import com.epmet.resi.group.dto.topic.MyCreateTopicsFormDTO;
 import com.epmet.resi.group.dto.topic.ResiTopicDTO;
 import com.epmet.resi.group.dto.topic.form.*;
 import com.epmet.resi.group.dto.topic.result.*;
+import com.epmet.resi.group.dto.topic.result.TopicInfoResultDTO;
 import com.epmet.resi.group.feign.fallback.ResiGroupOpenFeignClientFallback;
 import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -253,4 +254,14 @@ public interface ResiGroupOpenFeignClient {
      */
     @PostMapping("resi/group/group/groupPointDetail/{groupId}")
     Result<GroupPointDetailResultDTO> groupPointDetail(@PathVariable String groupId);
+
+    /**
+     * @Description  查询话题信息
+     * @Param issueIds
+     * @author zxc
+     * @date 2021/5/17 4:19 下午
+     */
+    @PostMapping("resi/group/topic/gettopicinfos")
+    Result<List<TopicInfoResultDTO>> getTopicInfos(@RequestBody List<String> issueIds);
+
 }
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
index 84dee1113d..84d0385b47 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
@@ -10,6 +10,7 @@ import com.epmet.resi.group.dto.topic.MyCreateTopicsFormDTO;
 import com.epmet.resi.group.dto.topic.ResiTopicDTO;
 import com.epmet.resi.group.dto.topic.form.*;
 import com.epmet.resi.group.dto.topic.result.*;
+import com.epmet.resi.group.dto.topic.result.TopicInfoResultDTO;
 import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
 import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO;
 import org.springframework.stereotype.Component;
@@ -198,4 +199,9 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien
     public Result<GroupPointDetailResultDTO> groupPointDetail(String groupId) {
         return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "groupPointDetail", groupId);
     }
+
+    @Override
+    public Result<List<TopicInfoResultDTO>> getTopicInfos(List<String> issueIds) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "getTopicInfos", issueIds);
+    }
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java
index ef4a773ccf..062662457a 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java
@@ -485,4 +485,15 @@ public class ResiTopicController {
         ValidatorUtils.validateEntity(formDTO, GetPastTopicListV2FormDTO.GetPastTopicListV2Form.class);
         return new Result<List<AllMessagesResultDTO>>().ok(topicService.allMessages(formDTO));
     }
+
+    /**
+     * @Description  查询话题信息
+     * @Param issueIds
+     * @author zxc
+     * @date 2021/5/17 4:19 下午
+     */
+    @PostMapping("gettopicinfos")
+    public Result<List<TopicInfoResultDTO>> getTopicInfos(@RequestBody List<String> issueIds){
+        return new Result<List<TopicInfoResultDTO>>().ok(topicService.getTopicInfos(issueIds));
+    }
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicDao.java
index abc817659d..88bc4abad0 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicDao.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicDao.java
@@ -224,4 +224,12 @@ public interface ResiTopicDao extends BaseDao<ResiTopicEntity> {
      * @author sun
      */
     int upTopicList(@Param("delIdList") List<String> delIdList, @Param("userId") String userId);
+
+    /**
+     * @Description  查询话题信息
+     * @Param issueIds
+     * @author zxc
+     * @date 2021/5/17 4:54 下午
+     */
+    List<TopicInfoResultDTO> getTopicInfos(@Param("issueIds") List<String> issueIds);
 }
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java
index 064255c04c..cf496a8c5b 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java
@@ -389,4 +389,12 @@ public interface ResiTopicService extends BaseService<ResiTopicEntity> {
      * @date 2021/4/28 上午10:41
      */
     List<AllMessagesResultDTO> allMessages(AllMessagesFormDTO formDTO);
+
+    /**
+     * @Description  查询话题信息
+     * @Param issueIds
+     * @author zxc
+     * @date 2021/5/17 4:19 下午
+     */
+    List<TopicInfoResultDTO> getTopicInfos(List<String> issueIds);
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
index 6c4ff65b4f..ec51f04815 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
@@ -103,6 +103,7 @@ import com.epmet.resi.group.dto.topic.form.*;
 import com.epmet.resi.group.dto.topic.result.CheckTopicPublisherResultDTO;
 import com.epmet.resi.group.dto.topic.result.GovTopicIssueInfoResultDTO;
 import com.epmet.resi.group.dto.topic.result.*;
+import com.epmet.resi.group.dto.topic.result.TopicInfoResultDTO;
 import com.epmet.send.SendMqMsgUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -2746,6 +2747,32 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         return allMessages;
     }
 
+    /**
+     * @Description  查询话题信息
+     * @Param issueIds
+     * @author zxc
+     * @date 2021/5/17 4:19 下午
+     */
+    @Override
+    public List<TopicInfoResultDTO> getTopicInfos(List<String> issueIds) {
+        if (CollectionUtils.isEmpty(issueIds)){
+            return new ArrayList<>();
+        }
+        List<TopicInfoResultDTO> topicInfos = baseDao.getTopicInfos(issueIds);
+        Result<List<AllGridsByUserIdResultDTO>> gridNames = govOrgOpenFeignClient.getGridListByGridIds(topicInfos.stream().map(m -> m.getGridId()).collect(Collectors.toList()));
+        if (!gridNames.success()){
+            throw new RenException("查询网格Name失败");
+        }
+        topicInfos.forEach(t -> {
+            gridNames.getData().forEach(g -> {
+                if (t.getGridId().equals(g.getGridId())){
+                    t.setGridName(g.getGridName());
+                }
+            });
+        });
+        return topicInfos;
+    }
+
 }
 
 
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml
index b5f35a8a7a..d912ca952b 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml
@@ -606,5 +606,30 @@
         </foreach>
     </update>
 
+    <resultMap id="getTopicInfosMap" type="com.epmet.resi.group.dto.topic.result.TopicInfoResultDTO">
+        <result property="issueId" column="issueId"/>
+        <result property="gridId" column="gridId"/>
+        <result property="topicContent" column="topicContent"/>
+        <collection property="photos" ofType="java.lang.String">
+            <result column="imgUrl"/>
+        </collection>
+    </resultMap>
+    <select id="getTopicInfos" resultMap="getTopicInfosMap">
+        SELECT
+            t.TOPIC_CONTENT AS topicContent,
+            g.GRID_ID AS gridId,
+            ta.ATTACHMENT_URL AS imgUrl,
+            t.ISSUE_ID AS issueId
+        FROM resi_topic t
+        LEFT JOIN resi_group g ON g.ID = t.GROUP_ID AND g.DEL_FLAG = '0'
+        LEFT JOIN resi_topic_attachment ta ON t.ID = ta.TOPIC_ID AND ta.DEL_FLAG = '0' AND ta.ATTACHMENT_TYPE = 'image' AND (ta.SORT = 0 OR ta.SORT = 1 OR ta.SORT = 2)
+        WHERE t.DEL_FLAG = '0'
+          AND (
+              <foreach collection="issueIds" item="issueId" separator=" OR ">
+                  t.ISSUE_ID = #{issueId}
+              </foreach>
+            )
+    </select>
+
 </mapper>
 

From d8847b1a6d770525cd77e68bd3df64671f633f37 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 18 May 2021 15:21:34 +0800
Subject: [PATCH 031/128] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=B1=82=E7=BA=A7?=
 =?UTF-8?q?=E4=BA=94=E9=A1=B9=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datastats/form/GridBasicDataFormDTO.java  |  28 ++++
 .../result/GridBasicDataResultDTO.java        |  96 ++++++++++++++
 .../controller/DataStatsController.java       |  12 ++
 .../service/datastats/DataStatsService.java   |   9 ++
 .../datastats/impl/DataStatsServiceImpl.java  | 120 ++++++++++++++++--
 5 files changed, 254 insertions(+), 11 deletions(-)
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/GridBasicDataFormDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/GridBasicDataResultDTO.java

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/GridBasicDataFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/GridBasicDataFormDTO.java
new file mode 100644
index 0000000000..eb1b981134
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/GridBasicDataFormDTO.java
@@ -0,0 +1,28 @@
+package com.epmet.dataaggre.dto.datastats.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 基础数据-网格各种数据汇总-接口入参
+ * @Auth sun
+ */
+@Data
+public class GridBasicDataFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -3381286960911634231L;
+    /**
+     * 网格Id
+     */
+    @NotBlank(message = "网格ID不能为空",groups = GridBasicDataFormDTO.Grid.class)
+    private String gridId;
+    /**
+     * 日维度Id
+     */
+    private String dateId;
+    public interface Grid extends CustomerClientShowGroup{}
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/GridBasicDataResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/GridBasicDataResultDTO.java
new file mode 100644
index 0000000000..1ee5dc9b8a
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/GridBasicDataResultDTO.java
@@ -0,0 +1,96 @@
+package com.epmet.dataaggre.dto.datastats.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @Description 基础数据-网格各种数据汇总-接口返参
+ * @Auth sun
+ */
+@Data
+public class GridBasicDataResultDTO implements Serializable {
+    private static final long serialVersionUID = 466974582608407121L;
+    @JsonIgnore
+    BigDecimal bi = new BigDecimal(0);
+    /**
+     * 网格Id
+     */
+    private String gridId;
+    //用户总数
+    private Integer userTotal = 0;
+    //党员总数
+    private Integer partyMemberTotal = 0;
+    //党员总数占比
+    private BigDecimal partyMemberRatio = bi;
+    //居民总数
+    private Integer resiTotal = 0;
+    //居民总数占比
+    private BigDecimal resiRatio = bi;
+    //党群小组总数
+    private Integer groupTotal = 0;
+    //楼院小组总数
+    private Integer ordinaryTotal = 0;
+    //楼院小组总数占比
+    private BigDecimal ordinaryRatio = bi;
+    //支部小组总数
+    private Integer branchTotal = 0;
+    //支部小组总数占比
+    private BigDecimal branchRatio = bi;
+    //话题总数
+    private Integer topicTotal = 0;
+    //热议中总数
+    private Integer discussingTotal = 0;
+    //热议中总数占比
+    private BigDecimal discussingRatio = bi;
+    //已处理总数
+    private Integer closedTopicTotal = 0;
+    //已处理总数占比
+    private BigDecimal closedTopicRatio = bi;
+    //转议题总数
+    private Integer shiftIssueTotal = 0;
+    //转议题总数占比
+    private BigDecimal shiftIssueRatio = bi;
+    //议题总数
+    private Integer issueTotal = 0;
+    //表决中总数
+    private Integer votingTotal = 0;
+    //表决中总数占比
+    private BigDecimal votingRatio = bi;
+    //已处理总数
+    private Integer closedIssueTotal = 0;
+    //已处理总数占比
+    private BigDecimal closedIssueRatio = bi;
+    //已转项目总数
+    private Integer shiftProjectTotal = 0;
+    //已转项目总数占比
+    private BigDecimal shiftProjectRatio = bi;
+    //项目总数
+    private Integer projectTotal = 0;
+    //处理中总数
+    private Integer pendingTotal = 0;
+    //处理中总数占比
+    private BigDecimal pendingRatio = bi;
+    //已结案总数
+    private Integer closedProjectTotal = 0;
+    //已结案总数占比
+    private BigDecimal closedProjectRatio = bi;
+
+
+    @Data
+    public static class Topic implements Serializable {
+        //话题总量
+        private Integer topicTotal;
+        //话题数量
+        private Integer topicCount;
+        //话题状态 已关闭：closed、已屏蔽：hidden、 讨论中：discussing
+        private String topicStatus;
+        //话题已转议题数量
+        private Integer shiftedIssueTotal;
+        //数据更新至 时间
+        private String deadline;
+    }
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java
index 951696b919..162b7e5671 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java
@@ -3,6 +3,7 @@ package com.epmet.dataaggre.controller;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dataaggre.dto.datastats.form.AgenctBasicDataFormDTO;
+import com.epmet.dataaggre.dto.datastats.form.GridBasicDataFormDTO;
 import com.epmet.dataaggre.dto.datastats.form.SubAgencyFormDTO;
 import com.epmet.dataaggre.dto.datastats.form.SubGridFormDTO;
 import com.epmet.dataaggre.dto.datastats.result.*;
@@ -37,6 +38,17 @@ public class DataStatsController {
         return new Result<AgencyBasicDataResultDTO>().ok(dataStatsService.agencyBasicData(formDTO));
     }
 
+    /**
+     * @Param formDTO
+     * @Description 网格下五项基础数据汇总
+     * @author sun
+     */
+    @PostMapping("gridbasicdata")
+    public Result<GridBasicDataResultDTO> gridBasicData(@RequestBody GridBasicDataFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, GridBasicDataFormDTO.Grid.class);
+        return new Result<GridBasicDataResultDTO>().ok(dataStatsService.gridBasicData(formDTO));
+    }
+
     /**
      * @Param formDTO
      * @Description 查询当前组织的直属下级组织用户数据
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
index 6eb826dc8d..256aaeb15c 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
@@ -1,6 +1,7 @@
 package com.epmet.dataaggre.service.datastats;
 
 import com.epmet.dataaggre.dto.datastats.form.AgenctBasicDataFormDTO;
+import com.epmet.dataaggre.dto.datastats.form.GridBasicDataFormDTO;
 import com.epmet.dataaggre.dto.datastats.form.SubAgencyFormDTO;
 import com.epmet.dataaggre.dto.datastats.form.SubGridFormDTO;
 import com.epmet.dataaggre.dto.datastats.result.*;
@@ -20,6 +21,13 @@ public interface DataStatsService {
      */
     AgencyBasicDataResultDTO agencyBasicData(AgenctBasicDataFormDTO formDTO);
 
+    /**
+     * @Param formDTO
+     * @Description 网格下五项基础数据汇总
+     * @author sun
+     */
+    GridBasicDataResultDTO gridBasicData(GridBasicDataFormDTO formDTO);
+
     /**
      * @Param formDTO
      * @Description 查询当前组织的直属下级组织用户数据
@@ -91,4 +99,5 @@ public interface DataStatsService {
      * @author sun
      */
     List<SubGridProjectResultDTO> subGridProject(SubGridFormDTO formDTO);
+
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index cf3eefefb7..f8ddfde557 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -6,6 +6,7 @@ import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.datastats.DataStatsDao;
 import com.epmet.dataaggre.dto.datastats.form.AgenctBasicDataFormDTO;
+import com.epmet.dataaggre.dto.datastats.form.GridBasicDataFormDTO;
 import com.epmet.dataaggre.dto.datastats.form.SubAgencyFormDTO;
 import com.epmet.dataaggre.dto.datastats.form.SubGridFormDTO;
 import com.epmet.dataaggre.dto.datastats.result.*;
@@ -47,7 +48,7 @@ public class DataStatsServiceImpl implements DataStatsService {
         AgencyBasicDataResultDTO resultDTO = new AgencyBasicDataResultDTO();
         resultDTO.setAgencyId(formDTO.getAgencyId());
         NumberFormat numberFormat = NumberFormat.getInstance();
-        numberFormat.setMaximumFractionDigits(NumConstant.FOUR);
+        numberFormat.setMaximumFractionDigits(NumConstant.THREE);
 
         //入参有日期的则按具体时间执行,没有的则按当前时间前一天执行
         if (StringUtils.isBlank(formDTO.getDateId())) {
@@ -132,6 +133,103 @@ public class DataStatsServiceImpl implements DataStatsService {
         return resultDTO;
     }
 
+    /**
+     * @Param formDTO
+     * @Description 网格下五项基础数据汇总
+     * @author sun
+     */
+    @Override
+    public GridBasicDataResultDTO gridBasicData(GridBasicDataFormDTO formDTO) {
+        GridBasicDataResultDTO resultDTO = new GridBasicDataResultDTO();
+        resultDTO.setGridId(formDTO.getGridId());
+        NumberFormat numberFormat = NumberFormat.getInstance();
+        numberFormat.setMaximumFractionDigits(NumConstant.THREE);
+
+        //入参有日期的则按具体时间执行,没有的则按当前时间前一天执行
+        if (StringUtils.isBlank(formDTO.getDateId())) {
+            Date yesterday = DateUtils.addDateDays(new Date(), -1);
+            SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD);
+            formDTO.setDateId(format.format(yesterday));
+        }
+
+        //1.查询网格下注册用户最新日统计数据【只查询注册用户的统计数据，不涉及参与用户的】
+        List<String> gridIds = new ArrayList<>();
+        gridIds.add(formDTO.getGridId());
+        List<SubGridUserResultDTO> userList = dataStatsDao.getSubGridUser(gridIds, formDTO.getDateId());
+        if (userList.size() > NumConstant.ZERO) {
+            resultDTO.setUserTotal(userList.get(0).getUserTotal());
+            resultDTO.setResiTotal(userList.get(0).getResiTotal());
+            resultDTO.setResiRatio(resultDTO.getResiTotal() == 0 || resultDTO.getUserTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getResiTotal() / (float) resultDTO.getUserTotal())));
+            resultDTO.setPartyMemberTotal(userList.get(0).getPartyMemberTotal());
+            resultDTO.setPartyMemberRatio(resultDTO.getPartyMemberTotal() == 0 || resultDTO.getUserTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getPartyMemberTotal() / (float) resultDTO.getUserTotal())));
+        }
+
+        //2.查询网格下最新群组日统计数据
+        List<SubGridGroupResultDTO> groupList = dataStatsDao.getSubGridGroup(gridIds, formDTO.getDateId());
+        if (groupList.size() > NumConstant.ZERO) {
+            resultDTO.setGroupTotal(groupList.get(0).getGroupTotal());
+            resultDTO.setOrdinaryTotal(groupList.get(0).getOrdinaryTotal());
+            resultDTO.setOrdinaryRatio(resultDTO.getOrdinaryTotal() == 0 || resultDTO.getGroupTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getOrdinaryTotal() / (float) resultDTO.getGroupTotal())));
+            resultDTO.setBranchTotal(groupList.get(0).getBranchTotal());
+            resultDTO.setBranchRatio(resultDTO.getBranchTotal() == 0 || resultDTO.getGroupTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getBranchTotal() / (float) resultDTO.getGroupTotal())));
+        }
+
+        //3.查询网格下最新话题日统计数据
+        //状态话题-网格日统计数据表最新日期三种状态数据
+        //网格日表里三种类型数据之和就是话题总量，讨论中数量与热议中不是一个概念
+        List<SubGridFormDTO.Topic> topicList = dataStatsDao.getSubGridTopic(gridIds, formDTO.getDateId());
+        //转议题话题-网格日统计数据表
+        List<SubGridFormDTO.Topic> topicShiftIssueList = dataStatsDao.getSubGridTopicShiftIssue(gridIds, formDTO.getDateId());
+        //热议中话题-网格日统计数据
+        List<SubGridFormDTO.Topic> hotdiscussList = dataStatsDao.getSubGridTopicHotDiscuss(gridIds, formDTO.getDateId());
+        AtomicReference<Integer> closedTotal = new AtomicReference<>(0);
+        if (topicList.size() > NumConstant.ZERO) {
+            resultDTO.setTopicTotal(topicList.stream().collect(Collectors.summingInt(SubGridFormDTO.Topic::getTopicCount)));
+            topicList.forEach(t -> {
+                if (t.getTopicStatus().equals("closed")) {
+                    closedTotal.set(t.getTopicCount());
+                }
+            });
+        }
+        //转议题
+        if (topicShiftIssueList.size() > NumConstant.ZERO) {
+            resultDTO.setShiftIssueTotal(topicShiftIssueList.get(0).getShiftedIssueTotal());
+            resultDTO.setShiftIssueRatio(resultDTO.getShiftIssueTotal() == 0 || resultDTO.getTopicTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getShiftIssueTotal() / (float) resultDTO.getTopicTotal())));
+        }
+        //热议中
+        if (hotdiscussList.size() > NumConstant.ZERO) {
+            resultDTO.setDiscussingTotal(hotdiscussList.get(0).getTopicCount());
+            resultDTO.setDiscussingRatio(resultDTO.getDiscussingTotal() == 0 || resultDTO.getTopicTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getDiscussingTotal() / (float) resultDTO.getTopicTotal())));
+        }
+        //已处理
+        resultDTO.setClosedTopicTotal(closedTotal.get());
+        resultDTO.setClosedTopicRatio(resultDTO.getClosedTopicTotal() == 0 || resultDTO.getTopicTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getClosedTopicTotal() / (float) resultDTO.getTopicTotal())));
+
+        //4.查询网格下最新议题日统计数据
+        List<SubGridIssueResultDTO> issueList = dataStatsDao.getSubGridIssue(gridIds, formDTO.getDateId());
+        if (issueList.size() > NumConstant.ZERO) {
+            resultDTO.setIssueTotal(issueList.get(0).getIssueTotal());
+            resultDTO.setVotingTotal(issueList.get(0).getVotingTotal());
+            resultDTO.setVotingRatio(resultDTO.getVotingTotal() == 0 || resultDTO.getIssueTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getVotingTotal() / (float) resultDTO.getIssueTotal())));
+            resultDTO.setClosedIssueTotal(issueList.get(0).getClosedIssueTotal());
+            resultDTO.setClosedIssueRatio(resultDTO.getClosedIssueTotal() == 0 || resultDTO.getIssueTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getClosedIssueTotal() / (float) resultDTO.getIssueTotal())));
+            resultDTO.setShiftProjectTotal(issueList.get(0).getShiftProjectTotal());
+            resultDTO.setShiftProjectRatio(resultDTO.getShiftProjectTotal() == 0 || resultDTO.getIssueTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getShiftProjectTotal() / (float) resultDTO.getIssueTotal())));
+        }
+
+        //5.查询网格下最新项目日统计数据
+        List<SubGridProjectResultDTO> projectList = dataStatsDao.getSubGridProject(gridIds, formDTO.getDateId());
+        if (projectList.size() > NumConstant.ZERO) {
+            resultDTO.setProjectTotal(projectList.get(0).getProjectTotal());
+            resultDTO.setPendingTotal(projectList.get(0).getPendingTotal());
+            resultDTO.setPendingRatio(resultDTO.getPendingTotal() == 0 || resultDTO.getProjectTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getPendingTotal() / (float) resultDTO.getProjectTotal())));
+            resultDTO.setClosedProjectTotal(projectList.get(0).getClosedProjectTotal());
+            resultDTO.setClosedProjectRatio(resultDTO.getClosedProjectTotal() == 0 || resultDTO.getProjectTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getClosedProjectTotal() / (float) resultDTO.getProjectTotal())));
+        }
+
+        return resultDTO;
+    }
+
     /**
      * @Param formDTO
      * @Description 查询当前组织的直属下级组织用户数据
@@ -141,7 +239,7 @@ public class DataStatsServiceImpl implements DataStatsService {
     public List<SubAgencyUserResultDTO> subAgencyUser(SubAgencyFormDTO formDTO) {
         List<SubAgencyUserResultDTO> resultList = new ArrayList<>();
         NumberFormat numberFormat = NumberFormat.getInstance();
-        numberFormat.setMaximumFractionDigits(NumConstant.FOUR);
+        numberFormat.setMaximumFractionDigits(NumConstant.THREE);
 
         //入参有日期的则按具体时间执行,没有的则按当前时间前一天执行
         if (StringUtils.isBlank(formDTO.getDateId())) {
@@ -204,7 +302,7 @@ public class DataStatsServiceImpl implements DataStatsService {
     public List<SubGridUserResultDTO> subGridUser(SubGridFormDTO formDTO) {
         List<SubGridUserResultDTO> resultList = new ArrayList<>();
         NumberFormat numberFormat = NumberFormat.getInstance();
-        numberFormat.setMaximumFractionDigits(NumConstant.FOUR);
+        numberFormat.setMaximumFractionDigits(NumConstant.THREE);
 
         //入参有日期的则按具体时间执行,没有的则按当前时间前一天执行
         if (StringUtils.isBlank(formDTO.getDateId())) {
@@ -265,7 +363,7 @@ public class DataStatsServiceImpl implements DataStatsService {
     public List<SubAgencyGroupResultDTO> subAgencyGroup(SubAgencyFormDTO formDTO) {
         List<SubAgencyGroupResultDTO> resultList = new ArrayList<>();
         NumberFormat numberFormat = NumberFormat.getInstance();
-        numberFormat.setMaximumFractionDigits(NumConstant.FOUR);
+        numberFormat.setMaximumFractionDigits(NumConstant.THREE);
 
         //入参有日期的则按具体时间执行,没有的则按当前时间前一天执行
         if (StringUtils.isBlank(formDTO.getDateId())) {
@@ -325,7 +423,7 @@ public class DataStatsServiceImpl implements DataStatsService {
     public List<SubGridGroupResultDTO> subGridGroup(SubGridFormDTO formDTO) {
         List<SubGridGroupResultDTO> resultList = new ArrayList<>();
         NumberFormat numberFormat = NumberFormat.getInstance();
-        numberFormat.setMaximumFractionDigits(NumConstant.FOUR);
+        numberFormat.setMaximumFractionDigits(NumConstant.THREE);
 
         //入参有日期的则按具体时间执行,没有的则按当前时间前一天执行
         if (StringUtils.isBlank(formDTO.getDateId())) {
@@ -386,7 +484,7 @@ public class DataStatsServiceImpl implements DataStatsService {
     public List<SubAgencyTopicResultDTO> subAgencyTopic(SubAgencyFormDTO formDTO) {
         List<SubAgencyTopicResultDTO> resultList = new ArrayList<>();
         NumberFormat numberFormat = NumberFormat.getInstance();
-        numberFormat.setMaximumFractionDigits(NumConstant.FOUR);
+        numberFormat.setMaximumFractionDigits(NumConstant.THREE);
 
         //入参有日期的则按具体时间执行,没有的则按当前时间前一天执行
         if (StringUtils.isBlank(formDTO.getDateId())) {
@@ -486,7 +584,7 @@ public class DataStatsServiceImpl implements DataStatsService {
     public List<SubGridTopicResultDTO> subGridTopic(SubGridFormDTO formDTO) {
         List<SubGridTopicResultDTO> resultList = new ArrayList<>();
         NumberFormat numberFormat = NumberFormat.getInstance();
-        numberFormat.setMaximumFractionDigits(NumConstant.FOUR);
+        numberFormat.setMaximumFractionDigits(NumConstant.THREE);
 
         //入参有日期的则按具体时间执行,没有的则按当前时间前一天执行
         if (StringUtils.isBlank(formDTO.getDateId())) {
@@ -585,7 +683,7 @@ public class DataStatsServiceImpl implements DataStatsService {
     public List<SubAgencyIssueResultDTO> subAgencyIssue(SubAgencyFormDTO formDTO) {
         List<SubAgencyIssueResultDTO> resultList = new ArrayList<>();
         NumberFormat numberFormat = NumberFormat.getInstance();
-        numberFormat.setMaximumFractionDigits(NumConstant.FOUR);
+        numberFormat.setMaximumFractionDigits(NumConstant.THREE);
 
         //入参有日期的则按具体时间执行,没有的则按当前时间前一天执行
         if (StringUtils.isBlank(formDTO.getDateId())) {
@@ -648,7 +746,7 @@ public class DataStatsServiceImpl implements DataStatsService {
     public List<SubGridIssueResultDTO> subGridIssue(SubGridFormDTO formDTO) {
         List<SubGridIssueResultDTO> resultList = new ArrayList<>();
         NumberFormat numberFormat = NumberFormat.getInstance();
-        numberFormat.setMaximumFractionDigits(NumConstant.FOUR);
+        numberFormat.setMaximumFractionDigits(NumConstant.THREE);
 
         //入参有日期的则按具体时间执行,没有的则按当前时间前一天执行
         if (StringUtils.isBlank(formDTO.getDateId())) {
@@ -711,7 +809,7 @@ public class DataStatsServiceImpl implements DataStatsService {
     public List<SubAgencyProjectResultDTO> subAgencyProject(SubAgencyFormDTO formDTO) {
         List<SubAgencyProjectResultDTO> resultList = new ArrayList<>();
         NumberFormat numberFormat = NumberFormat.getInstance();
-        numberFormat.setMaximumFractionDigits(NumConstant.FOUR);
+        numberFormat.setMaximumFractionDigits(NumConstant.THREE);
 
         //入参有日期的则按具体时间执行,没有的则按当前时间前一天执行
         if (StringUtils.isBlank(formDTO.getDateId())) {
@@ -771,7 +869,7 @@ public class DataStatsServiceImpl implements DataStatsService {
     public List<SubGridProjectResultDTO> subGridProject(SubGridFormDTO formDTO) {
         List<SubGridProjectResultDTO> resultList = new ArrayList<>();
         NumberFormat numberFormat = NumberFormat.getInstance();
-        numberFormat.setMaximumFractionDigits(NumConstant.FOUR);
+        numberFormat.setMaximumFractionDigits(NumConstant.THREE);
 
         //入参有日期的则按具体时间执行,没有的则按当前时间前一天执行
         if (StringUtils.isBlank(formDTO.getDateId())) {

From 58d051118469ff6aa3b7890888ad403c876676ae Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 18 May 2021 16:13:37 +0800
Subject: [PATCH 032/128] =?UTF-8?q?=E8=BD=AC=E8=AE=AE=E9=A2=98=E8=AF=9D?=
 =?UTF-8?q?=E9=A2=98=E4=B8=8D=E5=85=81=E8=AE=B8=E5=B1=8F=E8=94=BD=E6=88=96?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commons/tools/exception/EpmetErrorCode.java      |  1 +
 .../topic/service/impl/ResiTopicServiceImpl.java     | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
index b7b70c5159..a38c4cbb0e 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
@@ -150,6 +150,7 @@ public enum EpmetErrorCode {
     TOPIC_ALREADY_SHIFTED_TO_ISSUE(9005,"该话题已被转为议题，请勿重复操作"),
     TOPIC_IS_HIDDEN(9006,"该话题已被屏蔽，请先解除屏蔽"),
     TOPIC_IS_CLOSED(9008,"该话题已关闭，无法转为议题"),
+	TOPIC_SHIFT_ISSUE(9008,"该话题已转议题，不允许关闭或屏蔽"),
 
     CUSTOMER_CATEGORY(9101,"分类已使用，不允许删除"),
     CATEGORY_NAME(9102,"分类名称已存在，不允许重复"),
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
index ec51f04815..abf3c2a315 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
@@ -630,6 +630,12 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             throw new RenException(EpmetErrorCode.TOPIC_SHIFTED_TO_ISSUE_UNDER_AUDITING.getCode());
         }
 
+        //1.4已转议题的话题不允许关闭  2021.5.18   sun   start
+        if (topic.getShiftIssue()) {
+            throw new RenException(EpmetErrorCode.TOPIC_SHIFT_ISSUE.getCode());
+        }
+        //2021.5.18  sun  end
+
         //2.屏蔽话题
         ResiTopicEntity topicForUpdate = new ResiTopicEntity();
         topicForUpdate.setId(hiddenFormDTO.getTopicId());
@@ -767,6 +773,12 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             throw new RenException(EpmetErrorCode.TOPIC_SHIFTED_TO_ISSUE_UNDER_AUDITING.getCode());
         }
 
+        //1.4已转议题的话题不允许关闭  2021.5.18   sun   start
+        if (topic.getShiftIssue()) {
+            throw new RenException(EpmetErrorCode.TOPIC_SHIFT_ISSUE.getCode());
+        }
+        //2021.5.18  sun  end
+
         //2.关闭操作
         topic.setClosedStatus(closeFormDTO.getClosedStatus());
         baseDao.updateById(topic);

From 74b7fa0db54b86194d4b99aa2a79a142b15e2a3e Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Tue, 18 May 2021 16:25:04 +0800
Subject: [PATCH 033/128] =?UTF-8?q?=E5=85=9A=E5=91=98=E5=85=88=E9=94=8B?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dataaggre/constant/OrgConstant.java |   2 +
 .../form/PartyMemberVanguardFormDTO.java      |  18 ++
 .../PartyMemberVanguardDetailResultDTO.java   |  74 ++++++++
 .../PartyMemberVanguardRankResultDTO.java     |  18 ++
 .../PartyMemberVanguardController.java        |  51 +++++
 .../dataaggre/dao/datastats/DataStatsDao.java |  36 ++++
 .../service/datastats/DataStatsService.java   |  19 ++
 .../datastats/impl/DataStatsServiceImpl.java  |  68 +++++++
 .../mapper/datastats/DatsStatsDao.xml         | 174 ++++++++++++++++++
 .../com/epmet/controller/DemoController.java  |   2 +-
 .../StatsPartyMemberVanguardServiceImpl.java  |  50 ++---
 .../extract/FactOriginProjectMainDailyDao.xml |   4 +
 12 files changed, 490 insertions(+), 26 deletions(-)
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/PartyMemberVanguardFormDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/PartyMemberVanguardDetailResultDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/PartyMemberVanguardRankResultDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/PartyMemberVanguardController.java

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/OrgConstant.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/OrgConstant.java
index 987c2a2697..a7da3d564b 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/OrgConstant.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/OrgConstant.java
@@ -5,4 +5,6 @@ package com.epmet.dataaggre.constant;
  * @DateTime 2020/12/25 上午10:55
  */
 public interface OrgConstant {
+	String AGENCY = "agency";
+	String GRID = "grid";
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/PartyMemberVanguardFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/PartyMemberVanguardFormDTO.java
new file mode 100644
index 0000000000..2b70bbeaa0
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/PartyMemberVanguardFormDTO.java
@@ -0,0 +1,18 @@
+package com.epmet.dataaggre.dto.datastats.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2021/5/18 14:25
+ */
+@Data
+public class PartyMemberVanguardFormDTO implements Serializable {
+	private static final long serialVersionUID = -4331281350678714877L;
+	private String agencyId;
+	private String orgId;
+	private String orgType;
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/PartyMemberVanguardDetailResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/PartyMemberVanguardDetailResultDTO.java
new file mode 100644
index 0000000000..929178031d
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/PartyMemberVanguardDetailResultDTO.java
@@ -0,0 +1,74 @@
+package com.epmet.dataaggre.dto.datastats.result;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2021/5/18 14:27
+ */
+@NoArgsConstructor
+@Data
+public class PartyMemberVanguardDetailResultDTO implements Serializable {
+	private static final long serialVersionUID = 8315392246739995430L;
+	/**
+	 * 组织ID
+	 */
+	private String orgId;
+	/**
+	 * 组织名
+	 */
+	private String orgName;
+	/**
+	 * 党员建组数
+	 */
+	private Integer groupCount;
+	/**
+	 * 党员建组数占比
+	 */
+	private BigDecimal groupRatio;
+	/**
+	 * 组内党员人数
+	 */
+	private Integer groupMemberCount;
+	/**
+	 * 组内党员人数占比
+	 */
+	private BigDecimal groupMemberRatio;
+	/**
+	 * 党员发布话题数
+	 */
+	private Integer topicCount;
+	/**
+	 * 党员发布话题数占比
+	 */
+	private BigDecimal topicRatio;
+	/**
+	 * 党员发布话题转议题数
+	 */
+	private Integer issueCount;
+	/**
+	 * 党员发布话题转议题数占比
+	 */
+	private BigDecimal issueRatio;
+	/**
+	 * 党员发布话题转项目数
+	 */
+	private Integer projectCount;
+	/**
+	 * 党员发布话题转项目数占比
+	 */
+	private BigDecimal projectRatio;
+	/**
+	 * 党员发布话题转项目结案数
+	 */
+	private Integer projectClosedCount;
+	/**
+	 * 党员发布话题转项目结案数占比
+	 */
+	private BigDecimal projectClosedRatio;
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/PartyMemberVanguardRankResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/PartyMemberVanguardRankResultDTO.java
new file mode 100644
index 0000000000..9d2f643229
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/PartyMemberVanguardRankResultDTO.java
@@ -0,0 +1,18 @@
+package com.epmet.dataaggre.dto.datastats.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2021/5/18 14:30
+ */
+@Data
+public class PartyMemberVanguardRankResultDTO implements Serializable {
+	private static final long serialVersionUID = -3103242333633668412L;
+	private List<PartyMemberVanguardDetailResultDTO> agencyRank;
+	private List<PartyMemberVanguardDetailResultDTO> gridRank;
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/PartyMemberVanguardController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/PartyMemberVanguardController.java
new file mode 100644
index 0000000000..6acf23d69e
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/PartyMemberVanguardController.java
@@ -0,0 +1,51 @@
+package com.epmet.dataaggre.controller;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dataaggre.dto.datastats.form.PartyMemberVanguardFormDTO;
+import com.epmet.dataaggre.dto.datastats.result.PartyMemberVanguardDetailResultDTO;
+import com.epmet.dataaggre.dto.datastats.result.PartyMemberVanguardRankResultDTO;
+import com.epmet.dataaggre.service.datastats.DataStatsService;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2021/5/18 14:19
+ */
+@RestController
+@RequestMapping("vanguard")
+public class PartyMemberVanguardController {
+	@Resource
+	private DataStatsService dataStatsService;
+
+	/**
+	 * 党员先锋--组织/网格详情
+	 * @author zhaoqifeng
+	 * @date 2021/5/18 15:16 
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result<com.epmet.dataaggre.dto.datastats.result.PartyMemberVanguardDetailResultDTO>
+	 */
+	@PostMapping("detail")
+	public Result<PartyMemberVanguardDetailResultDTO> vanguardDetail(@RequestBody PartyMemberVanguardFormDTO formDTO) {
+		PartyMemberVanguardDetailResultDTO result = dataStatsService.vanguardDetail(formDTO);
+		return new Result<PartyMemberVanguardDetailResultDTO>().ok(result);
+	}
+
+	/**
+	 * 党员先锋--下级组织排行
+	 * @author zhaoqifeng
+	 * @date 2021/5/18 15:16
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result<com.epmet.dataaggre.dto.datastats.result.PartyMemberVanguardRankResultDTO>
+	 */
+	@PostMapping("orgrank")
+	public Result<PartyMemberVanguardRankResultDTO> vanguardRank(@RequestBody PartyMemberVanguardFormDTO formDTO) {
+		PartyMemberVanguardRankResultDTO result = dataStatsService.vanguardRank(formDTO);
+		return new Result<PartyMemberVanguardRankResultDTO>().ok(result);
+	}
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
index d84e733e50..d6729152b5 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
@@ -172,4 +172,40 @@ public interface DataStatsDao {
      */
     List<SubGridProjectResultDTO> getSubGridProject(@Param("gridIds") List<String> gridIds, @Param("dateId") String dateId);
 
+    /**
+     * 查询组织党员先锋详情
+     * @author zhaoqifeng
+     * @date 2021/5/18 14:40
+     * @param agencyId
+     * @return com.epmet.dataaggre.dto.datastats.result.PartyMemberVanguardDetailResultDTO
+     */
+    PartyMemberVanguardDetailResultDTO selectAgencyVanguardDetail(@Param("agencyId") String agencyId);
+
+    /**
+     * 查询网格党员先锋详情
+     * @author zhaoqifeng
+     * @date 2021/5/18 14:40
+     * @param grid
+     * @return com.epmet.dataaggre.dto.datastats.result.PartyMemberVanguardDetailResultDTO
+     */
+    PartyMemberVanguardDetailResultDTO selectGridVanguardDetail(@Param("grid") String grid);
+
+    /**
+     * 查询组织党员先锋排行
+     * @author zhaoqifeng
+     * @date 2021/5/18 15:02
+     * @param agencyId
+     * @return java.util.List<com.epmet.dataaggre.dto.datastats.result.PartyMemberVanguardDetailResultDTO>
+     */
+    List<PartyMemberVanguardDetailResultDTO> selectAgencyVanguardRank(@Param("agencyId") String agencyId);
+
+    /**
+     * 查询网格党员先锋排行
+     * @author zhaoqifeng
+     * @date 2021/5/18 15:03
+     * @param agencyId
+     * @return java.util.List<com.epmet.dataaggre.dto.datastats.result.PartyMemberVanguardDetailResultDTO>
+     */
+    List<PartyMemberVanguardDetailResultDTO> selectGridVanguardRank(@Param("agencyId") String agencyId);
+
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
index 256aaeb15c..282a2d8f8a 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
@@ -1,6 +1,7 @@
 package com.epmet.dataaggre.service.datastats;
 
 import com.epmet.dataaggre.dto.datastats.form.AgenctBasicDataFormDTO;
+import com.epmet.dataaggre.dto.datastats.form.PartyMemberVanguardFormDTO;
 import com.epmet.dataaggre.dto.datastats.form.GridBasicDataFormDTO;
 import com.epmet.dataaggre.dto.datastats.form.SubAgencyFormDTO;
 import com.epmet.dataaggre.dto.datastats.form.SubGridFormDTO;
@@ -100,4 +101,22 @@ public interface DataStatsService {
      */
     List<SubGridProjectResultDTO> subGridProject(SubGridFormDTO formDTO);
 
+    /**
+     * 党员先锋--组织/网格详情
+     * @author zhaoqifeng
+     * @date 2021/5/18 14:35
+     * @param formDTO
+     * @return com.epmet.dataaggre.dto.datastats.result.PartyMemberVanguardDetailResultDTO
+     */
+    PartyMemberVanguardDetailResultDTO vanguardDetail(PartyMemberVanguardFormDTO formDTO);
+
+    /**
+     * 党员先锋--下级组织排行
+     * @author zhaoqifeng
+     * @date 2021/5/18 14:36
+     * @param formDTO
+     * @return com.epmet.dataaggre.dto.datastats.result.PartyMemberVanguardDetailResultDTO
+     */
+    PartyMemberVanguardRankResultDTO vanguardRank(PartyMemberVanguardFormDTO formDTO);
+
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index f8ddfde557..2fdbdc353e 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -4,8 +4,10 @@ import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.dataaggre.constant.DataSourceConstant;
+import com.epmet.dataaggre.constant.OrgConstant;
 import com.epmet.dataaggre.dao.datastats.DataStatsDao;
 import com.epmet.dataaggre.dto.datastats.form.AgenctBasicDataFormDTO;
+import com.epmet.dataaggre.dto.datastats.form.PartyMemberVanguardFormDTO;
 import com.epmet.dataaggre.dto.datastats.form.GridBasicDataFormDTO;
 import com.epmet.dataaggre.dto.datastats.form.SubAgencyFormDTO;
 import com.epmet.dataaggre.dto.datastats.form.SubGridFormDTO;
@@ -14,11 +16,13 @@ import com.epmet.dataaggre.entity.datastats.DimAgencyEntity;
 import com.epmet.dataaggre.entity.datastats.DimGridEntity;
 import com.epmet.dataaggre.service.datastats.DataStatsService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.text.NumberFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -920,4 +924,68 @@ public class DataStatsServiceImpl implements DataStatsService {
         return resultList;
     }
 
+    /**
+     * 党员先锋--组织/网格详情
+     *
+     * @param formDTO
+     * @return com.epmet.dataaggre.dto.datastats.result.PartyMemberVanguardDetailResultDTO
+     * @author zhaoqifeng
+     * @date 2021/5/18 14:35
+     */
+    @Override
+    public PartyMemberVanguardDetailResultDTO vanguardDetail(PartyMemberVanguardFormDTO formDTO) {
+        PartyMemberVanguardDetailResultDTO result;
+        if (OrgConstant.AGENCY.equals(formDTO.getOrgType())) {
+            result = dataStatsDao.selectAgencyVanguardDetail(formDTO.getOrgId());
+        } else {
+            result = dataStatsDao.selectGridVanguardDetail(formDTO.getOrgId());
+        }
+        result.setGroupRatio(transform(result.getGroupRatio()));
+        result.setGroupMemberRatio(transform(result.getGroupMemberRatio()));
+        result.setTopicRatio(transform(result.getTopicRatio()));
+        result.setIssueRatio(transform(result.getIssueRatio()));
+        result.setProjectRatio(transform(result.getProjectRatio()));
+        result.setProjectClosedRatio(transform(result.getProjectClosedRatio()));
+        return result;
+    }
+
+    /**
+     * 党员先锋--下级组织排行
+     *
+     * @param formDTO
+     * @return com.epmet.dataaggre.dto.datastats.result.PartyMemberVanguardDetailResultDTO
+     * @author zhaoqifeng
+     * @date 2021/5/18 14:36
+     */
+    @Override
+    public PartyMemberVanguardRankResultDTO vanguardRank(PartyMemberVanguardFormDTO formDTO) {
+        List<PartyMemberVanguardDetailResultDTO> agencyRank = dataStatsDao.selectAgencyVanguardRank(formDTO.getAgencyId());
+        List<PartyMemberVanguardDetailResultDTO> gridRank = dataStatsDao.selectGridVanguardRank(formDTO.getAgencyId());
+        PartyMemberVanguardRankResultDTO result = new PartyMemberVanguardRankResultDTO();
+        result.setAgencyRank(CollectionUtils.isNotEmpty(agencyRank)?agencyRank:Collections.emptyList());
+        result.setGridRank(CollectionUtils.isNotEmpty(gridRank)?gridRank:Collections.emptyList());
+        result.getAgencyRank().forEach(item -> {
+            item.setGroupRatio(transform(item.getGroupRatio()));
+            item.setGroupMemberRatio(transform(item.getGroupMemberRatio()));
+            item.setTopicRatio(transform(item.getTopicRatio()));
+            item.setIssueRatio(transform(item.getIssueRatio()));
+            item.setProjectRatio(transform(item.getProjectRatio()));
+            item.setProjectClosedRatio(transform(item.getProjectClosedRatio()));
+        });
+        result.getGridRank().forEach(item -> {
+            item.setGroupRatio(transform(item.getGroupRatio()));
+            item.setGroupMemberRatio(transform(item.getGroupMemberRatio()));
+            item.setTopicRatio(transform(item.getTopicRatio()));
+            item.setIssueRatio(transform(item.getIssueRatio()));
+            item.setProjectRatio(transform(item.getProjectRatio()));
+            item.setProjectClosedRatio(transform(item.getProjectClosedRatio()));
+        });
+        return result;
+    }
+
+    private BigDecimal transform(BigDecimal count) {
+        return count.multiply(new BigDecimal(NumConstant.ONE_HUNDRED) ).setScale(NumConstant.ONE,
+                RoundingMode.HALF_UP);
+    }
+
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
index 4096010837..ffaeff4e5d 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
@@ -356,5 +356,179 @@
         ORDER BY
             project_total DESC
     </select>
+    <select id="selectAgencyVanguardDetail" resultType="com.epmet.dataaggre.dto.datastats.result.PartyMemberVanguardDetailResultDTO">
+        SELECT
+            orgId,
+            orgName,
+            GROUP_COUNT,
+            GROUP_RATIO,
+            GROUP_MEMBER_COUNT,
+            GROUP_MEMBER_RATIO,
+            TOPIC_COUNT,
+            TOPIC_RATIO,
+            ISSUE_COUNT,
+            ISSUE_RATIO,
+            PROJECT_COUNT,
+            PROJECT_RATIO,
+            PROJECT_CLOSED_COUNT,
+            PROJECT_CLOSED_RATIO
+        FROM
+            (
+                SELECT
+                    AGENCY_ID AS "orgId",
+                    AGENCY_NAME AS "orgName",
+                    GROUP_COUNT,
+                    GROUP_RATIO,
+                    GROUP_MEMBER_COUNT,
+                    GROUP_MEMBER_RATIO,
+                    TOPIC_COUNT,
+                    TOPIC_RATIO,
+                    ISSUE_COUNT,
+                    ISSUE_RATIO,
+                    PROJECT_COUNT,
+                    PROJECT_RATIO,
+                    PROJECT_CLOSED_COUNT,
+                    PROJECT_CLOSED_RATIO,
+                    MAX( DATE_ID )
+                FROM
+                    fact_party_member_vanguard_agency_daily a
+                        INNER JOIN dim_agency b ON a.AGENCY_ID = b.ID
+                WHERE
+                    a.AGENCY_ID = #{agencyId}
+                GROUP BY
+                    AGENCY_ID
+            ) a
+    </select>
+    <select id="selectGridVanguardDetail" resultType="com.epmet.dataaggre.dto.datastats.result.PartyMemberVanguardDetailResultDTO">
+        SELECT
+            orgId,
+            orgName,
+            GROUP_COUNT,
+            GROUP_RATIO,
+            GROUP_MEMBER_COUNT,
+            GROUP_MEMBER_RATIO,
+            TOPIC_COUNT,
+            TOPIC_RATIO,
+            ISSUE_COUNT,
+            ISSUE_RATIO,
+            PROJECT_COUNT,
+            PROJECT_RATIO,
+            PROJECT_CLOSED_COUNT,
+            PROJECT_CLOSED_RATIO
+        FROM
+            (
+                SELECT
+                    GRID_ID AS "orgId",
+                    GRID_NAME AS "orgName",
+                    GROUP_COUNT,
+                    GROUP_RATIO,
+                    GROUP_MEMBER_COUNT,
+                    GROUP_MEMBER_RATIO,
+                    TOPIC_COUNT,
+                    TOPIC_RATIO,
+                    ISSUE_COUNT,
+                    ISSUE_RATIO,
+                    PROJECT_COUNT,
+                    PROJECT_RATIO,
+                    PROJECT_CLOSED_COUNT,
+                    PROJECT_CLOSED_RATIO,
+                    MAX( DATE_ID )
+                FROM
+                    fact_party_member_vanguard_grid_daily a
+                    INNER JOIN dim_grid b ON a.GRID_ID = b.ID
+                WHERE
+                    a.GRID_ID = #{grid}
+                GROUP BY
+                    GRID_ID
+            ) a
+    </select>
+    <select id="selectAgencyVanguardRank" resultType="com.epmet.dataaggre.dto.datastats.result.PartyMemberVanguardDetailResultDTO">
+        SELECT
+            orgId,
+            orgName,
+            GROUP_COUNT,
+            GROUP_RATIO,
+            GROUP_MEMBER_COUNT,
+            GROUP_MEMBER_RATIO,
+            TOPIC_COUNT,
+            TOPIC_RATIO,
+            ISSUE_COUNT,
+            ISSUE_RATIO,
+            PROJECT_COUNT,
+            PROJECT_RATIO,
+            PROJECT_CLOSED_COUNT,
+            PROJECT_CLOSED_RATIO
+        FROM
+            (
+                SELECT
+                    AGENCY_ID AS "orgId",
+                    AGENCY_NAME AS "orgName",
+                    GROUP_COUNT,
+                    GROUP_RATIO,
+                    GROUP_MEMBER_COUNT,
+                    GROUP_MEMBER_RATIO,
+                    TOPIC_COUNT,
+                    TOPIC_RATIO,
+                    ISSUE_COUNT,
+                    ISSUE_RATIO,
+                    PROJECT_COUNT,
+                    PROJECT_RATIO,
+                    PROJECT_CLOSED_COUNT,
+                    PROJECT_CLOSED_RATIO,
+                    MAX( DATE_ID )
+                FROM
+                    fact_party_member_vanguard_agency_daily a
+                        INNER JOIN dim_agency b ON a.AGENCY_ID = b.ID
+                WHERE
+                    a.PID = #{agencyId}
+                GROUP BY
+                    AGENCY_ID
+            ) a
+        ORDER BY GROUP_COUNT DESC
+    </select>
+    <select id="selectGridVanguardRank" resultType="com.epmet.dataaggre.dto.datastats.result.PartyMemberVanguardDetailResultDTO">
+        SELECT
+            orgId,
+            orgName,
+            GROUP_COUNT,
+            GROUP_RATIO,
+            GROUP_MEMBER_COUNT,
+            GROUP_MEMBER_RATIO,
+            TOPIC_COUNT,
+            TOPIC_RATIO,
+            ISSUE_COUNT,
+            ISSUE_RATIO,
+            PROJECT_COUNT,
+            PROJECT_RATIO,
+            PROJECT_CLOSED_COUNT,
+            PROJECT_CLOSED_RATIO
+        FROM
+            (
+                SELECT
+                    GRID_ID AS "orgId",
+                    GRID_NAME AS "orgName",
+                    GROUP_COUNT,
+                    GROUP_RATIO,
+                    GROUP_MEMBER_COUNT,
+                    GROUP_MEMBER_RATIO,
+                    TOPIC_COUNT,
+                    TOPIC_RATIO,
+                    ISSUE_COUNT,
+                    ISSUE_RATIO,
+                    PROJECT_COUNT,
+                    PROJECT_RATIO,
+                    PROJECT_CLOSED_COUNT,
+                    PROJECT_CLOSED_RATIO,
+                    MAX( DATE_ID )
+                FROM
+                    fact_party_member_vanguard_grid_daily a
+                        INNER JOIN dim_grid b ON a.GRID_ID = b.ID
+                WHERE
+                    a.AGENCY_ID = #{agencyId}
+                GROUP BY
+                    GRID_ID
+            ) a
+        ORDER BY GROUP_COUNT DESC
+    </select>
 
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
index 018dc35102..644830e3a2 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
@@ -878,7 +878,7 @@ public class DemoController {
     }
 
     @PostMapping("vanguard")
-    public Result partyMemberVanguard(StatsFormDTO formDTO) {
+    public Result partyMemberVanguard(@RequestBody StatsFormDTO formDTO) {
         statsPartyMemberVanguardService.agencyStats(formDTO);
         statsPartyMemberVanguardService.gridStats(formDTO);
         return new Result();
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPartyMemberVanguardServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPartyMemberVanguardServiceImpl.java
index 080a168591..7147774894 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPartyMemberVanguardServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPartyMemberVanguardServiceImpl.java
@@ -146,9 +146,9 @@ public class StatsPartyMemberVanguardServiceImpl implements StatsPartyMemberVang
 				vanguardList.forEach(item -> {
 					OrgStatisticsResultDTO dto = topicStatic.get(item.getAgencyId());
 					if (null != dto) {
-						item.setGroupMemberCount(dto.getCount());
-						item.setGroupMemberRatio(dto.getRatio());
-						item.setGroupMemberTotal(dto.getSum());
+						item.setTopicCount(dto.getCount());
+						item.setTopicRatio(dto.getRatio());
+						item.setTopicTotal(dto.getSum());
 					}
 				});
 			}
@@ -159,9 +159,9 @@ public class StatsPartyMemberVanguardServiceImpl implements StatsPartyMemberVang
 				vanguardList.forEach(item -> {
 					OrgStatisticsResultDTO dto = issueStatic.get(item.getAgencyId());
 					if (null != dto) {
-						item.setGroupMemberCount(dto.getCount());
-						item.setGroupMemberRatio(dto.getRatio());
-						item.setGroupMemberTotal(dto.getSum());
+						item.setIssueCount(dto.getCount());
+						item.setIssueRatio(dto.getRatio());
+						item.setIssueTotal(dto.getSum());
 					}
 				});
 			}
@@ -172,9 +172,9 @@ public class StatsPartyMemberVanguardServiceImpl implements StatsPartyMemberVang
 				vanguardList.forEach(item -> {
 					OrgStatisticsResultDTO dto = projectStatic.get(item.getAgencyId());
 					if (null != dto) {
-						item.setGroupMemberCount(dto.getCount());
-						item.setGroupMemberRatio(dto.getRatio());
-						item.setGroupMemberTotal(dto.getSum());
+						item.setProjectCount(dto.getCount());
+						item.setProjectRatio(dto.getRatio());
+						item.setProjectTotal(dto.getSum());
 					}
 				});
 			}
@@ -185,9 +185,9 @@ public class StatsPartyMemberVanguardServiceImpl implements StatsPartyMemberVang
 				vanguardList.forEach(item -> {
 					OrgStatisticsResultDTO dto = closedStatic.get(item.getAgencyId());
 					if (null != dto) {
-						item.setGroupMemberCount(dto.getCount());
-						item.setGroupMemberRatio(dto.getRatio());
-						item.setGroupMemberTotal(dto.getSum());
+						item.setProjectClosedCount(dto.getCount());
+						item.setProjectClosedRatio(dto.getRatio());
+						item.setProjectClosedTotal(dto.getSum());
 					}
 				});
 			}
@@ -214,7 +214,7 @@ public class StatsPartyMemberVanguardServiceImpl implements StatsPartyMemberVang
 		}
 		//入参有客户Id的则按客户Id执行，没有的则全部客户都执行
 		if (null != formDTO && StringUtils.isNotBlank(formDTO.getCustomerId())) {
-			customerAgencyStats(formDTO.getCustomerId(), date);
+			customerGridStats(formDTO.getCustomerId(), date);
 		} else {
 			int pageNo = 1;
 			int pageSize = 100;
@@ -282,9 +282,9 @@ public class StatsPartyMemberVanguardServiceImpl implements StatsPartyMemberVang
 				vanguardList.forEach(item -> {
 					OrgStatisticsResultDTO dto = topicStatic.get(item.getGridId());
 					if (null != dto) {
-						item.setGroupMemberCount(dto.getCount());
-						item.setGroupMemberRatio(dto.getRatio());
-						item.setGroupMemberTotal(dto.getSum());
+						item.setTopicCount(dto.getCount());
+						item.setTopicRatio(dto.getRatio());
+						item.setTopicTotal(dto.getSum());
 					}
 				});
 			}
@@ -295,9 +295,9 @@ public class StatsPartyMemberVanguardServiceImpl implements StatsPartyMemberVang
 				vanguardList.forEach(item -> {
 					OrgStatisticsResultDTO dto = issueStatic.get(item.getGridId());
 					if (null != dto) {
-						item.setGroupMemberCount(dto.getCount());
-						item.setGroupMemberRatio(dto.getRatio());
-						item.setGroupMemberTotal(dto.getSum());
+						item.setIssueCount(dto.getCount());
+						item.setIssueRatio(dto.getRatio());
+						item.setIssueTotal(dto.getSum());
 					}
 				});
 			}
@@ -308,9 +308,9 @@ public class StatsPartyMemberVanguardServiceImpl implements StatsPartyMemberVang
 				vanguardList.forEach(item -> {
 					OrgStatisticsResultDTO dto = projectStatic.get(item.getGridId());
 					if (null != dto) {
-						item.setGroupMemberCount(dto.getCount());
-						item.setGroupMemberRatio(dto.getRatio());
-						item.setGroupMemberTotal(dto.getSum());
+						item.setProjectCount(dto.getCount());
+						item.setProjectRatio(dto.getRatio());
+						item.setProjectTotal(dto.getSum());
 					}
 				});
 			}
@@ -321,9 +321,9 @@ public class StatsPartyMemberVanguardServiceImpl implements StatsPartyMemberVang
 				vanguardList.forEach(item -> {
 					OrgStatisticsResultDTO dto = closedStatic.get(item.getGridId());
 					if (null != dto) {
-						item.setGroupMemberCount(dto.getCount());
-						item.setGroupMemberRatio(dto.getRatio());
-						item.setGroupMemberTotal(dto.getSum());
+						item.setProjectClosedCount(dto.getCount());
+						item.setProjectClosedRatio(dto.getRatio());
+						item.setProjectClosedTotal(dto.getSum());
 					}
 				});
 			}
diff --git 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
index 92fe50a99c..dc6b766fb7 100644
--- 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
@@ -769,6 +769,7 @@
         FROM fact_origin_project_main_daily
         WHERE CUSTOMER_ID = #{customerId}
           AND DATE_ID &lt;= #{dateId}
+          AND ORIGIN = 'issue'
         GROUP BY AGENCY_ID
     </select>
     <select id="selectPartyMemberProjectStaticByGrid" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
@@ -779,6 +780,7 @@
         FROM fact_origin_project_main_daily
         WHERE CUSTOMER_ID = #{customerId}
           AND DATE_ID &lt;= #{dateId}
+          AND ORIGIN = 'issue'
         GROUP BY GRID_ID
     </select>
     <select id="selectPartyMemberClosedProjectStaticByAgency" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
@@ -790,6 +792,7 @@
         WHERE CUSTOMER_ID = #{customerId}
           AND DATE_ID &lt;= #{dateId}
           AND PROJECT_STATUS = 'closed'
+          AND ORIGIN = 'issue'
         GROUP BY AGENCY_ID
     </select>
     <select id="selectPartyMemberClosedProjectStaticByGrid" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
@@ -801,6 +804,7 @@
         WHERE CUSTOMER_ID = #{customerId}
           AND DATE_ID &lt;= #{dateId}
           AND PROJECT_STATUS = 'closed'
+          AND ORIGIN = 'issue'
         GROUP BY GRID_ID
     </select>
 

From e8cfbdfbd77b6ee72a07859750ec22490a3ebd8b Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Tue, 18 May 2021 16:27:32 +0800
Subject: [PATCH 034/128] =?UTF-8?q?=E5=85=9A=E5=91=98=E5=85=88=E9=94=8B?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/feign/DataStatisticalOpenFeignClient.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java
index e6a46879f4..dfafe94a1e 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java
@@ -244,7 +244,7 @@ public interface DataStatisticalOpenFeignClient {
      * @return com.epmet.commons.tools.utils.Result
      */
     @PostMapping("/data/stats/vanguard/agencyvanguardstats")
-    Result agencyVanguardStats(StatsFormDTO formDTO);
+    Result agencyVanguardStats(@RequestBody StatsFormDTO formDTO);
 
     /**
      * 党员先锋统计-网格
@@ -254,6 +254,6 @@ public interface DataStatisticalOpenFeignClient {
      * @return com.epmet.commons.tools.utils.Result
      */
     @PostMapping("/data/stats/vanguard/gridvanguardstats")
-    Result gridVanguardStats(StatsFormDTO formDTO);
+    Result gridVanguardStats(@RequestBody StatsFormDTO formDTO);
 
 }

From 28da367a68a2d06545134c9564c7b46f695e1dd4 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 18 May 2021 16:57:06 +0800
Subject: [PATCH 035/128] =?UTF-8?q?=E6=94=AF=E9=83=A8=E5=BB=BA=E8=AE=BE?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3v1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/datastats/FactGroupActDailyDTO.java   |  96 +++++++++++
 .../dto/resigroup/ActCategoryDictDTO.java     |  76 +++++++++
 .../form/BranchConAnalysisFormDTO.java        |  42 +++++
 .../form/GroupActCategoryQueryFormDTO.java    |  32 ++++
 .../form/SubAnalysisByCodeFormDTO.java        |  44 +++++
 .../result/BranchConAnalysisDetailDTO.java    |  20 +++
 .../result/BranchConAnalysisResultDTO.java    |  37 +++++
 .../resigroup/result/OrgInfoCommonDTO.java    |  20 +++
 .../result/SubAnalysisByCodeResultDTO.java    |  30 ++++
 .../controller/GroupActController.java        |  74 +++++++++
 .../dataaggre/dao/datastats/DataStatsDao.java |  11 ++
 .../dao/govorg/CustomerAgencyDao.java         |   3 +
 .../dataaggre/dao/resigroup/ResiGroupDao.java |   5 +-
 .../service/datastats/DataStatsService.java   |   5 +
 .../datastats/impl/DataStatsServiceImpl.java  |  11 ++
 .../service/govorg/GovOrgService.java         |   3 +
 .../govorg/impl/GovOrgServiceImpl.java        |  26 +++
 .../service/resigroup/ResiGroupService.java   |  31 +++-
 .../resigroup/impl/ResiGroupServiceImpl.java  | 156 +++++++++++++++++-
 .../mapper/datastats/DatsStatsDao.xml         |  47 ++++++
 .../mapper/govorg/CustomerAgencyDao.xml       |  14 ++
 .../mapper/resigroup/ResiGroupDao.xml         |  13 ++
 22 files changed, 792 insertions(+), 4 deletions(-)
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/FactGroupActDailyDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ActCategoryDictDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/form/BranchConAnalysisFormDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/form/GroupActCategoryQueryFormDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/form/SubAnalysisByCodeFormDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/BranchConAnalysisDetailDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/BranchConAnalysisResultDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/OrgInfoCommonDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/SubAnalysisByCodeResultDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GroupActController.java

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/FactGroupActDailyDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/FactGroupActDailyDTO.java
new file mode 100644
index 0000000000..a4f834fbb2
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/FactGroupActDailyDTO.java
@@ -0,0 +1,96 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.dto.datastats;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 组织活动(参加人数、组织次数、平均参加人数)按天累计值分析
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-13
+ */
+@Data
+public class FactGroupActDailyDTO implements Serializable {
+
+    private static final long serialVersionUID = 4411632223804355342L;
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 数据更新至日期Id：yyyyMMdd
+     */
+	private String dateId;
+
+    /**
+     * 网格id
+     */
+	private String orgId;
+
+    /**
+     * 网格：grid;组织：agency
+     */
+	private String orgType;
+
+    /**
+     * 1)orgType=grid: pid=网格所属组织id;
+2)orgType=agency： pid=当前组织的上级组织
+     */
+	private String pid;
+
+    /**
+     * 1)orgType=grid: pids=网格所有上级组织，包括pid;
+2)orgType=agency： pids=当前组织的所有上级组织，包括pid.
+     */
+	private String pids;
+
+    /**
+     * 活动分类编码
+     */
+	private String categoryCode;
+
+    /**
+     * 上级分类编码
+     */
+	private String parentCode;
+
+    /**
+     * 分类等级
+     */
+	private Integer level;
+
+    /**
+     * 截止到dateId: 组织次数;包含dateId这一天的数据
+     */
+	private Integer organizeTotal;
+
+    /**
+     * 截止到dateId: 参加人数;包含dateId这一天的数据
+     */
+	private Integer participateUserTotal;
+
+    /**
+     * 截止到dateId: 平均参加人数;包含dateId这一天的数据
+     */
+	private Integer avgParticipateUserTotal;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ActCategoryDictDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ActCategoryDictDTO.java
new file mode 100644
index 0000000000..3cee85b0bd
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ActCategoryDictDTO.java
@@ -0,0 +1,76 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.dto.resigroup;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 活动类别字典
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Data
+public class ActCategoryDictDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @JsonIgnore
+	private String id;
+
+    /**
+     * 客户id
+     */
+    @JsonIgnore
+	private String customerId;
+
+    /**
+     * 类别编码
+     */
+	private String categoryCode;
+
+    /**
+     * 活动类别名称；eg：支部建设、联建共建
+     */
+	private String categoryName;
+
+    /**
+     * 等级1,2......
+     */
+    @JsonIgnore
+	private Integer level;
+
+    /**
+     * 排序
+     */
+    @JsonIgnore
+	private Integer sort;
+
+    /**
+     * 上级类别编码
+     */
+    @JsonIgnore
+	private String parentCode;
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/form/BranchConAnalysisFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/form/BranchConAnalysisFormDTO.java
new file mode 100644
index 0000000000..7090008a4f
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/form/BranchConAnalysisFormDTO.java
@@ -0,0 +1,42 @@
+package com.epmet.dataaggre.dto.resigroup.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 001、【支建+联建】统计分析 入参
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/5/18 9:16
+ */
+@Data
+public class BranchConAnalysisFormDTO implements Serializable {
+    public interface AddUserInternalGroup {
+    }
+
+    /**
+     * 支部建设：100；联建共建：101
+     */
+    @NotBlank(message = "firstCategoryCode必传,支部建设：100；联建共建：101", groups = AddUserInternalGroup.class)
+    private String firstCategoryCode;
+
+    /**
+     * 当前客户id
+     */
+    @NotBlank(message = "客户id不能为空", groups = AddUserInternalGroup.class)
+    private String customerId;
+
+    /**
+     * 当前组织或者网格id
+     */
+    @NotBlank(message = "orgId不能为空", groups = AddUserInternalGroup.class)
+    private String orgId;
+
+    /**
+     * 默认传组织：agency;  网格：grid
+     */
+    @NotBlank(message = "orgType不能为空", groups = AddUserInternalGroup.class)
+    private String orgType;
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/form/GroupActCategoryQueryFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/form/GroupActCategoryQueryFormDTO.java
new file mode 100644
index 0000000000..63bb6b1771
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/form/GroupActCategoryQueryFormDTO.java
@@ -0,0 +1,32 @@
+package com.epmet.dataaggre.dto.resigroup.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 002、【支建+联建】二级分类字典查询 入参
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/5/18 13:42
+ */
+@Data
+public class GroupActCategoryQueryFormDTO implements Serializable {
+    private static final long serialVersionUID = 8373780230315448396L;
+
+    public interface AddUserInternalGroup {
+    }
+
+    /**
+     * 支部建设：100；联建共建：101
+     */
+    @NotBlank(message = "firstCategoryCode必传,支部建设：100；联建共建：101", groups = AddUserInternalGroup.class)
+    private String firstCategoryCode;
+
+    /**
+     * 当前客户id
+     */
+    @NotBlank(message = "客户id不能为空", groups = BranchConAnalysisFormDTO.AddUserInternalGroup.class)
+    private String customerId;
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/form/SubAnalysisByCodeFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/form/SubAnalysisByCodeFormDTO.java
new file mode 100644
index 0000000000..5f92ede5cb
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/form/SubAnalysisByCodeFormDTO.java
@@ -0,0 +1,44 @@
+package com.epmet.dataaggre.dto.resigroup.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 003、【支建+联建】下级组织折线图 入参
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/5/18 13:52
+ */
+@Data
+public class SubAnalysisByCodeFormDTO implements Serializable {
+    private static final long serialVersionUID = -4132250208377993452L;
+
+    public interface AddUserInternalGroup {
+    }
+
+    /**
+     * 分类编码；002接口返回的
+     */
+    @NotBlank(message = "categoryCode不能为空", groups = AddUserInternalGroup.class)
+    private String categoryCode;
+
+    /**
+     * 当前客户id
+     */
+    @NotBlank(message = "客户id不能为空", groups = AddUserInternalGroup.class)
+    private String customerId;
+
+    /**
+     * 当前组织或者网格id
+     */
+    @NotBlank(message = "orgId不能为空", groups = AddUserInternalGroup.class)
+    private String orgId;
+
+    /**
+     * 默认传组织：agency;  网格：grid
+     */
+    @NotBlank(message = "orgType不能为空", groups = AddUserInternalGroup.class)
+    private String orgType;
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/BranchConAnalysisDetailDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/BranchConAnalysisDetailDTO.java
new file mode 100644
index 0000000000..da57f1f74f
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/BranchConAnalysisDetailDTO.java
@@ -0,0 +1,20 @@
+package com.epmet.dataaggre.dto.resigroup.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 001、【支建+联建】统计分析 返参
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/5/18 15:12
+ */
+@Data
+public class BranchConAnalysisDetailDTO implements Serializable {
+    private String name;
+    private String type;
+    private Integer value;
+    private Integer avg;
+    private String categoryCode;
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/BranchConAnalysisResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/BranchConAnalysisResultDTO.java
new file mode 100644
index 0000000000..7b25d8d8fc
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/BranchConAnalysisResultDTO.java
@@ -0,0 +1,37 @@
+package com.epmet.dataaggre.dto.resigroup.result;
+
+import com.epmet.commons.tools.constant.NumConstant;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 001、【支建+联建】统计分析 返参
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/5/18 10:01
+ */
+@Data
+public class BranchConAnalysisResultDTO implements Serializable {
+    private static final long serialVersionUID = -4998343002705222898L;
+
+    /**
+     * 组织活动次数
+     */
+    private Integer organizeTotal;
+
+    /**
+     * 参加活动人数
+     */
+    private Integer participateUserTotal;
+
+    private List<BranchConAnalysisDetailDTO> dataList;
+
+    public BranchConAnalysisResultDTO() {
+        this.organizeTotal = NumConstant.ZERO;
+        this.participateUserTotal =  NumConstant.ZERO;
+        this.dataList=new ArrayList<>();
+    }
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/OrgInfoCommonDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/OrgInfoCommonDTO.java
new file mode 100644
index 0000000000..79b6460be4
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/OrgInfoCommonDTO.java
@@ -0,0 +1,20 @@
+package com.epmet.dataaggre.dto.resigroup.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 组织或者网格基本信息
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/5/18 14:36
+ */
+@Data
+public class OrgInfoCommonDTO implements Serializable {
+    private static final long serialVersionUID = -2191521364070476999L;
+
+    private String orgId;
+    private String orgName;
+    private String orgType;
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/SubAnalysisByCodeResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/SubAnalysisByCodeResultDTO.java
new file mode 100644
index 0000000000..4b4ec0fe06
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/SubAnalysisByCodeResultDTO.java
@@ -0,0 +1,30 @@
+package com.epmet.dataaggre.dto.resigroup.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 003、【支建+联建】下级组织折线图 返参
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/5/18 14:09
+ */
+@Data
+public class SubAnalysisByCodeResultDTO implements Serializable {
+    private static final long serialVersionUID = -6025482721295705372L;
+
+    /**
+     * 横坐标名称：组织名或者网格名
+     */
+    private String name;
+
+    /**
+     * 参加人数、组织次数、平均参加人数
+     */
+    private String type;
+
+    private Integer value;
+
+    private String orgId;
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GroupActController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GroupActController.java
new file mode 100644
index 0000000000..487b938fbc
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GroupActController.java
@@ -0,0 +1,74 @@
+package com.epmet.dataaggre.controller;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO;
+import com.epmet.dataaggre.dto.resigroup.form.BranchConAnalysisFormDTO;
+import com.epmet.dataaggre.dto.resigroup.form.GroupActCategoryQueryFormDTO;
+import com.epmet.dataaggre.dto.resigroup.form.SubAnalysisByCodeFormDTO;
+import com.epmet.dataaggre.dto.resigroup.result.BranchConAnalysisResultDTO;
+import com.epmet.dataaggre.dto.resigroup.result.SubAnalysisByCodeResultDTO;
+import com.epmet.dataaggre.service.resigroup.ResiGroupService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 专项组-组织活动相关API放这
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/5/18 9:08
+ */
+@RestController
+@RequestMapping("groupact")
+public class GroupActController {
+
+    @Autowired
+    private ResiGroupService resiGroupService;
+
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dataaggre.dto.resigroup.result.BranchConAnalysisResultDTO>
+     * @param formDTO
+     * @author yinzuomei
+     * @description  001、【支建+联建】统计分析
+     * @Date 2021/5/18 10:17 
+     **/
+    @PostMapping("branchconanalysis")
+    public Result<BranchConAnalysisResultDTO> branchConAnalysis(@RequestBody BranchConAnalysisFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO,BranchConAnalysisFormDTO.AddUserInternalGroup.class);
+        return new Result<BranchConAnalysisResultDTO>().ok(resiGroupService.branchConAnalysis(formDTO));
+    }
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO>>
+     * @param formDTO
+     * @author yinzuomei
+     * @description 002、【支建+联建】二级分类字典查询
+     * @Date 2021/5/18 13:49 
+     **/
+    @PostMapping("categorydictlist")
+    public Result<List<ActCategoryDictDTO>> queryCategoryDictList(@RequestBody GroupActCategoryQueryFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO,GroupActCategoryQueryFormDTO.AddUserInternalGroup.class);
+        return new Result<List<ActCategoryDictDTO>>().ok(resiGroupService.queryActCategoryDictList(formDTO.getCustomerId(),formDTO.getFirstCategoryCode()));
+    }
+
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dataaggre.dto.resigroup.result.SubAnalysisByCodeResultDTO>
+     * @param formDTO
+     * @author yinzuomei
+     * @description 003、【支建+联建】下级组织折线图
+     * @Date 2021/5/18 14:31
+     **/
+    @PostMapping("subanalysisbycode")
+    public Result<List<SubAnalysisByCodeResultDTO>> querySubAnalysisByCode(@RequestBody SubAnalysisByCodeFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO,GroupActCategoryQueryFormDTO.AddUserInternalGroup.class);
+        return new Result<List<SubAnalysisByCodeResultDTO>>().ok(resiGroupService.querySubAnalysisByCode(formDTO));
+    }
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
index c96b053cba..4f9ee94c72 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
@@ -17,6 +17,7 @@
 
 package com.epmet.dataaggre.dao.datastats;
 
+import com.epmet.dataaggre.dto.datastats.FactGroupActDailyDTO;
 import com.epmet.dataaggre.dto.datastats.form.SubAgencyFormDTO;
 import com.epmet.dataaggre.dto.datastats.form.SubGridFormDTO;
 import com.epmet.dataaggre.dto.datastats.result.*;
@@ -154,4 +155,14 @@ public interface DataStatsDao {
      */
     List<SubGridProjectResultDTO> getSubGridProject(@Param("gridIds") List<String> gridIds, @Param("dateId") String dateId);
 
+    List<FactGroupActDailyDTO> branchConAnalysis(@Param("customerId")String customerId,
+                                                 @Param("orgId")String orgId,
+                                                 @Param("orgType")String orgType,
+                                                 @Param("dateId")String dateId,
+                                                 @Param("parentCode")String parentCode);
+
+    List<FactGroupActDailyDTO> querySubAnalysisByCode(@Param("customerId")String customerId,
+                                                      @Param("pid")String pid,
+                                                      @Param("dateId")String dateId,
+                                                      @Param("categoryCode")String categoryCode);
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java
index fc33ce00bb..7d705c2aa3 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java
@@ -49,4 +49,7 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
     String getAgencyIdByUserId(@Param("userId") String userId);
 
     List<String> selectUsedAreaCodeList(@Param("parentAreaCode") String parentAreaCode);
+
+
+    List<CustomerAgencyEntity> selectNextAgency(@Param("customerId")String customerId, @Param("pid")String pid);
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/resigroup/ResiGroupDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/resigroup/ResiGroupDao.java
index f297a4f82f..0632f8bbf8 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/resigroup/ResiGroupDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/resigroup/ResiGroupDao.java
@@ -18,6 +18,7 @@
 package com.epmet.dataaggre.dao.resigroup;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO;
 import com.epmet.dataaggre.dto.resigroup.result.CandidateListResultDTO;
 import com.epmet.dataaggre.entity.resigroup.ResiGroupEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -41,5 +42,7 @@ public interface ResiGroupDao extends BaseDao<ResiGroupEntity> {
      * @date 2021/3/30 上午10:13
      */
     List<CandidateListResultDTO> candidateList(@Param("groupId")String groupId);
-	
+
+    List<ActCategoryDictDTO> selectActCategoryDictDTOByPcode(@Param("customerId")String customerId,
+                                                             @Param("categoryCode")String firstCategoryCode);
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
index 6eb826dc8d..1f842209d9 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
@@ -1,5 +1,6 @@
 package com.epmet.dataaggre.service.datastats;
 
+import com.epmet.dataaggre.dto.datastats.FactGroupActDailyDTO;
 import com.epmet.dataaggre.dto.datastats.form.AgenctBasicDataFormDTO;
 import com.epmet.dataaggre.dto.datastats.form.SubAgencyFormDTO;
 import com.epmet.dataaggre.dto.datastats.form.SubGridFormDTO;
@@ -91,4 +92,8 @@ public interface DataStatsService {
      * @author sun
      */
     List<SubGridProjectResultDTO> subGridProject(SubGridFormDTO formDTO);
+
+    List<FactGroupActDailyDTO> branchConAnalysis(String customerId, String orgId, String orgType, String dateId, String parentCode);
+
+    List<FactGroupActDailyDTO> querySubAnalysisByCode(String customerId, String pid, String dateId, String categoryCode);
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index 900144795e..d41fd93a24 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -5,6 +5,7 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.datastats.DataStatsDao;
+import com.epmet.dataaggre.dto.datastats.FactGroupActDailyDTO;
 import com.epmet.dataaggre.dto.datastats.form.AgenctBasicDataFormDTO;
 import com.epmet.dataaggre.dto.datastats.form.SubAgencyFormDTO;
 import com.epmet.dataaggre.dto.datastats.form.SubGridFormDTO;
@@ -811,4 +812,14 @@ public class DataStatsServiceImpl implements DataStatsService {
         return resultList;
     }
 
+    @Override
+    public List<FactGroupActDailyDTO> branchConAnalysis(String customerId, String orgId, String orgType, String dateId, String parentCode) {
+        return dataStatsDao.branchConAnalysis(customerId,orgId,orgType,dateId,parentCode);
+    }
+
+    @Override
+    public List<FactGroupActDailyDTO> querySubAnalysisByCode(String customerId, String pid, String dateId, String categoryCode) {
+        return dataStatsDao.querySubAnalysisByCode(customerId,pid,dateId,categoryCode);
+    }
+
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java
index 7d9fc8f339..d0780b046d 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java
@@ -5,6 +5,7 @@ import com.epmet.dataaggre.dto.govorg.result.AgencyGridResultDTO;
 import com.epmet.dataaggre.dto.govorg.result.GridInfoResultDTO;
 import com.epmet.dataaggre.dto.govorg.result.GridsInfoListResultDTO;
 import com.epmet.dataaggre.dto.govorg.result.NextAreaCodeResultDTO;
+import com.epmet.dataaggre.dto.resigroup.result.OrgInfoCommonDTO;
 
 import java.util.List;
 
@@ -45,4 +46,6 @@ public interface GovOrgService {
     String getAgencyIdByUserId(String userId);
 
     List<NextAreaCodeResultDTO> queryNextLevelAreaCodeList(NextAreaCodeFormDTO formDTO);
+
+    List<OrgInfoCommonDTO> queryNextOrgInfoDTO(String customerId, String orgId, String orgType);
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
index b09414f1bd..18ad900fc6 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
@@ -15,6 +15,7 @@ import com.epmet.dataaggre.dto.govorg.result.AgencyGridResultDTO;
 import com.epmet.dataaggre.dto.govorg.result.GridInfoResultDTO;
 import com.epmet.dataaggre.dto.govorg.result.GridsInfoListResultDTO;
 import com.epmet.dataaggre.dto.govorg.result.NextAreaCodeResultDTO;
+import com.epmet.dataaggre.dto.resigroup.result.OrgInfoCommonDTO;
 import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity;
 import com.epmet.dataaggre.service.commonservice.AreaCodeService;
 import com.epmet.dataaggre.service.govorg.GovOrgService;
@@ -162,6 +163,31 @@ public class GovOrgServiceImpl implements GovOrgService {
         return allList;
     }
 
+    @Override
+    public List<OrgInfoCommonDTO> queryNextOrgInfoDTO(String customerId, String orgId, String orgType) {
+        List<OrgInfoCommonDTO> result=new ArrayList<>();
+        if("agency".equals(orgType)){
+            List<CustomerAgencyEntity> customerAgencyEntityList = customerAgencyDao.selectNextAgency(customerId, orgId);
+            customerAgencyEntityList.forEach(agencyEntity->{
+                OrgInfoCommonDTO agecnyInfo=new OrgInfoCommonDTO();
+                agecnyInfo.setOrgId(agencyEntity.getId());
+                agecnyInfo.setOrgName(agencyEntity.getOrganizationName());
+                agecnyInfo.setOrgType("agency");
+                result.add(agecnyInfo);
+            });
+        }else if("grid".equals(orgType)){
+            List<GridInfoResultDTO> list= customerGridDao.selectGridListByAgencyId(orgId);
+            list.forEach(grid->{
+                OrgInfoCommonDTO gridInfo=new OrgInfoCommonDTO();
+                gridInfo.setOrgId(grid.getGridId());
+                gridInfo.setOrgName(grid.getGridName());
+                gridInfo.setOrgType("grid");
+                result.add(gridInfo);
+            });
+        }
+        return result;
+    }
+
     public static void main(String[] args) {
         List<NextAreaCodeResultDTO> allList = new ArrayList<>();
         NextAreaCodeResultDTO m1 = new NextAreaCodeResultDTO();
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/ResiGroupService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/ResiGroupService.java
index 5b163c4f5d..66c3b991dd 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/ResiGroupService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/ResiGroupService.java
@@ -1,9 +1,13 @@
 package com.epmet.dataaggre.service.resigroup;
 
+import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO;
 import com.epmet.dataaggre.dto.resigroup.ResiTopicDTO;
+import com.epmet.dataaggre.dto.resigroup.form.BranchConAnalysisFormDTO;
 import com.epmet.dataaggre.dto.resigroup.form.CandidateListFormDTO;
+import com.epmet.dataaggre.dto.resigroup.form.SubAnalysisByCodeFormDTO;
+import com.epmet.dataaggre.dto.resigroup.result.BranchConAnalysisResultDTO;
 import com.epmet.dataaggre.dto.resigroup.result.CandidateListResultDTO;
-import org.apache.ibatis.annotations.Param;
+import com.epmet.dataaggre.dto.resigroup.result.SubAnalysisByCodeResultDTO;
 
 import java.util.List;
 
@@ -20,4 +24,29 @@ public interface ResiGroupService {
      */
     List<CandidateListResultDTO> candidateList(CandidateListFormDTO formDTO);
     List<ResiTopicDTO> selectTopicInfoByIds(List<String> topicIds);
+
+    /**
+     * 001、【支建+联建】统计分析
+     *
+     * @param formDTO
+     * @return com.epmet.dataaggre.dto.resigroup.result.BranchConAnalysisResultDTO
+     */
+    BranchConAnalysisResultDTO branchConAnalysis(BranchConAnalysisFormDTO formDTO);
+
+    /**
+     * 002、【支建+联建】二级分类字典查询
+     *
+     * @param customerId
+     * @param firstCategoryCode
+     * @return com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO
+     */
+    List<ActCategoryDictDTO> queryActCategoryDictList(String customerId, String firstCategoryCode);
+
+    /**
+     * 003、【支建+联建】下级组织折线图
+     *
+     * @param formDTO
+     * @return com.epmet.dataaggre.dto.resigroup.result.DataCommonDTO
+     */
+    List<SubAnalysisByCodeResultDTO> querySubAnalysisByCode(SubAnalysisByCodeFormDTO formDTO);
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java
index 253d42f78b..141158f063 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java
@@ -1,17 +1,25 @@
 package com.epmet.dataaggre.service.resigroup.impl;
 
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.commons.tools.constant.Constant;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.resigroup.ResiGroupDao;
 import com.epmet.dataaggre.dao.resigroup.ResiTopicDao;
+import com.epmet.dataaggre.dto.datastats.FactGroupActDailyDTO;
 import com.epmet.dataaggre.dto.epmetuser.result.UserInfosResultDTO;
-import com.epmet.dataaggre.dto.resigroup.ResiGroupDTO;
+import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO;
 import com.epmet.dataaggre.dto.resigroup.ResiTopicDTO;
+import com.epmet.dataaggre.dto.resigroup.form.BranchConAnalysisFormDTO;
 import com.epmet.dataaggre.dto.resigroup.form.CandidateListFormDTO;
-import com.epmet.dataaggre.dto.resigroup.result.CandidateListResultDTO;
+import com.epmet.dataaggre.dto.resigroup.form.SubAnalysisByCodeFormDTO;
+import com.epmet.dataaggre.dto.resigroup.result.*;
 import com.epmet.dataaggre.entity.resigroup.ResiGroupEntity;
 import com.epmet.dataaggre.redis.ResiGroupRedis;
+import com.epmet.dataaggre.service.datastats.DataStatsService;
 import com.epmet.dataaggre.service.epmetuser.EpmetUserService;
+import com.epmet.dataaggre.service.govorg.GovOrgService;
 import com.epmet.dataaggre.service.resigroup.ResiGroupService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -22,6 +30,7 @@ import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -40,6 +49,10 @@ public class ResiGroupServiceImpl implements ResiGroupService {
     private EpmetUserService epmetUserService;
     @Autowired
     private ResiGroupRedis resiGroupRedis;
+    @Autowired
+    private DataStatsService dataStatsService;
+    @Autowired
+    private GovOrgService govOrgService;
 
     @Override
     public List<ResiTopicDTO> selectTopicInfoByIds(List<String> topicIds) {
@@ -92,4 +105,143 @@ public class ResiGroupServiceImpl implements ResiGroupService {
         showUsers.forEach(u -> result.stream().filter(r -> u.equals(r.getUserId())).forEach(r -> disResult.add(r)));
         return disResult;
     }
+
+
+    /**
+     * 001、【支建+联建】统计分析
+     *
+     * @param formDTO
+     * @return Result<BranchConAnalysisResultDTO>
+     */
+    @Override
+    public BranchConAnalysisResultDTO branchConAnalysis(BranchConAnalysisFormDTO formDTO) {
+        List<ActCategoryDictDTO> categoryList = queryActCategoryDictList(formDTO.getCustomerId(), formDTO.getFirstCategoryCode());
+        if (CollectionUtils.isEmpty(categoryList)) {
+            return new BranchConAnalysisResultDTO();
+        }
+        String dateId = DateUtils.getBeforeNDay(NumConstant.ONE);
+        List<FactGroupActDailyDTO> factGroupActDailyDTOList = dataStatsService.branchConAnalysis(formDTO.getCustomerId(), formDTO.getOrgId(), formDTO.getOrgType(),
+                dateId, formDTO.getFirstCategoryCode());
+        /**
+         * List -> Map
+         * 需要注意的是：
+         * toMap 如果集合对象有重复的key，会报错Duplicate key .... *  apple1,apple12的id都为1。
+         *  可以用 (k1,k2)->k1 来设置，如果有重复的key,则保留key1,舍弃key2
+         */
+        Map<String,FactGroupActDailyDTO> map = factGroupActDailyDTOList.stream().collect(Collectors.toMap(FactGroupActDailyDTO::getCategoryCode, a -> a,(k1,k2)->k1));
+
+        // 组织活动次数
+        int organizeTotal=0;
+        // 参加活动人数
+        int participateUserTotal=0;
+        List<BranchConAnalysisDetailDTO> dataList=new ArrayList<>();
+
+        for (ActCategoryDictDTO categoryDictDTO : categoryList) {
+
+            BranchConAnalysisDetailDTO participateUserTotalObject=new BranchConAnalysisDetailDTO();
+            participateUserTotalObject.setName(categoryDictDTO.getCategoryName());
+            participateUserTotalObject.setType("参加人数");
+            participateUserTotalObject.setCategoryCode(categoryDictDTO.getCategoryCode());
+
+            BranchConAnalysisDetailDTO organizeTotalObject=new BranchConAnalysisDetailDTO();
+            organizeTotalObject.setName(categoryDictDTO.getCategoryName());
+            organizeTotalObject.setType("组织次数");
+            organizeTotalObject.setCategoryCode(categoryDictDTO.getCategoryCode());
+
+
+            /*DataCommonDTO avgParticipateUserTotalObject=new DataCommonDTO();
+            avgParticipateUserTotalObject.setName(categoryDictDTO.getCategoryName());
+            avgParticipateUserTotalObject.setType("平均参加人数");*/
+
+            if (map.containsKey(categoryDictDTO.getCategoryCode())) {
+
+                participateUserTotalObject.setValue(map.get(categoryDictDTO.getCategoryCode()).getParticipateUserTotal());
+                organizeTotalObject.setValue(map.get(categoryDictDTO.getCategoryCode()).getOrganizeTotal());
+                // avgParticipateUserTotalObject.setValue(map.get(categoryDictDTO.getCategoryCode()).getAvgParticipateUserTotal());
+                participateUserTotalObject.setAvg(map.get(categoryDictDTO.getCategoryCode()).getAvgParticipateUserTotal());
+                organizeTotalObject.setAvg(map.get(categoryDictDTO.getCategoryCode()).getAvgParticipateUserTotal());
+
+
+                organizeTotal += map.get(categoryDictDTO.getCategoryCode()).getOrganizeTotal();
+                participateUserTotal += map.get(categoryDictDTO.getCategoryCode()).getParticipateUserTotal();
+
+            } else {
+                participateUserTotalObject.setValue(NumConstant.ZERO);
+                organizeTotalObject.setValue(NumConstant.ZERO);
+                participateUserTotalObject.setAvg(NumConstant.ZERO);
+                organizeTotalObject.setAvg(NumConstant.ZERO);
+                // avgParticipateUserTotalObject.setValue(NumConstant.ZERO);
+            }
+            dataList.add(participateUserTotalObject);
+            dataList.add(organizeTotalObject);
+            // dataList.add(avgParticipateUserTotalObject);
+        }
+        BranchConAnalysisResultDTO resultDTO = new BranchConAnalysisResultDTO();
+        resultDTO.setOrganizeTotal(organizeTotal);
+        resultDTO.setParticipateUserTotal(participateUserTotal);
+        resultDTO.setDataList(dataList);
+        return resultDTO;
+    }
+
+    @Override
+    public List<ActCategoryDictDTO> queryActCategoryDictList(String customerId, String firstCategoryCode) {
+        List<ActCategoryDictDTO> categoryList=resiGroupDao.selectActCategoryDictDTOByPcode(customerId,firstCategoryCode);
+        if(CollectionUtils.isEmpty(categoryList)){
+            categoryList=resiGroupDao.selectActCategoryDictDTOByPcode(Constant.DEFAULT_CUSTOMER,firstCategoryCode);
+        }
+        return categoryList;
+    }
+
+    /**
+     * 003、【支建+联建】下级组织折线图
+     *
+     * @param formDTO
+     * @return com.epmet.dataaggre.dto.resigroup.result.SubAnalysisByCodeResultDTO
+     */
+    @Override
+    public List<SubAnalysisByCodeResultDTO> querySubAnalysisByCode(SubAnalysisByCodeFormDTO formDTO) {
+        List<OrgInfoCommonDTO> orgInfoDTOList = govOrgService.queryNextOrgInfoDTO(formDTO.getCustomerId(), formDTO.getOrgId(), formDTO.getOrgType());
+        if (CollectionUtils.isEmpty(orgInfoDTOList)) {
+            return new ArrayList<>();
+        }
+
+        String dateId = DateUtils.getBeforeNDay(NumConstant.ONE);
+        List<FactGroupActDailyDTO> factGroupActDailyDTOList = dataStatsService.querySubAnalysisByCode(formDTO.getCustomerId(), formDTO.getOrgId(),
+                dateId, formDTO.getCategoryCode());
+        Map<String, FactGroupActDailyDTO> map = factGroupActDailyDTOList.stream().collect(Collectors.toMap(FactGroupActDailyDTO::getOrgId, a -> a, (k1, k2) -> k1));
+        List<SubAnalysisByCodeResultDTO> resultList = new ArrayList<>();
+        for (OrgInfoCommonDTO orgInfo : orgInfoDTOList) {
+
+            SubAnalysisByCodeResultDTO participateUserTotalObject=new SubAnalysisByCodeResultDTO();
+            participateUserTotalObject.setName(orgInfo.getOrgName());
+            participateUserTotalObject.setType("参加人数");
+            participateUserTotalObject.setOrgId(orgInfo.getOrgId());
+
+            SubAnalysisByCodeResultDTO organizeTotalObject=new SubAnalysisByCodeResultDTO();
+            organizeTotalObject.setName(orgInfo.getOrgName());
+            organizeTotalObject.setType("组织次数");
+            organizeTotalObject.setOrgId(orgInfo.getOrgId());
+
+
+            SubAnalysisByCodeResultDTO avgParticipateUserTotalObject=new SubAnalysisByCodeResultDTO();
+            avgParticipateUserTotalObject.setName(orgInfo.getOrgName());
+            avgParticipateUserTotalObject.setType("平均参加人数");
+            avgParticipateUserTotalObject.setOrgId(orgInfo.getOrgId());
+
+            if (map.containsKey(orgInfo.getOrgId())) {
+                participateUserTotalObject.setValue(map.get(orgInfo.getOrgId()).getParticipateUserTotal());
+                organizeTotalObject.setValue(map.get(orgInfo.getOrgId()).getOrganizeTotal());
+                avgParticipateUserTotalObject.setValue(map.get(orgInfo.getOrgId()).getAvgParticipateUserTotal());
+            } else {
+                participateUserTotalObject.setValue(NumConstant.ZERO);
+                organizeTotalObject.setValue(NumConstant.ZERO);
+                avgParticipateUserTotalObject.setValue(NumConstant.ZERO);
+            }
+            resultList.add(participateUserTotalObject);
+            resultList.add(organizeTotalObject);
+            resultList.add(avgParticipateUserTotalObject);
+
+        }
+        return resultList;
+    }
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
index 06967cceab..8d6299ec86 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
@@ -314,4 +314,51 @@
             project_total DESC
     </select>
 
+    <select id="branchConAnalysis" parameterType="map" resultType="com.epmet.dataaggre.dto.datastats.FactGroupActDailyDTO">
+        SELECT
+            m.CUSTOMER_ID as customerId,
+            m.DATE_ID as dateId,
+            m.ORG_ID as orgId,
+            m.ORG_TYPE as orgType,
+            m.PID as pid,
+            m.CATEGORY_CODE as categoryCode,
+            m.PARENT_CODE as parentCode,
+            m.`LEVEL` as level,
+            m.ORGANIZE_TOTAL as organizeTotal,
+            m.PARTICIPATE_USER_TOTAL as participateUserTotal,
+            m.AVG_PARTICIPATE_USER_TOTAL as avgParticipateUserTotal
+        FROM
+            fact_group_act_daily m
+        WHERE
+            m.DEL_FLAG = '0'
+            AND m.CUSTOMER_ID = #{customerId}
+            AND m.PARENT_CODE = #{parentCode}
+            AND m.DATE_ID = #{dateId}
+            AND m.ORG_ID = #{orgId}
+            AND m.ORG_TYPE = #{orgType}
+            order by  m.CATEGORY_CODE asc
+    </select>
+
+    <select id="querySubAnalysisByCode" parameterType="map" resultType="com.epmet.dataaggre.dto.datastats.FactGroupActDailyDTO">
+         SELECT
+            m.CUSTOMER_ID as customerId,
+            m.DATE_ID as dateId,
+            m.ORG_ID as orgId,
+            m.ORG_TYPE as orgType,
+            m.PID as pid,
+            m.CATEGORY_CODE as categoryCode,
+            m.PARENT_CODE as parentCode,
+            m.`LEVEL` as level,
+            m.ORGANIZE_TOTAL as organizeTotal,
+            m.PARTICIPATE_USER_TOTAL as participateUserTotal,
+            m.AVG_PARTICIPATE_USER_TOTAL as avgParticipateUserTotal
+        FROM
+            fact_group_act_daily m
+        WHERE
+            m.DEL_FLAG = '0'
+            AND m.CUSTOMER_ID = #{customerId}
+            AND m.CATEGORY_CODE = #{categoryCode}
+            AND m.DATE_ID = #{dateId}
+            AND m.PID = #{pid}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml
index fda4f7245c..3033937191 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml
@@ -31,4 +31,18 @@
             ca.DEL_FLAG = '0'
             AND ca.PARENT_AREA_CODE = #{parentAreaCode}
     </select>
+
+    <select id="selectNextAgency" parameterType="map" resultType="com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity">
+        SELECT
+            *
+        FROM
+            customer_agency ca
+        WHERE
+            ca.DEL_FLAG = '0'
+            <if test="customerId != null and customerId != ''">
+                AND ca.CUSTOMER_ID = #{customerId}
+            </if>
+            AND ca.PID = #{pid}
+            order by ca.CREATED_TIME asc
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/resigroup/ResiGroupDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/resigroup/ResiGroupDao.xml
index 8a350ceec9..1549b66d21 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/resigroup/ResiGroupDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/resigroup/ResiGroupDao.xml
@@ -15,4 +15,17 @@
           AND rgm.GROUP_LEADER_FLAG != 'leader'
           AND rgm.RESI_GROUP_ID = #{groupId}
     </select>
+
+    <select id="selectActCategoryDictDTOByPcode" parameterType="map" resultType="com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO">
+        SELECT
+            *
+        FROM
+            act_category_dict acd
+        WHERE
+            acd.DEL_FLAG = '0'
+            AND acd.PARENT_CODE = #{categoryCode}
+            AND acd.CUSTOMER_ID = #{customerId}
+        ORDER BY
+            acd.SORT ASC
+    </select>
 </mapper>
\ No newline at end of file

From 018dc14a9d79a91ed0d00d6c31b93368622c08fc Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 18 May 2021 17:16:21 +0800
Subject: [PATCH 036/128] =?UTF-8?q?=E6=94=AF=E9=83=A8=E5=BB=BA=E8=AE=BE?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3v2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resigroup/result/RankCodeResultDTO.java   | 18 +++++++++++++
 .../controller/GroupActController.java        | 15 +++++++++++
 .../service/resigroup/ResiGroupService.java   | 10 +++++++
 .../resigroup/impl/ResiGroupServiceImpl.java  | 27 +++++++++++++++++++
 4 files changed, 70 insertions(+)
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/RankCodeResultDTO.java

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/RankCodeResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/RankCodeResultDTO.java
new file mode 100644
index 0000000000..50d8531978
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/RankCodeResultDTO.java
@@ -0,0 +1,18 @@
+package com.epmet.dataaggre.dto.resigroup.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 004、【支建+联建】排序方式下拉框
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/5/18 17:01
+ */
+@Data
+public class RankCodeResultDTO implements Serializable {
+    private static final long serialVersionUID = 7991057885312015889L;
+    private String rankCode;
+    private String rankName;
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GroupActController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GroupActController.java
index 487b938fbc..a88f86456e 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GroupActController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GroupActController.java
@@ -7,6 +7,7 @@ import com.epmet.dataaggre.dto.resigroup.form.BranchConAnalysisFormDTO;
 import com.epmet.dataaggre.dto.resigroup.form.GroupActCategoryQueryFormDTO;
 import com.epmet.dataaggre.dto.resigroup.form.SubAnalysisByCodeFormDTO;
 import com.epmet.dataaggre.dto.resigroup.result.BranchConAnalysisResultDTO;
+import com.epmet.dataaggre.dto.resigroup.result.RankCodeResultDTO;
 import com.epmet.dataaggre.dto.resigroup.result.SubAnalysisByCodeResultDTO;
 import com.epmet.dataaggre.service.resigroup.ResiGroupService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,4 +72,18 @@ public class GroupActController {
         return new Result<List<SubAnalysisByCodeResultDTO>>().ok(resiGroupService.querySubAnalysisByCode(formDTO));
     }
 
+    /**
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dataaggre.dto.resigroup.result.RankCodeResultDTO>>
+     * @param formDTO
+     * @author yinzuomei
+     * @description 004、【支建+联建】排序方式下拉框
+     * @Date 2021/5/18 17:14 
+     **/
+    @PostMapping("rankcodelist")
+    public Result<List<RankCodeResultDTO>> queryRankCodeList(@RequestBody GroupActCategoryQueryFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO,GroupActCategoryQueryFormDTO.AddUserInternalGroup.class);
+        return new Result<List<RankCodeResultDTO>>().ok(resiGroupService.queryRankCodeList(formDTO));
+    }
+
+
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/ResiGroupService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/ResiGroupService.java
index 66c3b991dd..d0cb64fade 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/ResiGroupService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/ResiGroupService.java
@@ -4,9 +4,11 @@ import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO;
 import com.epmet.dataaggre.dto.resigroup.ResiTopicDTO;
 import com.epmet.dataaggre.dto.resigroup.form.BranchConAnalysisFormDTO;
 import com.epmet.dataaggre.dto.resigroup.form.CandidateListFormDTO;
+import com.epmet.dataaggre.dto.resigroup.form.GroupActCategoryQueryFormDTO;
 import com.epmet.dataaggre.dto.resigroup.form.SubAnalysisByCodeFormDTO;
 import com.epmet.dataaggre.dto.resigroup.result.BranchConAnalysisResultDTO;
 import com.epmet.dataaggre.dto.resigroup.result.CandidateListResultDTO;
+import com.epmet.dataaggre.dto.resigroup.result.RankCodeResultDTO;
 import com.epmet.dataaggre.dto.resigroup.result.SubAnalysisByCodeResultDTO;
 
 import java.util.List;
@@ -49,4 +51,12 @@ public interface ResiGroupService {
      * @return com.epmet.dataaggre.dto.resigroup.result.DataCommonDTO
      */
     List<SubAnalysisByCodeResultDTO> querySubAnalysisByCode(SubAnalysisByCodeFormDTO formDTO);
+
+    /**
+     * 004、【支建+联建】排序方式下拉框
+     *
+     * @param formDTO
+     * @return com.epmet.dataaggre.dto.resigroup.result.RankCodeResultDTO
+     */
+    List<RankCodeResultDTO> queryRankCodeList(GroupActCategoryQueryFormDTO formDTO);
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java
index 141158f063..6d726bba69 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java
@@ -13,6 +13,7 @@ import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO;
 import com.epmet.dataaggre.dto.resigroup.ResiTopicDTO;
 import com.epmet.dataaggre.dto.resigroup.form.BranchConAnalysisFormDTO;
 import com.epmet.dataaggre.dto.resigroup.form.CandidateListFormDTO;
+import com.epmet.dataaggre.dto.resigroup.form.GroupActCategoryQueryFormDTO;
 import com.epmet.dataaggre.dto.resigroup.form.SubAnalysisByCodeFormDTO;
 import com.epmet.dataaggre.dto.resigroup.result.*;
 import com.epmet.dataaggre.entity.resigroup.ResiGroupEntity;
@@ -244,4 +245,30 @@ public class ResiGroupServiceImpl implements ResiGroupService {
         }
         return resultList;
     }
+
+    /**
+     * 004、【支建+联建】排序方式下拉框
+     *
+     * @param formDTO
+     * @return com.epmet.dataaggre.dto.resigroup.result.RankCodeResultDTO
+     */
+    @Override
+    public List<RankCodeResultDTO> queryRankCodeList(GroupActCategoryQueryFormDTO formDTO) {
+        List<RankCodeResultDTO> resultList=new ArrayList<>();
+        RankCodeResultDTO defaultResult=new RankCodeResultDTO();
+        defaultResult.setRankCode("orgtotal");
+        defaultResult.setRankName("组织活动总次数");
+        resultList.add(defaultResult);
+        List<ActCategoryDictDTO> categoryList=resiGroupDao.selectActCategoryDictDTOByPcode(formDTO.getCustomerId(),formDTO.getFirstCategoryCode());
+        if(CollectionUtils.isEmpty(categoryList)){
+            categoryList=resiGroupDao.selectActCategoryDictDTOByPcode(Constant.DEFAULT_CUSTOMER,formDTO.getFirstCategoryCode());
+        }
+        categoryList.forEach(category->{
+            RankCodeResultDTO result=new RankCodeResultDTO();
+            result.setRankCode(category.getCategoryCode());
+            result.setRankName(category.getCategoryName().concat("-组织次数"));
+            resultList.add(result);
+        });
+        return resultList;
+    }
 }

From 112c6efef4d58786890dc37d87322aa5ad9e6190 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 19 May 2021 09:49:17 +0800
Subject: [PATCH 037/128] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BB=B7bug?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resigroup/form/GroupActRankFormDTO.java   | 45 +++++++++++++++++++
 .../result/GroupActRankDetailDTO.java         | 13 ++++++
 .../result/GroupActRankResultDTO.java         | 22 +++++++++
 .../controller/GroupActController.java        | 15 +++++++
 .../govorg/impl/GovOrgServiceImpl.java        |  9 ----
 .../service/resigroup/ResiGroupService.java   | 18 ++++----
 .../resigroup/impl/ResiGroupServiceImpl.java  | 21 +++++++--
 7 files changed, 122 insertions(+), 21 deletions(-)
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/form/GroupActRankFormDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/GroupActRankDetailDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/GroupActRankResultDTO.java

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/form/GroupActRankFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/form/GroupActRankFormDTO.java
new file mode 100644
index 0000000000..e9a920f869
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/form/GroupActRankFormDTO.java
@@ -0,0 +1,45 @@
+package com.epmet.dataaggre.dto.resigroup.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 005、【支建+联建】下级组织排行列表
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/5/18 17:30
+ */
+@Data
+public class GroupActRankFormDTO implements Serializable {
+    private static final long serialVersionUID = 2293552582281839132L;
+    public interface AddUserInternalGroup {
+    }
+
+    /**
+     * 支部建设：100；联建共建：101
+     */
+    @NotBlank(message = "firstCategoryCode必传,支部建设：100；联建共建：101", groups = BranchConAnalysisFormDTO.AddUserInternalGroup.class)
+    private String firstCategoryCode;
+
+    /**
+     * 当前客户id
+     */
+    @NotBlank(message = "客户id不能为空", groups = BranchConAnalysisFormDTO.AddUserInternalGroup.class)
+    private String customerId;
+
+    /**
+     * 当前组织或者网格id
+     */
+    @NotBlank(message = "orgId不能为空", groups = BranchConAnalysisFormDTO.AddUserInternalGroup.class)
+    private String orgId;
+
+    /**
+     * 默认传组织：agency;  网格：grid
+     */
+    @NotBlank(message = "orgType不能为空", groups = BranchConAnalysisFormDTO.AddUserInternalGroup.class)
+    private String orgType;
+
+    private String rankCode;
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/GroupActRankDetailDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/GroupActRankDetailDTO.java
new file mode 100644
index 0000000000..21e3dc29fd
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/GroupActRankDetailDTO.java
@@ -0,0 +1,13 @@
+package com.epmet.dataaggre.dto.resigroup.result;
+
+import lombok.Data;
+
+/**
+ * 描述一下
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/5/19 9:31
+ */
+@Data
+public class GroupActRankDetailDTO {
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/GroupActRankResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/GroupActRankResultDTO.java
new file mode 100644
index 0000000000..45efaa413b
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/GroupActRankResultDTO.java
@@ -0,0 +1,22 @@
+package com.epmet.dataaggre.dto.resigroup.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 005、【支建+联建】下级组织排行列表
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/5/18 17:33
+ */
+@Data
+public class GroupActRankResultDTO implements Serializable {
+    private String orgId;
+    private String orgType;
+    private String orgName;
+    private Integer organizeTotal;
+    private String organizeName = "组织总次数";
+    private Integer participateUserTotal;
+    private String participateUserName = "参加总人数";
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GroupActController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GroupActController.java
index a88f86456e..b79cb0b7f7 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GroupActController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GroupActController.java
@@ -5,8 +5,10 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO;
 import com.epmet.dataaggre.dto.resigroup.form.BranchConAnalysisFormDTO;
 import com.epmet.dataaggre.dto.resigroup.form.GroupActCategoryQueryFormDTO;
+import com.epmet.dataaggre.dto.resigroup.form.GroupActRankFormDTO;
 import com.epmet.dataaggre.dto.resigroup.form.SubAnalysisByCodeFormDTO;
 import com.epmet.dataaggre.dto.resigroup.result.BranchConAnalysisResultDTO;
+import com.epmet.dataaggre.dto.resigroup.result.GroupActRankResultDTO;
 import com.epmet.dataaggre.dto.resigroup.result.RankCodeResultDTO;
 import com.epmet.dataaggre.dto.resigroup.result.SubAnalysisByCodeResultDTO;
 import com.epmet.dataaggre.service.resigroup.ResiGroupService;
@@ -86,4 +88,17 @@ public class GroupActController {
     }
 
 
+    /**
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dataaggre.dto.resigroup.result.GroupActRankResultDTO>>
+     * @param formDTO
+     * @author yinzuomei
+     * @description 005、【支建+联建】下级组织排行列表
+     * @Date 2021/5/18 17:46
+     **/
+    @PostMapping("subranklist")
+    public Result<List<GroupActRankResultDTO>> querySubRankList(@RequestBody GroupActRankFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO,GroupActRankFormDTO.class);
+        return new Result<List<GroupActRankResultDTO>>().ok(resiGroupService.querySubRankList(formDTO));
+    }
+
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
index 18ad900fc6..100978e144 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
@@ -175,15 +175,6 @@ public class GovOrgServiceImpl implements GovOrgService {
                 agecnyInfo.setOrgType("agency");
                 result.add(agecnyInfo);
             });
-        }else if("grid".equals(orgType)){
-            List<GridInfoResultDTO> list= customerGridDao.selectGridListByAgencyId(orgId);
-            list.forEach(grid->{
-                OrgInfoCommonDTO gridInfo=new OrgInfoCommonDTO();
-                gridInfo.setOrgId(grid.getGridId());
-                gridInfo.setOrgName(grid.getGridName());
-                gridInfo.setOrgType("grid");
-                result.add(gridInfo);
-            });
         }
         return result;
     }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/ResiGroupService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/ResiGroupService.java
index d0cb64fade..68f4afb4ee 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/ResiGroupService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/ResiGroupService.java
@@ -2,14 +2,8 @@ package com.epmet.dataaggre.service.resigroup;
 
 import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO;
 import com.epmet.dataaggre.dto.resigroup.ResiTopicDTO;
-import com.epmet.dataaggre.dto.resigroup.form.BranchConAnalysisFormDTO;
-import com.epmet.dataaggre.dto.resigroup.form.CandidateListFormDTO;
-import com.epmet.dataaggre.dto.resigroup.form.GroupActCategoryQueryFormDTO;
-import com.epmet.dataaggre.dto.resigroup.form.SubAnalysisByCodeFormDTO;
-import com.epmet.dataaggre.dto.resigroup.result.BranchConAnalysisResultDTO;
-import com.epmet.dataaggre.dto.resigroup.result.CandidateListResultDTO;
-import com.epmet.dataaggre.dto.resigroup.result.RankCodeResultDTO;
-import com.epmet.dataaggre.dto.resigroup.result.SubAnalysisByCodeResultDTO;
+import com.epmet.dataaggre.dto.resigroup.form.*;
+import com.epmet.dataaggre.dto.resigroup.result.*;
 
 import java.util.List;
 
@@ -59,4 +53,12 @@ public interface ResiGroupService {
      * @return com.epmet.dataaggre.dto.resigroup.result.RankCodeResultDTO
      */
     List<RankCodeResultDTO> queryRankCodeList(GroupActCategoryQueryFormDTO formDTO);
+
+    /**
+     * 005、【支建+联建】下级组织排行列表
+     *
+     * @param formDTO
+     * @return com.epmet.dataaggre.dto.resigroup.result.GroupActRankResultDTO
+     */
+    List<GroupActRankResultDTO> querySubRankList(GroupActRankFormDTO formDTO);
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java
index 6d726bba69..030adf6b6a 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java
@@ -11,10 +11,7 @@ import com.epmet.dataaggre.dto.datastats.FactGroupActDailyDTO;
 import com.epmet.dataaggre.dto.epmetuser.result.UserInfosResultDTO;
 import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO;
 import com.epmet.dataaggre.dto.resigroup.ResiTopicDTO;
-import com.epmet.dataaggre.dto.resigroup.form.BranchConAnalysisFormDTO;
-import com.epmet.dataaggre.dto.resigroup.form.CandidateListFormDTO;
-import com.epmet.dataaggre.dto.resigroup.form.GroupActCategoryQueryFormDTO;
-import com.epmet.dataaggre.dto.resigroup.form.SubAnalysisByCodeFormDTO;
+import com.epmet.dataaggre.dto.resigroup.form.*;
 import com.epmet.dataaggre.dto.resigroup.result.*;
 import com.epmet.dataaggre.entity.resigroup.ResiGroupEntity;
 import com.epmet.dataaggre.redis.ResiGroupRedis;
@@ -271,4 +268,20 @@ public class ResiGroupServiceImpl implements ResiGroupService {
         });
         return resultList;
     }
+
+    /**
+     * 005、【支建+联建】下级组织排行列表
+     *
+     * @param formDTO
+     * @return com.epmet.dataaggre.dto.resigroup.result.GroupActRankResultDTO
+     */
+    @Override
+    public List<GroupActRankResultDTO> querySubRankList(GroupActRankFormDTO formDTO) {
+        List<OrgInfoCommonDTO> orgInfoDTOList = govOrgService.queryNextOrgInfoDTO(formDTO.getCustomerId(), formDTO.getOrgId(), formDTO.getOrgType());
+        if (CollectionUtils.isEmpty(orgInfoDTOList)) {
+            return new ArrayList<>();
+        }
+        // todo
+        return null;
+    }
 }

From 535837686c082900d08863c886c18c217c028337 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 19 May 2021 12:28:14 +0800
Subject: [PATCH 038/128] =?UTF-8?q?=E6=94=AF=E9=83=A8=E5=BB=BA=E8=AE=BE?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3v3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resigroup/form/GroupActRankFormDTO.java   |  3 ++
 .../result/GroupActRankDetailDTO.java         | 14 +++++-
 .../result/GroupActRankResultDTO.java         | 21 +++++++++
 .../controller/GroupActController.java        |  2 +-
 .../dataaggre/dao/datastats/DataStatsDao.java |  7 +++
 .../service/datastats/DataStatsService.java   |  4 ++
 .../datastats/impl/DataStatsServiceImpl.java  | 10 ++++
 .../service/govorg/GovOrgService.java         |  2 +-
 .../govorg/impl/GovOrgServiceImpl.java        | 17 +++++--
 .../resigroup/impl/ResiGroupServiceImpl.java  | 47 +++++++++++++++++--
 .../mapper/datastats/DatsStatsDao.xml         | 20 ++++++++
 11 files changed, 136 insertions(+), 11 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/form/GroupActRankFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/form/GroupActRankFormDTO.java
index e9a920f869..58a029661b 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/form/GroupActRankFormDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/form/GroupActRankFormDTO.java
@@ -41,5 +41,8 @@ public class GroupActRankFormDTO implements Serializable {
     @NotBlank(message = "orgType不能为空", groups = BranchConAnalysisFormDTO.AddUserInternalGroup.class)
     private String orgType;
 
+    /**
+     * 排序编码；可以不传，前端自己处理。
+     */
     private String rankCode;
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/GroupActRankDetailDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/GroupActRankDetailDTO.java
index 21e3dc29fd..575b9bd803 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/GroupActRankDetailDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/GroupActRankDetailDTO.java
@@ -2,12 +2,22 @@ package com.epmet.dataaggre.dto.resigroup.result;
 
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
- * 描述一下
+ * 005、【支建+联建】下级组织排行列表
  *
  * @author yinzuomei@elink-cn.com
  * @date 2021/5/19 9:31
  */
 @Data
-public class GroupActRankDetailDTO {
+public class GroupActRankDetailDTO implements Serializable {
+    private static final long serialVersionUID = 7738751412518098478L;
+
+    private String categoryCode;
+    private String categoryName;
+    private Integer organizeTotal;
+    private Integer participateUserTotal;
+    private String organizeName="组织总次数";
+    private String participateUserName="参加总人数";
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/GroupActRankResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/GroupActRankResultDTO.java
index 45efaa413b..56822631f2 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/GroupActRankResultDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/GroupActRankResultDTO.java
@@ -1,8 +1,12 @@
 package com.epmet.dataaggre.dto.resigroup.result;
 
+import com.epmet.commons.tools.constant.NumConstant;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 005、【支建+联建】下级组织排行列表
@@ -19,4 +23,21 @@ public class GroupActRankResultDTO implements Serializable {
     private String organizeName = "组织总次数";
     private Integer participateUserTotal;
     private String participateUserName = "参加总人数";
+    private List<GroupActRankDetailDTO> categoryList;
+
+    @JsonIgnore
+    private Integer sortValue;
+
+    public GroupActRankResultDTO() {
+        this.orgId = "";
+        this.orgType = "";
+        this.orgName = "";
+        this.organizeTotal = NumConstant.ZERO;
+        this.organizeName = "组织总次数";
+        this.participateUserTotal = NumConstant.ZERO;
+        this.participateUserName = "参加总人数";
+        this.categoryList = new ArrayList<>();
+    }
+
+
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GroupActController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GroupActController.java
index b79cb0b7f7..ee86d8c1d1 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GroupActController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GroupActController.java
@@ -97,7 +97,7 @@ public class GroupActController {
      **/
     @PostMapping("subranklist")
     public Result<List<GroupActRankResultDTO>> querySubRankList(@RequestBody GroupActRankFormDTO formDTO){
-        ValidatorUtils.validateEntity(formDTO,GroupActRankFormDTO.class);
+        ValidatorUtils.validateEntity(formDTO,GroupActRankFormDTO.AddUserInternalGroup.class);
         return new Result<List<GroupActRankResultDTO>>().ok(resiGroupService.querySubRankList(formDTO));
     }
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
index 2a7aae6f5e..61632b35bd 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
@@ -21,6 +21,8 @@ import com.epmet.dataaggre.dto.datastats.FactGroupActDailyDTO;
 import com.epmet.dataaggre.dto.datastats.form.SubAgencyFormDTO;
 import com.epmet.dataaggre.dto.datastats.form.SubGridFormDTO;
 import com.epmet.dataaggre.dto.datastats.result.*;
+import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO;
+import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO;
 import com.epmet.dataaggre.entity.datastats.DimAgencyEntity;
 import com.epmet.dataaggre.entity.datastats.DimGridEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -219,4 +221,9 @@ public interface DataStatsDao {
                                                       @Param("pid")String pid,
                                                       @Param("dateId")String dateId,
                                                       @Param("categoryCode")String categoryCode);
+
+    List<GroupActRankDetailDTO> selectGroupActRankDetail(@Param("customerId") String customerId,
+                                                         @Param("dateId") String dateId,
+                                                         @Param("orgId") String orgId,
+                                                         @Param("actCategoryDictDTOList") List<ActCategoryDictDTO> actCategoryDictDTOList);
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
index 0fe6517106..1e99251989 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
@@ -7,6 +7,8 @@ import com.epmet.dataaggre.dto.datastats.form.GridBasicDataFormDTO;
 import com.epmet.dataaggre.dto.datastats.form.SubAgencyFormDTO;
 import com.epmet.dataaggre.dto.datastats.form.SubGridFormDTO;
 import com.epmet.dataaggre.dto.datastats.result.*;
+import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO;
+import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO;
 
 import java.util.List;
 
@@ -124,4 +126,6 @@ public interface DataStatsService {
     List<FactGroupActDailyDTO> branchConAnalysis(String customerId, String orgId, String orgType, String dateId, String parentCode);
 
     List<FactGroupActDailyDTO> querySubAnalysisByCode(String customerId, String pid, String dateId, String categoryCode);
+
+    List<GroupActRankDetailDTO> selectGroupActRankDetail(String customerId, String dateId, String orgId, List<ActCategoryDictDTO> actCategoryDictDTOList);
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index acb2cc22a0..415b1e969b 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -13,6 +13,8 @@ import com.epmet.dataaggre.dto.datastats.form.GridBasicDataFormDTO;
 import com.epmet.dataaggre.dto.datastats.form.SubAgencyFormDTO;
 import com.epmet.dataaggre.dto.datastats.form.SubGridFormDTO;
 import com.epmet.dataaggre.dto.datastats.result.*;
+import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO;
+import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO;
 import com.epmet.dataaggre.entity.datastats.DimAgencyEntity;
 import com.epmet.dataaggre.entity.datastats.DimGridEntity;
 import com.epmet.dataaggre.service.datastats.DataStatsService;
@@ -999,4 +1001,12 @@ public class DataStatsServiceImpl implements DataStatsService {
         return dataStatsDao.querySubAnalysisByCode(customerId,pid,dateId,categoryCode);
     }
 
+    @Override
+    public List<GroupActRankDetailDTO> selectGroupActRankDetail(String customerId, String dateId, String orgId, List<ActCategoryDictDTO> actCategoryDictDTOList) {
+        if(CollectionUtils.isNotEmpty(actCategoryDictDTOList)){
+            return dataStatsDao.selectGroupActRankDetail(customerId,dateId,orgId,actCategoryDictDTOList);
+        }
+        return new ArrayList<>();
+    }
+
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java
index d0780b046d..916044b1f3 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java
@@ -47,5 +47,5 @@ public interface GovOrgService {
 
     List<NextAreaCodeResultDTO> queryNextLevelAreaCodeList(NextAreaCodeFormDTO formDTO);
 
-    List<OrgInfoCommonDTO> queryNextOrgInfoDTO(String customerId, String orgId, String orgType);
+    List<OrgInfoCommonDTO> queryNextOrgInfoDTO(String customerId, String orgId);
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
index 100978e144..ec45f0419f 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
@@ -164,10 +164,10 @@ public class GovOrgServiceImpl implements GovOrgService {
     }
 
     @Override
-    public List<OrgInfoCommonDTO> queryNextOrgInfoDTO(String customerId, String orgId, String orgType) {
+    public List<OrgInfoCommonDTO> queryNextOrgInfoDTO(String customerId, String orgId) {
         List<OrgInfoCommonDTO> result=new ArrayList<>();
-        if("agency".equals(orgType)){
-            List<CustomerAgencyEntity> customerAgencyEntityList = customerAgencyDao.selectNextAgency(customerId, orgId);
+        List<CustomerAgencyEntity> customerAgencyEntityList = customerAgencyDao.selectNextAgency(customerId, orgId);
+        if(CollectionUtils.isNotEmpty(customerAgencyEntityList)){
             customerAgencyEntityList.forEach(agencyEntity->{
                 OrgInfoCommonDTO agecnyInfo=new OrgInfoCommonDTO();
                 agecnyInfo.setOrgId(agencyEntity.getId());
@@ -175,6 +175,17 @@ public class GovOrgServiceImpl implements GovOrgService {
                 agecnyInfo.setOrgType("agency");
                 result.add(agecnyInfo);
             });
+            return result;
+        }
+        List<GridInfoResultDTO> gridInfoResultDTOList=customerGridDao.selectGridListByAgencyId(orgId);
+        if(CollectionUtils.isNotEmpty(gridInfoResultDTOList)){
+            gridInfoResultDTOList.forEach(grid->{
+                OrgInfoCommonDTO gridInfo=new OrgInfoCommonDTO();
+                gridInfo.setOrgId(grid.getGridId());
+                gridInfo.setOrgName(grid.getGridName());
+                gridInfo.setOrgType("grid");
+                result.add(gridInfo);
+            });
         }
         return result;
     }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java
index 030adf6b6a..a56c37e37f 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java
@@ -25,8 +25,10 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -198,7 +200,7 @@ public class ResiGroupServiceImpl implements ResiGroupService {
      */
     @Override
     public List<SubAnalysisByCodeResultDTO> querySubAnalysisByCode(SubAnalysisByCodeFormDTO formDTO) {
-        List<OrgInfoCommonDTO> orgInfoDTOList = govOrgService.queryNextOrgInfoDTO(formDTO.getCustomerId(), formDTO.getOrgId(), formDTO.getOrgType());
+        List<OrgInfoCommonDTO> orgInfoDTOList = govOrgService.queryNextOrgInfoDTO(formDTO.getCustomerId(), formDTO.getOrgId());
         if (CollectionUtils.isEmpty(orgInfoDTOList)) {
             return new ArrayList<>();
         }
@@ -277,11 +279,48 @@ public class ResiGroupServiceImpl implements ResiGroupService {
      */
     @Override
     public List<GroupActRankResultDTO> querySubRankList(GroupActRankFormDTO formDTO) {
-        List<OrgInfoCommonDTO> orgInfoDTOList = govOrgService.queryNextOrgInfoDTO(formDTO.getCustomerId(), formDTO.getOrgId(), formDTO.getOrgType());
+        List<OrgInfoCommonDTO> orgInfoDTOList = govOrgService.queryNextOrgInfoDTO(formDTO.getCustomerId(), formDTO.getOrgId());
         if (CollectionUtils.isEmpty(orgInfoDTOList)) {
             return new ArrayList<>();
         }
-        // todo
-        return null;
+        List<GroupActRankResultDTO> resultDTOList=new ArrayList<>();
+        String dateId = DateUtils.getBeforeNDay(NumConstant.ONE);
+        // 1、根据以及编码查询出二级编码列表
+        List<ActCategoryDictDTO> actCategoryDictDTOList=queryActCategoryDictList(formDTO.getCustomerId(),formDTO.getFirstCategoryCode());
+        for(OrgInfoCommonDTO orgInfo:orgInfoDTOList){
+            GroupActRankResultDTO resultDTO=new GroupActRankResultDTO();
+            resultDTO.setOrgId(orgInfo.getOrgId());
+            resultDTO.setOrgName(orgInfo.getOrgName());
+            resultDTO.setOrgType(orgInfo.getOrgType());
+            if(!CollectionUtils.isEmpty(actCategoryDictDTOList)){
+                int organizeTotal = NumConstant.ZERO;
+                int participateUserTotal = NumConstant.ZERO;
+                List<GroupActRankDetailDTO> detailList=dataStatsService.selectGroupActRankDetail(formDTO.getCustomerId(),dateId,orgInfo.getOrgId(),actCategoryDictDTOList);
+                for(GroupActRankDetailDTO deatil:detailList){
+                    organizeTotal+=deatil.getOrganizeTotal();
+                    participateUserTotal+=deatil.getParticipateUserTotal();
+                }
+                resultDTO.setOrganizeTotal(organizeTotal);
+                resultDTO.setParticipateUserTotal(participateUserTotal);
+                resultDTO.setCategoryList(detailList);
+            }
+            resultDTOList.add(resultDTO);
+        }
+
+        if(StringUtils.isEmpty(formDTO.getRankCode())||"orgtotal".equals(formDTO.getRankCode())){
+            //按照 组织总次数降序排列
+            resultDTOList.sort(Comparator.comparing(GroupActRankResultDTO::getOrganizeTotal).reversed());
+        }else{
+            resultDTOList.forEach(m->{
+                for(GroupActRankDetailDTO categoryDto:m.getCategoryList()){
+                    if(formDTO.getRankCode().equals(categoryDto.getCategoryCode())){
+                        m.setSortValue(categoryDto.getOrganizeTotal());
+                        break;
+                    }
+                }
+            });
+            resultDTOList.sort(Comparator.comparing(GroupActRankResultDTO::getSortValue).reversed());
+        }
+        return resultDTOList;
     }
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
index d918e91a3f..0b41cf0b15 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
@@ -578,4 +578,24 @@
             AND m.DATE_ID = #{dateId}
             AND m.PID = #{pid}
     </select>
+
+    <select id="selectGroupActRankDetail" parameterType="map" resultType="com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO">
+        <foreach collection="actCategoryDictDTOList" item="category" separator=" UNION ">
+            select
+                #{category.categoryCode} as categoryCode,
+                #{category.categoryName} as categoryName,
+                IFNULL(m.ORGANIZE_TOTAL,0) as organizeTotal,
+                IFNULL(m.PARTICIPATE_USER_TOTAL,0) as participateUserTotal,
+                '组织总次数' as organizeName,
+                '参加总人数'as participateUserName
+            FROM
+                fact_group_act_daily m
+            WHERE
+                m.DEL_FLAG = '0'
+                AND m.CUSTOMER_ID = #{customerId}
+                AND m.CATEGORY_CODE = #{category.categoryCode}
+                AND m.DATE_ID = #{dateId}
+                AND m.ORG_ID = #{orgId}
+        </foreach>
+    </select>
 </mapper>
\ No newline at end of file

From dc7c29270d572a2821391f7eace5fe6f50ab97eb Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 19 May 2021 12:50:09 +0800
Subject: [PATCH 039/128] =?UTF-8?q?=E6=94=AF=E9=83=A8=E5=BB=BA=E8=AE=BE?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3v3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../result/GroupActRankDetailDTO.java         |  4 +--
 .../resigroup/impl/ResiGroupServiceImpl.java  | 25 +++++++++++++++++--
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/GroupActRankDetailDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/GroupActRankDetailDTO.java
index 575b9bd803..60be83657e 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/GroupActRankDetailDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/GroupActRankDetailDTO.java
@@ -18,6 +18,6 @@ public class GroupActRankDetailDTO implements Serializable {
     private String categoryName;
     private Integer organizeTotal;
     private Integer participateUserTotal;
-    private String organizeName="组织总次数";
-    private String participateUserName="参加总人数";
+    private String organizeName;
+    private String participateUserName;
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java
index a56c37e37f..a2f853dd2f 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java
@@ -293,16 +293,37 @@ public class ResiGroupServiceImpl implements ResiGroupService {
             resultDTO.setOrgName(orgInfo.getOrgName());
             resultDTO.setOrgType(orgInfo.getOrgType());
             if(!CollectionUtils.isEmpty(actCategoryDictDTOList)){
+
+                List<GroupActRankDetailDTO> detailList=new ArrayList<>();
+                List<GroupActRankDetailDTO> detailRecords=dataStatsService.selectGroupActRankDetail(formDTO.getCustomerId(),dateId,orgInfo.getOrgId(),actCategoryDictDTOList);
+                Map<String, GroupActRankDetailDTO> map = detailRecords.stream().collect(Collectors.toMap(GroupActRankDetailDTO::getCategoryCode, a -> a, (k1, k2) -> k1));
+
+                for(ActCategoryDictDTO actCategoryDictDTO:actCategoryDictDTOList){
+                    GroupActRankDetailDTO temp=new GroupActRankDetailDTO();
+                    temp.setCategoryCode(actCategoryDictDTO.getCategoryCode());
+                    temp.setCategoryName(actCategoryDictDTO.getCategoryName());
+                    temp.setOrganizeName("组织总次数");
+                    temp.setParticipateUserName("参加总人数");
+                    if(map.containsKey(actCategoryDictDTO.getCategoryCode())){
+                        temp.setOrganizeTotal(map.get(actCategoryDictDTO.getCategoryCode()).getOrganizeTotal());
+                        temp.setParticipateUserTotal(map.get(actCategoryDictDTO.getCategoryCode()).getParticipateUserTotal());
+                    }else{
+                        temp.setOrganizeTotal(NumConstant.ZERO);
+                        temp.setParticipateUserTotal(NumConstant.ZERO);
+                    }
+                    detailList.add(temp);
+                }
+                resultDTO.setCategoryList(detailList);
+
                 int organizeTotal = NumConstant.ZERO;
                 int participateUserTotal = NumConstant.ZERO;
-                List<GroupActRankDetailDTO> detailList=dataStatsService.selectGroupActRankDetail(formDTO.getCustomerId(),dateId,orgInfo.getOrgId(),actCategoryDictDTOList);
                 for(GroupActRankDetailDTO deatil:detailList){
                     organizeTotal+=deatil.getOrganizeTotal();
                     participateUserTotal+=deatil.getParticipateUserTotal();
                 }
                 resultDTO.setOrganizeTotal(organizeTotal);
                 resultDTO.setParticipateUserTotal(participateUserTotal);
-                resultDTO.setCategoryList(detailList);
+
             }
             resultDTOList.add(resultDTO);
         }

From 3dba5488f9e061c3350a02637a4c99d55e07e72b Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 19 May 2021 12:50:39 +0800
Subject: [PATCH 040/128] =?UTF-8?q?=E6=94=AF=E9=83=A8=E5=BB=BA=E8=AE=BE?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3v3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataaggre/dto/resigroup/result/GroupActRankResultDTO.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/GroupActRankResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/GroupActRankResultDTO.java
index 56822631f2..8bb3ed181f 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/GroupActRankResultDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/GroupActRankResultDTO.java
@@ -20,9 +20,9 @@ public class GroupActRankResultDTO implements Serializable {
     private String orgType;
     private String orgName;
     private Integer organizeTotal;
-    private String organizeName = "组织总次数";
+    private String organizeName;
     private Integer participateUserTotal;
-    private String participateUserName = "参加总人数";
+    private String participateUserName;
     private List<GroupActRankDetailDTO> categoryList;
 
     @JsonIgnore

From 850ae0faa86119b8147078ef6c2fd0352a87fb03 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 19 May 2021 13:44:31 +0800
Subject: [PATCH 041/128] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E6=8C=89=E5=A4=A9=E7=BB=9F=E8=AE=A1bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/group/GroupDataDao.xml          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml
index ebd75dc9dd..6ced5d827a 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml
@@ -284,7 +284,7 @@
             AND gai.CUSTOMER_ID = #{customerId}
             AND gai.`STATUS` != 'canceled'
             AND gai.SIGNED_IN_NUM > 0
-            and DATE_FORMAT(gai.CREATED_TIME,'%Y%m%d') &lt; #{dateId}
+            and DATE_FORMAT(gai.CREATED_TIME,'%Y%m%d') &lt;= #{dateId}
             and gai.CATEGORY_CODE like concat(#{categoryCode},'%')
             and gai.GRID_ID=#{gridId}
         GROUP BY
@@ -308,7 +308,7 @@
             AND gai.`STATUS` != 'canceled'
             AND gai.SIGNED_IN_NUM > 0
             and gai.GRID_PIDS like concat('%',#{agencyId},'%')
-            and DATE_FORMAT(gai.CREATED_TIME,'%Y%m%d') &lt; #{dateId}
+            and DATE_FORMAT(gai.CREATED_TIME,'%Y%m%d') &lt;= #{dateId}
             and gai.CATEGORY_CODE like concat(#{categoryCode},'%')
         GROUP BY
             gai.CUSTOMER_ID

From aa89523b1f2becc46affa1bdcbf1d140477088d6 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 19 May 2021 13:54:05 +0800
Subject: [PATCH 042/128] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=BE=97=E5=88=86?=
 =?UTF-8?q?=E8=AF=B4=E6=98=8E=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../index/dto/IndexExplainDTO.java            |  5 --
 .../index/dto/IndexExplainTreeDTO.java        |  5 --
 .../datareport/constant/IndexConstant.java    |  3 +-
 .../index/impl/IndexExplainServiceImpl.java   | 86 ++++++++++++-------
 .../mapper/index/IndexExplainDao.xml          |  5 +-
 5 files changed, 59 insertions(+), 45 deletions(-)

diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/dto/IndexExplainDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/dto/IndexExplainDTO.java
index 9980f5500d..d48084d3df 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/dto/IndexExplainDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/dto/IndexExplainDTO.java
@@ -84,11 +84,6 @@ public class IndexExplainDTO implements Serializable {
      */
 	private String type;
 
-    /**
-     * 是否下钻：1 是；0否；eg：网格的下级分数 下钻到党员
-     */
-	private Integer goDown;
-
     /**
      * 删除标记 0：未删除，1：已删除
      */
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/dto/IndexExplainTreeDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/dto/IndexExplainTreeDTO.java
index e50b466e9d..d812953500 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/dto/IndexExplainTreeDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/dto/IndexExplainTreeDTO.java
@@ -84,11 +84,6 @@ public class IndexExplainTreeDTO implements Serializable {
      */
 	private String type;
 
-    /**
-     * 是否下钻：1 是；0否；eg：网格的下级分数 下钻到党员
-     */
-	private Integer goDown;
-
     /**
      * 子节点
      */
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/constant/IndexConstant.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/constant/IndexConstant.java
index 4e2c5e01e1..5f177f9f8b 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/constant/IndexConstant.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/constant/IndexConstant.java
@@ -25,8 +25,9 @@ public class IndexConstant {
     private static final String BEN_JI_CN = "本级";
     private static final String XIA_JI_CN = "下级";
 
-    public static final String ZI_SHEN = "ZISHEN";
+    public static final String ZI_SHEN = "zishen";
     public static final String XIA_JI = "xiaji";
+    public static final String THRESHOLD_TEXT = "给定阈值%d%%，超过阈值不加分";
 
 
     /**
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
index 0f79d225e2..06c22aaa61 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
@@ -94,39 +94,51 @@ public class IndexExplainServiceImpl implements IndexExplainService {
     }
 
     private void setTableData(IndexExplainFormDTO formDTO, Map<String, List<IndexGroupDetailResult>> detailEntityMap, IndexExplainTreeDTO explainDTO, IndexExplainResult result) {
-        Integer goDown = explainDTO.getGoDown();
         if (NumConstant.ONE == explainDTO.getIsSearch()) {
-            List<String> tableHeaders = getTableHeaders(explainDTO);
-            result.setTableTileList(tableHeaders);
+            String type = explainDTO.getType();
+
             switch (explainDTO.getOrgLevel()) {
                 case "grid":
-                    String type = explainDTO.getType();
                     String allIndexCodePath = null;
                     List<IndexScoreDetailResult> tableList = null;
-                    if (IndexConstant.ZI_SHEN.equals(type)) {
-                        allIndexCodePath = "wanggexiangguan:dangjiannengli";
-                        tableList = setDefaultTableData(detailEntityMap, type, allIndexCodePath);
-                        result.setTableDataList(tableList);
-                    } else if (IndexConstant.XIA_JI.equals(type)) {
-                        allIndexCodePath = "dangyuanxiangguan:lianxiqunzhong";
-                        tableList = setDefaultTableData(detailEntityMap, type, allIndexCodePath);
-                        result.setTableDataList(tableList);
-                    }
+
+                    List<IndexScoreResult> scoreList = null;
                     //set Target value
                     IndexScoreFormDTO ablityListFormDTO = new IndexScoreFormDTO();
                     ablityListFormDTO.setCustomerId(formDTO.getCustomerId());
                     ablityListFormDTO.setOrgId(formDTO.getOrgId());
                     ablityListFormDTO.setMonthId(DateUtils.getCurrentTimeBeforeMonthId());
-                    ablityListFormDTO.setAllParentIndexCode(allIndexCodePath);
-                    //下钻到党员
-                    List<IndexScoreResult> scoreList = null;
-                    if (goDown == 1) {
-                        scoreList = factIndexCpcSubScoreDao.selecCpcAvgScore(ablityListFormDTO);
-                    } else {
+
+
+                    if (IndexConstant.ZI_SHEN.equals(type)) {
+                        allIndexCodePath = "wanggexiangguan:dangjiannengli";
+
+                        List<String> tableHeaders = getTableHeaders(type, allIndexCodePath, formDTO.getOrgLevel());
+                        result.setTableTileList(tableHeaders);
+
+
+                        tableList = setDefaultTableData(formDTO.getOrgLevel(), type, detailEntityMap, result, allIndexCodePath);
+
                         //不下钻
+                        ablityListFormDTO.setAllParentIndexCode(allIndexCodePath);
                         scoreList = gridSubScoreDao.selectGridSubScore(ablityListFormDTO);
+                    } else if (IndexConstant.XIA_JI.equals(type)) {
+
+                        allIndexCodePath = "dangyuanxiangguan:lianxiqunzhong";
+
+
+                        List<String> tableHeaders = getTableHeaders(type, allIndexCodePath, formDTO.getOrgLevel());
+                        tableHeaders.add(0, "组织内党员的联系群众指数考评分（平均值）");
+                        result.setTableTileList(tableHeaders);
+
+                        tableList = setDefaultTableData(formDTO.getOrgLevel(), type, detailEntityMap, result, allIndexCodePath);
+
+                        //下钻到党员
+                        ablityListFormDTO.setAllParentIndexCode(allIndexCodePath);
+                        scoreList = factIndexCpcSubScoreDao.selecCpcAvgScore(ablityListFormDTO);
                     }
-                    if (scoreList == null || tableList == null) {
+
+                    if (scoreList == null) {
                         return;
                     }
                     for (IndexScoreResult score : scoreList) {
@@ -135,12 +147,10 @@ public class IndexExplainServiceImpl implements IndexExplainService {
                                 tb.setOriginValue(score.getOriginValue());
                                 tb.setScore(String.valueOf(score.getScore()));
                                 tb.setQuantity(score.getQuantity());
-                                tb.setWeight(score.getWeight().multiply(new BigDecimal(100)).setScale(NumConstant.TWO, BigDecimal.ROUND_HALF_UP) + "%");
+                                tb.setWeight(score.getWeight().multiply(new BigDecimal(NumConstant.ONE_HUNDRED)).setScale(NumConstant.TWO, BigDecimal.ROUND_HALF_UP) + "%");
                             }
                         }
                     }
-
-
                     break;
                 default:
 
@@ -148,18 +158,27 @@ public class IndexExplainServiceImpl implements IndexExplainService {
         }
     }
 
-    private List<IndexScoreDetailResult> setDefaultTableData(Map<String, List<IndexGroupDetailResult>> detailEntityMap, String type, String allIndexCodePath) {
+    private List<IndexScoreDetailResult> setDefaultTableData(String orgLevel, String type, Map<String, List<IndexGroupDetailResult>> detailEntityMap, IndexExplainResult result, String allIndexCodePath) {
         List<IndexGroupDetailResult> indexGroupDetailEntities = detailEntityMap.get(allIndexCodePath);
         List<IndexScoreDetailResult> tableList = new ArrayList<>();
+        List<String> threlodList = new ArrayList<>();
         indexGroupDetailEntities.forEach(index -> {
             IndexScoreDetailResult table = new IndexScoreDetailResult();
+            if ("grid".equals(orgLevel) && IndexConstant.ZI_SHEN.equals(type) && index.getAllIndexCodePath().contains(IndexConstant.XIA_JI)) {
+                return;
+            }
             table.setIndexCode(index.getIndexCode());
             table.setIndexName(index.getIndexName());
             table.setOriginValue(NumConstant.ZERO_STR);
             table.setScore(NumConstant.ZERO_STR);
             table.setWeight(index.getWeight().multiply(new BigDecimal(100)).setScale(NumConstant.TWO, BigDecimal.ROUND_HALF_UP) + "%");
             tableList.add(table);
+            if (new BigDecimal(-1).compareTo(index.getThreshold()) != 0) {
+                threlodList.add(index.getIndexName().concat(String.format(IndexConstant.THRESHOLD_TEXT, index.getThreshold().intValue())));
+            }
         });
+        result.setTableDataList(tableList);
+        result.setThresholdList(threlodList);
         return tableList;
     }
 
@@ -182,15 +201,20 @@ public class IndexExplainServiceImpl implements IndexExplainService {
 
     }
 
-    private List<String> getTableHeaders(IndexExplainTreeDTO explain) {
-        String type = explain.getType();
+    private List<String> getTableHeaders(String type, String allIndexCode, String orgLevel) {
         List<String> headers = new ArrayList<>();
-        if ("zishen".equals(type)) {
-            headers = IndexConstant.getStandardSelfHeaders(explain.getIndexCode());
-
-        } else if ("xiaji".equals(type)) {
-            headers = IndexConstant.getStandardSubHeaders(explain.getIndexCode());
+        switch (orgLevel) {
+            case "grid":
+                //还没确定怎么搞
+            default:
+                if ("zishen".equals(type)) {
+                    headers = IndexConstant.getStandardSelfHeaders(allIndexCode);
+
+                } else if ("xiaji".equals(type)) {
+                    headers = IndexConstant.getStandardSubHeaders(allIndexCode);
+                }
         }
+
         return headers;
     }
 }
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/index/IndexExplainDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/index/IndexExplainDao.xml
index 392ba21ddd..9c7f5d0870 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/index/IndexExplainDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/index/IndexExplainDao.xml
@@ -14,14 +14,13 @@
         <result property="sort" column="SORT"/>
         <result property="isSearch" column="IS_SEARCH"/>
         <result property="type" column="TYPE"/>
-        <result property="goDown" column="GO_DOWN"/>
        <collection property="children" ofType="com.epmet.evaluationindex.index.dto.IndexExplainTreeDTO" column="ID"  select="getIndexExplainTreeByPid">
 
 </collection>
     </resultMap>
     <select id="getIndexExplainTreeByOrgType" resultMap="explainTreeResultMap">
         SELECT
-            ID, CUSTOMER_ID, TITLE, MEANING, INDEX_CODE, ORG_LEVEL, PID, SORT, IS_SEARCH, TYPE, GO_DOWN
+            ID, CUSTOMER_ID, TITLE, MEANING, INDEX_CODE, ORG_LEVEL, PID, SORT, IS_SEARCH, TYPE
         FROM  index_explain
         WHERE
             ORG_LEVEL = #{orgLevel}
@@ -31,7 +30,7 @@
     </select>
     <select id="getIndexExplainTreeByPid" resultMap="explainTreeResultMap">
         SELECT
-            ID, CUSTOMER_ID, TITLE, MEANING, INDEX_CODE, ORG_LEVEL, PID, SORT, IS_SEARCH, TYPE, GO_DOWN
+            ID, CUSTOMER_ID, TITLE, MEANING, INDEX_CODE, ORG_LEVEL, PID, SORT, IS_SEARCH, TYPE
         FROM  index_explain
         WHERE
             DEL_FLAG = '0'

From 8b8ae4b7b91d3120114f072d300d11e4aa6f6f2c Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 19 May 2021 14:11:46 +0800
Subject: [PATCH 043/128] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=BE=97=E5=88=86?=
 =?UTF-8?q?=E8=AF=B4=E6=98=8E=E6=9A=82=E5=AD=98-=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../index/impl/IndexExplainServiceImpl.java   | 63 +++++++++++--------
 1 file changed, 38 insertions(+), 25 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
index 06c22aaa61..76fc992ea3 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
@@ -95,14 +95,14 @@ public class IndexExplainServiceImpl implements IndexExplainService {
 
     private void setTableData(IndexExplainFormDTO formDTO, Map<String, List<IndexGroupDetailResult>> detailEntityMap, IndexExplainTreeDTO explainDTO, IndexExplainResult result) {
         if (NumConstant.ONE == explainDTO.getIsSearch()) {
-            String type = explainDTO.getType();
+            List<IndexScoreResult> realScoreList = null;
 
-            switch (explainDTO.getOrgLevel()) {
+            String type = explainDTO.getType();
+            String orgLevel = formDTO.getOrgLevel();
+            switch (orgLevel) {
                 case "grid":
                     String allIndexCodePath = null;
-                    List<IndexScoreDetailResult> tableList = null;
 
-                    List<IndexScoreResult> scoreList = null;
                     //set Target value
                     IndexScoreFormDTO ablityListFormDTO = new IndexScoreFormDTO();
                     ablityListFormDTO.setCustomerId(formDTO.getCustomerId());
@@ -113,48 +113,61 @@ public class IndexExplainServiceImpl implements IndexExplainService {
                     if (IndexConstant.ZI_SHEN.equals(type)) {
                         allIndexCodePath = "wanggexiangguan:dangjiannengli";
 
-                        List<String> tableHeaders = getTableHeaders(type, allIndexCodePath, formDTO.getOrgLevel());
+                        List<String> tableHeaders = getTableHeaders(type, allIndexCodePath, orgLevel);
                         result.setTableTileList(tableHeaders);
 
-
-                        tableList = setDefaultTableData(formDTO.getOrgLevel(), type, detailEntityMap, result, allIndexCodePath);
+                        setDefaultTableData(orgLevel, type, detailEntityMap, result, allIndexCodePath);
 
                         //不下钻
                         ablityListFormDTO.setAllParentIndexCode(allIndexCodePath);
-                        scoreList = gridSubScoreDao.selectGridSubScore(ablityListFormDTO);
+                        realScoreList = gridSubScoreDao.selectGridSubScore(ablityListFormDTO);
                     } else if (IndexConstant.XIA_JI.equals(type)) {
-
                         allIndexCodePath = "dangyuanxiangguan:lianxiqunzhong";
 
 
-                        List<String> tableHeaders = getTableHeaders(type, allIndexCodePath, formDTO.getOrgLevel());
+                        List<String> tableHeaders = getTableHeaders(type, allIndexCodePath, orgLevel);
                         tableHeaders.add(0, "组织内党员的联系群众指数考评分（平均值）");
                         result.setTableTileList(tableHeaders);
 
-                        tableList = setDefaultTableData(formDTO.getOrgLevel(), type, detailEntityMap, result, allIndexCodePath);
+                        setDefaultTableData(orgLevel, type, detailEntityMap, result, allIndexCodePath);
 
                         //下钻到党员
                         ablityListFormDTO.setAllParentIndexCode(allIndexCodePath);
-                        scoreList = factIndexCpcSubScoreDao.selecCpcAvgScore(ablityListFormDTO);
+                        realScoreList = factIndexCpcSubScoreDao.selecCpcAvgScore(ablityListFormDTO);
                     }
 
-                    if (scoreList == null) {
-                        return;
-                    }
-                    for (IndexScoreResult score : scoreList) {
-                        for (IndexScoreDetailResult tb : tableList) {
-                            if (tb.getIndexCode().equals(score.getIndexCode())) {
-                                tb.setOriginValue(score.getOriginValue());
-                                tb.setScore(String.valueOf(score.getScore()));
-                                tb.setQuantity(score.getQuantity());
-                                tb.setWeight(score.getWeight().multiply(new BigDecimal(NumConstant.ONE_HUNDRED)).setScale(NumConstant.TWO, BigDecimal.ROUND_HALF_UP) + "%");
-                            }
-                        }
-                    }
                     break;
                 default:
 
             }
+
+            setRealValue(result.getTableDataList(), realScoreList);
+        }
+    }
+
+    /**
+     * desc: 设置实际值
+     *
+     * @param tableList
+     * @param scoreList
+     * @return void
+     * @author LiuJanJun
+     * @date 2021/5/19 2:07 下午
+     */
+    private void setRealValue(List<IndexScoreDetailResult> tableList, List<IndexScoreResult> scoreList) {
+        if (CollectionUtils.isEmpty(tableList) || CollectionUtils.isEmpty(scoreList)) {
+            return;
+        }
+        for (IndexScoreResult score : scoreList) {
+            for (IndexScoreDetailResult tb : tableList) {
+                if (!tb.getIndexCode().equals(score.getIndexCode())) {
+                    continue;
+                }
+                tb.setOriginValue(score.getOriginValue());
+                tb.setScore(String.valueOf(score.getScore()));
+                tb.setQuantity(score.getQuantity());
+                tb.setWeight(score.getWeight().multiply(new BigDecimal(NumConstant.ONE_HUNDRED)).setScale(NumConstant.TWO, BigDecimal.ROUND_HALF_UP) + "%");
+            }
         }
     }
 

From 01c986d2157900e2714961284b67b6753a9ee301 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 19 May 2021 14:24:57 +0800
Subject: [PATCH 044/128] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9C=88=E5=BA=A6?=
 =?UTF-8?q?=E5=BE=97=E5=88=86=E6=B7=BB=E5=8A=A0=20=E5=8E=9F=E5=A7=8B?=
 =?UTF-8?q?=E5=BE=97=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/result/IndexScoreResultDTO.java       | 21 +++++++++++++++++++
 .../screen/ScreenIndexDataMonthlyDao.xml      |  3 +++
 2 files changed, 24 insertions(+)

diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/IndexScoreResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/IndexScoreResultDTO.java
index 33ffff9c5d..4f145e3d8a 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/IndexScoreResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/IndexScoreResultDTO.java
@@ -26,7 +26,14 @@ public class IndexScoreResultDTO implements Serializable {
      */
     @JsonIgnore
     private String party;
+    /**
+     * 党建能力 乘以权重后得分
+     */
     private BigDecimal partyDevAbility;
+    /**
+     * 党建能力 原始得分
+     */
+    private BigDecimal partyOriginScore;
     /**
      * 党建能力权重(保留一位小数)
      */
@@ -36,7 +43,14 @@ public class IndexScoreResultDTO implements Serializable {
      */
     @JsonIgnore
     private String govern;
+    /**
+     * 治理能力 乘以权重后得分
+     */
     private BigDecimal governAbility;
+    /**
+     * 治理能力 原始得分
+     */
+    private BigDecimal governOriginScore;
     /**
      * 治理能力权重(保留一位小数)
      */
@@ -46,7 +60,14 @@ public class IndexScoreResultDTO implements Serializable {
      */
     @JsonIgnore
     private String service;
+    /**
+     * 服务能力 乘以权重后得分
+     */
     private BigDecimal serviceAbility;
+    /**
+     * 服务能力 原始得分
+     */
+    private BigDecimal serviceOriginScore;
     /**
      * 服务能力权重(保留一位小数)
      */
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
index 7e114d857c..072c90a494 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
@@ -176,10 +176,13 @@
         SELECT
             index_total AS "total",
             (party_dev_ablity * party_dev_weight) AS "party",
+            ROUND(party_dev_ablity,1) partyOriginScore,
             party_dev_weight AS "partyDevAbilityWeight",
             (govern_ablity * govern_ablity_weight) AS "govern",
+            ROUND(govern_ablity,1) governOriginScore,
             govern_ablity_weight AS "governAbilityWeight",
             (service_ablity * service_ablity_weight) AS "service",
+            ROUND(service_ablity,1) serviceOriginScore,
             service_ablity_weight AS "serviceAbilityWeight"
         FROM
             screen_index_data_monthly

From fda6a8325570ba14ad1162a1f60cac33b608775d Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 19 May 2021 15:02:26 +0800
Subject: [PATCH 045/128] =?UTF-8?q?=E5=BE=97=E5=88=86=E8=AF=B4=E6=98=8E=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=A1=A8=E6=A0=BC=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../evaluationindex/index/result/IndexExplainResult.java     | 5 +++++
 .../java/com/epmet/datareport/constant/IndexConstant.java    | 3 +++
 .../evaluationindex/index/impl/IndexExplainServiceImpl.java  | 5 +++++
 3 files changed, 13 insertions(+)

diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexExplainResult.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexExplainResult.java
index 5e37adf827..1ade73b168 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexExplainResult.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexExplainResult.java
@@ -44,5 +44,10 @@ public class IndexExplainResult {
      */
     private List<String> thresholdList = new ArrayList<>();
 
+    /**
+     * 表格说明
+     */
+    private String tableDesc;
+
 
 }
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/constant/IndexConstant.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/constant/IndexConstant.java
index 5f177f9f8b..7bae5401c4 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/constant/IndexConstant.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/constant/IndexConstant.java
@@ -28,6 +28,9 @@ public class IndexConstant {
     public static final String ZI_SHEN = "zishen";
     public static final String XIA_JI = "xiaji";
     public static final String THRESHOLD_TEXT = "给定阈值%d%%，超过阈值不加分";
+    public static final String TABLE_DESC = "详见下表：";
+    public static final String INDEX_SCORE_TITLE = "当月指数";
+    public static final String INDEX_SCORE_DESC = "含义：自然月周期内，当月指数得分=党建指数得分*相关权重+治理指数得分*相关权重+服务指数得分*相关权重";
 
 
     /**
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
index 76fc992ea3..603a25ebce 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
@@ -67,6 +67,10 @@ public class IndexExplainServiceImpl implements IndexExplainService {
     @Override
     public List<IndexExplainResult> getScoreDetail(IndexExplainFormDTO formDTO) {
         List<IndexExplainResult> results = new ArrayList<>();
+        IndexExplainResult first = new IndexExplainResult();
+        first.setTitle(IndexConstant.INDEX_SCORE_TITLE);
+        first.setMeaning(IndexConstant.INDEX_SCORE_DESC);
+        results.add(first);
         List<IndexExplainTreeDTO> explainDTOList = indexExplainDao.getIndexExplainTreeByOrgType(formDTO.getOrgLevel());
         if (CollectionUtils.isEmpty(explainDTOList)) {
             return null;
@@ -192,6 +196,7 @@ public class IndexExplainServiceImpl implements IndexExplainService {
         });
         result.setTableDataList(tableList);
         result.setThresholdList(threlodList);
+        result.setTableDesc(IndexConstant.TABLE_DESC);
         return tableList;
     }
 

From 74b8bfb55940bef6d2204781e42554954b98b1f1 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 19 May 2021 16:01:25 +0800
Subject: [PATCH 046/128] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AD=BE=E5=88=B0?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8C=89=E7=AD=BE=E5=88=B0=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E9=99=8D=E5=BA=8F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataaggre/dto/resigroup/result/GroupActRankResultDTO.java  | 3 +--
 .../src/main/resources/mapper/act/ActSignInRecordDao.xml       | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/GroupActRankResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/GroupActRankResultDTO.java
index 8bb3ed181f..bb27ea7436 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/GroupActRankResultDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/GroupActRankResultDTO.java
@@ -1,7 +1,6 @@
 package com.epmet.dataaggre.dto.resigroup.result;
 
 import com.epmet.commons.tools.constant.NumConstant;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -25,7 +24,7 @@ public class GroupActRankResultDTO implements Serializable {
     private String participateUserName;
     private List<GroupActRankDetailDTO> categoryList;
 
-    @JsonIgnore
+    // @JsonIgnore
     private Integer sortValue;
 
     public GroupActRankResultDTO() {
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActSignInRecordDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActSignInRecordDao.xml
index ec3207549b..b2cb9d1fdc 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActSignInRecordDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActSignInRecordDao.xml
@@ -25,6 +25,7 @@
         WHERE
             acr.DEL_FLAG = '0'
             AND acr.GROUP_ACT_ID = #{groupActId}
+            order by acr.CREATED_TIME desc
     </select>
 
     <select id="queryActSignInRecord" parameterType="map" resultType="com.epmet.modules.act.entity.ActSignInRecordEntity">

From b10ac25b59f29eace7d9ae5b4f44dba744f0de14 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 19 May 2021 16:32:52 +0800
Subject: [PATCH 047/128] =?UTF-8?q?=E5=BE=97=E5=88=86=E8=AF=B4=E6=98=8E=20?=
 =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=88=86=E6=95=B0=E5=AE=8C=E6=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../index/impl/IndexExplainServiceImpl.java   | 45 +++++++++++--------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
index 603a25ebce..4eeb95a14b 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
@@ -35,6 +35,7 @@ import com.epmet.evaluationindex.index.result.IndexGroupDetailResult;
 import com.epmet.evaluationindex.index.result.IndexScoreDetailResult;
 import com.epmet.evaluationindex.index.result.IndexScoreResult;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -79,8 +80,8 @@ public class IndexExplainServiceImpl implements IndexExplainService {
         if (CollectionUtils.isEmpty(groupDetailEntities)) {
             return null;
         }
-        Map<String, List<IndexGroupDetailResult>> detailEntityMap = groupDetailEntities.stream().collect(Collectors.groupingBy(IndexGroupDetailResult::getAllParentIndexCode));
 
+        Map<String, List<IndexGroupDetailResult>> detailEntityMap = groupDetailEntities.stream().collect(Collectors.groupingBy(IndexGroupDetailResult::getAllParentIndexCode));
 
         for (IndexExplainTreeDTO explainDTO : explainDTOList) {
             //根节点
@@ -103,35 +104,26 @@ public class IndexExplainServiceImpl implements IndexExplainService {
 
             String type = explainDTO.getType();
             String orgLevel = formDTO.getOrgLevel();
+
+            IndexScoreFormDTO ablityListFormDTO = new IndexScoreFormDTO();
+            ablityListFormDTO.setCustomerId(formDTO.getCustomerId());
+            ablityListFormDTO.setOrgId(formDTO.getOrgId());
+            ablityListFormDTO.setMonthId(StringUtils.isBlank(formDTO.getMonthId()) ? DateUtils.getCurrentTimeBeforeMonthId() : formDTO.getMonthId());
             switch (orgLevel) {
                 case "grid":
                     String allIndexCodePath = null;
-
-                    //set Target value
-                    IndexScoreFormDTO ablityListFormDTO = new IndexScoreFormDTO();
-                    ablityListFormDTO.setCustomerId(formDTO.getCustomerId());
-                    ablityListFormDTO.setOrgId(formDTO.getOrgId());
-                    ablityListFormDTO.setMonthId(DateUtils.getCurrentTimeBeforeMonthId());
-
-
                     if (IndexConstant.ZI_SHEN.equals(type)) {
-                        allIndexCodePath = "wanggexiangguan:dangjiannengli";
-
-                        List<String> tableHeaders = getTableHeaders(type, allIndexCodePath, orgLevel);
-                        result.setTableTileList(tableHeaders);
+                        allIndexCodePath = explainDTO.getIndexCode();
 
                         setDefaultTableData(orgLevel, type, detailEntityMap, result, allIndexCodePath);
 
                         //不下钻
                         ablityListFormDTO.setAllParentIndexCode(allIndexCodePath);
                         realScoreList = gridSubScoreDao.selectGridSubScore(ablityListFormDTO);
-                    } else if (IndexConstant.XIA_JI.equals(type)) {
-                        allIndexCodePath = "dangyuanxiangguan:lianxiqunzhong";
 
 
-                        List<String> tableHeaders = getTableHeaders(type, allIndexCodePath, orgLevel);
-                        tableHeaders.add(0, "组织内党员的联系群众指数考评分（平均值）");
-                        result.setTableTileList(tableHeaders);
+                    } else if (IndexConstant.XIA_JI.equals(type)) {
+                        allIndexCodePath = explainDTO.getIndexCode();
 
                         setDefaultTableData(orgLevel, type, detailEntityMap, result, allIndexCodePath);
 
@@ -139,6 +131,11 @@ public class IndexExplainServiceImpl implements IndexExplainService {
                         ablityListFormDTO.setAllParentIndexCode(allIndexCodePath);
                         realScoreList = factIndexCpcSubScoreDao.selecCpcAvgScore(ablityListFormDTO);
                     }
+                    List<String> tableHeaders = getTableHeaders(type, allIndexCodePath, orgLevel);
+                    result.setTableTileList(tableHeaders);
+
+                    break;
+                case "community":
 
                     break;
                 default:
@@ -224,6 +221,18 @@ public class IndexExplainServiceImpl implements IndexExplainService {
         switch (orgLevel) {
             case "grid":
                 //还没确定怎么搞
+                if ("zishen".equals(type)) {
+                    headers = IndexConstant.getStandardSelfHeaders(allIndexCode);
+
+                } else if ("xiaji".equals(type)) {
+                    headers = IndexConstant.getStandardSubHeaders(allIndexCode);
+                    if (allIndexCode.contains("canyuyishi")) {
+                        headers.add(0, "组织内党员的参与议事指数考评分（平均值）");
+                    } else if (allIndexCode.contains("lianxiqunzhong")) {
+                        headers.add(0, "组织内党员的联系群众指数考评分（平均值）");
+                    }
+                    break;
+                }
             default:
                 if ("zishen".equals(type)) {
                     headers = IndexConstant.getStandardSelfHeaders(allIndexCode);

From 0a266bec42ed9a1373ebfed0ac12540dde8021cd Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 19 May 2021 17:24:39 +0800
Subject: [PATCH 048/128] =?UTF-8?q?=E7=BE=A4=E4=BC=97=E4=B8=8D=E6=BB=A1?=
 =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProjectSatisfactionStatisticsServiceImpl.java       | 5 +++++
 .../src/main/resources/mapper/ProjectDao.xml                 | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionStatisticsServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionStatisticsServiceImpl.java
index ed20dfd167..5ced71018a 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionStatisticsServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionStatisticsServiceImpl.java
@@ -159,15 +159,18 @@ public class ProjectSatisfactionStatisticsServiceImpl extends BaseServiceImpl<Pr
      */
     @Override
     public List<MassesDiscontentResultDTO> massesDiscontent(MassesDiscontentFormDTO formDTO) {
+        // 根据时间范围查询已结案的项目，来源是issue的
         List<MassesDiscontentResultDTO> projectIds = projectDao.selectProjectIdByTime(formDTO.getAgencyId(), getDateId("yesterday"), getDateId(formDTO.getTimeSection()));
         if (CollectionUtils.isEmpty(projectIds)){
             return new ArrayList<>();
         }
+        // 查询少于75分的项目
         PageInfo<MassesDiscontentResultDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectProjectByScore(projectIds.stream().map(m -> m.getProjectId()).collect(Collectors.toList()), NumConstant.SEVENTY_FIVE, formDTO.getSortType()));
         List<MassesDiscontentResultDTO> projects = pageInfo.getList();
         if (CollectionUtils.isEmpty(projects)){
             return new ArrayList<>();
         }
+        // 项目分类标签
         List<ProjectCategoryDisPoseResultDTO> projectCategoryDisPoseResultDTOS = projectCategoryDao.selectCategoryByIds(projects.stream().map(m -> m.getProjectId()).collect(Collectors.toList()));
         List<ProjectCategoryDisPoseResultDTO> projectCategoryData = new ArrayList<>();
         if (!CollectionUtils.isEmpty(projectCategoryDisPoseResultDTOS)){
@@ -177,11 +180,13 @@ public class ProjectSatisfactionStatisticsServiceImpl extends BaseServiceImpl<Pr
             }
             projectCategoryData = projectCategory.getData();
         }
+        // 话题信息
         Result<List<TopicInfoResultDTO>> topicInfos = resiGroupOpenFeignClient.getTopicInfos(projects.stream().map(m -> m.getIssueId()).collect(Collectors.toList()));
         if (!topicInfos.success()){
             throw new RenException("查询话题信息失败".concat(topicInfos.getMsg()));
         }
         List<ProjectCategoryDisPoseResultDTO> finalProjectCategoryData = projectCategoryData;
+        // 数据组装
         projects.forEach(p -> {
             if (!CollectionUtils.isEmpty(finalProjectCategoryData)){
                 finalProjectCategoryData.forEach(cate -> {
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
index 4a8c18c125..13309309c8 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
@@ -281,6 +281,8 @@
           AND DATE_FORMAT(CREATED_TIME,'%Y%m%d') >= #{startDate}
           AND DATE_FORMAT(CREATED_TIME,'%Y%m%d') <![CDATA[ <= ]]> #{endDate}
           AND ORG_ID_PATH LIKE CONCAT('%',#{agencyId},'%')
+          AND ORIGIN = 'issue'
+          AND `STATUS` = 'closed'
     </select>
 
 </mapper>
\ No newline at end of file

From 81c5c0775379714f31843172efb8fd6d8b3b9c90 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Wed, 19 May 2021 17:42:34 +0800
Subject: [PATCH 049/128] =?UTF-8?q?=E5=85=9A=E5=91=98=E5=85=88=E9=94=8B?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../result/PartyMemberVanguardRankResultDTO.java   |  5 +++++
 .../dataaggre/dao/datastats/DataStatsDao.java      |  2 ++
 .../datastats/impl/DataStatsServiceImpl.java       |  5 +++++
 .../resources/mapper/datastats/DatsStatsDao.xml    | 14 ++++++++++++++
 4 files changed, 26 insertions(+)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/PartyMemberVanguardRankResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/PartyMemberVanguardRankResultDTO.java
index 9d2f643229..57640eea9a 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/PartyMemberVanguardRankResultDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/PartyMemberVanguardRankResultDTO.java
@@ -13,6 +13,11 @@ import java.util.List;
 @Data
 public class PartyMemberVanguardRankResultDTO implements Serializable {
 	private static final long serialVersionUID = -3103242333633668412L;
+	/**
+	 *
+	 * 组织级别 社区级：community，乡（镇、街道）级:street，区县级: district，市级: city，省级:province
+	 */
+	private String agencyLevel;
 	private List<PartyMemberVanguardDetailResultDTO> agencyRank;
 	private List<PartyMemberVanguardDetailResultDTO> gridRank;
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
index 61632b35bd..02d6e72a76 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
@@ -226,4 +226,6 @@ public interface DataStatsDao {
                                                          @Param("dateId") String dateId,
                                                          @Param("orgId") String orgId,
                                                          @Param("actCategoryDictDTOList") List<ActCategoryDictDTO> actCategoryDictDTOList);
+
+    DimAgencyEntity getAgencyInfo(@Param("agencyId") String agencyId);
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index 415b1e969b..9daf0c36ab 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -962,7 +962,11 @@ public class DataStatsServiceImpl implements DataStatsService {
      */
     @Override
     public PartyMemberVanguardRankResultDTO vanguardRank(PartyMemberVanguardFormDTO formDTO) {
+        //获取组织级别
+        DimAgencyEntity agency = dataStatsDao.getAgencyInfo(formDTO.getAgencyId());
+        //组织排行
         List<PartyMemberVanguardDetailResultDTO> agencyRank = dataStatsDao.selectAgencyVanguardRank(formDTO.getAgencyId());
+        //网格排行
         List<PartyMemberVanguardDetailResultDTO> gridRank = dataStatsDao.selectGridVanguardRank(formDTO.getAgencyId());
         PartyMemberVanguardRankResultDTO result = new PartyMemberVanguardRankResultDTO();
         result.setAgencyRank(CollectionUtils.isNotEmpty(agencyRank)?agencyRank:Collections.emptyList());
@@ -983,6 +987,7 @@ public class DataStatsServiceImpl implements DataStatsService {
             item.setProjectRatio(transform(item.getProjectRatio()));
             item.setProjectClosedRatio(transform(item.getProjectClosedRatio()));
         });
+        result.setAgencyLevel(agency.getLevel());
         return result;
     }
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
index 0b41cf0b15..1f1663bd49 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
@@ -598,4 +598,18 @@
                 AND m.ORG_ID = #{orgId}
         </foreach>
     </select>
+    <select id="getAgencyInfo" resultType="com.epmet.dataaggre.entity.datastats.DimAgencyEntity">
+        SELECT
+            ID,
+            AGENCY_NAME,
+            CUSTOMER_ID,
+            PID,
+            PIDS,
+            ALL_PARENT_NAME,
+            `LEVEL`
+        FROM
+            dim_agency
+        WHERE
+            ID = #{agencyId}
+    </select>
 </mapper>
\ No newline at end of file

From 61e0c6780bc1af1fc177f9b942154cecd5f0301b Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 19 May 2021 18:02:31 +0800
Subject: [PATCH 050/128] =?UTF-8?q?=E5=BE=97=E5=88=86=E8=AF=B4=E6=98=8E-?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/fact/FactIndexAgencySubScoreDao.java  |  4 ++
 .../fact/FactIndexCommunitySubScoreDao.java   | 12 +++++
 .../dao/fact/FactIndexGridSubScoreDao.java    |  2 +-
 .../index/impl/IndexExplainServiceImpl.java   | 50 +++++++++++++++----
 .../fact/FactIndexAgencySubScoreDao.xml       | 15 ++++++
 .../fact/FactIndexCommunitySubScoreDao.xml    | 15 ++++++
 .../mapper/fact/FactIndexGridSubScoreDao.xml  | 19 +------
 7 files changed, 87 insertions(+), 30 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexAgencySubScoreDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexAgencySubScoreDao.java
index 0fd8e29c06..5347867afc 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexAgencySubScoreDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexAgencySubScoreDao.java
@@ -17,6 +17,8 @@
 
 package com.epmet.datareport.dao.fact;
 
+import com.epmet.evaluationindex.index.form.IndexScoreFormDTO;
+import com.epmet.evaluationindex.index.result.IndexScoreResult;
 import com.epmet.evaluationindex.screen.dto.form.AblityListFormDTO;
 import com.epmet.evaluationindex.screen.dto.form.MonthAblityListFormDTO;
 import com.epmet.evaluationindex.screen.dto.result.AblityListResultDTO;
@@ -48,4 +50,6 @@ public interface FactIndexAgencySubScoreDao {
      * @author sun
      */
     LinkedList<MonthAblityListResultDTO> selectMonthAblityList(MonthAblityListFormDTO formDTO);
+
+    List<IndexScoreResult> selectSubScore(IndexScoreFormDTO ablityListFormDTO);
 }
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexCommunitySubScoreDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexCommunitySubScoreDao.java
index 1689ab0b3c..5c38d0985e 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexCommunitySubScoreDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexCommunitySubScoreDao.java
@@ -17,6 +17,8 @@
 
 package com.epmet.datareport.dao.fact;
 
+import com.epmet.evaluationindex.index.form.IndexScoreFormDTO;
+import com.epmet.evaluationindex.index.result.IndexScoreResult;
 import com.epmet.evaluationindex.screen.dto.form.AblityListFormDTO;
 import com.epmet.evaluationindex.screen.dto.form.MonthAblityListFormDTO;
 import com.epmet.evaluationindex.screen.dto.result.AblityListResultDTO;
@@ -48,4 +50,14 @@ public interface FactIndexCommunitySubScoreDao {
      * @author sun
      */
     LinkedList<MonthAblityListResultDTO> selectCommunityMonthAblityList(MonthAblityListFormDTO formDTO);
+
+    /**
+     * desc: 查询分数
+     *
+     * @param ablityListFormDTO
+     * @return java.util.List<com.epmet.evaluationindex.index.result.IndexScoreResult>
+     * @author LiuJanJun
+     * @date 2021/5/14 2:07 下午
+     */
+    List<IndexScoreResult> selectSubScore(IndexScoreFormDTO ablityListFormDTO);
 }
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexGridSubScoreDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexGridSubScoreDao.java
index b71adcdd4e..8a64352187 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexGridSubScoreDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexGridSubScoreDao.java
@@ -59,5 +59,5 @@ public interface FactIndexGridSubScoreDao {
      * @author LiuJanJun
      * @date 2021/5/14 2:07 下午
      */
-    List<IndexScoreResult> selectGridSubScore(IndexScoreFormDTO ablityListFormDTO);
+    List<IndexScoreResult> selectSubScore(IndexScoreFormDTO ablityListFormDTO);
 }
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
index 4eeb95a14b..ef85b31714 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
@@ -24,6 +24,8 @@ import com.epmet.constant.DataSourceConstant;
 import com.epmet.datareport.constant.IndexConstant;
 import com.epmet.datareport.dao.evaluationindex.index.IndexExplainDao;
 import com.epmet.datareport.dao.evaluationindex.index.IndexGroupDetailDao;
+import com.epmet.datareport.dao.fact.FactIndexAgencySubScoreDao;
+import com.epmet.datareport.dao.fact.FactIndexCommunitySubScoreDao;
 import com.epmet.datareport.dao.fact.FactIndexCpcSubScoreDao;
 import com.epmet.datareport.dao.fact.FactIndexGridSubScoreDao;
 import com.epmet.datareport.service.evaluationindex.index.IndexExplainService;
@@ -34,6 +36,7 @@ import com.epmet.evaluationindex.index.result.IndexExplainResult;
 import com.epmet.evaluationindex.index.result.IndexGroupDetailResult;
 import com.epmet.evaluationindex.index.result.IndexScoreDetailResult;
 import com.epmet.evaluationindex.index.result.IndexScoreResult;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -51,6 +54,7 @@ import java.util.stream.Collectors;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-05-12
  */
+@Slf4j
 @Service
 @DataSource(DataSourceConstant.EVALUATION_INDEX)
 public class IndexExplainServiceImpl implements IndexExplainService {
@@ -63,6 +67,10 @@ public class IndexExplainServiceImpl implements IndexExplainService {
     private FactIndexGridSubScoreDao gridSubScoreDao;
     @Autowired
     private FactIndexCpcSubScoreDao factIndexCpcSubScoreDao;
+    @Autowired
+    private FactIndexCommunitySubScoreDao communitySubScoreDao;
+    @Autowired
+    private FactIndexAgencySubScoreDao agencySubScoreDao;
 
 
     @Override
@@ -104,6 +112,11 @@ public class IndexExplainServiceImpl implements IndexExplainService {
 
             String type = explainDTO.getType();
             String orgLevel = formDTO.getOrgLevel();
+            String allIndexCodePath = explainDTO.getIndexCode();
+
+            //设置表头
+            List<String> tableHeaders = getTableHeaders(type, allIndexCodePath, orgLevel);
+            result.setTableTileList(tableHeaders);
 
             IndexScoreFormDTO ablityListFormDTO = new IndexScoreFormDTO();
             ablityListFormDTO.setCustomerId(formDTO.getCustomerId());
@@ -111,32 +124,40 @@ public class IndexExplainServiceImpl implements IndexExplainService {
             ablityListFormDTO.setMonthId(StringUtils.isBlank(formDTO.getMonthId()) ? DateUtils.getCurrentTimeBeforeMonthId() : formDTO.getMonthId());
             switch (orgLevel) {
                 case "grid":
-                    String allIndexCodePath = null;
-                    if (IndexConstant.ZI_SHEN.equals(type)) {
-                        allIndexCodePath = explainDTO.getIndexCode();
 
+                    if (IndexConstant.ZI_SHEN.equals(type)) {
                         setDefaultTableData(orgLevel, type, detailEntityMap, result, allIndexCodePath);
-
                         //不下钻
                         ablityListFormDTO.setAllParentIndexCode(allIndexCodePath);
-                        realScoreList = gridSubScoreDao.selectGridSubScore(ablityListFormDTO);
+                        realScoreList = gridSubScoreDao.selectSubScore(ablityListFormDTO);
 
 
                     } else if (IndexConstant.XIA_JI.equals(type)) {
-                        allIndexCodePath = explainDTO.getIndexCode();
-
                         setDefaultTableData(orgLevel, type, detailEntityMap, result, allIndexCodePath);
-
                         //下钻到党员
                         ablityListFormDTO.setAllParentIndexCode(allIndexCodePath);
                         realScoreList = factIndexCpcSubScoreDao.selecCpcAvgScore(ablityListFormDTO);
                     }
-                    List<String> tableHeaders = getTableHeaders(type, allIndexCodePath, orgLevel);
-                    result.setTableTileList(tableHeaders);
+
 
                     break;
                 case "community":
-
+                    setDefaultTableData(orgLevel, type, detailEntityMap, result, allIndexCodePath);
+                    //不下钻
+                    ablityListFormDTO.setAllParentIndexCode(allIndexCodePath);
+                    realScoreList = communitySubScoreDao.selectSubScore(ablityListFormDTO);
+                    break;
+                case "street":
+                    setDefaultTableData(orgLevel, type, detailEntityMap, result, allIndexCodePath);
+                    //不下钻
+                    ablityListFormDTO.setAllParentIndexCode(allIndexCodePath);
+                    realScoreList = agencySubScoreDao.selectSubScore(ablityListFormDTO);
+                    break;
+                case "district":
+                    setDefaultTableData(orgLevel, type, detailEntityMap, result, allIndexCodePath);
+                    //不下钻
+                    ablityListFormDTO.setAllParentIndexCode(allIndexCodePath);
+                    realScoreList = agencySubScoreDao.selectSubScore(ablityListFormDTO);
                     break;
                 default:
 
@@ -174,6 +195,10 @@ public class IndexExplainServiceImpl implements IndexExplainService {
 
     private List<IndexScoreDetailResult> setDefaultTableData(String orgLevel, String type, Map<String, List<IndexGroupDetailResult>> detailEntityMap, IndexExplainResult result, String allIndexCodePath) {
         List<IndexGroupDetailResult> indexGroupDetailEntities = detailEntityMap.get(allIndexCodePath);
+        if (CollectionUtils.isEmpty(indexGroupDetailEntities)){
+            log.warn("setDefaultTableData allINdexCodePath:{} is config error",allIndexCodePath);
+            return null;
+        }
         List<IndexScoreDetailResult> tableList = new ArrayList<>();
         List<String> threlodList = new ArrayList<>();
         indexGroupDetailEntities.forEach(index -> {
@@ -181,6 +206,9 @@ public class IndexExplainServiceImpl implements IndexExplainService {
             if ("grid".equals(orgLevel) && IndexConstant.ZI_SHEN.equals(type) && index.getAllIndexCodePath().contains(IndexConstant.XIA_JI)) {
                 return;
             }
+            if (!"grid".equals(orgLevel) && !index.getAllIndexCodePath().contains(type)){
+                return;
+            }
             table.setIndexCode(index.getIndexCode());
             table.setIndexName(index.getIndexName());
             table.setOriginValue(NumConstant.ZERO_STR);
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencySubScoreDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencySubScoreDao.xml
index e1cbb6850b..3a5f74717c 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencySubScoreDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencySubScoreDao.xml
@@ -40,5 +40,20 @@
         ORDER BY
             fact.month_id ASC
     </select>
+    <select id="selectSubScore" resultType="com.epmet.evaluationindex.index.result.IndexScoreResult">
+     SELECT
+            fact.index_code,
+            IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS origin_value,
+            round(fact.score,2) AS score,
+            round(fact.WEIGHT,2) AS weight
+        FROM
+            fact_index_agency_sub_score fact
+        WHERE
+            fact.del_flag = '0'
+            AND fact.all_parent_index_code = #{allParentIndexCode}
+            AND customer_id = #{customerId}
+            AND agency_id = #{orgId}
+            AND month_id = #{monthId}
+    </select>
 
 </mapper>
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunitySubScoreDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunitySubScoreDao.xml
index b0fd69d5cf..35dec5b46b 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunitySubScoreDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunitySubScoreDao.xml
@@ -40,5 +40,20 @@
         ORDER BY
             fact.month_id ASC
     </select>
+    <select id="selectSubScore" resultType="com.epmet.evaluationindex.index.result.IndexScoreResult">
+        SELECT
+            fact.index_code,
+            IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS origin_value,
+            round(fact.score,2) AS score,
+            round(fact.WEIGHT,2) AS weight
+        FROM
+            fact_index_community_sub_score fact
+        WHERE
+            fact.del_flag = '0'
+            AND fact.all_parent_index_code = #{allParentIndexCode}
+            AND customer_id = #{customerId}
+            AND AGENCY_ID = #{orgId}
+            AND month_id = #{monthId}
+    </select>
 
 </mapper>
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridSubScoreDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridSubScoreDao.xml
index eb2312455a..aa8f2550a8 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridSubScoreDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridSubScoreDao.xml
@@ -40,21 +40,7 @@
         ORDER BY
             fact.month_id ASC
     </select>
-    <select id="selectGridSubScore" resultType="com.epmet.evaluationindex.index.result.IndexScoreResult">
-     <!--   SELECT
-            fact.index_code,
-            IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS origin_value,
-            round(fact.SCORE,2） AS score,
-            round(fact.WEIGHT,2) AS weight
-        FROM
-            fact_index_grid_sub_score fact
-        WHERE
-            fact.del_flag = '0'
-        AND fact.all_parent_index_code = #{allParentIndexCode}
-        AND customer_id = #{customerId}
-        AND grid_id = #{orgId}
-        AND month_id = #{monthId}-->
-
+    <select id="selectSubScore" resultType="com.epmet.evaluationindex.index.result.IndexScoreResult">
          SELECT
             fact.index_code,
             IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS origin_value,
@@ -68,9 +54,6 @@
             AND customer_id = #{customerId}
             AND grid_id = #{orgId}
             AND month_id = #{monthId}
-
-
-
     </select>
 
 </mapper>

From c2ca0073a7bfb21b24faade6cccfadb6115792d3 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Thu, 20 May 2021 10:29:28 +0800
Subject: [PATCH 051/128] =?UTF-8?q?=E6=8C=87=E6=A0=87=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E9=A1=B9-=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/dto/result/AblityListResultDTO.java    |  7 +++++++
 .../controller/index/IndexExplainController.java  | 15 +++++++++++++++
 .../index/IndexExplainService.java                | 12 ++++++++++++
 .../index/impl/IndexExplainServiceImpl.java       | 14 +++++++++-----
 .../mapper/fact/FactIndexAgencySubScoreDao.xml    |  3 ++-
 .../mapper/fact/FactIndexCommunitySubScoreDao.xml |  3 ++-
 .../mapper/fact/FactIndexGridSubScoreDao.xml      |  3 ++-
 .../main/resources/mapper/index/IndexDictDao.xml  |  3 ++-
 8 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/AblityListResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/AblityListResultDTO.java
index 2c8c7b6d00..d25c99c678 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/AblityListResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/AblityListResultDTO.java
@@ -36,6 +36,13 @@ public class AblityListResultDTO implements Serializable {
      */
     private BigDecimal weight;
 
+    /**
+     * 原始分数
+     */
     private Double score;
+    /**
+     * 加权分数（乘以权重后得分）
+     */
+    private BigDecimal weightedScore;
 
 }
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/index/IndexExplainController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/index/IndexExplainController.java
index 14ab225481..abac68a416 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/index/IndexExplainController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/index/IndexExplainController.java
@@ -20,7 +20,9 @@ package com.epmet.datareport.controller.index;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.datareport.service.evaluationindex.index.IndexExplainService;
 import com.epmet.evaluationindex.index.form.IndexExplainFormDTO;
+import com.epmet.evaluationindex.index.form.IndexScoreFormDTO;
 import com.epmet.evaluationindex.index.result.IndexExplainResult;
+import com.epmet.evaluationindex.screen.dto.result.IndexDictResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -58,5 +60,18 @@ public class IndexExplainController {
         return ok;
     }
 
+    /**
+     * desc: 指标字典项
+     *
+     * @param formDTO
+     * @author LiuJanJun
+     * @date 2021/5/12 4:12 下午
+     */
+    @PostMapping("indexdict")
+    public Result<IndexDictResultDTO> getIndexMeaning(@RequestBody IndexScoreFormDTO formDTO){
+        IndexDictResultDTO result = indexExplainService.getIndexMeaning(formDTO);
+        return new Result<IndexDictResultDTO>().ok(result);
+    }
+
 
 }
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/IndexExplainService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/IndexExplainService.java
index 54c12aed09..c028422cd4 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/IndexExplainService.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/IndexExplainService.java
@@ -18,7 +18,9 @@
 package com.epmet.datareport.service.evaluationindex.index;
 
 import com.epmet.evaluationindex.index.form.IndexExplainFormDTO;
+import com.epmet.evaluationindex.index.form.IndexScoreFormDTO;
 import com.epmet.evaluationindex.index.result.IndexExplainResult;
+import com.epmet.evaluationindex.screen.dto.result.IndexDictResultDTO;
 
 import java.util.List;
 
@@ -39,4 +41,14 @@ public interface IndexExplainService {
      * @date 2021/5/12 4:38 下午
      */
     List<IndexExplainResult> getScoreDetail(IndexExplainFormDTO formDTO);
+
+    /**
+     * desc: 条件获取指标
+     *
+     * @param formDTO
+     * @return com.epmet.evaluationindex.index.result.IndexDictResultDTO
+     * @author LiuJanJun
+     * @date 2021/5/20 10:20 上午
+     */
+    IndexDictResultDTO getIndexMeaning(IndexScoreFormDTO formDTO);
 }
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
index ef85b31714..3e035f30ae 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
@@ -24,10 +24,7 @@ import com.epmet.constant.DataSourceConstant;
 import com.epmet.datareport.constant.IndexConstant;
 import com.epmet.datareport.dao.evaluationindex.index.IndexExplainDao;
 import com.epmet.datareport.dao.evaluationindex.index.IndexGroupDetailDao;
-import com.epmet.datareport.dao.fact.FactIndexAgencySubScoreDao;
-import com.epmet.datareport.dao.fact.FactIndexCommunitySubScoreDao;
-import com.epmet.datareport.dao.fact.FactIndexCpcSubScoreDao;
-import com.epmet.datareport.dao.fact.FactIndexGridSubScoreDao;
+import com.epmet.datareport.dao.fact.*;
 import com.epmet.datareport.service.evaluationindex.index.IndexExplainService;
 import com.epmet.evaluationindex.index.dto.IndexExplainTreeDTO;
 import com.epmet.evaluationindex.index.form.IndexExplainFormDTO;
@@ -36,6 +33,7 @@ import com.epmet.evaluationindex.index.result.IndexExplainResult;
 import com.epmet.evaluationindex.index.result.IndexGroupDetailResult;
 import com.epmet.evaluationindex.index.result.IndexScoreDetailResult;
 import com.epmet.evaluationindex.index.result.IndexScoreResult;
+import com.epmet.evaluationindex.screen.dto.result.IndexDictResultDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -58,7 +56,8 @@ import java.util.stream.Collectors;
 @Service
 @DataSource(DataSourceConstant.EVALUATION_INDEX)
 public class IndexExplainServiceImpl implements IndexExplainService {
-
+    @Autowired
+    private IndexDictDao indexDictDao;
     @Autowired
     private IndexExplainDao indexExplainDao;
     @Autowired
@@ -106,6 +105,11 @@ public class IndexExplainServiceImpl implements IndexExplainService {
         return results;
     }
 
+    @Override
+    public IndexDictResultDTO getIndexMeaning(IndexScoreFormDTO formDTO) {
+        return indexDictDao.selectIndexDict(formDTO.getIndexCode());
+    }
+
     private void setTableData(IndexExplainFormDTO formDTO, Map<String, List<IndexGroupDetailResult>> detailEntityMap, IndexExplainTreeDTO explainDTO, IndexExplainResult result) {
         if (NumConstant.ONE == explainDTO.getIsSearch()) {
             List<IndexScoreResult> realScoreList = null;
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencySubScoreDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencySubScoreDao.xml
index 3a5f74717c..954ce4c772 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencySubScoreDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencySubScoreDao.xml
@@ -9,7 +9,8 @@
             IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS "value",
             fact.score AS score,
             dict.index_name AS "name",
-            round(fact.WEIGHT,2) AS weight
+            round(fact.WEIGHT,2) AS weight,
+            (fact.SCORE * fact.WEIGHT) AS weightedScore
         FROM
             fact_index_agency_sub_score fact
         LEFT JOIN index_dict dict ON fact.index_code = dict.index_code
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunitySubScoreDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunitySubScoreDao.xml
index 35dec5b46b..52f1e767f0 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunitySubScoreDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunitySubScoreDao.xml
@@ -9,7 +9,8 @@
             IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS "value",
             dict.index_name AS "name",
             fact.score AS score,
-            round(fact.WEIGHT,2) AS weight
+            round(fact.WEIGHT,2) AS weight,
+            (fact.SCORE * fact.WEIGHT) AS weightedScore
         FROM
             fact_index_community_sub_score fact
         LEFT JOIN index_dict dict ON fact.index_code = dict.index_code
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridSubScoreDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridSubScoreDao.xml
index aa8f2550a8..e7b23aebcc 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridSubScoreDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridSubScoreDao.xml
@@ -9,7 +9,8 @@
             IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS "value",
             dict.index_name AS "name",
             fact.score AS score,
-            round(fact.WEIGHT,2) AS weight
+            round(fact.WEIGHT,2) AS weight,
+            (fact.SCORE * fact.WEIGHT) AS weightedScore
         FROM
             fact_index_grid_sub_score fact
         LEFT JOIN index_dict dict ON fact.index_code = dict.index_code
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/index/IndexDictDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/index/IndexDictDao.xml
index fffd0604bf..28f6d1955b 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/index/IndexDictDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/index/IndexDictDao.xml
@@ -18,7 +18,8 @@
         SELECT
             index_name AS "indexName",
             index_code AS "indexCode",
-            value_type AS "valueType"
+            value_type AS "valueType",
+            INDEX_DESC
         FROM
             index_dict
         WHERE

From c065da7cfbcde0178d97fbce3823633dc1562a94 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Thu, 20 May 2021 11:20:27 +0800
Subject: [PATCH 052/128] =?UTF-8?q?=E5=AF=86=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-module/data-aggregator/data-aggregator-server/pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml
index 604d182cb8..a2cc3bc297 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml
@@ -337,8 +337,8 @@
                 <datasource.druid.opercrm.url>
                     <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.opercrm.url>
-                <datasource.druid.opercrm.username>epmet_data_statistical_user</datasource.druid.opercrm.username>
-                <datasource.druid.opercrm.password>EpmEt-db-UsEr</datasource.druid.opercrm.password>
+                <datasource.druid.opercrm.username>epmet</datasource.druid.opercrm.username>
+                <datasource.druid.opercrm.password>elink@833066</datasource.druid.opercrm.password>
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
@@ -452,4 +452,4 @@
             </properties>
         </profile>
     </profiles>
-</project>
\ No newline at end of file
+</project>

From 76e989c0bfc853f4138bc3812a6aac16026295b8 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Thu, 20 May 2021 15:14:17 +0800
Subject: [PATCH 053/128] =?UTF-8?q?=E5=85=A8=E5=8C=BA=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E6=8C=87=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../index/form/IndexScoreFormDTO.java         |  5 +-
 .../datareport/constant/IndexConstant.java    |  2 +
 .../dao/fact/FactIndexDeptSubScoreDao.java    | 36 +++++++++
 .../index/impl/IndexExplainServiceImpl.java   | 80 ++++++++++++++-----
 .../fact/FactIndexAgencySubScoreDao.xml       |  9 ++-
 .../mapper/fact/FactIndexDeptSubScoreDao.xml  | 24 ++++++
 6 files changed, 135 insertions(+), 21 deletions(-)
 create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexDeptSubScoreDao.java
 create mode 100644 epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexDeptSubScoreDao.xml

diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/form/IndexScoreFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/form/IndexScoreFormDTO.java
index 0ee464a9b5..f2f7f98a01 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/form/IndexScoreFormDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/form/IndexScoreFormDTO.java
@@ -36,5 +36,8 @@ public class IndexScoreFormDTO implements Serializable {
      * 所有有权重的指标code拼接的字符串 冒号隔开
      */
     private String allParentIndexCode;
-
+    /**
+     * pid
+     */
+    private String pid;
 }
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/constant/IndexConstant.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/constant/IndexConstant.java
index 7bae5401c4..af1ae3588d 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/constant/IndexConstant.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/constant/IndexConstant.java
@@ -31,6 +31,8 @@ public class IndexConstant {
     public static final String TABLE_DESC = "详见下表：";
     public static final String INDEX_SCORE_TITLE = "当月指数";
     public static final String INDEX_SCORE_DESC = "含义：自然月周期内，当月指数得分=党建指数得分*相关权重+治理指数得分*相关权重+服务指数得分*相关权重";
+    public static final String INDEX_DISTRINCT_TABLE1_INDEX_CODE = "suoyoujiedaozlnlpjz";
+    public static final String ZHI_LI_NENG_LI = "zhilinengli";
 
 
     /**
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexDeptSubScoreDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexDeptSubScoreDao.java
new file mode 100644
index 0000000000..7d84dd87e7
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexDeptSubScoreDao.java
@@ -0,0 +1,36 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.fact;
+
+import com.epmet.evaluationindex.index.form.IndexScoreFormDTO;
+import com.epmet.evaluationindex.index.result.IndexScoreResult;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 部门相关分数表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-02
+ */
+@Mapper
+public interface FactIndexDeptSubScoreDao {
+
+    List<IndexScoreResult> selecDeptAvgScore(IndexScoreFormDTO ablityListFormDTO);
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
index 3e035f30ae..6ca654a4ec 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
@@ -70,6 +70,8 @@ public class IndexExplainServiceImpl implements IndexExplainService {
     private FactIndexCommunitySubScoreDao communitySubScoreDao;
     @Autowired
     private FactIndexAgencySubScoreDao agencySubScoreDao;
+    @Autowired
+    private FactIndexDeptSubScoreDao deptSubScoreDao;
 
 
     @Override
@@ -125,43 +127,63 @@ public class IndexExplainServiceImpl implements IndexExplainService {
             IndexScoreFormDTO ablityListFormDTO = new IndexScoreFormDTO();
             ablityListFormDTO.setCustomerId(formDTO.getCustomerId());
             ablityListFormDTO.setOrgId(formDTO.getOrgId());
+            ablityListFormDTO.setAllParentIndexCode(allIndexCodePath);
             ablityListFormDTO.setMonthId(StringUtils.isBlank(formDTO.getMonthId()) ? DateUtils.getCurrentTimeBeforeMonthId() : formDTO.getMonthId());
             switch (orgLevel) {
                 case "grid":
 
                     if (IndexConstant.ZI_SHEN.equals(type)) {
-                        setDefaultTableData(orgLevel, type, detailEntityMap, result, allIndexCodePath);
+                        setDefaultTableData(orgLevel, type, detailEntityMap, result, allIndexCodePath, null);
                         //不下钻
-                        ablityListFormDTO.setAllParentIndexCode(allIndexCodePath);
                         realScoreList = gridSubScoreDao.selectSubScore(ablityListFormDTO);
 
 
                     } else if (IndexConstant.XIA_JI.equals(type)) {
-                        setDefaultTableData(orgLevel, type, detailEntityMap, result, allIndexCodePath);
+                        setDefaultTableData(orgLevel, type, detailEntityMap, result, allIndexCodePath, null);
                         //下钻到党员
-                        ablityListFormDTO.setAllParentIndexCode(allIndexCodePath);
                         realScoreList = factIndexCpcSubScoreDao.selecCpcAvgScore(ablityListFormDTO);
                     }
 
 
                     break;
                 case "community":
-                    setDefaultTableData(orgLevel, type, detailEntityMap, result, allIndexCodePath);
+                    setDefaultTableData(orgLevel, type, detailEntityMap, result, allIndexCodePath, null);
                     //不下钻
-                    ablityListFormDTO.setAllParentIndexCode(allIndexCodePath);
                     realScoreList = communitySubScoreDao.selectSubScore(ablityListFormDTO);
                     break;
                 case "street":
-                    setDefaultTableData(orgLevel, type, detailEntityMap, result, allIndexCodePath);
+                    setDefaultTableData(orgLevel, type, detailEntityMap, result, allIndexCodePath, null);
                     //不下钻
-                    ablityListFormDTO.setAllParentIndexCode(allIndexCodePath);
                     realScoreList = agencySubScoreDao.selectSubScore(ablityListFormDTO);
                     break;
                 case "district":
-                    setDefaultTableData(orgLevel, type, detailEntityMap, result, allIndexCodePath);
-                    //不下钻
-                    ablityListFormDTO.setAllParentIndexCode(allIndexCodePath);
-                    realScoreList = agencySubScoreDao.selectSubScore(ablityListFormDTO);
+                    System.out.println("========" + allIndexCodePath);
+                    if (allIndexCodePath.contains(IndexConstant.ZHI_LI_NENG_LI)) {
+                        List<IndexGroupDetailResult> detailResults = detailEntityMap.get(allIndexCodePath);
+
+                        List<IndexGroupDetailResult> indexGroupDetailEntities = new ArrayList<>();
+                        for (IndexGroupDetailResult index : detailResults) {
+
+                            if (IndexConstant.INDEX_DISTRINCT_TABLE1_INDEX_CODE.equals(index.getIndexCode())) {
+                                indexGroupDetailEntities.add(index);
+                                setDefaultTableData(orgLevel, type, detailEntityMap, result, allIndexCodePath, indexGroupDetailEntities);
+                                //不下钻
+                                realScoreList = agencySubScoreDao.selectSubScore(ablityListFormDTO);
+                                break;
+                            } else {
+                                //下钻
+                                setDefaultTableData(orgLevel, type, detailEntityMap, result, allIndexCodePath, null);
+                                ablityListFormDTO.setPid(formDTO.getOrgId());
+                                realScoreList = deptSubScoreDao.selecDeptAvgScore(ablityListFormDTO);
+                            }
+                        }
+                    } else {
+                        setDefaultTableData(orgLevel, type, detailEntityMap, result, allIndexCodePath, null);
+                        //不下钻
+                        realScoreList = agencySubScoreDao.selectSubScore(ablityListFormDTO);
+                    }
+
+
                     break;
                 default:
 
@@ -191,16 +213,22 @@ public class IndexExplainServiceImpl implements IndexExplainService {
                 }
                 tb.setOriginValue(score.getOriginValue());
                 tb.setScore(String.valueOf(score.getScore()));
-                tb.setQuantity(score.getQuantity());
+                if (StringUtils.isNotBlank(score.getQuantity())) {
+                    tb.setQuantity(score.getQuantity());
+                }
                 tb.setWeight(score.getWeight().multiply(new BigDecimal(NumConstant.ONE_HUNDRED)).setScale(NumConstant.TWO, BigDecimal.ROUND_HALF_UP) + "%");
             }
         }
     }
 
-    private List<IndexScoreDetailResult> setDefaultTableData(String orgLevel, String type, Map<String, List<IndexGroupDetailResult>> detailEntityMap, IndexExplainResult result, String allIndexCodePath) {
-        List<IndexGroupDetailResult> indexGroupDetailEntities = detailEntityMap.get(allIndexCodePath);
-        if (CollectionUtils.isEmpty(indexGroupDetailEntities)){
-            log.warn("setDefaultTableData allINdexCodePath:{} is config error",allIndexCodePath);
+    private List<IndexScoreDetailResult> setDefaultTableData(String orgLevel, String type, Map<String, List<IndexGroupDetailResult>> detailEntityMap,
+                                                             IndexExplainResult result, String allIndexCodePath, List<IndexGroupDetailResult> indexGroupDetailEntities) {
+
+        if (indexGroupDetailEntities == null) {
+            indexGroupDetailEntities = detailEntityMap.get(allIndexCodePath);
+        }
+        if (CollectionUtils.isEmpty(indexGroupDetailEntities)) {
+            log.warn("setDefaultTableData allINdexCodePath:{} is config error", allIndexCodePath);
             return null;
         }
         List<IndexScoreDetailResult> tableList = new ArrayList<>();
@@ -210,7 +238,7 @@ public class IndexExplainServiceImpl implements IndexExplainService {
             if ("grid".equals(orgLevel) && IndexConstant.ZI_SHEN.equals(type) && index.getAllIndexCodePath().contains(IndexConstant.XIA_JI)) {
                 return;
             }
-            if (!"grid".equals(orgLevel) && !index.getAllIndexCodePath().contains(type)){
+            if ((!"grid".equals(orgLevel) && !"district".equals(orgLevel)) && !index.getAllIndexCodePath().contains(type)) {
                 return;
             }
             table.setIndexCode(index.getIndexCode());
@@ -218,6 +246,7 @@ public class IndexExplainServiceImpl implements IndexExplainService {
             table.setOriginValue(NumConstant.ZERO_STR);
             table.setScore(NumConstant.ZERO_STR);
             table.setWeight(index.getWeight().multiply(new BigDecimal(100)).setScale(NumConstant.TWO, BigDecimal.ROUND_HALF_UP) + "%");
+            table.setQuantity(NumConstant.ZERO_STR);
             tableList.add(table);
             if (new BigDecimal(-1).compareTo(index.getThreshold()) != 0) {
                 threlodList.add(index.getIndexName().concat(String.format(IndexConstant.THRESHOLD_TEXT, index.getThreshold().intValue())));
@@ -257,7 +286,7 @@ public class IndexExplainServiceImpl implements IndexExplainService {
                     headers = IndexConstant.getStandardSelfHeaders(allIndexCode);
 
                 } else if ("xiaji".equals(type)) {
-                    headers = IndexConstant.getStandardSubHeaders(allIndexCode);
+                    headers = new ArrayList<>(IndexConstant.QuantityLastHeader);
                     if (allIndexCode.contains("canyuyishi")) {
                         headers.add(0, "组织内党员的参与议事指数考评分（平均值）");
                     } else if (allIndexCode.contains("lianxiqunzhong")) {
@@ -265,6 +294,19 @@ public class IndexExplainServiceImpl implements IndexExplainService {
                     }
                     break;
                 }
+            case "district":
+                if ("zishen".equals(type)) {
+                    headers = IndexConstant.getStandardSelfHeaders(allIndexCode);
+
+                } else if ("xiaji".equals(type)) {
+                    headers = new ArrayList<>(IndexConstant.QuantityLastHeader);
+                    if (allIndexCode.contains("quzhibumen")) {
+                        headers.add(0, "区直部门各项治理指数指标");
+                    } else {
+                        headers.add(0, "所有街道治理指数指标");
+                    }
+                }
+                break;
             default:
                 if ("zishen".equals(type)) {
                     headers = IndexConstant.getStandardSelfHeaders(allIndexCode);
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencySubScoreDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencySubScoreDao.xml
index 954ce4c772..481d5be0f1 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencySubScoreDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencySubScoreDao.xml
@@ -53,7 +53,14 @@
             fact.del_flag = '0'
             AND fact.all_parent_index_code = #{allParentIndexCode}
             AND customer_id = #{customerId}
-            AND agency_id = #{orgId}
+            <choose>
+                <when test="pid != null and pid != ''">
+                    AND PARENT_AGENCY_ID = #{pid}
+                </when>
+                <otherwise>
+                 AND agency_id = #{orgId}
+                </otherwise>
+            </choose>
             AND month_id = #{monthId}
     </select>
 
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexDeptSubScoreDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexDeptSubScoreDao.xml
new file mode 100644
index 0000000000..af7d01495b
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexDeptSubScoreDao.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.datareport.dao.fact.FactIndexDeptSubScoreDao">
+
+
+
+    <select id="selecDeptAvgScore" resultType="com.epmet.evaluationindex.index.result.IndexScoreResult">
+            SELECT
+                id, customer_id, dept_id, agency_id, month_id,
+                origin_value,
+                index_code, all_parent_index_code, weight,
+                COUNT(*) quantity,
+                ROUND(AVG(score),2) score
+            FROM  fact_index_dept_sub_score
+            WHERE
+                ALL_PARENT_INDEX_CODE = #{allParentIndexCode}
+                AND CUSTOMER_ID = #{customerId}
+                and  AGENCY_ID= #{orgId}
+                and MONTH_ID = #{monthId}
+            GROUP BY INDEX_CODE;
+    </select>
+
+ </mapper>

From 328cccaa2922624b94c6fdb2ac591855c9d20cf8 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 20 May 2021 16:34:33 +0800
Subject: [PATCH 054/128] =?UTF-8?q?=E7=BE=A4=E4=BC=97=E4=B8=8D=E6=BB=A1?=
 =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IssueProjectCategoryDictServiceImpl.java      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java
index 46bed8859f..6e61017ed1 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java
@@ -509,6 +509,9 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
                 result.concat(l.getCategoryName()).concat(",");
             });
         }
+        if (StringUtils.isEmpty(result)){
+            return result;
+        }
         return result.substring(NumConstant.ZERO,result.length()-NumConstant.ONE);
     }
 }

From 4e9ff4fe5f5ae04b83c031ab159b6167d5196581 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Thu, 20 May 2021 17:54:25 +0800
Subject: [PATCH 055/128] =?UTF-8?q?orglevel=E6=9E=9A=E4=B8=BE=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commons/tools/enums/OrgLevelEnum.java     | 51 +++++++++++++++++++
 .../index/impl/IndexExplainServiceImpl.java   | 20 ++++----
 .../fact/FactIndexAgencySubScoreDao.xml       |  9 +---
 3 files changed, 61 insertions(+), 19 deletions(-)
 create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/OrgLevelEnum.java

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/OrgLevelEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/OrgLevelEnum.java
new file mode 100644
index 0000000000..3462ad772b
--- /dev/null
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/OrgLevelEnum.java
@@ -0,0 +1,51 @@
+package com.epmet.commons.tools.enums;
+
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.RenException;
+
+/**
+ * 组织级别枚举类
+ * dev|test|prod
+ *
+ * @author jianjun liu
+ * @date 2020-07-03 11:14
+ **/
+public enum OrgLevelEnum {
+	/**
+	 * 组织等级枚举
+	 */
+	GRID("grid"),
+	COMMUNITY("community"),
+	STREET("street"),
+	DISTRICT("district"),
+	CITY("city"),
+	PROVINCE("province"),
+	;
+
+	private String code;
+
+
+
+
+	OrgLevelEnum(String code) {
+		this.code = code;
+
+	}
+
+	public static OrgLevelEnum getEnum(String code) {
+		OrgLevelEnum[] values = OrgLevelEnum.values();
+		for (OrgLevelEnum value : values) {
+			if (value.getCode().equals(code)) {
+				return value;
+			}
+		}
+		throw new RenException(EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getCode());
+	}
+
+
+
+
+	public String getCode() {
+		return code;
+	}
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
index 6ca654a4ec..a08c32bc6e 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
@@ -19,6 +19,7 @@ package com.epmet.datareport.service.evaluationindex.index.impl;
 
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.enums.OrgLevelEnum;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.datareport.constant.IndexConstant;
@@ -129,9 +130,9 @@ public class IndexExplainServiceImpl implements IndexExplainService {
             ablityListFormDTO.setOrgId(formDTO.getOrgId());
             ablityListFormDTO.setAllParentIndexCode(allIndexCodePath);
             ablityListFormDTO.setMonthId(StringUtils.isBlank(formDTO.getMonthId()) ? DateUtils.getCurrentTimeBeforeMonthId() : formDTO.getMonthId());
-            switch (orgLevel) {
-                case "grid":
-
+            OrgLevelEnum anEnum = OrgLevelEnum.getEnum(orgLevel);
+            switch (anEnum) {
+                case GRID:
                     if (IndexConstant.ZI_SHEN.equals(type)) {
                         setDefaultTableData(orgLevel, type, detailEntityMap, result, allIndexCodePath, null);
                         //不下钻
@@ -144,20 +145,18 @@ public class IndexExplainServiceImpl implements IndexExplainService {
                         realScoreList = factIndexCpcSubScoreDao.selecCpcAvgScore(ablityListFormDTO);
                     }
 
-
                     break;
-                case "community":
+                case COMMUNITY:
                     setDefaultTableData(orgLevel, type, detailEntityMap, result, allIndexCodePath, null);
                     //不下钻
                     realScoreList = communitySubScoreDao.selectSubScore(ablityListFormDTO);
                     break;
-                case "street":
+                case STREET:
                     setDefaultTableData(orgLevel, type, detailEntityMap, result, allIndexCodePath, null);
                     //不下钻
                     realScoreList = agencySubScoreDao.selectSubScore(ablityListFormDTO);
                     break;
-                case "district":
-                    System.out.println("========" + allIndexCodePath);
+                case DISTRICT:
                     if (allIndexCodePath.contains(IndexConstant.ZHI_LI_NENG_LI)) {
                         List<IndexGroupDetailResult> detailResults = detailEntityMap.get(allIndexCodePath);
 
@@ -171,7 +170,7 @@ public class IndexExplainServiceImpl implements IndexExplainService {
                                 realScoreList = agencySubScoreDao.selectSubScore(ablityListFormDTO);
                                 break;
                             } else {
-                                //下钻
+                                //下钻到区直部门
                                 setDefaultTableData(orgLevel, type, detailEntityMap, result, allIndexCodePath, null);
                                 ablityListFormDTO.setPid(formDTO.getOrgId());
                                 realScoreList = deptSubScoreDao.selecDeptAvgScore(ablityListFormDTO);
@@ -183,10 +182,9 @@ public class IndexExplainServiceImpl implements IndexExplainService {
                         realScoreList = agencySubScoreDao.selectSubScore(ablityListFormDTO);
                     }
 
-
                     break;
                 default:
-
+                    log.error("暂不支持更高级别的查询，level:{}",orgLevel);
             }
 
             setRealValue(result.getTableDataList(), realScoreList);
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencySubScoreDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencySubScoreDao.xml
index 481d5be0f1..954ce4c772 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencySubScoreDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencySubScoreDao.xml
@@ -53,14 +53,7 @@
             fact.del_flag = '0'
             AND fact.all_parent_index_code = #{allParentIndexCode}
             AND customer_id = #{customerId}
-            <choose>
-                <when test="pid != null and pid != ''">
-                    AND PARENT_AGENCY_ID = #{pid}
-                </when>
-                <otherwise>
-                 AND agency_id = #{orgId}
-                </otherwise>
-            </choose>
+            AND agency_id = #{orgId}
             AND month_id = #{monthId}
     </select>
 

From 3ffbd3b55e3d58f881d846fe2d0cecf41653d190 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 21 May 2021 10:14:43 +0800
Subject: [PATCH 056/128] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=8C=87=E6=A0=87?=
 =?UTF-8?q?=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/dto/result/IndexDictResultDTO.java                | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/IndexDictResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/IndexDictResultDTO.java
index 196837f220..bf3670b11f 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/IndexDictResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/IndexDictResultDTO.java
@@ -3,7 +3,6 @@ package com.epmet.evaluationindex.screen.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  *  评价指标字典表数据--接口返参
@@ -18,6 +17,10 @@ public class IndexDictResultDTO implements Serializable {
      * 指标名
      */
     private String indexName;
+    /**
+     * 指标名
+     */
+    private String indexDesc;
     /**
      * 指标code
      */

From 84ced263052bc7f416471b5d286da094c626a040 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 21 May 2021 15:42:40 +0800
Subject: [PATCH 057/128] =?UTF-8?q?=E6=94=AF=E9=83=A8=E5=BB=BA=E8=AE=BE?=
 =?UTF-8?q?=E3=80=81=E8=81=94=E5=BB=BA=E5=85=B1=E5=BB=BA=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?2=E5=BC=A0=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../migration/V0.0.14__groupact_analysis.sql  | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.14__groupact_analysis.sql

diff --git 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
new file mode 100644
index 0000000000..ee35df8d10
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.14__groupact_analysis.sql
@@ -0,0 +1,49 @@
+-- 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='专项组活动(参加人数、组织次数、平均参加人数)按月增量分析';
\ No newline at end of file

From daf5d5dff7980c89d66c374518bbb27ad83bfd0f Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 24 May 2021 09:59:27 +0800
Subject: [PATCH 058/128] =?UTF-8?q?=E6=B2=BB=E7=90=86=E5=AE=9E=E5=86=B5-?=
 =?UTF-8?q?=E6=B2=BB=E7=90=86=E6=8C=87=E6=95=B0-=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datastats/form/AgencyGovrnFormDTO.java    | 28 +++++++++++
 .../dto/datastats/form/GridGovrnFormDTO.java  | 28 +++++++++++
 .../result/AgencyGovrnResultDTO.java          | 37 ++++++++++++++
 .../datastats/result/GridGovrnResultDTO.java  | 29 +++++++++++
 .../controller/DataStatsController.java       | 49 +++++++++++++++++--
 .../service/datastats/DataStatsService.java   | 34 +++++++++++--
 .../datastats/impl/DataStatsServiceImpl.java  | 46 +++++++++++++++--
 7 files changed, 237 insertions(+), 14 deletions(-)
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/AgencyGovrnFormDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/GridGovrnFormDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/AgencyGovrnResultDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/GridGovrnResultDTO.java

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/AgencyGovrnFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/AgencyGovrnFormDTO.java
new file mode 100644
index 0000000000..1ad7a8149e
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/AgencyGovrnFormDTO.java
@@ -0,0 +1,28 @@
+package com.epmet.dataaggre.dto.datastats.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 治理实况-当前组织治理指数-接口入参
+ * @Auth sun
+ */
+@Data
+public class AgencyGovrnFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -3381286960911634231L;
+    /**
+     * 组织Id
+     */
+    @NotBlank(message = "组织ID不能为空",groups = AgencyGovrnFormDTO.Agency.class)
+    private String agencyId;
+    /**
+     * 日维度Id
+     */
+    private String dateId;
+    public interface Agency extends CustomerClientShowGroup {}
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/GridGovrnFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/GridGovrnFormDTO.java
new file mode 100644
index 0000000000..1c8fe4b861
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/GridGovrnFormDTO.java
@@ -0,0 +1,28 @@
+package com.epmet.dataaggre.dto.datastats.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 治理实况-当前网格治理指数-接口入参
+ * @Auth sun
+ */
+@Data
+public class GridGovrnFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -3381286960911634231L;
+    /**
+     * 网格Id
+     */
+    @NotBlank(message = "网格Id不能为空",groups = GridGovrnFormDTO.Grid.class)
+    private String gridId;
+    /**
+     * 日维度Id
+     */
+    private String dateId;
+    public interface Grid extends CustomerClientShowGroup {}
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/AgencyGovrnResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/AgencyGovrnResultDTO.java
new file mode 100644
index 0000000000..72f331a500
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/AgencyGovrnResultDTO.java
@@ -0,0 +1,37 @@
+package com.epmet.dataaggre.dto.datastats.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @Description 治理实况-当前组织治理指数-接口返参
+ * @Auth sun
+ */
+@Data
+public class AgencyGovrnResultDTO implements Serializable {
+    private static final long serialVersionUID = 466974582608407121L;
+    @JsonIgnore
+    BigDecimal bi = new BigDecimal(0);
+    //组织Id
+    private String agencyId;
+    //组织名称
+    private String agencyName;
+    //机关级别（社区级：community， 乡（镇、街道）级:street, 区县级: district, 市级: city 省级:province）
+    private String level;
+    //问题解决总数
+    private Integer a = 0;
+    //党群自治占比
+    private BigDecimal b = bi;
+    //网格自治占比
+    private BigDecimal c = bi;
+    //社区解决占比
+    private BigDecimal d = bi;
+    //区直部门解决占比
+    private BigDecimal e = bi;
+    //街道解决占比
+    private BigDecimal f = bi;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/GridGovrnResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/GridGovrnResultDTO.java
new file mode 100644
index 0000000000..0aa7f5852e
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/GridGovrnResultDTO.java
@@ -0,0 +1,29 @@
+package com.epmet.dataaggre.dto.datastats.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @Description 治理实况-当前网格治理指数-接口返参
+ * @Auth sun
+ */
+@Data
+public class GridGovrnResultDTO implements Serializable {
+    private static final long serialVersionUID = 466974582608407121L;
+    @JsonIgnore
+    BigDecimal bi = new BigDecimal(0);
+    //网格Id
+    private String gridId;
+    //网格名称
+    private String gridName;
+    //问题解决总数
+    private Integer a = 0;
+    //党群自治占比
+    private BigDecimal b = bi;
+    //网格自治占比
+    private BigDecimal c = bi;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java
index 162b7e5671..0546d0c846 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java
@@ -2,10 +2,7 @@ package com.epmet.dataaggre.controller;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.dataaggre.dto.datastats.form.AgenctBasicDataFormDTO;
-import com.epmet.dataaggre.dto.datastats.form.GridBasicDataFormDTO;
-import com.epmet.dataaggre.dto.datastats.form.SubAgencyFormDTO;
-import com.epmet.dataaggre.dto.datastats.form.SubGridFormDTO;
+import com.epmet.dataaggre.dto.datastats.form.*;
 import com.epmet.dataaggre.dto.datastats.result.*;
 import com.epmet.dataaggre.service.datastats.DataStatsService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -159,4 +156,48 @@ public class DataStatsController {
         return new Result<List<SubGridProjectResultDTO>>().ok(dataStatsService.subGridProject(formDTO));
     }
 
+    /**
+     * @Param formDTO
+     * @Description 治理实况-当前组织治理指数
+     * @author sun
+     */
+    @PostMapping("agencygovrn")
+    public Result<AgencyGovrnResultDTO> agencyGovrn(@RequestBody AgencyGovrnFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, AgencyGovrnFormDTO.Agency.class);
+        return new Result<AgencyGovrnResultDTO>().ok(dataStatsService.agencyGovrn(formDTO));
+    }
+
+    /**
+     * @Param formDTO
+     * @Description 治理实况-组织直属下级治理指数列表
+     * @author sun
+     */
+    @PostMapping("subagencygovrnlist")
+    public Result<List<AgencyGovrnResultDTO>> subAgencyGovrnList(@RequestBody AgencyGovrnFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, AgencyGovrnFormDTO.Agency.class);
+        return new Result<List<AgencyGovrnResultDTO>>().ok(dataStatsService.subAgencyGovrnList(formDTO));
+    }
+
+    /**
+     * @Param formDTO
+     * @Description 治理实况-当前网格治理指数
+     * @author sun
+     */
+    @PostMapping("gridgovrn")
+    public Result<GridGovrnResultDTO> gridGovrn(@RequestBody GridGovrnFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, GridGovrnFormDTO.Grid.class);
+        return new Result<GridGovrnResultDTO>().ok(dataStatsService.gridGovrn(formDTO));
+    }
+
+    /**
+     * @Param formDTO
+     * @Description 治理实况-组织直属网格治理指数列表
+     * @author sun
+     */
+    @PostMapping("subgridgovrnlist")
+    public Result<List<GridGovrnResultDTO>> subGridGovrnList(@RequestBody GridGovrnFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, GridGovrnFormDTO.Grid.class);
+        return new Result<List<GridGovrnResultDTO>>().ok(dataStatsService.subGridGovrnList(formDTO));
+    }
+
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
index 1e99251989..472bc277b4 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
@@ -1,11 +1,7 @@
 package com.epmet.dataaggre.service.datastats;
 
 import com.epmet.dataaggre.dto.datastats.FactGroupActDailyDTO;
-import com.epmet.dataaggre.dto.datastats.form.AgenctBasicDataFormDTO;
-import com.epmet.dataaggre.dto.datastats.form.PartyMemberVanguardFormDTO;
-import com.epmet.dataaggre.dto.datastats.form.GridBasicDataFormDTO;
-import com.epmet.dataaggre.dto.datastats.form.SubAgencyFormDTO;
-import com.epmet.dataaggre.dto.datastats.form.SubGridFormDTO;
+import com.epmet.dataaggre.dto.datastats.form.*;
 import com.epmet.dataaggre.dto.datastats.result.*;
 import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO;
 import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO;
@@ -128,4 +124,32 @@ public interface DataStatsService {
     List<FactGroupActDailyDTO> querySubAnalysisByCode(String customerId, String pid, String dateId, String categoryCode);
 
     List<GroupActRankDetailDTO> selectGroupActRankDetail(String customerId, String dateId, String orgId, List<ActCategoryDictDTO> actCategoryDictDTOList);
+
+    /**
+     * @Param formDTO
+     * @Description 治理实况-当前组织治理指数
+     * @author sun
+     */
+    AgencyGovrnResultDTO agencyGovrn(AgencyGovrnFormDTO formDTO);
+
+    /**
+     * @Param formDTO
+     * @Description 治理实况-组织直属下级治理指数列表
+     * @author sun
+     */
+    List<AgencyGovrnResultDTO> subAgencyGovrnList(AgencyGovrnFormDTO formDTO);
+
+    /**
+     * @Param formDTO
+     * @Description 治理实况-当前网格治理指数
+     * @author sun
+     */
+    GridGovrnResultDTO gridGovrn(GridGovrnFormDTO formDTO);
+
+    /**
+     * @Param formDTO
+     * @Description 治理实况-组织直属网格治理指数列表
+     * @author sun
+     */
+    List<GridGovrnResultDTO> subGridGovrnList(GridGovrnFormDTO formDTO);
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index 9daf0c36ab..51bf154a84 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -7,11 +7,7 @@ import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.constant.OrgConstant;
 import com.epmet.dataaggre.dao.datastats.DataStatsDao;
 import com.epmet.dataaggre.dto.datastats.FactGroupActDailyDTO;
-import com.epmet.dataaggre.dto.datastats.form.AgenctBasicDataFormDTO;
-import com.epmet.dataaggre.dto.datastats.form.PartyMemberVanguardFormDTO;
-import com.epmet.dataaggre.dto.datastats.form.GridBasicDataFormDTO;
-import com.epmet.dataaggre.dto.datastats.form.SubAgencyFormDTO;
-import com.epmet.dataaggre.dto.datastats.form.SubGridFormDTO;
+import com.epmet.dataaggre.dto.datastats.form.*;
 import com.epmet.dataaggre.dto.datastats.result.*;
 import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO;
 import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO;
@@ -1014,4 +1010,44 @@ public class DataStatsServiceImpl implements DataStatsService {
         return new ArrayList<>();
     }
 
+    /**
+     * @Param formDTO
+     * @Description 治理实况-当前组织治理指数
+     * @author sun
+     */
+    @Override
+    public AgencyGovrnResultDTO agencyGovrn(AgencyGovrnFormDTO formDTO) {
+        return null;
+    }
+
+    /**
+     * @Param formDTO
+     * @Description 治理实况-组织直属下级治理指数列表
+     * @author sun
+     */
+    @Override
+    public List<AgencyGovrnResultDTO> subAgencyGovrnList(AgencyGovrnFormDTO formDTO) {
+        return null;
+    }
+
+    /**
+     * @Param formDTO
+     * @Description 治理实况-当前网格治理指数
+     * @author sun
+     */
+    @Override
+    public GridGovrnResultDTO gridGovrn(GridGovrnFormDTO formDTO) {
+        return null;
+    }
+
+    /**
+     * @Param formDTO
+     * @Description 治理实况-组织直属网格治理指数列表
+     * @author sun
+     */
+    @Override
+    public List<GridGovrnResultDTO> subGridGovrnList(GridGovrnFormDTO formDTO) {
+        return null;
+    }
+
 }

From 9e9776e98b0e634ff18dd64b8b7eb51a485a3192 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Mon, 24 May 2021 10:11:47 +0800
Subject: [PATCH 059/128] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E6=8C=87=E6=A0=87=E8=AE=A1=E7=AE=97=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=B9=B3=E5=9D=87=E5=80=BC=E7=9A=84=E6=A0=B7=E6=9C=AC=E9=87=8F?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../evaluationindex/indexcal/CpcScoreDao.java |  9 +--
 .../indexcal/GridSubScoreEntity.java          |  5 ++
 .../com/epmet/model/AvgOperationResultVO.java | 21 +++++++
 .../impl/GridCorreLationServiceImpl.java      | 63 ++++++++++++++-----
 .../V0.0.14__cpc_subscore_add_samplecount.sql |  1 +
 .../evaluationindex/indexcal/CpcScoreDao.xml  | 10 +--
 .../indexcal/GridSubScoreDao.xml              |  6 +-
 7 files changed, 88 insertions(+), 27 deletions(-)
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/AvgOperationResultVO.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.14__cpc_subscore_add_samplecount.sql

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/CpcScoreDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/CpcScoreDao.java
index c1b8e5b479..b4b6fc8869 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/CpcScoreDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/CpcScoreDao.java
@@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.indexcal.CalculateCommonFormDTO;
 import com.epmet.dto.indexcal.CpcScoreResultDTO;
 import com.epmet.entity.evaluationindex.indexcal.CpcScoreEntity;
+import com.epmet.model.AvgOperationResultVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -46,9 +47,9 @@ public interface CpcScoreDao extends BaseDao<CpcScoreEntity> {
      * @description 获取网格内党员的联系群众能力考评分（平均值）
      * @Date 2020/8/31 10:56
      **/
-    BigDecimal selectGridContactMassesAvgValue(@Param("customerId") String customerId,
-                                               @Param("monthId") String monthId,
-                                               @Param("gridId") String gridId);
+    AvgOperationResultVO selectGridContactMassesAvgValue(@Param("customerId") String customerId,
+                                                         @Param("monthId") String monthId,
+                                                         @Param("gridId") String gridId);
 
     /**
      * @param formDTO
@@ -77,7 +78,7 @@ public interface CpcScoreDao extends BaseDao<CpcScoreEntity> {
      * @description 组织内党员的参与议事能力考评分（平均值）
      * @Date 2020/8/31 15:51
      **/
-    BigDecimal selectGridJoinIssueAvgValue(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("gridId") String gridId);
+    AvgOperationResultVO selectGridJoinIssueAvgValue(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("gridId") String gridId);
 
     int deleteByMonthId(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("indexCode") String indexCode, @Param("deleteSize") Integer deleteSize, @Param("isTotal") String isTotal);
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/GridSubScoreEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/GridSubScoreEntity.java
index fa88df4ba7..f6bf4bb903 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/GridSubScoreEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/GridSubScoreEntity.java
@@ -101,4 +101,9 @@ public class GridSubScoreEntity extends BaseEpmetEntity {
 	 * 权重（同一组权重总和=1）
 	 */
 	private BigDecimal weight;
+
+	/**
+	 * 样本总量
+	 */
+	private Integer sampleCount;
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/AvgOperationResultVO.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/AvgOperationResultVO.java
new file mode 100644
index 0000000000..d97ad2e264
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/AvgOperationResultVO.java
@@ -0,0 +1,21 @@
+package com.epmet.model;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 平均值运算结果vo
+ */
+@Data
+public class AvgOperationResultVO {
+    /**
+     * 样本量
+     */
+    private Integer sampleCount;
+
+    /**
+     * 平均值
+     */
+    private BigDecimal avgValue;
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java
index b785d78b4a..e70200f06a 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java
@@ -26,6 +26,7 @@ import com.epmet.entity.evaluationindex.indexcal.GridSelfSubScoreEntity;
 import com.epmet.entity.evaluationindex.indexcal.GridSubScoreEntity;
 import com.epmet.entity.evaluationindex.screen.IndexGroupDetailEntity;
 import com.epmet.eum.IndexCodeEnum;
+import com.epmet.model.AvgOperationResultVO;
 import com.epmet.service.evaluationindex.indexcal.GridCorreLationService;
 import com.epmet.service.evaluationindex.indexcal.IndexCodeFieldReService;
 import com.epmet.service.evaluationindex.screen.IndexGroupDetailService;
@@ -185,6 +186,7 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
      **/
     @Transactional(rollbackFor = Exception.class)
     public void calculateGridDangJian(CalculateCommonFormDTO formDTO) {
+        // 该客户下的指标列表及权重
         List<IndexGroupDetailEntity> indexList = indexGroupDetailService.getDetailListByParentCode(formDTO.getCustomerId(),
                 IndexCodeEnum.WANG_GE_XIANG_GUAN.getCode(),
                 IndexCodeEnum.DANG_JIAN_NENG_LI.getCode());
@@ -192,7 +194,7 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
             log.error("calculateGridDangJian customerId:{} have not any indexGroupDetail", formDTO.getCustomerId());
             throw new RenException("客户【网格相关:党建能力】指标权重信息不存在");
         }
-        //查询总记录数
+        //查询总记录数（该客户下，该月份，每个网格一条，有多少条）
         int total = factIndexPartyAblityGridMonthlyDao.selectCount(formDTO);
         if (NumConstant.ZERO == total) {
             log.warn(String.format("customerId=%s,monthId=%s,没有上传网格相关-党建能力-五级指标数据", formDTO.getCustomerId(), formDTO.getMonthId()));
@@ -210,10 +212,12 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
         //指标集合
         Map<String, IndexInputVO<BigDecimal>> indexMap = buildGridCorrelationIndexInputVO(formDTO, indexList, minAndMaxMap);
         List<HashMap<String, CalculateResult>> resultMapList = new ArrayList<>();
+        // 平均值计算结果，内含平均值，样本总量
+        HashMap<String, AvgOperationResultVO> gridAvgOpeResultMap = new HashMap<>();
         //分页查询采集记录
         for (int pageNo = 1; pageNo <= totalPage; pageNo++) {
             int pageIndex = (pageNo - NumConstant.ONE) * IndexCalConstant.PAGE_SIZE;
-            //前10条
+            //前10条。每个网格的党建能力的数据
             List<Map<String, Object>> recordList = queryListPartyAblityGrid(new PageQueryGridFormDTO(formDTO.getCustomerId(),
                     formDTO.getMonthId(),
                     pageIndex,
@@ -231,8 +235,10 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
 //                        log.info("组织内党员的联系群众能力考评分（平均值） 单独处理");
                         //网格内党员的联系群众能力考评分（平均值）
                         String gridId = (String) recordMap.get(IndexCalConstant.GRID_ID);
-                        BigDecimal contactMassesAvgValue = getGridContactMassesAvgValue(formDTO, gridId);
-                        SampleValue<BigDecimal> contactMassesAblityValue = new SampleValue((String) recordMap.get(IndexCalConstant.GRID_ID), contactMassesAvgValue);
+                        String monthId = (String) recordMap.get(IndexCalConstant.MONTH_ID);
+                         AvgOperationResultVO contactMassesAvgVo = getGridContactMassesAvgValue(formDTO, gridId);
+                         gridAvgOpeResultMap.put(gridId.concat(":").concat(monthId), contactMassesAvgVo);
+                         SampleValue<BigDecimal> contactMassesAblityValue = new SampleValue((String) recordMap.get(IndexCalConstant.GRID_ID), contactMassesAvgVo.getAvgValue());
                         value.getIndexValueVOs().add(contactMassesAblityValue);
                     }else if (StringUtils.isNotBlank(indexCodeFieldReService.getFieldNameByIndexCode(key))) {
                         //对应的数值
@@ -251,7 +257,11 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
         saveGridCorreLationResult(formDTO,
                 resultMapList,
                 IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(),
-                NumConstant.ZERO_STR);
+                NumConstant.ZERO_STR,
+                gridAvgOpeResultMap);
+
+        // 清理map
+        gridAvgOpeResultMap.clear();
     }
 
     /**
@@ -312,10 +322,11 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
      * @description 获取网格（组织）内党员的联系群众能力考评分（平均值）
      * @Date 2020/8/31 9:50
      **/
-    private BigDecimal getGridContactMassesAvgValue(CalculateCommonFormDTO calculateCommonFormDTO, String gridId) {
-        BigDecimal result = cpcScoreDao.selectGridContactMassesAvgValue(calculateCommonFormDTO.getCustomerId(), calculateCommonFormDTO.getMonthId(), gridId);
+    private AvgOperationResultVO getGridContactMassesAvgValue(CalculateCommonFormDTO calculateCommonFormDTO, String gridId) {
+        AvgOperationResultVO result = cpcScoreDao.selectGridContactMassesAvgValue(calculateCommonFormDTO.getCustomerId(), calculateCommonFormDTO.getMonthId(), gridId);
         if (null == result) {
-            return new BigDecimal(NumConstant.ZERO_STR);
+            result.setAvgValue(new BigDecimal(0));
+            result.setSampleCount(0);
         }
         //FOR TEST
         /*BigDecimal result=null;
@@ -337,10 +348,12 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
      * @description 组织内党员的参与议事能力考评分（平均值）
      * @Date 2020/8/31 15:51
      **/
-    private BigDecimal getGridJoinIssueAvgValue(CalculateCommonFormDTO formDTO, String gridId) {
-        BigDecimal result = cpcScoreDao.selectGridJoinIssueAvgValue(formDTO.getCustomerId(), formDTO.getMonthId(), gridId);
+    private AvgOperationResultVO getGridJoinIssueAvgValue(CalculateCommonFormDTO formDTO, String gridId) {
+        AvgOperationResultVO result = cpcScoreDao.selectGridJoinIssueAvgValue(formDTO.getCustomerId(), formDTO.getMonthId(), gridId);
         if (null == result) {
-            return new BigDecimal(NumConstant.ZERO_STR);
+            //return new BigDecimal(NumConstant.ZERO_STR);
+            result.setSampleCount(0);
+            result.setAvgValue(new BigDecimal(0));
         }
         //FOR TEST
         /*BigDecimal result=null;
@@ -411,7 +424,7 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
 
     /**
      * @param formDTO       客户id   月份id:  yyyyMM
-     * @param resultMapList
+     * @param resultMapList key：网格id，value：该网格各项指标的计算结果
      * @param indexCode     指标编码: 党建能力：dangjiannengli；治理能力：zhilinengli；服务能力：fuwunengli；
      * @param isTotal       1：总分；0不是
      * @return void
@@ -422,7 +435,8 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
     private void saveGridCorreLationResult(CalculateCommonFormDTO formDTO,
                                              List<HashMap<String, CalculateResult>> resultMapList,
                                              String indexCode,
-                                             String isTotal) {
+                                             String isTotal,
+                                             HashMap<String, AvgOperationResultVO> avgOpeResultVo) {
         String quarterId = DateUtils.getQuarterId(formDTO.getMonthId());
         String yearId = DateUtils.getYearId(formDTO.getMonthId());
         //三大能力结果表
@@ -463,6 +477,14 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
                     gridSubScoreEntity.setScore(detail.getScore());
                     gridSubScoreEntity.setWeight(detail.getWeight());
                     gridSubScoreEntity.setOriginValue(detail.getOriginValue());
+
+                    // 为平均值类型的指标赋值样本总量
+                    AvgOperationResultVO avgOperationResultVO = avgOpeResultVo.get(gridSubScoreEntity.getGridId().concat(":").concat(gridSubScoreEntity.getMonthId()));
+                    if (avgOperationResultVO != null) {
+                        gridSubScoreEntity.setSampleCount(avgOperationResultVO.getSampleCount());
+                    } else {
+                        gridSubScoreEntity.setSampleCount(0);
+                    }
                     gridSubScoreList.add(gridSubScoreEntity);
                 }
             });
@@ -621,6 +643,7 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
         //指标集合
         Map<String, IndexInputVO<BigDecimal>> indexMap = buildGridCorrelationIndexInputVO(formDTO, indexList, minAndMaxMap);
         List<HashMap<String, CalculateResult>> resultMapList = new ArrayList<>();
+        HashMap<String, AvgOperationResultVO> avgOperationResultVo = new HashMap<>();
         //分页查询采集记录
         for (int pageNo = 1; pageNo <= totalPage; pageNo++) {
             int pageIndex = (pageNo - NumConstant.ONE) * IndexCalConstant.PAGE_SIZE;
@@ -639,8 +662,11 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
                     if (IndexCodeEnum.ZUZHINEIDANGYDSYYSNLKPFPJZ.getCode().equals(key)) {
 //                        log.info("组织内党员的参与议事能力考评分（平均值） 单独处理");
                         String gridId = (String) recordMap.get(IndexCalConstant.GRID_ID);
-                        BigDecimal joinAvgValue = getGridJoinIssueAvgValue(formDTO, gridId);
-                        SampleValue<BigDecimal> contactMassesAblityValue = new SampleValue((String) recordMap.get(IndexCalConstant.GRID_ID), joinAvgValue);
+                        String monthId = (String) recordMap.get(IndexCalConstant.MONTH_ID);
+                        AvgOperationResultVO joinAvgValue = getGridJoinIssueAvgValue(formDTO, gridId);
+                        avgOperationResultVo.put(gridId.concat(":").concat(monthId), joinAvgValue);
+
+                        SampleValue<BigDecimal> contactMassesAblityValue = new SampleValue((String) recordMap.get(IndexCalConstant.GRID_ID), joinAvgValue.getAvgValue());
                         value.getIndexValueVOs().add(contactMassesAblityValue);
                     }else if (StringUtils.isNotBlank(indexCodeFieldReService.getFieldNameByIndexCode(key))) {
                         //对应的数值
@@ -659,7 +685,8 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
         saveGridCorreLationResult(formDTO,
                                 resultMapList,
                                 IndexCodeEnum.ZHI_LI_NENG_LI.getCode(),
-                                NumConstant.ZERO_STR);
+                                NumConstant.ZERO_STR,
+                                avgOperationResultVo);
     }
 
 
@@ -696,6 +723,7 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
         //指标集合
         Map<String, IndexInputVO<BigDecimal>> indexMap = buildGridCorrelationIndexInputVO(formDTO, indexList, minAndMaxMap);
         List<HashMap<String, CalculateResult>> resultMapList = new ArrayList<>();
+        HashMap<String, AvgOperationResultVO> avgOperationResultVO = new HashMap<>();
         //分页查询采集记录
         for (int pageNo = 1; pageNo <= totalPage; pageNo++) {
             int pageIndex = (pageNo - NumConstant.ONE) * IndexCalConstant.PAGE_SIZE;
@@ -730,7 +758,8 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
         saveGridCorreLationResult(formDTO,
                 resultMapList,
                 IndexCodeEnum.FU_WU_NENG_LI.getCode(),
-                NumConstant.ZERO_STR);
+                NumConstant.ZERO_STR,
+                avgOperationResultVO);
     }
 
     /**
diff --git 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
new file mode 100644
index 0000000000..af7688ee68
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.14__cpc_subscore_add_samplecount.sql
@@ -0,0 +1 @@
+alter table fact_index_grid_sub_score add column SAMPLE_COUNT int(10) comment '样本量' after ORIGIN_VALUE;
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CpcScoreDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CpcScoreDao.xml
index bf0cfd3d51..b4ad476821 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CpcScoreDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CpcScoreDao.xml
@@ -46,9 +46,10 @@
 
 
     <!--   获取网格内党员的联系群众能力考评分（平均值）  -->
-    <select id="selectGridContactMassesAvgValue" parameterType="map" resultType="java.math.BigDecimal">
+    <select id="selectGridContactMassesAvgValue" parameterType="map" resultType="com.epmet.model.AvgOperationResultVO">
          SELECT
-            round(AVG( SCORE ),6) AS AVG_CONTACT_MASSES_SCORE
+            round(AVG( SCORE ),6) AS AVG_VALUE,
+            count(1) AS SAMPLE_COUNT
          FROM
             fact_index_cpc_score m
          WHERE
@@ -90,9 +91,10 @@
     </select>
 
     <!--    -->
-    <select id="selectGridJoinIssueAvgValue" parameterType="map" resultType="java.math.BigDecimal">
+    <select id="selectGridJoinIssueAvgValue" parameterType="map" resultType="com.epmet.model.AvgOperationResultVO">
         SELECT
-            round(AVG( SCORE ),6) AS AVG_CONTACT_MASSES_SCORE
+            round(AVG( SCORE ),6) AS AVG_VALUE,
+            count(1) AS SAMPLE_COUNT
          FROM
             fact_index_cpc_score m
          WHERE
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridSubScoreDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridSubScoreDao.xml
index 056f92afb2..8d39d8dcc3 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridSubScoreDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridSubScoreDao.xml
@@ -24,7 +24,8 @@
         `CREATED_BY`,
         `CREATED_TIME`,
         `UPDATED_BY`,
-        `UPDATED_TIME`
+        `UPDATED_TIME`,
+        `SAMPLE_COUNT`
         )
         VALUES
         <foreach collection="list" item="item" index="index" separator=",">
@@ -47,7 +48,8 @@
             'APP_USER',
             now(),
             'APP_USER',
-            now()
+            now(),
+            #{item.sampleCount}
             )
         </foreach>
     </insert>

From 7d03cd6b4169855cba62254bb7d536b461f65e25 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 24 May 2021 10:40:52 +0800
Subject: [PATCH 060/128] =?UTF-8?q?=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datastats/form/AgencyGovrnFormDTO.java    |  10 ++
 .../dto/datastats/form/GridGovrnFormDTO.java  |  13 ++
 .../result/AgencyGovrnResultDTO.java          |   2 -
 .../controller/DataStatsController.java       |   2 +-
 .../datastats/impl/DataStatsServiceImpl.java  | 121 +++++++++++++++++-
 5 files changed, 142 insertions(+), 6 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/AgencyGovrnFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/AgencyGovrnFormDTO.java
index 1ad7a8149e..82315c125f 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/AgencyGovrnFormDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/AgencyGovrnFormDTO.java
@@ -23,6 +23,16 @@ public class AgencyGovrnFormDTO implements Serializable {
      * 日维度Id
      */
     private String dateId;
+    /**
+     * 排序类型字段
+     * 问题解决总数:problem
+     * 党群自治占比:party
+     * 网格自治占比:grid
+     * 社区解决占比:community
+     * 区直部门解决占比:department
+     * 街道解决占比:street
+     */
+    private String type;
     public interface Agency extends CustomerClientShowGroup {}
 
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/GridGovrnFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/GridGovrnFormDTO.java
index 1c8fe4b861..45eaa572c5 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/GridGovrnFormDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/GridGovrnFormDTO.java
@@ -14,6 +14,11 @@ import java.io.Serializable;
 public class GridGovrnFormDTO implements Serializable {
 
     private static final long serialVersionUID = -3381286960911634231L;
+    /**
+     * 组织Id
+     */
+    @NotBlank(message = "机关Id不能为空",groups = GridGovrnFormDTO.Agency.class)
+    private String agencyId;
     /**
      * 网格Id
      */
@@ -23,6 +28,14 @@ public class GridGovrnFormDTO implements Serializable {
      * 日维度Id
      */
     private String dateId;
+    /**
+     * 排序类型字段
+     * 问题解决总数:problem
+     * 党群自治占比:party
+     * 网格自治占比:grid
+     */
+    private String type;
+    public interface Agency extends CustomerClientShowGroup {}
     public interface Grid extends CustomerClientShowGroup {}
 
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/AgencyGovrnResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/AgencyGovrnResultDTO.java
index 72f331a500..b48a5602d7 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/AgencyGovrnResultDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/AgencyGovrnResultDTO.java
@@ -19,8 +19,6 @@ public class AgencyGovrnResultDTO implements Serializable {
     private String agencyId;
     //组织名称
     private String agencyName;
-    //机关级别（社区级：community， 乡（镇、街道）级:street, 区县级: district, 市级: city 省级:province）
-    private String level;
     //问题解决总数
     private Integer a = 0;
     //党群自治占比
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java
index 0546d0c846..74b2552e43 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java
@@ -196,7 +196,7 @@ public class DataStatsController {
      */
     @PostMapping("subgridgovrnlist")
     public Result<List<GridGovrnResultDTO>> subGridGovrnList(@RequestBody GridGovrnFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO, GridGovrnFormDTO.Grid.class);
+        ValidatorUtils.validateEntity(formDTO, GridGovrnFormDTO.Agency.class);
         return new Result<List<GridGovrnResultDTO>>().ok(dataStatsService.subGridGovrnList(formDTO));
     }
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index 51bf154a84..1691ff528e 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -1017,6 +1017,20 @@ public class DataStatsServiceImpl implements DataStatsService {
      */
     @Override
     public AgencyGovrnResultDTO agencyGovrn(AgencyGovrnFormDTO formDTO) {
+        AgencyGovrnResultDTO resultDTO = new AgencyGovrnResultDTO();
+        resultDTO.setAgencyId(formDTO.getAgencyId());
+        NumberFormat numberFormat = NumberFormat.getInstance();
+        numberFormat.setMaximumFractionDigits(NumConstant.THREE);
+
+        //入参有日期的则按具体时间执行,没有的则按当前时间前一天执行
+        if (StringUtils.isBlank(formDTO.getDateId())) {
+            Date yesterday = DateUtils.addDateDays(new Date(), -1);
+            SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD);
+            formDTO.setDateId(format.format(yesterday));
+        }
+        //1.按日期查询当前组织事件治理指数
+
+
         return null;
     }
 
@@ -1027,7 +1041,53 @@ public class DataStatsServiceImpl implements DataStatsService {
      */
     @Override
     public List<AgencyGovrnResultDTO> subAgencyGovrnList(AgencyGovrnFormDTO formDTO) {
-        return null;
+        List<AgencyGovrnResultDTO> resultList = new ArrayList<>();
+        NumberFormat numberFormat = NumberFormat.getInstance();
+        numberFormat.setMaximumFractionDigits(NumConstant.THREE);
+
+        //入参有日期的则按具体时间执行,没有的则按当前时间前一天执行
+        if (StringUtils.isBlank(formDTO.getDateId())) {
+            Date yesterday = DateUtils.addDateDays(new Date(), -1);
+            SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD);
+            formDTO.setDateId(format.format(yesterday));
+        }
+        //排序类型，默认按问题解决总数降序
+        if (StringUtils.isBlank(formDTO.getDateId())) {
+            formDTO.setType("problem");
+        }
+
+        //1.查询当前组织的直属下级组织信息【机关维度】
+        List<DimAgencyEntity> subAgencyList = dataStatsDao.getSubAgencyList(formDTO.getAgencyId());
+        if (subAgencyList.size() < NumConstant.ONE) {
+            return resultList;
+        }
+        List<String> agencyIds = subAgencyList.stream().map(DimAgencyEntity::getId).collect(Collectors.toList());
+
+        //2.按日期查询所有下级组织的事件治理指数
+
+        //3.封装数据
+
+        //4.按要求排序并返回
+        Collections.sort(resultList, new Comparator<AgencyGovrnResultDTO>() {
+            @Override
+            public int compare(AgencyGovrnResultDTO o1, AgencyGovrnResultDTO o2) {
+                if ("party".equals(formDTO.getType())) {
+                    return o2.getB().compareTo(o1.getB());
+                } else if ("grid".equals(formDTO.getType())) {
+                    return o2.getC().compareTo(o1.getC());
+                } else if ("community".equals(formDTO.getType())) {
+                    return o2.getD().compareTo(o1.getD());
+                } else if ("department".equals(formDTO.getType())) {
+                    return o2.getE().compareTo(o1.getE());
+                } else if ("street".equals(formDTO.getType())) {
+                    return o2.getF().compareTo(o1.getF());
+                } else {
+                    return o2.getA().compareTo(o1.getA());
+                }
+            }
+        });
+
+        return resultList;
     }
 
     /**
@@ -1037,7 +1097,22 @@ public class DataStatsServiceImpl implements DataStatsService {
      */
     @Override
     public GridGovrnResultDTO gridGovrn(GridGovrnFormDTO formDTO) {
-        return null;
+        GridGovrnResultDTO resultDTO = new GridGovrnResultDTO();
+        resultDTO.setGridId(formDTO.getGridId());
+        NumberFormat numberFormat = NumberFormat.getInstance();
+        numberFormat.setMaximumFractionDigits(NumConstant.THREE);
+
+        //入参有日期的则按具体时间执行,没有的则按当前时间前一天执行
+        if (StringUtils.isBlank(formDTO.getDateId())) {
+            Date yesterday = DateUtils.addDateDays(new Date(), -1);
+            SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD);
+            formDTO.setDateId(format.format(yesterday));
+        }
+
+        //1.按日子查询网格事件治理指数
+
+
+        return resultDTO;
     }
 
     /**
@@ -1047,7 +1122,47 @@ public class DataStatsServiceImpl implements DataStatsService {
      */
     @Override
     public List<GridGovrnResultDTO> subGridGovrnList(GridGovrnFormDTO formDTO) {
-        return null;
+        List<GridGovrnResultDTO> resultList = new ArrayList<>();
+        NumberFormat numberFormat = NumberFormat.getInstance();
+        numberFormat.setMaximumFractionDigits(NumConstant.THREE);
+
+        //入参有日期的则按具体时间执行,没有的则按当前时间前一天执行
+        if (StringUtils.isBlank(formDTO.getDateId())) {
+            Date yesterday = DateUtils.addDateDays(new Date(), -1);
+            SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD);
+            formDTO.setDateId(format.format(yesterday));
+        }
+        //排序类型，默认按问题解决总数降序
+        if (StringUtils.isBlank(formDTO.getDateId())) {
+            formDTO.setType("problem");
+        }
+
+        //1.查询组织直属网格列表【网格维度】
+        List<DimGridEntity> gridList = dataStatsDao.getSubGridList(formDTO.getAgencyId());
+        if (gridList.size() < NumConstant.ONE) {
+            return resultList;
+        }
+        List<String> gridIds = gridList.stream().map(DimGridEntity::getId).collect(Collectors.toList());
+
+        //2.按日期查找组织直属网格事件治理指数列表
+
+        //3.封装数据
+
+        //4.按要求排序并返回
+        Collections.sort(resultList, new Comparator<GridGovrnResultDTO>() {
+            @Override
+            public int compare(GridGovrnResultDTO o1, GridGovrnResultDTO o2) {
+                if ("party".equals(formDTO.getType())) {
+                    return o2.getB().compareTo(o1.getB());
+                } else if ("grid".equals(formDTO.getType())) {
+                    return o2.getC().compareTo(o1.getC());
+                } else {
+                    return o2.getA().compareTo(o1.getA());
+                }
+            }
+        });
+
+        return resultList;
     }
 
 }

From 78ad16e7e62873fcdd43fb79fd7cd7ffa0e98aa0 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 24 May 2021 14:33:21 +0800
Subject: [PATCH 061/128] =?UTF-8?q?=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application.yml        |   2 +-
 .../extract/FactGridGovernDailyDao.java       |  33 +++++
 .../extract/FactGridGovernDailyEntity.java    | 135 ++++++++++++++++++
 .../todata/FactGridGovernDailyService.java    |  32 +++++
 .../impl/FactGridGovernDailyServiceImpl.java  |  35 +++++
 .../extract/FactGridGovernDailyDao.xml        |   7 +
 6 files changed, 243 insertions(+), 1 deletion(-)
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactGridGovernDailyDao.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactGridGovernDailyEntity.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactGridGovernDailyService.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactGridGovernDailyDao.xml

diff --git a/epmet-cloud-generator/src/main/resources/application.yml b/epmet-cloud-generator/src/main/resources/application.yml
index 5a36af7c15..76cfc7865d 100644
--- a/epmet-cloud-generator/src/main/resources/application.yml
+++ b/epmet-cloud-generator/src/main/resources/application.yml
@@ -9,7 +9,7 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     #MySQL配置
     driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://192.168.1.130:3306/epmet_third?useUnicode=true&characterEncoding=UTF-8&useSSL=false
+    url: jdbc:mysql://192.168.1.130:3306/epmet_data_statistical?useUnicode=true&characterEncoding=UTF-8&useSSL=false
     username: epmet_dba
     password: EpmEt-dbA-UsEr
     #oracle配置
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactGridGovernDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactGridGovernDailyDao.java
new file mode 100644
index 0000000000..5d35359bc7
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactGridGovernDailyDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.evaluationindex.extract;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.evaluationindex.extract.FactGridGovernDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 网格的治理指数，按天统计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-24
+ */
+@Mapper
+public interface FactGridGovernDailyDao extends BaseDao<FactGridGovernDailyEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactGridGovernDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactGridGovernDailyEntity.java
new file mode 100644
index 0000000000..0fcff9c663
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactGridGovernDailyEntity.java
@@ -0,0 +1,135 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.evaluationindex.extract;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+
+/**
+ * 网格的治理指数，按天统计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-24
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("fact_grid_govern_daily")
+public class FactGridGovernDailyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 数据更新至：yyyyMMdd; 
+     */
+	private String dateId;
+
+    /**
+     * 网格id
+     */
+	private String gridId;
+
+    /**
+     * 网格所属的组织id
+     */
+	private String pid;
+
+    /**
+     * 网格所有上级id
+     */
+	private String pids;
+
+    /**
+     * 界面展示：问题解决总数=1+2+3+4+5+6+7+8
+     */
+	private Integer problemResolvedCount;
+
+    /**
+     * 界面展示：党群自治占比=（9+10）/PROBLEM_RESOLVED_COUNT; 此列存储的是小数
+     */
+	private BigDecimal groupSelfGovernRatio;
+
+    /**
+     * 界面展示：网格自治占比=GRID_SELF_GOVERN_PROJECT_TOTAL/PROBLEM_RESOLVED_COUNT；此列存储的是小数
+     */
+	private BigDecimal gridSelfGovernRatio;
+
+    /**
+     * 1、当前网格内，话题关闭已解决数
+     */
+	private Integer topicResolvedCount;
+
+    /**
+     * 2、当前网格内，话题关闭无需解决数
+     */
+	private Integer topicUnResolvedCount;
+
+    /**
+     * 3、当前网格内，议题关闭已解决数
+     */
+	private Integer issueResolvedCount;
+
+    /**
+     * 4、当前网格内，议题关闭无需解决数
+     */
+	private Integer issueUnResolvedCount;
+
+    /**
+     * 5、当前网格内：来源于议题的项目：结案已解决数
+     */
+	private Integer issueProjectResolvedCount;
+
+    /**
+     * 6、当前网格内：来源于议题的项目：结案无需解决数
+     */
+	private Integer issueProjectUnResolvedCount;
+
+    /**
+     * 7、当前网格内：项目立项，结案已解决数；默认为0，
+     */
+	private Integer approvalProjectResolvedCount;
+
+    /**
+     * 8、当前网格内：项目立项，结案无需解决数；默认为0，
+     */
+	private Integer approvalProjectUnResolvedCount;
+
+    /**
+     * 9、当前网格内，未出小组即未转议题的：话题关闭已解决数
+     */
+	private Integer inGroupTopicResolvedCount;
+
+    /**
+     * 10、当前网格内，未出小组即未转议题的：话题关闭无需解决数
+     */
+	private Integer inGroupTopicUnResolvedCount;
+
+    /**
+     * 未出当前网格的，结案项目数
+     */
+	private Integer gridSelfGovernProjectTotal;
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactGridGovernDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactGridGovernDailyService.java
new file mode 100644
index 0000000000..d5ffd39cd4
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactGridGovernDailyService.java
@@ -0,0 +1,32 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.evaluationindex.extract.todata;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.entity.evaluationindex.extract.FactGridGovernDailyEntity;
+
+/**
+ * 网格的治理指数，按天统计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-24
+ */
+public interface FactGridGovernDailyService extends BaseService<FactGridGovernDailyEntity> {
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java
new file mode 100644
index 0000000000..99e73d3603
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java
@@ -0,0 +1,35 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.evaluationindex.extract.todata.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.dao.evaluationindex.extract.FactGridGovernDailyDao;
+import com.epmet.entity.evaluationindex.extract.FactGridGovernDailyEntity;
+import com.epmet.service.evaluationindex.extract.todata.FactGridGovernDailyService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 网格的治理指数，按天统计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-24
+ */
+@Service
+public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGovernDailyDao, FactGridGovernDailyEntity> implements FactGridGovernDailyService {
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactGridGovernDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactGridGovernDailyDao.xml
new file mode 100644
index 0000000000..6fa56797fa
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactGridGovernDailyDao.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.evaluationindex.extract.FactGridGovernDailyDao">
+
+
+</mapper>
\ No newline at end of file

From b474a2ce84610b6261653571eae5f46eed31bdfe Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 24 May 2021 15:24:18 +0800
Subject: [PATCH 062/128] =?UTF-8?q?=E7=BB=84=E7=BB=87=E3=80=81=E7=BD=91?=
 =?UTF-8?q?=E6=A0=BC=E4=BA=8B=E4=BB=B6=E6=B2=BB=E7=90=86=E6=8C=87=E6=95=B0?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=A6=96=E7=89=88=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datastats/form/AgencyGovrnFormDTO.java    |  2 +-
 .../result/AgencyGovrnResultDTO.java          | 16 +++--
 .../datastats/result/GridGovrnResultDTO.java  |  8 +--
 .../dataaggre/dao/datastats/DataStatsDao.java | 14 ++++
 .../datastats/impl/DataStatsServiceImpl.java  | 70 +++++++++++++++----
 .../mapper/datastats/DatsStatsDao.xml         | 39 +++++++++++
 6 files changed, 122 insertions(+), 27 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/AgencyGovrnFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/AgencyGovrnFormDTO.java
index 82315c125f..ad33559d5b 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/AgencyGovrnFormDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/AgencyGovrnFormDTO.java
@@ -29,7 +29,7 @@ public class AgencyGovrnFormDTO implements Serializable {
      * 党群自治占比:party
      * 网格自治占比:grid
      * 社区解决占比:community
-     * 区直部门解决占比:department
+     * 区直部门解决占比:dept
      * 街道解决占比:street
      */
     private String type;
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/AgencyGovrnResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/AgencyGovrnResultDTO.java
index b48a5602d7..b15017ea33 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/AgencyGovrnResultDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/AgencyGovrnResultDTO.java
@@ -18,18 +18,20 @@ public class AgencyGovrnResultDTO implements Serializable {
     //组织Id
     private String agencyId;
     //组织名称
-    private String agencyName;
+    private String agencyName = "";
+    //agency_id所属的机关级别（社区级：community,乡（镇、街道）级:street, 区县级: district, 市级: city, 省级:province）
+    private String level = "";
     //问题解决总数
-    private Integer a = 0;
+    private Integer problemResolvedCount = 0;
     //党群自治占比
-    private BigDecimal b = bi;
+    private BigDecimal groupSelfGovernRatio = bi;
     //网格自治占比
-    private BigDecimal c = bi;
+    private BigDecimal gridSelfGovernRatio = bi;
     //社区解决占比
-    private BigDecimal d = bi;
+    private BigDecimal communityResolvedRatio = bi;
     //区直部门解决占比
-    private BigDecimal e = bi;
+    private BigDecimal districtDeptResolvedRatio = bi;
     //街道解决占比
-    private BigDecimal f = bi;
+    private BigDecimal streetResolvedRatio = bi;
 
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/GridGovrnResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/GridGovrnResultDTO.java
index 0aa7f5852e..9b16f7b014 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/GridGovrnResultDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/GridGovrnResultDTO.java
@@ -18,12 +18,12 @@ public class GridGovrnResultDTO implements Serializable {
     //网格Id
     private String gridId;
     //网格名称
-    private String gridName;
+    private String gridName = "";
     //问题解决总数
-    private Integer a = 0;
+    private Integer problemResolvedCount = 0;
     //党群自治占比
-    private BigDecimal b = bi;
+    private BigDecimal groupSelfGovernRatio = bi;
     //网格自治占比
-    private BigDecimal c = bi;
+    private BigDecimal gridSelfGovernRatio = bi;
 
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
index 02d6e72a76..b49b16fc0c 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
@@ -228,4 +228,18 @@ public interface DataStatsDao {
                                                          @Param("actCategoryDictDTOList") List<ActCategoryDictDTO> actCategoryDictDTOList);
 
     DimAgencyEntity getAgencyInfo(@Param("agencyId") String agencyId);
+
+    /**
+     * @Param formDTO
+     * @Description 根据组织Id查询事件治理指数
+     * @author sun
+     */
+    List<AgencyGovrnResultDTO> getAgencyGovern(@Param("agencyIds") List<String> agencyIds, @Param("dateId") String dateId);
+
+    /**
+     * @Param formDTO
+     * @Description 根据网格Id查询事件治理指数
+     * @author sun
+     */
+    List<GridGovrnResultDTO> getGridGovern(@Param("gridIds") List<String> gridIds, @Param("dateId") String dateId);
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index 1691ff528e..3a0512349a 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -1029,9 +1029,13 @@ public class DataStatsServiceImpl implements DataStatsService {
             formDTO.setDateId(format.format(yesterday));
         }
         //1.按日期查询当前组织事件治理指数
-
-
-        return null;
+        List<String> agencyIds = new ArrayList<>();
+        agencyIds.add(formDTO.getAgencyId());
+        List<AgencyGovrnResultDTO> list = dataStatsDao.getAgencyGovern(agencyIds, formDTO.getDateId());
+        if (list.size() > NumConstant.ZERO) {
+            resultDTO = list.get(NumConstant.ZERO);
+        }
+        return resultDTO;
     }
 
     /**
@@ -1064,25 +1068,43 @@ public class DataStatsServiceImpl implements DataStatsService {
         List<String> agencyIds = subAgencyList.stream().map(DimAgencyEntity::getId).collect(Collectors.toList());
 
         //2.按日期查询所有下级组织的事件治理指数
+        List<AgencyGovrnResultDTO> list = dataStatsDao.getAgencyGovern(agencyIds, formDTO.getDateId());
 
         //3.封装数据
+        for (DimAgencyEntity sub : subAgencyList) {
+            AgencyGovrnResultDTO dto = new AgencyGovrnResultDTO();
+            dto.setAgencyId(sub.getId());
+            dto.setAgencyName(sub.getAgencyName());
+            dto.setLevel(sub.getLevel());
+            for (AgencyGovrnResultDTO re : list) {
+                if (sub.getId().equals(re.getAgencyId())) {
+                    dto.setProblemResolvedCount(re.getProblemResolvedCount());
+                    dto.setGroupSelfGovernRatio(re.getGroupSelfGovernRatio());
+                    dto.setGridSelfGovernRatio(re.getGridSelfGovernRatio());
+                    dto.setCommunityResolvedRatio(re.getCommunityResolvedRatio());
+                    dto.setStreetResolvedRatio(re.getStreetResolvedRatio());
+                    dto.setDistrictDeptResolvedRatio(re.getDistrictDeptResolvedRatio());
+                }
+            }
+            resultList.add(dto);
+        }
 
         //4.按要求排序并返回
         Collections.sort(resultList, new Comparator<AgencyGovrnResultDTO>() {
             @Override
             public int compare(AgencyGovrnResultDTO o1, AgencyGovrnResultDTO o2) {
                 if ("party".equals(formDTO.getType())) {
-                    return o2.getB().compareTo(o1.getB());
+                    return o2.getGroupSelfGovernRatio().compareTo(o1.getGroupSelfGovernRatio());
                 } else if ("grid".equals(formDTO.getType())) {
-                    return o2.getC().compareTo(o1.getC());
+                    return o2.getGridSelfGovernRatio().compareTo(o1.getGridSelfGovernRatio());
                 } else if ("community".equals(formDTO.getType())) {
-                    return o2.getD().compareTo(o1.getD());
+                    return o2.getCommunityResolvedRatio().compareTo(o1.getCommunityResolvedRatio());
                 } else if ("department".equals(formDTO.getType())) {
-                    return o2.getE().compareTo(o1.getE());
+                    return o2.getDistrictDeptResolvedRatio().compareTo(o1.getDistrictDeptResolvedRatio());
                 } else if ("street".equals(formDTO.getType())) {
-                    return o2.getF().compareTo(o1.getF());
+                    return o2.getStreetResolvedRatio().compareTo(o1.getStreetResolvedRatio());
                 } else {
-                    return o2.getA().compareTo(o1.getA());
+                    return o2.getProblemResolvedCount().compareTo(o1.getProblemResolvedCount());
                 }
             }
         });
@@ -1109,9 +1131,13 @@ public class DataStatsServiceImpl implements DataStatsService {
             formDTO.setDateId(format.format(yesterday));
         }
 
-        //1.按日子查询网格事件治理指数
-
-
+        //1.按日期查询网格事件治理指数
+        List<String> gridIds = new ArrayList<>();
+        gridIds.add(formDTO.getGridId());
+        List<GridGovrnResultDTO> list = dataStatsDao.getGridGovern(gridIds, formDTO.getDateId());
+        if (list.size() > NumConstant.ZERO) {
+            resultDTO = list.get(NumConstant.ZERO);
+        }
         return resultDTO;
     }
 
@@ -1145,19 +1171,33 @@ public class DataStatsServiceImpl implements DataStatsService {
         List<String> gridIds = gridList.stream().map(DimGridEntity::getId).collect(Collectors.toList());
 
         //2.按日期查找组织直属网格事件治理指数列表
+        List<GridGovrnResultDTO> list = dataStatsDao.getGridGovern(gridIds, formDTO.getDateId());
 
         //3.封装数据
+        for (DimGridEntity gr : gridList) {
+            GridGovrnResultDTO dto = new GridGovrnResultDTO();
+            dto.setGridId(gr.getId());
+            dto.setGridName(gr.getGridName());
+            for (GridGovrnResultDTO re : list) {
+                if (gr.getId().equals(re.getGridId())) {
+                    dto.setProblemResolvedCount(re.getProblemResolvedCount());
+                    dto.setGroupSelfGovernRatio(re.getGroupSelfGovernRatio());
+                    dto.setGridSelfGovernRatio(re.getGridSelfGovernRatio());
+                }
+            }
+            resultList.add(dto);
+        }
 
         //4.按要求排序并返回
         Collections.sort(resultList, new Comparator<GridGovrnResultDTO>() {
             @Override
             public int compare(GridGovrnResultDTO o1, GridGovrnResultDTO o2) {
                 if ("party".equals(formDTO.getType())) {
-                    return o2.getB().compareTo(o1.getB());
+                    return o2.getGroupSelfGovernRatio().compareTo(o1.getGroupSelfGovernRatio());
                 } else if ("grid".equals(formDTO.getType())) {
-                    return o2.getC().compareTo(o1.getC());
+                    return o2.getGridSelfGovernRatio().compareTo(o1.getGridSelfGovernRatio());
                 } else {
-                    return o2.getA().compareTo(o1.getA());
+                    return o2.getProblemResolvedCount().compareTo(o1.getProblemResolvedCount());
                 }
             }
         });
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
index 1f1663bd49..7097ca36c5 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
@@ -612,4 +612,43 @@
         WHERE
             ID = #{agencyId}
     </select>
+
+    <select id="getAgencyGovern" resultType="com.epmet.dataaggre.dto.datastats.result.AgencyGovrnResultDTO">
+        SELECT
+            agency_id AS agencyId,
+            `level` AS level,
+            problem_resolved_count AS problemResolvedCount,
+            ROUND(group_self_govern_ratio, 3) AS groupSelfGovernRatio,
+            ROUND(grid_self_govern_ratio, 3) AS gridSelfGovernRatio,
+            ROUND(community_closed_ratio, 3) AS communityResolvedRatio,
+            ROUND(street_closed_ratio, 3) AS streetResolvedRatio,
+            ROUND(district_dept_closed_ratio, 3) AS districtDeptResolvedRatio
+        FROM
+            fact_agency_govern_daily
+        WHERE
+            del_flag = '0'
+        AND date_id = #{dateId}
+        <foreach item="agencyId" collection="agencyIds" open="AND (" separator="or" close=")" index="">
+            agency_id = #{agencyId}
+        </foreach>
+        ORDER BY problem_resolved_count DESC
+    </select>
+
+    <select id="getGridGovern" resultType="com.epmet.dataaggre.dto.datastats.result.GridGovrnResultDTO">
+        SELECT
+            grid_id AS gridId,
+            problem_resolved_count AS problemResolvedCount,
+            ROUND(group_self_govern_ratio, 3) AS groupSelfGovernRatio,
+            ROUND(grid_self_govern_ratio, 3) AS gridSelfGovernRatio
+        FROM
+            fact_grid_govern_daily
+        WHERE
+            del_flag = '0'
+        AND date_id = #{dateId}
+        <foreach item="gridId" collection="gridIds" open="AND (" separator="or" close=")" index="">
+            grid_id = #{gridId}
+        </foreach>
+        ORDER BY problem_resolved_count DESC
+    </select>
+
 </mapper>
\ No newline at end of file

From eba81f662423c499fb9918f3840305f99a77c804 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 24 May 2021 15:56:13 +0800
Subject: [PATCH 063/128] =?UTF-8?q?=E6=BC=8F=E6=B4=9E=E4=BF=AE=E5=A4=8D=20?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datastats/impl/DataStatsServiceImpl.java  | 234 ++++++++++--------
 1 file changed, 136 insertions(+), 98 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index 3a0512349a..59bca42a8a 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -263,18 +263,24 @@ public class DataStatsServiceImpl implements DataStatsService {
         List<String> agencyIds = subAgencyList.stream().map(DimAgencyEntity::getId).collect(Collectors.toList());
 
         //2.查询直属下级组织注册用户日统计数据，默认按用户总数降序
-        resultList = dataStatsDao.getSubAgencyUser(agencyIds, formDTO.getDateId());
+        List<SubAgencyUserResultDTO> list = dataStatsDao.getSubAgencyUser(agencyIds, formDTO.getDateId());
 
         //3.封装数据
-        resultList.forEach(re -> {
-            re.setPartyMemberRatio(re.getPartyMemberTotal() == 0 || re.getUserTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getPartyMemberTotal() / (float) re.getUserTotal())));
-            re.setResiRatio(re.getResiTotal() == 0 || re.getUserTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getResiTotal() / (float) re.getUserTotal())));
-            subAgencyList.forEach(sub -> {
-                if (re.getAgencyId().equals(sub.getId())) {
-                    re.setAgencyName(sub.getAgencyName());
+        for (DimAgencyEntity sub : subAgencyList) {
+            SubAgencyUserResultDTO dto = new SubAgencyUserResultDTO();
+            dto.setAgencyId(sub.getId());
+            dto.setAgencyName(sub.getAgencyName());
+            for (SubAgencyUserResultDTO u : list) {
+                if (sub.getId().equals(u.getAgencyId())) {
+                    dto.setUserTotal(u.getUserTotal());
+                    dto.setPartyMemberTotal(u.getPartyMemberTotal());
+                    dto.setResiTotal(u.getResiTotal());
                 }
-            });
-        });
+            }
+            dto.setPartyMemberRatio(dto.getPartyMemberTotal() == 0 || dto.getUserTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) dto.getPartyMemberTotal() / (float) dto.getUserTotal())));
+            dto.setResiRatio(dto.getResiTotal() == 0 || dto.getUserTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) dto.getResiTotal() / (float) dto.getUserTotal())));
+            resultList.add(dto);
+        }
 
         //4.按要求排序并返回
         Collections.sort(resultList, new Comparator<SubAgencyUserResultDTO>() {
@@ -326,18 +332,24 @@ public class DataStatsServiceImpl implements DataStatsService {
         List<String> gridIds = gridList.stream().map(DimGridEntity::getId).collect(Collectors.toList());
 
         //2.查询网格层级注册用户日统计数据，默认按用户总数降序
-        resultList = dataStatsDao.getSubGridUser(gridIds, formDTO.getDateId());
+        List<SubGridUserResultDTO> list = dataStatsDao.getSubGridUser(gridIds, formDTO.getDateId());
 
         //3.封装数据
-        resultList.forEach(re -> {
-            re.setPartyMemberRatio(re.getPartyMemberTotal() == 0 || re.getUserTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getPartyMemberTotal() / (float) re.getUserTotal())));
-            re.setResiRatio(re.getResiTotal() == 0 || re.getUserTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getResiTotal() / (float) re.getUserTotal())));
-            gridList.forEach(sub -> {
-                if (re.getGridId().equals(sub.getId())) {
-                    re.setGridName(sub.getGridName());
+        for (DimGridEntity gr : gridList) {
+            SubGridUserResultDTO dto = new SubGridUserResultDTO();
+            dto.setGridId(gr.getId());
+            dto.setGridName(gr.getGridName());
+            for (SubGridUserResultDTO re : list) {
+                if (gr.getId().equals(re.getGridId())) {
+                    dto.setUserTotal(re.getUserTotal());
+                    dto.setPartyMemberTotal(re.getPartyMemberTotal());
+                    dto.setResiTotal(re.getResiTotal());
                 }
-            });
-        });
+            }
+            dto.setPartyMemberRatio(dto.getPartyMemberTotal() == 0 || dto.getUserTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) dto.getPartyMemberTotal() / (float) dto.getUserTotal())));
+            dto.setResiRatio(dto.getResiTotal() == 0 || dto.getUserTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) dto.getResiTotal() / (float) dto.getUserTotal())));
+            resultList.add(dto);
+        }
 
         //4.按要求排序并返回
         Collections.sort(resultList, new Comparator<SubGridUserResultDTO>() {
@@ -387,18 +399,24 @@ public class DataStatsServiceImpl implements DataStatsService {
         List<String> agencyIds = subAgencyList.stream().map(DimAgencyEntity::getId).collect(Collectors.toList());
 
         //2.查询直属下级组织小组日统计数据，默认按群组总数降序
-        resultList = dataStatsDao.getSubAgencyGroup(agencyIds, formDTO.getDateId());
+        List<SubAgencyGroupResultDTO> list = dataStatsDao.getSubAgencyGroup(agencyIds, formDTO.getDateId());
 
         //3.封装数据
-        resultList.forEach(re -> {
-            re.setOrdinaryRatio(re.getOrdinaryTotal() == 0 || re.getGroupTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getOrdinaryTotal() / (float) re.getGroupTotal())));
-            re.setBranchRatio(re.getBranchTotal() == 0 || re.getGroupTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getBranchTotal() / (float) re.getGroupTotal())));
-            subAgencyList.forEach(sub -> {
-                if (re.getAgencyId().equals(sub.getId())) {
-                    re.setAgencyName(sub.getAgencyName());
+        for (DimAgencyEntity sub : subAgencyList) {
+            SubAgencyGroupResultDTO dto = new SubAgencyGroupResultDTO();
+            dto.setAgencyId(sub.getId());
+            dto.setAgencyName(sub.getAgencyName());
+            for (SubAgencyGroupResultDTO u : list) {
+                if (sub.getId().equals(u.getAgencyId())) {
+                    dto.setGroupTotal(u.getGroupTotal());
+                    dto.setOrdinaryTotal(u.getOrdinaryTotal());
+                    dto.setBranchTotal(u.getBranchTotal());
                 }
-            });
-        });
+            }
+            dto.setOrdinaryRatio(dto.getOrdinaryTotal() == 0 || dto.getGroupTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) dto.getOrdinaryTotal() / (float) dto.getGroupTotal())));
+            dto.setBranchRatio(dto.getBranchTotal() == 0 || dto.getGroupTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) dto.getBranchTotal() / (float) dto.getGroupTotal())));
+            resultList.add(dto);
+        }
 
         //4.按要求排序并返回
         Collections.sort(resultList, new Comparator<SubAgencyGroupResultDTO>() {
@@ -447,18 +465,24 @@ public class DataStatsServiceImpl implements DataStatsService {
         List<String> gridIds = gridList.stream().map(DimGridEntity::getId).collect(Collectors.toList());
 
         //2.查询网格层级小组日统计数据，默认按群组总数降序
-        resultList = dataStatsDao.getSubGridGroup(gridIds, formDTO.getDateId());
+        List<SubGridGroupResultDTO> list = dataStatsDao.getSubGridGroup(gridIds, formDTO.getDateId());
 
         //3.封装数据并返回
-        resultList.forEach(re -> {
-            re.setOrdinaryRatio(re.getOrdinaryTotal() == 0 || re.getGroupTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getOrdinaryTotal() / (float) re.getGroupTotal())));
-            re.setBranchRatio(re.getBranchTotal() == 0 || re.getGroupTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getBranchTotal() / (float) re.getGroupTotal())));
-            gridList.forEach(sub -> {
-                if (re.getGridId().equals(sub.getId())) {
-                    re.setGridName(sub.getGridName());
+        for (DimGridEntity gr : gridList) {
+            SubGridGroupResultDTO dto = new SubGridGroupResultDTO();
+            dto.setGridId(gr.getId());
+            dto.setGridName(gr.getGridName());
+            for (SubGridGroupResultDTO re : list) {
+                if (gr.getId().equals(re.getGridId())) {
+                    dto.setGroupTotal(re.getGroupTotal());
+                    dto.setOrdinaryTotal(re.getOrdinaryTotal());
+                    dto.setBranchTotal(re.getBranchTotal());
                 }
-            });
-        });
+            }
+            dto.setOrdinaryRatio(dto.getOrdinaryTotal() == 0 || dto.getGroupTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) dto.getOrdinaryTotal() / (float) dto.getGroupTotal())));
+            dto.setBranchRatio(dto.getBranchTotal() == 0 || dto.getGroupTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) dto.getBranchTotal() / (float) dto.getGroupTotal())));
+            resultList.add(dto);
+        }
 
         //4.按要求排序并返回
         Collections.sort(resultList, new Comparator<SubGridGroupResultDTO>() {
@@ -514,15 +538,14 @@ public class DataStatsServiceImpl implements DataStatsService {
         List<SubAgencyFormDTO.Topic> topicShiftIssue = dataStatsDao.getSubAgencyTopicShiftIssue(agencyIds, formDTO.getDateId());
         //查询直属下级组织热议中话题-机关日统计数据
         List<SubAgencyFormDTO.Topic> hotdiscuss = dataStatsDao.getSubAgencyTopicHotDiscuss(agencyIds, formDTO.getDateId());
-        agencyIds.forEach(agencyId -> {
+        subAgencyList.forEach(sub -> {
             SubAgencyTopicResultDTO resultDTO = new SubAgencyTopicResultDTO();
             AtomicInteger topicTotal = new AtomicInteger(0);
             AtomicInteger closedTotal = new AtomicInteger(0);
             AtomicInteger shiftIssueTotal = new AtomicInteger(0);
             AtomicInteger hotdiscussTotal = new AtomicInteger(0);
-            AtomicReference<String> agencyName = new AtomicReference<>("");
             topic.forEach(t -> {
-                if (t.getAgencyId().equals(agencyId)) {
+                if (t.getAgencyId().equals(sub.getId())) {
                     topicTotal.addAndGet(t.getTopicCount());
                     if (t.getTopicStatus().equals("closed")) {
                         closedTotal.set(t.getTopicCount());
@@ -530,23 +553,18 @@ public class DataStatsServiceImpl implements DataStatsService {
                 }
             });
             topicShiftIssue.forEach(t -> {
-                if (t.getAgencyId().equals(agencyId)) {
+                if (t.getAgencyId().equals(sub.getId())) {
                     shiftIssueTotal.addAndGet(t.getShiftedIssueTotal());
                 }
             });
             hotdiscuss.forEach(t -> {
-                if (t.getAgencyId().equals(agencyId)) {
+                if (t.getAgencyId().equals(sub.getId())) {
                     hotdiscussTotal.addAndGet(t.getTopicCount());
                 }
             });
-            subAgencyList.forEach(sub -> {
-                if (agencyId.equals(sub.getId())) {
-                    agencyName.set(sub.getAgencyName());
-                }
-            });
 
-            resultDTO.setAgencyId(agencyId);
-            resultDTO.setAgencyName(agencyName.get());
+            resultDTO.setAgencyId(sub.getId());
+            resultDTO.setAgencyName(sub.getAgencyName());
             resultDTO.setTopicTotal(topicTotal.get());
             resultDTO.setDiscussingTotal(hotdiscussTotal.get());
             resultDTO.setDiscussingRatio(resultDTO.getDiscussingTotal() == 0 || resultDTO.getTopicTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getDiscussingTotal() / (float) resultDTO.getTopicTotal())));
@@ -614,15 +632,14 @@ public class DataStatsServiceImpl implements DataStatsService {
         List<SubGridFormDTO.Topic> topicShiftIssue = dataStatsDao.getSubGridTopicShiftIssue(gridIds, formDTO.getDateId());
         //查询网格层级热议中话题-日统计数据
         List<SubGridFormDTO.Topic> hotdiscuss = dataStatsDao.getSubGridTopicHotDiscuss(gridIds, formDTO.getDateId());
-        gridIds.forEach(gridId -> {
+        gridList.forEach(gr -> {
             SubGridTopicResultDTO resultDTO = new SubGridTopicResultDTO();
             AtomicInteger topicTotal = new AtomicInteger(0);
             AtomicInteger closedTotal = new AtomicInteger(0);
             AtomicInteger shiftIssueTotal = new AtomicInteger(0);
             AtomicInteger hotdiscussTotal = new AtomicInteger(0);
-            AtomicReference<String> gridName = new AtomicReference<>("");
             topic.forEach(t -> {
-                if (t.getGridId().equals(gridId)) {
+                if (t.getGridId().equals(gr.getId())) {
                     topicTotal.addAndGet(t.getTopicCount());
                     if (t.getTopicStatus().equals("closed")) {
                         closedTotal.set(t.getTopicCount());
@@ -630,23 +647,18 @@ public class DataStatsServiceImpl implements DataStatsService {
                 }
             });
             topicShiftIssue.forEach(t -> {
-                if (t.getGridId().equals(gridId)) {
+                if (t.getGridId().equals(gr.getId())) {
                     shiftIssueTotal.addAndGet(t.getShiftedIssueTotal());
                 }
             });
             hotdiscuss.forEach(t -> {
-                if (t.getGridId().equals(gridId)) {
+                if (t.getGridId().equals(gr.getId())) {
                     hotdiscussTotal.addAndGet(t.getTopicCount());
                 }
             });
-            gridList.forEach(sub -> {
-                if (gridId.equals(sub.getId())) {
-                    gridName.set(sub.getGridName());
-                }
-            });
 
-            resultDTO.setGridId(gridId);
-            resultDTO.setGridName(gridName.get());
+            resultDTO.setGridId(gr.getId());
+            resultDTO.setGridName(gr.getGridName());
             resultDTO.setTopicTotal(topicTotal.get());
             resultDTO.setDiscussingTotal(hotdiscussTotal.get());
             resultDTO.setDiscussingRatio(resultDTO.getDiscussingTotal() == 0 || resultDTO.getTopicTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getDiscussingTotal() / (float) resultDTO.getTopicTotal())));
@@ -707,19 +719,26 @@ public class DataStatsServiceImpl implements DataStatsService {
         List<String> agencyIds = subAgencyList.stream().map(DimAgencyEntity::getId).collect(Collectors.toList());
 
         //2.查询直属下级组织议题日统计数据，默认按议题总数降序
-        resultList = dataStatsDao.getSubAgencyIssue(agencyIds, formDTO.getDateId());
+        List<SubAgencyIssueResultDTO> list = dataStatsDao.getSubAgencyIssue(agencyIds, formDTO.getDateId());
 
         //3.封装数据
-        resultList.forEach(re -> {
-            re.setVotingRatio(re.getVotingTotal() == 0 || re.getIssueTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getVotingTotal() / (float) re.getIssueTotal())));
-            re.setClosedIssueRatio(re.getClosedIssueTotal() == 0 || re.getIssueTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getClosedIssueTotal() / (float) re.getIssueTotal())));
-            re.setShiftProjectRatio(re.getShiftProjectTotal() == 0 || re.getIssueTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getShiftProjectTotal() / (float) re.getIssueTotal())));
-            subAgencyList.forEach(sub -> {
-                if (re.getAgencyId().equals(sub.getId())) {
-                    re.setAgencyName(sub.getAgencyName());
+        for (DimAgencyEntity sub : subAgencyList) {
+            SubAgencyIssueResultDTO dto = new SubAgencyIssueResultDTO();
+            dto.setAgencyId(sub.getId());
+            dto.setAgencyName(sub.getAgencyName());
+            for (SubAgencyIssueResultDTO u : list) {
+                if (sub.getId().equals(u.getAgencyId())) {
+                    dto.setIssueTotal(u.getIssueTotal());
+                    dto.setVotingTotal(u.getVotingTotal());
+                    dto.setClosedIssueTotal(u.getClosedIssueTotal());
+                    dto.setShiftProjectTotal(u.getShiftProjectTotal());
                 }
-            });
-        });
+            }
+            dto.setVotingRatio(dto.getVotingTotal() == 0 || dto.getIssueTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) dto.getVotingTotal() / (float) dto.getIssueTotal())));
+            dto.setClosedIssueRatio(dto.getClosedIssueTotal() == 0 || dto.getIssueTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) dto.getClosedIssueTotal() / (float) dto.getIssueTotal())));
+            dto.setShiftProjectRatio(dto.getShiftProjectTotal() == 0 || dto.getIssueTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) dto.getShiftProjectTotal() / (float) dto.getIssueTotal())));
+            resultList.add(dto);
+        }
 
         //4.按要求排序并返回
         Collections.sort(resultList, new Comparator<SubAgencyIssueResultDTO>() {
@@ -770,19 +789,26 @@ public class DataStatsServiceImpl implements DataStatsService {
         List<String> gridIds = gridList.stream().map(DimGridEntity::getId).collect(Collectors.toList());
 
         //2.查询网格层级议题日统计数据，默认按议题总数降序
-        resultList = dataStatsDao.getSubGridIssue(gridIds, formDTO.getDateId());
+        List<SubGridIssueResultDTO> list = dataStatsDao.getSubGridIssue(gridIds, formDTO.getDateId());
 
         //3.封装数据
-        resultList.forEach(re -> {
-            re.setVotingRatio(re.getVotingTotal() == 0 || re.getIssueTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getVotingTotal() / (float) re.getIssueTotal())));
-            re.setClosedIssueRatio(re.getClosedIssueTotal() == 0 || re.getIssueTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getClosedIssueTotal() / (float) re.getIssueTotal())));
-            re.setShiftProjectRatio(re.getShiftProjectTotal() == 0 || re.getIssueTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getShiftProjectTotal() / (float) re.getIssueTotal())));
-            gridList.forEach(sub -> {
-                if (re.getGridId().equals(sub.getId())) {
-                    re.setGridName(sub.getGridName());
+        for (DimGridEntity gr : gridList) {
+            SubGridIssueResultDTO dto = new SubGridIssueResultDTO();
+            dto.setGridId(gr.getId());
+            dto.setGridName(gr.getGridName());
+            for (SubGridIssueResultDTO re : list) {
+                if (gr.getId().equals(re.getGridId())) {
+                    dto.setIssueTotal(re.getIssueTotal());
+                    dto.setVotingTotal(re.getVotingTotal());
+                    dto.setClosedIssueTotal(re.getClosedIssueTotal());
+                    dto.setShiftProjectTotal(re.getShiftProjectTotal());
                 }
-            });
-        });
+            }
+            dto.setVotingRatio(dto.getVotingTotal() == 0 || dto.getIssueTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) dto.getVotingTotal() / (float) dto.getIssueTotal())));
+            dto.setClosedIssueRatio(dto.getClosedIssueTotal() == 0 || dto.getIssueTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) dto.getClosedIssueTotal() / (float) dto.getIssueTotal())));
+            dto.setShiftProjectRatio(dto.getShiftProjectTotal() == 0 || dto.getIssueTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) dto.getShiftProjectTotal() / (float) dto.getIssueTotal())));
+            resultList.add(dto);
+        }
 
         //4.按要求排序并返回
         Collections.sort(resultList, new Comparator<SubGridIssueResultDTO>() {
@@ -833,18 +859,24 @@ public class DataStatsServiceImpl implements DataStatsService {
         List<String> agencyIds = subAgencyList.stream().map(DimAgencyEntity::getId).collect(Collectors.toList());
 
         //2.查询直属下级组织项目日统计数据，默认按项目总数降序
-        resultList = dataStatsDao.getSubAgencyProject(agencyIds, formDTO.getDateId());
+        List<SubAgencyProjectResultDTO> list = dataStatsDao.getSubAgencyProject(agencyIds, formDTO.getDateId());
 
         //3.封装数据
-        resultList.forEach(re -> {
-            re.setPendingRatio(re.getPendingTotal() == 0 || re.getProjectTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getPendingTotal() / (float) re.getProjectTotal())));
-            re.setClosedProjectRatio(re.getClosedProjectTotal() == 0 || re.getProjectTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getClosedProjectTotal() / (float) re.getProjectTotal())));
-            subAgencyList.forEach(sub -> {
-                if (re.getAgencyId().equals(sub.getId())) {
-                    re.setAgencyName(sub.getAgencyName());
+        for (DimAgencyEntity sub : subAgencyList) {
+            SubAgencyProjectResultDTO dto = new SubAgencyProjectResultDTO();
+            dto.setAgencyId(sub.getId());
+            dto.setAgencyName(sub.getAgencyName());
+            for (SubAgencyProjectResultDTO u : list) {
+                if (sub.getId().equals(u.getAgencyId())) {
+                    dto.setProjectTotal(u.getProjectTotal());
+                    dto.setPendingTotal(u.getPendingTotal());
+                    dto.setClosedProjectTotal(u.getClosedProjectTotal());
                 }
-            });
-        });
+            }
+            dto.setPendingRatio(dto.getPendingTotal() == 0 || dto.getProjectTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) dto.getPendingTotal() / (float) dto.getProjectTotal())));
+            dto.setClosedProjectRatio(dto.getClosedProjectTotal() == 0 || dto.getProjectTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) dto.getClosedProjectTotal() / (float) dto.getProjectTotal())));
+            resultList.add(dto);
+        }
 
         //4.按要求排序并返回
         Collections.sort(resultList, new Comparator<SubAgencyProjectResultDTO>() {
@@ -893,18 +925,24 @@ public class DataStatsServiceImpl implements DataStatsService {
         List<String> gridIds = gridList.stream().map(DimGridEntity::getId).collect(Collectors.toList());
 
         //2.查询网格层级项目日统计数据，默认按项目总数降序
-        resultList = dataStatsDao.getSubGridProject(gridIds, formDTO.getDateId());
+        List<SubGridProjectResultDTO> list = dataStatsDao.getSubGridProject(gridIds, formDTO.getDateId());
 
         //3.封装数据
-        resultList.forEach(re -> {
-            re.setPendingRatio(re.getPendingTotal() == 0 || re.getProjectTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getPendingTotal() / (float) re.getProjectTotal())));
-            re.setClosedProjectRatio(re.getClosedProjectTotal() == 0 || re.getProjectTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) re.getClosedProjectTotal() / (float) re.getProjectTotal())));
-            gridList.forEach(sub -> {
-                if (re.getGridId().equals(sub.getId())) {
-                    re.setGridName(sub.getGridName());
+        for (DimGridEntity gr : gridList) {
+            SubGridProjectResultDTO dto = new SubGridProjectResultDTO();
+            dto.setGridId(gr.getId());
+            dto.setGridName(gr.getGridName());
+            for (SubGridProjectResultDTO re : list) {
+                if (gr.getId().equals(re.getGridId())) {
+                    dto.setProjectTotal(re.getProjectTotal());
+                    dto.setPendingTotal(re.getPendingTotal());
+                    dto.setClosedProjectTotal(re.getClosedProjectTotal());
                 }
-            });
-        });
+            }
+            dto.setPendingRatio(dto.getPendingTotal() == 0 || dto.getProjectTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) dto.getPendingTotal() / (float) dto.getProjectTotal())));
+            dto.setClosedProjectRatio(dto.getClosedProjectTotal() == 0 || dto.getProjectTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) dto.getClosedProjectTotal() / (float) dto.getProjectTotal())));
+            resultList.add(dto);
+        }
 
         //4.按要求排序并返回
         Collections.sort(resultList, new Comparator<SubGridProjectResultDTO>() {

From 5d9df3fc7cfd6d673cfaebbca491a19f8cfccfb3 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 24 May 2021 16:03:22 +0800
Subject: [PATCH 064/128] fact_agency_govern_daily

---
 .../extract/FactAgencyGovernDailyDao.java     |  33 ++++
 .../extract/FactAgencyGovernDailyEntity.java  | 174 ++++++++++++++++++
 .../todata/FactAgencyGovernDailyService.java  |  31 ++++
 .../FactAgencyGovernDailyServiceImpl.java     |  37 ++++
 .../extract/FactAgencyGovernDailyDao.xml      |   8 +
 5 files changed, 283 insertions(+)
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactAgencyGovernDailyDao.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactAgencyGovernDailyEntity.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactAgencyGovernDailyService.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactAgencyGovernDailyDao.xml

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactAgencyGovernDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactAgencyGovernDailyDao.java
new file mode 100644
index 0000000000..b88d897543
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactAgencyGovernDailyDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.evaluationindex.extract;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.evaluationindex.extract.FactAgencyGovernDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 组织的治理指数，按天统计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-24
+ */
+@Mapper
+public interface FactAgencyGovernDailyDao extends BaseDao<FactAgencyGovernDailyEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactAgencyGovernDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactAgencyGovernDailyEntity.java
new file mode 100644
index 0000000000..2f37f9a113
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactAgencyGovernDailyEntity.java
@@ -0,0 +1,174 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.evaluationindex.extract;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+
+/**
+ * 组织的治理指数，按天统计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-24
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("fact_agency_govern_daily")
+public class FactAgencyGovernDailyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 数据更新至：yyyyMMdd; 
+     */
+	private String dateId;
+
+    /**
+     * 组织id
+     */
+	private String agencyId;
+
+    /**
+     * agency_id所属的机关级别（社区级：community，
+乡（镇、街道）级:street,
+区县级: district,
+市级: city
+省级:province）
+     */
+	private String level;
+
+    /**
+     * 组织i所属的组织id
+     */
+	private String pid;
+
+    /**
+     * 组织i所有上级id
+     */
+	private String pids;
+
+    /**
+     * 界面展示：问题解决总数=1+2+3+4+5+6+7+8
+     */
+	private Integer problemResolvedCount;
+
+    /**
+     * 界面展示：党群自治占比=（9+10）/PROBLEM_RESOLVED_COUNT; 此列存储的是小数
+     */
+	private BigDecimal groupSelfGovernRatio;
+
+    /**
+     * 界面展示：网格自治占比=GRID_SELF_GOVERN_PROJECT_TOTAL/PROBLEM_RESOLVED_COUNT；此列存储的是小数
+     */
+	private BigDecimal gridSelfGovernRatio;
+
+    /**
+     * 界面展示：社区解决占比=COMMUNITY_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数
+     */
+	private BigDecimal communityClosedRatio;
+
+    /**
+     * 界面展示：街道解决占比=STREET_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数
+     */
+	private BigDecimal streetClosedRatio;
+
+    /**
+     * 界面展示：区直部门解决占比=DISTRICT_DEPT_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数
+     */
+	private BigDecimal districtDeptClosedRatio;
+
+    /**
+     * 1、当前组织内，话题关闭已解决数
+     */
+	private Integer topicResolvedCount;
+
+    /**
+     * 2、当前组织内，话题关闭无需解决数
+     */
+	private Integer topicUnResolvedCount;
+
+    /**
+     * 3、当前组织内，议题关闭已解决数
+     */
+	private Integer issueResolvedCount;
+
+    /**
+     * 4、当前组织内，议题关闭无需解决数
+     */
+	private Integer issueUnResolvedCount;
+
+    /**
+     * 5、当前组织内：来源于议题的项目：结案已解决数
+     */
+	private Integer issueProjectResolvedCount;
+
+    /**
+     * 6、当前组织内：来源于议题的项目：结案无需解决数
+     */
+	private Integer issueProjectUnResolvedCount;
+
+    /**
+     * 7、当前组织内：项目立项，结案已解决数；默认为0，
+     */
+	private Integer approvalProjectResolvedCount;
+
+    /**
+     * 8、当前组织内：项目立项，结案无需解决数；默认为0，
+     */
+	private Integer approvalProjectUnResolvedCount;
+
+    /**
+     * 9、当前组织内，未出小组即未转议题的：话题关闭已解决数
+     */
+	private Integer inGroupTopicResolvedCount;
+
+    /**
+     * 10、当前组织内，未出小组即未转议题的：话题关闭无需解决数
+     */
+	private Integer inGroupTopicUnResolvedCount;
+
+    /**
+     * 未出当前网格的，结案项目数
+     */
+	private Integer gridSelfGovernProjectTotal;
+
+    /**
+     * 当前组织内结案的项目中：由社区结案的项目总数
+     */
+	private Integer communityClosedCount;
+
+    /**
+     * 当前组织内结案的项目中：由街道结案的项目总数
+     */
+	private Integer streetClosedCount;
+
+    /**
+     * 当前组织内结案的项目中：由区直部门结案的项目总数
+     */
+	private Integer districtDeptClosedCount;
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactAgencyGovernDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactAgencyGovernDailyService.java
new file mode 100644
index 0000000000..1f8440c281
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactAgencyGovernDailyService.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.evaluationindex.extract.todata;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.entity.evaluationindex.extract.FactAgencyGovernDailyEntity;
+
+/**
+ * 组织的治理指数，按天统计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-24
+ */
+public interface FactAgencyGovernDailyService extends BaseService<FactAgencyGovernDailyEntity> {
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java
new file mode 100644
index 0000000000..e40ffd49bd
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java
@@ -0,0 +1,37 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.evaluationindex.extract.todata.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.dao.evaluationindex.extract.FactAgencyGovernDailyDao;
+import com.epmet.entity.evaluationindex.extract.FactAgencyGovernDailyEntity;
+import com.epmet.service.evaluationindex.extract.todata.FactAgencyGovernDailyService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 组织的治理指数，按天统计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-24
+ */
+@Service
+public class FactAgencyGovernDailyServiceImpl extends BaseServiceImpl<FactAgencyGovernDailyDao, FactAgencyGovernDailyEntity> implements FactAgencyGovernDailyService {
+
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactAgencyGovernDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactAgencyGovernDailyDao.xml
new file mode 100644
index 0000000000..7b4aa4c504
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactAgencyGovernDailyDao.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.evaluationindex.extract.FactAgencyGovernDailyDao">
+
+
+
+</mapper>
\ No newline at end of file

From f55f29e1e33875dc0de9275037e435eadc15ef3e Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Mon, 24 May 2021 16:33:36 +0800
Subject: [PATCH 065/128] =?UTF-8?q?=E5=9F=BA=E5=B1=82=E6=B2=BB=E7=90=86-?=
 =?UTF-8?q?=E6=B2=BB=E7=90=86=E8=83=BD=E5=8A=9B=E6=8E=92=E8=A1=8C=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE(=E6=8C=89=E5=A4=A9=E7=BB=9F=E8=AE=A1)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FactOriginProjectMainDailyDTO.java        |   5 +
 .../epmet/dto/project/ProjectPointDTO.java    |  17 +
 .../screen/ScreenGovernRankDataDailyDTO.java  | 132 ++++++++
 .../extract/FactOriginProjectLogDailyDao.java |  43 +++
 .../FactOriginProjectMainDailyDao.java        |  34 ++
 .../FactIndexGovrnAblityGridMonthlyDao.java   |  10 +
 .../screen/ScreenGovernRankDataDailyDao.java  |  68 ++++
 .../com/epmet/dao/project/ProjectDao.java     |  23 ++
 .../FactOriginProjectMainDailyEntity.java     |   5 +
 .../ScreenGovernRankDataDailyEntity.java      | 102 ++++++
 .../FactOriginProjectLogDailyService.java     |  42 +++
 .../FactOriginProjectMainDailyService.java    |  31 ++
 .../FactOriginProjectLogDailyServiceImpl.java |  58 ++++
 ...FactOriginProjectMainDailyServiceImpl.java |  44 +++
 .../GovernRankDataExtractService.java         |  44 +++
 .../GovernRankDataExtractServiceImpl.java     | 294 ++++++++++++++++++
 .../impl/ScreenExtractServiceImpl.java        |  22 ++
 ...actIndexGovrnAblityGridMonthlyService.java |  11 +
 ...ndexGovrnAblityGridMonthlyServiceImpl.java |  14 +
 .../ScreenGovernRankDataDailyService.java     | 121 +++++++
 .../ScreenGovernRankDataDailyServiceImpl.java | 169 ++++++++++
 .../epmet/service/project/ProjectService.java |  10 +
 .../project/impl/ProjectServiceImpl.java      |  41 ++-
 .../extract/FactOriginProjectLogDailyDao.xml  | 148 +++++++--
 .../extract/FactOriginProjectMainDailyDao.xml | 106 +++++++
 .../FactIndexGovrnAblityGridMonthlyDao.xml    |  15 +
 .../screen/ScreenGovernRankDataDailyDao.xml   |  80 +++++
 .../resources/mapper/project/ProjectDao.xml   |  17 +
 .../stats/user/FactRegUserGridMonthlyDao.xml  |  11 +
 29 files changed, 1679 insertions(+), 38 deletions(-)
 create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/project/ProjectPointDTO.java
 create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenGovernRankDataDailyDTO.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenGovernRankDataDailyDao.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenGovernRankDataDailyEntity.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenGovernRankDataDailyService.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenGovernRankDataDailyServiceImpl.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenGovernRankDataDailyDao.xml

diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactOriginProjectMainDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactOriginProjectMainDailyDTO.java
index 9d1484b5f4..13e1e5fba7 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactOriginProjectMainDailyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactOriginProjectMainDailyDTO.java
@@ -138,6 +138,11 @@ public class FactOriginProjectMainDailyDTO implements Serializable {
      */
 	private String isOverdue;
 
+	/**
+	 * 是否满意 1:是
+	 */
+	private Integer isSatisfied;
+
     /**
      * 办结组织Ids（:隔开，有可能是社区id可能是网格id，无需区分级别，在统计时模糊查询）
      */
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/project/ProjectPointDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/project/ProjectPointDTO.java
new file mode 100644
index 0000000000..abeeab8d89
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/project/ProjectPointDTO.java
@@ -0,0 +1,17 @@
+package com.epmet.dto.project;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2021/5/21 10:53
+ */
+@Data
+public class ProjectPointDTO implements Serializable {
+	private static final long serialVersionUID = -592430619162380664L;
+	private String projectId;
+	private Integer point;
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenGovernRankDataDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenGovernRankDataDailyDTO.java
new file mode 100644
index 0000000000..29d988da64
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenGovernRankDataDailyDTO.java
@@ -0,0 +1,132 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.screen;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 基层治理-治理能力排行数据(按月统计)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-24
+ */
+@Data
+public class ScreenGovernRankDataDailyDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID 主键
+     */
+	private String id;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 年Id
+     */
+	private String yearId;
+
+    /**
+     * 月份Id
+     */
+	private String monthId;
+
+    /**
+     * 数据更新至：yyyyMMdd
+     */
+	private String dateId;
+
+    /**
+     * 组织类别 agency：组织；部门：department；网格：grid
+     */
+	private String orgType;
+
+    /**
+     * 组织Id 可以为网格，机关id
+     */
+	private String orgId;
+
+    /**
+     * 上级组织Id
+     */
+	private String parentId;
+
+    /**
+     * 组织名称
+     */
+	private String orgName;
+
+    /**
+     * 响应率
+     */
+	private BigDecimal responseRatio;
+
+    /**
+     * 解决率
+     */
+	private BigDecimal resolvedRatio;
+
+    /**
+     * 自治率
+     */
+	private BigDecimal governRatio;
+
+    /**
+     * 满意率
+     */
+	private BigDecimal satisfactionRatio;
+
+    /**
+     * 删除标识 0未删除；1已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectLogDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectLogDailyDao.java
index 8e18ad5500..ed79666c63 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectLogDailyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectLogDailyDao.java
@@ -182,6 +182,28 @@ public interface FactOriginProjectLogDailyDao extends BaseDao<FactOriginProjectL
 	 */
 	List<OrgStatisticsResultDTO> selectGridResponse(@Param("customerId") String customerId, @Param("monthId") String monthId);
 
+	/**
+	 * 组织项目响应度
+	 * @author zhaoqifeng
+	 * @date 2020/9/25 10:01
+	 * @param customerId
+	 * @param dateId
+	 * @param level
+	 * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+	 */
+	List<OrgStatisticsResultDTO> selectOrgResponseDaily(@Param("customerId") String customerId, @Param("dateId") String dateId,
+													@Param("level")String level);
+
+	/**
+	 * 网格项目响应度
+	 * @author zhaoqifeng
+	 * @date 2020/9/25 10:01
+	 * @param customerId
+	 * @param dateId
+	 * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+	 */
+	List<OrgStatisticsResultDTO> selectGridResponseDaily(@Param("customerId") String customerId, @Param("dateId") String dateId);
+
 	/**
 	 * 组织项目响应度
 	 * @author zhaoqifeng
@@ -215,6 +237,27 @@ public interface FactOriginProjectLogDailyDao extends BaseDao<FactOriginProjectL
 	List<OrgStatisticsResultDTO> selectOrgSatisfaction(@Param("customerId") String customerId, @Param("monthId") String monthId,
 													@Param("level")String level);
 
+	/**
+	 * 网格满意率
+	 * @author zhaoqifeng
+	 * @date 2020/9/27 15:52
+	 * @param customerId
+	 * @param dateId
+	 * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+	 */
+	List<OrgStatisticsResultDTO> selectGridSatisfactionDaily(@Param("customerId") String customerId, @Param("dateId") String dateId);
+
+	/**
+	 * 组织满意率
+	 * @author zhaoqifeng
+	 * @date 2020/9/27 15:52
+	 * @param customerId
+	 * @param level
+	 * @param dateId
+	 * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+	 */
+	List<OrgStatisticsResultDTO> selectOrgSatisfactionDaily(@Param("customerId") String customerId, @Param("level")String level, @Param("dateId") String dateId);
+
 	/**
 	 * 获取部门办结项目数
 	 * @author zhaoqifeng
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java
index 179574ae7a..e07a58613f 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java
@@ -157,6 +157,18 @@ public interface FactOriginProjectMainDailyDao extends BaseDao<FactOriginProject
 	List<OrgStatisticsResultDTO> getSelfProject(@Param("customerId") String customerId, @Param("monthId")String monthId,
 												@Param("level") String level);
 
+	/**
+	 * 组织自治项目数
+	 * @author zhaoqifeng
+	 * @date 2020/9/25 15:16
+	 * @param customerId
+	 * @param dateId
+	 * @param level
+	 * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+	 */
+	List<OrgStatisticsResultDTO> getSelfProjectDaily(@Param("customerId") String customerId, @Param("dateId")String dateId,
+												@Param("level") String level);
+
 
 	/**
 	 * 组织解决项目数
@@ -170,6 +182,18 @@ public interface FactOriginProjectMainDailyDao extends BaseDao<FactOriginProject
 	List<OrgStatisticsResultDTO> getResolveProject(@Param("customerId") String customerId, @Param("monthId")String monthId,
 												@Param("level") String level);
 
+	/**
+	 * 组织解决项目数
+	 * @author zhaoqifeng
+	 * @date 2020/9/25 15:16
+	 * @param customerId
+	 * @param dateId
+	 * @param level
+	 * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+	 */
+	List<OrgStatisticsResultDTO> getResolveProjectDaily(@Param("customerId") String customerId, @Param("dateId")String dateId,
+												   @Param("level") String level);
+
 	/**
 	 * 网格解决项目数
 	 * @author zhaoqifeng
@@ -180,6 +204,16 @@ public interface FactOriginProjectMainDailyDao extends BaseDao<FactOriginProject
 	 */
 	List<OrgStatisticsResultDTO> getGridResolveProject(@Param("customerId") String customerId, @Param("monthId")String monthId);
 
+	/**
+	 * 网格解决项目数
+	 * @author zhaoqifeng
+	 * @date 2020/9/25 15:16
+	 * @param customerId
+	 * @param dateId
+	 * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+	 */
+	List<OrgStatisticsResultDTO> getGridResolveProjectDaily(@Param("customerId") String customerId, @Param("dateId")String dateId);
+
 	/**
 	 * @Description 查询难点赌点的基本信息，要排除之前已经结案过的项目
 	 * @param customerId
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyDao.java
index a47ebdc88d..cc7277e9e0 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyDao.java
@@ -123,4 +123,14 @@ public interface FactIndexGovrnAblityGridMonthlyDao extends BaseDao<FactIndexGov
      * @return java.util.List<com.epmet.entity.evaluationindex.indexcoll.FactIndexGovrnAblityGridMonthlyEntity>
      */
     List<FactIndexGovrnAblityGridMonthlyEntity> selectGridByCustomer(@Param("customerId")String customerId, @Param("monthId")String monthId);
+
+    /**
+     * 查询客户下网格治理能力
+     * @author zhaoqifeng
+     * @date 2020/9/24 15:26
+     * @param customerId
+     * @param dateId
+     * @return java.util.List<com.epmet.entity.evaluationindex.indexcoll.FactIndexGovrnAblityGridMonthlyEntity>
+     */
+    List<FactIndexGovrnAblityGridMonthlyEntity> selectGridByCustomerDaily(@Param("customerId")String customerId, @Param("dateId")String dateId);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenGovernRankDataDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenGovernRankDataDailyDao.java
new file mode 100644
index 0000000000..688d9b4d3f
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenGovernRankDataDailyDao.java
@@ -0,0 +1,68 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.evaluationindex.screen.ScreenGovernRankDataDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 基层治理-治理能力排行数据(按月统计)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-24
+ */
+@Mapper
+public interface ScreenGovernRankDataDailyDao extends BaseDao<ScreenGovernRankDataDailyEntity> {
+	/**
+	 * 组织级别初始化数据
+	 * @author zhaoqifeng
+	 * @date 2020/9/24 14:52
+	 * @param customerId
+	 * @param level
+	 * @return java.util.List<com.epmet.entity.evaluationindex.screen.ScreenGovernRankDataEntity>
+	 */
+	List<ScreenGovernRankDataDailyEntity> initAgencyDataList(@Param("customerId") String customerId, @Param("level") String level);
+
+	/**
+	 * 网格级别初始化数据
+	 * @author zhaoqifeng
+	 * @date 2020/9/24 14:52
+	 * @param customerId
+	 * @return java.util.List<com.epmet.entity.evaluationindex.screen.ScreenGovernRankDataEntity>
+	 */
+	List<ScreenGovernRankDataDailyEntity> initGridDataList(@Param("customerId") String customerId);
+
+	/**
+	 * 删除旧数据
+	 * @author zhaoqifeng
+	 * @date 2020/9/25 10:38
+	 * @param customerId
+	 * @param orgType
+	 * @param dateId
+	 * @param deleteSize
+	 * @param orgIds
+	 * @return java.lang.Integer
+	 */
+	Integer deleteRankData(@Param("customerId") String customerId, @Param("orgType") String orgType, @Param("dateId") String dateId,
+						   @Param("deleteSize") Integer deleteSize,
+						   @Param("orgIds")List<String> orgIds);
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectDao.java
index 2d3318c262..44e47f6f92 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectDao.java
@@ -18,12 +18,16 @@
 package com.epmet.dao.project;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.CustomerProjectParameterDTO;
 import com.epmet.dto.ProjectDTO;
+import com.epmet.dto.ProjectSatisfactionStatisticsDTO;
 import com.epmet.dto.project.ProjectAgencyDTO;
 import com.epmet.dto.project.ProjectCategoryDTO;
 import com.epmet.dto.project.ProjectGridDTO;
+import com.epmet.dto.project.ProjectPointDTO;
 import com.epmet.dto.project.result.ProjectExceedParamsResultDTO;
 import com.epmet.dto.screen.ScreenProjectProcessAttachmentDTO;
+import com.epmet.entity.evaluationindex.extract.FactOriginProjectMainDailyEntity;
 import com.epmet.entity.project.ProjectEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -135,4 +139,23 @@ public interface ProjectDao extends BaseDao<ProjectEntity> {
     List<ProjectCategoryDTO> selectProjectCategory(@Param("list")List<String> list);
 
     List<com.epmet.dto.ProjectCategoryDTO> getProjectCategoryData(@Param("customerId") String customerId, @Param("dateId") String dateId);
+
+    /**
+     * 获取项目满意度
+     * @author zhaoqifeng
+     * @date 2021/5/21 10:06
+     * @param customerId
+     * @return java.util.List<com.epmet.dto.ProjectSatisfactionStatisticsDTO>
+     */
+    List<ProjectPointDTO> selectProjectSatisfaction(@Param("customerId") String customerId);
+
+    /**
+     * 根据key查找value
+     * @author zhaoqifeng
+     * @date 2021/5/21 10:58
+     * @param customerId
+     * @param parameterKey
+     * @return java.lang.String
+     */
+    String selectValueByKey(@Param("customerId") String customerId, @Param("parameterKey") String parameterKey);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginProjectMainDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginProjectMainDailyEntity.java
index 35d0e46b8f..be69a89f3d 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginProjectMainDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginProjectMainDailyEntity.java
@@ -138,6 +138,11 @@ public class FactOriginProjectMainDailyEntity extends BaseEpmetEntity {
      */
 	private String isOverdue;
 
+	/**
+	 * 是否满意 1:是
+	 */
+	private Integer isSatisfied;
+
     /**
      * 办结组织Ids（:隔开，有可能是社区id可能是网格id，无需区分级别，在统计时模糊查询）
      */
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenGovernRankDataDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenGovernRankDataDailyEntity.java
new file mode 100644
index 0000000000..8bbe10f526
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenGovernRankDataDailyEntity.java
@@ -0,0 +1,102 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.evaluationindex.screen;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 基层治理-治理能力排行数据(按月统计)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-24
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("screen_govern_rank_data_daily")
+public class ScreenGovernRankDataDailyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 年Id
+     */
+	private String yearId;
+
+    /**
+     * 月份Id
+     */
+	private String monthId;
+
+    /**
+     * 数据更新至：yyyyMMdd
+     */
+	private String dateId;
+
+    /**
+     * 组织类别 agency：组织；部门：department；网格：grid
+     */
+	private String orgType;
+
+    /**
+     * 组织Id 可以为网格，机关id
+     */
+	private String orgId;
+
+    /**
+     * 上级组织Id
+     */
+	private String parentId;
+
+    /**
+     * 组织名称
+     */
+	private String orgName;
+
+    /**
+     * 响应率
+     */
+	private BigDecimal responseRatio;
+
+    /**
+     * 解决率
+     */
+	private BigDecimal resolvedRatio;
+
+    /**
+     * 自治率
+     */
+	private BigDecimal governRatio;
+
+    /**
+     * 满意率
+     */
+	private BigDecimal satisfactionRatio;
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectLogDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectLogDailyService.java
index c337c085da..13c0e1d6c8 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectLogDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectLogDailyService.java
@@ -218,6 +218,27 @@ public interface FactOriginProjectLogDailyService extends BaseService<FactOrigin
      */
     List<OrgStatisticsResultDTO> getOrgResponse(String customerId, String monthId, String level);
 
+    /**
+     * 网格项目响应度
+     * @author zhaoqifeng
+     * @date 2020/9/25 9:56
+     * @param customerId
+     * @param dateId
+     * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     */
+    List<OrgStatisticsResultDTO> getGridResponseDaily(String customerId, String dateId);
+
+    /**
+     * 组织项目响应度
+     * @author zhaoqifeng
+     * @date 2020/9/25 9:56
+     * @param customerId
+     * @param dateId
+     * @param level
+     * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     */
+    List<OrgStatisticsResultDTO> getOrgResponseDaily(String customerId, String dateId, String level);
+
     /**
      * 网格满意率
      * @author zhaoqifeng
@@ -239,6 +260,27 @@ public interface FactOriginProjectLogDailyService extends BaseService<FactOrigin
      */
     List<OrgStatisticsResultDTO> getOrgSatisfaction(String customerId, String monthId, String level);
 
+    /**
+     * 网格满意率
+     * @author zhaoqifeng
+     * @date 2020/9/27 16:06
+     * @param customerId
+     * @param dateId
+     * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     */
+    List<OrgStatisticsResultDTO> getGridSatisfactionDaily(String customerId, String dateId);
+
+    /**
+     * 组织满意率
+     * @author zhaoqifeng
+     * @date 2020/9/27 16:06
+     * @param customerId
+     * @param dateId
+     * @param level
+     * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     */
+    List<OrgStatisticsResultDTO> getOrgSatisfactionDaily(String customerId, String dateId, String level);
+
     /**
      * 获取部门办结项目数
      * @author zhaoqifeng
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java
index b160131db7..21994e4a98 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java
@@ -146,6 +146,17 @@ public interface FactOriginProjectMainDailyService extends BaseService<FactOrigi
      * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
      */
     List<OrgStatisticsResultDTO> getSelfProject(String customerId, String monthId, String level);
+    /**
+     * 自治项目数
+     * @author zhaoqifeng
+     * @date 2020/9/25 15:34
+     * @param customerId
+     * @param dateId
+     * @param level
+     * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     */
+    List<OrgStatisticsResultDTO> getSelfProjectDaily(String customerId, String dateId, String level);
+
     /**
      * 已解决项目数
      * @author zhaoqifeng
@@ -156,6 +167,16 @@ public interface FactOriginProjectMainDailyService extends BaseService<FactOrigi
      * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
      */
     List<OrgStatisticsResultDTO> getResolveProject(String customerId, String monthId, String level);
+    /**
+     * 已解决项目数
+     * @author zhaoqifeng
+     * @date 2020/9/25 15:34
+     * @param customerId
+     * @param dateId
+     * @param level
+     * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     */
+    List<OrgStatisticsResultDTO> getResolveProjectDaily(String customerId, String dateId, String level);
 
     /**
      * 网格已解决项目数
@@ -167,6 +188,16 @@ public interface FactOriginProjectMainDailyService extends BaseService<FactOrigi
      */
     List<OrgStatisticsResultDTO> getGridResolveProject(String customerId, String monthId);
 
+    /**
+     * 网格已解决项目数
+     * @author zhaoqifeng
+     * @date 2020/9/25 15:34
+     * @param customerId
+     * @param dateId
+     * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     */
+    List<OrgStatisticsResultDTO> getGridResolveProjectDaily(String customerId, String dateId);
+
     /**
      * 网格项目数
      * @author zhaoqifeng
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectLogDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectLogDailyServiceImpl.java
index 9be7b9f44f..b01e714325 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectLogDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectLogDailyServiceImpl.java
@@ -290,6 +290,35 @@ public class FactOriginProjectLogDailyServiceImpl extends BaseServiceImpl<FactOr
         return baseDao.selectOrgResponse(customerId, monthId, level);
     }
 
+    /**
+     * 网格项目响应度
+     *
+     * @param customerId
+     * @param dateId
+     * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     * @author zhaoqifeng
+     * @date 2020/9/25 9:56
+     */
+    @Override
+    public List<OrgStatisticsResultDTO> getGridResponseDaily(String customerId, String dateId) {
+        return baseDao.selectGridResponseDaily(customerId, dateId);
+    }
+
+    /**
+     * 组织项目响应度
+     *
+     * @param customerId
+     * @param dateId
+     * @param level
+     * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     * @author zhaoqifeng
+     * @date 2020/9/25 9:56
+     */
+    @Override
+    public List<OrgStatisticsResultDTO> getOrgResponseDaily(String customerId, String dateId, String level) {
+        return baseDao.selectOrgResponseDaily(customerId, dateId, level);
+    }
+
     @Override
     public List<OrgStatisticsResultDTO> getGridSatisfaction(String customerId, String monthId) {
         return baseDao.selectGridSatisfaction(customerId, monthId);
@@ -300,6 +329,35 @@ public class FactOriginProjectLogDailyServiceImpl extends BaseServiceImpl<FactOr
         return baseDao.selectOrgSatisfaction(customerId, monthId, level);
     }
 
+    /**
+     * 网格满意率
+     *
+     * @param customerId
+     * @param dateId
+     * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     * @author zhaoqifeng
+     * @date 2020/9/27 16:06
+     */
+    @Override
+    public List<OrgStatisticsResultDTO> getGridSatisfactionDaily(String customerId, String dateId) {
+        return baseDao.selectGridSatisfactionDaily(customerId, dateId);
+    }
+
+    /**
+     * 组织满意率
+     *
+     * @param customerId
+     * @param dateId
+     * @param level
+     * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     * @author zhaoqifeng
+     * @date 2020/9/27 16:06
+     */
+    @Override
+    public List<OrgStatisticsResultDTO> getOrgSatisfactionDaily(String customerId, String dateId, String level) {
+        return baseDao.selectOrgSatisfactionDaily(customerId, dateId, level);
+    }
+
     /**
      * 获取部门办结项目数
      *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java
index 73830ce377..12550e187f 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java
@@ -180,16 +180,60 @@ public class FactOriginProjectMainDailyServiceImpl extends BaseServiceImpl<FactO
         return baseDao.getSelfProject(customerId, monthId, level);
     }
 
+    /**
+     * 自治项目数
+     *
+     * @param customerId
+     * @param dateId
+     * @param level
+     * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     * @author zhaoqifeng
+     * @date 2020/9/25 15:34
+     */
+    @Override
+    public List<OrgStatisticsResultDTO> getSelfProjectDaily(String customerId, String dateId, String level) {
+        return baseDao.getSelfProjectDaily(customerId, dateId, level);
+    }
+
     @Override
     public List<OrgStatisticsResultDTO> getResolveProject(String customerId, String monthId, String level) {
         return baseDao.getResolveProject(customerId, monthId, level);
     }
 
+    /**
+     * 已解决项目数
+     *
+     * @param customerId
+     * @param dateId
+     * @param level
+     * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     * @author zhaoqifeng
+     * @date 2020/9/25 15:34
+     */
+    @Override
+    public List<OrgStatisticsResultDTO> getResolveProjectDaily(String customerId, String dateId, String level) {
+        return baseDao.getResolveProjectDaily(customerId, dateId, level);
+    }
+
     @Override
     public List<OrgStatisticsResultDTO> getGridResolveProject(String customerId, String monthId) {
         return baseDao.getGridResolveProject(customerId, monthId);
     }
 
+    /**
+     * 网格已解决项目数
+     *
+     * @param customerId
+     * @param dateId
+     * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     * @author zhaoqifeng
+     * @date 2020/9/25 15:34
+     */
+    @Override
+    public List<OrgStatisticsResultDTO> getGridResolveProjectDaily(String customerId, String dateId) {
+        return baseDao.getGridResolveProjectDaily(customerId, dateId);
+    }
+
     @Override
     public List<OrgStatisticsResultDTO> getGridProjectCount(String customerId, String monthId) {
         return baseDao.getGridProjectCount(customerId, monthId);
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/GovernRankDataExtractService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/GovernRankDataExtractService.java
index ef55ca765a..81b88a84bd 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/GovernRankDataExtractService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/GovernRankDataExtractService.java
@@ -49,4 +49,48 @@ public interface GovernRankDataExtractService {
 	 * @date 2020/9/24 15:17
 	 */
 	void extractDistrictData(String customerId, String monthId);
+
+	/**
+	 * 网格治理能力
+	 *
+	 * @param customerId
+	 * @param dateId
+	 * @return void
+	 * @author zhaoqifeng
+	 * @date 2020/9/24 15:16
+	 */
+	void extractGridDataDaily(String customerId, String dateId);
+
+	/**
+	 * 社区治理能力
+	 *
+	 * @param customerId
+	 * @param dateId
+	 * @return void
+	 * @author zhaoqifeng
+	 * @date 2020/9/24 15:17
+	 */
+	void extractCommunityDataDaily(String customerId, String dateId);
+
+	/**
+	 * 街道治理能力
+	 *
+	 * @param customerId
+	 * @param dateId
+	 * @return void
+	 * @author zhaoqifeng
+	 * @date 2020/9/24 15:17
+	 */
+	void extractStreetDataDaily(String customerId, String dateId);
+
+	/**
+	 * 全区治理能力
+	 *
+	 * @param customerId
+	 * @param dateId
+	 * @return void
+	 * @author zhaoqifeng
+	 * @date 2020/9/24 15:17
+	 */
+	void extractDistrictDataDaily(String customerId, String dateId);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/GovernRankDataExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/GovernRankDataExtractServiceImpl.java
index 14198e915b..8d88c42e05 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/GovernRankDataExtractServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/GovernRankDataExtractServiceImpl.java
@@ -5,12 +5,14 @@ import com.epmet.constant.IndexCalConstant;
 import com.epmet.constant.OrgTypeConstant;
 import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
 import com.epmet.entity.evaluationindex.indexcoll.FactIndexGovrnAblityGridMonthlyEntity;
+import com.epmet.entity.evaluationindex.screen.ScreenGovernRankDataDailyEntity;
 import com.epmet.entity.evaluationindex.screen.ScreenGovernRankDataEntity;
 import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectLogDailyService;
 import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectMainDailyService;
 import com.epmet.service.evaluationindex.extract.toscreen.GovernRankDataExtractService;
 import com.epmet.service.evaluationindex.indexcoll.FactIndexGovrnAblityGridMonthlyService;
 import com.epmet.service.evaluationindex.indexcoll.FactIndexGovrnAblityOrgMonthlyService;
+import com.epmet.service.evaluationindex.screen.ScreenGovernRankDataDailyService;
 import com.epmet.service.evaluationindex.screen.ScreenGovernRankDataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -30,6 +32,8 @@ public class GovernRankDataExtractServiceImpl implements GovernRankDataExtractSe
 	@Autowired
 	private ScreenGovernRankDataService screenGovernRankDataService;
 	@Autowired
+	private ScreenGovernRankDataDailyService screenGovernRankDataDailyService;
+	@Autowired
 	private FactIndexGovrnAblityOrgMonthlyService factIndexGovrnAblityOrgMonthlyService;
 	@Autowired
 	private FactIndexGovrnAblityGridMonthlyService factIndexGovrnAblityGridMonthlyService;
@@ -283,4 +287,294 @@ public class GovernRankDataExtractServiceImpl implements GovernRankDataExtractSe
 		}
 		screenGovernRankDataService.delAndSaveRankData(customerId, OrgTypeConstant.AGENCY, monthId, IndexCalConstant.DELETE_SIZE, list);
 	}
+
+	/**
+	 * 网格治理能力
+	 *
+	 * @param customerId
+	 * @param dateId
+	 * @return void
+	 * @author zhaoqifeng
+	 * @date 2020/9/24 15:16
+	 */
+	@Override
+	public void extractGridDataDaily(String customerId, String dateId) {
+		List<ScreenGovernRankDataDailyEntity> list = screenGovernRankDataDailyService.initList(customerId, OrgTypeConstant.GRID, null);
+		if (CollectionUtils.isEmpty(list)) {
+			return;
+		}
+		BigDecimal hundred = new BigDecimal(NumConstant.ONE_HUNDRED);
+		list.forEach(entity -> {
+			entity.setYearId(dateId.substring(NumConstant.ZERO, NumConstant.FOUR));
+			entity.setMonthId(dateId.substring(NumConstant.ZERO, NumConstant.SIX));
+			entity.setDateId(dateId);
+		});
+		//满意率 满意和非常满意占比
+		List<OrgStatisticsResultDTO> satisfactionList =  factOriginProjectLogDailyService.getGridSatisfactionDaily(customerId, dateId);
+		if (!CollectionUtils.isEmpty(satisfactionList)) {
+			list.forEach(entity -> satisfactionList.stream().filter(item -> item.getOrgId().equals(entity.getOrgId())).forEach(dto -> {
+				if (dto.getSum() != NumConstant.ZERO) {
+					BigDecimal sum = new BigDecimal(dto.getSum());
+					BigDecimal count = new BigDecimal(dto.getCount());
+					entity.setSatisfactionRatio(count.multiply(hundred).divide(sum, NumConstant.SIX, RoundingMode.HALF_UP));
+				}
+			}));
+		}
+		//自治率
+		List<FactIndexGovrnAblityGridMonthlyEntity> gridList = factIndexGovrnAblityGridMonthlyService.getGridByCustomerDaily(customerId, dateId);
+		if (CollectionUtils.isNotEmpty(gridList)) {
+			list.forEach(entity -> gridList.stream().filter(gridAbility -> entity.getOrgId().equals(gridAbility.getGridId())).forEach(grid -> {
+				BigDecimal resolveCount = new BigDecimal(grid.getResolveProjectCount());
+				BigDecimal selfCount = new BigDecimal(grid.getSelfSolveProjectCount());
+				if (grid.getResolveProjectCount() != NumConstant.ZERO) {
+					entity.setGovernRatio(selfCount.multiply(hundred).divide(resolveCount, NumConstant.SIX, RoundingMode.HALF_UP));
+				}
+			}));
+		}
+
+		//响应率 响应次数/流转到网格的次数
+		List<OrgStatisticsResultDTO> responseList = factOriginProjectLogDailyService.getGridResponseDaily(customerId, dateId);
+		if (CollectionUtils.isNotEmpty(responseList)) {
+			list.forEach(entity -> responseList.stream().filter(response -> entity.getOrgId().equals(response.getOrgId())).forEach(dto -> {
+				if (dto.getSum() != NumConstant.ZERO) {
+					BigDecimal sum = new BigDecimal(dto.getSum());
+					BigDecimal count = new BigDecimal(dto.getCount());
+					entity.setResponseRatio(count.multiply(hundred).divide(sum, NumConstant.SIX, RoundingMode.HALF_UP));
+				}
+			}));
+		}
+
+		//解决率 已解决项目数/办结项目数
+		List<OrgStatisticsResultDTO> resolveList = factOriginProjectMainDailyService.getGridResolveProjectDaily(customerId, dateId);
+		if (CollectionUtils.isNotEmpty(resolveList)) {
+			list.forEach(entity -> resolveList.stream().filter(resolve -> entity.getOrgId().equals(resolve.getOrgId())).forEach(dto -> {
+				if (dto.getSum() != NumConstant.ZERO) {
+					BigDecimal sum = new BigDecimal(dto.getSum());
+					BigDecimal count = new BigDecimal(dto.getCount());
+					entity.setResolvedRatio(count.multiply(hundred).divide(sum, NumConstant.SIX, RoundingMode.HALF_UP));
+				}
+			}));
+		}
+
+		screenGovernRankDataDailyService.delAndSaveRankData(customerId, OrgTypeConstant.GRID, dateId, IndexCalConstant.DELETE_SIZE, list);
+	}
+
+	/**
+	 * 社区治理能力
+	 *
+	 * @param customerId
+	 * @param dateId
+	 * @return void
+	 * @author zhaoqifeng
+	 * @date 2020/9/24 15:17
+	 */
+	@Override
+	public void extractCommunityDataDaily(String customerId, String dateId) {
+		List<ScreenGovernRankDataDailyEntity> list = screenGovernRankDataDailyService.initList(customerId, OrgTypeConstant.AGENCY,
+				OrgTypeConstant.COMMUNITY);
+		if (CollectionUtils.isEmpty(list)) {
+			return;
+		}
+		BigDecimal hundred = new BigDecimal(NumConstant.ONE_HUNDRED);
+		list.forEach(entity -> {
+			entity.setYearId(dateId.substring(NumConstant.ZERO, NumConstant.FOUR));
+			entity.setMonthId(dateId.substring(NumConstant.ZERO, NumConstant.SIX));
+			entity.setDateId(dateId);
+		});
+
+		//满意率 满意和非常满意占比
+		List<OrgStatisticsResultDTO> satisfactionList =  factOriginProjectLogDailyService.getOrgSatisfactionDaily(customerId, dateId,
+				OrgTypeConstant.COMMUNITY);
+		if (CollectionUtils.isNotEmpty(satisfactionList)) {
+			list.forEach(entity -> satisfactionList.stream().filter(item -> item.getAgencyId().equals(entity.getOrgId())).forEach(dto -> {
+				if (dto.getSum() != NumConstant.ZERO) {
+					BigDecimal sum = new BigDecimal(dto.getSum());
+					BigDecimal count = new BigDecimal(dto.getCount());
+					entity.setSatisfactionRatio(count.multiply(hundred).divide(sum, NumConstant.SIX, RoundingMode.HALF_UP));
+				}
+			}));
+		}
+
+		//响应率 响应次数/流转到网格的次数
+		List<OrgStatisticsResultDTO> responseList = factOriginProjectLogDailyService.getOrgResponseDaily(customerId, dateId, OrgTypeConstant.COMMUNITY);
+		if (CollectionUtils.isNotEmpty(responseList)) {
+			list.forEach(entity -> responseList.stream().filter(response -> entity.getOrgId().equals(response.getAgencyId())).forEach(dto -> {
+				if (dto.getSum() != NumConstant.ZERO) {
+					BigDecimal sum = new BigDecimal(dto.getSum());
+					BigDecimal count = new BigDecimal(dto.getCount());
+					entity.setResponseRatio(count.multiply(hundred).divide(sum, NumConstant.SIX, RoundingMode.HALF_UP));
+				}
+			}));
+		}
+		//自制率 自治项目数/办结项目数
+		List<OrgStatisticsResultDTO> selfList = factOriginProjectMainDailyService.getSelfProject(customerId, dateId, OrgTypeConstant.COMMUNITY);
+		if (CollectionUtils.isNotEmpty(selfList)) {
+			list.forEach(entity -> selfList.stream().filter(self -> entity.getOrgId().equals(self.getAgencyId())).forEach(dto -> {
+				if (dto.getSum() != NumConstant.ZERO) {
+					BigDecimal sum = new BigDecimal(dto.getSum());
+					BigDecimal count = new BigDecimal(dto.getCount());
+					entity.setGovernRatio(count.multiply(hundred).divide(sum, NumConstant.SIX, RoundingMode.HALF_UP));
+				}
+			}));
+		}
+		//解决率 已解决项目数/办结项目数
+		List<OrgStatisticsResultDTO> resolveList = factOriginProjectMainDailyService.getResolveProjectDaily(customerId, dateId,
+				OrgTypeConstant.COMMUNITY);
+		if (CollectionUtils.isNotEmpty(resolveList)) {
+			list.forEach(entity -> resolveList.stream().filter(resolve -> entity.getOrgId().equals(resolve.getAgencyId())).forEach(dto -> {
+				if (dto.getSum() != NumConstant.ZERO) {
+					BigDecimal sum = new BigDecimal(dto.getSum());
+					BigDecimal count = new BigDecimal(dto.getCount());
+					entity.setResolvedRatio(count.multiply(hundred).divide(sum, NumConstant.SIX, RoundingMode.HALF_UP));
+				}
+			}));
+		}
+		screenGovernRankDataDailyService.delAndSaveRankData(customerId, OrgTypeConstant.AGENCY, dateId, IndexCalConstant.DELETE_SIZE, list);
+	}
+
+	/**
+	 * 街道治理能力
+	 *
+	 * @param customerId
+	 * @param dateId
+	 * @return void
+	 * @author zhaoqifeng
+	 * @date 2020/9/24 15:17
+	 */
+	@Override
+	public void extractStreetDataDaily(String customerId, String dateId) {
+		List<ScreenGovernRankDataDailyEntity> list = screenGovernRankDataDailyService.initList(customerId, OrgTypeConstant.AGENCY,
+				OrgTypeConstant.STREET);
+		if (CollectionUtils.isEmpty(list)) {
+			return;
+		}
+		BigDecimal hundred = new BigDecimal(NumConstant.ONE_HUNDRED);
+		list.forEach(entity -> {
+			entity.setYearId(dateId.substring(NumConstant.ZERO, NumConstant.FOUR));
+			entity.setMonthId(dateId.substring(NumConstant.ZERO, NumConstant.SIX));
+			entity.setDateId(dateId);
+		});
+
+		//满意率 满意和非常满意占比
+		List<OrgStatisticsResultDTO> satisfactionList =  factOriginProjectLogDailyService.getOrgSatisfactionDaily(customerId, dateId,
+				OrgTypeConstant.STREET);
+		if (CollectionUtils.isNotEmpty(satisfactionList)) {
+			list.forEach(entity -> satisfactionList.stream().filter(item -> item.getAgencyId().equals(entity.getOrgId())).forEach(dto -> {
+				if (dto.getSum() != NumConstant.ZERO) {
+					BigDecimal sum = new BigDecimal(dto.getSum());
+					BigDecimal count = new BigDecimal(dto.getCount());
+					entity.setSatisfactionRatio(count.multiply(hundred).divide(sum, NumConstant.SIX, RoundingMode.HALF_UP));
+				}
+			}));
+		}
+
+		//响应率 响应次数/流转到网格的次数
+		List<OrgStatisticsResultDTO> responseList = factOriginProjectLogDailyService.getOrgResponseDaily(customerId, dateId, OrgTypeConstant.STREET);
+		if (CollectionUtils.isNotEmpty(responseList)) {
+			list.forEach(entity -> responseList.stream().filter(response -> entity.getOrgId().equals(response.getAgencyId())).forEach(dto -> {
+				if (dto.getSum() != NumConstant.ZERO) {
+					BigDecimal sum = new BigDecimal(dto.getSum());
+					BigDecimal count = new BigDecimal(dto.getCount());
+					entity.setResponseRatio(count.multiply(hundred).divide(sum, NumConstant.SIX, RoundingMode.HALF_UP));
+				}
+			}));
+		}
+		//自制率 自治项目数/办结项目数
+		List<OrgStatisticsResultDTO> selfList = factOriginProjectMainDailyService.getSelfProject(customerId, dateId, OrgTypeConstant.STREET);
+		if (CollectionUtils.isNotEmpty(selfList)) {
+			list.forEach(entity -> selfList.stream().filter(self -> entity.getOrgId().equals(self.getAgencyId())).forEach(dto -> {
+				if (dto.getSum() != NumConstant.ZERO) {
+					BigDecimal sum = new BigDecimal(dto.getSum());
+					BigDecimal count = new BigDecimal(dto.getCount());
+					entity.setGovernRatio(count.multiply(hundred).divide(sum, NumConstant.SIX, RoundingMode.HALF_UP));
+				}
+			}));
+		}
+		//解决率 已解决项目数/办结项目数
+		List<OrgStatisticsResultDTO> resolveList = factOriginProjectMainDailyService.getResolveProjectDaily(customerId, dateId,
+				OrgTypeConstant.STREET);
+		if (CollectionUtils.isNotEmpty(resolveList)) {
+			list.forEach(entity -> resolveList.stream().filter(resolve -> entity.getOrgId().equals(resolve.getAgencyId())).forEach(dto -> {
+				if (dto.getSum() != NumConstant.ZERO) {
+					BigDecimal sum = new BigDecimal(dto.getSum());
+					BigDecimal count = new BigDecimal(dto.getCount());
+					entity.setResolvedRatio(count.multiply(hundred).divide(sum, NumConstant.SIX, RoundingMode.HALF_UP));
+				}
+			}));
+		}
+		screenGovernRankDataDailyService.delAndSaveRankData(customerId, OrgTypeConstant.AGENCY, dateId, IndexCalConstant.DELETE_SIZE, list);
+	}
+
+	/**
+	 * 全区治理能力
+	 *
+	 * @param customerId
+	 * @param dateId
+	 * @return void
+	 * @author zhaoqifeng
+	 * @date 2020/9/24 15:17
+	 */
+	@Override
+	public void extractDistrictDataDaily(String customerId, String dateId) {
+		List<ScreenGovernRankDataDailyEntity> list = screenGovernRankDataDailyService.initList(customerId, OrgTypeConstant.AGENCY,
+				OrgTypeConstant.DISTRICT);
+		if (CollectionUtils.isEmpty(list)) {
+			return;
+		}
+		BigDecimal hundred = new BigDecimal(NumConstant.ONE_HUNDRED);
+		list.forEach(entity -> {
+			entity.setYearId(dateId.substring(NumConstant.ZERO, NumConstant.FOUR));
+			entity.setMonthId(dateId.substring(NumConstant.ZERO, NumConstant.SIX));
+			entity.setDateId(dateId);
+		});
+
+		//满意率 满意和非常满意占比
+		List<OrgStatisticsResultDTO> satisfactionList =  factOriginProjectLogDailyService.getOrgSatisfactionDaily(customerId, dateId,
+				OrgTypeConstant.DISTRICT);
+		if (CollectionUtils.isNotEmpty(satisfactionList)) {
+			list.forEach(entity -> satisfactionList.stream().filter(item -> item.getAgencyId().equals(entity.getOrgId())).forEach(dto -> {
+				if (dto.getSum() != NumConstant.ZERO) {
+					BigDecimal sum = new BigDecimal(dto.getSum());
+					BigDecimal count = new BigDecimal(dto.getCount());
+					entity.setSatisfactionRatio(count.multiply(hundred).divide(sum, NumConstant.SIX, RoundingMode.HALF_UP));
+				}
+			}));
+		}
+
+		//响应率 响应次数/流转到网格的次数
+		List<OrgStatisticsResultDTO> responseList = factOriginProjectLogDailyService.getOrgResponseDaily(customerId, dateId, OrgTypeConstant.DISTRICT);
+		if (CollectionUtils.isNotEmpty(responseList)) {
+			list.forEach(entity -> responseList.stream().filter(response -> entity.getOrgId().equals(response.getAgencyId())).forEach(dto -> {
+				if (dto.getSum() != NumConstant.ZERO) {
+					BigDecimal sum = new BigDecimal(dto.getSum());
+					BigDecimal count = new BigDecimal(dto.getCount());
+					entity.setResponseRatio(count.multiply(hundred).divide(sum, NumConstant.SIX, RoundingMode.HALF_UP));
+				}
+			}));
+		}
+		//自制率 自治项目数/办结项目数
+		List<OrgStatisticsResultDTO> selfList = factOriginProjectMainDailyService.getSelfProject(customerId, dateId, OrgTypeConstant.DISTRICT);
+		if (CollectionUtils.isNotEmpty(selfList)) {
+			list.forEach(entity -> selfList.stream().filter(self -> entity.getOrgId().equals(self.getAgencyId())).forEach(dto -> {
+				if (dto.getSum() != NumConstant.ZERO) {
+					BigDecimal sum = new BigDecimal(dto.getSum());
+					BigDecimal count = new BigDecimal(dto.getCount());
+					entity.setGovernRatio(count.multiply(hundred).divide(sum, NumConstant.SIX, RoundingMode.HALF_UP));
+				}
+			}));
+		}
+		//解决率 已解决项目数/办结项目数
+		List<OrgStatisticsResultDTO> resolveList = factOriginProjectMainDailyService.getResolveProjectDaily(customerId, dateId,
+				OrgTypeConstant.DISTRICT);
+		if (CollectionUtils.isNotEmpty(resolveList)) {
+			list.forEach(entity -> resolveList.stream().filter(resolve -> entity.getOrgId().equals(resolve.getAgencyId())).forEach(dto -> {
+				if (dto.getSum() != NumConstant.ZERO) {
+					BigDecimal sum = new BigDecimal(dto.getSum());
+					BigDecimal count = new BigDecimal(dto.getCount());
+					entity.setResolvedRatio(count.multiply(hundred).divide(sum, NumConstant.SIX, RoundingMode.HALF_UP));
+				}
+			}));
+		}
+		screenGovernRankDataDailyService.delAndSaveRankData(customerId, OrgTypeConstant.AGENCY, dateId, IndexCalConstant.DELETE_SIZE, list);
+	}
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java
index 0697a46edd..b69cb0e595 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java
@@ -221,6 +221,28 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
             log.error("按天统计：组织内各个分类下的项目总数，customerId为："+customerId+"dateId为："+dateId, e);
         }
 
+        //治理能力排行screen_govern_rank_data
+        try {
+            governRankDataExtractService.extractGridDataDaily(customerId, dateId);
+        }catch (Exception e){
+            log.error("治理能力排行【网格】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+        }
+        try {
+            governRankDataExtractService.extractCommunityDataDaily(customerId, dateId);
+        }catch (Exception e){
+            log.error("治理能力排行【社区】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+        }
+        try {
+            governRankDataExtractService.extractStreetDataDaily(customerId, dateId);
+        }catch (Exception e){
+            log.error("治理能力排行【街道】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+        }
+        try {
+            governRankDataExtractService.extractDistrictDataDaily(customerId, dateId);
+        }catch (Exception e){
+            log.error("治理能力排行【全区】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+        }
+
         extractPartData(customerId, dateId);
         log.info("===== extractDaily method end ======");
     }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyService.java
index 8010a566d2..c8621ab7d6 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyService.java
@@ -21,4 +21,15 @@ public interface FactIndexGovrnAblityGridMonthlyService extends BaseService<Fact
 	 * @date 2020/9/24 15:41
 	 */
 	List<FactIndexGovrnAblityGridMonthlyEntity> getGridByCustomer(String customerId, String monthId);
+
+	/**
+	 * 查询客户下网格治理能力
+	 *
+	 * @param customerId
+	 * @param dateId
+	 * @return java.util.List<com.epmet.entity.evaluationindex.indexcoll.FactIndexGovrnAblityGridMonthlyEntity>
+	 * @author zhaoqifeng
+	 * @date 2020/9/24 15:41
+	 */
+	List<FactIndexGovrnAblityGridMonthlyEntity> getGridByCustomerDaily(String customerId, String dateId);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexGovrnAblityGridMonthlyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexGovrnAblityGridMonthlyServiceImpl.java
index 3f9c73afb3..bf3dd65e5e 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexGovrnAblityGridMonthlyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexGovrnAblityGridMonthlyServiceImpl.java
@@ -22,4 +22,18 @@ public class FactIndexGovrnAblityGridMonthlyServiceImpl extends BaseServiceImpl<
 	public List<FactIndexGovrnAblityGridMonthlyEntity> getGridByCustomer(String customerId, String monthId) {
 		return baseDao.selectGridByCustomer(customerId, monthId);
 	}
+
+	/**
+	 * 查询客户下网格治理能力
+	 *
+	 * @param customerId
+	 * @param dateId
+	 * @return java.util.List<com.epmet.entity.evaluationindex.indexcoll.FactIndexGovrnAblityGridMonthlyEntity>
+	 * @author zhaoqifeng
+	 * @date 2020/9/24 15:41
+	 */
+	@Override
+	public List<FactIndexGovrnAblityGridMonthlyEntity> getGridByCustomerDaily(String customerId, String dateId) {
+		return baseDao.selectGridByCustomerDaily(customerId, dateId);
+	}
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenGovernRankDataDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenGovernRankDataDailyService.java
new file mode 100644
index 0000000000..0fa086cfb7
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenGovernRankDataDailyService.java
@@ -0,0 +1,121 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.evaluationindex.screen;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.screen.ScreenGovernRankDataDailyDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenGovernRankDataDailyEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 基层治理-治理能力排行数据(按月统计)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-24
+ */
+public interface ScreenGovernRankDataDailyService extends BaseService<ScreenGovernRankDataDailyEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<ScreenGovernRankDataDailyDTO>
+     * @author generator
+     * @date 2021-05-24
+     */
+    PageData<ScreenGovernRankDataDailyDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<ScreenGovernRankDataDailyDTO>
+     * @author generator
+     * @date 2021-05-24
+     */
+    List<ScreenGovernRankDataDailyDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return ScreenGovernRankDataDailyDTO
+     * @author generator
+     * @date 2021-05-24
+     */
+    ScreenGovernRankDataDailyDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-05-24
+     */
+    void save(ScreenGovernRankDataDailyDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-05-24
+     */
+    void update(ScreenGovernRankDataDailyDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-05-24
+     */
+    void delete(String[] ids);
+
+    /**
+     * 构造screen_govern_rank_data 初始数据，先赋值为0
+     *
+     * @param customerId
+     * @param orgType
+     * @param agencyLevel
+     * @return java.util.List<com.epmet.entity.evaluationindex.screen.ScreenGovernRankDataEntity>
+     * @author zhaoqifeng
+     * @date 2020/9/24 14:41
+     */
+    List<ScreenGovernRankDataDailyEntity> initList(String customerId, String orgType, String agencyLevel);
+
+    /**
+     * 保存抽取结果
+     *
+     * @param customerId
+     * @param orgType
+     * @param dateId
+     * @param deleteSize
+     * @param entityList
+     * @return void
+     * @author zhaoqifeng
+     * @date 2020/9/25 10:32
+     */
+    void delAndSaveRankData(String customerId, String orgType, String dateId, Integer deleteSize, List<ScreenGovernRankDataDailyEntity> entityList);
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenGovernRankDataDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenGovernRankDataDailyServiceImpl.java
new file mode 100644
index 0000000000..6c9054d6b0
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenGovernRankDataDailyServiceImpl.java
@@ -0,0 +1,169 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.evaluationindex.screen.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.constant.DataSourceConstant;
+import com.epmet.constant.OrgTypeConstant;
+import com.epmet.dao.evaluationindex.screen.ScreenGovernRankDataDailyDao;
+import com.epmet.dto.screen.ScreenGovernRankDataDailyDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenGovernRankDataDailyEntity;
+import com.epmet.entity.evaluationindex.screen.ScreenGovernRankDataEntity;
+import com.epmet.service.evaluationindex.screen.ScreenGovernRankDataDailyService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 基层治理-治理能力排行数据(按月统计)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-24
+ */
+@Service
+@Slf4j
+@DataSource(DataSourceConstant.EVALUATION_INDEX)
+public class ScreenGovernRankDataDailyServiceImpl extends BaseServiceImpl<ScreenGovernRankDataDailyDao, ScreenGovernRankDataDailyEntity> implements ScreenGovernRankDataDailyService {
+
+
+    @Override
+    public PageData<ScreenGovernRankDataDailyDTO> page(Map<String, Object> params) {
+        IPage<ScreenGovernRankDataDailyEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, ScreenGovernRankDataDailyDTO.class);
+    }
+
+    @Override
+    public List<ScreenGovernRankDataDailyDTO> list(Map<String, Object> params) {
+        List<ScreenGovernRankDataDailyEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, ScreenGovernRankDataDailyDTO.class);
+    }
+
+    private QueryWrapper<ScreenGovernRankDataDailyEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<ScreenGovernRankDataDailyEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public ScreenGovernRankDataDailyDTO get(String id) {
+        ScreenGovernRankDataDailyEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, ScreenGovernRankDataDailyDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(ScreenGovernRankDataDailyDTO dto) {
+        ScreenGovernRankDataDailyEntity entity = ConvertUtils.sourceToTarget(dto, ScreenGovernRankDataDailyEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(ScreenGovernRankDataDailyDTO dto) {
+        ScreenGovernRankDataDailyEntity entity = ConvertUtils.sourceToTarget(dto, ScreenGovernRankDataDailyEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+    /**
+     * 构造screen_govern_rank_data 初始数据，先赋值为0
+     *
+     * @param customerId
+     * @param orgType
+     * @param agencyLevel
+     * @return java.util.List<com.epmet.entity.evaluationindex.screen.ScreenGovernRankDataEntity>
+     * @author zhaoqifeng
+     * @date 2020/9/24 14:41
+     */
+    @Override
+    public List<ScreenGovernRankDataDailyEntity> initList(String customerId, String orgType, String agencyLevel) {
+        List<ScreenGovernRankDataDailyEntity> list = new ArrayList<>();
+        switch (orgType) {
+            case OrgTypeConstant.AGENCY:
+                log.info("组织级别统计");
+                list = baseDao.initAgencyDataList(customerId, agencyLevel);
+                break;
+            case OrgTypeConstant.GRID:
+                log.info("网格级别统计");
+                list = baseDao.initGridDataList(customerId);
+                break;
+            default:
+                log.info("部门级别统计");
+                break;
+        }
+        return list;
+    }
+
+    /**
+     * 保存抽取结果
+     *
+     * @param customerId
+     * @param orgType
+     * @param dateId
+     * @param deleteSize
+     * @param entityList
+     * @return void
+     * @author zhaoqifeng
+     * @date 2020/9/25 10:32
+     */
+    @Override
+    public void delAndSaveRankData(String customerId, String orgType, String dateId, Integer deleteSize,
+                                   List<ScreenGovernRankDataDailyEntity> entityList) {
+        if (CollectionUtils.isEmpty(entityList)) {
+            return;
+        }
+        List<String> orgIds = new ArrayList<>();
+        for (ScreenGovernRankDataDailyEntity entity : entityList) {
+            orgIds.add(entity.getOrgId());
+        }
+        int deleteNum;
+        do {
+            deleteNum = baseDao.deleteRankData(customerId, orgType, dateId, deleteSize, orgIds);
+        } while (deleteNum != NumConstant.ZERO);
+
+        insertBatch(entityList);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java
index 56a99d5257..36c3ebd05b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java
@@ -23,6 +23,7 @@ import com.epmet.dto.ProjectDTO;
 import com.epmet.dto.project.ProjectAgencyDTO;
 import com.epmet.dto.project.ProjectGridDTO;
 import com.epmet.dto.project.result.ProjectExceedParamsResultDTO;
+import com.epmet.entity.evaluationindex.extract.FactOriginProjectMainDailyEntity;
 import com.epmet.entity.project.ProjectEntity;
 import org.apache.ibatis.annotations.Param;
 
@@ -152,4 +153,13 @@ public interface ProjectService extends BaseService<ProjectEntity> {
      */
     List<ProjectCategoryDTO> getProjectCategoryData(String customerId, String dateId);
 
+    /**
+     * 获取项目满意度
+     * @author zhaoqifeng
+     * @date 2021/5/21 10:04
+     * @param customerId
+     * @return java.util.List<com.epmet.entity.evaluationindex.extract.FactOriginProjectMainDailyEntity>
+     */
+    List<FactOriginProjectMainDailyEntity> getProjectSatisfaction(String customerId);
+
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java
index d2a3ff001d..3581f920b1 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java
@@ -26,17 +26,16 @@ import com.epmet.dto.ProjectDTO;
 import com.epmet.dto.project.ProjectAgencyDTO;
 import com.epmet.dto.project.ProjectCategoryDTO;
 import com.epmet.dto.project.ProjectGridDTO;
+import com.epmet.dto.project.ProjectPointDTO;
 import com.epmet.dto.project.result.ProjectExceedParamsResultDTO;
+import com.epmet.entity.evaluationindex.extract.FactOriginProjectMainDailyEntity;
 import com.epmet.entity.project.ProjectEntity;
 import com.epmet.service.project.ProjectService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -163,5 +162,39 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		return baseDao.getProjectCategoryData(customerId,dateId);
 	}
 
+	/**
+	 * 获取项目满意度
+	 *
+	 * @param customerId
+	 * @return java.util.List<com.epmet.entity.evaluationindex.extract.FactOriginProjectMainDailyEntity>
+	 * @author zhaoqifeng
+	 * @date 2021/5/21 10:04
+	 */
+	@Override
+	public List<FactOriginProjectMainDailyEntity> getProjectSatisfaction(String customerId) {
+		List<ProjectPointDTO> list = baseDao.selectProjectSatisfaction(customerId);
+		if (org.apache.commons.collections4.CollectionUtils.isEmpty(list)) {
+			return Collections.emptyList();
+		}
+		//获取项目满意指标
+		String value = baseDao.selectValueByKey(customerId, "satisfaction");
+		if (null == value) {
+			//客户没有自定义配置的话取默认配置
+			value = baseDao.selectValueByKey("default", "satisfaction");
+		}
+
+		String finalValue = value;
+		return list.stream().map(item -> {
+			FactOriginProjectMainDailyEntity entity = new FactOriginProjectMainDailyEntity();
+			entity.setId(item.getProjectId());
+			if (item.getPoint() < Integer.parseInt(finalValue)) {
+				entity.setIsSatisfied(NumConstant.ZERO);
+			} else {
+				entity.setIsSatisfied(NumConstant.ONE);
+			}
+			return entity;
+		}).collect(Collectors.toList());
+	}
+
 
 }
diff --git 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
index 7b2a4f9ae7..4d913d3edf 100644
--- 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
@@ -362,33 +362,22 @@
     <select id="selectGridSatisfaction" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
         SELECT
             GRID_ID AS "orgId",
-            COUNT( score &gt;= 80 OR NULL ) AS 'count',
+            SUM( score ) AS 'count',
             COUNT( ID ) AS 'sum'
         FROM
             (
                 SELECT
                     fm.GRID_ID,
                     fm.ID,
-                    IFNULL( fl.score, 80 ) AS "score"
+                    IFNULL( IS_SATISFIED, 1 ) AS "score"
                 FROM
                     fact_origin_project_main_daily fm
-                LEFT JOIN (
-                SELECT
-                    f.PROJECT_ID,
-                    AVG( CASE ACTION_CODE WHEN 'bad' THEN 60 WHEN 'perfect' THEN 100 ELSE 80 END ) AS score
-                FROM
-                    fact_origin_project_log_daily f
                 WHERE
-                    ( ACTION_CODE = 'bad' OR ACTION_CODE = 'good' OR ACTION_CODE = 'perfect' )
-                  AND f.CUSTOMER_ID = #{customerId}
-                  AND f.MONTH_ID = #{monthId}
-                GROUP BY
-                    PROJECT_ID
-            ) fl ON fm.ID = fl.PROJECT_ID
-                WHERE  fm.CUSTOMER_ID = #{customerId}
+                    fm.CUSTOMER_ID = #{customerId}
                   AND fm.MONTH_ID = #{monthId}
                   AND fm.PROJECT_STATUS = 'closed'
                   AND fm.GRID_ID != ''
+                  AND fm.ORIGIN = 'issue'
             ) a
         GROUP BY
             GRID_ID
@@ -396,36 +385,20 @@
     <select id="selectOrgSatisfaction" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
         SELECT
             AGENCY_ID,
-            COUNT( score &gt;= 80 OR NULL ) AS 'count',
+            SUM( score ) AS 'count',
             COUNT( ID ) AS 'sum'
         FROM
             (
                 SELECT
                     fm.AGENCY_ID,
                     fm.ID,
-                    IFNULL( fl.score, 80 ) AS "score"
+                    IFNULL( IS_SATISFIED, 1 ) AS "score"
                 FROM
                     fact_origin_project_main_daily fm
-                INNER JOIN dim_agency da ON fm.AGENCY_ID = da.ID
-                        AND da.`LEVEL` = #{level}
-                LEFT JOIN (
-                SELECT
-                    f.PROJECT_ID,
-                    AVG( CASE ACTION_CODE WHEN 'bad' THEN 60 WHEN 'perfect' THEN 100 ELSE 80 END ) AS score
-                FROM
-                    fact_origin_project_log_daily f
-                        INNER JOIN dim_agency da ON f.AGENCY_ID = da.ID
-                        AND da.`LEVEL` = #{level}
-                WHERE
-                    ( ACTION_CODE = 'bad' OR ACTION_CODE = 'good' OR ACTION_CODE = 'perfect' )
-                  AND f.CUSTOMER_ID = #{customerId}
-                  AND f.MONTH_ID = #{monthId}
-                GROUP BY
-                    PROJECT_ID
-            ) fl ON fm.ID = fl.PROJECT_ID
                 WHERE  fm.CUSTOMER_ID = #{customerId}
                     AND fm.MONTH_ID = #{monthId}
                   AND fm.PROJECT_STATUS = 'closed'
+                  AND fm.ORIGIN = 'issue'
             ) a
         GROUP BY
             AGENCY_ID
@@ -552,4 +525,111 @@
         GROUP BY PROJECT_ID
         HAVING COUNT(DISTINCT(ORG_ID)) = 1
     </select>
+    <select id="selectGridSatisfactionDaily" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
+        SELECT
+            GRID_ID AS "orgId",
+            SUM( score ) AS 'count',
+            COUNT( ID ) AS 'sum'
+        FROM
+            (
+                SELECT
+                    fm.GRID_ID,
+                    fm.ID,
+                    IFNULL( IS_SATISFIED, 1 ) AS "score"
+                FROM
+                    fact_origin_project_main_daily fm
+                WHERE
+                    fm.CUSTOMER_ID = #{customerId}
+                  AND fm.PROJECT_STATUS = 'closed'
+                  AND fm.GRID_ID != ''
+                  AND fm.ORIGIN = 'issue'
+            ) a
+        GROUP BY
+            GRID_ID
+    </select>
+    <select id="selectOrgSatisfactionDaily" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
+        SELECT
+            AGENCY_ID,
+            SUM( score ) AS 'count',
+            COUNT( ID ) AS 'sum'
+        FROM
+            (
+                SELECT
+                    fm.AGENCY_ID,
+                    fm.ID,
+                    IFNULL( IS_SATISFIED, 1 ) AS "score"
+                FROM
+                    fact_origin_project_main_daily fm
+                WHERE  fm.CUSTOMER_ID = #{customerId}
+                  AND fm.PROJECT_STATUS = 'closed'
+                  AND fm.ORIGIN = 'issue'
+            ) a
+        GROUP BY
+            AGENCY_ID
+    </select>
+    <select id="selectOrgResponseDaily" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
+        SELECT a.AGENCY_ID,
+               a.count AS "sum",
+               IFNULL( b.count,
+                       0 ) AS "count"
+        FROM
+            (SELECT f.AGENCY_ID,
+                    COUNT( f.ID ) AS "count"
+             FROM fact_origin_project_log_daily f
+                      INNER JOIN dim_agency da ON f.AGENCY_ID = da.ID
+                 AND da.`LEVEL` = #{level}
+             WHERE f.IS_ACTIVE = 0
+               AND f.CUSTOMER_ID = #{customerId}
+               AND f.DATE_ID &lt;= #{dateId}
+             GROUP BY  f.AGENCY_ID ) a
+                LEFT JOIN
+            (SELECT f.AGENCY_ID,
+                    COUNT( f.ID ) AS "count"
+             FROM fact_origin_project_log_daily f
+                      INNER JOIN dim_agency da ON f.AGENCY_ID = da.ID
+                 AND da.`LEVEL` = #{level}
+             WHERE
+                 ( ACTION_CODE = 'response'
+                     OR ACTION_CODE = 'close'
+                     OR ACTION_CODE = 'transfer'
+                     OR ACTION_CODE = 'resolved'
+                     OR ACTION_CODE = 'unresolved'
+                     OR ACTION_CODE = 'created' )
+               AND f.IS_ACTIVE = 1
+               AND f.CUSTOMER_ID = #{customerId}
+               AND f.DATE_ID &lt;= #{dateId}
+             GROUP BY  f.AGENCY_ID ) b
+            ON a.AGENCY_ID = b.AGENCY_ID
+    </select>
+    <select id="selectGridResponseDaily" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
+        SELECT a.ORG_ID,
+               a.count AS "sum",
+               IFNULL( b.count,
+                       0 ) AS "count"
+        FROM
+            (SELECT ORG_ID,
+                    COUNT( ID ) AS "count"
+             FROM fact_origin_project_log_daily
+             WHERE ORG_TYPE = 'grid'
+               AND IS_ACTIVE = 0
+               AND CUSTOMER_ID = #{customerId}
+               AND DATE_ID &lt;= #{dateId}
+             GROUP BY  ORG_ID ) a
+                LEFT JOIN
+            (SELECT ORG_ID,
+                    COUNT( ID ) AS "count"
+             FROM fact_origin_project_log_daily
+             WHERE ORG_TYPE = 'grid'
+               AND ( ACTION_CODE = 'response'
+                 OR ACTION_CODE = 'close'
+                 OR ACTION_CODE = 'transfer'
+                 OR ACTION_CODE = 'resolved'
+                 OR ACTION_CODE = 'unresolved'
+                 OR ACTION_CODE = 'created' )
+               AND IS_ACTIVE = 1
+               AND CUSTOMER_ID = #{customerId}
+               AND DATE_ID &lt;= #{dateId}
+             GROUP BY  ORG_ID ) b
+            ON a.ORG_ID = b.ORG_ID
+    </select>
 </mapper>
\ No newline at end of file
diff --git 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
index dc6b766fb7..34156fb11b 100644
--- 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
@@ -807,5 +807,111 @@
           AND ORIGIN = 'issue'
         GROUP BY GRID_ID
     </select>
+    <select id="getGridResolveProjectDaily" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
+        SELECT
+            a.GRID_ID AS "orgId",
+            a.count AS "sum",
+            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 = 'close'
+               AND fm.GRID_ID != ''
+               AND fm.CUSTOMER_ID = #{customerId}
+               AND fm.DATE_ID &lt;= #{dateId}
+             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 = 'close'
+               AND fm.GRID_ID != ''
+               AND fm.CUSTOMER_ID = #{customerId}
+               AND fm.DATE_ID &lt;= #{dateId}
+               AND fm.IS_RESOLVED = 'resolved'
+             GROUP BY
+                 fm.GRID_ID) b
+            ON a.GRID_ID = b.GRID_ID
+    </select>
+    <select id="getSelfProjectDaily" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
+        SELECT
+            a.AGENCY_ID,
+            a.count AS "sum",
+            IFNULL(b.count,0) AS "count"
+        FROM
+            (SELECT
+                 fm.AGENCY_ID,
+                 COUNT( fm.ID ) AS "count"
+             FROM
+                 fact_origin_project_main_daily fm
+                     INNER JOIN dim_agency da ON fm.AGENCY_ID = da.ID
+                     AND da.`LEVEL` = #{level}
+             WHERE
+                 fm.PROJECT_STATUS = 'closed'
+               AND fm.CUSTOMER_ID = #{customerId}
+               AND fm.DATE_ID &lt;= #{dateId}
+             GROUP BY
+                 fm.AGENCY_ID) a
+                LEFT JOIN
+            (SELECT
+                 fm.AGENCY_ID,
+                 COUNT( fm.ID ) AS "count"
+             FROM
+                 fact_origin_project_main_daily fm
+                     INNER JOIN dim_agency da ON fm.AGENCY_ID = da.ID
+                     AND da.`LEVEL` = #{level}
+             WHERE
+                 fm.PROJECT_STATUS = 'closed'
+               AND fm.CUSTOMER_ID = #{customerId}
+               AND fm.DATE_ID &lt;= #{dateId}
+               AND fm.FINISH_ORG_IDS LIKE CONCAT('%', fm.AGENCY_ID,'%')
+             GROUP BY
+                 fm.AGENCY_ID) b
+            ON a.AGENCY_ID = b.AGENCY_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"
+        FROM
+            (SELECT
+                 fm.AGENCY_ID,
+                 COUNT( fm.ID ) AS "count"
+             FROM
+                 fact_origin_project_main_daily fm
+                     INNER JOIN dim_agency da ON fm.AGENCY_ID = da.ID
+                     AND da.`LEVEL` = #{level}
+             WHERE
+                 fm.PROJECT_STATUS = 'close'
+               AND fm.CUSTOMER_ID = #{customerId}
+               AND fm.DATE_ID &lt;= #{dateId}
+             GROUP BY
+                 fm.AGENCY_ID) a
+                LEFT JOIN
+            (SELECT
+                 fm.AGENCY_ID,
+                 COUNT( fm.ID ) AS "count"
+             FROM
+                 fact_origin_project_main_daily fm
+                     INNER JOIN dim_agency da ON fm.AGENCY_ID = da.ID
+                     AND da.`LEVEL` = #{level}
+             WHERE
+                 fm.PROJECT_STATUS = 'close'
+               AND fm.CUSTOMER_ID = #{customerId}
+               AND fm.DATE_ID &lt;= #{dateId}
+               AND fm.IS_RESOLVED = 'resolved'
+             GROUP BY
+                 fm.AGENCY_ID) b
+            ON a.AGENCY_ID = b.AGENCY_ID
+    </select>
 
 </mapper>
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyDao.xml
index 755e3aab60..1285067483 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyDao.xml
@@ -256,6 +256,21 @@
             CUSTOMER_ID = #{customerId}
         AND MONTH_ID = #{monthId}
     </select>
+    <select id="selectGridByCustomerDaily" resultType="com.epmet.entity.evaluationindex.indexcoll.FactIndexGovrnAblityGridMonthlyEntity">
+        SELECT
+            GRID_ID,
+            MONTH_ID,
+            YEAR_ID,
+            PROJECT_TOTAL,
+            SELF_SOLVE_PROJECT_COUNT,
+            RESOLVE_PROJECT_COUNT,
+            SATISFACTION_RATIO
+        FROM
+            fact_index_govrn_ablity_grid_monthly
+        WHERE
+            CUSTOMER_ID = #{customerId}
+          AND DATE_ID &lt;= #{dateId}
+    </select>
 
     <!-- 批量插入治理能力 -->
     <insert id="insertGovernAbilityRecord">
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenGovernRankDataDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenGovernRankDataDailyDao.xml
new file mode 100644
index 0000000000..eec63e765b
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenGovernRankDataDailyDao.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.evaluationindex.screen.ScreenGovernRankDataDailyDao">
+
+    <resultMap type="com.epmet.entity.evaluationindex.screen.ScreenGovernRankDataDailyEntity" id="screenGovernRankDataDailyMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="yearId" column="YEAR_ID"/>
+        <result property="monthId" column="MONTH_ID"/>
+        <result property="dateId" column="DATE_ID"/>
+        <result property="orgType" column="ORG_TYPE"/>
+        <result property="orgId" column="ORG_ID"/>
+        <result property="parentId" column="PARENT_ID"/>
+        <result property="orgName" column="ORG_NAME"/>
+        <result property="responseRatio" column="RESPONSE_RATIO"/>
+        <result property="resolvedRatio" column="RESOLVED_RATIO"/>
+        <result property="governRatio" column="GOVERN_RATIO"/>
+        <result property="satisfactionRatio" column="SATISFACTION_RATIO"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+    <delete id="deleteRankData">
+        delete from screen_govern_rank_data
+        where CUSTOMER_ID = #{customerId}
+        AND DATE_ID &lt;= #{dateId}
+        <if test='null != orgType and "" != orgType'>
+            and ORG_TYPE=#{orgType}
+        </if>
+        <if test='null!=orgIds and orgIds.size()>0'>
+            and
+            (
+            <foreach collection="orgIds" item="orgId" separator=" OR ">
+                ORG_ID = #{orgId}
+            </foreach>
+            )
+        </if>
+        limit #{deleteSize}
+    </delete>
+
+    <select id="initAgencyDataList" resultType="com.epmet.entity.evaluationindex.screen.ScreenGovernRankDataDailyEntity">
+        SELECT DISTINCT
+            CUSTOMER_ID,
+            'agency' AS ORG_TYPE,
+            AGENCY_ID AS ORG_ID,
+            PID AS PARENT_ID,
+            AGENCY_NAME AS ORG_NAME,
+            0 AS RESPONSE_RATIO,
+            0 AS RESOLVED_RATIO,
+            0 AS GOVERN_RATIO,
+            0 AS SATISFACTION_RATIO
+        FROM
+            screen_customer_agency
+        WHERE
+            CUSTOMER_ID = #{customerId}
+          AND `LEVEL` = #{level}
+    </select>
+    <select id="initGridDataList" resultType="com.epmet.entity.evaluationindex.screen.ScreenGovernRankDataDailyEntity">
+        SELECT DISTINCT
+            CUSTOMER_ID,
+            'grid' AS ORG_TYPE,
+            GRID_ID AS ORG_ID,
+            PARENT_AGENCY_ID AS PARENT_ID,
+            GRID_NAME AS ORG_NAME,
+            0 AS RESPONSE_RATIO,
+            0 AS RESOLVED_RATIO,
+            0 AS GOVERN_RATIO,
+            0 AS SATISFACTION_RATIO
+        FROM
+            screen_customer_grid
+        WHERE
+            CUSTOMER_ID = #{customerId}
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml
index 58dd19a9e5..3c5ebd884f 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml
@@ -145,4 +145,21 @@
             AND DATE_FORMAT(CREATED_TIME,'%Y%m%d')=#{dateId}
         </if>
     </select>
+    <select id="selectProjectSatisfaction" resultType="com.epmet.dto.project.ProjectPointDTO">
+        SELECT
+            PROJECT_ID,
+            ( PERFECT_COUNT * 100 + (SHOULD_EVALUATE_COUNT-PERFECT_COUNT-BAD_COUNT) * 80 + BAD_COUNT * 60 ) DIV SHOULD_EVALUATE_COUNT AS point
+        FROM
+            project_satisfaction_statistics
+        WHERE CUSTOMER_ID = #{customerId}
+    </select>
+    <select id="selectValueByKey" resultType="java.lang.String">
+        select
+            PARAMETER_VALUE
+        from
+            customer_project_parameter
+        where DEL_FLAG = '0'
+          and CUSTOMER_ID = #{customerId}
+          and PARAMETER_KEY = #{parameterKey}
+    </select>
 </mapper>
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/user/FactRegUserGridMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/user/FactRegUserGridMonthlyDao.xml
index 209d13e228..821ca24983 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/user/FactRegUserGridMonthlyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/user/FactRegUserGridMonthlyDao.xml
@@ -131,6 +131,17 @@
           AND CUSTOMER_ID = #{customerId}
           AND MONTH_ID = #{monthId}
     </select>
+    <select id="selectGridUserCountByCustomerDaily" resultType="com.epmet.dto.stats.user.FactRegUserGridMonthlyDTO">
+        SELECT
+            GRID_ID,
+            PARTYMEMBER_TOTAL
+        FROM
+            fact_reg_user_grid_daily
+        WHERE
+            DEL_FLAG = '0'
+          AND CUSTOMER_ID = #{customerId}
+          AND DATE_ID &lt;= #{dateId}
+    </select>
 
 
 </mapper>
\ No newline at end of file

From 70edf314c40f7e162873e73cfd83e18bb2fa6763 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 24 May 2021 17:08:38 +0800
Subject: [PATCH 066/128] zancun

---
 .../todata/FactGridGovernDailyService.java    | 14 ++++++-
 .../impl/FactGridGovernDailyServiceImpl.java  | 39 +++++++++++++++++++
 2 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactGridGovernDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactGridGovernDailyService.java
index d5ffd39cd4..95185f2134 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactGridGovernDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactGridGovernDailyService.java
@@ -27,6 +27,18 @@ import com.epmet.entity.evaluationindex.extract.FactGridGovernDailyEntity;
  * @since v1.0.0 2021-05-24
  */
 public interface FactGridGovernDailyService extends BaseService<FactGridGovernDailyEntity> {
-
+    // 指标解释：
+    // 1、问题解决总数：当前网格内，话题关闭（已解决+无需解决）总数、议题关闭（已解决+无需解决）总数和项目结案（议题转为项目的结案数+项目立项结案数）总数之和
+    // 2、党群自治占比：当前网格内，所有小组内关闭（已解决+无需解决）的话题数与问题解决总数之比（未出小组：未转议题的）
+    // 3、网格自治占比：当前组织下，所有网格内结案项目数与问题解决总数之比（未出网格）
+    /**
+     * 治理指数-网格相关：问题解决总数、党群自治占比、网格自治占比
+     *
+     *
+     * @param customerId
+     * @param dateId
+     * @return
+     */
+    void extractFactGridGovernDaily(String customerId, String dateId);
 
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java
index 99e73d3603..38b5a2d8a0 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java
@@ -19,17 +19,56 @@ package com.epmet.service.evaluationindex.extract.todata.impl;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.dao.evaluationindex.extract.FactGridGovernDailyDao;
+import com.epmet.dto.org.GridInfoDTO;
 import com.epmet.entity.evaluationindex.extract.FactGridGovernDailyEntity;
 import com.epmet.service.evaluationindex.extract.todata.FactGridGovernDailyService;
+import com.epmet.service.group.GroupDataService;
+import com.epmet.service.org.CustomerAgencyService;
+import com.epmet.service.org.CustomerGridService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 网格的治理指数，按天统计
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-05-24
  */
+@Slf4j
 @Service
 public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGovernDailyDao, FactGridGovernDailyEntity> implements FactGridGovernDailyService {
+    @Autowired
+    private GroupDataService groupDataService;
+    @Autowired
+    private CustomerAgencyService customerAgencyService;
+    @Autowired
+    private CustomerGridService customerGridService;
+
 
+    // 指标解释：
+    // 1、问题解决总数：当前网格内，话题关闭（已解决+无需解决）总数、议题关闭（已解决+无需解决）总数和项目结案（议题转为项目的结案数+项目立项结案数）总数之和
+    // 2、党群自治占比：当前网格内，所有小组内关闭（已解决+无需解决）的话题数与问题解决总数之比（未出小组：未转议题的）
+    // 3、网格自治占比：当前组织下，所有网格内结案项目数与问题解决总数之比（未出网格）
+    /**
+     * 治理指数-网格相关：问题解决总数、党群自治占比、网格自治占比
+     *
+     * @param customerId
+     * @param dateId
+     * @return
+     */
+    @Override
+    public void extractFactGridGovernDaily(String customerId, String dateId) {
+        //客户id, dateId不能为空
+        if(StringUtils.isBlank(customerId)||StringUtils.isBlank(dateId)){
+            return;
+        }
+        // 2、当前客户下所有的网格
+        List<GridInfoDTO> gridInfoDTOList=customerGridService.queryGridInfoList(customerId);
+        //todo
+        // List<FactGridGovernDailyEntity>
+    }
 }
\ No newline at end of file

From e789a8941667d91612e1561b0bad7242bde198ff Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 24 May 2021 17:21:05 +0800
Subject: [PATCH 067/128] FactAgencyGovernDailyService

---
 .../todata/FactAgencyGovernDailyService.java      | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactAgencyGovernDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactAgencyGovernDailyService.java
index 1f8440c281..2c0050903c 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactAgencyGovernDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactAgencyGovernDailyService.java
@@ -27,5 +27,20 @@ import com.epmet.entity.evaluationindex.extract.FactAgencyGovernDailyEntity;
  * @since v1.0.0 2021-05-24
  */
 public interface FactAgencyGovernDailyService extends BaseService<FactAgencyGovernDailyEntity> {
+    // 问题解决总数：当前组织下，话题关闭（已解决+无需解决）总数、议题关闭（已解决+无需解决）总数和项目结案（议题转为项目的结案数+项目立项结案数）总数之和
+    // 党群自治占比：当前组织下，所有小组内关闭（已解决+无需解决）的话题数与问题解决总数之比（未出小组：未转议题的）
+    // 网格自治占比：当前组织下，所有网格内结案项目数与问题解决总数之比（未出网格）
+    // 参考：fact_index_govrn_ablity_grid_monthly的SELF_SOLVE_PROJECT_COUNT计算
+    // 社区解决占比：当前组织下，由社区结案的项目数与问题解决总数之比
+    // 区直部门解决占比：当前组织下，由区级部门结案的项目数与问题解决总数之比
+    // 街道解决占比：当前组织下，由街道结案的项目数与问题解决总数之比
+    // 自下而上的项目解决：结案时操作人所代表的的处理部门（可以是网格、街道、组织）
+    // 自上而下的项目解决：向下吹哨，谁立项谁解决（后期在讨论哪样更合理）
+    //
+    // 究竟是谁解决！！：
+    // A社区→A街道→B社区（结案）——A街道解决（自下而上吹（饱含立项往上吹/从话题来的项目），看往上吹的最高层级）
+    // A社区→B社区→C社区（结案）——C社区解决（平级协助解决，看最后结案）
+    // A街道→A社区→B社区（结案）——A街道解决（自上而下吹，谁立项谁解决）
+    // 注：A社区→A街道→（退回）A社区→B社区（结案），A街道不算处理项目，仍是平级协助解决，看最后谁结案
 
 }
\ No newline at end of file

From 0b54d26c6aadf46391de391b8e1c9d51e5219451 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 25 May 2021 09:37:56 +0800
Subject: [PATCH 068/128] =?UTF-8?q?=E6=B2=BB=E7=90=86=E6=8C=87=E6=95=B0?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=A4=E5=BC=A0=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../db/migration/V0.0.15__govern.sql          | 97 +++++++++++++++++++
 1 file changed, 97 insertions(+)
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.15__govern.sql

diff --git 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
new file mode 100644
index 0000000000..7777abc992
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.15__govern.sql
@@ -0,0 +1,97 @@
+-- epmet_data_statistical新增两张表，治理指数网格按天统计，治理指数按组织按天统计
+
+-- /*
+--  Navicat Premium Data Transfer
+--
+--  Source Server         : 192.168.1.130
+--  Source Server Type    : MySQL
+--  Source Server Version : 50728
+--  Source Host           : 192.168.1.130:3306
+--  Source Schema         : epmet_data_statistical
+--
+--  Target Server Type    : MySQL
+--  Target Server Version : 50728
+--  File Encoding         : 65001
+--
+--  Date: 25/05/2021 09:31:39
+-- */
+--
+-- SET NAMES utf8mb4;
+-- SET FOREIGN_KEY_CHECKS = 0;
+--
+-- -- ----------------------------
+-- -- Table structure for fact_agency_govern_daily
+-- -- ----------------------------
+-- DROP TABLE IF EXISTS `fact_agency_govern_daily`;
+-- CREATE TABLE `fact_agency_govern_daily`  (
+--   `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键，customer_id+AGENCY_ID+date_id只有一条记录',
+--   `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客户id',
+--   `DATE_ID` varchar(8) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '数据更新至：yyyyMMdd; ',
+--   `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '组织id',
+--   `LEVEL` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'agency_id所属的机关级别（社区级：community，\r\n乡（镇、街道）级:street,\r\n区县级: district,\r\n市级: city\r\n省级:province）',
+--   `PID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '组织i所属的组织id',
+--   `PIDS` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci 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 '未出当前网格的，结案项目数',
+--   `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) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除、1已删除',
+--   `REVISION` int(11) NOT NULL DEFAULT 0 COMMENT '乐观锁',
+--   `CREATED_BY` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人',
+--   `CREATED_TIME` datetime(0) NOT NULL COMMENT '创建时间：第一次提交审核的时间，注意和历史表的第一条记录时间一致',
+--   `UPDATED_BY` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新人',
+--   `UPDATED_TIME` datetime(0) NOT NULL COMMENT '更新时间',
+--   PRIMARY KEY (`ID`) USING BTREE
+-- ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '组织的治理指数，按天统计' ROW_FORMAT = Dynamic;
+--
+-- -- ----------------------------
+-- -- Table structure for fact_grid_govern_daily
+-- -- ----------------------------
+-- DROP TABLE IF EXISTS `fact_grid_govern_daily`;
+-- CREATE TABLE `fact_grid_govern_daily`  (
+--   `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键，customer_id+grid_id+date_id只有一条记录',
+--   `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客户id',
+--   `DATE_ID` varchar(8) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '数据更新至：yyyyMMdd; ',
+--   `GRID_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网格id',
+--   `PID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网格所属的组织id',
+--   `PIDS` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci 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；此列存储的是小数',
+--   `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 COMMENT '未出当前网格的，结案项目数',
+--   `DEL_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除、1已删除',
+--   `REVISION` int(11) NOT NULL DEFAULT 0 COMMENT '乐观锁',
+--   `CREATED_BY` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人',
+--   `CREATED_TIME` datetime(0) NOT NULL COMMENT '创建时间：第一次提交审核的时间，注意和历史表的第一条记录时间一致',
+--   `UPDATED_BY` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新人',
+--   `UPDATED_TIME` datetime(0) NOT NULL COMMENT '更新时间',
+--   PRIMARY KEY (`ID`) USING BTREE
+-- ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '网格的治理指数，按天统计' ROW_FORMAT = Dynamic;
+--
+-- SET FOREIGN_KEY_CHECKS = 1;

From 2feb3140670bc73441ba7afdfc8b1c29d68c1db5 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Tue, 25 May 2021 10:15:07 +0800
Subject: [PATCH 069/128] =?UTF-8?q?=E5=9F=BA=E5=B1=82=E6=B2=BB=E7=90=86-?=
 =?UTF-8?q?=E6=B2=BB=E7=90=86=E8=83=BD=E5=8A=9B=E6=8E=92=E8=A1=8C=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE(=E6=8C=89=E5=A4=A9=E7=BB=9F=E8=AE=A1)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/controller/DemoController.java  |  9 ++++
 .../extract/FactOriginProjectLogDailyDao.java | 10 ++++
 .../FactOriginProjectLogDailyService.java     | 10 ++++
 .../FactOriginProjectLogDailyServiceImpl.java | 14 +++++
 .../GovernRankDataExtractServiceImpl.java     | 10 ++--
 .../ScreenGovernRankDataDailyServiceImpl.java |  1 +
 .../extract/FactOriginProjectLogDailyDao.xml  | 52 +++++++++++++++----
 .../extract/FactOriginProjectMainDailyDao.xml | 16 +++---
 .../FactIndexGovrnAblityGridMonthlyDao.xml    |  2 +-
 .../screen/ScreenGovernRankDataDailyDao.xml   |  2 +-
 10 files changed, 101 insertions(+), 25 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
index 644830e3a2..dbedc28b8c 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
@@ -669,6 +669,15 @@ public class DemoController {
         return new Result();
     }
 
+    @PostMapping("governRankDaily")
+    public Result governRankDaily(@RequestBody CustomerIdAndDateIdFormDTO formDTO){
+        governRankDataExtractService.extractGridDataDaily(formDTO.getCustomerId(), formDTO.getDateId());
+        governRankDataExtractService.extractCommunityDataDaily(formDTO.getCustomerId(), formDTO.getDateId());
+        governRankDataExtractService.extractStreetDataDaily(formDTO.getCustomerId(), formDTO.getDateId());
+        governRankDataExtractService.extractDistrictDataDaily(formDTO.getCustomerId(), formDTO.getDateId());
+        return new Result();
+    }
+
     @Autowired
     private PioneerDataExtractService pioneerDataExtractService;
     @Autowired
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectLogDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectLogDailyDao.java
index ed79666c63..78f9be78e9 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectLogDailyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectLogDailyDao.java
@@ -288,4 +288,14 @@ public interface FactOriginProjectLogDailyDao extends BaseDao<FactOriginProjectL
 	 * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
 	 */
 	List<OrgStatisticsResultDTO> selectGridClosed(@Param("customerId") String customerId, @Param("monthId") String monthId);
+
+	/**
+	 * 网格自治率统计--按天
+	 * @author zhaoqifeng
+	 * @date 2021/5/24 17:53
+	 * @param customerId
+	 * @param dateId
+	 * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+	 */
+	List<OrgStatisticsResultDTO> selectGridSelfDaily(@Param("customerId") String customerId, @Param("dateId") String dateId);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectLogDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectLogDailyService.java
index 13c0e1d6c8..141a8dc7b8 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectLogDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectLogDailyService.java
@@ -310,4 +310,14 @@ public interface FactOriginProjectLogDailyService extends BaseService<FactOrigin
      * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
      */
     List<OrgStatisticsResultDTO>  getGridClosed(String customerId, String monthId);
+
+    /**
+     * 网格自制率统计-按天
+     * @author zhaoqifeng
+     * @date 2021/5/24 17:52
+     * @param customerId
+     * @param dateId
+     * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     */
+    List<OrgStatisticsResultDTO> getGridSelfDaily(String customerId, String dateId);
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectLogDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectLogDailyServiceImpl.java
index b01e714325..3dde0b0032 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectLogDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectLogDailyServiceImpl.java
@@ -400,5 +400,19 @@ public class FactOriginProjectLogDailyServiceImpl extends BaseServiceImpl<FactOr
         return baseDao.selectGridClosed(customerId, monthId);
     }
 
+    /**
+     * 网格自制率统计-按天
+     *
+     * @param customerId
+     * @param dateId
+     * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     * @author zhaoqifeng
+     * @date 2021/5/24 17:52
+     */
+    @Override
+    public List<OrgStatisticsResultDTO> getGridSelfDaily(String customerId, String dateId) {
+        return baseDao.selectGridSelfDaily(customerId, dateId);
+    }
+
 
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/GovernRankDataExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/GovernRankDataExtractServiceImpl.java
index 8d88c42e05..80d3f22ee7 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/GovernRankDataExtractServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/GovernRankDataExtractServiceImpl.java
@@ -321,12 +321,12 @@ public class GovernRankDataExtractServiceImpl implements GovernRankDataExtractSe
 			}));
 		}
 		//自治率
-		List<FactIndexGovrnAblityGridMonthlyEntity> gridList = factIndexGovrnAblityGridMonthlyService.getGridByCustomerDaily(customerId, dateId);
+		List<OrgStatisticsResultDTO> gridList = factOriginProjectLogDailyService.getGridSelfDaily(customerId, dateId);
 		if (CollectionUtils.isNotEmpty(gridList)) {
-			list.forEach(entity -> gridList.stream().filter(gridAbility -> entity.getOrgId().equals(gridAbility.getGridId())).forEach(grid -> {
-				BigDecimal resolveCount = new BigDecimal(grid.getResolveProjectCount());
-				BigDecimal selfCount = new BigDecimal(grid.getSelfSolveProjectCount());
-				if (grid.getResolveProjectCount() != NumConstant.ZERO) {
+			list.forEach(entity -> gridList.stream().filter(gridAbility -> entity.getOrgId().equals(gridAbility.getOrgId())).forEach(grid -> {
+				BigDecimal resolveCount = new BigDecimal(grid.getSum());
+				BigDecimal selfCount = new BigDecimal(grid.getCount());
+				if (grid.getSum() != NumConstant.ZERO) {
 					entity.setGovernRatio(selfCount.multiply(hundred).divide(resolveCount, NumConstant.SIX, RoundingMode.HALF_UP));
 				}
 			}));
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenGovernRankDataDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenGovernRankDataDailyServiceImpl.java
index 6c9054d6b0..3c48645963 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenGovernRankDataDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenGovernRankDataDailyServiceImpl.java
@@ -149,6 +149,7 @@ public class ScreenGovernRankDataDailyServiceImpl extends BaseServiceImpl<Screen
      * @date 2020/9/25 10:32
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void delAndSaveRankData(String customerId, String orgType, String dateId, Integer deleteSize,
                                    List<ScreenGovernRankDataDailyEntity> entityList) {
         if (CollectionUtils.isEmpty(entityList)) {
diff --git 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
index 4d913d3edf..411d959a57 100644
--- 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
@@ -313,8 +313,7 @@
                     COUNT( ID ) AS "count"
              FROM fact_origin_project_log_daily
              WHERE ORG_TYPE = 'grid'
-               AND ( ACTION_CODE = 'response'
-                 OR ACTION_CODE = 'close'
+               AND (ACTION_CODE = 'close'
                  OR ACTION_CODE = 'transfer'
                  OR ACTION_CODE = 'resolved'
                  OR ACTION_CODE = 'unresolved'
@@ -347,8 +346,7 @@
              INNER JOIN dim_agency da ON f.AGENCY_ID = da.ID
                  AND da.`LEVEL` = #{level}
              WHERE
-                 ( ACTION_CODE = 'response'
-                     OR ACTION_CODE = 'close'
+                 ( ACTION_CODE = 'close'
                      OR ACTION_CODE = 'transfer'
                      OR ACTION_CODE = 'resolved'
                      OR ACTION_CODE = 'unresolved'
@@ -589,8 +587,7 @@
                       INNER JOIN dim_agency da ON f.AGENCY_ID = da.ID
                  AND da.`LEVEL` = #{level}
              WHERE
-                 ( ACTION_CODE = 'response'
-                     OR ACTION_CODE = 'close'
+                 (ACTION_CODE = 'close'
                      OR ACTION_CODE = 'transfer'
                      OR ACTION_CODE = 'resolved'
                      OR ACTION_CODE = 'unresolved'
@@ -620,11 +617,8 @@
                     COUNT( ID ) AS "count"
              FROM fact_origin_project_log_daily
              WHERE ORG_TYPE = 'grid'
-               AND ( ACTION_CODE = 'response'
-                 OR ACTION_CODE = 'close'
+               AND ( ACTION_CODE = 'close'
                  OR ACTION_CODE = 'transfer'
-                 OR ACTION_CODE = 'resolved'
-                 OR ACTION_CODE = 'unresolved'
                  OR ACTION_CODE = 'created' )
                AND IS_ACTIVE = 1
                AND CUSTOMER_ID = #{customerId}
@@ -632,4 +626,42 @@
              GROUP BY  ORG_ID ) b
             ON a.ORG_ID = b.ORG_ID
     </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"
+        FROM
+            fact_origin_project_main_daily fm
+                LEFT JOIN (
+                SELECT
+                    orgId,
+                    COUNT( PROJECT_ID ) AS "count"
+                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")
+                        GROUP BY
+                            PROJECT_ID
+                        HAVING
+                            COUNT(DISTINCT ( ORG_ID )) = 1) a
+                GROUP BY
+                    orgId
+            ) a ON fm.GRID_ID = a.orgId
+        WHERE
+            PROJECT_STATUS = 'closed'
+          AND ORIGIN = "issue"
+          AND CUSTOMER_ID = #{customerId}
+         AND DATE_ID &lt;= #{dateId}
+        GROUP BY
+            GRID_ID
+    </select>
 </mapper>
\ No newline at end of file
diff --git 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
index 34156fb11b..c6e024c502 100644
--- 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
@@ -240,7 +240,7 @@
                      INNER JOIN dim_agency da ON fm.AGENCY_ID = da.ID
                      AND da.`LEVEL` = #{level}
              WHERE
-                 fm.PROJECT_STATUS = 'close'
+                 fm.PROJECT_STATUS = 'closed'
                AND fm.CUSTOMER_ID = #{customerId}
                AND fm.MONTH_ID = #{monthId}
              GROUP BY
@@ -254,7 +254,7 @@
                      INNER JOIN dim_agency da ON fm.AGENCY_ID = da.ID
                      AND da.`LEVEL` = #{level}
              WHERE
-                 fm.PROJECT_STATUS = 'close'
+                 fm.PROJECT_STATUS = 'closed'
                AND fm.CUSTOMER_ID = #{customerId}
                AND fm.MONTH_ID = #{monthId}
                AND fm.IS_RESOLVED = 'resolved'
@@ -274,7 +274,7 @@
              FROM
                  fact_origin_project_main_daily fm
              WHERE
-                 fm.PROJECT_STATUS = 'close'
+                 fm.PROJECT_STATUS = 'closed'
                AND fm.GRID_ID != ''
                AND fm.CUSTOMER_ID = #{customerId}
                AND fm.MONTH_ID = #{monthId}
@@ -287,7 +287,7 @@
              FROM
                  fact_origin_project_main_daily fm
              WHERE
-                 fm.PROJECT_STATUS = 'close'
+                 fm.PROJECT_STATUS = 'closed'
                AND fm.GRID_ID != ''
                AND fm.CUSTOMER_ID = #{customerId}
                AND fm.MONTH_ID = #{monthId}
@@ -819,7 +819,7 @@
              FROM
                  fact_origin_project_main_daily fm
              WHERE
-                 fm.PROJECT_STATUS = 'close'
+                 fm.PROJECT_STATUS = 'closed'
                AND fm.GRID_ID != ''
                AND fm.CUSTOMER_ID = #{customerId}
                AND fm.DATE_ID &lt;= #{dateId}
@@ -832,7 +832,7 @@
              FROM
                  fact_origin_project_main_daily fm
              WHERE
-                 fm.PROJECT_STATUS = 'close'
+                 fm.PROJECT_STATUS = 'closed'
                AND fm.GRID_ID != ''
                AND fm.CUSTOMER_ID = #{customerId}
                AND fm.DATE_ID &lt;= #{dateId}
@@ -891,7 +891,7 @@
                      INNER JOIN dim_agency da ON fm.AGENCY_ID = da.ID
                      AND da.`LEVEL` = #{level}
              WHERE
-                 fm.PROJECT_STATUS = 'close'
+                 fm.PROJECT_STATUS = 'closed'
                AND fm.CUSTOMER_ID = #{customerId}
                AND fm.DATE_ID &lt;= #{dateId}
              GROUP BY
@@ -905,7 +905,7 @@
                      INNER JOIN dim_agency da ON fm.AGENCY_ID = da.ID
                      AND da.`LEVEL` = #{level}
              WHERE
-                 fm.PROJECT_STATUS = 'close'
+                 fm.PROJECT_STATUS = 'closed'
                AND fm.CUSTOMER_ID = #{customerId}
                AND fm.DATE_ID &lt;= #{dateId}
                AND fm.IS_RESOLVED = 'resolved'
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyDao.xml
index 1285067483..800adbfb30 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyDao.xml
@@ -266,7 +266,7 @@
             RESOLVE_PROJECT_COUNT,
             SATISFACTION_RATIO
         FROM
-            fact_index_govrn_ablity_grid_monthly
+            fact_index_govrn_ablity_grid_daily
         WHERE
             CUSTOMER_ID = #{customerId}
           AND DATE_ID &lt;= #{dateId}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenGovernRankDataDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenGovernRankDataDailyDao.xml
index eec63e765b..b38ec6cce5 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenGovernRankDataDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenGovernRankDataDailyDao.xml
@@ -25,7 +25,7 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
     <delete id="deleteRankData">
-        delete from screen_govern_rank_data
+        delete from screen_govern_rank_data_daily
         where CUSTOMER_ID = #{customerId}
         AND DATE_ID &lt;= #{dateId}
         <if test='null != orgType and "" != orgType'>

From 93277b9580ab1fe22e63737e753a6711a2609e30 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 25 May 2021 15:25:19 +0800
Subject: [PATCH 070/128] =?UTF-8?q?=E7=BB=84=E7=BB=87/=E7=BD=91=E6=A0=BC?=
 =?UTF-8?q?=E4=B8=8B=E5=93=8D=E5=BA=94=E8=A7=A3=E5=86=B3=E6=BB=A1=E6=84=8F?=
 =?UTF-8?q?=E8=87=AA=E6=B2=BB=E7=8E=87=E6=9F=A5=E8=AF=A2=EF=BC=8C=E5=B9=B6?=
 =?UTF-8?q?=E5=BC=95=E5=85=A5epmet=5Fevaluation=5Findex=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../constant/DataSourceConstant.java          |  2 +
 .../dto/datastats/form/GovrnRatioFormDTO.java | 33 ++++++++++
 .../datastats/result/GovrnRatioResultDTO.java | 27 +++++++++
 .../data-aggregator-server/pom.xml            | 60 ++++++++++++++-----
 .../controller/DataStatsController.java       | 15 +++++
 .../evaluationindex/EvaluationIndexDao.java   | 37 ++++++++++++
 .../service/datastats/DataStatsService.java   |  7 +++
 .../datastats/impl/DataStatsServiceImpl.java  | 32 ++++++++++
 .../EvaluationIndexService.java               | 18 ++++++
 .../impl/EvaluationIndexServiceImpl.java      | 40 +++++++++++++
 .../src/main/resources/bootstrap.yml          | 11 +++-
 .../evaluationindex/EvaluationIndexDao.xml    | 23 +++++++
 12 files changed, 286 insertions(+), 19 deletions(-)
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/GovrnRatioFormDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/GovrnRatioResultDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/evaluationindex/EvaluationIndexDao.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/EvaluationIndexService.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java
index b5395e65b6..ce186bfffc 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java
@@ -28,4 +28,6 @@ public interface DataSourceConstant {
     String OPER_CRM="opercrm";
 
     String DATA_STATISTICAL="datastatistical";
+
+    String EVALUATION_INDEX = "evaluationIndex";
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/GovrnRatioFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/GovrnRatioFormDTO.java
new file mode 100644
index 0000000000..7e5407a8ef
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/GovrnRatioFormDTO.java
@@ -0,0 +1,33 @@
+package com.epmet.dataaggre.dto.datastats.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 治理实况-组织/网格下响应解决满意自治率-接口入参
+ * @Auth sun
+ */
+@Data
+public class GovrnRatioFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -3381286960911634231L;
+    /**
+     * 组织Id
+     */
+    @NotBlank(message = "组织或网格Id不能为空", groups = GovrnRatioFormDTO.AgencyGrid.class)
+    private String orgId;
+    /**
+     * 组织:agency  网格:grid
+     */
+    @NotBlank(message = "网格Id不能为空", groups = GovrnRatioFormDTO.AgencyGrid.class)
+    private String orgType;
+    /**
+     * 日维度Id[日期，不传值默认查前一天的【格式：20210101】]
+     */
+    private String dateId;
+    public interface AgencyGrid extends CustomerClientShowGroup {}
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/GovrnRatioResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/GovrnRatioResultDTO.java
new file mode 100644
index 0000000000..75a6f5ee1b
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/GovrnRatioResultDTO.java
@@ -0,0 +1,27 @@
+package com.epmet.dataaggre.dto.datastats.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 治理实况-组织/网格下响应解决满意自治率-接口返参
+ * @Auth sun
+ */
+@Data
+public class GovrnRatioResultDTO implements Serializable {
+    private static final long serialVersionUID = 466974582608407121L;
+    //组织或网格Id
+    private String orgId;
+    //组织:agency  网格:grid
+    private String orgType;
+    //响应率
+    private String responseRatio = "0%";
+    //解决率
+    private String resolvedRatio = "0%";
+    //自治率
+    private String governRatio = "0%";
+    //满意率
+    private String satisfactionRatio = "0%";
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml
index a2cc3bc297..ab8c36be1a 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml
@@ -158,11 +158,18 @@
                 <datasource.druid.opercrm.password>EpmEt-db-UsEr</datasource.druid.opercrm.password>
 
                 <!-- data_statistical -->
-                <datasource.druid.opercrm.url>
+                <datasource.druid.stats.url>
                     <![CDATA[jdbc:mysql://192.168.1.130:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
-                </datasource.druid.opercrm.url>
-                <datasource.druid.opercrm.username>epmet_data_statistical_user</datasource.druid.opercrm.username>
-                <datasource.druid.opercrm.password>EpmEt-db-UsEr</datasource.druid.opercrm.password>
+                </datasource.druid.stats.url>
+                <datasource.druid.stats.username>epmet_data_statistical_user</datasource.druid.stats.username>
+                <datasource.druid.stats.password>EpmEt-db-UsEr</datasource.druid.stats.password>
+
+                <!-- epmet_evaluation_index -->
+                <datasource.druid.evaluationIndex.url>
+                    <![CDATA[jdbc:mysql://192.168.1.130:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.evaluationIndex.url>
+                <datasource.druid.evaluationIndex.username>epmet_evaluation_index_user</datasource.druid.evaluationIndex.username>
+                <datasource.druid.evaluationIndex.password>EpmEt-db-UsEr</datasource.druid.evaluationIndex.password>
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
@@ -246,11 +253,18 @@
                 <datasource.druid.opercrm.password>EpmEt-db-UsEr</datasource.druid.opercrm.password>
 
                 <!-- data_statistical -->
-                <datasource.druid.opercrm.url>
+                <datasource.druid.stats.url>
                     <![CDATA[jdbc:mysql://192.168.1.130:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
-                </datasource.druid.opercrm.url>
-                <datasource.druid.opercrm.username>epmet_data_statistical_user</datasource.druid.opercrm.username>
-                <datasource.druid.opercrm.password>EpmEt-db-UsEr</datasource.druid.opercrm.password>
+                </datasource.druid.stats.url>
+                <datasource.druid.stats.username>epmet_data_statistical_user</datasource.druid.stats.username>
+                <datasource.druid.stats.password>EpmEt-db-UsEr</datasource.druid.stats.password>
+
+                <!-- epmet_evaluation_index -->
+                <datasource.druid.evaluationIndex.url>
+                    <![CDATA[jdbc:mysql://192.168.1.130:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.evaluationIndex.url>
+                <datasource.druid.evaluationIndex.username>epmet_evaluation_index_user</datasource.druid.evaluationIndex.username>
+                <datasource.druid.evaluationIndex.password>EpmEt-db-UsEr</datasource.druid.evaluationIndex.password>
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
@@ -334,11 +348,18 @@
                 <datasource.druid.opercrm.password>elink@833066</datasource.druid.opercrm.password>
 
                 <!-- data_statistical -->
-                <datasource.druid.opercrm.url>
+                <datasource.druid.stats.url>
                     <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
-                </datasource.druid.opercrm.url>
-                <datasource.druid.opercrm.username>epmet</datasource.druid.opercrm.username>
-                <datasource.druid.opercrm.password>elink@833066</datasource.druid.opercrm.password>
+                </datasource.druid.stats.url>
+                <datasource.druid.stats.username>epmet</datasource.druid.stats.username>
+                <datasource.druid.stats.password>elink@833066</datasource.druid.stats.password>
+
+                <!-- epmet_evaluation_index -->
+                <datasource.druid.evaluationIndex.url>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.evaluationIndex.url>
+                <datasource.druid.evaluationIndex.username>epmet</datasource.druid.evaluationIndex.username>
+                <datasource.druid.evaluationIndex.password>elink@833066</datasource.druid.evaluationIndex.password>
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
@@ -422,11 +443,18 @@
                 <datasource.druid.opercrm.password>EpmEt-db-UsEr</datasource.druid.opercrm.password>
 
                 <!-- data_statistical -->
-                <datasource.druid.opercrm.url>
+                <datasource.druid.stats.url>
                     <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
-                </datasource.druid.opercrm.url>
-                <datasource.druid.opercrm.username>epmet_data_statistical_user</datasource.druid.opercrm.username>
-                <datasource.druid.opercrm.password>EpmEt-db-UsEr</datasource.druid.opercrm.password>
+                </datasource.druid.stats.url>
+                <datasource.druid.stats.username>epmet_data_statistical_user</datasource.druid.stats.username>
+                <datasource.druid.stats.password>EpmEt-db-UsEr</datasource.druid.stats.password>
+
+                <!-- epmet_evaluation_index -->
+                <datasource.druid.evaluationIndex.url>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.evaluationIndex.url>
+                <datasource.druid.evaluationIndex.username>epmet_evaluation_index_user</datasource.druid.evaluationIndex.username>
+                <datasource.druid.evaluationIndex.password>EpmEt-db-UsEr</datasource.druid.evaluationIndex.password>
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java
index 74b2552e43..a56d769119 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java
@@ -1,5 +1,6 @@
 package com.epmet.dataaggre.controller;
 
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dataaggre.dto.datastats.form.*;
@@ -200,4 +201,18 @@ public class DataStatsController {
         return new Result<List<GridGovrnResultDTO>>().ok(dataStatsService.subGridGovrnList(formDTO));
     }
 
+    /**
+     * @Param formDTO
+     * @Description 治理实况-组织/网格下响应解决满意自治率
+     * @author sun
+     */
+    @PostMapping("governratio")
+    public Result<GovrnRatioResultDTO> governRatio(@RequestBody GovrnRatioFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, GovrnRatioFormDTO.AgencyGrid.class);
+        if (!"agency".equals(formDTO.getOrgType()) && !"grid".equals(formDTO.getOrgType())) {
+            throw new RenException(String.format("入参格式错误,错误的组织或网格类型:%s", formDTO.getOrgType()));
+        }
+        return new Result<GovrnRatioResultDTO>().ok(dataStatsService.governRatio(formDTO));
+    }
+
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/evaluationindex/EvaluationIndexDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/evaluationindex/EvaluationIndexDao.java
new file mode 100644
index 0000000000..c9084a0b4b
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/evaluationindex/EvaluationIndexDao.java
@@ -0,0 +1,37 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.dao.evaluationindex;
+
+import com.epmet.dataaggre.dto.datastats.result.GovrnRatioResultDTO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @Author sun
+ * @Description  指标统计服务
+ */
+@Mapper
+public interface EvaluationIndexDao {
+
+    /**
+     * @Param formDTO
+     * @Description 按类型、日期查询治理指数下响应解决满意自治四个统计率
+     * @author sun
+     */
+    GovrnRatioResultDTO getAgnecyOrGridGoverRatio(@Param("orgId") String orgId, @Param("orgType") String orgType, @Param("dateId") String dateId);
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
index 472bc277b4..8b08a765d2 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
@@ -152,4 +152,11 @@ public interface DataStatsService {
      * @author sun
      */
     List<GridGovrnResultDTO> subGridGovrnList(GridGovrnFormDTO formDTO);
+
+    /**
+     * @Param formDTO
+     * @Description 治理实况-组织/网格下响应解决满意自治率
+     * @author sun
+     */
+    GovrnRatioResultDTO governRatio(GovrnRatioFormDTO formDTO);
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index 59bca42a8a..c636d2fe11 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -14,6 +14,7 @@ import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO;
 import com.epmet.dataaggre.entity.datastats.DimAgencyEntity;
 import com.epmet.dataaggre.entity.datastats.DimGridEntity;
 import com.epmet.dataaggre.service.datastats.DataStatsService;
+import com.epmet.dataaggre.service.evaluationindex.EvaluationIndexService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -39,6 +40,8 @@ import java.util.stream.Collectors;
 public class DataStatsServiceImpl implements DataStatsService {
     @Autowired
     private DataStatsDao dataStatsDao;
+    @Autowired
+    private EvaluationIndexService indexService;
 
 
     /**
@@ -1243,4 +1246,33 @@ public class DataStatsServiceImpl implements DataStatsService {
         return resultList;
     }
 
+    /**
+     * @Param formDTO
+     * @Description 治理实况-组织/网格下响应解决满意自治率
+     * @author sun
+     */
+    @Override
+    public GovrnRatioResultDTO governRatio(GovrnRatioFormDTO formDTO) {
+        GovrnRatioResultDTO resultDTO = new GovrnRatioResultDTO();
+        resultDTO.setOrgId(formDTO.getOrgId());
+        resultDTO.setOrgType(formDTO.getOrgType());
+
+        //入参有日期的则按具体时间执行,没有的则按当前时间前一天执行
+        if (StringUtils.isBlank(formDTO.getDateId())) {
+            Date yesterday = DateUtils.addDateDays(new Date(), -1);
+            SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD);
+            formDTO.setDateId(format.format(yesterday));
+        }
+
+        //1.按类型、日期查询治理指数下响应解决满意自治四个统计率
+        GovrnRatioResultDTO dto = indexService.governRatio(formDTO);
+        if (null != dto) {
+            resultDTO.setResponseRatio(dto.getResponseRatio());
+            resultDTO.setResolvedRatio(dto.getResolvedRatio());
+            resultDTO.setGovernRatio(dto.getGovernRatio());
+            resultDTO.setSatisfactionRatio(dto.getSatisfactionRatio());
+        }
+        return resultDTO;
+    }
+
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/EvaluationIndexService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/EvaluationIndexService.java
new file mode 100644
index 0000000000..909a3dc208
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/EvaluationIndexService.java
@@ -0,0 +1,18 @@
+package com.epmet.dataaggre.service.evaluationindex;
+
+import com.epmet.dataaggre.dto.datastats.form.GovrnRatioFormDTO;
+import com.epmet.dataaggre.dto.datastats.result.GovrnRatioResultDTO;
+
+/**
+ * @Author sun
+ * @Description  指标统计服务
+ */
+public interface EvaluationIndexService {
+
+    /**
+     * @Param formDTO
+     * @Description 治理实况-组织/网格下响应解决满意自治率
+     * @author sun
+     */
+    GovrnRatioResultDTO governRatio(GovrnRatioFormDTO formDTO);
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java
new file mode 100644
index 0000000000..bec7bafd90
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java
@@ -0,0 +1,40 @@
+package com.epmet.dataaggre.service.evaluationindex.impl;
+
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.commons.tools.utils.DateUtils;
+import com.epmet.dataaggre.constant.DataSourceConstant;
+import com.epmet.dataaggre.dao.datastats.DataStatsDao;
+import com.epmet.dataaggre.dao.evaluationindex.EvaluationIndexDao;
+import com.epmet.dataaggre.dto.datastats.form.GovrnRatioFormDTO;
+import com.epmet.dataaggre.dto.datastats.result.GovrnRatioResultDTO;
+import com.epmet.dataaggre.service.evaluationindex.EvaluationIndexService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * @Author sun
+ * @Description 指标统计服务
+ */
+@Service
+@DataSource(DataSourceConstant.EVALUATION_INDEX)
+@Slf4j
+public class EvaluationIndexServiceImpl implements EvaluationIndexService {
+    @Autowired
+    private EvaluationIndexDao evaluationIndexDao;
+
+    /**
+     * @Param formDTO
+     * @Description 按类型、日期查询治理指数下响应解决满意自治四个统计率
+     * @author sun
+     */
+    @Override
+    public GovrnRatioResultDTO governRatio(GovrnRatioFormDTO formDTO) {
+        return  evaluationIndexDao.getAgnecyOrGridGoverRatio(formDTO.getOrgId(),formDTO.getOrgType(),formDTO.getDateId());
+    }
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml
index cd8b7b8ef1..ab888fc91c 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml
@@ -131,9 +131,14 @@ dynamic:
       password: @datasource.druid.opercrm.password@
     datastatistical:
       driver-class-name: com.mysql.cj.jdbc.Driver
-      url: @datasource.druid.opercrm.url@
-      username: @datasource.druid.opercrm.username@
-      password: @datasource.druid.opercrm.password@
+      url: @datasource.druid.stats.url@
+      username: @datasource.druid.stats.username@
+      password: @datasource.druid.stats.password@
+    evaluationIndex:
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      url: @datasource.druid.evaluationIndex.url@
+      username: @datasource.druid.evaluationIndex.username@
+      password: @datasource.druid.evaluationIndex.password@
 feign:
   hystrix:
     enabled: true
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml
new file mode 100644
index 0000000000..a0c2e0c245
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dataaggre.dao.evaluationindex.EvaluationIndexDao">
+
+    <select id="getAgnecyOrGridGoverRatio" resultType="com.epmet.dataaggre.dto.datastats.result.GovrnRatioResultDTO">
+        SELECT
+            org_id AS orgId,
+            org_type AS orgType,
+            CONCAT(ROUND(response_ratio, 1), '%') AS responseRatio,
+            CONCAT(ROUND(resolved_ratio, 1) , '%')AS resolvedRatio,
+            CONCAT(ROUND(govern_ratio, 1), '%') AS governRatio,
+            CONCAT(ROUND(satisfaction_ratio, 1), '%') AS satisfactionRatio
+        FROM
+            screen_govern_rank_data_daily
+        WHERE
+            del_flag = '0'
+        AND org_id = #{orgId}
+        AND org_type = #{orgType}
+        AND date_id = #{dateId}
+    </select>
+
+</mapper>
\ No newline at end of file

From 64e3084e660997401f806eecb4804674447f14cf Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 25 May 2021 16:01:19 +0800
Subject: [PATCH 071/128] =?UTF-8?q?=E6=B2=BB=E7=90=86=E6=8C=87=E6=95=B0?=
 =?UTF-8?q?=E7=BD=91=E6=A0=BCv1,?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/controller/DemoController.java  |   9 +
 .../extract/FactGridGovernDailyDao.java       |   4 +-
 .../extract/FactOriginIssueMainDailyDao.java  |  17 ++
 .../extract/FactOriginTopicMainDailyDao.java  |  18 ++
 .../extract/FactGridGovernDailyEntity.java    |  25 +-
 .../extract/GovernGridTotalCommonDTO.java     |  18 ++
 .../FactOriginIssueMainDailyService.java      |  14 +
 .../FactOriginTopicMainDailyService.java      |  15 ++
 .../impl/FactGridGovernDailyServiceImpl.java  | 251 +++++++++++++++++-
 .../FactOriginIssueMainDailyServiceImpl.java  |  17 ++
 .../FactOriginTopicMainDailyServiceImpl.java  |  18 ++
 .../db/migration/V0.0.15__govern.sql          |   4 +-
 .../extract/FactGridGovernDailyDao.xml        |  11 +-
 .../extract/FactOriginIssueMainDailyDao.xml   |  32 +++
 .../extract/FactOriginTopicMainDailyDao.xml   |  31 +++
 15 files changed, 473 insertions(+), 11 deletions(-)
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/GovernGridTotalCommonDTO.java

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
index 644830e3a2..63be2f1da0 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
@@ -37,6 +37,7 @@ import com.epmet.entity.stats.DimMonthEntity;
 import com.epmet.service.StatsDemoService;
 import com.epmet.service.StatsPartyMemberVanguardService;
 import com.epmet.service.evaluationindex.extract.dataToIndex.*;
+import com.epmet.service.evaluationindex.extract.todata.FactGridGovernDailyService;
 import com.epmet.service.evaluationindex.extract.todata.FactGroupActDailyService;
 import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectCategoryDailyService;
 import com.epmet.service.evaluationindex.extract.todata.FactOriginTopicMainDailyService;
@@ -116,6 +117,8 @@ public class DemoController {
     private StatsPartyMemberVanguardService statsPartyMemberVanguardService;
     @Autowired
     private FactGroupActDailyService factGroupActDailyService;
+    @Autowired
+    private FactGridGovernDailyService factGridGovernDailyService;
 
     @GetMapping("testAlarm")
     public void testAlarm() {
@@ -890,4 +893,10 @@ public class DemoController {
         factGroupActDailyService.extractAgencyGroupActDaily(customerId,dateId);
         return new Result();
     }
+
+    @PostMapping("extractgridgoverndaily")
+    public Result extractFactGridGovernDaily(@RequestParam("customerId") String customerId,@RequestParam("dateId")String dateId){
+        factGridGovernDailyService.extractFactGridGovernDaily(customerId,dateId);
+        return new Result();
+    }
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactGridGovernDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactGridGovernDailyDao.java
index 5d35359bc7..1408abaeff 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactGridGovernDailyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactGridGovernDailyDao.java
@@ -20,6 +20,7 @@ package com.epmet.dao.evaluationindex.extract;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.entity.evaluationindex.extract.FactGridGovernDailyEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 网格的治理指数，按天统计
@@ -29,5 +30,6 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface FactGridGovernDailyDao extends BaseDao<FactGridGovernDailyEntity> {
-	
+
+    int deleteBatchByCustomerIdAndDateId(@Param("customerId") String customerId, @Param("dateId") String dateId, @Param("limit") int limit);
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginIssueMainDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginIssueMainDailyDao.java
index 280e38213e..ee2e78aaa3 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginIssueMainDailyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginIssueMainDailyDao.java
@@ -25,6 +25,7 @@ import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
 import com.epmet.dto.extract.result.ShiftProjectCountResultDTO;
 import com.epmet.dto.indexcollect.result.CpcIndexCommonDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginIssueMainDailyEntity;
+import com.epmet.entity.evaluationindex.extract.GovernGridTotalCommonDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -225,4 +226,20 @@ public interface FactOriginIssueMainDailyDao extends BaseDao<FactOriginIssueMain
      * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
      */
     List<OrgStatisticsResultDTO> selectPartyMemberIssueStaticByGrid(@Param("customerId") String customerId, @Param("dateId") String dateId);
+
+    /**
+     * 3、当前网格内，议题关闭已解决数
+     * 4、当前网格内，议题关闭无需解决数
+     * 这两个值可以通过此方法获得
+     *
+     * @param customerId
+     * @param gridIds
+     * @param issueStatus 议题状态  voting 已转项目：shift_project 已关闭：closed_resloved
+     * @param resolveType unresolved,resolved
+     * @return
+     */
+    List<GovernGridTotalCommonDTO> selectGroupByGridId(@Param("customerId")String customerId,
+                                                       @Param("gridIds")List<String> gridIds,
+                                                       @Param("issueStatus")String issueStatus,
+                                                       @Param("resolveType")String resolveType);
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginTopicMainDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginTopicMainDailyDao.java
index f34fbf3a4b..96ecdef6c6 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginTopicMainDailyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginTopicMainDailyDao.java
@@ -22,6 +22,7 @@ import com.epmet.dto.extract.result.CreateTopicCountResultDTO;
 import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
 import com.epmet.dto.indexcollect.result.CpcIndexCommonDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginTopicMainDailyEntity;
+import com.epmet.entity.evaluationindex.extract.GovernGridTotalCommonDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -159,4 +160,21 @@ public interface FactOriginTopicMainDailyDao extends BaseDao<FactOriginTopicMain
      * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
      */
     List<OrgStatisticsResultDTO> selectPartyMemberTopicStaticByGrid(@Param("customerId") String customerId, @Param("dateId") String dateId);
+
+    /**
+     * 1、当前网格内，话题关闭已解决数
+     * 2、当前网格内，话题关闭无需解决数
+     * 这两个值可以通过此方法获得
+     *
+     * @param customerId
+     * @param gridIds
+     * @param topicStatus  话题状态（讨论中 - discussing、 已屏蔽 - hidden、  已关闭 - closed）
+     * @param closedStatus unresolved,resolved
+     * @return
+     */
+    List<GovernGridTotalCommonDTO> selectTopicGroupByGridId(@Param("customerId")String customerId,
+                                                            @Param("gridIds")List<String> gridIds,
+                                                            @Param("topicStatus")String topicStatus,
+                                                            @Param("closedStatus")String closedStatus,
+                                                            @Param("shiftIssue")String shiftIssue);
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactGridGovernDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactGridGovernDailyEntity.java
index 0fcff9c663..0e7b1cb889 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactGridGovernDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactGridGovernDailyEntity.java
@@ -19,6 +19,8 @@ package com.epmet.entity.evaluationindex.extract;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.StrConstant;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -128,8 +130,29 @@ public class FactGridGovernDailyEntity extends BaseEpmetEntity {
 	private Integer inGroupTopicUnResolvedCount;
 
     /**
-     * 未出当前网格的，结案项目数
+     * 11、未出当前网格的，结案项目数
      */
 	private Integer gridSelfGovernProjectTotal;
 
+	public FactGridGovernDailyEntity() {
+		this.customerId = StrConstant.EPMETY_STR;
+		this.dateId = StrConstant.EPMETY_STR;
+		this.gridId = StrConstant.EPMETY_STR;
+		this.pid = StrConstant.EPMETY_STR;
+		this.pids = StrConstant.EPMETY_STR;
+		this.problemResolvedCount = NumConstant.ZERO;
+		this.groupSelfGovernRatio=BigDecimal.ZERO;
+		this.gridSelfGovernProjectTotal=NumConstant.ZERO;
+		this.topicResolvedCount=NumConstant.ZERO;
+		this.topicUnResolvedCount=NumConstant.ZERO;
+		this.issueResolvedCount=NumConstant.ZERO;
+		this.issueUnResolvedCount=NumConstant.ZERO;
+		this.issueProjectResolvedCount=NumConstant.ZERO;
+		this.issueProjectUnResolvedCount=NumConstant.ZERO;
+		this.approvalProjectResolvedCount=NumConstant.ZERO;
+		this.approvalProjectUnResolvedCount=NumConstant.ZERO;
+		this.inGroupTopicResolvedCount=NumConstant.ZERO;
+		this.inGroupTopicUnResolvedCount=NumConstant.ZERO;
+		this.gridSelfGovernProjectTotal=NumConstant.ZERO;
+	}
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/GovernGridTotalCommonDTO.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/GovernGridTotalCommonDTO.java
new file mode 100644
index 0000000000..38dae54c41
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/GovernGridTotalCommonDTO.java
@@ -0,0 +1,18 @@
+package com.epmet.entity.evaluationindex.extract;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 网格的治理指数，按天统计 计算过程中，通用dto
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/5/25 13:43
+ */
+@Data
+public class GovernGridTotalCommonDTO implements Serializable {
+    private String customerId;
+    private String gridId;
+    private Integer total;
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginIssueMainDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginIssueMainDailyService.java
index a1e4ac55de..648891b0cc 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginIssueMainDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginIssueMainDailyService.java
@@ -20,6 +20,7 @@ package com.epmet.service.evaluationindex.extract.todata;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginIssueMainDailyEntity;
+import com.epmet.entity.evaluationindex.extract.GovernGridTotalCommonDTO;
 
 import java.util.List;
 import java.util.Map;
@@ -122,4 +123,17 @@ public interface FactOriginIssueMainDailyService extends BaseService<FactOriginI
      * @return java.util.Map<java.lang.String,com.epmet.dto.extract.result.OrgStatisticsResultDTO>
      */
     Map<String, OrgStatisticsResultDTO> getPartyMemberIssueStatic(String customerId, String dateId, String type);
+
+    /**
+     * 3、当前网格内，议题关闭已解决数
+     * 4、当前网格内，议题关闭无需解决数
+     * 这两个值可以通过此方法获得
+     *
+     * @param customerId
+     * @param gridIds
+     * @param issueStatus 议题状态  voting 已转项目：shift_project 已关闭：closed_resloved
+     * @param resolveType unresolved,resolved
+     * @return
+     */
+    List<GovernGridTotalCommonDTO> queryGridIssueValue(String customerId, List<String> gridIds, String issueStatus, String resolveType);
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginTopicMainDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginTopicMainDailyService.java
index aa66fc44e0..2cae521855 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginTopicMainDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginTopicMainDailyService.java
@@ -23,6 +23,7 @@ import com.epmet.dto.extract.result.CreateTopicCountResultDTO;
 import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
 import com.epmet.dto.indexcollect.result.CpcIndexCommonDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginTopicMainDailyEntity;
+import com.epmet.entity.evaluationindex.extract.GovernGridTotalCommonDTO;
 
 import java.util.List;
 import java.util.Map;
@@ -123,4 +124,18 @@ public interface FactOriginTopicMainDailyService extends BaseService<FactOriginT
      * @return java.util.Map<java.lang.String,com.epmet.dto.extract.result.OrgStatisticsResultDTO>
      */
     Map<String, OrgStatisticsResultDTO> getPartyMemberTopicStatic(String customerId, String dateId, String type);
+
+    /**
+     * 1、当前网格内，话题关闭已解决数
+     * 2、当前网格内，话题关闭无需解决数
+     * 这两个值可以通过此方法获得
+     *
+     * @param customerId
+     * @param gridIds
+     * @param topicStatus 话题状态（讨论中 - discussing、 已屏蔽 - hidden、  已关闭 - closed）
+     * @param closedStatus unresolved,resolved
+     * @param shiftIssue 是否转为议题，0:false，1:true；
+     * @return
+     */
+    List<GovernGridTotalCommonDTO> queryGridTopicValue(String customerId, List<String> gridIds, String topicStatus, String closedStatus, String shiftIssue);
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java
index 38b5a2d8a0..d3ebd1edc9 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java
@@ -18,19 +18,29 @@
 package com.epmet.service.evaluationindex.extract.todata.impl;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.constant.DimObjectStatusConstant;
+import com.epmet.constant.ProjectConstant;
 import com.epmet.dao.evaluationindex.extract.FactGridGovernDailyDao;
 import com.epmet.dto.org.GridInfoDTO;
 import com.epmet.entity.evaluationindex.extract.FactGridGovernDailyEntity;
+import com.epmet.entity.evaluationindex.extract.GovernGridTotalCommonDTO;
 import com.epmet.service.evaluationindex.extract.todata.FactGridGovernDailyService;
-import com.epmet.service.group.GroupDataService;
-import com.epmet.service.org.CustomerAgencyService;
+import com.epmet.service.evaluationindex.extract.todata.FactOriginIssueMainDailyService;
+import com.epmet.service.evaluationindex.extract.todata.FactOriginTopicMainDailyService;
 import com.epmet.service.org.CustomerGridService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.text.NumberFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 网格的治理指数，按天统计
@@ -42,9 +52,9 @@ import java.util.List;
 @Service
 public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGovernDailyDao, FactGridGovernDailyEntity> implements FactGridGovernDailyService {
     @Autowired
-    private GroupDataService groupDataService;
+    private FactOriginTopicMainDailyService factOriginTopicMainDailyService;
     @Autowired
-    private CustomerAgencyService customerAgencyService;
+    private FactOriginIssueMainDailyService factOriginIssueMainDailyService;
     @Autowired
     private CustomerGridService customerGridService;
 
@@ -62,13 +72,242 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
      */
     @Override
     public void extractFactGridGovernDaily(String customerId, String dateId) {
+        log.info("extractFactGridGovernDaily start customerId="+customerId+";dateId="+dateId);
         //客户id, dateId不能为空
         if(StringUtils.isBlank(customerId)||StringUtils.isBlank(dateId)){
             return;
         }
         // 2、当前客户下所有的网格
         List<GridInfoDTO> gridInfoDTOList=customerGridService.queryGridInfoList(customerId);
-        //todo
-        // List<FactGridGovernDailyEntity>
+        if(CollectionUtils.isEmpty(gridInfoDTOList)){
+            log.info("当前客户customerId=("+customerId+")下没有网格,无需计算");
+            return;
+        }
+        List<FactGridGovernDailyEntity> insertEntityList=this.constructFactGridGovernDailyEntityList(customerId,dateId,gridInfoDTOList);
+        // log.info(JSON.toJSONString(insertEntityList,true));
+
+        NumberFormat numberFormat = NumberFormat.getInstance();
+        numberFormat.setMaximumFractionDigits(NumConstant.SIX);
+
+        Map<String, Integer> topicResolvedMap=getTopicMap(customerId, null,ProjectConstant.CLOSED, DimObjectStatusConstant.RESOLVED,NumConstant.ZERO_STR);
+        Map<String, Integer> topicUnResolvedMap=getTopicMap(customerId, null,ProjectConstant.CLOSED, DimObjectStatusConstant.UNRESOLVED,NumConstant.ZERO_STR);
+
+        Map<String, Integer> issueResolvedMap=getIssueMap(customerId, null,ProjectConstant.CLOSED, DimObjectStatusConstant.RESOLVED);
+        Map<String, Integer> issueUnResolvedMap=getIssueMap(customerId, null,ProjectConstant.CLOSED, DimObjectStatusConstant.UNRESOLVED);
+
+        for(FactGridGovernDailyEntity insertEntity:insertEntityList){
+            //1、当前网格内，话题关闭已解决数
+            if(topicResolvedMap.containsKey(insertEntity.getGridId())){
+                insertEntity.setTopicResolvedCount(topicResolvedMap.get(insertEntity.getGridId()));
+            }
+            //2、当前网格内，话题关闭无需解决数
+            if(topicUnResolvedMap.containsKey(insertEntity.getGridId())){
+                insertEntity.setTopicUnResolvedCount(topicUnResolvedMap.get(insertEntity.getGridId()));
+            }
+            //3、当前网格内，议题关闭已解决数
+            if(issueResolvedMap.containsKey(insertEntity.getGridId())){
+                insertEntity.setIssueResolvedCount(issueResolvedMap.get(insertEntity.getGridId()));
+            }
+            //4、当前网格内，议题关闭无需解决数
+            if(issueUnResolvedMap.containsKey(insertEntity.getGridId())){
+                insertEntity.setIssueUnResolvedCount(issueUnResolvedMap.get(insertEntity.getGridId()));
+            }
+
+            // todo
+            // 5、当前网格内：来源于议题的项目：结案已解决数
+            insertEntity.setIssueProjectResolvedCount(calIssueProjectResolvedCount(customerId,insertEntity.getGridId()));
+            // 6、当前网格内：来源于议题的项目：结案无需解决数
+            insertEntity.setIssueProjectUnResolvedCount(calIssueProjectUnResolvedCount(customerId,insertEntity.getGridId()));
+            //7、当前网格内：项目立项，结案已解决数；默认为0，
+            insertEntity.setApprovalProjectResolvedCount(calApprovalProjectResolvedCount(customerId,insertEntity.getGridId()));
+            // 8、当前网格内：项目立项，结案无需解决数；默认为0，
+            insertEntity.setApprovalProjectUnResolvedCount(calApprovalProjectUnResolvedCount(customerId,insertEntity.getGridId()));
+
+
+            // 9、当前网格内，未出小组即未转议题的：话题关闭已解决数
+            insertEntity.setInGroupTopicResolvedCount(calInGroupTopicResolvedCount(customerId,insertEntity.getGridId()));
+            // 10、当前网格内，未出小组即未转议题的：话题关闭无需解决数
+            insertEntity.setInGroupTopicUnResolvedCount(calInGroupTopicUnResolvedCount(customerId,insertEntity.getGridId()));
+            // 11、未出当前网格的，结案项目数
+            insertEntity.setGridSelfGovernProjectTotal(calGridSelfGovernProjectTotal(customerId,insertEntity.getGridId()));
+
+
+            //界面展示：1、问题解决总数=1+2+3+4+5+6+7+8
+            insertEntity.setProblemResolvedCount(insertEntity.getTopicResolvedCount()+insertEntity.getTopicUnResolvedCount()
+                                    +insertEntity.getIssueResolvedCount()+insertEntity.getIssueUnResolvedCount()
+                                    +insertEntity.getIssueProjectResolvedCount()+insertEntity.getIssueProjectUnResolvedCount()
+                                    +insertEntity.getApprovalProjectResolvedCount()+insertEntity.getApprovalProjectUnResolvedCount());
+
+            //界面展示：2、党群自治占比=（9+10）/PROBLEM_RESOLVED_COUNT; 此列存储的是小数
+            int groupSelfGovernRatioFz=insertEntity.getInGroupTopicResolvedCount()+insertEntity.getInGroupTopicUnResolvedCount();
+            if (NumConstant.ZERO == groupSelfGovernRatioFz || NumConstant.ZERO == insertEntity.getProblemResolvedCount()) {
+                insertEntity.setGroupSelfGovernRatio(BigDecimal.ZERO);
+            }else{
+                String groupSelfGovernRatioStr = numberFormat.format((float) groupSelfGovernRatioFz / insertEntity.getProblemResolvedCount());
+                insertEntity.setGroupSelfGovernRatio(new BigDecimal(groupSelfGovernRatioStr));
+            }
+
+            //界面展示：3、网格自治占比=GRID_SELF_GOVERN_PROJECT_TOTAL/PROBLEM_RESOLVED_COUNT；此列存储的是小数
+            if(NumConstant.ZERO==insertEntity.getGridSelfGovernProjectTotal()||NumConstant.ZERO == insertEntity.getProblemResolvedCount()){
+                insertEntity.setGridSelfGovernRatio(BigDecimal.ZERO);
+            }else{
+                String gridSelfGovernRatioStr = numberFormat.format((float) insertEntity.getGridSelfGovernProjectTotal() / insertEntity.getProblemResolvedCount());
+                insertEntity.setGridSelfGovernRatio(new BigDecimal(gridSelfGovernRatioStr));
+            }
+        }
+        // 先删除，后新增
+        // 3、批量删除
+        int deleteNum;
+        do {
+            deleteNum = baseDao.deleteBatchByCustomerIdAndDateId(customerId, dateId, NumConstant.TWO_HUNDRED);
+        } while (deleteNum > NumConstant.ZERO);
+
+        // 4、插入数据
+        this.insertBatch(insertEntityList);
+        log.info("extractFactGridGovernDaily completed");
     }
+
+    /**
+     * 构造要插入的数据，每个网格一天一条数据，初始赋值0
+     *
+     * @param customerId
+     * @param dateId
+     * @param gridInfoDTOList
+     * @return com.epmet.entity.evaluationindex.extract.FactGridGovernDailyEntity
+     */
+    private List<FactGridGovernDailyEntity> constructFactGridGovernDailyEntityList(String customerId, String dateId, List<GridInfoDTO> gridInfoDTOList) {
+        List<FactGridGovernDailyEntity> insertEntityList = new ArrayList<>();
+        for (GridInfoDTO gridInfoDTO : gridInfoDTOList) {
+            FactGridGovernDailyEntity entity = new FactGridGovernDailyEntity();
+            entity.setCustomerId(customerId);
+            entity.setDateId(dateId);
+            entity.setGridId(gridInfoDTO.getGridId());
+            entity.setPid(gridInfoDTO.getPid());
+            entity.setPids(gridInfoDTO.getPids());
+            insertEntityList.add(entity);
+        }
+        return insertEntityList;
+    }
+
+    /**
+     * 1、当前网格内，话题关闭已解决数
+     * 2、当前网格内，话题关闭无需解决数
+     * 这两个值可以通过此方法获得
+     *
+     * @param customerId
+     * @param gridIds
+     * @param topicStatus 话题状态（讨论中 - discussing、 已屏蔽 - hidden、  已关闭 - closed）
+     * @param closedStatus unresolved,resolved
+     * @param shiftIssue 是否转为议题，0:false，1:true；
+     * @return
+     */
+    private Map<String, Integer> getTopicMap(String customerId, List<String> gridIds, String topicStatus, String closedStatus,String shiftIssue) {
+        Map<String, Integer> resultMap = new HashMap<>();
+        List<GovernGridTotalCommonDTO> list = factOriginTopicMainDailyService.queryGridTopicValue(customerId, gridIds, topicStatus, closedStatus,shiftIssue);
+        for (GovernGridTotalCommonDTO gridTotalCommonDTO : list) {
+            resultMap.put(gridTotalCommonDTO.getGridId(), gridTotalCommonDTO.getTotal());
+        }
+        return resultMap;
+    }
+
+    /**
+     * 3、当前网格内，议题关闭已解决数
+     * 4、当前网格内，议题关闭无需解决数
+     * 这两个值可以通过此方法获得
+     *
+     * @param customerId
+     * @param gridIds
+     * @param issueStatus 议题状态  voting 已转项目：shift_project 已关闭：closed_resloved
+     * @param resolveType unresolved,resolved
+     * @return
+     */
+    private Map<String, Integer> getIssueMap(String customerId, List<String> gridIds, String issueStatus, String resolveType) {
+        Map<String, Integer> resultMap = new HashMap<>();
+        List<GovernGridTotalCommonDTO> list = factOriginIssueMainDailyService.queryGridIssueValue(customerId, gridIds, issueStatus, resolveType);
+        for (GovernGridTotalCommonDTO gridTotalCommonDTO : list) {
+            resultMap.put(gridTotalCommonDTO.getGridId(), gridTotalCommonDTO.getTotal());
+        }
+        return resultMap;
+    }
+
+
+    /**
+     * 5、当前网格内：来源于议题的项目：结案已解决数
+     *
+     * @param customerId
+     * @param gridId
+     */
+    private Integer calIssueProjectResolvedCount(String customerId, String gridId) {
+        // todo
+        return 0;
+    }
+
+    /**
+     * 6、当前网格内：来源于议题的项目：结案无需解决数
+     *
+     * @param customerId
+     * @param gridId
+     */
+    private Integer calIssueProjectUnResolvedCount(String customerId, String gridId) {
+        // todo
+        return 0;
+    }
+
+
+    /**
+     * 7、当前网格内：项目立项，结案已解决数；默认为0，
+     *
+     * @param customerId
+     * @param gridId
+     */
+    private Integer calApprovalProjectResolvedCount(String customerId, String gridId) {
+        // todo
+        return 0;
+    }
+
+
+    /**
+     * 8、当前网格内：项目立项，结案无需解决数；默认为0，
+     *
+     * @param customerId
+     * @param gridId
+     */
+    private Integer calApprovalProjectUnResolvedCount(String customerId, String gridId) {
+        // todo
+        return 0;
+    }
+
+    /**
+     * 9、当前网格内，未出小组即未转议题的：话题关闭已解决数
+     *
+     * @param customerId
+     * @param gridId
+     */
+    private Integer calInGroupTopicResolvedCount(String customerId, String gridId) {
+        // todo
+        return 0;
+    }
+
+    /**
+     * 10、当前网格内，未出小组即未转议题的：话题关闭无需解决数
+     *
+     * @param customerId
+     * @param gridId
+     */
+    private Integer calInGroupTopicUnResolvedCount(String customerId, String gridId) {
+        // todo
+        return 0;
+    }
+
+    /**
+     * 11、未出当前网格的，结案项目数
+     *
+     * @param customerId
+     * @param gridId
+     */
+    private Integer calGridSelfGovernProjectTotal(String customerId, String gridId) {
+        // todo
+        return 0;
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginIssueMainDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginIssueMainDailyServiceImpl.java
index 86e60734b7..09a040e630 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginIssueMainDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginIssueMainDailyServiceImpl.java
@@ -25,6 +25,7 @@ import com.epmet.constant.OrgTypeConstant;
 import com.epmet.dao.evaluationindex.extract.FactOriginIssueMainDailyDao;
 import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginIssueMainDailyEntity;
+import com.epmet.entity.evaluationindex.extract.GovernGridTotalCommonDTO;
 import com.epmet.service.evaluationindex.extract.todata.FactOriginIssueMainDailyService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -169,4 +170,20 @@ public class FactOriginIssueMainDailyServiceImpl extends BaseServiceImpl<FactOri
             return result.stream().collect(Collectors.toMap(OrgStatisticsResultDTO::getOrgId, Function.identity()));
         }
     }
+
+    /**
+     * 3、当前网格内，议题关闭已解决数
+     * 4、当前网格内，议题关闭无需解决数
+     * 这两个值可以通过此方法获得
+     *
+     * @param customerId
+     * @param gridIds
+     * @param issueStatus 议题状态  voting 已转项目：shift_project 已关闭：closed_resloved
+     * @param resolveType unresolved,resolved
+     * @return
+     */
+    @Override
+    public List<GovernGridTotalCommonDTO> queryGridIssueValue(String customerId, List<String> gridIds, String issueStatus, String resolveType) {
+        return baseDao.selectGroupByGridId(customerId,gridIds,issueStatus,resolveType);
+    }
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginTopicMainDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginTopicMainDailyServiceImpl.java
index ac1e8af7a3..39eeffea2c 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginTopicMainDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginTopicMainDailyServiceImpl.java
@@ -37,6 +37,7 @@ import com.epmet.dto.org.GridInfoDTO;
 import com.epmet.dto.topic.TopicOriginInfoDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginTopicLogDailyEntity;
 import com.epmet.entity.evaluationindex.extract.FactOriginTopicMainDailyEntity;
+import com.epmet.entity.evaluationindex.extract.GovernGridTotalCommonDTO;
 import com.epmet.service.evaluationindex.extract.todata.FactOriginTopicMainDailyService;
 import com.epmet.service.org.CustomerGridService;
 import com.epmet.service.topic.TopicService;
@@ -359,4 +360,21 @@ public class FactOriginTopicMainDailyServiceImpl extends BaseServiceImpl<FactOri
         }
     }
 
+
+    /**
+     * 1、当前网格内，话题关闭已解决数
+     * 2、当前网格内，话题关闭无需解决数
+     * 这两个值可以通过此方法获得
+     *
+     * @param customerId
+     * @param gridIds
+     * @param topicStatus  话题状态（讨论中 - discussing、 已屏蔽 - hidden、  已关闭 - closed）
+     * @param closedStatus unresolved,resolved
+     * @param shiftIssue ：是否转为议题，0:false，1:true；
+     * @return
+     */
+    @Override
+    public List<GovernGridTotalCommonDTO> queryGridTopicValue(String customerId, List<String> gridIds, String topicStatus, String closedStatus, String shiftIssue) {
+        return baseDao.selectTopicGroupByGridId(customerId,gridIds,topicStatus,closedStatus,shiftIssue);
+    }
 }
\ No newline at end of file
diff --git 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
index 7777abc992..37ccee43f9 100644
--- 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
@@ -47,7 +47,7 @@
 --   `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 '未出当前网格的，结案项目数',
+--   `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 '当前组织内结案的项目中：由区直部门结案的项目总数',
@@ -84,7 +84,7 @@
 --   `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 COMMENT '未出当前网格的，结案项目数',
+--   `GRID_SELF_GOVERN_PROJECT_TOTAL` int(11) NOT NULL COMMENT '11、未出当前网格的，结案项目数',
 --   `DEL_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除、1已删除',
 --   `REVISION` int(11) NOT NULL DEFAULT 0 COMMENT '乐观锁',
 --   `CREATED_BY` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人',
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactGridGovernDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactGridGovernDailyDao.xml
index 6fa56797fa..3a13103f14 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactGridGovernDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactGridGovernDailyDao.xml
@@ -2,6 +2,15 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.epmet.dao.evaluationindex.extract.FactGridGovernDailyDao">
-
+    <!--  批量删除  -->
+    <delete id="deleteBatchByCustomerIdAndDateId" parameterType="map">
+        DELETE
+        FROM
+            fact_grid_govern_daily
+        WHERE
+            CUSTOMER_ID = #{customerId}
+            AND DATE_ID = #{dateId}
+            LIMIT #{limit}
+    </delete>
 
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml
index 259e46c150..e6c00c33af 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml
@@ -311,4 +311,36 @@
           AND DATE_ID &lt;= #{dateId}
         GROUP BY GRID_ID
     </select>
+
+
+    <!--  3、当前网格内，议题关闭已解决数 4、当前网格内，议题关闭无需解决数  -->
+    <select id="selectGroupByGridId" parameterType="map" resultType="com.epmet.entity.evaluationindex.extract.GovernGridTotalCommonDTO">
+        SELECT
+            m.CUSTOMER_ID AS customerId,
+            m.GRID_ID AS gridId,
+            count( 1 ) AS total
+        FROM
+            fact_origin_issue_main_daily m
+        WHERE
+            m.DEL_FLAG = '0'
+            AND m.GRID_ID IS NOT NULL
+            <if test='null != customerId and "" != customerId'>
+                AND m.CUSTOMER_ID = #{customerId}
+            </if>
+            <if test='null != issueStatus and "" != issueStatus'>
+                AND m.ISSUE_STATUS LIKE concat(#{issueStatus},'%')
+            </if>
+            <if test='null != resolveType and "" != resolveType'>
+                AND m.RESOLVE_TYPE = #{resolveType}
+            </if>
+            <if test="gridIds != null and gridIds.size() > 0">
+                AND m.GRID_ID in
+                <foreach item="gridId" collection="gridIds" open="(" separator="," close=")">
+                    #{gridId}
+                </foreach>
+            </if>
+        GROUP BY
+            m.CUSTOMER_ID,
+            m.GRID_ID
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml
index c8136df35a..49b0c96151 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml
@@ -197,4 +197,35 @@
           AND DATE_ID &lt;= #{dateId}
         GROUP BY GRID_ID
     </select>
+
+    <select id="selectTopicGroupByGridId" parameterType="map" resultType="com.epmet.entity.evaluationindex.extract.GovernGridTotalCommonDTO">
+        SELECT
+        m.CUSTOMER_ID as customerId,
+        m.GRID_ID AS gridId,
+        count( 1 ) AS total
+        FROM
+        fact_origin_topic_main_daily m
+        WHERE
+        m.DEL_FLAG = '0'
+        <if test='null != customerId and "" != customerId'>
+            AND m.CUSTOMER_ID = #{customerId}
+        </if>
+        <if test='null != topicStatus and "" != topicStatus'>
+            AND m.TOPIC_STATUS = #{topicStatus}
+        </if>
+        <if test='null != closedStatus and "" != closedStatus'>
+            AND m.CLOSED_STATUS = #{closedStatus}
+        </if>
+        <if test="gridIds != null and gridIds.size() > 0">
+            AND m.GRID_ID in
+            <foreach item="gridId" collection="gridIds" open="(" separator="," close=")">
+                #{gridId}
+            </foreach>
+        </if>
+        <if test='null != shiftIssue and "" != shiftIssue'>
+            and m.SHIFT_ISSUE=#{shiftIssue}
+        </if>
+        GROUP BY
+        m.CUSTOMER_ID,m.GRID_ID
+    </select>
 </mapper>
\ No newline at end of file

From ac551e3f4d0cce35134239834683964c4e6d17f1 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 25 May 2021 16:33:10 +0800
Subject: [PATCH 072/128] =?UTF-8?q?=E7=BE=A4=E4=BC=97=E4=B8=8D=E6=BB=A1?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/constant/ProjectConstant.java   | 1 +
 .../impl/ProjectSatisfactionStatisticsServiceImpl.java      | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java
index 992871d265..eec6371298 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java
@@ -181,6 +181,7 @@ public interface ProjectConstant {
 	String THREE_MONTH = "threeMonth";
 	String SIX_MONTH = "sixMonth";
 	String TWELVE_MONTH = "twelveMonth";
+	String YESTERDAY = "yesterday";
 
 	/**
 	 * 排序
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionStatisticsServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionStatisticsServiceImpl.java
index 5ced71018a..119f217c14 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionStatisticsServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionStatisticsServiceImpl.java
@@ -215,8 +215,7 @@ public class ProjectSatisfactionStatisticsServiceImpl extends BaseServiceImpl<Pr
      * @date 2021/5/18 2:28 下午
      */
     public Integer getDateId(String dateType){
-        String beforeNDay = DateUtils.getBeforeNDay(NumConstant.ONE);
-        Integer result = Integer.valueOf(beforeNDay);
+        Integer result = Integer.valueOf(DateUtils.getBeforeNDay(NumConstant.ONE));
         switch (dateType) {
             case ProjectConstant.THREE_MONTH:
                 result = Integer.valueOf(DateUtils.getBeforeNDay(NumConstant.NINETY));
@@ -227,6 +226,9 @@ public class ProjectSatisfactionStatisticsServiceImpl extends BaseServiceImpl<Pr
             case ProjectConstant.TWELVE_MONTH:
                 result = Integer.valueOf(DateUtils.getBeforeNDay(NumConstant.THREE_HUNDRED_AND_SIXTY_FIVE));
                 break;
+            case ProjectConstant.YESTERDAY:
+                result = Integer.valueOf(DateUtils.getBeforeNDay(NumConstant.ONE));
+                break;
             default:
         }
         return result;

From c032326cd19bd4cd75e7d82057081bfe8bb7676e Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 25 May 2021 17:40:07 +0800
Subject: [PATCH 073/128] =?UTF-8?q?=E6=B2=BB=E7=90=86=E6=8C=87=E6=95=B0?=
 =?UTF-8?q?=E7=BD=91=E6=A0=BCv2,?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/constant/ProjectConstant.java   | 10 +++
 .../FactOriginProjectMainDailyDao.java        | 20 +++++
 .../FactOriginProjectMainDailyService.java    | 15 ++++
 .../impl/FactGridGovernDailyServiceImpl.java  | 82 ++++++++-----------
 ...FactOriginProjectMainDailyServiceImpl.java | 19 +++++
 .../extract/FactOriginProjectMainDailyDao.xml | 33 ++++++++
 6 files changed, 133 insertions(+), 46 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/ProjectConstant.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/ProjectConstant.java
index e1b0dd8a11..b714ce2210 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/ProjectConstant.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/ProjectConstant.java
@@ -71,4 +71,14 @@ public interface ProjectConstant {
 
 
     String ISSUE = "issue";
+
+    /**
+     * 项目来源于议题
+     */
+    String PROJECT_ORIGIN_ISSUE="issue";
+
+    /**
+     * 项目来源于 工作端立项
+     */
+    String PROJECT_ORIGIN_AGENCY="agency";
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java
index e07a58613f..0403e29bc2 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java
@@ -28,6 +28,7 @@ import com.epmet.dto.screen.ScreenProjectDataDTO;
 import com.epmet.dto.screen.form.ProjectSourceMapFormDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectMainDailyEntity;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectOrgPeriodDailyEntity;
+import com.epmet.entity.evaluationindex.extract.GovernGridTotalCommonDTO;
 import com.epmet.entity.evaluationindex.screen.ScreenDifficultyDataEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -445,4 +446,23 @@ public interface FactOriginProjectMainDailyDao extends BaseDao<FactOriginProject
 	 * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
 	 */
 	List<OrgStatisticsResultDTO> selectPartyMemberClosedProjectStaticByGrid(@Param("customerId") String customerId, @Param("dateId") String dateId);
+
+	/**
+	 * 5、当前网格内：来源于议题的项目：结案已解决数、
+	 * 6、当前网格内：来源于议题的项目：结案无需解决数、
+	 * 7、当前网格内：项目立项，结案已解决数；默认为0、
+	 * 8、当前网格内：项目立项，结案无需解决数；默认为0、
+	 *
+	 * @param customerId
+	 * @param gridIds
+	 * @param projectStatus 状态:待处理 pending，结案closed
+	 * @param origin        项目来源 来源：议题issue 组织agency
+	 * @param isResolved    unresolved,resolved
+	 * @return com.epmet.entity.evaluationindex.extract.GovernGridTotalCommonDTO
+	 */
+    List<GovernGridTotalCommonDTO> selectGroupByGrid(@Param("customerId")String customerId,
+													 @Param("gridIds")List<String> gridIds,
+													 @Param("projectStatus")String projectStatus,
+													 @Param("origin")String origin,
+													 @Param("isResolved")String isResolved);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java
index 21994e4a98..215aa74756 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java
@@ -29,6 +29,7 @@ import com.epmet.dto.screen.form.ProjectSourceMapFormDTO;
 import com.epmet.dto.screen.form.ScreenCentralZoneDataFormDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectMainDailyEntity;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectOrgPeriodDailyEntity;
+import com.epmet.entity.evaluationindex.extract.GovernGridTotalCommonDTO;
 import com.epmet.entity.evaluationindex.screen.ScreenDifficultyDataEntity;
 
 import java.util.List;
@@ -421,4 +422,18 @@ public interface FactOriginProjectMainDailyService extends BaseService<FactOrigi
      */
     Map<String, OrgStatisticsResultDTO> getPartyMemberClosedProjectStatic(String customerId, String dateId, String type);
 
+    /**
+     * 5、当前网格内：来源于议题的项目：结案已解决数、
+     * 6、当前网格内：来源于议题的项目：结案无需解决数、
+     * 7、当前网格内：项目立项，结案已解决数；默认为0、
+     * 8、当前网格内：项目立项，结案无需解决数；默认为0、
+     *
+     * @param customerId
+     * @param gridIds
+     * @param projectStatus 状态:待处理 pending，结案closed
+     * @param origin 项目来源 来源：议题issue 组织agency
+     * @param isResolved unresolved,resolved
+     * @return
+     */
+    List<GovernGridTotalCommonDTO> queryGridProjectValue(String customerId, List<String> gridIds, String projectStatus, String origin, String isResolved);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java
index d3ebd1edc9..b0b0abc786 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java
@@ -27,6 +27,7 @@ import com.epmet.entity.evaluationindex.extract.FactGridGovernDailyEntity;
 import com.epmet.entity.evaluationindex.extract.GovernGridTotalCommonDTO;
 import com.epmet.service.evaluationindex.extract.todata.FactGridGovernDailyService;
 import com.epmet.service.evaluationindex.extract.todata.FactOriginIssueMainDailyService;
+import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectMainDailyService;
 import com.epmet.service.evaluationindex.extract.todata.FactOriginTopicMainDailyService;
 import com.epmet.service.org.CustomerGridService;
 import lombok.extern.slf4j.Slf4j;
@@ -56,6 +57,8 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
     @Autowired
     private FactOriginIssueMainDailyService factOriginIssueMainDailyService;
     @Autowired
+    private FactOriginProjectMainDailyService factOriginProjectMainDailyService;
+    @Autowired
     private CustomerGridService customerGridService;
 
 
@@ -91,9 +94,12 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
 
         Map<String, Integer> topicResolvedMap=getTopicMap(customerId, null,ProjectConstant.CLOSED, DimObjectStatusConstant.RESOLVED,NumConstant.ZERO_STR);
         Map<String, Integer> topicUnResolvedMap=getTopicMap(customerId, null,ProjectConstant.CLOSED, DimObjectStatusConstant.UNRESOLVED,NumConstant.ZERO_STR);
-
         Map<String, Integer> issueResolvedMap=getIssueMap(customerId, null,ProjectConstant.CLOSED, DimObjectStatusConstant.RESOLVED);
         Map<String, Integer> issueUnResolvedMap=getIssueMap(customerId, null,ProjectConstant.CLOSED, DimObjectStatusConstant.UNRESOLVED);
+        Map<String,Integer>  issueProjectResolvedMap=getGridProjectMap(customerId,null,ProjectConstant.CLOSED,ProjectConstant.PROJECT_ORIGIN_ISSUE,DimObjectStatusConstant.RESOLVED);
+        Map<String,Integer>  issueProjectUnResolvedMap=getGridProjectMap(customerId,null,ProjectConstant.CLOSED,ProjectConstant.PROJECT_ORIGIN_ISSUE,DimObjectStatusConstant.UNRESOLVED);
+        Map<String,Integer>  approvalProjectResolvedMap=getGridProjectMap(customerId,null,ProjectConstant.CLOSED,ProjectConstant.PROJECT_ORIGIN_AGENCY,DimObjectStatusConstant.RESOLVED);
+        Map<String,Integer>  approvalProjectUnResolvedMap=getGridProjectMap(customerId,null,ProjectConstant.CLOSED,ProjectConstant.PROJECT_ORIGIN_AGENCY,DimObjectStatusConstant.UNRESOLVED);
 
         for(FactGridGovernDailyEntity insertEntity:insertEntityList){
             //1、当前网格内，话题关闭已解决数
@@ -112,18 +118,24 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
             if(issueUnResolvedMap.containsKey(insertEntity.getGridId())){
                 insertEntity.setIssueUnResolvedCount(issueUnResolvedMap.get(insertEntity.getGridId()));
             }
-
-            // todo
             // 5、当前网格内：来源于议题的项目：结案已解决数
-            insertEntity.setIssueProjectResolvedCount(calIssueProjectResolvedCount(customerId,insertEntity.getGridId()));
+            if(issueProjectResolvedMap.containsKey(insertEntity.getGridId())){
+                insertEntity.setIssueProjectResolvedCount(issueProjectResolvedMap.get(insertEntity.getGridId()));
+            }
             // 6、当前网格内：来源于议题的项目：结案无需解决数
-            insertEntity.setIssueProjectUnResolvedCount(calIssueProjectUnResolvedCount(customerId,insertEntity.getGridId()));
+            if(issueProjectUnResolvedMap.containsKey(insertEntity.getGridId())){
+                insertEntity.setIssueProjectUnResolvedCount(issueProjectUnResolvedMap.get(insertEntity.getGridId()));
+            }
             //7、当前网格内：项目立项，结案已解决数；默认为0，
-            insertEntity.setApprovalProjectResolvedCount(calApprovalProjectResolvedCount(customerId,insertEntity.getGridId()));
+            if(approvalProjectResolvedMap.containsKey(insertEntity.getGridId())){
+                insertEntity.setApprovalProjectResolvedCount(approvalProjectResolvedMap.get(insertEntity.getGridId()));
+            }
             // 8、当前网格内：项目立项，结案无需解决数；默认为0，
-            insertEntity.setApprovalProjectUnResolvedCount(calApprovalProjectUnResolvedCount(customerId,insertEntity.getGridId()));
-
+            if(approvalProjectUnResolvedMap.containsKey(insertEntity.getGridId())){
+                insertEntity.setApprovalProjectUnResolvedCount(approvalProjectUnResolvedMap.get(insertEntity.getGridId()));
+            }
 
+            // todo
             // 9、当前网格内，未出小组即未转议题的：话题关闭已解决数
             insertEntity.setInGroupTopicResolvedCount(calInGroupTopicResolvedCount(customerId,insertEntity.getGridId()));
             // 10、当前网格内，未出小组即未转议题的：话题关闭无需解决数
@@ -230,52 +242,30 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
         return resultMap;
     }
 
-
-    /**
-     * 5、当前网格内：来源于议题的项目：结案已解决数
-     *
-     * @param customerId
-     * @param gridId
-     */
-    private Integer calIssueProjectResolvedCount(String customerId, String gridId) {
-        // todo
-        return 0;
-    }
-
     /**
-     * 6、当前网格内：来源于议题的项目：结案无需解决数
+     * 5、当前网格内：来源于议题的项目：结案已解决数、
+     * 6、当前网格内：来源于议题的项目：结案无需解决数、
+     * 7、当前网格内：项目立项，结案已解决数；默认为0、
+     * 8、当前网格内：项目立项，结案无需解决数；默认为0、
      *
      * @param customerId
-     * @param gridId
+     * @param gridIds
+     * @param projectStatus 状态:待处理 pending，结案closed
+     * @param origin 项目来源 来源：议题issue 组织agency
+     * @param isResolved unresolved,resolved
+     * @return
      */
-    private Integer calIssueProjectUnResolvedCount(String customerId, String gridId) {
-        // todo
-        return 0;
+    private Map<String, Integer> getGridProjectMap(String customerId,  List<String> gridIds, String projectStatus, String origin, String isResolved) {
+        Map<String, Integer> resultMap = new HashMap<>();
+        List<GovernGridTotalCommonDTO> list = factOriginProjectMainDailyService.queryGridProjectValue(customerId, gridIds, projectStatus, origin, isResolved);
+        for (GovernGridTotalCommonDTO gridTotalCommonDTO : list) {
+            resultMap.put(gridTotalCommonDTO.getGridId(), gridTotalCommonDTO.getTotal());
+        }
+        return resultMap;
     }
 
 
-    /**
-     * 7、当前网格内：项目立项，结案已解决数；默认为0，
-     *
-     * @param customerId
-     * @param gridId
-     */
-    private Integer calApprovalProjectResolvedCount(String customerId, String gridId) {
-        // todo
-        return 0;
-    }
-
 
-    /**
-     * 8、当前网格内：项目立项，结案无需解决数；默认为0，
-     *
-     * @param customerId
-     * @param gridId
-     */
-    private Integer calApprovalProjectUnResolvedCount(String customerId, String gridId) {
-        // todo
-        return 0;
-    }
 
     /**
      * 9、当前网格内，未出小组即未转议题的：话题关闭已解决数
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java
index 12550e187f..58d625f999 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java
@@ -39,6 +39,7 @@ import com.epmet.dto.screen.form.ProjectSourceMapFormDTO;
 import com.epmet.dto.screen.form.ScreenCentralZoneDataFormDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectMainDailyEntity;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectOrgPeriodDailyEntity;
+import com.epmet.entity.evaluationindex.extract.GovernGridTotalCommonDTO;
 import com.epmet.entity.evaluationindex.screen.ScreenDifficultyDataEntity;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectMainDailyService;
@@ -639,5 +640,23 @@ public class FactOriginProjectMainDailyServiceImpl extends BaseServiceImpl<FactO
         }
     }
 
+    /**
+     * 5、当前网格内：来源于议题的项目：结案已解决数、
+     * 6、当前网格内：来源于议题的项目：结案无需解决数、
+     * 7、当前网格内：项目立项，结案已解决数；默认为0、
+     * 8、当前网格内：项目立项，结案无需解决数；默认为0、
+     *
+     * @param customerId
+     * @param gridIds
+     * @param projectStatus 状态:待处理 pending，结案closed
+     * @param origin        项目来源 来源：议题issue 组织agency
+     * @param isResolved    unresolved,resolved
+     * @return com.epmet.entity.evaluationindex.extract.GovernGridTotalCommonDTO
+     */
+    @Override
+    public List<GovernGridTotalCommonDTO> queryGridProjectValue(String customerId, List<String> gridIds, String projectStatus, String origin, String isResolved) {
+        return baseDao.selectGroupByGrid(customerId,gridIds,projectStatus,origin,isResolved);
+    }
+
 
 }
diff --git 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
index c6e024c502..c76cfb8128 100644
--- 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
@@ -914,4 +914,37 @@
             ON a.AGENCY_ID = b.AGENCY_ID
     </select>
 
+    <!--  5、当前网格内：来源于议题的项目：结案已解决数、6、当前网格内：来源于议题的项目：结案无需解决数、7、当前网格内：项目立项，结案已解决数；默认为0、8、当前网格内：项目立项，结案无需解决数；默认为0、  -->
+    <select id="selectGroupByGrid" parameterType="map" resultType="com.epmet.entity.evaluationindex.extract.GovernGridTotalCommonDTO">
+        SELECT
+            m.CUSTOMER_ID AS customerId,
+            m.GRID_ID AS gridId,
+            count( 1 ) AS total
+        FROM
+            fact_origin_project_main_daily m
+        WHERE
+            m.DEL_FLAG = '0'
+            <if test='null != customerId and "" != customerId'>
+                AND m.CUSTOMER_ID = #{customerId}
+            </if>
+            <if test='null != origin and "" != origin'>
+                AND m.ORIGIN = #{origin}
+            </if>
+            <if test='null != projectStatus and "" != projectStatus'>
+                AND m.PROJECT_STATUS = #{projectStatus}
+            </if>
+            <if test='null != isResolved and "" != isResolved'>
+                AND m.IS_RESOLVED = #{isResolved}
+            </if>
+
+            <if test="gridIds != null and gridIds.size() > 0">
+                AND m.GRID_ID in
+                <foreach item="gridId" collection="gridIds" open="(" separator="," close=")">
+                    #{gridId}
+                </foreach>
+            </if>
+        GROUP BY
+            m.CUSTOMER_ID,
+            m.GRID_ID
+    </select>
 </mapper>

From ec6e94809e4c7e901e062b710f3caf4928b963ba Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 25 May 2021 18:29:43 +0800
Subject: [PATCH 074/128] =?UTF-8?q?=E6=B2=BB=E7=90=86=E6=8C=87=E6=95=B0?=
 =?UTF-8?q?=E7=BD=91=E6=A0=BCv2.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extract/FactGridGovernDailyEntity.java    | 31 ++++++++-
 .../impl/FactGridGovernDailyServiceImpl.java  | 65 ++++++++++---------
 .../db/migration/V0.0.15__govern.sql          | 60 +++++++++--------
 3 files changed, 93 insertions(+), 63 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactGridGovernDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactGridGovernDailyEntity.java
index 0e7b1cb889..ae45d7aa7d 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactGridGovernDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactGridGovernDailyEntity.java
@@ -129,11 +129,32 @@ public class FactGridGovernDailyEntity extends BaseEpmetEntity {
      */
 	private Integer inGroupTopicUnResolvedCount;
 
-    /**
-     * 11、未出当前网格的，结案项目数
-     */
+	/**
+	 * 11、来源于议题的项目，未出网格结案并且已解决的项目数
+	 */
+	private Integer fromIssueResolvedInGridCount;
+
+	/**
+	 * 12、来源于议题的项目，未出网格结案并且无需解决的项目数
+	 */
+	private Integer fromIssueUnResolvedInGridCount;
+
+	/**
+	 * 13、来源于项目立项的项目，未出网格结案，并且已解决的项目数；因现在网格不能立项，所以此列默认为0
+	 */
+	private Integer fromAgencyResolvedInGridCount;
+
+	/**
+	 * 14、来源于项目立项的项目，未出网格结案，并且无需解决的项目数；因现在网格不能立项，所以此列默认为0
+	 */
+	private Integer fromAgencyUnResolvedInGridCount;
+
+	/**
+	 * 15、未出当前网格的，结案项目数=11+12+13+14
+	 */
 	private Integer gridSelfGovernProjectTotal;
 
+
 	public FactGridGovernDailyEntity() {
 		this.customerId = StrConstant.EPMETY_STR;
 		this.dateId = StrConstant.EPMETY_STR;
@@ -153,6 +174,10 @@ public class FactGridGovernDailyEntity extends BaseEpmetEntity {
 		this.approvalProjectUnResolvedCount=NumConstant.ZERO;
 		this.inGroupTopicResolvedCount=NumConstant.ZERO;
 		this.inGroupTopicUnResolvedCount=NumConstant.ZERO;
+		this.fromIssueResolvedInGridCount=NumConstant.ZERO;
+		this.fromIssueUnResolvedInGridCount=NumConstant.ZERO;
+		this.fromAgencyResolvedInGridCount=NumConstant.ZERO;
+		this.fromAgencyUnResolvedInGridCount=NumConstant.ZERO;
 		this.gridSelfGovernProjectTotal=NumConstant.ZERO;
 	}
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java
index b0b0abc786..4f5483e7b4 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java
@@ -92,14 +92,17 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
         NumberFormat numberFormat = NumberFormat.getInstance();
         numberFormat.setMaximumFractionDigits(NumConstant.SIX);
 
-        Map<String, Integer> topicResolvedMap=getTopicMap(customerId, null,ProjectConstant.CLOSED, DimObjectStatusConstant.RESOLVED,NumConstant.ZERO_STR);
-        Map<String, Integer> topicUnResolvedMap=getTopicMap(customerId, null,ProjectConstant.CLOSED, DimObjectStatusConstant.UNRESOLVED,NumConstant.ZERO_STR);
+        Map<String, Integer> topicResolvedMap=getTopicMap(customerId, null,ProjectConstant.CLOSED, DimObjectStatusConstant.RESOLVED,null);
+        Map<String, Integer> topicUnResolvedMap=getTopicMap(customerId, null,ProjectConstant.CLOSED, DimObjectStatusConstant.UNRESOLVED,null);
         Map<String, Integer> issueResolvedMap=getIssueMap(customerId, null,ProjectConstant.CLOSED, DimObjectStatusConstant.RESOLVED);
         Map<String, Integer> issueUnResolvedMap=getIssueMap(customerId, null,ProjectConstant.CLOSED, DimObjectStatusConstant.UNRESOLVED);
         Map<String,Integer>  issueProjectResolvedMap=getGridProjectMap(customerId,null,ProjectConstant.CLOSED,ProjectConstant.PROJECT_ORIGIN_ISSUE,DimObjectStatusConstant.RESOLVED);
         Map<String,Integer>  issueProjectUnResolvedMap=getGridProjectMap(customerId,null,ProjectConstant.CLOSED,ProjectConstant.PROJECT_ORIGIN_ISSUE,DimObjectStatusConstant.UNRESOLVED);
         Map<String,Integer>  approvalProjectResolvedMap=getGridProjectMap(customerId,null,ProjectConstant.CLOSED,ProjectConstant.PROJECT_ORIGIN_AGENCY,DimObjectStatusConstant.RESOLVED);
         Map<String,Integer>  approvalProjectUnResolvedMap=getGridProjectMap(customerId,null,ProjectConstant.CLOSED,ProjectConstant.PROJECT_ORIGIN_AGENCY,DimObjectStatusConstant.UNRESOLVED);
+        Map<String, Integer> inGroupTopicResolvedMap=getTopicMap(customerId, null,ProjectConstant.CLOSED, DimObjectStatusConstant.RESOLVED,NumConstant.ONE_STR);
+        Map<String, Integer> inGroupTopicUnResolvedMap=getTopicMap(customerId, null,ProjectConstant.CLOSED, DimObjectStatusConstant.UNRESOLVED,NumConstant.ONE_STR);
+
 
         for(FactGridGovernDailyEntity insertEntity:insertEntityList){
             //1、当前网格内，话题关闭已解决数
@@ -110,6 +113,8 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
             if(topicUnResolvedMap.containsKey(insertEntity.getGridId())){
                 insertEntity.setTopicUnResolvedCount(topicUnResolvedMap.get(insertEntity.getGridId()));
             }
+
+
             //3、当前网格内，议题关闭已解决数
             if(issueResolvedMap.containsKey(insertEntity.getGridId())){
                 insertEntity.setIssueResolvedCount(issueResolvedMap.get(insertEntity.getGridId()));
@@ -118,6 +123,8 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
             if(issueUnResolvedMap.containsKey(insertEntity.getGridId())){
                 insertEntity.setIssueUnResolvedCount(issueUnResolvedMap.get(insertEntity.getGridId()));
             }
+
+
             // 5、当前网格内：来源于议题的项目：结案已解决数
             if(issueProjectResolvedMap.containsKey(insertEntity.getGridId())){
                 insertEntity.setIssueProjectResolvedCount(issueProjectResolvedMap.get(insertEntity.getGridId()));
@@ -135,13 +142,29 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
                 insertEntity.setApprovalProjectUnResolvedCount(approvalProjectUnResolvedMap.get(insertEntity.getGridId()));
             }
 
-            // todo
+            // 党群自治占比：当前组织下，所有小组内关闭（已解决+无需解决）的话题数与问题解决总数之比（未出小组：未转议题的）
             // 9、当前网格内，未出小组即未转议题的：话题关闭已解决数
-            insertEntity.setInGroupTopicResolvedCount(calInGroupTopicResolvedCount(customerId,insertEntity.getGridId()));
+            if(inGroupTopicResolvedMap.containsKey(insertEntity.getGridId())){
+                insertEntity.setInGroupTopicResolvedCount(inGroupTopicResolvedMap.get(insertEntity.getGridId()));
+            }
             // 10、当前网格内，未出小组即未转议题的：话题关闭无需解决数
-            insertEntity.setInGroupTopicUnResolvedCount(calInGroupTopicUnResolvedCount(customerId,insertEntity.getGridId()));
-            // 11、未出当前网格的，结案项目数
-            insertEntity.setGridSelfGovernProjectTotal(calGridSelfGovernProjectTotal(customerId,insertEntity.getGridId()));
+            if(inGroupTopicUnResolvedMap.containsKey(insertEntity.getGridId())){
+                insertEntity.setInGroupTopicUnResolvedCount(inGroupTopicUnResolvedMap.get(insertEntity.getGridId()));
+            }
+
+            // todo
+            // 11、来源于议题的项目，未出网格结案并且已解决的项目数
+            insertEntity.setFromIssueResolvedInGridCount(0);
+            // 12、来源于议题的项目，未出网格结案并且无需解决的项目数
+            insertEntity.setFromIssueUnResolvedInGridCount(0);
+            // 13、来源于项目立项的项目，未出网格结案，并且已解决的项目数；因现在网格不能立项，所以此列默认为0
+            insertEntity.setFromAgencyResolvedInGridCount(0);
+            // 14、来源于项目立项的项目，未出网格结案，并且无需解决的项目数；因现在网格不能立项，所以此列默认为0
+            insertEntity.setFromAgencyUnResolvedInGridCount(0);
+            // 所有网格内结案项目数（未出网格）=来源于议题的项目结案已解决+来源于议题的项目结案无需解决+来源于立项的项目结案已解决+来源于立项的项目结案无需解决
+            // 15、未出当前网格的，结案项目数=11+12+13+14
+            insertEntity.setGridSelfGovernProjectTotal(insertEntity.getFromIssueResolvedInGridCount()+insertEntity.getFromIssueUnResolvedInGridCount()+
+                        insertEntity.getFromAgencyResolvedInGridCount()+insertEntity.getFromAgencyUnResolvedInGridCount());
 
 
             //界面展示：1、问题解决总数=1+2+3+4+5+6+7+8
@@ -150,6 +173,7 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
                                     +insertEntity.getIssueProjectResolvedCount()+insertEntity.getIssueProjectUnResolvedCount()
                                     +insertEntity.getApprovalProjectResolvedCount()+insertEntity.getApprovalProjectUnResolvedCount());
 
+            // 党群自治占比：当前组织下，所有小组内关闭（已解决+无需解决）的话题数与问题解决总数之比（未出小组：未转议题的）
             //界面展示：2、党群自治占比=（9+10）/PROBLEM_RESOLVED_COUNT; 此列存储的是小数
             int groupSelfGovernRatioFz=insertEntity.getInGroupTopicResolvedCount()+insertEntity.getInGroupTopicUnResolvedCount();
             if (NumConstant.ZERO == groupSelfGovernRatioFz || NumConstant.ZERO == insertEntity.getProblemResolvedCount()) {
@@ -159,6 +183,7 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
                 insertEntity.setGroupSelfGovernRatio(new BigDecimal(groupSelfGovernRatioStr));
             }
 
+            // 网格自治占比：当前组织下，所有网格内结案项目数与问题解决总数之比（未出网格）
             //界面展示：3、网格自治占比=GRID_SELF_GOVERN_PROJECT_TOTAL/PROBLEM_RESOLVED_COUNT；此列存储的是小数
             if(NumConstant.ZERO==insertEntity.getGridSelfGovernProjectTotal()||NumConstant.ZERO == insertEntity.getProblemResolvedCount()){
                 insertEntity.setGridSelfGovernRatio(BigDecimal.ZERO);
@@ -265,32 +290,8 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
     }
 
 
-
-
-    /**
-     * 9、当前网格内，未出小组即未转议题的：话题关闭已解决数
-     *
-     * @param customerId
-     * @param gridId
-     */
-    private Integer calInGroupTopicResolvedCount(String customerId, String gridId) {
-        // todo
-        return 0;
-    }
-
-    /**
-     * 10、当前网格内，未出小组即未转议题的：话题关闭无需解决数
-     *
-     * @param customerId
-     * @param gridId
-     */
-    private Integer calInGroupTopicUnResolvedCount(String customerId, String gridId) {
-        // todo
-        return 0;
-    }
-
     /**
-     * 11、未出当前网格的，结案项目数
+     * 15、未出当前网格的，结案项目数=11+12+13+14
      *
      * @param customerId
      * @param gridId
diff --git 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
index 37ccee43f9..8d469eec21 100644
--- 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
@@ -64,34 +64,38 @@
 -- -- Table structure for fact_grid_govern_daily
 -- -- ----------------------------
 -- DROP TABLE IF EXISTS `fact_grid_govern_daily`;
--- CREATE TABLE `fact_grid_govern_daily`  (
---   `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键，customer_id+grid_id+date_id只有一条记录',
---   `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客户id',
---   `DATE_ID` varchar(8) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '数据更新至：yyyyMMdd; ',
---   `GRID_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网格id',
---   `PID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网格所属的组织id',
---   `PIDS` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci 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；此列存储的是小数',
---   `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 COMMENT '11、未出当前网格的，结案项目数',
---   `DEL_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除、1已删除',
---   `REVISION` int(11) NOT NULL DEFAULT 0 COMMENT '乐观锁',
---   `CREATED_BY` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人',
---   `CREATED_TIME` datetime(0) NOT NULL COMMENT '创建时间：第一次提交审核的时间，注意和历史表的第一条记录时间一致',
---   `UPDATED_BY` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新人',
---   `UPDATED_TIME` datetime(0) NOT NULL 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；此列存储的是小数',
+--   `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',
+--   `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 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '网格的治理指数，按天统计' ROW_FORMAT = Dynamic;
+-- ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='网格的治理指数，按天统计';
 --
 -- SET FOREIGN_KEY_CHECKS = 1;

From cff05a0e5097f34ba9ffd41b5cb7690bd2db94c0 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 26 May 2021 10:02:39 +0800
Subject: [PATCH 075/128] =?UTF-8?q?=E6=94=AF=E9=83=A8=E5=BB=BA=E8=AE=BE?=
 =?UTF-8?q?=E3=80=81=E8=81=94=E5=BB=BA=E5=85=B1=E5=BB=BA=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?DB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../migration/V0.0.14__groupact_analysis.sql  | 90 +++++++++----------
 1 file changed, 44 insertions(+), 46 deletions(-)

diff --git 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
index ee35df8d10..a450ab5eec 100644
--- 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,49 +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_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='专项组活动(参加人数、组织次数、平均参加人数)按月增量分析';
\ No newline at end of file
+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='专项组活动(参加人数、组织次数、平均参加人数)按月增量分析';
\ No newline at end of file

From f3338fc61eb40c8e2fb2e0aec3ecf7f825fc764f Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Wed, 26 May 2021 10:06:53 +0800
Subject: [PATCH 076/128] =?UTF-8?q?sql=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../db/migration/V0.0.15__govern.sql          | 32 +++++++++++++++++++
 .../db/migration/V0.0.13__add_parameter.sql   |  1 +
 2 files changed, 33 insertions(+)
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.13__add_parameter.sql

diff --git 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
index 8d469eec21..836d3a3b7a 100644
--- 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
@@ -99,3 +99,35 @@
 -- ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='网格的治理指数，按天统计';
 --
 -- SET FOREIGN_KEY_CHECKS = 1;
+
+# 小组成员添加是否是党员
+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='基层治理-治理能力排行数据(按日统计)';
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.13__add_parameter.sql b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.13__add_parameter.sql
new file mode 100644
index 0000000000..4f8d970ed4
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.13__add_parameter.sql
@@ -0,0 +1 @@
+INSERT INTO `customer_project_parameter`(`ID`, `CUSTOMER_ID`, `PARAMETER_KEY`, `PARAMETER_NAME`, `PARAMETER_VALUE`, `DESCRIPTION`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1007', 'default', 'satisfaction', '项目满意指标', '75', '评分小于当前分的为不满意', '0', 1, '1', '2020-10-26 10:57:41', '1', '2020-10-26 10:57:45');

From 6f0593bc58e4ff379ea0c368288ca02b7f0fb397 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 26 May 2021 10:16:05 +0800
Subject: [PATCH 077/128] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=AF=E7=99=BB?=
 =?UTF-8?q?=E9=99=86=E5=8F=91=E9=80=81=E7=9F=AD=E4=BF=A1=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ThirdLoginController.java      | 12 +++++
 .../dto/form/ThirdSendSmsCodeFormDTO.java     | 27 +++++++++++
 .../com/epmet/service/ThirdLoginService.java  | 12 +++--
 .../service/impl/ThirdLoginServiceImpl.java   | 46 +++++++++++++++++++
 4 files changed, 93 insertions(+), 4 deletions(-)
 create mode 100644 epmet-auth/src/main/java/com/epmet/dto/form/ThirdSendSmsCodeFormDTO.java

diff --git a/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java b/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java
index 00770d82bb..144e18d024 100644
--- a/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java
+++ b/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java
@@ -104,4 +104,16 @@ public class ThirdLoginController {
         return new Result().ok("");
     }
 
+    /**
+     * @param formDTO
+     * @author sun
+     * @description 单客户-工作端微信小程序登录-发送验证码
+     **/
+    @PostMapping(value = "sendsmscode")
+    public Result sendSmsCode(@RequestBody ThirdSendSmsCodeFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO,ThirdSendSmsCodeFormDTO.AddUserShowGroup.class);
+        thirdLoginService.sendSmsCode(formDTO);
+        return new Result();
+    }
+
 }
diff --git a/epmet-auth/src/main/java/com/epmet/dto/form/ThirdSendSmsCodeFormDTO.java b/epmet-auth/src/main/java/com/epmet/dto/form/ThirdSendSmsCodeFormDTO.java
new file mode 100644
index 0000000000..d2588a27bb
--- /dev/null
+++ b/epmet-auth/src/main/java/com/epmet/dto/form/ThirdSendSmsCodeFormDTO.java
@@ -0,0 +1,27 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 单客户-工作端微信小程序登录-发送验证码
+ * @Author sun
+ */
+@Data
+public class ThirdSendSmsCodeFormDTO implements Serializable {
+    private static final long serialVersionUID = -1852541457359282018L;
+    /**
+     * 小程序appId
+     */
+    @NotBlank(message = "appId不能为空", groups = {AddUserShowGroup.class})
+    private String appId;
+    /**
+     * 手机号
+     */
+    @NotBlank(message = "手机号不能为空", groups = {AddUserShowGroup.class})
+    private String mobile;
+    public interface AddUserShowGroup extends CustomerClientShowGroup {}
+}
diff --git a/epmet-auth/src/main/java/com/epmet/service/ThirdLoginService.java b/epmet-auth/src/main/java/com/epmet/service/ThirdLoginService.java
index 3d9c60cc64..c79a67d41c 100644
--- a/epmet-auth/src/main/java/com/epmet/service/ThirdLoginService.java
+++ b/epmet-auth/src/main/java/com/epmet/service/ThirdLoginService.java
@@ -1,9 +1,6 @@
 package com.epmet.service;
 
-import com.epmet.dto.form.GetResiWxPhoneFormDTO;
-import com.epmet.dto.form.LoginFormDTO;
-import com.epmet.dto.form.ThirdStaffOrgsFormDTO;
-import com.epmet.dto.form.ThirdWxmpEnteOrgFormDTO;
+import com.epmet.dto.form.*;
 import com.epmet.dto.result.StaffOrgsResultDTO;
 import com.epmet.dto.result.UserTokenResultDTO;
 
@@ -62,4 +59,11 @@ public interface ThirdLoginService {
 	 * @description 单客户-获取微信用户手机号
 	 **/
     String getResiWxPhone(GetResiWxPhoneFormDTO formDTO);
+
+	/**
+	 * @param formDTO
+	 * @author sun
+	 * @description 单客户-工作端微信小程序登录-发送验证码
+	 **/
+    void sendSmsCode(ThirdSendSmsCodeFormDTO formDTO);
 }
diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java
index c9a6addb29..8dd958fe36 100644
--- a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java
+++ b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java
@@ -14,10 +14,13 @@ import com.epmet.commons.tools.security.dto.GovTokenDto;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.security.password.PasswordUtils;
 import com.epmet.commons.tools.utils.*;
+import com.epmet.commons.tools.validator.PhoneValidatorUtils;
 import com.epmet.constant.AuthHttpUrlConstant;
+import com.epmet.constant.SmsTemplateConstant;
 import com.epmet.dto.*;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
+import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.jwt.JwtTokenProperties;
@@ -56,6 +59,8 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
     @Autowired
     private GovOrgOpenFeignClient govOrgOpenFeignClient;
+    @Autowired
+    private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
 
     /**
      * @param formDTO
@@ -589,4 +594,45 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
         return phone;
     }
 
+    /**
+     * @param formDTO
+     * @author sun
+     * @description 单客户-工作端微信小程序登录-发送验证码
+     **/
+    @Override
+    public void sendSmsCode(ThirdSendSmsCodeFormDTO formDTO) {
+        String str = "发送短信验证码异常,手机号[%s],code[%s],msg[%s]";
+        //1.校验手机号是否符合规范
+        if (!PhoneValidatorUtils.isMobile(formDTO.getMobile())) {
+            logger.warn(String.format(str, formDTO.getMobile(), EpmetErrorCode.ERROR_PHONE.getCode(), EpmetErrorCode.ERROR_PHONE.getMsg()));
+            throw new RenException(EpmetErrorCode.ERROR_PHONE.getCode());
+        }
+        //2.根据手机号校验用户是否存在
+        //2-1.根据appId查询对应客户Id
+        PaCustomerDTO customer = this.getCustomerInfo(formDTO.getAppId());
+        //2-2.根据手机号查询到用户信息
+        ThirdCustomerStaffFormDTO dto = new ThirdCustomerStaffFormDTO();
+        dto.setCustomerId(customer.getId());
+        dto.setMobile(formDTO.getMobile());
+        Result<List<CustomerStaffDTO>> customerStaffResult = epmetUserOpenFeignClient.getCustsomerStaffByIdAndPhone(dto);
+        if (!customerStaffResult.success()) {
+            logger.warn(String.format(str, formDTO.getMobile(), customerStaffResult.getCode(), customerStaffResult.getMsg()));
+            throw new RenException(customerStaffResult.getCode());
+        }
+        //3.发送短信验证码
+        SendVerificationCodeFormDTO sendVerificationCodeFormDTO = new SendVerificationCodeFormDTO();
+        sendVerificationCodeFormDTO.setMobile(formDTO.getMobile());
+        sendVerificationCodeFormDTO.setAliyunTemplateCode(SmsTemplateConstant.LGOIN_CONFIRM);
+        Result<SendVerificationCodeResultDTO> smsCodeResult = epmetMessageOpenFeignClient.sendVerificationCode(sendVerificationCodeFormDTO);
+        if (!smsCodeResult.success()) {
+            logger.warn(String.format(str, formDTO.getMobile(), smsCodeResult.getCode(), smsCodeResult.getMsg()));
+            throw new RenException(smsCodeResult.getCode());
+        }
+        //4.保存短信验证码(删除现有短信验证码 将新的短信验证码存入Redis)
+        SendSmsCodeFormDTO sendSmsCodeFormDTO = new SendSmsCodeFormDTO();
+        sendSmsCodeFormDTO.setMobile(formDTO.getMobile());
+        captchaRedis.saveSmsCode(sendSmsCodeFormDTO, smsCodeResult.getData().getCode());
+        logger.info(String.format("发送短信验证码成功,手机号[%s]", formDTO.getMobile()));
+    }
+
 }

From fe3e24bdf5bc9b78edce27c215cd54b4914bac43 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Wed, 26 May 2021 10:25:02 +0800
Subject: [PATCH 078/128] =?UTF-8?q?=E7=BD=91=E6=A0=BC=EF=BC=8C=E7=A4=BE?=
 =?UTF-8?q?=E5=8C=BA=EF=BC=8C=E8=A1=97=E9=81=93=EF=BC=8C=E5=8C=BA=E7=BA=A7?=
 =?UTF-8?q?=E5=88=AB=E7=9B=B8=E5=85=B3=E6=8C=87=E6=A0=87=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=B9=B3=E5=9D=87=E5=80=BC=E7=9A=84?=
 =?UTF-8?q?=E5=8F=82=E4=B8=8E=E8=AE=A1=E7=AE=97=E7=9A=84=E6=A0=B7=E6=9C=AC?=
 =?UTF-8?q?=E4=B8=AA=E6=95=B0=E5=80=BC=E7=9A=84=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/indexcal/AgencyScoreDTO.java    |  5 +++
 .../indexcal/SubAgencyScoreAvgResultDTO.java  |  5 +++
 .../indexcal/SubCommunityAvgResultDTO.java    |  5 +++
 .../screen/FactIndexCommunityScoreDTO.java    |  5 +++
 .../screen/result/SubGridAvgResultDTO.java    |  5 +++
 .../impl/GridCorreLationServiceImpl.java      | 10 ++---
 .../IndexCalculateCommunityServiceImpl.java   | 39 +++++++++++++++++++
 .../IndexCalculateDistrictServiceImpl.java    | 32 +++++++++++++++
 .../impl/IndexCalculateStreetServiceImpl.java | 38 ++++++++++++++++++
 .../V0.0.14__cpc_subscore_add_samplecount.sql |  6 ++-
 .../indexcal/AgencyScoreDao.xml               |  1 +
 .../indexcal/AgencySubScoreDao.xml            |  3 +-
 .../indexcal/CommunityScoreDao.xml            |  1 +
 .../indexcal/CommunitySubScoreDao.xml         |  3 +-
 .../evaluationindex/indexcal/GridScoreDao.xml |  1 +
 15 files changed, 150 insertions(+), 9 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/AgencyScoreDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/AgencyScoreDTO.java
index 42d0ce8fa3..e558c4206e 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/AgencyScoreDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/AgencyScoreDTO.java
@@ -86,6 +86,11 @@ public class AgencyScoreDTO implements Serializable {
      */
     private BigDecimal score;
 
+    /**
+     * 样本量
+     */
+    private Integer sampleCount;
+
     /**
      * 党建能力：dangjiannengli；治理能力：zhilinengli；服务能力：fuwunengli；街道相关：jiedaoxiangguan；全区相关:quanquxiangguan
      */
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/SubAgencyScoreAvgResultDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/SubAgencyScoreAvgResultDTO.java
index f88e035b7b..13cfc69069 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/SubAgencyScoreAvgResultDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/SubAgencyScoreAvgResultDTO.java
@@ -48,4 +48,9 @@ public class SubAgencyScoreAvgResultDTO implements Serializable {
      * 分数
      */
     private BigDecimal score;
+
+    /**
+     * 样本量
+     */
+    private Integer sampleCount;
 }
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/SubCommunityAvgResultDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/SubCommunityAvgResultDTO.java
index a2c167eaeb..4376910337 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/SubCommunityAvgResultDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/SubCommunityAvgResultDTO.java
@@ -50,6 +50,11 @@ public class SubCommunityAvgResultDTO implements Serializable {
      */
     private BigDecimal score = NumConstant.ZERO_DECIMAL;
 
+    /**
+     * 样本量
+     */
+    private Integer sampleCount;
+
     /**
      * 赋值状态
      */
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/FactIndexCommunityScoreDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/FactIndexCommunityScoreDTO.java
index 3ca91f2a98..94c1ea6b79 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/FactIndexCommunityScoreDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/FactIndexCommunityScoreDTO.java
@@ -79,6 +79,11 @@ public class FactIndexCommunityScoreDTO implements Serializable {
      */
     private String originValue;
 
+    /**
+     * 参与计算的样本量
+     */
+    private Integer sampleCount;
+
     /**
      * 分值
      */
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/result/SubGridAvgResultDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/result/SubGridAvgResultDTO.java
index 460eb12640..92883b45dc 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/result/SubGridAvgResultDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/result/SubGridAvgResultDTO.java
@@ -49,4 +49,9 @@ public class SubGridAvgResultDTO implements Serializable {
      */
     private BigDecimal score;
 
+    /**
+     * 样本量
+     */
+    private Integer sampleCount;
+
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java
index e70200f06a..be8016783d 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java
@@ -235,9 +235,8 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
 //                        log.info("组织内党员的联系群众能力考评分（平均值） 单独处理");
                         //网格内党员的联系群众能力考评分（平均值）
                         String gridId = (String) recordMap.get(IndexCalConstant.GRID_ID);
-                        String monthId = (String) recordMap.get(IndexCalConstant.MONTH_ID);
                          AvgOperationResultVO contactMassesAvgVo = getGridContactMassesAvgValue(formDTO, gridId);
-                         gridAvgOpeResultMap.put(gridId.concat(":").concat(monthId), contactMassesAvgVo);
+                         gridAvgOpeResultMap.put(gridId.concat(":").concat(IndexCodeEnum.ZUZHINEIDANGYDLXQZNLKPFPJZ.getCode()), contactMassesAvgVo);
                          SampleValue<BigDecimal> contactMassesAblityValue = new SampleValue((String) recordMap.get(IndexCalConstant.GRID_ID), contactMassesAvgVo.getAvgValue());
                         value.getIndexValueVOs().add(contactMassesAblityValue);
                     }else if (StringUtils.isNotBlank(indexCodeFieldReService.getFieldNameByIndexCode(key))) {
@@ -252,7 +251,7 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
             HashMap<String, CalculateResult> resultMap = calculate(indexMap);
             resultMapList.add(resultMap);
         }
-        // 保存中间表
+         //保存中间表
         deleteBeforeDataList(formDTO,IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(),IndexCalConstant.GRID_DJ_ALL_PARENT_INDEX_CODE);
         saveGridCorreLationResult(formDTO,
                 resultMapList,
@@ -479,7 +478,7 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
                     gridSubScoreEntity.setOriginValue(detail.getOriginValue());
 
                     // 为平均值类型的指标赋值样本总量
-                    AvgOperationResultVO avgOperationResultVO = avgOpeResultVo.get(gridSubScoreEntity.getGridId().concat(":").concat(gridSubScoreEntity.getMonthId()));
+                    AvgOperationResultVO avgOperationResultVO = avgOpeResultVo.get(gridSubScoreEntity.getGridId().concat(":").concat(gridSubScoreEntity.getIndexCode()));
                     if (avgOperationResultVO != null) {
                         gridSubScoreEntity.setSampleCount(avgOperationResultVO.getSampleCount());
                     } else {
@@ -662,9 +661,8 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
                     if (IndexCodeEnum.ZUZHINEIDANGYDSYYSNLKPFPJZ.getCode().equals(key)) {
 //                        log.info("组织内党员的参与议事能力考评分（平均值） 单独处理");
                         String gridId = (String) recordMap.get(IndexCalConstant.GRID_ID);
-                        String monthId = (String) recordMap.get(IndexCalConstant.MONTH_ID);
                         AvgOperationResultVO joinAvgValue = getGridJoinIssueAvgValue(formDTO, gridId);
-                        avgOperationResultVo.put(gridId.concat(":").concat(monthId), joinAvgValue);
+                        avgOperationResultVo.put(gridId.concat(":").concat(IndexCodeEnum.ZUZHINEIDANGYDSYYSNLKPFPJZ.getCode()), joinAvgValue);
 
                         SampleValue<BigDecimal> contactMassesAblityValue = new SampleValue((String) recordMap.get(IndexCalConstant.GRID_ID), joinAvgValue.getAvgValue());
                         value.getIndexValueVOs().add(contactMassesAblityValue);
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateCommunityServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateCommunityServiceImpl.java
index 693f02c50d..c04cc8942a 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateCommunityServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateCommunityServiceImpl.java
@@ -226,9 +226,15 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
         List<IndexInputVO> indexInputVOS = new ArrayList<>();
         Map<String, String> pid = new HashMap<>();
         //下属所有网格的党建能力平均值
+
+        // 计算党建能力平均分时候的样本量
+        Map<String, Integer> gridPartyScoreSampleCountMap = new HashMap<>();
         detailListByParentCode.forEach(detail -> {
             if (IndexCodeEnum.XIA_SHU_SUO_YOU_WGDDJNLPJZ.getCode().equals(detail.getIndexCode())) {
                 List<SubGridAvgResultDTO> subGridPartyAvgScore = factIndexGridScoreDao.selectSubGridAvgScore(customerId, monthId,IndexCodeEnum.DANG_JIAN_NENG_LI.getCode());
+                subGridPartyAvgScore.stream().forEach(s -> {
+                    gridPartyScoreSampleCountMap.put(s.getAgencyId().concat(":").concat(IndexCodeEnum.XIA_SHU_SUO_YOU_WGDDJNLPJZ.getCode()), s.getSampleCount());
+                });
                 if (CollectionUtils.isEmpty(subGridPartyAvgScore)) {
                     log.warn(IndexCalConstant.GRID_PARTY_AVG_NULL);
                 } else {
@@ -281,6 +287,10 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
         log.info("communityPartyCalculate getScoreCountOfSampleId result:{}", JSON.toJSONString(scoreTotalOfSampleId));
         CommunityCalResultDTO result = getResultB(scoreTotalOfSampleId, customerId, monthId, NumConstant.ZERO_STR, IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(), IndexCodeEnum.SHE_QU_XIANG_GUAN.getCode(), pid);
         deleteOldRecord(customerId,monthId);
+        result.getFiveLevel().forEach(s -> {
+            Integer sampleCount = gridPartyScoreSampleCountMap.get(s.getAgencyId().concat(":").concat(s.getIndexCode()));
+            s.setSampleCount(sampleCount == null ? 0 : sampleCount);
+        });
         deleteAndInsert(result);
         return true;
     }
@@ -300,9 +310,15 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
         }
         List<IndexInputVO> indexInputVOS = new ArrayList<>();
         Map<String, String> pid = new HashMap<>();
+
+        // key:agencyId,value:sampleCount样本量
+        Map<String, Integer> gridPartyScoreSampleCountMap = new HashMap<>();
         detailListByParentCode.forEach(detail -> {
             if (IndexCodeEnum.SHE_QU_XIA_SHU_SYWGZLNLHZPJZ.getCode().equals(detail.getIndexCode())) {
                 List<SubGridAvgResultDTO> subGridGovernAvg = factIndexGridScoreDao.selectSubGridAvgScore(customerId, monthId,IndexCodeEnum.ZHI_LI_NENG_LI.getCode());
+                subGridGovernAvg.forEach(s -> {
+                    gridPartyScoreSampleCountMap.put(s.getAgencyId().concat(":").concat(IndexCodeEnum.SHE_QU_XIA_SHU_SYWGZLNLHZPJZ.getCode()), s.getSampleCount());
+                });
                 if (CollectionUtils.isEmpty(subGridGovernAvg)){
                     log.warn("社区下级治理能力平均分集合为空");
                 }else{
@@ -353,6 +369,10 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
         HashMap<String, CalculateResult> scoreTotalOfSampleId = batchScoreCalculator.getScoreTotalOfSampleId(indexInputVOS);
         log.info("communityGovernAbilityCalculate getScoreCountOfSampleId result:{}", JSON.toJSONString(scoreTotalOfSampleId));
         CommunityCalResultDTO result = getResultB(scoreTotalOfSampleId, customerId, monthId, NumConstant.ZERO_STR, IndexCodeEnum.ZHI_LI_NENG_LI.getCode(), IndexCodeEnum.SHE_QU_XIANG_GUAN.getCode(), pid);
+        result.getFiveLevel().forEach(s -> {
+            Integer sampleCount = gridPartyScoreSampleCountMap.get(s.getAgencyId().concat(":").concat(s.getIndexCode()));
+            s.setSampleCount(sampleCount == null ? 0 : sampleCount);
+        });
         deleteAndInsert(result);
         return true;
     }
@@ -372,10 +392,16 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
         }
         List<IndexInputVO> indexInputVOS = new ArrayList<>();
         Map<String, String> pid = new HashMap<>();
+
+        // key:agencyId,value:sampleCount样本量
+        Map<String, Integer> gridPartyScoreSampleCountMap = new HashMap<>();
         detailListByParentCode.forEach(detail -> {
             String indexCode = detail.getIndexCode();
             if (IndexCodeEnum.SHE_QU_XIA_JI_SYWGFWNLDFPJZ.getCode().equals(indexCode)) {
                 List<SubGridAvgResultDTO> subGridServiceAvg = factIndexGridScoreDao.selectSubGridAvgScore(customerId, monthId,IndexCodeEnum.FU_WU_NENG_LI.getCode());
+                subGridServiceAvg.forEach(s -> {
+                    gridPartyScoreSampleCountMap.put(s.getAgencyId().concat(":").concat(IndexCodeEnum.SHE_QU_XIA_JI_SYWGFWNLDFPJZ.getCode()), s.getSampleCount());
+                });
                 if (CollectionUtils.isEmpty(subGridServiceAvg)) {
                     log.warn("查询社区下级所有网格服务能力得分平均值集合为空");
                 } else {
@@ -425,6 +451,10 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
         HashMap<String, CalculateResult> scoreTotalOfSampleId = batchScoreCalculator.getScoreTotalOfSampleId(indexInputVOS);
         log.info("communityServiceAbilityCalculate getScoreCountOfSampleId result:{}", JSON.toJSONString(scoreTotalOfSampleId));
         CommunityCalResultDTO result = getResultB(scoreTotalOfSampleId, customerId, monthId, NumConstant.ZERO_STR, IndexCodeEnum.FU_WU_NENG_LI.getCode(), IndexCodeEnum.SHE_QU_XIANG_GUAN.getCode(), pid);
+        result.getFiveLevel().forEach(s -> {
+            Integer sampleCount = gridPartyScoreSampleCountMap.get(s.getAgencyId().concat(":").concat(s.getIndexCode()));
+            s.setSampleCount(sampleCount == null ? 0 : sampleCount);
+        });
         deleteAndInsert(result);
         return true;
     }
@@ -662,6 +692,9 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
         log.info("communityPartyCalculateExistsSub getScoreCountOfSampleId result:{}", JSON.toJSONString(scoreTotalOfSampleId));
         CommunityCalResultDTO result = getResultB(scoreTotalOfSampleId, form.getCustomerId(), form.getMonthId(), NumConstant.ZERO_STR, IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(), IndexCodeEnum.SHE_QU_XIANG_GUAN.getCode(), pid);
         deleteOldRecord(form.getCustomerId(),form.getMonthId());
+        result.getFiveLevel().forEach(s->{
+            s.setSampleCount(0);
+        });
         deleteAndInsert(result);
         return true;
     }
@@ -734,6 +767,9 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
         HashMap<String, CalculateResult> scoreTotalOfSampleId = batchScoreCalculator.getScoreTotalOfSampleId(indexInputVOS);
         log.info("communityGovernAbilityCalculateExistsSub getScoreCountOfSampleId result:{}", JSON.toJSONString(scoreTotalOfSampleId));
         CommunityCalResultDTO result = getResultB(scoreTotalOfSampleId, form.getCustomerId(), form.getMonthId(), NumConstant.ZERO_STR, IndexCodeEnum.ZHI_LI_NENG_LI.getCode(), IndexCodeEnum.SHE_QU_XIANG_GUAN.getCode(), pid);
+        result.getFiveLevel().forEach(s->{
+            s.setSampleCount(0);
+        });
         deleteAndInsert(result);
         return true;
     }
@@ -806,6 +842,9 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
         HashMap<String, CalculateResult> scoreTotalOfSampleId = batchScoreCalculator.getScoreTotalOfSampleId(indexInputVOS);
         log.info("communityServiceAbilityCalculateExistsSub getScoreCountOfSampleId result:{}", JSON.toJSONString(scoreTotalOfSampleId));
         CommunityCalResultDTO result = getResultB(scoreTotalOfSampleId, form.getCustomerId(), form.getMonthId(), NumConstant.ZERO_STR, IndexCodeEnum.FU_WU_NENG_LI.getCode(), IndexCodeEnum.SHE_QU_XIANG_GUAN.getCode(), pid);
+        result.getFiveLevel().forEach(s->{
+            s.setSampleCount(0);
+        });
         deleteAndInsert(result);
         return true;
     }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java
index 9c3328f6ca..92aae2fe95 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java
@@ -222,10 +222,16 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
         }
         List<IndexInputVO> indexInputVOS = new ArrayList<>();
         Map<String, String> pid = new HashMap<>();
+
+        // key:agencyId,value:sampleCount样本量
+        Map<String, Integer> gridPartyScoreSampleCountMap = new HashMap<>();
         //党建能力平均值
         indexDetailList.forEach(detail -> {
             if (IndexCodeEnum.QU_XIA_JI_JIE_DDJNLHZPJZ.getCode().equals(detail.getIndexCode())) {
                 List<SubAgencyScoreAvgResultDTO> subGridPartyAvgScore = agencyScoreDao.selectAgencyScoreAvg(customerId, monthId,IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(),IndexCalConstant.STREET_LEVEL);
+                subGridPartyAvgScore.forEach(s -> {
+                    gridPartyScoreSampleCountMap.put(s.getParentId().concat(":").concat(IndexCodeEnum.QU_XIA_JI_JIE_DDJNLHZPJZ.getCode()), s.getSampleCount());
+                });
                 log.info("subGridPartyAvgScore:::"+subGridPartyAvgScore.toString());
                 if (CollectionUtils.isEmpty(subGridPartyAvgScore)) {
                     log.warn(IndexCalConstant.DISTRICT_PARTY_AVG_NULL);
@@ -282,6 +288,11 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
         log.info("districtPartyAbilityCalculate getScoreCountOfSampleId result:{}", JSON.toJSONString(scoreTotalOfSampleId));
         AgencyCalResultDTO result = getResultB(scoreTotalOfSampleId, customerId, monthId, NumConstant.ZERO_STR, IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(), IndexCodeEnum.QUAN_QU_XIANG_GUAN.getCode(), pid);
         deleteOldRecord(customerId,monthId,IndexCalConstant.DISTRICT_LEVEL);
+
+        result.getFiveLevel().forEach(s -> {
+            Integer sampleCount = gridPartyScoreSampleCountMap.get(s.getAgencyId().concat(":").concat(s.getIndexCode()));
+            s.setSampleCount(sampleCount == null ? NumConstant.ZERO : sampleCount);
+        });
         insertDetail(result);
         return true;
     }
@@ -301,9 +312,14 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
         }
         List<IndexInputVO> indexInputVOS = new ArrayList<>();
         Map<String, String> pid = new HashMap<>();
+        // key:agencyId,value:sampleCount样本量
+        Map<String, Integer> gridPartyScoreSampleCountMap = new HashMap<>();
         detailListByParentCode.forEach(detail -> {
             if (IndexCodeEnum.SUO_YOU_JIE_DAO_ZLNLPJZ.getCode().equals(detail.getIndexCode())) {
                 List<SubAgencyScoreAvgResultDTO> districtGovernAvgList = agencyScoreDao.selectAgencyScoreAvg(customerId, monthId, IndexCodeEnum.ZHI_LI_NENG_LI.getCode(),IndexCalConstant.STREET_LEVEL);
+                districtGovernAvgList.forEach(s -> {
+                    gridPartyScoreSampleCountMap.put(s.getParentId().concat(":").concat(IndexCodeEnum.SUO_YOU_JIE_DAO_ZLNLPJZ.getCode()), s.getSampleCount());
+                });
                 log.info("districtGovernAvgList:::"+districtGovernAvgList.toString());
                 for (int i = 0; i < districtGovernAvgList.size(); i++) {
                     if (districtGovernAvgList.get(i).getAgencyId().equals(NumConstant.ZERO_STR)){
@@ -363,6 +379,11 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
         log.info("districtGovernAbilityCalculate getScoreTotalOfSampleId param:{}", JSON.toJSONString(indexInputVOS));
         log.info("districtGovernAbilityCalculate getScoreCountOfSampleId result:{}", JSON.toJSONString(scoreTotalOfSampleId));
         AgencyCalResultDTO result = getResultB(scoreTotalOfSampleId, customerId, monthId, NumConstant.ZERO_STR, IndexCodeEnum.ZHI_LI_NENG_LI.getCode(), IndexCodeEnum.QUAN_QU_XIANG_GUAN.getCode(), pid);
+        // 赋值样本量
+        result.getFiveLevel().forEach(s -> {
+            Integer sampleCount = gridPartyScoreSampleCountMap.get(s.getAgencyId().concat(":").concat(s.getIndexCode()));
+            s.setSampleCount(sampleCount == null ? NumConstant.ZERO : sampleCount);
+        });
         insertDetail(result);
         return true;
     }
@@ -382,10 +403,16 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
         }
         List<IndexInputVO> indexInputVOS = new ArrayList<>();
         Map<String, String> pid = new HashMap<>();
+        // key:agencyId,value:sampleCount样本量
+        Map<String, Integer> gridPartyScoreSampleCountMap = new HashMap<>();
         detailListByParentCode.forEach(detail -> {
             String indexCode = detail.getIndexCode();
             if (IndexCodeEnum.QU_XIA_SHU_JIE_DFWNLHZPJZ.getCode().equals(indexCode)) {
                 List<SubAgencyScoreAvgResultDTO> subStreetAvgList = agencyScoreDao.selectAgencyScoreAvg(customerId, monthId,IndexCodeEnum.FU_WU_NENG_LI.getCode(),IndexCalConstant.STREET_LEVEL);
+
+                subStreetAvgList.forEach(s -> {
+                    gridPartyScoreSampleCountMap.put(s.getParentId().concat(":").concat(IndexCodeEnum.QU_XIA_SHU_JIE_DFWNLHZPJZ.getCode()), s.getSampleCount());
+                });
                 log.info("subStreetAvgList:::"+subStreetAvgList.toString());
                 for (int i = 0; i < subStreetAvgList.size(); i++) {
                     if (subStreetAvgList.get(i).getAgencyId().equals(NumConstant.ZERO_STR)){
@@ -421,6 +448,11 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
             log.info("districtServiceAbilityCalculate getScoreTotalOfSampleId param:{}", JSON.toJSONString(indexInputVOS));
             log.info("districtServiceAbilityCalculate getScoreCountOfSampleId result:{}", JSON.toJSONString(scoreTotalOfSampleId));
             AgencyCalResultDTO result = getResultB(scoreTotalOfSampleId, customerId, monthId, NumConstant.ZERO_STR, IndexCodeEnum.FU_WU_NENG_LI.getCode(), IndexCodeEnum.QUAN_QU_XIANG_GUAN.getCode(), pid);
+            // 赋值样本量
+            result.getFiveLevel().forEach(s -> {
+                Integer sampleCount = gridPartyScoreSampleCountMap.get(s.getAgencyId().concat(":").concat(s.getIndexCode()));
+                s.setSampleCount(sampleCount == null ? NumConstant.ZERO : sampleCount);
+            });
             insertDetail(result);
         }
         return true;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java
index 8c0bcf7484..35c9bdc671 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java
@@ -227,10 +227,16 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
         }
         List<IndexInputVO> indexInputVOS = new ArrayList<>();
         Map<String, String> pid = new HashMap<>();
+
+        // key:agencyId,value:sampleCount样本量
+        Map<String, Integer> gridPartyScoreSampleCountMap = new HashMap<>();
         //下属所有社区的党建能力平均值
         detailListByParentCode.forEach(detail -> {
             if (IndexCodeEnum.JIE_DAO_XIA_SHU_SYSQDJNLHZPJZ.getCode().equals(detail.getIndexCode())) {
                 List<SubCommunityAvgResultDTO> subCommPartyAvgScore = communityScoreDao.selectSubCommAvgScore(customerId, monthId,IndexCodeEnum.DANG_JIAN_NENG_LI.getCode());
+                subCommPartyAvgScore.forEach(s -> {
+                    gridPartyScoreSampleCountMap.put(s.getAgencyId().concat(":").concat(IndexCodeEnum.JIE_DAO_XIA_SHU_SYSQDJNLHZPJZ.getCode()), s.getSampleCount());
+                });
                 if (CollectionUtils.isEmpty(subCommPartyAvgScore)) {
                     log.warn(IndexCalConstant.COMMUNITY_PARTY_AVG_NULL);
                 } else if (subCommPartyAvgScore.size() > NumConstant.ZERO) {
@@ -283,6 +289,13 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
         log.info("streetPartyAbilityCalculate getScoreCountOfSampleId result:{}", JSON.toJSONString(scoreTotalOfSampleId));
         AgencyCalResultDTO result = getResultB(scoreTotalOfSampleId, customerId, monthId, NumConstant.ZERO_STR, IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(), IndexCodeEnum.JIE_DAO_XIANG_GUAN.getCode(), pid);
         deleteOldRecord(customerId, monthId, IndexCalConstant.STREET_LEVEL);
+
+        // 赋值样本量
+        result.getFiveLevel().forEach(s -> {
+            Integer sampleCount = gridPartyScoreSampleCountMap.get(s.getAgencyId().concat(":").concat(s.getIndexCode()));
+            s.setSampleCount(sampleCount == null ? NumConstant.ZERO : sampleCount);
+        });
+
         insertDetail(result);
         return true;
     }
@@ -302,9 +315,15 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
         }
         List<IndexInputVO> indexInputVOS = new ArrayList<>();
         Map<String, String> pid = new HashMap<>();
+
+        // key:agencyId,value:sampleCount样本量
+        Map<String, Integer> gridPartyScoreSampleCountMap = new HashMap<>();
         detailListByParentCode.forEach(detail -> {
             if (IndexCodeEnum.JIE_DAO_XIA_SHU_SYSQZLNLHZ.getCode().equals(detail.getIndexCode())) {
                 List<SubCommunityAvgResultDTO> subGridGovernAvg = communityScoreDao.selectSubCommAvgScore(customerId, monthId,IndexCodeEnum.ZHI_LI_NENG_LI.getCode());
+                subGridGovernAvg.forEach(s -> {
+                    gridPartyScoreSampleCountMap.put(s.getAgencyId().concat(":").concat(IndexCodeEnum.JIE_DAO_XIA_SHU_SYSQZLNLHZ.getCode()), s.getSampleCount());
+                });
                 if (CollectionUtils.isEmpty(subGridGovernAvg)){
                     log.warn("查询街道下属所有社区治理能力汇总为空");
                 }else if (subGridGovernAvg.size() > NumConstant.ZERO) {
@@ -355,6 +374,11 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
         log.info("streetGovernAbilityCalculate getScoreTotalOfSampleId param:{}", JSON.toJSONString(indexInputVOS));
         log.info("streetGovernAbilityCalculate getScoreCountOfSampleId result:{}", JSON.toJSONString(scoreTotalOfSampleId));
         AgencyCalResultDTO result = getResultB(scoreTotalOfSampleId, customerId, monthId, NumConstant.ZERO_STR, IndexCodeEnum.ZHI_LI_NENG_LI.getCode(), IndexCodeEnum.JIE_DAO_XIANG_GUAN.getCode(), pid);
+        // 赋值样本量
+        result.getFiveLevel().forEach(s -> {
+            Integer sampleCount = gridPartyScoreSampleCountMap.get(s.getAgencyId().concat(":").concat(s.getIndexCode()));
+            s.setSampleCount(sampleCount == null ? NumConstant.ZERO : sampleCount);
+        });
         insertDetail(result);
         return true;
     }
@@ -374,10 +398,19 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
         }
         List<IndexInputVO> indexInputVOS = new ArrayList<>();
         Map<String, String> pid = new HashMap<>();
+
+        // key:agencyId,value:sampleCount样本量
+        Map<String, Integer> gridPartyScoreSampleCountMap = new HashMap<>();
+
         detailListByParentCode.forEach(detail -> {
             String indexCode = detail.getIndexCode();
             if (IndexCodeEnum.JIE_DAO_XIA_SHU_SQFWNLDFPYZ.getCode().equals(indexCode)) {
                 List<SubCommunityAvgResultDTO> subCommServiceAvg = communityScoreDao.selectSubCommAvgScore(customerId, monthId,IndexCodeEnum.FU_WU_NENG_LI.getCode());
+
+                subCommServiceAvg.forEach(s -> {
+                    gridPartyScoreSampleCountMap.put(s.getAgencyId().concat(":").concat(IndexCodeEnum.JIE_DAO_XIA_SHU_SQFWNLDFPYZ.getCode()), s.getSampleCount());
+                });
+
                 if (CollectionUtils.isEmpty(subCommServiceAvg)) {
                     log.warn("查询街道下属社区服务能力得分平均值为空");
                 } else if (subCommServiceAvg.size() > NumConstant.ZERO) {
@@ -427,6 +460,11 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
         log.info("streetServiceAbilityCalculate getScoreTotalOfSampleId param:{}", JSON.toJSONString(indexInputVOS));
         log.info("streetServiceAbilityCalculate getScoreCountOfSampleId result:{}", JSON.toJSONString(scoreTotalOfSampleId));
         AgencyCalResultDTO result = getResultB(scoreTotalOfSampleId, customerId, monthId, NumConstant.ZERO_STR, IndexCodeEnum.FU_WU_NENG_LI.getCode(), IndexCodeEnum.JIE_DAO_XIANG_GUAN.getCode(), pid);
+        // 赋值样本量
+        result.getFiveLevel().forEach(s -> {
+            Integer sampleCount = gridPartyScoreSampleCountMap.get(s.getAgencyId().concat(":").concat(s.getIndexCode()));
+            s.setSampleCount(sampleCount == null ? NumConstant.ZERO : sampleCount);
+        });
         insertDetail(result);
         return true;
     }
diff --git 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
index af7688ee68..b5e87ed6f5 100644
--- 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 +1,5 @@
-alter table fact_index_grid_sub_score add column SAMPLE_COUNT int(10) comment '样本量' after ORIGIN_VALUE;
\ No newline at end of file
+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;
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/AgencyScoreDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/AgencyScoreDao.xml
index 62c6226e07..215a7f3f31 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/AgencyScoreDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/AgencyScoreDao.xml
@@ -97,6 +97,7 @@
             fics.quarter_id,
             fics.year_id,
             ROUND(AVG( fics.score ),6) AS score,
+            COUNT(1) AS sample_count,
             fics.customer_id,
             PARENT_AGENCY_ID AS parentId
         FROM
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/AgencySubScoreDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/AgencySubScoreDao.xml
index 64cca5242c..f1c861d1e3 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/AgencySubScoreDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/AgencySubScoreDao.xml
@@ -5,7 +5,7 @@
 
     <!-- 【街道】中间表插入 -->
     <insert id="insertStreetRecord">
-        INSERT INTO fact_index_agency_sub_score (ID, CUSTOMER_ID, AGENCY_ID, PARENT_AGENCY_ID, YEAR_ID, QUARTER_ID, MONTH_ID, DATA_TYPE, ORIGIN_VALUE, SCORE, INDEX_CODE,ALL_PARENT_INDEX_CODE,
+        INSERT INTO fact_index_agency_sub_score (ID, CUSTOMER_ID, AGENCY_ID, PARENT_AGENCY_ID, YEAR_ID, QUARTER_ID, MONTH_ID, DATA_TYPE, ORIGIN_VALUE, SCORE, SAMPLE_COUNT, INDEX_CODE,ALL_PARENT_INDEX_CODE,
         WEIGHT,DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME )
         VALUES
         <foreach collection="lists" item="item" separator=",">
@@ -20,6 +20,7 @@
             #{item.dataType},
             #{item.originValue},
             #{item.score},
+            #{item.sampleCount},
             #{item.indexCode},
             #{item.allParentIndexCode},
             #{item.weight},
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CommunityScoreDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CommunityScoreDao.xml
index 28eda4f99c..17e80da926 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CommunityScoreDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CommunityScoreDao.xml
@@ -75,6 +75,7 @@
             fics.quarter_id,
             fics.year_id,
             ROUND(AVG( fics.score ),6) AS score,
+            COUNT(1)    AS sampleCount,
             fics.customer_id,
             sca.pid AS parentId
         FROM
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CommunitySubScoreDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CommunitySubScoreDao.xml
index f4dfd8fbd9..8f3bc53e6e 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CommunitySubScoreDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CommunitySubScoreDao.xml
@@ -5,7 +5,7 @@
 
     <!-- 党建能力【社区】中间表插入 -->
     <insert id="insertCommunityPartyRecord">
-        INSERT INTO fact_index_community_sub_score ( ID, CUSTOMER_ID, AGENCY_ID, PARENT_AGENCY_ID, YEAR_ID, QUARTER_ID, MONTH_ID, ORIGIN_VALUE, SCORE, INDEX_CODE,ALL_PARENT_INDEX_CODE,
+        INSERT INTO fact_index_community_sub_score ( ID, CUSTOMER_ID, AGENCY_ID, PARENT_AGENCY_ID, YEAR_ID, QUARTER_ID, MONTH_ID, ORIGIN_VALUE, SAMPLE_COUNT, SCORE, INDEX_CODE,ALL_PARENT_INDEX_CODE,
         WEIGHT,DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME )
         VALUES
         <foreach collection="lists" item="item" separator=",">
@@ -18,6 +18,7 @@
             #{item.quarterId},
             #{item.monthId},
             #{item.originValue},
+            #{item.sampleCount},
             #{item.score},
             #{item.indexCode},
             #{item.allParentIndexCode},
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridScoreDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridScoreDao.xml
index cee52bfea1..ca1de4a3b1 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridScoreDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridScoreDao.xml
@@ -131,6 +131,7 @@
             figc.quarter_id as quarterId,
             figc.year_id as yearId,
             ROUND(AVG( figc.score ),6) AS score,
+            COUNT(1) AS sampleCount,
             figc.customer_id as customerId,
             sca.pid AS parentId
         FROM

From b051d649c10698ece2f9f556b6cd21a2e4117e70 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 26 May 2021 10:33:45 +0800
Subject: [PATCH 079/128] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8C=87=E6=A0=87?=
 =?UTF-8?q?=E8=A7=A3=E9=87=8A=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../db/migration/V0.0.17__inxdex_explain.sql  | 77 +++++++++++++++++++
 1 file changed, 77 insertions(+)
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.17__inxdex_explain.sql

diff --git 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
new file mode 100644
index 0000000000..f7306c991d
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.17__inxdex_explain.sql
@@ -0,0 +1,77 @@
+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='指标说明文案';
+
+#更新含义
+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';
+

From d1716b5dd6b5c9cff15063432871ea111d737fad Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 26 May 2021 10:39:58 +0800
Subject: [PATCH 080/128] =?UTF-8?q?=E6=95=B0=E9=87=8F=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/fact/FactIndexCommunitySubScoreDao.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunitySubScoreDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunitySubScoreDao.xml
index 52f1e767f0..01b7bedf74 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunitySubScoreDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunitySubScoreDao.xml
@@ -45,6 +45,7 @@
         SELECT
             fact.index_code,
             IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS origin_value,
+            IF(fact.SAMPLE_COUNT='',0,IFNULL(fact.SAMPLE_COUNT,0)) AS quantity,
             round(fact.score,2) AS score,
             round(fact.WEIGHT,2) AS weight
         FROM

From 9afa6466c3fcc9b5b91dc6b99169a26b18134c0a Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 26 May 2021 10:56:07 +0800
Subject: [PATCH 081/128] =?UTF-8?q?=E5=8C=BA=E5=8E=BF=E7=BA=A7=E5=88=AB=20?=
 =?UTF-8?q?=E4=B8=89=E5=A4=A7=E8=83=BD=E5=8A=9B=E8=AE=A1=E7=AE=97=20?=
 =?UTF-8?q?=E8=B5=8B=E5=80=BCparentId=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/ScreenCustomerAgencyDao.java       |  9 +++++++
 .../IndexCalculateDistrictServiceImpl.java    | 25 +++++++++++++------
 .../screen/ScreenCustomerAgencyDao.xml        | 12 +++++++++
 3 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java
index d0cb1d1726..40118c9253 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java
@@ -33,6 +33,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 组织机构信息
@@ -99,6 +100,14 @@ public interface ScreenCustomerAgencyDao extends BaseDao<ScreenCustomerAgencyEnt
     String selectParentId(@Param("agencyId") String agencyId);
     String selectAgencyId(@Param("areaCode") String areaCode);
 
+    /**
+     * @Description  查询客户下所有的组织的上级组织
+     * @Param
+     * @author zxc
+     * @date 2021/5/26 10:38 上午
+     */
+    Map<String,String> selectAgencyIdAndParentId(@Param("customerId") String customerId);
+
     /**
      * 返回当前客户下，未匹配到的 【乡（镇、街道）级、区县级】 组织信息
      *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java
index 92aae2fe95..df8515ad11 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java
@@ -222,7 +222,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
         }
         List<IndexInputVO> indexInputVOS = new ArrayList<>();
         Map<String, String> pid = new HashMap<>();
-
+        Map<String, String> agencyMap = customerAgencyDao.selectAgencyIdAndParentId(customerId);
         // key:agencyId,value:sampleCount样本量
         Map<String, Integer> gridPartyScoreSampleCountMap = new HashMap<>();
         //党建能力平均值
@@ -242,7 +242,8 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
                         List<SampleValue> index1SampleValues = new ArrayList<>();
                         party.forEach(c -> {
                             if (!c.getParentId().equals(NumConstant.ZERO_STR)) {
-                                pid.put(c.getParentId(), customerAgencyDao.selectPid(c.getParentId()));
+//                                pid.put(c.getParentId(), customerAgencyDao.selectPid(c.getParentId()));
+                                pid.put(c.getParentId(), agencyMap.get(c.getParentId()));
                                 SampleValue s = new SampleValue(c.getParentId(), c.getScore());
                                 index1SampleValues.add(s);
                             }
@@ -314,6 +315,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
         Map<String, String> pid = new HashMap<>();
         // key:agencyId,value:sampleCount样本量
         Map<String, Integer> gridPartyScoreSampleCountMap = new HashMap<>();
+        Map<String, String> agencyMap = customerAgencyDao.selectAgencyIdAndParentId(customerId);
         detailListByParentCode.forEach(detail -> {
             if (IndexCodeEnum.SUO_YOU_JIE_DAO_ZLNLPJZ.getCode().equals(detail.getIndexCode())) {
                 List<SubAgencyScoreAvgResultDTO> districtGovernAvgList = agencyScoreDao.selectAgencyScoreAvg(customerId, monthId, IndexCodeEnum.ZHI_LI_NENG_LI.getCode(),IndexCalConstant.STREET_LEVEL);
@@ -335,7 +337,8 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
                         List<SampleValue> index1SampleValues = new ArrayList<>();
                         avg.forEach(c -> {
                             if (!c.getParentId().equals(NumConstant.ZERO_STR)) {
-                                pid.put(c.getParentId(), customerAgencyDao.selectPid(c.getParentId()));
+//                                pid.put(c.getParentId(), customerAgencyDao.selectPid(c.getParentId()));
+                                pid.put(c.getParentId(), agencyMap.get(c.getParentId()));
                                 SampleValue s = new SampleValue(c.getParentId(), c.getScore());
                                 index1SampleValues.add(s);
                             }
@@ -405,6 +408,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
         Map<String, String> pid = new HashMap<>();
         // key:agencyId,value:sampleCount样本量
         Map<String, Integer> gridPartyScoreSampleCountMap = new HashMap<>();
+        Map<String, String> agencyMap = customerAgencyDao.selectAgencyIdAndParentId(customerId);
         detailListByParentCode.forEach(detail -> {
             String indexCode = detail.getIndexCode();
             if (IndexCodeEnum.QU_XIA_SHU_JIE_DFWNLHZPJZ.getCode().equals(indexCode)) {
@@ -429,7 +433,8 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
                         List<SampleValue> index1SampleValues = new ArrayList<>();
                         serviceAvg.forEach(c -> {
                             if (!c.getParentId().equals(NumConstant.ZERO_STR)) {
-                                pid.put(c.getParentId(), customerAgencyDao.selectPid(c.getParentId()));
+//                                pid.put(c.getParentId(), customerAgencyDao.selectPid(c.getParentId()));
+                                pid.put(c.getParentId(), agencyMap.get(c.getParentId()));
                                 SampleValue s = new SampleValue(c.getParentId(), c.getScore());
                                 index1SampleValues.add(s);
                             }
@@ -643,6 +648,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
         }
         List<IndexInputVO> indexInputVOS = new ArrayList<>();
         Map<String, String> pid = new HashMap<>();
+        Map<String, String> agencyMap = customerAgencyDao.selectAgencyIdAndParentId(customerId);
         //党建能力平均值
         indexDetailList.forEach(detail -> {
             if (IndexCodeEnum.QU_XIA_JI_JIE_DDJNLHZPJZ.getCode().equals(detail.getIndexCode())) {
@@ -657,7 +663,8 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
                         List<SampleValue> index1SampleValues = new ArrayList<>();
                         party.forEach(c -> {
                             if (!c.getParentId().equals(NumConstant.ZERO_STR)) {
-                                pid.put(c.getParentId(), customerAgencyDao.selectPid(c.getParentId()));
+//                                pid.put(c.getParentId(), customerAgencyDao.selectPid(c.getParentId()));
+                                pid.put(c.getParentId(), agencyMap.get(c.getParentId()));
                                 SampleValue s = new SampleValue(c.getParentId(), c.getScore());
                                 index1SampleValues.add(s);
                             }else {
@@ -727,6 +734,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
         }
         List<IndexInputVO> indexInputVOS = new ArrayList<>();
         Map<String, String> pid = new HashMap<>();
+        Map<String, String> agencyMap = customerAgencyDao.selectAgencyIdAndParentId(customerId);
         detailListByParentCode.forEach(detail -> {
             if (IndexCodeEnum.SUO_YOU_JIE_DAO_ZLNLPJZ.getCode().equals(detail.getIndexCode())) {
                 List<SubAgencyScoreAvgResultDTO> districtGovernAvgList = agencyScoreDao.selectAgencyScoreAvgExistsSub(monthId, IndexCodeEnum.ZHI_LI_NENG_LI.getCode(),form.getCustomerAreaCode());
@@ -745,7 +753,8 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
                         List<SampleValue> index1SampleValues = new ArrayList<>();
                         avg.forEach(c -> {
                             if (!c.getParentId().equals(NumConstant.ZERO_STR)) {
-                                pid.put(c.getParentId(), customerAgencyDao.selectPid(c.getParentId()));
+//                                pid.put(c.getParentId(), customerAgencyDao.selectPid(c.getParentId()));
+                                pid.put(c.getParentId(), agencyMap.get(c.getParentId()));
                                 SampleValue s = new SampleValue(c.getParentId(), c.getScore());
                                 index1SampleValues.add(s);
                             }else {
@@ -813,6 +822,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
         }
         List<IndexInputVO> indexInputVOS = new ArrayList<>();
         Map<String, String> pid = new HashMap<>();
+        Map<String, String> agencyMap = customerAgencyDao.selectAgencyIdAndParentId(customerId);
         detailListByParentCode.forEach(detail -> {
             String indexCode = detail.getIndexCode();
             if (IndexCodeEnum.QU_XIA_SHU_JIE_DFWNLHZPJZ.getCode().equals(indexCode)) {
@@ -833,7 +843,8 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
                         List<SampleValue> index1SampleValues = new ArrayList<>();
                         serviceAvg.forEach(c -> {
                             if (!c.getParentId().equals(NumConstant.ZERO_STR)) {
-                                pid.put(c.getParentId(), customerAgencyDao.selectPid(c.getParentId()));
+//                                pid.put(c.getParentId(), customerAgencyDao.selectPid(c.getParentId()));
+                                pid.put(c.getParentId(), agencyMap.get(c.getParentId()));
                                 SampleValue s = new SampleValue(c.getParentId(), c.getScore());
                                 index1SampleValues.add(s);
                             }else {
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerAgencyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerAgencyDao.xml
index acb10f1bad..8d5a681938 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerAgencyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerAgencyDao.xml
@@ -426,4 +426,16 @@
         (SELECT GRID_ID AS orgId FROM screen_customer_grid WHERE DEL_FLAG = 0 AND CUSTOMER_ID = #{customerId}) UNION ALL
         (SELECT DEPT_ID AS orgId FROM screen_customer_dept WHERE DEL_FLAG = 0 AND CUSTOMER_ID = #{customerId})
     </select>
+
+    <!-- 查询客户下所有的组织的上级组织 -->
+    <select id="selectAgencyIdAndParentId" resultType="java.util.Map">
+        SELECT
+            AGENCY_ID,
+            PID
+        FROM
+            screen_customer_agency
+        WHERE
+            DEL_FLAG = 0
+          AND CUSTOMER_ID = #{customerId}
+    </select>
 </mapper>

From 717d0b2f33e5d1ae6d99bcfd2c8a2b5ac82615dd Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 26 May 2021 13:56:19 +0800
Subject: [PATCH 082/128] =?UTF-8?q?=E5=8C=BA=E5=8E=BF=E7=BA=A7=E5=88=AB?=
 =?UTF-8?q?=E7=9A=84=E4=B8=89=E5=A4=A7=E8=83=BD=E5=8A=9B=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../indexcal/AgencyAndParentResultDTO.java    | 26 ++++++++++++++++
 .../screen/ScreenCustomerAgencyDao.java       |  3 +-
 .../IndexCalculateDistrictServiceImpl.java    | 31 +++++++++++++------
 .../screen/ScreenCustomerAgencyDao.xml        |  2 +-
 4 files changed, 50 insertions(+), 12 deletions(-)
 create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/AgencyAndParentResultDTO.java

diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/AgencyAndParentResultDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/AgencyAndParentResultDTO.java
new file mode 100644
index 0000000000..02efab6132
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/AgencyAndParentResultDTO.java
@@ -0,0 +1,26 @@
+package com.epmet.dto.indexcal;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/5/26 1:47 下午
+ * @DESC
+ */
+@Data
+public class AgencyAndParentResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -7300464262794241276L;
+
+    /**
+     * 组织ID
+     */
+    private String agencyId;
+
+    /**
+     * parentId
+     */
+    private String pid;
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java
index 40118c9253..67cbe37e23 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java
@@ -24,6 +24,7 @@ import com.epmet.dto.extract.form.ScreenPartyLinkMassesDataFormDTO;
 import com.epmet.dto.extract.result.AgencyMonthCountResultDTO;
 import com.epmet.dto.extract.result.CustomerAgencyInfoResultDTO;
 import com.epmet.dto.extract.result.OrgNameResultDTO;
+import com.epmet.dto.indexcal.AgencyAndParentResultDTO;
 import com.epmet.dto.indexcollect.form.CustomerBizOrgFormDTO;
 import com.epmet.dto.screen.ScreenProjectOrgDailyDTO;
 import com.epmet.dto.screen.result.TreeResultDTO;
@@ -106,7 +107,7 @@ public interface ScreenCustomerAgencyDao extends BaseDao<ScreenCustomerAgencyEnt
      * @author zxc
      * @date 2021/5/26 10:38 上午
      */
-    Map<String,String> selectAgencyIdAndParentId(@Param("customerId") String customerId);
+    List<AgencyAndParentResultDTO> selectAgencyIdAndParentId(@Param("customerId") String customerId);
 
     /**
      * 返回当前客户下，未匹配到的 【乡（镇、街道）级、区县级】 组织信息
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java
index df8515ad11..3bc97544d0 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java
@@ -19,10 +19,7 @@ import com.epmet.dao.evaluationindex.indexcal.DeptScoreDao;
 import com.epmet.dao.evaluationindex.indexcoll.FactIndexPartyAblityOrgMonthlyDao;
 import com.epmet.dao.evaluationindex.screen.IndexGroupDetailDao;
 import com.epmet.dao.evaluationindex.screen.ScreenCustomerAgencyDao;
-import com.epmet.dto.indexcal.AgencyCalResultDTO;
-import com.epmet.dto.indexcal.AgencyScoreDTO;
-import com.epmet.dto.indexcal.CalculateCommonFormDTO;
-import com.epmet.dto.indexcal.SubAgencyScoreAvgResultDTO;
+import com.epmet.dto.indexcal.*;
 import com.epmet.dto.screen.ScreenProjectOrgDailyDTO;
 import com.epmet.dto.screen.result.MaxAndMinBigDecimalResultDTO;
 import com.epmet.entity.evaluationindex.indexcal.AgencySelfSubScoreEntity;
@@ -222,7 +219,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
         }
         List<IndexInputVO> indexInputVOS = new ArrayList<>();
         Map<String, String> pid = new HashMap<>();
-        Map<String, String> agencyMap = customerAgencyDao.selectAgencyIdAndParentId(customerId);
+        Map<String, String> agencyMap = agencyMap(customerId);
         // key:agencyId,value:sampleCount样本量
         Map<String, Integer> gridPartyScoreSampleCountMap = new HashMap<>();
         //党建能力平均值
@@ -315,7 +312,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
         Map<String, String> pid = new HashMap<>();
         // key:agencyId,value:sampleCount样本量
         Map<String, Integer> gridPartyScoreSampleCountMap = new HashMap<>();
-        Map<String, String> agencyMap = customerAgencyDao.selectAgencyIdAndParentId(customerId);
+        Map<String, String> agencyMap = agencyMap(customerId);
         detailListByParentCode.forEach(detail -> {
             if (IndexCodeEnum.SUO_YOU_JIE_DAO_ZLNLPJZ.getCode().equals(detail.getIndexCode())) {
                 List<SubAgencyScoreAvgResultDTO> districtGovernAvgList = agencyScoreDao.selectAgencyScoreAvg(customerId, monthId, IndexCodeEnum.ZHI_LI_NENG_LI.getCode(),IndexCalConstant.STREET_LEVEL);
@@ -408,7 +405,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
         Map<String, String> pid = new HashMap<>();
         // key:agencyId,value:sampleCount样本量
         Map<String, Integer> gridPartyScoreSampleCountMap = new HashMap<>();
-        Map<String, String> agencyMap = customerAgencyDao.selectAgencyIdAndParentId(customerId);
+        Map<String, String> agencyMap = agencyMap(customerId);
         detailListByParentCode.forEach(detail -> {
             String indexCode = detail.getIndexCode();
             if (IndexCodeEnum.QU_XIA_SHU_JIE_DFWNLHZPJZ.getCode().equals(indexCode)) {
@@ -648,7 +645,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
         }
         List<IndexInputVO> indexInputVOS = new ArrayList<>();
         Map<String, String> pid = new HashMap<>();
-        Map<String, String> agencyMap = customerAgencyDao.selectAgencyIdAndParentId(customerId);
+        Map<String, String> agencyMap = agencyMap(customerId);
         //党建能力平均值
         indexDetailList.forEach(detail -> {
             if (IndexCodeEnum.QU_XIA_JI_JIE_DDJNLHZPJZ.getCode().equals(detail.getIndexCode())) {
@@ -734,7 +731,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
         }
         List<IndexInputVO> indexInputVOS = new ArrayList<>();
         Map<String, String> pid = new HashMap<>();
-        Map<String, String> agencyMap = customerAgencyDao.selectAgencyIdAndParentId(customerId);
+        Map<String, String> agencyMap = agencyMap(customerId);
         detailListByParentCode.forEach(detail -> {
             if (IndexCodeEnum.SUO_YOU_JIE_DAO_ZLNLPJZ.getCode().equals(detail.getIndexCode())) {
                 List<SubAgencyScoreAvgResultDTO> districtGovernAvgList = agencyScoreDao.selectAgencyScoreAvgExistsSub(monthId, IndexCodeEnum.ZHI_LI_NENG_LI.getCode(),form.getCustomerAreaCode());
@@ -822,7 +819,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
         }
         List<IndexInputVO> indexInputVOS = new ArrayList<>();
         Map<String, String> pid = new HashMap<>();
-        Map<String, String> agencyMap = customerAgencyDao.selectAgencyIdAndParentId(customerId);
+        Map<String, String> agencyMap = agencyMap(customerId);
         detailListByParentCode.forEach(detail -> {
             String indexCode = detail.getIndexCode();
             if (IndexCodeEnum.QU_XIA_SHU_JIE_DFWNLHZPJZ.getCode().equals(indexCode)) {
@@ -918,5 +915,19 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
         return true;
     }
 
+    /**
+     * @Description  查询客户下的所有组织parentId
+     * @Param customerId
+     * @author zxc
+     * @date 2021/5/26 1:44 下午
+     */
+    public Map<String,String> agencyMap(String customerId){
+        Map<String,String> result = new HashMap<>(16);
+        List<AgencyAndParentResultDTO> dtos = customerAgencyDao.selectAgencyIdAndParentId(customerId);
+        dtos.forEach(d -> {
+            result.put(d.getAgencyId(),d.getPid());
+        });
+        return result;
+    }
 
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerAgencyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerAgencyDao.xml
index 8d5a681938..d71a8a36f8 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerAgencyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerAgencyDao.xml
@@ -428,7 +428,7 @@
     </select>
 
     <!-- 查询客户下所有的组织的上级组织 -->
-    <select id="selectAgencyIdAndParentId" resultType="java.util.Map">
+    <select id="selectAgencyIdAndParentId" resultType="com.epmet.dto.indexcal.AgencyAndParentResultDTO">
         SELECT
             AGENCY_ID,
             PID

From f78c25f68b45aa0378cc9222bcf9aaebc4b45d1d Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Wed, 26 May 2021 13:59:56 +0800
Subject: [PATCH 083/128] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=B9=B3=E5=9D=87?=
 =?UTF-8?q?=E5=80=BC=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E5=81=9A=E5=B9=B3?=
 =?UTF-8?q?=E5=9D=87=E5=80=BC=E4=B8=BAnull=E7=9A=84=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../indexcal/impl/GridCorreLationServiceImpl.java          | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java
index be8016783d..2a71c3e8d3 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java
@@ -327,6 +327,10 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
             result.setAvgValue(new BigDecimal(0));
             result.setSampleCount(0);
         }
+
+        if (result.getAvgValue() == null) {
+            result.setAvgValue(new BigDecimal(NumConstant.ZERO));
+        }
         //FOR TEST
         /*BigDecimal result=null;
         if(IndexCalConstant.S1_C1_G1.equals(gridId)){
@@ -354,6 +358,9 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
             result.setSampleCount(0);
             result.setAvgValue(new BigDecimal(0));
         }
+        if (result.getAvgValue() == null) {
+            result.setAvgValue(new BigDecimal(NumConstant.ZERO));
+        }
         //FOR TEST
         /*BigDecimal result=null;
         if(IndexCalConstant.S1_C1_G1.equals(gridId)){

From 09700ffc93210a33ce624d1f97208175ecc4447d Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 26 May 2021 14:08:42 +0800
Subject: [PATCH 084/128] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E6=9C=BA=E6=9E=84=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=AE=A2=E6=88=B7=E8=B7=9F=E7=BB=84=E7=BB=87=E7=BA=A7?=
 =?UTF-8?q?=E5=88=AB=E8=BF=94=E5=8F=82=E7=94=A8=E4=BA=8E=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=B2=BB=E7=90=86=E5=AE=9E=E5=86=B5=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/result/AgencysResultDTO.java |  5 +++++
 .../java/com/epmet/controller/AgencyController.java |  5 +++--
 .../com/epmet/service/impl/AgencyServiceImpl.java   | 13 +++++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencysResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencysResultDTO.java
index 175fe56674..b9cbcdc232 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencysResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencysResultDTO.java
@@ -96,4 +96,9 @@ public class AgencysResultDTO implements Serializable {
      * 组织区划的名称
      */
     private String areaName;
+
+    /**
+     * 当前组织对应客户根组织级别（社区级：community，乡（镇、街道）级:street,区县级: district,市级: city省级:province）
+     */
+    private String rootlevel;
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java
index b0ec95dfd2..263fe905e7 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java
@@ -151,8 +151,9 @@ public class AgencyController {
      * @Description 组织首页-获取组织机构信息
      */
     @PostMapping("agencydetail")
-    @RequirePermission(requirePermission = RequirePermissionEnum.ORG_AGENCY_TRACE)
-    public Result<AgencysResultDTO> agencyDetail(@LoginUser TokenDto tokenDTO, @RequestBody AgencydetailFormDTO formDTO) {
+    //@RequirePermission(requirePermission = RequirePermissionEnum.ORG_AGENCY_TRACE)
+    //public Result<AgencysResultDTO> agencyDetail(@LoginUser TokenDto tokenDTO, @RequestBody AgencydetailFormDTO formDTO) {
+    public Result<AgencysResultDTO> agencyDetail(@RequestBody AgencydetailFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, AgencydetailFormDTO.AddUserInternalGroup.class);
         return agencyService.agencyDetail(formDTO);
     }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
index e83b78ba77..2324c7d1d2 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
@@ -237,6 +237,19 @@ public class AgencyServiceImpl implements AgencyService {
         agencysResultDTO = ConvertUtils.sourceToTarget(entity, AgencysResultDTO.class);
         agencysResultDTO.setAgencyId(entity.getId());
         agencysResultDTO.setAgencyName(entity.getOrganizationName());
+        //2021.5.26 sun 添加当前组织对应客户的根组织级别返参  start
+        if (null != entity) {
+            if (null == entity.getPids() || "".equals(entity.getPids())) {
+                agencysResultDTO.setRootlevel(entity.getLevel());
+            } else {
+                String id = Arrays.asList(entity.getPids().split(":")).get(0);
+                CustomerAgencyEntity rootEntity = customerAgencyDao.selectById(id);
+                if (null != rootEntity) {
+                    agencysResultDTO.setRootlevel(rootEntity.getLevel());
+                }
+            }
+        }
+        //2021.5.26 sun 添加当前组织对应客户的根组织级别返参  end
         //2:查询本机关的所有上级机关，按自上而下层级顺序
         if (null == entity.getPids()) {
             agencysResultDTO.setParentList(parentList);

From 20cc0ad70a0dd13cd746a6c39287cacff0baac7e Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 26 May 2021 14:52:25 +0800
Subject: [PATCH 085/128] =?UTF-8?q?=E4=BA=94=E7=BA=A7=E6=8C=87=E6=A0=87?=
 =?UTF-8?q?=E6=8A=BD=E5=8F=96=EF=BC=8C=E6=B7=BB=E5=8A=A0monthId=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/extract/form/ExtractIndexFormDTO.java    | 7 +++++++
 .../dataToIndex/impl/IndexOriginExtractServiceImpl.java    | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/ExtractIndexFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/ExtractIndexFormDTO.java
index c188b64a57..8d948a633e 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/ExtractIndexFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/ExtractIndexFormDTO.java
@@ -1,7 +1,9 @@
 package com.epmet.dto.extract.form;
 
 import lombok.Data;
+import org.hibernate.validator.constraints.Length;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
@@ -13,8 +15,13 @@ public class ExtractIndexFormDTO implements Serializable {
 
     private static final long serialVersionUID = 1248641210655148366L;
 
+    public interface AddUserInternalGroup {
+    }
+
+    @NotBlank(message = "customerId不能为空", groups = AddUserInternalGroup.class)
     private String customerId;
 
+    @Length(min = 6, max = 6, message = "monthId不能为空", groups = {AddUserInternalGroup.class})
     private String monthId;
 
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexOriginExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexOriginExtractServiceImpl.java
index 80e087bc3f..b21eee911b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexOriginExtractServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexOriginExtractServiceImpl.java
@@ -2,6 +2,7 @@ package com.epmet.service.evaluationindex.extract.dataToIndex.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.extract.form.ExtractIndexFormDTO;
 import com.epmet.service.evaluationindex.extract.dataToIndex.*;
 import com.epmet.service.stats.DimCustomerService;
@@ -72,6 +73,7 @@ public class IndexOriginExtractServiceImpl implements IndexOriginExtractService
             ExtractIndexFormDTO param = new ExtractIndexFormDTO();
             param.setCustomerId(cId);
             param.setMonthId(finalMonthId);
+            ValidatorUtils.validateEntity(param, ExtractIndexFormDTO.AddUserInternalGroup.class);
             submitJob(param);
         });
     }

From 08105949571956a10f84214006daa289868e13c5 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 26 May 2021 15:03:05 +0800
Subject: [PATCH 086/128] =?UTF-8?q?=E6=B2=BB=E7=90=86=E6=8C=87=E6=95=B0?=
 =?UTF-8?q?=E7=BD=91=E6=A0=BC=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../db/migration/V0.0.15__govern.sql          | 79 +++++++++----------
 1 file changed, 39 insertions(+), 40 deletions(-)

diff --git 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
index 836d3a3b7a..59975cc83f 100644
--- 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
@@ -22,7 +22,6 @@
 -- -- ----------------------------
 -- -- Table structure for fact_agency_govern_daily
 -- -- ----------------------------
--- DROP TABLE IF EXISTS `fact_agency_govern_daily`;
 -- CREATE TABLE `fact_agency_govern_daily`  (
 --   `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键，customer_id+AGENCY_ID+date_id只有一条记录',
 --   `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客户id',
@@ -60,45 +59,45 @@
 --   PRIMARY KEY (`ID`) USING BTREE
 -- ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '组织的治理指数，按天统计' ROW_FORMAT = Dynamic;
 --
--- -- ----------------------------
--- -- Table structure for fact_grid_govern_daily
--- -- ----------------------------
--- DROP TABLE IF EXISTS `fact_grid_govern_daily`;
--- 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；此列存储的是小数',
---   `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',
---   `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='网格的治理指数，按天统计';
---
--- SET FOREIGN_KEY_CHECKS = 1;
+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`

From e2898b66cc344252899bebf332445405e60c5687 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 26 May 2021 15:03:47 +0800
Subject: [PATCH 087/128] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=B1=82=E7=BA=A7?=
 =?UTF-8?q?=E6=B2=BB=E7=90=86=E6=8C=87=E6=95=B0=E5=A2=9E=E5=8A=A0=E8=BF=94?=
 =?UTF-8?q?=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataaggre/dto/datastats/result/GridGovrnResultDTO.java  | 6 ++++++
 .../src/main/resources/mapper/datastats/DatsStatsDao.xml    | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/GridGovrnResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/GridGovrnResultDTO.java
index 9b16f7b014..cd88c5b0e4 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/GridGovrnResultDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/GridGovrnResultDTO.java
@@ -25,5 +25,11 @@ public class GridGovrnResultDTO implements Serializable {
     private BigDecimal groupSelfGovernRatio = bi;
     //网格自治占比
     private BigDecimal gridSelfGovernRatio = bi;
+    //社区解决占比
+    private BigDecimal communityResolvedRatio = bi;
+    //区直部门解决占比
+    private BigDecimal districtDeptResolvedRatio = bi;
+    //街道解决占比
+    private BigDecimal streetResolvedRatio = bi;
 
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
index 7097ca36c5..6fec43461f 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
@@ -639,7 +639,10 @@
             grid_id AS gridId,
             problem_resolved_count AS problemResolvedCount,
             ROUND(group_self_govern_ratio, 3) AS groupSelfGovernRatio,
-            ROUND(grid_self_govern_ratio, 3) AS gridSelfGovernRatio
+            ROUND(grid_self_govern_ratio, 3) AS gridSelfGovernRatio,
+            ROUND(community_closed_ratio, 3) AS communityResolvedRatio,
+            ROUND(street_closed_ratio, 3) AS streetResolvedRatio,
+            ROUND(district_dept_closed_ratio, 3) AS districtDeptResolvedRatio
         FROM
             fact_grid_govern_daily
         WHERE

From 5045c664b25955f22e205baa8bf4d681aee35745 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Wed, 26 May 2021 17:47:00 +0800
Subject: [PATCH 088/128] =?UTF-8?q?=E5=9F=BA=E5=B1=82=E6=B2=BB=E7=90=86-?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=9A=84=E6=B2=BB=E7=90=86=E6=8C=87=E6=95=B0?=
 =?UTF-8?q?=EF=BC=8C=E6=8C=89=E5=A4=A9=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../result/OrgStatisticsResultDTO.java        |  1 +
 .../extract/FactOriginIssueMainDailyDao.java  | 11 ++++++++
 .../FactOriginProjectMainDailyDao.java        | 12 +++++++++
 .../extract/FactOriginTopicMainDailyDao.java  | 14 ++++++++++
 .../todata/FactAgencyGovernDailyService.java  | 25 +++++++----------
 .../FactOriginIssueMainDailyService.java      | 11 ++++++++
 .../FactOriginProjectMainDailyService.java    | 12 +++++++++
 .../FactOriginTopicMainDailyService.java      | 14 ++++++++++
 .../FactAgencyGovernDailyServiceImpl.java     | 27 +++++++++++++++++++
 .../FactOriginIssueMainDailyServiceImpl.java  | 19 +++++++++++++
 ...FactOriginProjectMainDailyServiceImpl.java | 20 ++++++++++++++
 .../FactOriginTopicMainDailyServiceImpl.java  | 21 +++++++++++++++
 .../extract/FactOriginIssueMainDailyDao.xml   | 15 +++++++++++
 .../extract/FactOriginProjectMainDailyDao.xml | 16 +++++++++++
 .../extract/FactOriginTopicMainDailyDao.xml   | 16 +++++++++++
 .../mapper/project/ProjectProcessDao.xml      | 27 ++++++++-----------
 16 files changed, 230 insertions(+), 31 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/OrgStatisticsResultDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/OrgStatisticsResultDTO.java
index d7fca3b15d..f57927f65d 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/OrgStatisticsResultDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/OrgStatisticsResultDTO.java
@@ -15,6 +15,7 @@ public class OrgStatisticsResultDTO implements Serializable {
 	private static final long serialVersionUID = 9221060553279124719L;
 	private String customerId;
 	private String agencyId;
+	private String level;
 	private String orgId;
 	private Integer count;
 	private Integer sum;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginIssueMainDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginIssueMainDailyDao.java
index ee2e78aaa3..ba3ddbce69 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginIssueMainDailyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginIssueMainDailyDao.java
@@ -227,6 +227,17 @@ public interface FactOriginIssueMainDailyDao extends BaseDao<FactOriginIssueMain
      */
     List<OrgStatisticsResultDTO> selectPartyMemberIssueStaticByGrid(@Param("customerId") String customerId, @Param("dateId") String dateId);
 
+    /**
+     * 获取组织关闭议题数
+     * @author zhaoqifeng
+     * @date 2021/5/25 17:18
+     * @param customerId
+     * @param dateId
+	 * @param closedStatus
+     * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     */
+    List<OrgStatisticsResultDTO> selectAgencyClosedIssueCount(@Param("customerId") String customerId, @Param("dateId") String dateId, @Param("closedStatus") String closedStatus);
+
     /**
      * 3、当前网格内，议题关闭已解决数
      * 4、当前网格内，议题关闭无需解决数
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java
index 0403e29bc2..d5042bbb7b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java
@@ -465,4 +465,16 @@ public interface FactOriginProjectMainDailyDao extends BaseDao<FactOriginProject
 													 @Param("projectStatus")String projectStatus,
 													 @Param("origin")String origin,
 													 @Param("isResolved")String isResolved);
+
+	/**
+	 * 获取组织已结案项目
+	 * @author zhaoqifeng
+	 * @date 2021/5/26 15:11
+	 * @param customerId
+	 * @param dateId
+	 * @param closedStatus
+	 * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+	 */
+	List<OrgStatisticsResultDTO> selectAgencyClosedProjectCount(@Param("customerId") String customerId, @Param("dateId") String dateId, @Param(
+			"closedStatus") String closedStatus, @Param("origin") String origin);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginTopicMainDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginTopicMainDailyDao.java
index 96ecdef6c6..eb9339e5eb 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginTopicMainDailyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginTopicMainDailyDao.java
@@ -177,4 +177,18 @@ public interface FactOriginTopicMainDailyDao extends BaseDao<FactOriginTopicMain
                                                             @Param("topicStatus")String topicStatus,
                                                             @Param("closedStatus")String closedStatus,
                                                             @Param("shiftIssue")String shiftIssue);
+
+    /**
+     * 获取组织已关闭话题数
+     * @author zhaoqifeng
+     * @date 2021/5/25 15:45
+     * @param customerId
+     * @param dateId
+     * @param closedStatus
+     * @param shiftIssue
+     * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     */
+    List<OrgStatisticsResultDTO> selectAgencyClosedTopicCount(@Param("customerId") String customerId, @Param("dateId") String dateId,
+                                                              @Param("closedStatus") String closedStatus, @Param("shiftIssue") Integer shiftIssue);
+
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactAgencyGovernDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactAgencyGovernDailyService.java
index 2c0050903c..0504164079 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactAgencyGovernDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactAgencyGovernDailyService.java
@@ -27,20 +27,15 @@ import com.epmet.entity.evaluationindex.extract.FactAgencyGovernDailyEntity;
  * @since v1.0.0 2021-05-24
  */
 public interface FactAgencyGovernDailyService extends BaseService<FactAgencyGovernDailyEntity> {
-    // 问题解决总数：当前组织下，话题关闭（已解决+无需解决）总数、议题关闭（已解决+无需解决）总数和项目结案（议题转为项目的结案数+项目立项结案数）总数之和
-    // 党群自治占比：当前组织下，所有小组内关闭（已解决+无需解决）的话题数与问题解决总数之比（未出小组：未转议题的）
-    // 网格自治占比：当前组织下，所有网格内结案项目数与问题解决总数之比（未出网格）
-    // 参考：fact_index_govrn_ablity_grid_monthly的SELF_SOLVE_PROJECT_COUNT计算
-    // 社区解决占比：当前组织下，由社区结案的项目数与问题解决总数之比
-    // 区直部门解决占比：当前组织下，由区级部门结案的项目数与问题解决总数之比
-    // 街道解决占比：当前组织下，由街道结案的项目数与问题解决总数之比
-    // 自下而上的项目解决：结案时操作人所代表的的处理部门（可以是网格、街道、组织）
-    // 自上而下的项目解决：向下吹哨，谁立项谁解决（后期在讨论哪样更合理）
-    //
-    // 究竟是谁解决！！：
-    // A社区→A街道→B社区（结案）——A街道解决（自下而上吹（饱含立项往上吹/从话题来的项目），看往上吹的最高层级）
-    // A社区→B社区→C社区（结案）——C社区解决（平级协助解决，看最后结案）
-    // A街道→A社区→B社区（结案）——A街道解决（自上而下吹，谁立项谁解决）
-    // 注：A社区→A街道→（退回）A社区→B社区（结案），A街道不算处理项目，仍是平级协助解决，看最后谁结案
+
+	/**
+	 * 治理指数-组织相关
+	 * @author zhaoqifeng
+	 * @date 2021/5/25 14:10
+	 * @param customerId
+	 * @param dateId
+	 * @return void
+	 */
+	void extractFactAgencyGovernDaily(String customerId, String dateId);
 
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginIssueMainDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginIssueMainDailyService.java
index 648891b0cc..cf25f79ebb 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginIssueMainDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginIssueMainDailyService.java
@@ -136,4 +136,15 @@ public interface FactOriginIssueMainDailyService extends BaseService<FactOriginI
      * @return
      */
     List<GovernGridTotalCommonDTO> queryGridIssueValue(String customerId, List<String> gridIds, String issueStatus, String resolveType);
+
+    /**
+     * 获取组织关闭议题数
+     * @author zhaoqifeng
+     * @date 2021/5/25 17:09
+     * @param customerId
+     * @param dateId
+     * @param closedStatus
+     * @return java.util.Map<java.lang.String,com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     */
+    Map<String, OrgStatisticsResultDTO> getAgencyClosedIssueCount(String customerId, String dateId, String closedStatus);
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java
index 215aa74756..9445559627 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java
@@ -436,4 +436,16 @@ public interface FactOriginProjectMainDailyService extends BaseService<FactOrigi
      * @return
      */
     List<GovernGridTotalCommonDTO> queryGridProjectValue(String customerId, List<String> gridIds, String projectStatus, String origin, String isResolved);
+
+    /**
+     * 获取组织关闭项目数
+     * @author zhaoqifeng
+     * @date 2021/5/26 15:09
+     * @param customerId
+     * @param dateId
+     * @param closedStatus
+     * @param origin
+     * @return java.util.Map<java.lang.String,com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     */
+    Map<String, OrgStatisticsResultDTO> getAgencyClosedProjectCount(String customerId, String dateId, String closedStatus, String origin);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginTopicMainDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginTopicMainDailyService.java
index 2cae521855..7486daa191 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginTopicMainDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginTopicMainDailyService.java
@@ -138,4 +138,18 @@ public interface FactOriginTopicMainDailyService extends BaseService<FactOriginT
      * @return
      */
     List<GovernGridTotalCommonDTO> queryGridTopicValue(String customerId, List<String> gridIds, String topicStatus, String closedStatus, String shiftIssue);
+
+
+    /**
+     * 获取组织已关闭话题数
+     * @author zhaoqifeng
+     * @date 2021/5/25 15:02
+     * @param customerId
+     * @param dateId
+     * @param closedStatus
+     * @param shiftIssue
+     * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     */
+    Map<String, OrgStatisticsResultDTO> getAgencyClosedTopicCount(String customerId, String dateId, String closedStatus, Integer shiftIssue);
+
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java
index e40ffd49bd..5603dfde68 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java
@@ -33,5 +33,32 @@ import org.springframework.stereotype.Service;
 public class FactAgencyGovernDailyServiceImpl extends BaseServiceImpl<FactAgencyGovernDailyDao, FactAgencyGovernDailyEntity> implements FactAgencyGovernDailyService {
 
 
+	/**
+	 * 治理指数-组织相关
+	 *
+	 * @param customerId
+	 * @param dateId
+	 * @return void
+	 * @author zhaoqifeng
+	 * @date 2021/5/25 14:10
+	 */
+	@Override
+	public void extractFactAgencyGovernDaily(String customerId, String dateId) {
+		// 问题解决总数：当前组织下，话题关闭（已解决+无需解决）总数、议题关闭（已解决+无需解决）总数和项目结案（议题转为项目的结案数+项目立项结案数）总数之和
 
+		// 党群自治占比：当前组织下，所有小组内关闭（已解决+无需解决）的话题数与问题解决总数之比（未出小组：未转议题的）
+		// 网格自治占比：当前组织下，所有网格内结案项目数与问题解决总数之比（未出网格）
+		// 参考：fact_index_govrn_ablity_grid_monthly的SELF_SOLVE_PROJECT_COUNT计算
+		// 社区解决占比：当前组织下，由社区结案的项目数与问题解决总数之比
+		// 区直部门解决占比：当前组织下，由区级部门结案的项目数与问题解决总数之比
+		// 街道解决占比：当前组织下，由街道结案的项目数与问题解决总数之比
+		// 自下而上的项目解决：结案时操作人所代表的的处理部门（可以是网格、街道、组织）
+		// 自上而下的项目解决：向下吹哨，谁立项谁解决（后期在讨论哪样更合理）
+		//
+		// 究竟是谁解决！！：
+		// A社区→A街道→B社区（结案）——A街道解决（自下而上吹（饱含立项往上吹/从话题来的项目），看往上吹的最高层级）
+		// A社区→B社区→C社区（结案）——C社区解决（平级协助解决，看最后结案）
+		// A街道→A社区→B社区（结案）——A街道解决（自上而下吹，谁立项谁解决）
+		// 注：A社区→A街道→（退回）A社区→B社区（结案），A街道不算处理项目，仍是平级协助解决，看最后谁结案
+	}
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginIssueMainDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginIssueMainDailyServiceImpl.java
index 09a040e630..c9db796c53 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginIssueMainDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginIssueMainDailyServiceImpl.java
@@ -186,4 +186,23 @@ public class FactOriginIssueMainDailyServiceImpl extends BaseServiceImpl<FactOri
     public List<GovernGridTotalCommonDTO> queryGridIssueValue(String customerId, List<String> gridIds, String issueStatus, String resolveType) {
         return baseDao.selectGroupByGridId(customerId,gridIds,issueStatus,resolveType);
     }
+
+    /**
+     * 获取组织关闭议题数
+     *
+     * @param customerId
+     * @param dateId
+     * @param closedStatus
+     * @return java.util.Map<java.lang.String, com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     * @author zhaoqifeng
+     * @date 2021/5/25 17:09
+     */
+    @Override
+    public Map<String, OrgStatisticsResultDTO> getAgencyClosedIssueCount(String customerId, String dateId, String closedStatus) {
+        List<OrgStatisticsResultDTO> list = baseDao.selectAgencyClosedIssueCount(customerId, dateId, closedStatus);
+        if (CollectionUtils.isEmpty(list)) {
+            return Collections.emptyMap();
+        }
+        return list.stream().collect(Collectors.toMap(OrgStatisticsResultDTO::getAgencyId, Function.identity()));
+    }
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java
index 58d625f999..e31ea6fbaf 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java
@@ -658,5 +658,25 @@ public class FactOriginProjectMainDailyServiceImpl extends BaseServiceImpl<FactO
         return baseDao.selectGroupByGrid(customerId,gridIds,projectStatus,origin,isResolved);
     }
 
+    /**
+     * 获取组织关闭项目数
+     *
+     * @param customerId
+     * @param dateId
+     * @param closedStatus
+     * @param origin
+     * @return java.util.Map<java.lang.String, com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     * @author zhaoqifeng
+     * @date 2021/5/26 15:09
+     */
+    @Override
+    public Map<String, OrgStatisticsResultDTO> getAgencyClosedProjectCount(String customerId, String dateId, String closedStatus, String origin) {
+        List<OrgStatisticsResultDTO> list = baseDao.selectAgencyClosedProjectCount(customerId, dateId, closedStatus, origin);
+        if (CollectionUtils.isEmpty(list)) {
+            return Collections.emptyMap();
+        }
+        return list.stream().collect(Collectors.toMap(OrgStatisticsResultDTO::getAgencyId, Function.identity()));
+    }
+
 
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginTopicMainDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginTopicMainDailyServiceImpl.java
index 39eeffea2c..d535012b15 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginTopicMainDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginTopicMainDailyServiceImpl.java
@@ -377,4 +377,25 @@ public class FactOriginTopicMainDailyServiceImpl extends BaseServiceImpl<FactOri
     public List<GovernGridTotalCommonDTO> queryGridTopicValue(String customerId, List<String> gridIds, String topicStatus, String closedStatus, String shiftIssue) {
         return baseDao.selectTopicGroupByGridId(customerId,gridIds,topicStatus,closedStatus,shiftIssue);
     }
+    /**
+     * 获取组织已关闭话题数
+     *
+     * @param customerId
+     * @param dateId
+     * @param closedStatus
+     * @param shiftIssue
+     * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     * @author zhaoqifeng
+     * @date 2021/5/25 15:02
+     */
+    @Override
+    public Map<String, OrgStatisticsResultDTO> getAgencyClosedTopicCount(String customerId, String dateId, String closedStatus, Integer shiftIssue) {
+        List<OrgStatisticsResultDTO> list = baseDao.selectAgencyClosedTopicCount(customerId, dateId, closedStatus,shiftIssue);
+        if (CollectionUtils.isEmpty(list)) {
+            return Collections.emptyMap();
+        }
+        return list.stream().collect(Collectors.toMap(OrgStatisticsResultDTO::getAgencyId, Function.identity()));
+    }
+
+
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml
index e6c00c33af..12da80a473 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml
@@ -343,4 +343,19 @@
             m.CUSTOMER_ID,
             m.GRID_ID
     </select>
+    <select id="selectAgencyClosedIssueCount" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
+        SELECT
+            AGENCY_ID,
+            COUNT(ID) AS "sum"
+        FROM fact_origin_issue_main_daily
+        WHERE CUSTOMER_ID = #{customerId}
+          AND DATE_ID &lt;= #{dateId}
+        <if test='null != closedStatus and "" != closedStatus'>
+            AND ISSUE_STATUS = #{closedStatus}
+        </if>
+        <if test='null == closedStatus or "" == closedStatus'>
+            AND (ISSUE_STATUS = 'closed_resolved' OR ISSUE_STATUS = 'closed_unresolved')
+        </if>
+        GROUP BY AGENCY_ID
+    </select>
 </mapper>
\ No newline at end of file
diff --git 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
index c76cfb8128..f17dc573ef 100644
--- 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
@@ -947,4 +947,20 @@
             m.CUSTOMER_ID,
             m.GRID_ID
     </select>
+    <select id="selectAgencyClosedProjectCount" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
+        SELECT
+            AGENCY_ID,
+            COUNT(ID) AS "sum"
+        FROM fact_origin_project_main_daily
+        WHERE CUSTOMER_ID = #{customerId}
+          AND DATE_ID &lt;= #{dateId}
+          AND PROJECT_STATUS = 'closed'
+        <if test='null != origin and "" != origin'>
+            AND ORIGIN = #{origin}
+        </if>
+        <if test='null != closedStatus and "" != closedStatus'>
+            AND IS_RESOLVED = #{closedStatus}
+        </if>
+        GROUP BY AGENCY_ID
+    </select>
 </mapper>
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml
index 49b0c96151..9ad06cd4b5 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml
@@ -228,4 +228,20 @@
         GROUP BY
         m.CUSTOMER_ID,m.GRID_ID
     </select>
+    <select id="selectAgencyClosedTopicCount" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
+        SELECT
+            AGENCY_ID,
+            COUNT(ID) as "sum"
+        FROM fact_origin_topic_main_daily
+        WHERE CUSTOMER_ID = #{customerId}
+          AND DATE_ID &lt;= #{dateId}
+          AND TOPIC_STATUS = 'closed'
+        <if test='null != closedStatus and "" != closedStatus'>
+            AND CLOSED_STATUS = #{closedStatus}
+        </if>
+        <if test='null != shiftIssue'>
+            AND SHIFT_ISSUE = #{shiftIssue}
+        </if>
+        GROUP BY AGENCY_ID
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml
index e9079abc3b..3d4c8a5c8b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml
@@ -238,23 +238,18 @@
         FROM
             (
                 SELECT
-                    ps.PROJECT_ID,
-                    ps.ORG_ID_PATH,
-                    ps.GRID_ID,
-                    ps.DEPARTMENT_ID
-                FROM
-                    project_process pp
-                        INNER JOIN project_staff ps ON pp.STAFF_ID = ps.STAFF_ID
-                        AND pp.DEPARTMENT_NAME = ps.DEPARTMENT_NAME
-                        AND pp.PROJECT_ID = ps.PROJECT_ID
-                        AND ps.IS_HANDLE = 'handle'
-                        AND pp.CREATED_TIME = ps.UPDATED_TIME
-                        AND ps.CUSTOMER_ID = #{customerId}
+                    PROJECT_ID,
+                    ORG_ID_PATH,
+                    GRID_ID,
+                    DEPARTMENT_ID
+                 FROM
+                    project_process
                 WHERE
-                    pp.OPERATION = 'close'
-                    <if test="date != null and date.trim() != ''">
-                        AND DATE_FORMAT(pp.CREATED_TIME , '%Y%m%d') = #{date}
-                    </if>
+                OPERATION = 'close'
+                AND CUSTOMER_ID = #{customerId}
+                <if test="date != null and date.trim() != ''">
+                    AND DATE_FORMAT(CREATED_TIME , '%Y%m%d') = #{date}
+                </if>
 
             ) a
                 LEFT JOIN (

From 513dd6fdef2b53faa02e3cad74aa9b307a6f2e3a Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 26 May 2021 21:47:30 +0800
Subject: [PATCH 089/128] =?UTF-8?q?=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extract/FactGridGovernDailyEntity.java    | 41 +++++++++++-
 .../GovernGridClosedTotalCommonDTO.java       | 64 +++++++++++++++++++
 .../extract/ProjectInfoDTO.java               | 15 +++++
 .../impl/FactGridGovernDailyServiceImpl.java  | 55 ++++++++++++++--
 4 files changed, 169 insertions(+), 6 deletions(-)
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/GovernGridClosedTotalCommonDTO.java
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/ProjectInfoDTO.java

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactGridGovernDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactGridGovernDailyEntity.java
index ae45d7aa7d..22fa2b2b67 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactGridGovernDailyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactGridGovernDailyEntity.java
@@ -79,7 +79,22 @@ public class FactGridGovernDailyEntity extends BaseEpmetEntity {
      */
 	private BigDecimal gridSelfGovernRatio;
 
-    /**
+	/**
+	 * 界面展示：社区解决占比=COMMUNITY_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数
+	 */
+	private BigDecimal communityClosedRatio;
+
+	/**
+	 * 界面展示：街道解决占比=STREET_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数
+	 */
+	private BigDecimal streetClosedRatio;
+
+	/**
+	 * 界面展示：区直部门解决占比=DISTRICT_DEPT_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数
+	 */
+	private BigDecimal districtDeptClosedRatio;
+
+	/**
      * 1、当前网格内，话题关闭已解决数
      */
 	private Integer topicResolvedCount;
@@ -155,15 +170,36 @@ public class FactGridGovernDailyEntity extends BaseEpmetEntity {
 	private Integer gridSelfGovernProjectTotal;
 
 
+	/**
+	 * 当前网格内出来的项目：由社区结案(已解决+未解决)的项目总数
+	 */
+	private Integer communityClosedCount;
+
+	/**
+	 * 当前网格内出来的项目：由街道结案(已解决+未解决)的项目总数
+	 */
+	private Integer streetClosedCount;
+
+	/**
+	 * 当前网格内出来的项目：由街道结案(已解决+未解决)的项目总数
+	 */
+	private Integer districtDeptClosedCount;
+
+
 	public FactGridGovernDailyEntity() {
 		this.customerId = StrConstant.EPMETY_STR;
 		this.dateId = StrConstant.EPMETY_STR;
 		this.gridId = StrConstant.EPMETY_STR;
 		this.pid = StrConstant.EPMETY_STR;
 		this.pids = StrConstant.EPMETY_STR;
+		//界面展示
 		this.problemResolvedCount = NumConstant.ZERO;
 		this.groupSelfGovernRatio=BigDecimal.ZERO;
 		this.gridSelfGovernProjectTotal=NumConstant.ZERO;
+		this.communityClosedRatio=BigDecimal.ZERO;
+		this.streetClosedRatio=BigDecimal.ZERO;
+		this.districtDeptClosedRatio=BigDecimal.ZERO;
+
 		this.topicResolvedCount=NumConstant.ZERO;
 		this.topicUnResolvedCount=NumConstant.ZERO;
 		this.issueResolvedCount=NumConstant.ZERO;
@@ -179,5 +215,8 @@ public class FactGridGovernDailyEntity extends BaseEpmetEntity {
 		this.fromAgencyResolvedInGridCount=NumConstant.ZERO;
 		this.fromAgencyUnResolvedInGridCount=NumConstant.ZERO;
 		this.gridSelfGovernProjectTotal=NumConstant.ZERO;
+		this.communityClosedCount=NumConstant.ZERO;
+		this.streetClosedCount=NumConstant.ZERO;
+		this.districtDeptClosedCount=NumConstant.ZERO;
 	}
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/GovernGridClosedTotalCommonDTO.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/GovernGridClosedTotalCommonDTO.java
new file mode 100644
index 0000000000..fcc4193885
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/GovernGridClosedTotalCommonDTO.java
@@ -0,0 +1,64 @@
+package com.epmet.entity.evaluationindex.extract;
+
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.StrConstant;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 描述一下
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/5/26 15:47
+ */
+@Data
+public class GovernGridClosedTotalCommonDTO implements Serializable {
+    private static final long serialVersionUID = 7717094992132062415L;
+    private String gridId;
+    /**
+     * 11、来源于议题的项目，未出网格结案并且已解决的项目数
+     */
+    private Integer fromIssueResolvedInGridCount;
+
+    /**
+     * 12、来源于议题的项目，未出网格结案并且无需解决的项目数
+     */
+    private Integer fromIssueUnResolvedInGridCount;
+
+    /**
+     * 13、来源于项目立项的项目，未出网格结案，并且已解决的项目数；因现在网格不能立项，所以此列默认为0
+     */
+    private Integer fromAgencyResolvedInGridCount;
+
+    /**
+     * 14、来源于项目立项的项目，未出网格结案，并且无需解决的项目数；因现在网格不能立项，所以此列默认为0
+     */
+    private Integer fromAgencyUnResolvedInGridCount;
+
+    /**
+     * 当前网格内出来的项目：由社区结案(已解决+未解决)的项目总数
+     */
+    private Integer communityClosedCount;
+
+    /**
+     * 当前网格内出来的项目：由街道结案(已解决+未解决)的项目总数
+     */
+    private Integer streetClosedCount;
+
+    /**
+     * 当前网格内出来的项目：由街道结案(已解决+未解决)的项目总数
+     */
+    private Integer districtDeptClosedCount;
+
+    public GovernGridClosedTotalCommonDTO(){
+        this.gridId = StrConstant.EPMETY_STR;
+        this.fromIssueResolvedInGridCount=NumConstant.ZERO;
+        this.fromIssueUnResolvedInGridCount=NumConstant.ZERO;
+        this.fromAgencyResolvedInGridCount=NumConstant.ZERO;
+        this.fromAgencyUnResolvedInGridCount=NumConstant.ZERO;
+        this.communityClosedCount=NumConstant.ZERO;
+        this.streetClosedCount=NumConstant.ZERO;
+        this.districtDeptClosedCount=NumConstant.ZERO;
+    }
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/ProjectInfoDTO.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/ProjectInfoDTO.java
new file mode 100644
index 0000000000..0b1eb1af59
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/ProjectInfoDTO.java
@@ -0,0 +1,15 @@
+package com.epmet.entity.evaluationindex.extract;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 描述一下
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/5/26 18:00
+ */
+@Data
+public class ProjectInfoDTO implements Serializable {
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java
index 4f5483e7b4..84c4addeea 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java
@@ -24,6 +24,7 @@ import com.epmet.constant.ProjectConstant;
 import com.epmet.dao.evaluationindex.extract.FactGridGovernDailyDao;
 import com.epmet.dto.org.GridInfoDTO;
 import com.epmet.entity.evaluationindex.extract.FactGridGovernDailyEntity;
+import com.epmet.entity.evaluationindex.extract.GovernGridClosedTotalCommonDTO;
 import com.epmet.entity.evaluationindex.extract.GovernGridTotalCommonDTO;
 import com.epmet.service.evaluationindex.extract.todata.FactGridGovernDailyService;
 import com.epmet.service.evaluationindex.extract.todata.FactOriginIssueMainDailyService;
@@ -42,6 +43,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 网格的治理指数，按天统计
@@ -86,6 +88,7 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
             log.info("当前客户customerId=("+customerId+")下没有网格,无需计算");
             return;
         }
+        List<String> gridIds=gridInfoDTOList.stream().map(GridInfoDTO::getGridId).collect(Collectors.toList());
         List<FactGridGovernDailyEntity> insertEntityList=this.constructFactGridGovernDailyEntityList(customerId,dateId,gridInfoDTOList);
         // log.info(JSON.toJSONString(insertEntityList,true));
 
@@ -102,7 +105,7 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
         Map<String,Integer>  approvalProjectUnResolvedMap=getGridProjectMap(customerId,null,ProjectConstant.CLOSED,ProjectConstant.PROJECT_ORIGIN_AGENCY,DimObjectStatusConstant.UNRESOLVED);
         Map<String, Integer> inGroupTopicResolvedMap=getTopicMap(customerId, null,ProjectConstant.CLOSED, DimObjectStatusConstant.RESOLVED,NumConstant.ONE_STR);
         Map<String, Integer> inGroupTopicUnResolvedMap=getTopicMap(customerId, null,ProjectConstant.CLOSED, DimObjectStatusConstant.UNRESOLVED,NumConstant.ONE_STR);
-
+        Map<String, GovernGridClosedTotalCommonDTO> dtoMap=getGovernGridClosedTotalCommonDTOMap(customerId,gridIds);
 
         for(FactGridGovernDailyEntity insertEntity:insertEntityList){
             //1、当前网格内，话题关闭已解决数
@@ -154,18 +157,24 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
 
             // todo
             // 11、来源于议题的项目，未出网格结案并且已解决的项目数
-            insertEntity.setFromIssueResolvedInGridCount(0);
+            insertEntity.setFromIssueResolvedInGridCount(666);
             // 12、来源于议题的项目，未出网格结案并且无需解决的项目数
-            insertEntity.setFromIssueUnResolvedInGridCount(0);
+            insertEntity.setFromIssueUnResolvedInGridCount(666);
             // 13、来源于项目立项的项目，未出网格结案，并且已解决的项目数；因现在网格不能立项，所以此列默认为0
-            insertEntity.setFromAgencyResolvedInGridCount(0);
+            insertEntity.setFromAgencyResolvedInGridCount(666);
             // 14、来源于项目立项的项目，未出网格结案，并且无需解决的项目数；因现在网格不能立项，所以此列默认为0
-            insertEntity.setFromAgencyUnResolvedInGridCount(0);
+            insertEntity.setFromAgencyUnResolvedInGridCount(666);
             // 所有网格内结案项目数（未出网格）=来源于议题的项目结案已解决+来源于议题的项目结案无需解决+来源于立项的项目结案已解决+来源于立项的项目结案无需解决
             // 15、未出当前网格的，结案项目数=11+12+13+14
             insertEntity.setGridSelfGovernProjectTotal(insertEntity.getFromIssueResolvedInGridCount()+insertEntity.getFromIssueUnResolvedInGridCount()+
                         insertEntity.getFromAgencyResolvedInGridCount()+insertEntity.getFromAgencyUnResolvedInGridCount());
 
+            //当前网格内出来的项目：由社区结案(已解决+未解决)的项目总数
+            insertEntity.setCommunityClosedCount(666);
+            //当前网格内出来的项目：由街道结案(已解决+未解决)的项目总数
+            insertEntity.setStreetClosedCount(666);
+            //当前网格内出来的项目：由街道结案(已解决+未解决)的项目总数
+            insertEntity.setDistrictDeptClosedCount(666);
 
             //界面展示：1、问题解决总数=1+2+3+4+5+6+7+8
             insertEntity.setProblemResolvedCount(insertEntity.getTopicResolvedCount()+insertEntity.getTopicUnResolvedCount()
@@ -191,6 +200,34 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
                 String gridSelfGovernRatioStr = numberFormat.format((float) insertEntity.getGridSelfGovernProjectTotal() / insertEntity.getProblemResolvedCount());
                 insertEntity.setGridSelfGovernRatio(new BigDecimal(gridSelfGovernRatioStr));
             }
+
+            //界面展示：4、社区解决占比=COMMUNITY_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数
+            //网格内出来的项目，最终由社区结案的项目数
+            if (NumConstant.ZERO == insertEntity.getCommunityClosedCount()||NumConstant.ZERO == insertEntity.getProblemResolvedCount()) {
+                insertEntity.setCommunityClosedRatio(BigDecimal.ZERO);
+            }else{
+                String setCommunityClosedRatioStr = numberFormat.format((float) insertEntity.getCommunityClosedCount() / insertEntity.getProblemResolvedCount());
+                insertEntity.setCommunityClosedRatio(new BigDecimal(setCommunityClosedRatioStr));
+            }
+
+            // 界面展示：5、街道解决占比=STREET_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数
+            //网格内出来的项目，最终由街道结案的项目数
+            if (NumConstant.ZERO == insertEntity.getStreetClosedCount() || NumConstant.ZERO == insertEntity.getProblemResolvedCount()) {
+                insertEntity.setStreetClosedRatio(BigDecimal.ZERO);
+            } else {
+                String streetClosedRatioStr = numberFormat.format((float) insertEntity.getStreetClosedCount() / insertEntity.getProblemResolvedCount());
+                insertEntity.setStreetClosedRatio(new BigDecimal(streetClosedRatioStr));
+            }
+
+            //界面展示：6、区直部门解决占比=DISTRICT_DEPT_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数
+            //网格内出来的项目，最终由区直部门结案的项目数
+            if (NumConstant.ZERO == insertEntity.getDistrictDeptClosedCount() || NumConstant.ZERO == insertEntity.getProblemResolvedCount()) {
+                insertEntity.setDistrictDeptClosedRatio(BigDecimal.ZERO);
+            } else {
+                String setDistrictDeptClosedRatioStr = numberFormat.format((float) insertEntity.getDistrictDeptClosedCount() / insertEntity.getProblemResolvedCount());
+                insertEntity.setDistrictDeptClosedRatio(new BigDecimal(setDistrictDeptClosedRatioStr));
+            }
+
         }
         // 先删除，后新增
         // 3、批量删除
@@ -204,6 +241,14 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
         log.info("extractFactGridGovernDaily completed");
     }
 
+    private Map<String, GovernGridClosedTotalCommonDTO> getGovernGridClosedTotalCommonDTOMap(String customerId, List<String> gridIds) {
+        Map<String, GovernGridClosedTotalCommonDTO> resultMap=new HashMap<>();
+        for(String gridId:gridIds){
+
+        }
+        return resultMap;
+    }
+
     /**
      * 构造要插入的数据，每个网格一天一条数据，初始赋值0
      *

From 4fddf998fb6f5327a70841051240121f43a46dad Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Thu, 27 May 2021 09:23:49 +0800
Subject: [PATCH 090/128] =?UTF-8?q?=E5=BE=97=E5=88=86=E8=AF=B4=E6=98=8E=20?=
 =?UTF-8?q?=E4=BF=9D=E7=95=99=E5=88=86=E6=95=B0=E4=BF=9D=E7=95=99=E4=B8=80?=
 =?UTF-8?q?=E4=BD=8D=E5=B0=8F=E6=95=B0=EF=BC=8C=E6=9D=83=E9=87=8D=E4=BF=9D?=
 =?UTF-8?q?=E7=95=99=E6=95=B4=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../evaluationindex/index/impl/IndexExplainServiceImpl.java  | 2 +-
 .../resources/mapper/fact/FactIndexAgencySubScoreDao.xml     | 2 +-
 .../resources/mapper/fact/FactIndexCommunitySubScoreDao.xml  | 2 +-
 .../main/resources/mapper/fact/FactIndexCpcSubScoreDao.xml   | 5 +++--
 .../main/resources/mapper/fact/FactIndexDeptSubScoreDao.xml  | 3 ++-
 .../main/resources/mapper/fact/FactIndexGridSubScoreDao.xml  | 2 +-
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
index a08c32bc6e..5c8ceaf757 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
@@ -214,7 +214,7 @@ public class IndexExplainServiceImpl implements IndexExplainService {
                 if (StringUtils.isNotBlank(score.getQuantity())) {
                     tb.setQuantity(score.getQuantity());
                 }
-                tb.setWeight(score.getWeight().multiply(new BigDecimal(NumConstant.ONE_HUNDRED)).setScale(NumConstant.TWO, BigDecimal.ROUND_HALF_UP) + "%");
+                tb.setWeight(score.getWeight().multiply(new BigDecimal(NumConstant.ONE_HUNDRED)) + "%");
             }
         }
     }
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencySubScoreDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencySubScoreDao.xml
index 954ce4c772..d1b1dafeea 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencySubScoreDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencySubScoreDao.xml
@@ -45,7 +45,7 @@
      SELECT
             fact.index_code,
             IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS origin_value,
-            round(fact.score,2) AS score,
+            round(fact.score,1) AS score,
             round(fact.WEIGHT,2) AS weight
         FROM
             fact_index_agency_sub_score fact
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunitySubScoreDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunitySubScoreDao.xml
index 01b7bedf74..784ab0ccc7 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunitySubScoreDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunitySubScoreDao.xml
@@ -46,7 +46,7 @@
             fact.index_code,
             IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS origin_value,
             IF(fact.SAMPLE_COUNT='',0,IFNULL(fact.SAMPLE_COUNT,0)) AS quantity,
-            round(fact.score,2) AS score,
+            round(fact.score,1) AS score,
             round(fact.WEIGHT,2) AS weight
         FROM
             fact_index_community_sub_score fact
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCpcSubScoreDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCpcSubScoreDao.xml
index acf9b5a874..84ea0eca60 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCpcSubScoreDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCpcSubScoreDao.xml
@@ -30,8 +30,9 @@
             SELECT
                 id, customer_id, agency_id, grid_id, year_id, month_id, user_id,
                 COUNT(*) quantity,
-                ROUND(AVG(score),2) score,
-                index_code, all_parent_index_code, weight
+                ROUND(AVG(score),1) score,
+                index_code, all_parent_index_code,
+                ROUND(weight,2) weight
             FROM  fact_index_cpc_sub_score
             WHERE ALL_PARENT_INDEX_CODE = #{allParentIndexCode}
             AND CUSTOMER_ID = #{customerId}
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexDeptSubScoreDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexDeptSubScoreDao.xml
index af7d01495b..45cb19fced 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexDeptSubScoreDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexDeptSubScoreDao.xml
@@ -11,7 +11,8 @@
                 origin_value,
                 index_code, all_parent_index_code, weight,
                 COUNT(*) quantity,
-                ROUND(AVG(score),2) score
+                ROUND(AVG(score),1) score,
+                round(weight,2) AS weight
             FROM  fact_index_dept_sub_score
             WHERE
                 ALL_PARENT_INDEX_CODE = #{allParentIndexCode}
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridSubScoreDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridSubScoreDao.xml
index e7b23aebcc..5bbc687e50 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridSubScoreDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridSubScoreDao.xml
@@ -45,7 +45,7 @@
          SELECT
             fact.index_code,
             IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS origin_value,
-            round(fact.score,2) AS score,
+            round(fact.score,1) AS score,
             round(fact.WEIGHT,2) AS weight
         FROM
             fact_index_grid_sub_score fact

From 66ccfbc41fa147654da482fe51018e23771cf9f2 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Thu, 27 May 2021 09:29:44 +0800
Subject: [PATCH 091/128] =?UTF-8?q?=E5=9F=BA=E5=B1=82=E6=B2=BB=E7=90=86-?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=9A=84=E6=B2=BB=E7=90=86=E6=8C=87=E6=95=B0?=
 =?UTF-8?q?=EF=BC=8C=E6=8C=89=E5=A4=A9=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extract/todata/impl/ProjectExtractServiceImpl.java      | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git 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
index 77b4d843b8..68c621094a 100644
--- 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
@@ -215,6 +215,12 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
 			if (!list.isEmpty()) {
 				factOriginProjectMainDailyService.insertBatch(list);
 			}
+
+			//满意度
+			List<FactOriginProjectMainDailyEntity> satisfaction =  projectService.getProjectSatisfaction(customerId);
+			if (CollectionUtils.isNotEmpty(satisfaction)) {
+				factOriginProjectMainDailyService.updateBatchById(satisfaction);
+			}
 		}
 		final List<FactOriginProjectMainDailyEntity> mainList = list;
 		List<FactOriginProjectLogDailyEntity> logList = new ArrayList<>();

From ea6d23f43d20fdc02810786c2205300c354282aa Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Thu, 27 May 2021 10:03:17 +0800
Subject: [PATCH 092/128] =?UTF-8?q?=E7=BB=93=E6=A1=88=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=BB=A1=E6=84=8F=E5=BA=A6=E6=8A=BD=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../todata/impl/ProjectExtractServiceImpl.java       | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git 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
index 68c621094a..0ec9de39bb 100644
--- 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
@@ -216,12 +216,14 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
 				factOriginProjectMainDailyService.insertBatch(list);
 			}
 
-			//满意度
-			List<FactOriginProjectMainDailyEntity> satisfaction =  projectService.getProjectSatisfaction(customerId);
-			if (CollectionUtils.isNotEmpty(satisfaction)) {
-				factOriginProjectMainDailyService.updateBatchById(satisfaction);
-			}
 		}
+
+		//满意度
+		List<FactOriginProjectMainDailyEntity> satisfaction =  projectService.getProjectSatisfaction(customerId);
+		if (CollectionUtils.isNotEmpty(satisfaction)) {
+			factOriginProjectMainDailyService.updateBatchById(satisfaction);
+		}
+
 		final List<FactOriginProjectMainDailyEntity> mainList = list;
 		List<FactOriginProjectLogDailyEntity> logList = new ArrayList<>();
 		//节点发起人 部门流转退回结案

From c14e069f774fabeca0f7b15c8b194d1687b2d4d5 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 27 May 2021 10:09:23 +0800
Subject: [PATCH 093/128] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=BA=E4=B8=AD=E5=BF=83=E4=BF=AE=E6=94=B9=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E5=8F=B7=E6=93=8D=E4=BD=9C=E5=BF=85=E9=A1=BB=E6=98=AF=E5=B1=85?=
 =?UTF-8?q?=E6=B0=91=E6=89=8D=E5=8F=AF=E4=BB=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/UserResiInfoServiceImpl.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git 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
index 4221d063f9..af8191b9a2 100644
--- 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
@@ -428,6 +428,9 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 		}
 		//更新手机号
 		UserResiInfoDTO dto =  baseDao.selectByUserId(formDTO.getUserId());
+		if (null == dto) {
+			throw new RenException(EpmetErrorCode.CANNOT_AUDIT_WARM.getCode());
+		}
 		dto.setRegMobile(formDTO.getMobile());
 		update(dto);
 		//更新baseInfo

From 83de4c20d8f665113c2e8b136231ba1d064ef4b6 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Thu, 27 May 2021 10:59:38 +0800
Subject: [PATCH 094/128] =?UTF-8?q?=E5=BE=97=E5=88=86=E8=AF=B4=E6=98=8E=20?=
 =?UTF-8?q?=E4=BF=9D=E7=95=99=E5=88=86=E6=95=B0=E4=BF=9D=E7=95=99=E4=B8=80?=
 =?UTF-8?q?=E4=BD=8D=E5=B0=8F=E6=95=B0=EF=BC=8C=E6=9D=83=E9=87=8D=E4=BF=9D?=
 =?UTF-8?q?=E7=95=99=E6=95=B4=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../index/result/IndexScoreDetailResult.java  |  6 ++-
 .../index/result/IndexScoreResult.java        |  8 +++-
 .../index/impl/IndexExplainServiceImpl.java   | 45 ++++++++++++++-----
 .../fact/impl/FactIndexServiceImpl.java       |  5 +++
 .../fact/FactIndexAgencySubScoreDao.xml       |  5 ++-
 .../mapper/fact/FactIndexCpcSubScoreDao.xml   |  2 +-
 .../mapper/fact/FactIndexDeptSubScoreDao.xml  |  2 +-
 7 files changed, 56 insertions(+), 17 deletions(-)

diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexScoreDetailResult.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexScoreDetailResult.java
index 8b30af940f..cdec4cc3e9 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexScoreDetailResult.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexScoreDetailResult.java
@@ -1,5 +1,6 @@
 package com.epmet.evaluationindex.index.result;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -40,9 +41,10 @@ public class IndexScoreDetailResult implements Serializable {
     private String weight;
 
     /**
-     * 数量
+     * 类型 取原始值 还是数量
      */
-    private String quantity;
+    @JsonIgnore
+    private String type;
 
 
 
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexScoreResult.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexScoreResult.java
index c817b5de55..d6ca46a913 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexScoreResult.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexScoreResult.java
@@ -32,9 +32,15 @@ public class IndexScoreResult implements Serializable {
      * 原始值
      */
     private String originValue;
+
     /**
      * 数量
      */
-    private String quantity;
+    private String sampleCount;
+
+    /**
+     * 值类型
+     */
+    private String valueType;
 
 }
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
index 5c8ceaf757..77252eb6ad 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
@@ -22,6 +22,7 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.enums.OrgLevelEnum;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.DataSourceConstant;
+import com.epmet.datareport.constant.FactConstant;
 import com.epmet.datareport.constant.IndexConstant;
 import com.epmet.datareport.dao.evaluationindex.index.IndexExplainDao;
 import com.epmet.datareport.dao.evaluationindex.index.IndexGroupDetailDao;
@@ -184,10 +185,10 @@ public class IndexExplainServiceImpl implements IndexExplainService {
 
                     break;
                 default:
-                    log.error("暂不支持更高级别的查询，level:{}",orgLevel);
+                    log.error("暂不支持更高级别的查询，level:{}", orgLevel);
             }
 
-            setRealValue(result.getTableDataList(), realScoreList);
+            setRealValue(result.getTableDataList(), realScoreList, tableHeaders);
         }
     }
 
@@ -196,11 +197,12 @@ public class IndexExplainServiceImpl implements IndexExplainService {
      *
      * @param tableList
      * @param scoreList
+     * @param tableHeaders
      * @return void
      * @author LiuJanJun
      * @date 2021/5/19 2:07 下午
      */
-    private void setRealValue(List<IndexScoreDetailResult> tableList, List<IndexScoreResult> scoreList) {
+    private void setRealValue(List<IndexScoreDetailResult> tableList, List<IndexScoreResult> scoreList, List<String> tableHeaders) {
         if (CollectionUtils.isEmpty(tableList) || CollectionUtils.isEmpty(scoreList)) {
             return;
         }
@@ -209,19 +211,37 @@ public class IndexExplainServiceImpl implements IndexExplainService {
                 if (!tb.getIndexCode().equals(score.getIndexCode())) {
                     continue;
                 }
-                tb.setOriginValue(score.getOriginValue());
                 tb.setScore(String.valueOf(score.getScore()));
-                if (StringUtils.isNotBlank(score.getQuantity())) {
-                    tb.setQuantity(score.getQuantity());
+                tb.setWeight(score.getWeight().multiply(new BigDecimal(NumConstant.ONE_HUNDRED)).setScale(0, BigDecimal.ROUND_HALF_UP) + "%");
+                if (tableHeaders.contains("平均值")) {
+                    if (StringUtils.isNotBlank(score.getSampleCount())) {
+                        tb.setOriginValue(score.getSampleCount());
+                    }
+                } else {
+                    tb.setOriginValue(score.getOriginValue());
+                }
+
+
+                //小数类型，四舍五入保留小数点后一位
+                if (FactConstant.INTEGER.equals(score.getValueType())) {
+                    BigDecimal num = new BigDecimal(tb.getOriginValue()).setScale(0, BigDecimal.ROUND_HALF_UP);
+                    tb.setOriginValue(num.toString());
+                }
+                if (FactConstant.DECIMAL.equals(score.getValueType())) {
+                    BigDecimal num = new BigDecimal(tb.getOriginValue()).setScale(1, BigDecimal.ROUND_HALF_UP);
+                    tb.setOriginValue(num.toString());
+                }
+                //百分数类型，四舍五入保留小数点后一位并转成百分比
+                if (FactConstant.PERCENT.equals(score.getValueType())) {
+                    BigDecimal num = new BigDecimal(tb.getOriginValue()).setScale(1, BigDecimal.ROUND_HALF_UP);
+                    tb.setOriginValue(num + "%");
                 }
-                tb.setWeight(score.getWeight().multiply(new BigDecimal(NumConstant.ONE_HUNDRED)) + "%");
             }
         }
     }
 
     private List<IndexScoreDetailResult> setDefaultTableData(String orgLevel, String type, Map<String, List<IndexGroupDetailResult>> detailEntityMap,
                                                              IndexExplainResult result, String allIndexCodePath, List<IndexGroupDetailResult> indexGroupDetailEntities) {
-
         if (indexGroupDetailEntities == null) {
             indexGroupDetailEntities = detailEntityMap.get(allIndexCodePath);
         }
@@ -236,15 +256,18 @@ public class IndexExplainServiceImpl implements IndexExplainService {
             if ("grid".equals(orgLevel) && IndexConstant.ZI_SHEN.equals(type) && index.getAllIndexCodePath().contains(IndexConstant.XIA_JI)) {
                 return;
             }
-            if ((!"grid".equals(orgLevel) && !"district".equals(orgLevel)) && !index.getAllIndexCodePath().contains(type)) {
+            if ("district".equals(orgLevel) && !index.getAllIndexCodePath().contains(type) && !index.getAllIndexCodePath().contains(IndexConstant.ZHI_LI_NENG_LI)) {
+                return;
+            }
+            if (!"grid".equals(orgLevel) && !"district".equals(orgLevel) && !index.getAllIndexCodePath().contains(type)) {
                 return;
             }
             table.setIndexCode(index.getIndexCode());
             table.setIndexName(index.getIndexName());
             table.setOriginValue(NumConstant.ZERO_STR);
             table.setScore(NumConstant.ZERO_STR);
-            table.setWeight(index.getWeight().multiply(new BigDecimal(100)).setScale(NumConstant.TWO, BigDecimal.ROUND_HALF_UP) + "%");
-            table.setQuantity(NumConstant.ZERO_STR);
+            table.setWeight(index.getWeight().multiply(new BigDecimal(100)).setScale(0, BigDecimal.ROUND_HALF_UP) + "%");
+            table.setType(type);
             tableList.add(table);
             if (new BigDecimal(-1).compareTo(index.getThreshold()) != 0) {
                 threlodList.add(index.getIndexName().concat(String.format(IndexConstant.THRESHOLD_TEXT, index.getThreshold().intValue())));
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/fact/impl/FactIndexServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/fact/impl/FactIndexServiceImpl.java
index 596b1e9dd6..7a5eeee0d1 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/fact/impl/FactIndexServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/fact/impl/FactIndexServiceImpl.java
@@ -335,6 +335,11 @@ public class FactIndexServiceImpl implements FactIndexService {
         resultList.forEach(result -> {
             list.stream().filter(dto -> dto.getIndexCode().equals(result.getKey())).forEach(l -> {
                 result.setShowType(l.getValueType());
+                //整数
+                if (FactConstant.DECIMAL.equals(l.getValueType())) {
+                    BigDecimal num = new BigDecimal(result.getValue()).setScale(0, BigDecimal.ROUND_HALF_UP);
+                    result.setValue(num.toString());
+                }
                 //小数类型，四舍五入保留小数点后一位
                 if (FactConstant.DECIMAL.equals(l.getValueType())) {
                     BigDecimal num = new BigDecimal(result.getValue()).setScale(1, BigDecimal.ROUND_HALF_UP);
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencySubScoreDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencySubScoreDao.xml
index d1b1dafeea..aafd8dd25b 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencySubScoreDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencySubScoreDao.xml
@@ -46,9 +46,12 @@
             fact.index_code,
             IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS origin_value,
             round(fact.score,1) AS score,
-            round(fact.WEIGHT,2) AS weight
+            round(fact.WEIGHT,2) AS weight,
+            SAMPLE_COUNT,
+            dict.VALUE_TYPE
         FROM
             fact_index_agency_sub_score fact
+              LEFT JOIN index_dict dict ON fact.index_code = dict.index_code
         WHERE
             fact.del_flag = '0'
             AND fact.all_parent_index_code = #{allParentIndexCode}
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCpcSubScoreDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCpcSubScoreDao.xml
index 84ea0eca60..4e7171912d 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCpcSubScoreDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCpcSubScoreDao.xml
@@ -29,7 +29,7 @@
     <select id="selecCpcAvgScore" resultType="com.epmet.evaluationindex.index.result.IndexScoreResult">
             SELECT
                 id, customer_id, agency_id, grid_id, year_id, month_id, user_id,
-                COUNT(*) quantity,
+                COUNT(*) SAMPLE_COUNT,
                 ROUND(AVG(score),1) score,
                 index_code, all_parent_index_code,
                 ROUND(weight,2) weight
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexDeptSubScoreDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexDeptSubScoreDao.xml
index 45cb19fced..8da2f52516 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexDeptSubScoreDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexDeptSubScoreDao.xml
@@ -10,7 +10,7 @@
                 id, customer_id, dept_id, agency_id, month_id,
                 origin_value,
                 index_code, all_parent_index_code, weight,
-                COUNT(*) quantity,
+                COUNT(*) SAMPLE_COUNT,
                 ROUND(AVG(score),1) score,
                 round(weight,2) AS weight
             FROM  fact_index_dept_sub_score

From 48103d32f82b8fae2e4afb4d1164e515ef79a19a Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Thu, 27 May 2021 11:16:28 +0800
Subject: [PATCH 095/128] =?UTF-8?q?=E5=B9=B3=E5=9D=87=E5=80=BC=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=20=E4=B8=8D=E6=A0=BC=E5=BC=8F=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../index/impl/IndexExplainServiceImpl.java   | 59 ++++++++++---------
 1 file changed, 31 insertions(+), 28 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
index 77252eb6ad..4ade8e04b0 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
@@ -219,27 +219,29 @@ public class IndexExplainServiceImpl implements IndexExplainService {
                     }
                 } else {
                     tb.setOriginValue(score.getOriginValue());
-                }
-
-
-                //小数类型，四舍五入保留小数点后一位
-                if (FactConstant.INTEGER.equals(score.getValueType())) {
-                    BigDecimal num = new BigDecimal(tb.getOriginValue()).setScale(0, BigDecimal.ROUND_HALF_UP);
-                    tb.setOriginValue(num.toString());
-                }
-                if (FactConstant.DECIMAL.equals(score.getValueType())) {
-                    BigDecimal num = new BigDecimal(tb.getOriginValue()).setScale(1, BigDecimal.ROUND_HALF_UP);
-                    tb.setOriginValue(num.toString());
-                }
-                //百分数类型，四舍五入保留小数点后一位并转成百分比
-                if (FactConstant.PERCENT.equals(score.getValueType())) {
-                    BigDecimal num = new BigDecimal(tb.getOriginValue()).setScale(1, BigDecimal.ROUND_HALF_UP);
-                    tb.setOriginValue(num + "%");
+                    formatOriginValue(score, tb);
                 }
             }
         }
     }
 
+    private void formatOriginValue(IndexScoreResult score, IndexScoreDetailResult index) {
+        //小数类型，四舍五入保留小数点后一位
+        if (FactConstant.INTEGER.equals(score.getValueType())) {
+            BigDecimal num = new BigDecimal(index.getOriginValue()).setScale(0, BigDecimal.ROUND_HALF_UP);
+            index.setOriginValue(num.toString());
+        }
+        if (FactConstant.DECIMAL.equals(score.getValueType())) {
+            BigDecimal num = new BigDecimal(index.getOriginValue()).setScale(1, BigDecimal.ROUND_HALF_UP);
+            index.setOriginValue(num.toString());
+        }
+        //百分数类型，四舍五入保留小数点后一位并转成百分比
+        if (FactConstant.PERCENT.equals(score.getValueType())) {
+            BigDecimal num = new BigDecimal(index.getOriginValue()).setScale(1, BigDecimal.ROUND_HALF_UP);
+            index.setOriginValue(num + "%");
+        }
+    }
+
     private List<IndexScoreDetailResult> setDefaultTableData(String orgLevel, String type, Map<String, List<IndexGroupDetailResult>> detailEntityMap,
                                                              IndexExplainResult result, String allIndexCodePath, List<IndexGroupDetailResult> indexGroupDetailEntities) {
         if (indexGroupDetailEntities == null) {
@@ -253,13 +255,13 @@ public class IndexExplainServiceImpl implements IndexExplainService {
         List<String> threlodList = new ArrayList<>();
         indexGroupDetailEntities.forEach(index -> {
             IndexScoreDetailResult table = new IndexScoreDetailResult();
-            if ("grid".equals(orgLevel) && IndexConstant.ZI_SHEN.equals(type) && index.getAllIndexCodePath().contains(IndexConstant.XIA_JI)) {
+            if (OrgLevelEnum.GRID.equals(orgLevel) && IndexConstant.ZI_SHEN.equals(type) && index.getAllIndexCodePath().contains(IndexConstant.XIA_JI)) {
                 return;
             }
-            if ("district".equals(orgLevel) && !index.getAllIndexCodePath().contains(type) && !index.getAllIndexCodePath().contains(IndexConstant.ZHI_LI_NENG_LI)) {
+            if (OrgLevelEnum.DISTRICT.equals(orgLevel) && !index.getAllIndexCodePath().contains(type) && !index.getAllIndexCodePath().contains(IndexConstant.ZHI_LI_NENG_LI)) {
                 return;
             }
-            if (!"grid".equals(orgLevel) && !"district".equals(orgLevel) && !index.getAllIndexCodePath().contains(type)) {
+            if (!OrgLevelEnum.GRID.equals(orgLevel) && !OrgLevelEnum.DISTRICT.equals(orgLevel) && !index.getAllIndexCodePath().contains(type)) {
                 return;
             }
             table.setIndexCode(index.getIndexCode());
@@ -300,13 +302,14 @@ public class IndexExplainServiceImpl implements IndexExplainService {
 
     private List<String> getTableHeaders(String type, String allIndexCode, String orgLevel) {
         List<String> headers = new ArrayList<>();
-        switch (orgLevel) {
-            case "grid":
+        OrgLevelEnum anEnum = OrgLevelEnum.getEnum(orgLevel);
+        switch (anEnum) {
+            case GRID:
                 //还没确定怎么搞
-                if ("zishen".equals(type)) {
+                if (IndexConstant.ZI_SHEN.equals(type)) {
                     headers = IndexConstant.getStandardSelfHeaders(allIndexCode);
 
-                } else if ("xiaji".equals(type)) {
+                } else if (IndexConstant.XIA_JI.equals(type)) {
                     headers = new ArrayList<>(IndexConstant.QuantityLastHeader);
                     if (allIndexCode.contains("canyuyishi")) {
                         headers.add(0, "组织内党员的参与议事指数考评分（平均值）");
@@ -315,11 +318,11 @@ public class IndexExplainServiceImpl implements IndexExplainService {
                     }
                     break;
                 }
-            case "district":
-                if ("zishen".equals(type)) {
+            case DISTRICT:
+                if (IndexConstant.ZI_SHEN.equals(type)) {
                     headers = IndexConstant.getStandardSelfHeaders(allIndexCode);
 
-                } else if ("xiaji".equals(type)) {
+                } else if (IndexConstant.XIA_JI.equals(type)) {
                     headers = new ArrayList<>(IndexConstant.QuantityLastHeader);
                     if (allIndexCode.contains("quzhibumen")) {
                         headers.add(0, "区直部门各项治理指数指标");
@@ -329,10 +332,10 @@ public class IndexExplainServiceImpl implements IndexExplainService {
                 }
                 break;
             default:
-                if ("zishen".equals(type)) {
+                if (IndexConstant.ZI_SHEN.equals(type)) {
                     headers = IndexConstant.getStandardSelfHeaders(allIndexCode);
 
-                } else if ("xiaji".equals(type)) {
+                } else if (IndexConstant.XIA_JI.equals(type)) {
                     headers = IndexConstant.getStandardSubHeaders(allIndexCode);
                 }
         }

From 6f5c7b537554a19c86b647c723224c22217a7fc9 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Thu, 27 May 2021 14:29:11 +0800
Subject: [PATCH 096/128] =?UTF-8?q?=E7=89=B9=E6=AE=8A=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E4=B8=8B%d?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/datareport/constant/IndexConstant.java   | 14 ++++++++------
 .../index/impl/IndexExplainServiceImpl.java        | 11 ++++++++++-
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/constant/IndexConstant.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/constant/IndexConstant.java
index af1ae3588d..e6a4b3bfac 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/constant/IndexConstant.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/constant/IndexConstant.java
@@ -18,12 +18,12 @@ public class IndexConstant {
     public static final List<String> ScoreLastHeader = Arrays.asList("指标值", "得分", "权重");
     public static final List<String> QuantityLastHeader = Arrays.asList("数量", "平均值", "权重");
 
-    private static final String DJZS_CN = "党建指数";
-    private static final String FWZS_CN = "服务指数";
-    private static final String ZLZS_CN = "治理指数";
-    private static final String ZB_CN = "指标";
-    private static final String BEN_JI_CN = "本级";
-    private static final String XIA_JI_CN = "下级";
+    public static final String DJZS_CN = "党建指数";
+    public static final String FWZS_CN = "服务指数";
+    public static final String ZLZS_CN = "治理指数";
+    public static final String ZB_CN = "指标";
+    public static final String BEN_JI_CN = "本级";
+    public static final String XIA_JI_CN = "下级";
 
     public static final String ZI_SHEN = "zishen";
     public static final String XIA_JI = "xiaji";
@@ -33,6 +33,8 @@ public class IndexConstant {
     public static final String INDEX_SCORE_DESC = "含义：自然月周期内，当月指数得分=党建指数得分*相关权重+治理指数得分*相关权重+服务指数得分*相关权重";
     public static final String INDEX_DISTRINCT_TABLE1_INDEX_CODE = "suoyoujiedaozlnlpjz";
     public static final String ZHI_LI_NENG_LI = "zhilinengli";
+    public static final String PATTERN_D = "d";
+    public static final String QUAN_QU_ZHI_LI_INDEX_CODE = "quanquxiangguan:zhilinengli";
 
 
     /**
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
index 4ade8e04b0..3915f53da4 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
@@ -100,6 +100,16 @@ public class IndexExplainServiceImpl implements IndexExplainService {
             results.add(result);
             result.setTitle(explainDTO.getTitle());
             result.setMeaning(explainDTO.getMeaning());
+
+            //全区相关的服务能力的含义中 有权重 所以特殊处理下
+            if (explainDTO.getOrgLevel().equals(OrgLevelEnum.DISTRICT.getCode()) && IndexConstant.ZLZS_CN.equals(explainDTO.getTitle())) {
+                List<IndexGroupDetailResult> detailResults = detailEntityMap.get(IndexConstant.QUAN_QU_ZHI_LI_INDEX_CODE);
+                detailResults.forEach(index -> {
+                    String newMeaning = result.getMeaning().replaceFirst(IndexConstant.PATTERN_D,
+                            index.getWeight().multiply(new BigDecimal(NumConstant.ONE_HUNDRED)).setScale(NumConstant.ZERO, BigDecimal.ROUND_HALF_UP).toString());
+                    result.setMeaning(newMeaning);
+                });
+            }
             //设置表格数据
             setTableData(formDTO, detailEntityMap, explainDTO, result);
             //子节点
@@ -163,7 +173,6 @@ public class IndexExplainServiceImpl implements IndexExplainService {
 
                         List<IndexGroupDetailResult> indexGroupDetailEntities = new ArrayList<>();
                         for (IndexGroupDetailResult index : detailResults) {
-
                             if (IndexConstant.INDEX_DISTRINCT_TABLE1_INDEX_CODE.equals(index.getIndexCode())) {
                                 indexGroupDetailEntities.add(index);
                                 setDefaultTableData(orgLevel, type, detailEntityMap, result, allIndexCodePath, indexGroupDetailEntities);

From c434ad6a9c630ec54af1a4149747d91d731c286a Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Thu, 27 May 2021 15:04:06 +0800
Subject: [PATCH 097/128] =?UTF-8?q?=E5=9F=BA=E5=B1=82=E6=B2=BB=E7=90=86-?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=9A=84=E6=B2=BB=E7=90=86=E6=8C=87=E6=95=B0?=
 =?UTF-8?q?=EF=BC=8C=E6=8C=89=E5=A4=A9=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FactOriginProjectMainDailyDao.java        | 10 ++++++++++
 .../FactOriginProjectMainDailyService.java    | 10 ++++++++++
 ...FactOriginProjectMainDailyServiceImpl.java | 18 ++++++++++++++++++
 .../GovernRankDataExtractServiceImpl.java     |  6 +++---
 .../extract/FactOriginProjectMainDailyDao.xml | 19 +++++++++++++++++++
 5 files changed, 60 insertions(+), 3 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java
index d5042bbb7b..f8e9adecfd 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java
@@ -477,4 +477,14 @@ public interface FactOriginProjectMainDailyDao extends BaseDao<FactOriginProject
 	 */
 	List<OrgStatisticsResultDTO> selectAgencyClosedProjectCount(@Param("customerId") String customerId, @Param("dateId") String dateId, @Param(
 			"closedStatus") String closedStatus, @Param("origin") String origin);
+
+	/**
+	 * 组织结案项目统计
+	 * @author zhaoqifeng
+	 * @date 2021/5/27 14:51
+	 * @param customerId
+	 * @param dateId
+	 * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+	 */
+	List<OrgStatisticsResultDTO> selectAgencyClosedProjectStaticDaily(@Param("customerId") String customerId, @Param("dateId") String dateId);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java
index 9445559627..64dc533732 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java
@@ -448,4 +448,14 @@ public interface FactOriginProjectMainDailyService extends BaseService<FactOrigi
      * @return java.util.Map<java.lang.String,com.epmet.dto.extract.result.OrgStatisticsResultDTO>
      */
     Map<String, OrgStatisticsResultDTO> getAgencyClosedProjectCount(String customerId, String dateId, String closedStatus, String origin);
+
+    /**
+     * 组织结案项目统计
+     * @author zhaoqifeng
+     * @date 2021/5/27 14:56
+     * @param customerId
+     * @param dateId
+     * @return java.util.Map<java.lang.String,java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>>
+     */
+    Map<String, List<OrgStatisticsResultDTO>> getAgencyClosedProjectStatic(String customerId, String dateId);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java
index e31ea6fbaf..dfee660e65 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java
@@ -678,5 +678,23 @@ public class FactOriginProjectMainDailyServiceImpl extends BaseServiceImpl<FactO
         return list.stream().collect(Collectors.toMap(OrgStatisticsResultDTO::getAgencyId, Function.identity()));
     }
 
+    /**
+     * 组织结案项目统计
+     *
+     * @param customerId
+     * @param dateId
+     * @return java.util.Map<java.lang.String, java.util.List < com.epmet.dto.extract.result.OrgStatisticsResultDTO>>
+     * @author zhaoqifeng
+     * @date 2021/5/27 14:56
+     */
+    @Override
+    public Map<String, List<OrgStatisticsResultDTO>> getAgencyClosedProjectStatic(String customerId, String dateId) {
+        List<OrgStatisticsResultDTO> list = baseDao.selectAgencyClosedProjectStaticDaily(customerId, dateId);
+        if (CollectionUtils.isEmpty(list)) {
+            return Collections.emptyMap();
+        }
+        return list.stream().collect(Collectors.groupingBy(OrgStatisticsResultDTO::getAgencyId));
+    }
+
 
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/GovernRankDataExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/GovernRankDataExtractServiceImpl.java
index 80d3f22ee7..926b253910 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/GovernRankDataExtractServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/GovernRankDataExtractServiceImpl.java
@@ -407,7 +407,7 @@ public class GovernRankDataExtractServiceImpl implements GovernRankDataExtractSe
 			}));
 		}
 		//自制率 自治项目数/办结项目数
-		List<OrgStatisticsResultDTO> selfList = factOriginProjectMainDailyService.getSelfProject(customerId, dateId, OrgTypeConstant.COMMUNITY);
+		List<OrgStatisticsResultDTO> selfList = factOriginProjectMainDailyService.getSelfProjectDaily(customerId, dateId, OrgTypeConstant.COMMUNITY);
 		if (CollectionUtils.isNotEmpty(selfList)) {
 			list.forEach(entity -> selfList.stream().filter(self -> entity.getOrgId().equals(self.getAgencyId())).forEach(dto -> {
 				if (dto.getSum() != NumConstant.ZERO) {
@@ -480,7 +480,7 @@ public class GovernRankDataExtractServiceImpl implements GovernRankDataExtractSe
 			}));
 		}
 		//自制率 自治项目数/办结项目数
-		List<OrgStatisticsResultDTO> selfList = factOriginProjectMainDailyService.getSelfProject(customerId, dateId, OrgTypeConstant.STREET);
+		List<OrgStatisticsResultDTO> selfList = factOriginProjectMainDailyService.getSelfProjectDaily(customerId, dateId, OrgTypeConstant.STREET);
 		if (CollectionUtils.isNotEmpty(selfList)) {
 			list.forEach(entity -> selfList.stream().filter(self -> entity.getOrgId().equals(self.getAgencyId())).forEach(dto -> {
 				if (dto.getSum() != NumConstant.ZERO) {
@@ -553,7 +553,7 @@ public class GovernRankDataExtractServiceImpl implements GovernRankDataExtractSe
 			}));
 		}
 		//自制率 自治项目数/办结项目数
-		List<OrgStatisticsResultDTO> selfList = factOriginProjectMainDailyService.getSelfProject(customerId, dateId, OrgTypeConstant.DISTRICT);
+		List<OrgStatisticsResultDTO> selfList = factOriginProjectMainDailyService.getSelfProjectDaily(customerId, dateId, OrgTypeConstant.DISTRICT);
 		if (CollectionUtils.isNotEmpty(selfList)) {
 			list.forEach(entity -> selfList.stream().filter(self -> entity.getOrgId().equals(self.getAgencyId())).forEach(dto -> {
 				if (dto.getSum() != NumConstant.ZERO) {
diff --git 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
index f17dc573ef..f8420396f9 100644
--- 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
@@ -963,4 +963,23 @@
         </if>
         GROUP BY AGENCY_ID
     </select>
+    <select id="selectAgencyClosedProjectStaticDaily" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
+        SELECT
+            a.AGENCY_ID,
+            c.`LEVEL`,
+            COUNT(a.ID) AS "sum",
+            SUM(IF(b.ORG_TYPE = 'department', 1, 0)) 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.ACTION_CODE = 'close'
+                INNER JOIN dim_agency c ON b.AGENCY_ID = c.ID
+        WHERE
+            a.CUSTOMER_ID = #{customerId}
+            AND a.DATE_ID &lt;= #{dateId}
+            AND a.PROJECT_STATUS = 'closed'
+        GROUP BY
+            a.AGENCY_ID,
+            c.`LEVEL`
+    </select>
 </mapper>

From 1656ce8f687d1bfba9fb29534062ac53425e6027 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Thu, 27 May 2021 16:09:28 +0800
Subject: [PATCH 098/128] bug

---
 .../evaluationindex/index/impl/IndexExplainServiceImpl.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
index 3915f53da4..572fb3b4b8 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
@@ -264,13 +264,13 @@ public class IndexExplainServiceImpl implements IndexExplainService {
         List<String> threlodList = new ArrayList<>();
         indexGroupDetailEntities.forEach(index -> {
             IndexScoreDetailResult table = new IndexScoreDetailResult();
-            if (OrgLevelEnum.GRID.equals(orgLevel) && IndexConstant.ZI_SHEN.equals(type) && index.getAllIndexCodePath().contains(IndexConstant.XIA_JI)) {
+            if (OrgLevelEnum.GRID.getCode().equals(orgLevel) && IndexConstant.ZI_SHEN.equals(type) && index.getAllIndexCodePath().contains(IndexConstant.XIA_JI)) {
                 return;
             }
-            if (OrgLevelEnum.DISTRICT.equals(orgLevel) && !index.getAllIndexCodePath().contains(type) && !index.getAllIndexCodePath().contains(IndexConstant.ZHI_LI_NENG_LI)) {
+            if (OrgLevelEnum.DISTRICT.getCode().equals(orgLevel) && !index.getAllIndexCodePath().contains(type) && !index.getAllIndexCodePath().contains(IndexConstant.ZHI_LI_NENG_LI)) {
                 return;
             }
-            if (!OrgLevelEnum.GRID.equals(orgLevel) && !OrgLevelEnum.DISTRICT.equals(orgLevel) && !index.getAllIndexCodePath().contains(type)) {
+            if (!OrgLevelEnum.GRID.getCode().equals(orgLevel) && !OrgLevelEnum.DISTRICT.getCode().equals(orgLevel) && !index.getAllIndexCodePath().contains(type)) {
                 return;
             }
             table.setIndexCode(index.getIndexCode());

From d894dd37e17f8ca1f503cc5d5dece8ee169e4768 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 27 May 2021 16:33:21 +0800
Subject: [PATCH 099/128] =?UTF-8?q?=E6=B2=BB=E7=90=86=E6=8C=87=E8=B0=81?=
 =?UTF-8?q?=E7=BD=91=E6=A0=BC=E7=9B=B8=E5=85=B3v3:=20=E7=BD=91=E6=A0=BC?=
 =?UTF-8?q?=E8=87=AA=E6=B2=BB=E5=8D=A0=E6=AF=94=EF=BC=9A=E6=9C=AC=E7=BD=91?=
 =?UTF-8?q?=E6=A0=BC=E5=86=85=E4=BA=A7=E7=94=9F=E7=9A=84=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E4=B8=94=E4=B8=80=E7=9B=B4=E5=9C=A8=E7=BD=91?=
 =?UTF-8?q?=E6=A0=BC=E7=BA=A7=E6=B5=81=E8=BD=AC=E7=9A=84=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=EF=BC=8C=E4=BB=8E=E5=93=AA=E5=87=BA=E6=9D=A5=E5=BD=92=E8=B0=81?=
 =?UTF-8?q?=E8=87=AA=E6=B2=BB=EF=BC=9B=E7=A4=BE=E5=8C=BA=E3=80=81=E8=A1=97?=
 =?UTF-8?q?=E9=81=93=E3=80=81=E5=8C=BA=E7=9B=B4=E9=83=A8=E9=97=A8=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3=E9=83=BD=E6=98=AF=E6=8C=87=E7=9A=84=EF=BC=8C=E4=BB=8E?=
 =?UTF-8?q?=E6=9C=AC=E7=BD=91=E6=A0=BC=E5=86=85=E5=87=BA=E6=9D=A5=E7=9A=84?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=AD=EF=BC=8C=E5=86=8D=E5=8E=BB=E7=9C=8B?=
 =?UTF-8?q?=E8=B0=81=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extract/FactOriginProjectLogDailyDTO.java |  10 +-
 .../constant/DimObjectActionConstant.java     |  13 ++
 .../extract/FactOriginProjectLogDailyDao.java |  20 +-
 .../FactOriginProjectMainDailyDao.java        |  19 ++
 .../epmet/dao/org/StatsCustomerAgencyDao.java |   8 +
 .../extract/GovernProjectInfoDTO.java         |  20 ++
 .../extract/ProjectInfoDTO.java               |  15 --
 .../FactOriginProjectMainDailyService.java    |  19 ++
 .../impl/FactGridGovernDailyServiceImpl.java  | 197 +++++++++++++++++-
 ...FactOriginProjectMainDailyServiceImpl.java |  23 ++
 .../service/org/CustomerAgencyService.java    |  16 ++
 .../org/impl/CustomerAgencyServiceImpl.java   |  22 ++
 .../extract/FactOriginProjectLogDailyDao.xml  |  23 ++
 .../extract/FactOriginProjectMainDailyDao.xml |  59 ++++++
 .../mapper/org/StatsCustomerAgencyDao.xml     |  18 ++
 15 files changed, 457 insertions(+), 25 deletions(-)
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/GovernProjectInfoDTO.java
 delete mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/ProjectInfoDTO.java

diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactOriginProjectLogDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactOriginProjectLogDailyDTO.java
index 8f5f1571db..4843b32966 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactOriginProjectLogDailyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactOriginProjectLogDailyDTO.java
@@ -17,9 +17,10 @@
 
 package com.epmet.dto.extract;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -44,7 +45,7 @@ public class FactOriginProjectLogDailyDTO implements Serializable {
 	private String customerId;
 
 	/**
-	 * 网格grid,部门department
+	 * 网格grid,部门department,组织：agency
 	 */
 	private String orgType;
 
@@ -90,6 +91,11 @@ public class FactOriginProjectLogDailyDTO implements Serializable {
      */
 	private String yearId;
 
+	/**
+	 * 项目ID
+	 */
+	private String projectId;
+
     /**
      * 议题ID
      */
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/DimObjectActionConstant.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/DimObjectActionConstant.java
index 5476a93a1b..1b6697f1ec 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/DimObjectActionConstant.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/DimObjectActionConstant.java
@@ -11,4 +11,17 @@ public interface DimObjectActionConstant {
      * 发布话题
      */
     String TOPIC_PUBLISH="discussing";
+
+    // response	处理/响应
+    // close	结案
+    // transfer	流转
+    // return	退回
+    // resolved	结案_已解决
+    // unresolved	结案_无需解决
+    // evaluate	满意度评价
+    // bad	不满意
+    // good	基本满意
+    // perfect	非常满意
+    // created	立项
+    String PROJECT_RETURN="return";
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectLogDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectLogDailyDao.java
index 78f9be78e9..3d7371fb56 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectLogDailyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectLogDailyDao.java
@@ -18,12 +18,12 @@
 package com.epmet.dao.evaluationindex.extract;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.extract.FactOriginProjectLogDailyDTO;
 import com.epmet.dto.extract.result.*;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectLogDailyEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-
 import java.util.List;
 
 /**
@@ -298,4 +298,22 @@ public interface FactOriginProjectLogDailyDao extends BaseDao<FactOriginProjectL
 	 * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
 	 */
 	List<OrgStatisticsResultDTO> selectGridSelfDaily(@Param("customerId") String customerId, @Param("dateId") String dateId);
+
+	/**
+	 * @return java.util.List<com.epmet.dto.extract.FactOriginProjectLogDailyDTO>
+	 * @param projectId
+	 * @author yinzuomei
+	 * @description 根据项目id， 查询处理明细
+	 * @Date 2021/5/27 12:58
+	 **/
+	List<FactOriginProjectLogDailyDTO> selectListByProjectId(String projectId);
+
+	/**
+	 * @return com.epmet.dto.extract.FactOriginProjectLogDailyDTO
+	 * @param projectId
+	 * @author yinzuomei
+	 * @description 查询某一个项目的结案操作明细
+	 * @Date 2021/5/27 12:58
+	 **/
+	FactOriginProjectLogDailyDTO selectClosedLog(String projectId);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java
index d5042bbb7b..fe5a0e2584 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java
@@ -29,6 +29,7 @@ import com.epmet.dto.screen.form.ProjectSourceMapFormDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectMainDailyEntity;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectOrgPeriodDailyEntity;
 import com.epmet.entity.evaluationindex.extract.GovernGridTotalCommonDTO;
+import com.epmet.entity.evaluationindex.extract.GovernProjectInfoDTO;
 import com.epmet.entity.evaluationindex.screen.ScreenDifficultyDataEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -477,4 +478,22 @@ public interface FactOriginProjectMainDailyDao extends BaseDao<FactOriginProject
 	 */
 	List<OrgStatisticsResultDTO> selectAgencyClosedProjectCount(@Param("customerId") String customerId, @Param("dateId") String dateId, @Param(
 			"closedStatus") String closedStatus, @Param("origin") String origin);
+
+	/**
+	 * 当前网格内已结案的项目
+	 *
+	 * @author zhaoqifeng
+	 * @date 2021/5/26 15:09
+	 * @param customerId
+	 * @param gridId
+	 * @param projectStatus 状态:待处理 pending，结案closed
+	 * @param origin 项目来源 来源：议题issue 组织agency
+	 * @param isResolved unresolved,resolved
+	 * @return com.epmet.entity.evaluationindex.extract.GovernProjectInfoDTO
+	 */
+    List<GovernProjectInfoDTO> getGridClosedProjectList(@Param("customerId")String customerId,
+														@Param("gridId") String gridId,
+														@Param("projectStatus")String projectStatus,
+														@Param("origin") String origin,
+														@Param("isResolved")String isResolved);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java
index aa0f78f087..6a20ae9f7f 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java
@@ -35,4 +35,12 @@ public interface StatsCustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
     CustomerAgencyEntity getRootAgencyInfo(String customerId);
 
     List<CustomerAgencyEntity> queryAgencyListByCustomerId(String customerId);
+
+    /**
+     * 查询部门所属组织信息
+     *
+     * @param deptId
+     * @return com.epmet.entity.evaluationindex.screen.ScreenCustomerAgencyEntity
+     */
+    CustomerAgencyEntity selectByDeptId(String deptId);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/GovernProjectInfoDTO.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/GovernProjectInfoDTO.java
new file mode 100644
index 0000000000..b4dfa42239
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/GovernProjectInfoDTO.java
@@ -0,0 +1,20 @@
+package com.epmet.entity.evaluationindex.extract;
+
+import com.epmet.dto.extract.FactOriginProjectLogDailyDTO;
+import com.epmet.dto.extract.FactOriginProjectMainDailyDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 描述一下
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/5/26 18:00
+ */
+@Data
+public class GovernProjectInfoDTO extends FactOriginProjectMainDailyDTO implements Serializable {
+    private FactOriginProjectLogDailyDTO closeLogDTO;
+    private List<FactOriginProjectLogDailyDTO> projectLogDTOList;
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/ProjectInfoDTO.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/ProjectInfoDTO.java
deleted file mode 100644
index 0b1eb1af59..0000000000
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/ProjectInfoDTO.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.epmet.entity.evaluationindex.extract;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 描述一下
- *
- * @author yinzuomei@elink-cn.com
- * @date 2021/5/26 18:00
- */
-@Data
-public class ProjectInfoDTO implements Serializable {
-}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java
index 9445559627..32c027b605 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java
@@ -30,6 +30,7 @@ import com.epmet.dto.screen.form.ScreenCentralZoneDataFormDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectMainDailyEntity;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectOrgPeriodDailyEntity;
 import com.epmet.entity.evaluationindex.extract.GovernGridTotalCommonDTO;
+import com.epmet.entity.evaluationindex.extract.GovernProjectInfoDTO;
 import com.epmet.entity.evaluationindex.screen.ScreenDifficultyDataEntity;
 
 import java.util.List;
@@ -448,4 +449,22 @@ public interface FactOriginProjectMainDailyService extends BaseService<FactOrigi
      * @return java.util.Map<java.lang.String,com.epmet.dto.extract.result.OrgStatisticsResultDTO>
      */
     Map<String, OrgStatisticsResultDTO> getAgencyClosedProjectCount(String customerId, String dateId, String closedStatus, String origin);
+
+    /**
+     * 当前网格内已结案的项目
+     *
+     * @author zhaoqifeng
+     * @date 2021/5/26 15:09
+     * @param customerId
+     * @param gridId
+     * @param projectStatus 状态:待处理 pending，结案closed
+     * @param origin 项目来源 来源：议题issue 组织agency
+     * @param isResolved unresolved,resolved
+     * @return com.epmet.entity.evaluationindex.extract.GovernProjectInfoDTO
+     */
+    List<GovernProjectInfoDTO> getGridClosedProjectList(String customerId,
+                                                        String gridId,
+                                                        String projectStatus,
+                                                        String origin,
+                                                        String isResolved);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java
index 84c4addeea..24136c028f 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java
@@ -19,17 +19,22 @@ package com.epmet.service.evaluationindex.extract.todata.impl;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.constant.DimObjectActionConstant;
 import com.epmet.constant.DimObjectStatusConstant;
 import com.epmet.constant.ProjectConstant;
 import com.epmet.dao.evaluationindex.extract.FactGridGovernDailyDao;
+import com.epmet.dto.extract.FactOriginProjectLogDailyDTO;
 import com.epmet.dto.org.GridInfoDTO;
 import com.epmet.entity.evaluationindex.extract.FactGridGovernDailyEntity;
 import com.epmet.entity.evaluationindex.extract.GovernGridClosedTotalCommonDTO;
 import com.epmet.entity.evaluationindex.extract.GovernGridTotalCommonDTO;
+import com.epmet.entity.evaluationindex.extract.GovernProjectInfoDTO;
+import com.epmet.entity.org.CustomerAgencyEntity;
 import com.epmet.service.evaluationindex.extract.todata.FactGridGovernDailyService;
 import com.epmet.service.evaluationindex.extract.todata.FactOriginIssueMainDailyService;
 import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectMainDailyService;
 import com.epmet.service.evaluationindex.extract.todata.FactOriginTopicMainDailyService;
+import com.epmet.service.org.CustomerAgencyService;
 import com.epmet.service.org.CustomerGridService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -39,10 +44,7 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.text.NumberFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -62,7 +64,8 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
     private FactOriginProjectMainDailyService factOriginProjectMainDailyService;
     @Autowired
     private CustomerGridService customerGridService;
-
+    @Autowired
+    private CustomerAgencyService customerAgencyService;
 
     // 指标解释：
     // 1、问题解决总数：当前网格内，话题关闭（已解决+无需解决）总数、议题关闭（已解决+无需解决）总数和项目结案（议题转为项目的结案数+项目立项结案数）总数之和
@@ -242,13 +245,193 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
     }
 
     private Map<String, GovernGridClosedTotalCommonDTO> getGovernGridClosedTotalCommonDTOMap(String customerId, List<String> gridIds) {
-        Map<String, GovernGridClosedTotalCommonDTO> resultMap=new HashMap<>();
-        for(String gridId:gridIds){
+        Map<String, GovernGridClosedTotalCommonDTO> resultMap = new HashMap<>();
+        for (String gridId : gridIds) {
+
+            GovernGridClosedTotalCommonDTO governGridClosedTotalCommonDTO = new GovernGridClosedTotalCommonDTO();
+            governGridClosedTotalCommonDTO.setGridId(gridId);
+
+            // 11、来源于议题的项目，未出网格结案并且已解决的项目数
+            int fromIssueResolvedInGridCount = NumConstant.ZERO;
+            // 12、来源于议题的项目，未出网格结案并且无需解决的项目数
+            int fromIssueUnResolvedInGridCount = NumConstant.ZERO;
+            // 13、来源于项目立项的项目，未出网格结案，并且已解决的项目数；因现在网格不能立项，所以此列默认为0
+            int fromAgencyResolvedInGridCount = NumConstant.ZERO;
+            // 14、来源于项目立项的项目，未出网格结案，并且无需解决的项目数；因现在网格不能立项，所以此列默认为0
+            int fromAgencyUnResolvedInGridCount = NumConstant.ZERO;
+            // 当前网格内出来的项目：由社区结案(已解决+未解决)的项目总数
+            int communityClosedCount= NumConstant.ZERO;
+            // 当前网格内出来的项目：由街道结案(已解决+未解决)的项目总数
+            int streetClosedCount=NumConstant.ZERO;;
+            // 当前网格内出来的项目：由街道结案(已解决+未解决)的项目总数
+            int districtDeptClosedCount=NumConstant.ZERO;
+
+            //当前网格内已结案的项目
+            List<GovernProjectInfoDTO> currentGridClosedProjectList = factOriginProjectMainDailyService.getGridClosedProjectList(customerId, gridId,
+                    ProjectConstant.CLOSED,null,null);
+            for (GovernProjectInfoDTO governProjectInfoDTO : currentGridClosedProjectList) {
+                // 1、先判断当前项目是否出了网格
+                // 举例：A社区下有A1、A2两个网格；A1网格下的一个项目，流转给了A2网格的某人，他结案了。 只要项目流转部门未出grid   ;就算是网格自治。
+                boolean inGridClosed = checkIsInGridClosed(governProjectInfoDTO.getGridId(),
+                        governProjectInfoDTO.getProjectLogDTOList());
+                if (inGridClosed) {
+                    // 2、在网格内流转结案的，计算以下下值
+                    if (ProjectConstant.PROJECT_ORIGIN_ISSUE.equals(governProjectInfoDTO.getOrigin())) {
+                        if (ProjectConstant.RESOLVED.equals(governProjectInfoDTO.getIsResolved())) {
+                            // 11、来源于议题的项目，未出网格（在网格内流转的）结案并且已解决的项目数
+                            fromIssueResolvedInGridCount += 1;
+                        } else if (ProjectConstant.UNRESOLVED.equals(governProjectInfoDTO.getIsResolved())) {
+                            // 12、来源于议题的项目，未出网格（在网格内流转的）结案并且无需解决的项目数
+                            fromIssueUnResolvedInGridCount += 1;
+                        }
+                    } else if (ProjectConstant.PROJECT_ORIGIN_AGENCY.equals(governProjectInfoDTO.getOrigin())) {
+                        if (ProjectConstant.RESOLVED.equals(governProjectInfoDTO.getIsResolved())) {
+                            // 13、来源于项目立项的项目，未出网格（在网格内流转的）结案，并且已解决的项目数；因现在网格不能立项，所以此列默认为0
+                            fromAgencyResolvedInGridCount += 1;
+                        } else if (ProjectConstant.UNRESOLVED.equals(governProjectInfoDTO.getIsResolved())) {
+                            // 14、来源于项目立项的项目，未出网格（在网格内流转的）结案，并且无需解决的项目数；因现在网格不能立项，所以此列默认为0
+                            fromAgencyUnResolvedInGridCount += 1;
+                        }
+                    }
+                } else {
+                    // 3、出了网格的判断是由谁解决的？
+                    String resolveOrgType=getProjectResolveOrgType(governProjectInfoDTO.getProjectLogDTOList());
+                    if("community".equals(resolveOrgType)){
+                        // 当前网格内出来的项目：由社区结案(已解决+未解决)的项目总数
+                        communityClosedCount+=1;
+                    }else if("street".equals(resolveOrgType)){
+                        // 当前网格内出来的项目：由街道结案(已解决+未解决)的项目总数
+                        streetClosedCount+=1;
+                    }else if("districtdept".equals(resolveOrgType)){
+                        // 当前网格内出来的项目：由街道结案(已解决+未解决)的项目总数
+                        districtDeptClosedCount+=1;
+                    }
+                    // todo 可能是 市级解决、省级解决呢？？？
+                }
+            }
 
+            governGridClosedTotalCommonDTO.setFromIssueResolvedInGridCount(fromIssueResolvedInGridCount);
+            governGridClosedTotalCommonDTO.setFromIssueUnResolvedInGridCount(fromIssueUnResolvedInGridCount);
+            governGridClosedTotalCommonDTO.setFromAgencyResolvedInGridCount(fromAgencyResolvedInGridCount);
+            governGridClosedTotalCommonDTO.setFromAgencyUnResolvedInGridCount(fromAgencyUnResolvedInGridCount);
+            governGridClosedTotalCommonDTO.setCommunityClosedCount(communityClosedCount);
+            governGridClosedTotalCommonDTO.setStreetClosedCount(streetClosedCount);
+            governGridClosedTotalCommonDTO.setDistrictDeptClosedCount(districtDeptClosedCount);
+            resultMap.put(gridId, governGridClosedTotalCommonDTO);
         }
         return resultMap;
     }
 
+    /**
+     * 已经出网格的项目，到底归谁解决呢？
+     *
+     * @param projectLogDTOList 当前项目所有的处理明细
+     * @return String 社区解决：community；街道解决：street；区直部门解决：districtdept
+     */
+    private String getProjectResolveOrgType(List<FactOriginProjectLogDailyDTO> projectLogDTOList) {
+        List<Integer> handleLevelList=new ArrayList<>();
+        for (FactOriginProjectLogDailyDTO logDailyDTO : projectLogDTOList) {
+            if(logDailyDTO.getActionCode().equals(DimObjectActionConstant.PROJECT_RETURN)){
+                //当前操作如果是退回，不参与比较
+                continue;
+            }
+
+            /**
+             * 机关级别（社区级：community，
+             乡（镇、街道）级:street,
+             区县级: district,
+             市级: city
+             省级:province）
+             */
+            // orgType: 网格grid,部门department,组织：agency
+            if ("grid".equals(logDailyDTO.getOrgType())) {
+                handleLevelList.add(NumConstant.ONE);
+            } else if ("agency".equals(logDailyDTO.getOrgType())) {
+                CustomerAgencyEntity agencyEntity=customerAgencyService.getAgencyById(logDailyDTO.getOrgId());
+                if("community".equals(agencyEntity.getLevel())){
+                    handleLevelList.add(NumConstant.TWO);
+                }else if("street".equals(agencyEntity.getLevel())){
+                    handleLevelList.add(NumConstant.THREE);
+                }else if("district".equals(agencyEntity.getLevel())){
+                    handleLevelList.add(NumConstant.FOUR);
+                }else if("city".equals(agencyEntity.getLevel())){
+                    handleLevelList.add(NumConstant.FIVE);
+                }else if("province".equals(agencyEntity.getLevel())){
+                    handleLevelList.add(NumConstant.SIX);
+                }
+            } else if ("department".equals(logDailyDTO.getOrgType())) {
+                CustomerAgencyEntity deptAgencyEntity=customerAgencyService.getAgencyByDeptId(logDailyDTO.getOrgId());
+                if("district".equals(deptAgencyEntity.getLevel())){
+                    // 区直部门直接返回
+                    return "districtdept";
+                }else if("community".equals(deptAgencyEntity.getLevel())){
+                    handleLevelList.add(NumConstant.TWO);
+                }else if("street".equals(deptAgencyEntity.getLevel())){
+                    handleLevelList.add(NumConstant.THREE);
+                }else if("city".equals(deptAgencyEntity.getLevel())){
+                    handleLevelList.add(NumConstant.FIVE);
+                }else if("province".equals(deptAgencyEntity.getLevel())){
+                    handleLevelList.add(NumConstant.SIX);
+                }
+            }
+        }
+        //网格：1 grid
+        //社区：2  community
+        //街道：3 street
+        //区县：4 district
+        //市级：5 city
+        //省:6 province
+        //区直部门：7 districtdept
+        //求出最高的处理部门级别
+        String result = "";
+        int max = Collections.max(handleLevelList);
+        switch (max) {
+            case NumConstant.ONE:
+                return "grid";
+            case NumConstant.TWO:
+                result = "community";
+                break;
+            case NumConstant.THREE:
+                result = "street";
+                break;
+            case NumConstant.FOUR:
+                result = "district";
+                break;
+            case NumConstant.FIVE:
+                result = "city";
+                break;
+            case NumConstant.SIX:
+                result = "province";
+                break;
+            case NumConstant.SEVEN:
+                result = "districtdept";
+        }
+        return result;
+    }
+
+    /**
+     * 根据项目处理的明细,判断当前项目是否在网格内自己解决的
+     *
+     * @param gridId 当前项目所属网格
+     * @param projectLogDTOList
+     * @return boolean
+     */
+    private boolean checkIsInGridClosed(String gridId, List<FactOriginProjectLogDailyDTO> projectLogDTOList) {
+        boolean flag = true;
+        for (FactOriginProjectLogDailyDTO detail : projectLogDTOList) {
+            if(detail.getActionCode().equals(DimObjectActionConstant.PROJECT_RETURN)){
+                //当前操作如果是退回，不参与比较
+                continue;
+            }
+            //只要出了网格，就不算自治
+            if (!"grid".equals(detail.getOrgType())) {
+                flag = false;
+                break;
+            }
+        }
+        return flag;
+    }
+
     /**
      * 构造要插入的数据，每个网格一天一条数据，初始赋值0
      *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java
index e31ea6fbaf..40d9738a7d 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java
@@ -40,6 +40,7 @@ import com.epmet.dto.screen.form.ScreenCentralZoneDataFormDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectMainDailyEntity;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectOrgPeriodDailyEntity;
 import com.epmet.entity.evaluationindex.extract.GovernGridTotalCommonDTO;
+import com.epmet.entity.evaluationindex.extract.GovernProjectInfoDTO;
 import com.epmet.entity.evaluationindex.screen.ScreenDifficultyDataEntity;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectMainDailyService;
@@ -678,5 +679,27 @@ public class FactOriginProjectMainDailyServiceImpl extends BaseServiceImpl<FactO
         return list.stream().collect(Collectors.toMap(OrgStatisticsResultDTO::getAgencyId, Function.identity()));
     }
 
+    /**
+     * 当前网格内已结案的项目
+     *
+     * @author zhaoqifeng
+     * @date 2021/5/26 15:09
+     * @param customerId
+     * @param gridId
+     * @param projectStatus 状态:待处理 pending，结案closed
+     * @param origin 项目来源 来源：议题issue 组织agency
+     * @param isResolved unresolved,resolved
+     * @return com.epmet.entity.evaluationindex.extract.GovernProjectInfoDTO
+     */
+    @Override
+    public List<GovernProjectInfoDTO> getGridClosedProjectList(String customerId,
+                                                               String gridId,
+                                                               String projectStatus,
+                                                               String origin,
+                                                               String isResolved) {
+        List<GovernProjectInfoDTO> resultList=baseDao.getGridClosedProjectList(customerId,gridId,projectStatus,origin,isResolved);
+        return resultList;
+    }
+
 
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java
index fd611edf23..176167685c 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java
@@ -23,4 +23,20 @@ public interface CustomerAgencyService {
 
 
     List<CustomerAgencyEntity> queryAgencyListByCustomerId(String customerId);
+
+    /**
+     * 根据组织id查询基本信息
+     *
+     * @param agencyId
+     * @return com.epmet.entity.evaluationindex.screen.ScreenCustomerAgencyEntity
+     */
+    CustomerAgencyEntity getAgencyById(String agencyId);
+
+    /**
+     * 查询部门所属组织信息
+     *
+     * @param deptId
+     * @return com.epmet.entity.evaluationindex.screen.ScreenCustomerAgencyEntity
+     */
+    CustomerAgencyEntity getAgencyByDeptId(String deptId);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java
index 5c6b5175b0..b61066f7a7 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java
@@ -55,4 +55,26 @@ public class CustomerAgencyServiceImpl implements CustomerAgencyService {
     public List<CustomerAgencyEntity> queryAgencyListByCustomerId(String customerId) {
         return customerAgencyDao.queryAgencyListByCustomerId(customerId);
     }
+
+    /**
+     * 根据组织id查询基本信息
+     *
+     * @param agencyId
+     * @return com.epmet.entity.evaluationindex.screen.ScreenCustomerAgencyEntity
+     */
+    @Override
+    public CustomerAgencyEntity getAgencyById(String agencyId) {
+        return customerAgencyDao.selectById(agencyId);
+    }
+
+    /**
+     * 查询部门所属组织信息
+     *
+     * @param deptId
+     * @return com.epmet.entity.evaluationindex.screen.ScreenCustomerAgencyEntity
+     */
+    @Override
+    public CustomerAgencyEntity getAgencyByDeptId(String deptId) {
+        return customerAgencyDao.selectByDeptId(deptId);
+    }
 }
diff --git 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
index 411d959a57..c1b12a7da5 100644
--- 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
@@ -664,4 +664,27 @@
         GROUP BY
             GRID_ID
     </select>
+
+    <!--     根据项目id， 查询处理明细-->
+    <select id="selectListByProjectId" parameterType="java.lang.String" resultType="com.epmet.dto.extract.FactOriginProjectLogDailyDTO">
+        SELECT
+            m.*
+        FROM
+            fact_origin_project_log_daily m
+        WHERE
+            m.DEL_FLAG = '0'
+            AND m.PROJECT_ID = #{projectId}
+    </select>
+
+    <!-- 查询某一个项目的结案操作明细 -->
+    <select id="selectClosedLog" parameterType="java.lang.String" resultType="com.epmet.dto.extract.FactOriginProjectLogDailyDTO">
+        SELECT
+            m.*
+        FROM
+            fact_origin_project_log_daily m
+        WHERE
+            m.DEL_FLAG = '0'
+            and m.ACTION_CODE='close'
+            AND m.PROJECT_ID = #{projectId}
+    </select>
 </mapper>
\ No newline at end of file
diff --git 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
index f17dc573ef..633160b178 100644
--- 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
@@ -963,4 +963,63 @@
         </if>
         GROUP BY AGENCY_ID
     </select>
+
+
+
+    <resultMap type="com.epmet.entity.evaluationindex.extract.GovernProjectInfoDTO" id="GetGridClosedProjectListMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="issueCreatorId" column="ISSUE_CREATOR_ID"/>
+        <result property="issueId" column="ISSUE_ID"/>
+        <result property="topicId" column="TOPIC_ID"/>
+        <result property="gridId" column="GRID_ID"/>
+        <result property="pid" column="PID"/>
+        <result property="agencyId" column="AGENCY_ID"/>
+        <result property="projectStatus" column="PROJECT_STATUS"/>
+        <result property="topicCreatorId" column="TOPIC_CREATOR_ID"/>
+        <result property="isParty" column="IS_PARTY"/>
+        <result property="isOverdue" column="IS_OVERDUE"/>
+        <result property="isSatisfied" column="IS_SATISFIED"/>
+        <result property="finishOrgIds" column="FINISH_ORG_IDS"/>
+        <association property="closeLogDTO"
+                     select="com.epmet.dao.evaluationindex.extract.FactOriginProjectLogDailyDao.selectClosedLog"
+                     column="ID">
+        </association>
+        <collection property="projectLogDTOList" column="ID" ofType="com.epmet.dto.extract.FactOriginProjectLogDailyDTO"
+                    select="com.epmet.dao.evaluationindex.extract.FactOriginProjectLogDailyDao.selectListByProjectId">
+            <result property="orgType" column="ORG_TYPE"/>
+            <result property="orgId" column="ORG_ID"/>
+            <result property="agencyId" column="AGENCY_ID"/>
+            <result property="pid" column="PID"/>
+            <result property="pids" column="PIDS"/>
+            <result property="projectId" column="PROJECT_ID"/>
+            <result property="operationUserId" column="OPERATION_USER_ID"/>
+            <result property="actionCode" column="ACTION_CODE"/>
+            <result property="isActive" column="IS_ACTIVE"/>
+        </collection>
+    </resultMap>
+
+    <select id="getGridClosedProjectList" parameterType="map" resultMap="GetGridClosedProjectListMap">
+        SELECT
+            *
+        FROM
+            fact_origin_project_main_daily m
+        WHERE
+            m.DEL_FLAG = '0'
+            <if test='null != customerId and "" != customerId'>
+                AND m.CUSTOMER_ID = #{customerId}
+            </if>
+            <if test='null != gridId and "" != gridId'>
+                AND m.GRID_ID = #{gridId}
+            </if>
+            <if test='null != origin and "" != origin'>
+                AND m.ORIGIN = #{origin}
+            </if>
+            <if test='null != projectStatus and "" != projectStatus'>
+                AND m.PROJECT_STATUS = #{projectStatus}
+            </if>
+            <if test='null != isResolved and "" != isResolved'>
+                AND m.IS_RESOLVED=#{isResolved}
+            </if>
+    </select>
 </mapper>
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml
index a7b6c09ae2..771a60ba32 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml
@@ -132,4 +132,22 @@
         where ca.del_flag='0'
         and ca.CUSTOMER_ID=#{customerId}
     </select>
+
+    <select id="selectByDeptId" parameterType="java.lang.String" resultType="com.epmet.entity.org.CustomerAgencyEntity">
+         SELECT
+            *
+        FROM
+            customer_agency ca
+        WHERE
+            ca.DEL_FLAG = '0'
+            AND ca.id =(
+            SELECT
+                cd.AGENCY_ID
+            FROM
+                customer_department cd
+            WHERE
+                cd.id = #{deptId}
+            AND cd.DEL_FLAG = '0'
+            )
+    </select>
 </mapper>
\ No newline at end of file

From 566c160ad4a2fe6d03dc10cc9dae86d93fbcfcd4 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Thu, 27 May 2021 17:38:23 +0800
Subject: [PATCH 100/128] =?UTF-8?q?=E5=9F=BA=E5=B1=82=E6=B2=BB=E7=90=86-?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=9A=84=E6=B2=BB=E7=90=86=E6=8C=87=E6=95=B0?=
 =?UTF-8?q?=EF=BC=8C=E6=8C=89=E5=A4=A9=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FactAgencyGovernDailyServiceImpl.java     | 61 ++++++++++++++++++-
 1 file changed, 60 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java
index 5603dfde68..ba1ee9853d 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java
@@ -18,11 +18,25 @@
 package com.epmet.service.evaluationindex.extract.todata.impl;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.dao.evaluationindex.extract.FactAgencyGovernDailyDao;
+import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
+import com.epmet.dto.stats.DimAgencyDTO;
 import com.epmet.entity.evaluationindex.extract.FactAgencyGovernDailyEntity;
 import com.epmet.service.evaluationindex.extract.todata.FactAgencyGovernDailyService;
+import com.epmet.service.evaluationindex.extract.todata.FactOriginIssueMainDailyService;
+import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectMainDailyService;
+import com.epmet.service.evaluationindex.extract.todata.FactOriginTopicMainDailyService;
+import com.epmet.service.stats.DimAgencyService;
+import com.epmet.util.DimIdGenerator;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 /**
  * 组织的治理指数，按天统计
  *
@@ -32,6 +46,14 @@ import org.springframework.stereotype.Service;
 @Service
 public class FactAgencyGovernDailyServiceImpl extends BaseServiceImpl<FactAgencyGovernDailyDao, FactAgencyGovernDailyEntity> implements FactAgencyGovernDailyService {
 
+	@Resource
+	private DimAgencyService dimAgencyService;
+	@Resource
+	private FactOriginTopicMainDailyService factOriginTopicMainDailyService;
+	@Resource
+	private FactOriginIssueMainDailyService factOriginIssueMainDailyService;
+	@Resource
+	private FactOriginProjectMainDailyService factOriginProjectMainDailyService;
 
 	/**
 	 * 治理指数-组织相关
@@ -44,8 +66,14 @@ public class FactAgencyGovernDailyServiceImpl extends BaseServiceImpl<FactAgency
 	 */
 	@Override
 	public void extractFactAgencyGovernDaily(String customerId, String dateId) {
+		List<DimAgencyDTO> agencyList =  dimAgencyService.getAgencyInfoByCustomerId(customerId);
+		List<FactAgencyGovernDailyEntity> agencyGovernDailyList = agencyList.stream().map(agency -> {
+			FactAgencyGovernDailyEntity entity = initEntity(agency, dateId);
+			return entity;
+		}).collect(Collectors.toList());
 		// 问题解决总数：当前组织下，话题关闭（已解决+无需解决）总数、议题关闭（已解决+无需解决）总数和项目结案（议题转为项目的结案数+项目立项结案数）总数之和
-
+		Map<String, OrgStatisticsResultDTO> topicTotal = factOriginTopicMainDailyService.getAgencyClosedTopicCount(customerId, dateId, null,
+				null);
 		// 党群自治占比：当前组织下，所有小组内关闭（已解决+无需解决）的话题数与问题解决总数之比（未出小组：未转议题的）
 		// 网格自治占比：当前组织下，所有网格内结案项目数与问题解决总数之比（未出网格）
 		// 参考：fact_index_govrn_ablity_grid_monthly的SELF_SOLVE_PROJECT_COUNT计算
@@ -61,4 +89,35 @@ public class FactAgencyGovernDailyServiceImpl extends BaseServiceImpl<FactAgency
 		// A街道→A社区→B社区（结案）——A街道解决（自上而下吹，谁立项谁解决）
 		// 注：A社区→A街道→（退回）A社区→B社区（结案），A街道不算处理项目，仍是平级协助解决，看最后谁结案
 	}
+
+	private FactAgencyGovernDailyEntity initEntity(DimAgencyDTO agency, String dateId) {
+		FactAgencyGovernDailyEntity entity = new FactAgencyGovernDailyEntity();
+		entity.setCustomerId(agency.getCustomerId());
+		entity.setAgencyId(agency.getId());
+		entity.setLevel(agency.getLevel());
+		entity.setPid(agency.getPid());
+		entity.setPids(agency.getPids());
+		entity.setDateId(dateId);
+		entity.setProblemResolvedCount(NumConstant.ZERO);
+		entity.setGroupSelfGovernRatio(new BigDecimal(NumConstant.ZERO));
+		entity.setGridSelfGovernRatio(new BigDecimal(NumConstant.ZERO));
+		entity.setCommunityClosedRatio(new BigDecimal(NumConstant.ZERO));
+		entity.setStreetClosedRatio(new BigDecimal(NumConstant.ZERO));
+		entity.setDistrictDeptClosedRatio(new BigDecimal(NumConstant.ZERO));
+		entity.setTopicResolvedCount(NumConstant.ZERO);
+		entity.setTopicUnResolvedCount(NumConstant.ZERO);
+		entity.setIssueResolvedCount(NumConstant.ZERO);
+		entity.setIssueUnResolvedCount(NumConstant.ZERO);
+		entity.setIssueProjectResolvedCount(NumConstant.ZERO);
+		entity.setIssueProjectUnResolvedCount(NumConstant.ZERO);
+		entity.setApprovalProjectResolvedCount(NumConstant.ZERO);
+		entity.setApprovalProjectUnResolvedCount(NumConstant.ZERO);
+		entity.setInGroupTopicResolvedCount(NumConstant.ZERO);
+		entity.setInGroupTopicUnResolvedCount(NumConstant.ZERO);
+		entity.setGridSelfGovernProjectTotal(NumConstant.ZERO);
+		entity.setCommunityClosedCount(NumConstant.ZERO);
+		entity.setStreetClosedCount(NumConstant.ZERO);
+		entity.setDistrictDeptClosedCount(NumConstant.ZERO);
+		return entity;
+	}
 }
\ No newline at end of file

From 8fb5a3f10cdcb9f1c839020143e04ea7f09a15ac Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 28 May 2021 09:39:04 +0800
Subject: [PATCH 101/128] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../db/migration/V0.0.17__inxdex_explain.sql  | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git 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
index f7306c991d..15cca09546 100644
--- 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
@@ -18,6 +18,42 @@ CREATE TABLE `index_explain` (
                                  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';

From 7a48624a2f3d19d632be740add5e186577ffc7a5 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 28 May 2021 10:35:21 +0800
Subject: [PATCH 102/128] =?UTF-8?q?=E6=95=B0=E6=8D=AE3.0=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=BF=AE=E6=94=B9=E6=9D=83=E9=87=8D=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../V0.0.18__modify_index_weight_for_3.0.sql  |  22 ++++++++++++++++++
 ...系算法需求-备注3.0版新权重.xlsx | Bin 0 -> 64848 bytes
 2 files changed, 22 insertions(+)
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.18__modify_index_weight_for_3.0.sql
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/test/java/resources/评价指标体系算法需求-备注3.0版新权重.xlsx

diff --git 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
new file mode 100644
index 0000000000..1bbb8b6e4c
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.18__modify_index_weight_for_3.0.sql
@@ -0,0 +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';
diff --git a/epmet-module/data-statistical/data-statistical-server/src/test/java/resources/评价指标体系算法需求-备注3.0版新权重.xlsx b/epmet-module/data-statistical/data-statistical-server/src/test/java/resources/评价指标体系算法需求-备注3.0版新权重.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..cb442ccfe9cb70a87b2de2a9b0dab96057ecca73
GIT binary patch
literal 64848
zcmafZ1ymH=7A{>%2#6>x!;n%E0wRqJIgE6-fP}P!l!zdLbPOU$4lOASN~fgKsD#oA
zBGT{7p#J{%-uIsC%)-SS_Sy06Z|@Uu6<j<LEcCxe>Yt?1KY#xt2LG{gwuHMn-*w}I
zgK5;@7ett8*1pQ4TG&`v{y11z6n{@Mzk8SWo})urY@;%+4E00b*Is(L8c?arls2M7
zTp|`Nwo(JLY6PCQ6H``W^(K^fc-E>0Wh*Zna{AGU?$Zuz$WDhP%+$J(J=$z}c?=0}
zJo_ZUU@v>d;T(DV;0rC*bb2zcOLT1&UD{oi#Vzc&US=~DmAniZ;-rl?lhl1tq|p&(
z_Y}e15q)>cz1mehTkXwInvJ{%H4NL(;29(%+S8!egM<q2yzIErg@@VpYt}#KhT##x
zZy8DR@^Q(=ZIB&^yYAc%Bsrf{i_1FuUS_tbbSgLg(EbxUse^#0)r0`2>RZuuk8O!I
zi6xrH2I*GQN+pA17s^&RJf0Z{$sD_$eDmM-*zH1X7rsKg%ksGLKG^BvT?;WiYAyN!
zJt)2Mlh+$Jah<-Be{f=`u|nPDezv#h;4g8|;NSl?ed#v2#~{9ILU$?e)~nA_xP+Ei
z4)2TErcDFCf1byi`*#GOel<brAOiLv0_XmYfTgpmH97?MV@*|B`KjCI@SEkjeN!uE
ztU{|>rPjKGKFEK&0`W3_2~&xkSf5I*He84MsSeaOKXZdsUq^BM#Idw4cB8(Dho9kn
zC7ajnd!7EnGt_#Wm1f$-EH`hywAD8<wQhLPAoA5=h2Tk?8Lq}~;uiF##OF(o%N8Zz
zeTuU$8f%IpEe4p>!s$As^og&rED&(tRpsxzOL#UlCQM!F^-Ze^QEhSxdO3WO%8F}I
z7Kig5X7NXE8M;t)wwbbTY3eR{4zCGa+?k5#BORv{9Va`#?pYo-`THyvh9bP`KLtKk
zz1u^|ubcYjXXJ)-QqaumS&a~<@beW;>${B!%o|VJ)8Gh|RaMcHk8=d%8@^}VDS|W<
zA2HruymJ5EbP+rzIwS-_I-jccY<TYp<<?MRfWRCZ1Metj`$^k1$Tq*eL)VowzAp|U
zEYGnO(hs)0sQ<(H8yd9Nj)BwtK>(=!<$Mn}cV|aT21NHdJ>aLn+DzCdPu%S22%({%
zIIqMjS&0~#ju8lFJB)U;%_=xC$@=cH=^|V>w3ayKB^LD1kiD|NjQ$)^jfD@ziq`A*
zt&G+b*X9aeq*s1A-*A`k)y}%wo<r5gcV{-F;T*cJD|T~R#>=iIHAdj*1U;GTnSC_$
z{3YYf*Z1-!cxtzjDP12;tTiNd9j<&B)8#pC?vbge8eky5K;^o+W$2Hc_1yyX;bu~`
zaZ)VxknwD0avNz++#zGk6N<?}&vdD^8!Y^*f)Ay41fL!M+@h{*?en`DVRy}yZZv`q
zy1mp;%n9RE&Qz1n5}L4LJC<WR=0vG9<Qg;S24JJH`oBp97r5)5!++3;sP$)rDexuR
zFFFAeES()4t)1N61klbbhO4QxN>enRIezpqQ?%ahNcv7}u&l!O4>E7dp;OT48B&Qm
z#U@oG1}}Ul$}Y%!%_VHqD?I6_^x5L8u^SHdGS^?~zdoDlt&=|>o2AHx7d*w0el<p>
zmb)QP*Riru`?-lU0mmCjN)mNPcWLZ|XWs;R&p**DX&J<!cUa&)e_nv#eclskb@}*J
zn1YgGd}#S&me}}vA8r-sg`LS2dwP-hnk!Fvo*#?3-n9c6T7nS$YYf*~Wv>cOMPiK-
z(Z=dHR3fAmdrY?-tnBp_R*{gMsnI!JPo8T+_K?b<%fr%%__~}M#$G;8chl1z{ap6D
z?cptXvHnJk^i^4Z8<FLYL9v&3^(tSAw1msqY-td{PzqsTg;ekJu@i(JKg$nqsHGNl
zn(s~ZKM;0m@ME~&c6)tuWa+JM#qRX_EA?S@zcE$YnOA44qvj*(#oSz(`6n;t?S0@u
z-0w=i`-te7>Hj@iWT(;ca(2DrW@~Nj{-1R~ZmL2}^bQu*;4lsr?SIY1{0Sz2IgQ2@
zbng?a5Bym-0^na8*%&|giSu~TwqVOVbNleP#P{Gv1*FF&9#R0SGuki>xNU=TXI=7r
zS9Y)Q3y$u#4?SsDJ7-gBu^|2@b0^zL>CJn<RW|~D{#@NHEor)cw352peEjuWCwcSn
z-huAP=1Ikg^KNO=-r?d*sZ`U!-hAn1bHL8-Zo28wuGHb&$@|TdAKylr1CDzSc1@c!
zADT)9oUHJfHXZ(`-)uTKY&D%d+1l8C#T4LsQfRWbJfCMedw=NU@cZY@8z(=OkLsB^
zo4@zIohvqJZaUgX@?!G8FRcA@CNChnqch!q|7+{POefRve(!;4v#P?4#*@973y~+=
zrZ*0M>><{r0uCRo9Q|CLnX4>K`X(edtyU`EShy<K1it^eJpcKr)cw65kDfOBiINs?
zEVg=)&-fp2$#LSDA8l=nG@tCeI>~+0Z1?$iz4a|q)8YN;8Qp-NN3<WC{q{G=n@_$y
zu%L~a5lx>x`F>O=WpcEkv6?!i>tk(o{Q1#tz`^w4u4t>~!K<fCC-?7tTz@*(>{D#t
z+<35aBpPt?ey$S#;@6c_K47>1$w<=rL3)5r`&gm#?9tc7)_{hS3+8jp`>&pwHu)V|
z-@E_)Q^fI?JPoFk-2>B3$EK6L#_^}kWK+#x3Av+VK6U&&QiqZaXRVch$a$udN5@-U
z0{cIj`FzWn()N=y<_>=z=XnJj?e+ece|s|bh^hH-@j#b+uBpj5e|qoX$+vILk9L`k
z50lKBb>>XS<qkj2zvaq0IqBzPBKT-}f4jH-g#P5{Resz0tHP=JgVg%M)v=!^k7f=J
z-cANptsH-S|90|VyQ5@aCs(=0t|&Voo!gioE+Am?xUKYU!}0y4Qm3Xy!&2TUW68rT
z!=@X$!_9mNl@+C>u6)Ns%9E`wOy4(Ea^9azCp*1OK>v5u+1c6jX3^w&pEc+EdN;PC
z10y?+qxJiSD@?`N2@cZ|;1|m;p27qVEiH#%T;yJ!OA;u4yL4oUUsBl@bw2c@CVo(+
zUQ$IAwfmH8iHrVSz_UAGZ8vjMV;;uidBp1RRN>CPIg+%{mtiR2E)!p<Y0js@07PG5
z#C&UjQAgGOkEM?{mU^XlM#tK>3a57NC$>)P&r}*cDID6EN%8_H$a@-apvX?6AX&uK
zYOt-pnyMb4+kDHsn5VTcfL;};b5<sOr}O07qxa1x8&Z|YM|TxP0*!XMXri^Bu3_o#
zcCj+Qmn<h-$h|p><vPVmD81pcaD{nS(iLyv#m(nfwdMEH!^`|k!^#3R+VtK8T!yk9
ztM`P6B6a2`Y+njD)RH-W-&*K5dqV0p()@FOC*gQGZh~M-?VgwQP1l=G7<z76tm$op
zmp#}ErIkPun(257%@JH($UJj%y^aB8$=qKumHRwUUq9q+i;@0yzBaw<>}EP*OX?)u
z@C$MA7I&?UR6Ei(pZ?7Cb>Yv1RFG!FI&zphe(cB4POVA`@Z$4xry>X~j2@dINF<Uw
zrCs0OzXkM6yKVNE8Y62ddoab$E@!Zp^I^`bWs_&w{8n^I&|5kr7Dgl%4yC(oHPkId
zuA~fa3w}wN+OcG=UFA+C*Fb+o%^6m9Prao`aLFlWaIs@pS->c=P1$_evF-vp=h+E@
z*lsYRdnk%<<sXF#-IzOah@d$yjim@;>zm3yUOzXFz`B*q+~K*3*Eg;Ff_saNGxW@l
z=r`Br-1*cIwB@9bI8Fq`Jc7c~w~@Ug>J6RQp%O!w3uiEl)8YNopoNn9fWNirgT0vQ
z%o*vt>va(^9y9s33`-Bj@Uq5PDzIQhd0{iI0Ivc+=R?vxTBVKs$)4-jw|Iquz*3gq
zo&}~z+(&JfLD~mbNI4y@rf#&uNaU)6tOONEEO<WNv~V!=1uimsCn8MV5?}um_?K=#
zAbNVo!({#G?RIwHUyO6mg5qS=iY~VsPsflMcinx1GYb?_M;rBkQ=MX7ox)P0k<iBR
zLV$Bv_nn{(i#uQXuRyLgJR2Ifs8}{lD;Kay?UTJm<SkC*eH|~skD_PWf+_kE6C1O~
zm&`LXkum0<?nT&K72>_xB5?V3bvKU!^}|ajd3ks^QO2cnGS#)Xq<)U6zNv%MgLikG
zV(H_$(+odjrzFw@`ynM+t>*n@x;pM(Muq1m$wx-Z#Fl6yS9=F-oggn4y)F63k0QA(
ztGlgao3<rF96mFhD^HuF8eKcQCq2s?f5$RCx(<i!h36%O_hyxC>fEU>8fPKb6s`J1
zQgXsF;kXH5L|o^vwOB8Atw{~GtO`9=7Kk*8Wu@uCb$za=iGsB(O<vXJ`fMA*lS?I|
zrrHQup`?Z(?Wom41aKr)9YbHKO`ij+_iY}Mz4)Z$P@Hci(VVB;KaiexPOEMpV*Lio
zj36Hywb!VntoH!ZtICVB=eI(hOh8B0l9tQlP!MXvJ6s7NSOvt`?rGds>CqcZk3tkT
zKg>KTtZAlaEti}c@3j}YQ@lJiG-ZWksF0NiE^+MkfqW^Dr)C}KH%=XQMh#anOtoIT
z6lK!j;p&JRkUB^a?HTYhPvb+f>aDJ*6DpZSlR)OD%MZave$Z(CgYs@%L~Ps95=Z#@
zgw4-Y<jo!zzZ5oNC~E<`L!jR#liMA&oXf=8T(J~d5EhgYC0yBJWI<`ZsoF*AoEBSn
zu{93k$QkW|Sm_*nn0r7i2W&bZie~)z@~s=y<L|sH)u3KQ%9IZ&w;BW5ltr>7Wjxqk
z^ryfGi>!1nIa49ipq*C8w5x3CL|e(viMNtXhzeqP*ay>{+)IricD(wZbo`#QP)-`{
z@I5^fuF$9krP@lHJGUTlq7=P(_&j4p>4`+Ads<SJu`Krr|CcvkTyZ5EW{u*l5|)we
zCXB3tQq|oHca`PwFo8X%b@}oaXz5BvngoTrV{C&OM_vrfRTWBQOV(9W#U6Y;_cr)k
z0H4#~+Kck2W@)>#h7vV+)h?Ur1jwiqr<MHzSFqn_CSst>FK|(~$K?&(c;OadzES5n
zwnKYJUAJud{Bn6O(os<5T)QV_0UB30C`G)%NaH9*+YcU>6mp&^Lc3!~gb5d}M`psI
zAE1)A*nUL@PIZefd}BQ+S95y*=}4EwbWvRr`^_~<i`2fuflZ>Vv;at#m%j$QV*9fl
z_56Uq%mT>-dv@x2EZkS*aq2gL%pyT2`-&A4puvt$sw!FM(fBzn*2l%d32R|%WwDV5
zq%xwOmn12)@-&}t=EaaMD?LP>Vthg@HTtbqx1|qDmzwyw(d1E;Ou7XHSSFKzvW1va
z2k+g6bRn2UlJJz((ysr_=*=TmnWkOeU}U4z+pO_o`jJS67+meTva8)wAp@}-A=gVI
z4JDv)hV|vi&ne1TK>o`4$aJ+yvczxKCoN3dUOFKYLh1}vUt}wjao$h54GE`Ilh?6L
zdPrFi3ul`;kksMgCe|v5rLelW;ONB5R(5MxAZ5CC>!V_@-|PE|U7_EDqubqOZPh7v
z=t2{$bYk<FUX;!}i5<TuQn;~r5f<DX=C|pk&+&qbSi8J&&Jti5BaOJBzdr|3U1cd)
z>vmk*g9(0!gAyN+zAAgj5=67v{F^(~QJ5y>)Tqr^<8@XT|HYWiBi=J?T5K=SIMyj|
z{SlhMMeI=W+zCe+wwCReU7YZ?_S}MiB&!xAoW(lPU+0E-ju>npGIt^YVj!3W(O>lY
zIEfL}pWM4l0RC9IY4_k;Z@|1Y!l}e0PCAE+SjJO+c4-MgIaO;ZC<Zy1UZj%Irldu9
z<DTc9FcN2pfAp#zs-N!b=oWjn^mb{#)b*NWQyW+;#z?&LFrwdS8XT<>3o^A&AVsw$
z%kOfRrH^8l$S(M8@ZdAZXOpQSh;c=~)Q?(yFTS@*l&XpgzRkU|#M&@a?D`QS_ulfU
zY0sR>5y}>F;?OvW&*{CVVo*vr^FM0c-zdAqqPnZx)ykuw<IzEz6S)E2@!5WBS5lsI
z0bIZnAOs^?<*enM$_kVycgqAaJx(`zjT&bvah1&Hl`}JpaosNUu^M>Zs&B!E4^JD$
z9Axu)T|@M<r{$~Ig;dkkFTIgb<Bc;wu4@|-Z^}xLWp0l_rfK^r-rm3_aa|ef0l|yw
zmG@=sT@wzPp)bA!MG~h(rh4pd#YgAVsM&D7;E0E-5oI7Lq=i`mowgfGL3WlFyP@p5
z$TYIMR1&L<-vPkoh4FMa3fAswXO64O3SSPim&Y0l!>SWLAQ$>N9IeK2;gVrlRQJL_
zLMV?6<H%L;IRif7850i`kFo_L4PcpbLIbSzMRP^<N$fDyY)3&fPNJCS4sHhfZSDfQ
zET+YB4Gpo#wDOfH6A-aR<+-6e=L>FUam333&dZPO{4N{a>3-Q(hjJ&5hArHGgd^No
z*74m;ZyW?VERwR<2>8wy&38x7Gq_-AzPqFHA&5&GmWfbC=){`2-tl0=Mk(V&13~jY
zlGXA0l{1_AG9g2+Ku*p4|MbEk|D{)XEMA;pAvdu!u#&7>r{$CeD`HXJ6&x@jFGbiI
zj!VUc$#aN63}8U{rd^5P0!Ud^Zmgq|MnVAuzWgq+1sBu-`JDK+Q1@(E54LdG{(*_;
zQw!k<cp{?g-8;HIj;*Wx4-5Na)K0b_;o+5PHvXGlczd%_lmLS4C?(m!;wwRf!H*%t
zIgmt<>Z%z<5WGDjA1Ht@OP8hiIU(-weZf{`!QK4g)h|<LFAB}=C)fQr0^Xt-5;+Cm
zA5wC1bZVCATDw7^#kP!tz-g8G;fTkjbpsX{T?!#enFh&@!yY0Sv_bRJ;7StUIJT?G
z7WK^+k9~NBvLMIA-GI7d<zIvpK(Mr7SZEINWU~FB9gB+R4rhpFJ<pX#7wpF?Nwpx*
zNU<Q0Muaqmq29ln#xeEk7h!q}fE(K;KM9TNoI?|(^Lh*bg`|vjESe>at7AK?x1@pN
zG?#h8WnWHZ199mPW^|&WiXZ~n(_&ATLlTyBD1~Ped5uc51Vl?9)d#8Dz3aQk!v}4k
z{0mHp*Ri6M1xa%cM34X+01+98gb?Ob9A`H-Iq6nW&+kvuoiYZi7$)<0;sv}DPZP~s
zl|6W=>AidLyLo^SBt2VMeOv$6_ebuQ=N#j@8+SR&S-W<Rf9p!?6}3D-;Gdxk!m0c@
zK|VHqM2)|;%BKz+XxhOtQDX`UH-Ox8r_s-b@sRz%EJ!t$LrGpzeL`DDgBp}|3&0oM
zCSVFrJ|Y1Rs7b`d4U;~@4dWNvsEftY(xnUpRaZGf87IL;m$K?B4WCg~yQs3oorR@3
zU++37pnMQm)SoT_5Q-KX_7}8T{bLCbt~6cBhi0qmF(e7(B^ds-B3#60iC7L9oE8q>
z_lt;?XSy5TCQ?<4MsHad=m@^;{?W=o$+tj@ElAl*<m)MVD<JN5#L!M-4N)w>P1hiX
zb*4lG+{6w}KisoAramo0FS%tw@+WIGh8wTLEb_9~JusCa3eY)dlCXYh)*_&f<4o0)
z(3blHjbXpLk)YqY$TBs3MwVuT_{DT>iH7TTLe%P4ACr{*_okwslj`qK_JT@{W@1*5
z2GJTZk}?XEAQ6c6gkiD|AbwtPs!(_daNc_ehA}aLEP*)<FubpQ8+W!e4{{v22C}L$
zHhCPdWhNKQft>}=P?6OwD-Cr1dELg9g6Fu_!EBG+<5V|{#AX0$PtglJfVZSBDr!&5
zo8}byo(|@~=s3XV#T{-9S}sfs|DmAnN<-t$9A(*Pwyz?huU^JVzxWfxBzgo@O@9uR
zOa*s%of~lcu2WY_b9__nvdMEDO1c4&6q`Oz^+^n$feH~CpIR7;<qp&uTv`F-IKT}u
zLG~usLORs{a@XhKtFj{8rWEA@X%xtMsOHtXnz8x%DDwKq*m2`eOHiNi&tW>HN3%|;
zs*J*O2Mp-UGPu?K!yiLO`O30zeHhLqO4?Fbj~l6-(jp9j2hdWTNPJI~PpkX$FyQb6
z`TI>E?a8kxTX==1rfw|SvB4NRB{D!ku+)y_h({BN4i{)`L8(Rq#Id9VqRE*HGX`x%
zTH$-hDMFg@p@4o<QyZb0^Nv7A0WW>n8c*2}`DL;so*ChPe0Z7%kAJg?mQHLS4Vu8G
z(F9(Cmc|!v4Kk#^1Oft~JS<Fol&X^Yjc|9L{nkBPGXM@CVI2ZO5ti^6Fz&z&{I8*0
zGY9o8MCV}^ZXi8-^VQ;5&u{TDUO#O_N?;aBDL`b#l34!zbot0vz*+&(=T2*34o-DR
zog<L}#CKCwui6;KdZH`U9W^$(VGNNBH(r?{EO0l4ge!A~b9!gXF2*dL&cFen1iK$c
zCmqTv#tUrW?-n@1`(ygmb^)EY*Qn)AlwF2VE2HZXK(J#8Na~ICf<p|`aYDY8USrH3
zoFrQZZ4HQ4hgOqD6xtL!_1LLWccVw|Q*Quan9`uu<tW%6RSWs2tNAip(nC%(L47av
zS7&49xV;{pahX^)cj}BRFR=_LR^O^CW2Y4@ow_pi7(aZU{UZreltKACo11Ut3$|q1
zpeb?w#E3%F*2BK=gd?#OD94cjZOfczge7jv{i-%-j4bUp)kABw&p3m?wtF?ze{+^~
z3T=LVrvC}#bswf7{3kPrpX4j!09<Fpx4j!?CF{;$|95#vkSA?bfYpU&22i=WO`++d
z@P|ms^<#7`1v@Qbz?D=W!Y-eaHykH!z;n1@TFNkoW2XG*=Cq&kpuVf3Yy7Wf0q`VS
zih*BJLYq2U>eOkgi~9-F#{H?L$~cw<Xi6gHU=x^%x(0dh{LeNE!`jN39aEqPB-06g
z1!g&+I~b7oaozKqfQ0^|3e1)`{c2$-xj}h9hPF`st0B^djoveix3cdu)}f>_Lz@SB
zW^ZXs^NpsVU)_+Isy1a{0R%e-;yLfy#&Yrdf7&HHO8{GHdhJCQS?j`9ChY3wU+dWG
zn`8^JJOG{LO}n50oZTcYh*hm0yRQYRMs&c=nxm5wk?sCqOj`WYZY!K7u$eo&v7GYH
zKG*PAXQsA20aE7$3RE<R;D(ndy1V+Tte`iiyCRNr%vNd{tru5R!2-Ba8gZ-N?mQO(
z)w%9fvE;e$W}DR4G4&oDr`sRMy*Fp)a0<VPC<)#O|FG5a#gAsx@%y6UO`cT%J@@Le
z5KwJw3s}q2Lcn&h4BaciJ@7<!qj$57WxYOo&QBXiG(6v4co%h)8=!x#xYz69tL}x_
zq%b0%m%^(t%)6EvgAZonnq<04M97FHE`Jkw@%n{k?3UxQl_2&>PR;3_bvpaBS##Tr
zo6D!tQSTCq3{4t2=N#j>4>pa%9m^Herw1az1*`(exv?6oMOySh%8^P(LWn{XWYkal
zXUQG5nMGG&VXFhs5vv}fQ!k}lBG_IY%twH88Jo>cm*&^~`Z>6=)|c9sTrcV40G?(N
z3%J~+<^x5kXVDJ(sj?Tv<8HEP7NV4fRkKRs7EFVtrakyHqLRx&yTWqeW+q&A>|CH9
z>BPuV0V{l&MWgDz>`GjG$fVuqj^^PRv();HMb67p2k3r$qcbYwk|z2DWoxr6mZ4gd
zXd?edAUs7;AorPKVhbqtrbg&(%|B}kiAIjHbH)mdpzdV-+-(-|0v$AK;wMmZx@hL3
zz)=AZrbUm9QfCbm+W(p9C-rocjpJO^Hfr_qJ#HVj_l?)BtscyRqZs{e4iYx4t2iiL
zVXUzySi|J?Hx=h$tJ16i{P?rbc&hHp*PwB}x;KuM;Au+yU&Ujvww|e1)=u<_uT%(8
z<=?6JnM8wG9a3AA&bJ!e4PyU$2Z{?eMAl_F%KcRA`{CKC{q5n@UMCNrv*9ynPhFg-
zYXS!*%{J6v`+E_4A$ZNs&Ev8rTY!5nwn{=cb&l(0eY~4oT8v_f(VxGog5?FW&yKi>
zo9EPC9j@&koRJr$;@s%G33G^b*r-do2|K){hIW0@m<X_l4I6!A07@=AXQ}@CjC|cm
zPbV_;eX6h0RjZL^VEyX8NXqp63syJb-C-HA=VXuRP|nHaFjwY+XR(xzQ?#0@V^nSK
zTAJTDw;&@)rDa1Y!#D~U^5UaL=x6oTX<gXn{Bysq7OAHV;OIl>n~vP+UMQmgO}h)9
zAqDQ*!Y>fV_akt}3Xt;oqiurM5G*J0<A6v;ugYl00Sv*}3xo>8o%$b*Y!yLWR&Ur_
zaJMft`FamSl71`?vw{Ah=@X@vFuI?748_w{i!P_?2~yOaRZ`^;E;|c0YF$Te78>9S
zvk%%-fh+bngGEq#NgjL3;&4r>RJPQEjYSw$J#rcvcMgyUQ30~;9a33=D!2fuG-3Ba
zI_odJvj1Bzaq0-9JfY=in@u-HsWzI&AXAb_C(r$*QrMQtTinP3d&(RH)l?&>#(7KN
zqztHRP4Gvhl@_291M)AG$bd=`OX%Luo)R1ao>v39Q7q~{C%mLR22sv|Cccg#*~@DO
z1fKDn7^oe+^gvuQM_+9;SAP^Tc`XYnq9U>j5D)d7uI?7HtOiGe1<>Eyvk#Ps%El97
zJJMAJP)#o3G8u;aXeqIia1a@XD_2oS(1TM2+6ZgX*=xqx-ikzy^Gr;8@o6B(Jw5<L
z2w<A4ICOIr)%Bb!2&%QxGmuYMpe-DZ$Pc%^3yQ(oAz&iZZLp+3_Fjg%mYojOP63T@
zxXC+II73|j{oSqXaAQKJIJ*uboj9;BAH!o#hxkrUC!}4O<G0QdrvS1vPmP>Gs-WX%
zap$5Im_@!KpPG8mwb1C}0$g9}G}`vV;p*YeT2mzQ=jV1nu2KJl(Pra0m$9}QDn0<V
zeQK%Dx3f`NT~bs#^3jAls_-#Ls1Va=I9I>j*4G5ywXZ%tAJV^1eFui>Ia{OKpww3q
z!2ni!kO@{TA@iPi2?}i?*eS5A2#(88?C5VnXtpxImd8HRe`eTzi{hw(1^1-rGuZA8
zx0T?&`n@-XqM4RqQc}C1koZ=$9%C2?8VW(x`$6g9p`{c!_<+Afo2j%dlZF}wAZ@<_
zKw5`E#3Kwy0U}18)D}TCIbIYHOW%O~sHv?(!Z}ZNQva1cUq(PL1%gAMEsWjuKzwKk
z#Ie~)Gw#c0OdPMfqvJRRXz;H%<`<!J2LSc)Z=hn-8qxUwt7XW6hL?!#P2kPycUoLX
z3N2xlo@Ohz3{7pdOf7qhdM|(n?3e5q`1NJj<G_v8u#jW&M|BEnndzeT78O?8gN@hi
zEE*HgZ8qi{0S#2dP)J4rv1Wf#R_@#CA=D{QG2z4c@gL!{&(xXDgbo$Z376@Ydw(%`
zE>t#Ot(JSS;{5MKba3-6z)O0mWp5p^7-WB{*aLAuHq_In-m-xUgO(eLg^41N_4Y4W
zQxE^8SS&+~q&5zK)ydlAZ&?@VK?1pKg#&!1py|!-28v1>W28*n2Cjeq=X@rNt(|CM
zwX<MA_p-^o_LNgFls#ySV<nwRp1Y$)dlWq~3>Gb6#AxV)V@=7EC+~rNRJ8YgLH|xu
z-OPQTb(y2O_A$u5HzvzlP2X-zp<v!5R)6RfT_%?{@+pg;zbsC;dB{eMyhqS!<+^Y@
z+Wk8@E4^qi@XuteU+X5yCMFlr5c#oh^|(s6niQN6;7DXY=2qI%nz*V>bH3y7;u>Mw
zV?NS^H+s~a1U(#w=i)V#yv^P!oxdHu)uOJ{Z<uvFGrW@NTsOWy6!1-9^4d%P#%j-q
zN@9+RE$VDicm^r_d2l5QNhOPebp)ys`)nmKS5+BDwwm<Chf?u~Nvy>n7+r=mUB-2O
zJKWI*k(JL^jO&dWqeADXANDiaSq3&O%w11*-LG-LwblWW!V$0_5ovFd;ZTl%>K}9+
zhtDoMW*F4Ib3~1HIF)3R#&5AxD4$BBw#AJnggOQy-zy$9T03T9UsEuzxH(D7Z)>?u
zTP%W|LjmMrlT>2&+=>>F4-yI4dz-C9*CL&ofuM_!oy3dR{5ih_OkhktorN1GBHe!{
zOJ}xRWN0-t^W_Aq<5}9uG6^y}D!9!er_!kz_;zyCwsOhoRym|*8EWwSNCg&0oF0yz
z2hV`RvPnmA90Som;oFm_6H(g{NmO3#>vx~K_V3W8N)C4f%Fxy0#)x2JZ2hC#-o!0-
z&Nc`3e~UcCWit3B40su>Wr6n_O|RzrI|ju~z}^d|_Nq$X;32E}uXxB5+2bZRpWCaR
zSc*<yBqEUVnUYqc_BTip9iiEw?`%7CySx?3A;HqXycph1hZ5e5ycE(qD^KXM)sg$O
zLBLGUsfaye5t^Zj-GEKffcBxNe2{3^#KNE}E-jC!%%ZEMrfn@TN0#k#n8>U=@D4h{
z)I6fn-e$uDC~wD6exs(E@TgDJ58Ig?&)$=~?p4~XmUL=*B3<TT{BBorq{^(BK&v}a
zwrDmOSLf0jwXzD)oe7t%P~{ZV76FHb>MYhGm0B+;`~xYxUvyzzD2L4A8#JB#?vA+l
zlUtNDs7e8|!H$hr0B#YJ6!?=AHaC>$GW{6hMND7sSC$OS4AqJnmJl%4XBEt9WT;_>
z)~r>QJ7(n6xEhjb&&w9IJ=BVf5SZ%4-H=YR*5|pMV(qek5IJPeUg7B_wXyI>Jg0s8
zqGm<KnzC_Oj=o64tnIw1d%TF`SD(R-k{qyVtuN!7D9*vq$NC!wDHfrP=4(Dn#G1Og
z_5=x)lM*G^w)5p9@t;<L1b7Wo&g)7?xSYdxIcFor!JBE8c+S(&H(#HCwy!+HHBp}i
zX^m}7b37Yma}mxveigyri%P`z{A9q{R6MXkaNZf|Hc?~$d6QxP0#=S%W!!+KUE;)I
z70AP^EefIDFdRps3XqSQ8Kma@V|h6_P$gJls`U`t#gVUkZ#YXBX>X@Q8oS_E(q7P{
zxL{rlYgeFdQ_$O%E?>61qep6^Pu;6;gFC`=2G#wBuUxpFsDiW5j(}SAYQ_gEg3-fn
zRj&bsXP!ufRI4p$-fA+cVL51suD&E*6kAwdp9pCKpb;|hF$N8h5aG9~)poh5C$Wi9
zGfe(cx!*bq3%`)5x=h^Q0(#7sbMv;JAG9!%moW+%s|gFPA*!!#9PK{KpKK$uC{)2C
z)Q@9d{<Y9S?dlr`BczS=Yav{c+>7w-5!F{G7#)1gwmQ_cwsHvxoDbh1X7NU?tXXW4
z=kRAKbQ)Pm8d%oEcZYLRoO~WtE-}`-dz|-bzhxxC(>{i4Y2?|RQ-fphB!VL>f}bu)
zhb{9^x4<JjGWkj&(kAe=&>61W6e(@F5uOa_nP!t=A=bXLBd4qL_lMa(XRug8;l6ZG
zuOx!H@!U!o!OarO!H<Q<CAMdT)8t$t>0>EE%26jjNG>iAB;@C3M+tS7M~h(#`z}9?
zj}r^gw-O}e;0NOoO5aV#^q^=Ot8zC#ae1jHaEN|2(18vG>$Mmc(C+WPBGUd?Oi9~~
zqP}}-fBU?Ud6jOu7Sd9m-ka};eJY){qU(7~!O}v_5|xDcl}2;g^=AKm{ruYUnx(VS
zmQl^DP&Xelp-$dPYjx@VK{wU;k1=BML1H1=ZeciXMBD6*Om}U~)Tve6c+R9y!Q&q8
z-nJ$)r%CC<Ch5a2C=t`T^P0X&EwMkmsfRW+z))l9dy8$<dPW~H(2pYp7$~PF{0La_
zl1`$%i@v4hS;jE^lnO?YDXf?NO;IvN5^#sTf4`=e?Zh)%CbcEKT){j-MYk;<KO;3O
zb!jyNng@L>zg;GmEJba)ghjA~m$0NqBgl^Se{|x%T;}aI%3vVEK6x`v%yTkPOp+gI
z`ABmKZ#3Ilpo>1Uh5n60oG&lI61?m$t>}`0(%o<9-U&Y9k5FC0!bcAZVdp3V>)s`K
zK1ab$!32yXQ8V<KS0ZGVD8K|8LM6=4rDi5(H!NJYVC6ra+W5y)X!~aAt9pQ=OeU?O
zB8@SAnhETF7Kp4YivMlgXk?ni>{k)zB4l5Xy_q`PF3Ot44UKTGYO6n92eJzGD5GW!
z^POuP)P-o+-FSQez8;AA<3hpY;c{9lGEFlwbI+nGv}VjUXCC%ppY0>&>ifonb|%d+
zN+LxrSpn)6h=U$sNYR`3TdmzP%dVwZ-c&+sroPO=j&asAjxjh8CBlmi<%8ra)c=9i
zPEFu}m~Q%v7Wxdoh?UQ1f9;0?e_6T+cG_h1fy}3`#~wif<RrE;V<1&{>Mp4%mVddc
zJz<f{ji{o_iVQ3WhGxZ5QS&=F#=vSS+X@#qYXGa6K*#?9`)$*$Yaa#+#PoUk%Xp&n
zls7NS7kWBaT^F#4kz@t=;nL6U`Nm*B`R3W8<^lb}`kGVV2b5}IEOlC+ehWigtOMF*
zYRUZre5T!KvA`fPnH;gihX5E8D$Vq<e=vrsTY?wkyN!w(iLhUau%ta6Ltrwz`hfvD
z0)omI8+H28nC%PLl>3F&ag!bpZ=MEGK47WEp9J3%{>T4$ju=6n{|@CC2DFFl(pF?<
zf5YO@YB&8G9>Ek`>SQqFMjOOd=y+49BHO#^B^-O7G1B&zwQ~H8iRy023%G8m<P)y2
zQ%v-i1)(v>bLj2+pSb@MNA)R8Hm)hk{GCE;Sly>uJ(B$ot!{q(Z>`9do-n1Ktk0Cz
z(KhWH9}G=-pn>bK_Akjfr@%e67D-4PmGo1P@a2AYN%k;(uk4aEXJZ7#EB+*3?l(_j
z#iWDKL%u&XtLftw@-LhFzR~fgPz`4OO=G5MF=ByZga&Nqm+sLB5-KknhgguAk701z
zLZ7+RuQ_)YP!Es#()hVpOqSoj^+(1;jeGTFOeDh;|IIrAHt7R8fGYn-BK>C|Peouj
zUoQDXB=WcWf2HL34RlK8R-FHXexr2Xu8Q|!xPzWJ>y?eQf`Fu*TB=FWX}OjR2%RR?
zqMbh10smg>)c5p4F=n08Xtz{A7%pvymAU;1t~<iMb}^EcW%gw6%G=cSRGgjLTJ{;Y
zs_G&lbh~f|lSllleH&uq{-LzJU%Zjn`aEJr+wEmCgHsAFZ88<Qm~>%q+q&PTCrtPl
zIDSl+kWl1Ls-JCbZsf(35l=V<BEJdkftE0#fW-7~()fV@-&%cqyNNDv0>%Fdq1nJa
zNky;4_d|Nm`pQPCPnkm#T@mf{&kABnh&>siS}m=ZqJrUfYU(JX1!|^02~8$7U6K|!
zEtpFwW}elEKLHizb%RQqe!r2IQ}3#x@(02V<E)lr^ju3)_aSblBKPX!o$2hmEbg5h
zx^qJEye|l$yV&W;J3hEF(sz74*DyWbi}#(T{Z?C5_dVFR;CAUWJ1gU|iM%Z1J7&Kq
z@0|-s-}%#O6EE<Ski(ixlM&ReK9T%Y`s_ZPln2S$abkh5kyNAJG-HHkF??`nS1WFK
z&ZhM}5|_FNIOUpre<?bVO+RC3v;(;I!_F$*y%G~yH3ML>e17N_Q(=r)*v^RR5_5tV
z$-G0nSjZk<Iw-LA<YM_1Vg{aTJ<1?oJe>Exfg%eSLM~oIq*yFu;`?C#dCmT~Gi&ZS
z9p;*O-hr*BiO3R<0m212G=V*Pc?t!K`&)v9`St_4{3<H_<*_;kHvJy%Be^weUpP*i
zGpyguSy)0%bb-scrN}F4LM>*Q_z6_~<%9B|L9}qh9g#=3M)IsA&`ai?9Ku6k$aLG4
z#Pc4L;WRUq-SmdaR_f$Wmd4KqVwwhvK`^sVrYQMAJOlHUp%CF_@llP+)KZT#gc<95
z<3B`n37)v<Q%n&UJmyvrMt9^-BRJ`f=@?T^76!1(#D`o{#fEqySQ8PC@|aGjEOpjW
z^1(079LtZO8duw0Zy?3(Ay?EYQ*DJJ&40!*pDu2v0dVnT8gx|npevYe{&xAc)Gd&#
z?MTy^vdU2!PP?kxm8oA+Rb5gj9v2dJ)Htj?=FVtGccc`n#hOM+V>LwErl~{nxM!gT
zaG<~$wMsOr#`q&`LsHC<w(_rm7Zh{D6-U=Dt}EV;$y9e!q%(0&v<)~6!eCuu9n%Z&
z5U2@(2Bi(t(h=S9zuN&t8ep>(J7p@AnjvjH*|KYV%%1cT{BBLplu=$lhzO<)5p6RW
z{8`>10%;4H?VoZ-LPJDXTZM+gg2NT{(ro4XHH3t5AB(TcN7%f!iZVXm18PLyx0?^p
z`Ca+f+7m7SQT^3JPVOfX*~0!;o*C@o4wk4?KgAfoR+;y!Ge$43d7OInaRk4!yL~1$
z0o4^$vhA@01;+daw!Cn~<ebuQMQT-{H!Je21>QKp#Y6T4JcU#<!FIV5)-OhvgEZ5I
zNnxn)Ue`g@2m~qq3bW2A3&|+U+Uw~g@xUN)nH=%NhohhZ_uetY$wqfUn6HZpK)DnD
zB?`tc^&BmUp`Ku{fC^5Pw8-ochT}oOy+VP%Lb22gXZ66^PWa>~hmjS8sMB5R<ny3d
z<;<6(M#&{JC>!6T5-yDrXYE~)U$sJXmc--$Os<S81dbBhYBFR>Gqml)J<ceiCpWuY
z_Q1mR2v+vsIg?KXPkmVIh9E5S=gT3}%pfz@X2`S|tCf7!ZByz&kkR<A?4bwfT~JZQ
z>{A5x^DAzkWgkPg>^zSoFBGnrl`YwgS*|VwjunXO^NeBo7tw+Hv>I3SG$gNrnL+(G
zJwI7&ub|W_YgVQene0?s)8m*ue9W{udBd{N9s3n6v<(mRm<oP*Efo51_0ryFlUW>@
zD5I@-<4_G_$XpuJOtsZd`@*WWGX91OBaDE}0|%{Mw77hbc-T&RHpUo#Y@Yv@EGxt#
zl()y|RYM(iq<x%t^-JY6M%uBmGnau|=ycN`pcRrS;)9|?LFD^VD~HT1Lmi$EdRnkp
z#Y+$M73O!FIT*G3JP|7tAOb!%AOg1>5uG$T`C!W=?kNNLFU80`ndkb<s&Ns71sHVb
zD6im++L(80{v}R?(<98jsd!}9!)Z*~NQYhg$#4Bezman*rv*;d?9*e6w74&Tb|7xD
ze_BoHsq08QuAfF$><Yk0CmTlpLX3Ww!hn8{T>hW>WssS1pIm=7ihXvJm<z-dgvpVn
z`Wg&is4*Vx-w<t&Fr@BH(l%?4%+_o9mZE17V7KG37OVse=@|Qbirv)+5GrYg7M<hz
zdITXqoE@bFc8KEWv`#A=W$A;KU_AFL514risTex`$phwCFw;e!4DpBqPFR+S4kysc
zLnt4Y7Dc61V5zT^hUTYp0SNSN2a_f?j}Y(0<@*b>2tJjI51Bt3EpsbBO{)JbjKShR
zgkAhgn9dlBy-r$vsYe`P#xnE(mkQ0>E8~n#bRg4F47aq?rY&yuxsJP)6_A}b6xIlk
z@`@uaT!AF4jGHien;l0tvv(AYUj_5%$Nj9>c|}U2E`>!D4j8-Bb_yMa6aVG0voo%z
zu-z+o&@RouQN1;H@%o2B=`@bS6+IdRdVd(ulMXy~IS%9f2?y}=Z!_r#Fjy1e0J!}(
zbzoI*Ig2SXv`D9AAQ*aOL3pe_KHZBG2itSBV;}L;0Wz{TVGyQB8Ve_z&yJemSNbOh
z{!5nWrTD)Yt@};-HoFJd^PFZIpbn6kxGwP9KU{>oFah|b*}H6X-2W?@`7-(7)NW*_
z`UOTgY0ep|-T9<{l$*-d`6bf(Z|z3Eb#8&^(~M!#^QlQvH^5|I@gZ(IfZ0hw20-oT
zH#BO&PBB|5UrtXOZR*PcGEKlkK{Z9{?zHS44qyL@K$~?=B^pAf%#H1^$i$KOZ$meY
za?s2T^Z_JP@IT#un(Cj*f2F0uFYw=a@V~(SE0n(zY4J|l7k>4X@gLb3+QyFo^#T->
zQ&^n$2sGH+Bx-u?Sb}6fZ?Z2AC*_TM@Qc3V9!jlgtbjc%CfVMs!B-3j^NmCfyaqN$
ze-npi>tBqkW|a7g*ig9C`45sw)e8Tnwep&)t)NJW@M0>9o;G2=n8(K3nS}|7B5d2b
zZZFT)m!Or`>ilsRoUj@xt|u3)pgZ}*R>p`RaV>{MscZLI?6uQ)647~37VqTbvjdKB
zEZ(YWd$^iy$E4NhZD;rTkJakpy6Ab>q&JCTMT#G1GyO%Dp-y5-Xy3K%f5{<(a|axb
zq+aZMr<0F6_7{pZ(_e&w695ksEvRVyBKZ%roJK|g_CQtOkFxuj^I|k5(C_fM)4&y8
zbW-R>*)?SR@#bX@3c!XoOhmp@Yb_Ls&mZIjtYN_zxU>TnzCQ7I`)1oYM>#ED@8&Wx
zhkV|e090ArcAI8VztZE6<zho-pua!BN4LqDmUf`$q3LJovAnlnQ4PBy4u8@o(>Ks#
z;Ewe`fgNS!?tnRJiI8Y@Z@SzEP3>dpxm|*8ra9fBdmJY-vyMMz46MC>xsml6(5S8(
zA`kcbP+#FzpBPZOV^QjDt^y%P^GdXsJlH}Ia-8V%r4@&j8^?>vkDX^nRfv+jfg&4-
zQN(XVIKbICp|LVurbA<ru)Mxec__-LUiFd(8KK=$>C>#LYcR|AF0r||P&*!O7&y$(
zHmNWj(2@=klGi7RCE$oA;5fN|3x*pXFs_%EpMkhEr2u9Te58vPl3#3KnvWHd*R~5Q
zuYr(iRt%$V*E9^v-*SoV2<5dCH;e7ajmicm^1%r}PAG?p%rMrXR8dw!C<hQCr)6vx
ztZc_a1jJE=sL8{?4&h(23~PAQDyi7*9N?$g;iI)nP?Jl09*6^0q=t~fUk+0w=%=Ly
z=oKncRUs~IYYgL!;+X^0(CSZo8(I$Mh)@A@!0B_`en@X#o-IUuczg+>MyNWhrxOd!
zfEIF*!kI}mMR>sSN^<dI!^(162~bpght1RMQ}@}SS1TB%ur>r1_bX?SecV!}y3z(i
z@(8KR!A7v-ghX61e*4Er{5<xI!+r-K(r5%PVOWm>y%JHqW!$M=G*v*F3+z(nmfkLR
zf9v}jp4YJ)U%mCb>o$f9q~$u|3hSS@E7wA3U&?lf@SV+M+b7^Wc^!|7&_>ehDqFUS
zTjcLg-Ow)}ev`O)yJ*p+k>7e=TtJvRvMx9xFYl2pU6kg%JlL>%%QGQtYmyz=YbtDu
zoYzI@9MB;cq$&KR#+-;DeJp}vzmu#oI|#vj;cK`+s#Q6`W8<l`!XoS*!^Ls})RMcC
zO5~;BcH|Q5G5HYxv+S}M6(m`5xu6oanzVO@%%zO$cmN!anC$}XWoh3Q8`wqnd^FUt
z4;pjZ`<f+WSu15CDgV@gq?at?%}O9A&jV^5=?HUd{NKaFaU0$%2=AXVutXruWg=mu
zSNrY{o;}0y0L3K2Qt-Ste5*$2wOIsX5|kExoZm0SQe}@2el^Nr=*cZ^7iZ{c$@@y&
zY@j$$5JB$$K3=(}byz;cfH4tz8Lmc>6i!54gHK&^UaQVJPSpuNzFto%QWpHG>N;;N
zetaj}t3aGrfd+R~jw-ERWquT?wSHycT8O(eO~S#7|0;0n<pK?yF>xA)<kukKnkmpF
zz_zA1E;Os-#{$3ZnU6J;_BL`o!*TZv3jfupCs1qOHO??Gae5_C>=jOr((5Z3*LlEV
zk4_f@>*2f#R(`eiy}*Mz<7}osM-cc^dyI&uDo)t=PS{l+66@R^7*=c&O3EKNx%Ljn
z8Zz*I){(x*S#v4|qt^!-_y-zIk#6_K^P|zD)bb`vQS9cm=Rqp5zjzqI&z&m)Lc`aM
zAOD%HHqd^noSU=ibAj->w$JxX=$*A68t(u)gt3Lq^-1btaloyXFt}_4@rFL^O`wLG
zk!p@1Gb|LgK2LWc0|mqG)CWfkNxy!K2YhB1xCN3Oew=!_PMOf&Tmf;xd7{{MTg}P3
z!shyQ;6CW9HH3**Ahvb(4f4fP2lliAHw76=kIfaf7%W~1%zks_Bn4KxL+${_n7ruH
z4cvr|Nq~W_6SnYbq89V3lB{}u9JP_%*QreeFAYg6KhPi;-?4%ZWBw-^MEjNO!(EkG
zk<kx{$9czPIeX*MY7{qmpQ9^^lD7#T_^@Xq8|o_3o=f}?zLQCJZy@tT>4QyCw1M5~
zey46Wf&H6uYELC#HB>Ra>N>tYu2$R|_i8zkq96k^HMm`58l|<GwAjzd9qYcWSYdeI
zb}aCb3ED?|6^i%Y=4>a|xvbNva+wqfn7!;!-=E4=rb<kR71re9)R1|HwaD3ZDFaE(
z`;OUq_|8RQ9t}+bSXiLz_hU;t1BF1YJdW(^#Cy_JYnOFyU}>vsDqVS&Ir`J+9aKDP
zgu1*sm4*&iFBPELG&u)cdM0A7W=Se#dY(j!1m%c`2%|6Ep7!(QL}r3(VD!B*u^nza
zJBwo=xOg=fRGjH4Q1i8>TJM9=MQBaZwt#Eim|$?BtT#-+L9SAWzOY7AKOKg?<ixv1
zu96z)%5>z%4k`u2{RehWTr`+TISec%mN-DQ)~v}@GUstP{OBUY4J}&JDz4CwPD#ki
zu*T!ikhy_2ln`y`ZKmusg5|(=BvTt*L^qNn@!j}Eop*SnkdK;5bl^4wTtK6*mND0&
zQ2r6c{#I~#TYt^kTv3S*m%y>;Hish)Iws)K7=2-lzO9xP<}?B}=Z5~iP_F@It5Gge
zkv-7|x2uoQvN*_9C$YxxY$j3OdX?Q8*S^$R9OaY{v)nmLTU6G2MIT)>9x~qv+@i1o
zjtnlsE+GDBL5lE3UE%g<rKx!AG?5+Io>6p`w!EA%xtzpSfIEZv*T^0w>{XsgYcI+?
zxN2=Jz`+g7FUrd*!ZGM0;pqA`^1r`$yRvepu^8Jnl_IfKk^I&Q_QS=ux|1S<2t9qS
z{7W>N!aSMwda5ZDg!KN#brs`phST61^98&!VG{*APv*B;OfYW@go9E<R_xB+DmtMt
zZ%WAe4DryZIX9e37`l`wWeA(Z8x67MT#MeKW{laQ{-Gqy`Ru*ZCEaaHepa?SX5Sb4
z7eg-<U2Ky5>61|5!Q<foxW#XeI^XA(aw|Gt&(4BMEuA2m6oYK$Y(xZDft<~FvfWn|
zV<^c#56C6o)Vue8Q<Z~DoFSU?cGlUmTdtt~<SO9N(O^USr|~KemXg+YY~%fBxb6$$
z+Dt#@`d?J#Z7$9Wb56a&o3@@oowiO?;bC%H;$IY1k><lOhWz1hK`qfvp`0dGCz~<3
z44R<;Vn+>P_Z%HN*hklDT#_P|0s|_oBBf)RP@QbRPg}3?v&|GT4MYmrK#Y^Ju?zg}
zV&^|R4~tCvq~k_abi2Ot{oFC+TK*VrmO*tuT{H;?)kAz@4)__4x61a|RR$9?t#lp8
z%@-5$TE6B2MYd9^+k@Y4=}Gd3TE}UdgX>}%I0a@<)0p?af5F2eOiR=Hn4pbXXIA~`
zwu$*p3vHrD)!(&E!Tj7izs;^Uh(|!)7im@ViSu=Dzy&zZh{oUY7JD<Umw2e3?Nw$7
z1vtYMu(sBH)>A;(QPg+C8e9+SNXz^h^2Kf@-}Q@8&BHvKt*dIj?Mz!`LttO?L_ft3
z92xd-sjz8RTrRLt(CR12Uuv~VOmKoGH5jz_FMUZ6Rg2dqM^EhG%20jroFqKBD1*id
zpV~@6Yg?70SNWA>gnql@P<(>1Dt93xZAE!S#lJHl6B+u<I_J(&d(kHov!0%k=Rn?B
z{aUoV_M*VxUn9)mbLGn-_izcTG2tJRJ6ya$c|}|FE={(2JApUKeoO{5XzSxwCZC6s
zSHHelQYDhG`^0$4x8B+2<ul2|L|#`FgF2NOzfE`H4%DLuWV?^|8|Jw*sFG?v33}so
z)VSVZ%|@Tio#6;OgF4@)kgRq#M<IUIPrB%k|E648)?hs^O?z1olEZJ$-=goaB<o^U
zfJ_hjJaPV#&Sb;TL%*F|JC34H$^ly)C6Fq}PRo}_21aktd?x0+lp|?)Veo;}T!i0S
zE`AQyOV`qpnlVf_mDvCu7JTJ11<yK+c)_y{TlCP%>aW2%Bz}d8bMyN?vNoLdw%pj|
zj?jel``PkBLdANAj|s-0`Y|T1;gGE1Jl0`*BN!@hWkMl-_o>wdGc#SdU6KMzJ$Nj$
z@~Am%tHtWVC{BGK81|L5;}5ku>^+yGTqjCu7N4z^*PovNkTv$Si2qyS+GQTgnsJ5r
z02^aZYywaG1W$eHa_$W1;{+J0J%ZnGJ?8>E<JUl>6fWmXt;&>^$(&5pn|iqU?bL6?
za&0uTH*P6=UY8yQ8aJ*TayH`F3s$|%#{5<G1@nuo3VfM|s%(u|xQ)TejXWgFptX27
zH>bq+hDTr-pZW`WXl3bc_U}*IE;|_+I1^+nSAw_26@q5pI|iPBBSB1g)pmA$pjPYy
zd#Lw~Ab+2i)O;*8dzdcbQ<#MQ#$8aX+rSO}>_UxT*$S!V_AF{0p>eza%Cz{tpe0Se
zFV*Lrj=&*0iO=1ss94t0ysMclbOopH8+y`X{9C>~5Y^;qEaO-JMS+^zFmVBhr^{%;
zjHO1+GxigyUo_Qb#|Nuszk_I}^`R%~=_s#a9@5->o@t?W_VYG1;{7|%7}1w%U!kb)
z9huSKEr;g4W|dhAn{c~E^qU_r3W)m#ZrOKU@ufPd>!wRB1FtR=oq4=Y(ZlQ<h~pf1
z*_o(fsQI;8iBl0dyK@HZJt{39OU<s-KqSW@tLIiIzY2K8gO3^DkrDC*cx3d-eXC=G
zd_j%;?Cj4@!9}!kiNTol9yhQQ`N)k%MuNW~n8iCkdyjex>>(Z}Tu}j%=#ns#fL`{q
zbXB&6qH2XMKlhMJbv54X+phP)>7r<L0D3-8)&j;<jAJsL&c=xb28qh#h*rmeZ=by3
zYXiN7zYN$Rf~Els`^t+?f27}y*e>p<noJri`LQClpE^=tmE>)Z;A2+V8x^$%I^&&}
zRu|xA7vNSG%>74DBNxp@tA8l-wMds{AozM^eel6Sk{8=n1izcMKQ=yQ<oLI!#`zTI
z&VxO20(y_Efw>8$X*j(WiN@TP#fXIniy84|5Z9M2rT_a1vA?skBk1poSKQHHu@!c3
z9ZcHUO<#|D`gq}W@99bZ>6LMc9Bs1Pcw}+W?;ASI6BK=+^ql(Szg`Fg8t~sFZ3iy|
z=D`br3%-~;Tb_I9M;z!&ee~t$WpJT={uVoTCNljKBY9RE_SrUKuJ$qx2slNe?k7CM
z_Xz+6MxP;#8Aub^fVcifRkK@ImG1|=hv~fTVlsm4ZFLaxCC@_!#8~RI*{#AKMCU4k
z8qsKR(3fP^Y3x?Z6|HV(O&pfgGE#Zg*lo~nVqo!B4}hSmKvcfpH!JkhCm%NkhE9Pq
zC)Z*z&yISHXYqv6Pw}EmRZ8yvv>i#?(aP$K8jrkEutmWC7oLTft~K71)7v57_=+AV
zD8HfeDBS1=R6Ht9RK(pI4VlDx^npRIayKS_y6E0G{OG02bW)Y|#{C=2Nb)(829`d`
z5g%OYd+0IRAZpLS>r2JZ*-ckp8!sx!?_*ip3vmCE2j3er#~ZzJ{;*+3jDFdx{+}b@
z+2QOUO)B|iQ?#HsQRyJez*t!>I^^=Kq0CSP==4DJm>9<!+;?NXjsZ`rUcB=GmuF1H
zqJgh{sI>0QpXL{m+!`&ZgAJ32AQzFliVW@6&Y6qXye%)>#U!i42`2d!PgA<**5D#3
ze3mOgM1E!x$ps#bDZqNw;I|#W*Y5d%td0w5);}2?wdX&hIw>tczJ||9z80cIm25nV
z(!6GS_269T>KBOm<hWx_CAgcR>ouN4hXUQS-jhc+uJA$_IAtCVMHw0*z-vZ-n-~$9
zha$7I@9ojDBfx@%zn+AmUkd`kc3HgUL%DnQJs$4o*#8e-Zvhq6x;_rikP?E@NQn~C
zAsvDeN=pwtNVkA=gMfsHbc0BTbf=^e(ntsh2uPPm3g0_}9`CvL_y5)!&pPXzcR%~-
ze%)5qiSfLmoZ3cZy-B`FMXYFAhzk363afC1)apfjKl)g?ih(s(;rC<(tx4IpMeguE
zW`4d1nacnhN&Fc6Y+AMnNDOQ0!eOvAbhaSkrc5T*29L*xv?i9K;W<bzVB+_YKV{hS
zndObu_Ikm?HdE4VsJXl0`Rk0A_cn&0M%r~%j@npk*-~l>VR=a;%KfneldL(`CzMHE
zee<Vg9dmqY?6b}{g!vxFX&<jHgmCH9q`m$psa=n=czgaZ(P*>V(Ju2ox9NQPl_)+@
z&bLTs*Y=JnHYRuHMNDq#L+r{o_Q&nvS-;mwH{XJtzC(NUf#VliTo$OE2tNH;bKQKE
zso?mjCFJJ^<CiaW$A7e%zw94JbWOCFv<S1K{>k*Qi|#WkiSczl>lHH|^FnFvXVykh
z)u<l6gUE4uUh0u7`*NeVEU5iWvL2bVca;y@Y(3Girw}nQi4Os(*bhRS9p07apj1$i
z(R15Yegegy!tXeH8OX0&e2k?TCRY<m|IYRx!s8<oM}wN0z9{Fi$zAz<&J1~!FDRjV
zDB*jz`f`F6ZuO+s<Q`CzPSMI*;#wt`9fW<t;?;81e3<Jsk@+y^fZ|Sigm#M`bBG0$
zk(KbS<FjDRev5nFu7owdVAX4e6|scCSmUe}i`c?xsbq#qEkiUM25%@Pyp&(Qw$x(A
z@_XsXI!tIE6F6amcYim>@}d$zbFu3pmz<f4Q2wy9*T3`SK3&3$<)cz+GW3cAeK}Qe
zg}k^pG}KTu)S?dh_g8u;*<I))XD0C;akh$=W~gwo(7#8lYi(=Fae}Ek76#E33^f^f
z|Lef{ab^+ReLpG(BVkRt8Vz@LV|wonC+bs-BmfJ9YI1V^P$_??#zGYQxd|TW`xo_K
z$pP-`2fv>U*O2u`gp0%b1mR#*;}1pmhpH1q!=GzCA;8V=kmo!wD1i5y<pIUHi)H%x
z8$l7K^!p7FW`M|ps!BSt$8=<HdUh;n*z(is;h+a<i-kdUg+vY8RO?YGVgw{N{$FrS
zo-_&8tmx~ybbr>5!xtY3+kf@gS_1=&=&>9?(^{LP9gm5Vv1Wp(kcRUCtD``2K+MJW
zpU_~9{*O<7@1J}<On>G6r0<r8bU{+|qV}VW=bfgf%r%y6tna`=OM;`-wkBfo++Rj!
zjGSR&fN+$E3QN52Q8fPTDOYglG2wy9zgC^{wr6f37R~NpEJFbGg3p(9D|jD@=7XSQ
z!5d_6WfYIxU&!S_Mx|J=9t0MCVkyDaTw;4CW#*aN@xMdd(J8a`-*q#3u0#nKgXwaf
zL=D*3++lDmA0%r+jO9}{c3wvQ6M+AK<U8Y+KUNaxL16QD3DL(&>hCg~>=W+bQu)3<
z<#or&l<zOWUJ+X%0QjErqOIhA;3c-3^wX}*e)@QcBWHI7V(&%k=yUPk4Z;FC2FEMC
z9etDs%!Psqr@MSfi9q8ynE$<Y0}bti7Ja)3PExWjUvsjP0Lv!GCAP~=nR$a+gt~Jf
zqd!ngfN#hziy+xPG*!6@?C~#+bJ7Ej1btgl^f3Hz|D|zu#wy>W$82msk+CpfA#(oL
zHCkT2m}uJc!ws;6!ya2C#6}r{{@9VrI}<X)xI|o3Y+Td=Nrv_-R=4iDj0WpEGv0`e
z7Ix-mc5#P4>;B}Woq}QsMm*o}9)H7w(_g8RfDwWz=&g;}pW<5(j4ia-Ef`ZBs5XLp
z*0r~;nI?Xu%4ns^kTrG)E@j|$e8|>i;*yCeSZ8$j)&Y!6T{botUH%tfCso^)4L*3m
zSH;Jx5wTIi2n-M3E#UzSzd*6SKmmp>ml%RAU&f?JfZ@YS3>B>%z`T&X_x=_{Y73&_
zA1VBNvOJ%HD|5>RGwb)9Cl)bU)jHxYL5{RWq1dBPARH$k9Cyd9=JBUsWzojmB`Y}=
z`c|;6YJW@-Z0(S=11AnPC_63N$+;*dDZVVP&6c7*8B6(MoMe=Z*jj|Uw+mXCkR3SQ
zltixHUhCaW7F^?Ee<$cN^qjKY{9Y)JEG<&lPbT;VJ#o1iW$BU5ZNjMP<d|n_xhMTP
zyCXdLpY_0=rcs^fPO$1)E^5TZ8Ekp1D{NTCz;*YbXcsUVEWt#h-!{XAT>bz{s0if=
z@1tck8$5mxTwPaR1NN*QBNj*d%T&0LW7K`n{RX?Sh(#-;vqZSyQ6sPf33w>zoXdp7
zPtgK#7_lD<x%9qC62SLx1?PE8L;oz4Wdpkh<HhASz~SDCMy9s09SCDhNPJ6;$bg?C
zGGKX-0S5@4v%&vKHE%gWSOh;%ws8lC2}+8_1l=V@b<Bh%EM6|Co%KunU2J6z0m(4;
zf70uch|FBAF~O>{g0?i+S_KPJvUp(cQHR?pP<}Mvs)E&Trvn@aknyNp{Y}$OV>}{M
zN8ddT_D7T%NlLd81T3l8!w8!?WhfiEV+2GwLydwTE+89E;J_ow)<=Nn#stB6nC*0U
z@SBQ{nScrkAfb)Zf;l5_8VeBg1qd$(VpDbjtauSH#=q-L1-*xb2`q*Gg0#UYOPML+
z9)e2tf>13KjO`JNcuCt&Ue&GXN`VQUz3<*o%T4qJ@nSdoQ660q#`@4`0q5X+VqhNj
z8=egI$ZjDW-eZ6Z9iE|r*bj$TiHU$szdywTQnKO8VXLIT9rpd%zJ0vu(z$7zoih(M
z0o1`JfR6m-gi$&g=ssA;Q^CBWg2@SX2f$z$a~k!}B0x4`YE0Ju`3DD>4<^b`Wr!nx
z%VTvH+Bj~IB$9HUdzK*8SL^;{0g7L+s_gv8PpGalC!wb5C#=}QDwULqby<<JG(pvl
z0;nBp#MM#Uxfaj!js&Tn;cC3W&gDrGYJ{+s<u8Rb$VJ}U5k4Za3qM-#M5K-&iVaX3
zc0fZx{V`5i07A+2;84*CJRlVDlnfP07J9&r^4h8@T~LkyN&G2CTIDGZaN|2eauyN-
zeS|K-W#9ZS*704;edW`{uSO*R8;}C`vjsF{fvk+}t!5sCAZjIhUlimoiS!{`yK+i{
z-5AQrd`WtX=h@QEd3$=W7zJ9EL2lzKzQu1*GsPdWsmb)p;onrm6}(Bpbx}ffZ}lzL
zE9#5$*5JkSzR1I*Xi>Y>S060ohEB{p_HdSdR8qNx&o6<VA@)g_7OomffqXL|i4{SG
z)FX_Sv$$2tDc`vj7bX;PJ68SfQ(lbWhY&vA%4oUDYVUi?{z~BjWUS-qb<8`WKQnyp
zssQSfV+8J}b}Bp0P>$Xp0!@p;0^S#;%y^IK%Sc%<!mbfn5!|&Om1JGuQF5w##jyD8
z<%~m5GBsIK*{^6&`WupiDuS6wgxeHT83&KZ%8r740g^+*j$_Zt=JbhVB=pl%Ox%nK
zQ!zE!NI9>r1?XpyJdPnT<Ymja!`Axa&TL)fD7&^i%an|&wzJ8bN_V(?F9~}#$hEb_
zm9?LbRr+RDLUdX_QE}Fc-U7RKbJb0+sC$UwugckjCSrWQCUWmkTv_+|WGxS|pXIwy
z_Pf{f4y-6z;-0piHJoa<1>C5(@wT+WFK)+|JJex#kN__s{l~K{%mTU``V`P*Sn<wS
zj(^JgD6TUEuZJ!|Pf0F?I^jBFhJ3Hl;0-*rko#5wh9m(UQ0z->0@ZAXpQ8^bW}j{`
zvMRB?JtRPQzz#%ZCLrD)y8m=5)@fkM`qQuWb(`+?cYb^<sM2;DF*P=zzaVEAtR^%6
znoG{`mD&Nr!*o<Y+3sQQet_-AAgysx+&5QQ+%et?oEu^Uf_o=0=Pp$kbSYtt?sjOK
z{}b=Jyi#BPQeSQGj1H_GpIuIcLgNdgl3^kqb|EJCduo{mIKg?gAoS5GJ2Vp#IB3E4
zp9!V+<c*&=u{V&!ZB5F;HbX9GZOL*g_uQ?%qz!`xD_cMe7%^Hvr7WNr7Ep8xXqC53
zSU<GefCiT4;ilhGDDaSdj53{ToUy}```&GJ0+0KBgu=9Abfyd6rAuCnd@8TKp3?Y{
zWgrY$$woF}nGaE9$YLj%__|?hM}dV4i=(Sg)|VT);^MY`kdW@w5~d87vnchK1C8K*
z^hY7!kqEVbuNUgNv9Zmpvegs2_^WEWO*Pg6MrdO&75kEmpo9*i;0`1HY3&soR*;=7
z+!Uoz^SrzGE0JcJ00&Yb?jx5meKTtz0kyvVg{T?hn$<DpSeQln{*1h)ywb1VzjCv{
z3RYRldP7gi32Q?X5LlRfgd+raqh|!~D4I;{7ZjfobiZ?|Vm@dM7l5*bq9SzwP8~4*
z6yYX*yO0#!Irar`8L;xR>1_sk2&%m=GiYnHig1O13SXdph-IO2<s8YHuz_BGM8kj~
zo+QPWn^o!lp{;l<(YLGcw996MrB|%kqOF^Tk{Pzu@~n+#Q{B*k@bOC^|G4kfek5%V
z3W5S*SUC9vBr5BLBIH2yBRZUN{kzpH84E+dQv0~!2PX$MO)gd$ouyB7WQt2R8jn77
z_F$Tmu?(<3w4O1xvtNyP%Jr_+h>{^QG`>~{9@?wu;(!>Z%1dV5VQ0p$zm8!Kt#0m_
zG_+qewF4)~Qx?kUc!-6?Uv;+J0<G8D#@iKEvh+)@#N%}z7nT{uc)uDw>9Kt>$2sn)
z)7ducHF#}&qn`LsMiu7#KD$&1j@?TT3#K5rms0@nPcR60c>q+<4$J{g)0v7yv~<Ud
z@e<m~C5iuI!VRVXd@jcspJp`MLZ>fJA;;iyYX3O|0I&*0CQRereJAY?WjSYJ6&AC&
z;oM3TM_*8iq78=OSCBvKuu^quYaBVvvM?M^-6ciCN#5N51KN4h-QsQWVokRqHWs~3
zJgws37WDL~p{q7N#j$2%y*wLW4FB)<19Fzu+XYUR!v!&RtKVQ0KT{}m-)ymW1XH9o
z{-ft=j#VPIJLF8S*3rSA=W6>`&-9ZDOTP5smaO!LTb`nu;mdzYfaz2zbEtC{xGRgt
z1n<145_vAFGDbeNP+zxHR@Cgk;YfT)y7*-DN5sH>A!bey>thpQb&?7c?DF3~%ch>C
z_vOP*XTw@s%<uMdi+WzlgQ106Mh|lVt0@>({Qix)$Bwj>4~xDBMfw1ziOJ_L6jinC
zBUX@0nEyF55id@zF=GW>h%ZW-t)1etA;~_?Efo?sTxF;WLbN|5mz?GV)~n#ig@kw|
zHS0~9V$rXBzY0-6kZ#<)6LB?0x#(BS@$&?Z-GN7Sh_Uh$#;mChdCD2EiA`7|GQ!#`
zH{8261C18oBj)Wz>8TV60xN)&c}ra1<uTPL09X0LixoUWP{+<tHwYN>h`KW)1)wHG
z>&rnNlnEWsK0@GS{RG6_o&dMY$3^(i#ie(lV{?v9Q9s?FW7SuNQh0&@>AWKaB(>Oz
z!AV@i$)GTS=f#`ma=+t0MRNz3RKWQAgTn-T5wPxD!vyz6L2zUMeofIuE2Wk=t)uKz
zCAB~ZPS71k4}xgU64xWjOjfrL)R^v@_P&-zwJ#(lrmC3`#_um{&x#GsNSE2(;3Bn$
z?00}f>n7ggG=Oq}LSM(w)w6PeA<~47k6}CZ`1FdH@(UB?boL1PF+wC_s3iXlG@|-H
z`=;cb^%k;v{|D`Ck@r)!Zr9d7IcwkUraF3iZt7#7;zCDi|6e#4Tyo(~Z8XHPsXBno
z4uWduFKfq&1zL9uLww)aXCcdemwikTPB+kBgO&8JeL+pKp~Mp(LEGcc<g2GL2N$w+
zV!&N+LpN;UoKU{H_eD!g8+CDdd(HRP3fTE8Wm>MfPZLp8Dz7}Y8z#2NQ=42+RV|#9
z8964;-{V!z5-BBAsVHubz40I{Hy>(Vxm%hA_KKz^qUdZ;dWgg+G7FFwxH0lf_rjyK
zryx~7jl9H*-tlR%YEsB8yvUxiU2?1XsJ##HAoJF<0h1tbZQ2s0VobWJ3{1w|_>A8y
z%sS{hwPq<;yk!9GMU7-|WlbH7`q4qlFuF~OB4hmgqoV~XnK_}FrIE}d#1wzJYg3A%
z)idqyWpiY6k#8Pc=6;w0ZgHy>^HFhHstWgDnZS_u%&)3f{hhT#0Xyj*OhGWF(1@p8
z35FRmzI0aydktZ5BBt!<zk8NRt@0FA>hV<}&Ffh&siZ8x5)@xG-6|dN;~>QS@J#D~
zS75JVILH!QFN#93+@$#w#pmnCcR!o2TFL?;q3V5(DIlT0NP-*jme<*>2t_+&C>n%g
z`KWH%{Fs!+kppWBKs;a*;RIc@YlB&LR-9{w{l^Lnq@_N(N(&H;IkQJ=tcqT}QVZft
zdXYa-N2Ivm)QQOC2IMzDQ%NWfuEh6;Ff4#O0fW6McnN)F(TRN^rXxzEwgN%%DnZ>(
zYR~nOPe6wP=J4l^qiNaC8a`uCGT|v#OSiz;I591&LJ|cn3Bb@nuLBGnN@4`5I1`N|
z;sv25+8~tv2RKmpnHB#jLJ*gr5<92nroqJ?H)Czb7v%~)$h%onpyA<!1yJJys8P`-
z0wxMN%SK;<Llmr_UzZIoP1)dq@};4A<3F25J*?yB%Rzn6zT44)l9S&}kQWPWo|r~}
zCAVeC+u(xYmVhy^$>j+qg=MrD3pd1$An4jy;{5^F&i0>I6alr)Z-0Zkyz*s9xZbao
zp4?Tj&5J8O{i{N*@8!L!VH5<4(|iceu@Q;l=n$sW=Qv?hwk$o*iZ`ZxT5|;-RumfD
zsX_?`eAzwI6iP4Lz<wvOy@T$)Uux;NzknqPp4_L6hO6t}86xB&d}?JDp0(0N^!or$
zgEwOoDIoq@;Q1s2J<`=^x;R(T<H5c8e^kE-D*E9ZkXB)yO@|l5tP=wc?a|x6*t2Qo
zGzGQr9llfVcJ0l!PRB6_4@<-x^bwGAM;T#K2e{&ZNO0O%F+xy@UZ9SiOd&myMoNam
z<p_sd$}LP{0kW*Buy9RX6WsI+iQ^aN^_xtT{nZ8r2yX<~1e^ny?1T_^t<AvD47XQx
z&>xiuInl^t2<lD5&O4|g{xer22}I0`?`+$Dpa6-Jn}iy2-~y&C`_fn20l2qd9uW}5
zPsQoJ==IYE6=8vm;BR{PJ=p+$s=X5!we9mpXdhE*o<Fvo2sZF&TgGnD62PN@zn>s;
z<JzhSIvBbDt9E<qJrAZOkHNI0;i?-@AO3N1P{AO9LXiW+KL9^hKLQ9LC)!~00&=_<
z7ePe2me5FBfSlqWq1hs!DFSF#cLB6L=?fU_lHf>walM&I;<iQH@xzU(S@E);81uLA
z4EcZJ`F22ynpYx6wNg&b!#ey_cG6G{f%W-4nQa;cTzY}3mJGTc0I(nc+*cMReW~T-
zbdD(6JU}Bc%bxtvNG?QIwDjAbo@3vW&20zskKl4Iw19OORO32XPByq|6p8t7oe`D0
z5~$oaWm54HM$48|*3e??-SD)Z`GWObmNm%O@>6BRt?XG)$NzJ;z=Xug;11|>Q74j6
zWjvw+>(H`P8B-tRsSa?!f_u<HRz#|37BHE$iO$GTtUHT)U|IVyxLzU!PEoS2U2`_-
z)>(sKtf9qTZr&phbbLhBD#D!)mZiZaIf%*S`l;)V`>vkJY1HbR5F3{6chvmr)Bwfx
zH$d3BX`s9On6W0I^Q@z(`-u&nnN!}xNms-nv{2ot90o2fP?n8O&3$)$(0AKI8haFZ
zL#FMCjd4zdc2Il4-P7iFryoS!>fK@$x15CFDwo$}1fLDuUxP@k-CQojBet?7VP6(6
zK6v@}exovIfpLfKDFy@cCIsy$FlLRF3J&EBNfcNk$6E+z6x4Oh%ohkTiho6ri^^bc
zE&nIm0Jivo7^DSHYJuStxRp=6kfChbpx&^NxT>}46-?ne2bDV}p~tf>yGM)8)I#eu
z|HL`6@>?r|*_=zQ#>mrMAu~u)bgV&-4AL6IXhXmx4`Ja5sGy;sJvYHkYYzzk`^vf?
z*(gS2MN6r8A*cyTydcdP3YCBnW9Bh%>DZ6*g6_{$=t!thd;}874V6crQ~_>H8_@%}
z#)9ktXdyttatJUvul-H4mWmMo89@sJ^a?6cM?vuuoe=W2dLCpinkgM+I1fWcpl=0c
zZR5e~fgeZI#P^GU;u5w?QD%(uSIb|PM-M1pJwQ}PF^58+-Gs=3LOW=S{u|o5G=K)0
zRJ4CGAylG}0N8av1xVM#i|wovBL#es9Tt*6M80;%&KZD5lvqR|zo{jBsL*~tWw-xT
zt$_Xte|O2-LLi%5pOCvy_v#)9Zc8-EwkX|bmXnocJU62yy+-;-cuZ#og+pFdbJgMz
z1E*6fQTvKL<9JQ>)r7HTVV`{c&uwLaz3DPxdu9$9XNeK6$9MJGs(nm@W!foL4xjS9
zZzrN^T;<fF6p|;549@o^me?20;0t$8fb56OJ!Hl3B1C}3xkZ(8H^+xJ_@kmv(pTk8
zheyv6deT=pW5q@cnSFBF)z0OE^MBnHmbVNVGpS8g7-CDti%y+-mcVcmU)AeSHkj!*
zOpX`poKW;&th|HbRH<hP*D81=f|*K}{|)FY5l{8h?3ZEvu{Nm#WQsyq__g)8S%$ED
zwW&3Q`7WnPamSkBt%9>J``)I>)i)Xw-}iN)K3VD>r&#mE$dl{kx~Y(MjCDqo!0vsc
zZ`515PcwrwOLuc5@Wv<Keg;Q$ZkN#v?UV)nq4zg(Yg=BjxiH+E8S0Enjr*o3zL~)q
zO!Z``4Rkf4A8dW)>-VaYm`J^<u!R=q*m$1UaVLfKj!%w+{<%D6Eg)EN?Z@cis0hId
zgZBLq`*MklMIPvkeSxD$#?m4h85Luzc@%1Oa|P9)--ABq`<U3A3E%FgGP;R!t->%y
za}0Z1@Hn2BMn(w0n>l-+8Sp5j7==9%pG1+hpRB!vn;A0HIO==y;*3h{OpAJ93~u5!
z;F1P|Ae;{W^7o`VJqnXEk})r)TUI8`cZz2th0g6-#US|qH}N0S-%Y*6(6{jseRN|;
z%DpPL4!bcVZP55t2(1Uh&CPr<F(wZb%l-13#`uOV)iSBKAo~_ss%Vebg&S}`_XNN`
zRS)@mB!oGJ-tl3$+mkL6uxBQ;yfjcLQt4ybEn{}(o-(B>SqaZsG(OEolFeP>l!Bst
zPx1MCdz2!wLR9pLsTS)@)IeCMm*8XH_pJD9BE9Q@FC$FE6>fMRWVFjA@Z&z~fU?NF
zrMubpQ>DT)(>iYD;ML??zTR@tq2R;~u3shtXwQC5G{%TRdEMNuB`rPo6ZL(K_`T42
zm$dBbCwf0ylrP>`2|#oS`bga-!ZV3VHi-(uQaF)^l_)u?^R4dBth6-xT$mhg^)`r|
zozEDwcz*FYI_^DHn)7tO7&$CCcRgqjyJ`|NwzF6w=6$p`55B$RJ?nG!qql(reBtP1
z#qQok$!ibcFBLD2SAEV7Ru1Ppk5BCo-)CAh@Hsth$KP&lyhz{nK3_i_0H1K$74vaF
zT|6v##&|lNi%%owb+qT=bUbdfd2uq=Kz%;zB9K?|%IQGqrMg%!=eHdL>O$`uUoYTA
zi&`fwjs3|!wt0)M&vR9%rrxzsXh!-l++sRWk}7<~c|jxTu`lfAajI1J^l;$ip|?eC
zOVjE8X}nAN`PuyEfw{A@bH<sImh+!K=kJU4I~|MluPD)+ixlnd^u)hvx$5Jc>)6%e
zb+)&($Ps^W5P!Js?RjBwWKeH@wz~MRe{0p}PQ79B#mRXuplZ3srKRcOM+wb&jp@4+
zwWPFdpI>{n3ESXvN}G$h9O<)ON8GsH%+)l7xI-7<zxdFQMv9$X{J%fUg?st2En^2m
z7Ykdn|NbmjtnUJsBKVe?3K|4L@n0vMZLB3PpW<Q%|Nc@<;Z?FYZj<JkkN5}+op^%*
zAza-iSw|;-rl5NaE$HivVK`ZE<gbGRNPdi5)gzfc3Nf*L>!_Jm#aI|K!s5wc#>8Rb
z(*!J~r@Cj}U!-epJ<YPt#??*@i*{aUcD-QV7deM9DlaVz>a6xi*YrrS#fS<OF)^3L
z!ahH?%$N1Qf4%TU;CPeY*u3%~m4EhKD^FCpSJ`}KD9wJHhpwi$7e=_n*QJ7nc?(9Q
zQ+LGQ-#mC!H%L7A3`4!J9)~B7s7x*dMml-ouWQ_{%i_ySs$|snIa+Svhb&skg#8SU
zqLg@U#LPu0-QaUUA#x1iXJ22&TCNOIKC%mcC(}h`bERRmM*SDHHP8G<r}C2yGn{2r
zf@T|@4T>mD7fPBpnbNZ}MQ8mGJZHGCV!2<zu=8#I8{tet@BucP<CCPmgk`g@%7SaV
zCLzlHPD$EDwdzhciSCC?XyWOUKZ;%#z{|C(wv9~93=+MOrFrE{)}c;@NiVBfC$4Sp
z>oSTxnTP6Rhm7N=CADp%zTUIG-io79lvQuVAdStcbSw{f@mVP!-(mQ%gP`D&ke<r6
zCO_$cJY(7+-b3$C77*eeDGQA7ytzKP>th(N%HLD#4@Ge&j~kBOW*X+6-Ko&vOgV1W
z&BEQNgD8EnD#EOLK{R=X2G?B9z_Ufnd7$V(z^2`Wu0K}#_$uZv%sjWjE&<b5d!!8>
zA)eLrE~<2fQFMls42CznaqZfstwnp5!rjDnVRY1cewxdHmNu{5%|mi`3?x(wM|xYY
zU(gU;e)sS1S3-@rXF6DvA&{p>(Er!h;kXf>_lr&KccA<jm3qiMB0N}28dA_^r{mIV
zODy9nm8p}%@^YMvU`Bx=>TBe8j}^-j%t1v4n;&>n=Cq=p%=IN0Swy~wDyH;=Q&Tj+
z&C-7C9DP~rCQJ<3zStD=Iyw5racI!u<$841J~CDjovXAZ*5cuMF~46TCi3gm#r#-H
zo#)B7>BX6qLl+vFdvg~%KkN?Y($1%8E)H5w&P(tOF6O804i8@`!RNvE;L^^29vv+;
ztPB8Gv3Wi+Q)7m2uqC$G$ANDkHY2(q)^dJwHXUDb=(3GZ3SRE%<=}9BHZl`DpcEFk
z-5fFDdbAXezrAH3(s=r7<kw2~lW*(4x*HxIU2N9i8#Jq1UHtI=Fne0!;v;2HDE6_F
zbSZpVC)N4f>tttZy}c&bfI7X&<LF0Y?fBu|+Ohh`fYP>*1j=}BL&?R?X}k|=yTM>x
z%f-%a`{EqljMvHHA?EXot@UVwd!C++7w)G!)P7o`UgwL4+hV>wL_LfK+djwhtLYkZ
zzZxe~<jwHn&t`&8TfF5iy!TuW4}F?1TrakE&wm-ufAsNoJ^HcY;zGmdv0nINPE5h@
z%={q@O><+@#ge_t#r22Pwbng>Ek3SC!5`19U_yzWA`_{)bsmRD^Bjj#zudioJWsj<
zz-PhcCmmhbE*k2O*CNHfub-Y8Y<XWC)p{HqrQd7xIok}*eL4{F>omA!76g@pn(mJ+
zX1UQrF8DNt(2LV=BbeU~PFACpTrQp+9e;K>SU#KVJnmeY>|A>$`fGcHaohXi=h4o`
za2oTIC5i@0vCX})$%>JRivEeE6=y;3sipOUim~G{H;a>Jw?s!y0`(%&osU;LE5=M6
zot{$i!CjUe$i#k7i52d%RC=p;c!%ou>o%h#wI7U#75GJ)<!*_5@2AMy(L8#{`}AOA
z;TbV|A4T4gX2``-MeqJ-up4S_70ywxTdBUNP6@wN*f{|zosFTd&nSD!y@nU-PFK?7
zc|_=r!Wz08Xj(2#c0MyE#QPH5Wyl#vX{I}#-=Pf|8n83i%8_w8m{}tVSe<z`l-{HM
z;x@rAiiq>2?&$6G3-q_ksZ2R#0(#G7zR(wHl;6ejt~H*K)xYvFC$^F3YHD?qW?PRI
zOC2B9-e)gCJNl9^v@G4Sx>{>qkL)^2Uc2YZQQw=?Z?w4-@^ox7nzv2&iXT!A9TK&|
z6T)~Em0s)8w8<-4Z+^>35fRjyznDJX(j|CT^kNfd1pc_TfdzX=&SWLiW<7TJarirh
zfc#rinPfBKi;Vp7F-j%$p-q!b%<a%<hxO@X2XE2hM`Y{+chu~DJ+n=;{$kpqm~SMu
z6rJ2F{soN!)t!A}#Ptv!9i}6k7@!c9Dwj#BSE_KA!rCM_pqQuQ+Z2!B#5x&9@W%~|
zq(r!m-86hFY{p3|C6{UUB~||X(hslo6-Oh=xeZy;InO<F&-+g7%>q=r^w$8qMY&6O
zo(cgp5wRAHYR&@9vhBOP3WNqX-tkYq_U2Ryn=<gulCd(_SU#G1{dV_Ye`vj*zMH>c
zxU&XkPLg2smMqNY<(?hQY)eZzHiP82<{Hy;lk7CUx_cQRedCJDzR|`jQQtL4pN@R{
z<OJ1p7WgXL4&_%Md|F<?k#ulU`YR1%g)PFBonfoL??shQBvZ`$m<Nqj(TPkl&g@vZ
zLOD5!CIuVU!Zc;u<rPLa>HC|_xm78(jIpBw<lo@tlsQvHxmq#aRgK!vB~WydSGe1&
zHffk6E71tJPJ?Hm&=Br5WSpbr&8oz8UoD60tC3a22sBD$Zt5d$6rFJV^F^vhBYpmA
z&UwY)4L22{KU$ktH~V!l9o{|5PMHsz5ow=(Ez~}e=e3^es6$uZpOyuo9zM$T-209a
zk!i`^D4^FSJfoekTwP2xd1PI)e|z47^ub79(BsMZYuNqEQIek-ET6c__%-|8L4V!V
zvtC}D)4JXNbjERHm4E5S)Ns>GTT@kZ-GfcijSV%@0U#lfT!LDRXNJXTSzOK`1J!B$
z0r5NygJ`|%Kh$|BPMLd>KM{8x#1hz;_qysyDg3ZVwigZ&Il+2X@j&U&i&>WUKw%|-
z#$*sYc=o6QN5OSuzru9+IMF;U{o28q{OHbGw-r-|FUJR}Hx&!@Y&UJG#Ps?tQ8=`j
zs_hm%ZBtVkQq{I}v27EHlPkJ|uNO>DPQ;(o&E{lKFi)>W%*EVbI${~#ctAM&^F6=B
z{`<r6sBGJvE6OyUguL%_n+E#7)$Y&es;IQQlb<@avzzH>fs3leix+Iobsc}vC*9gm
zq}lTP=~~NWYuf&DpKDZ;XV)(Gw1UzW0W)>A-6m+ceY2QePOmmF55FcP>FEfa&t1W^
zHU-ty^`u40tta(ZHB>@3Y{k;2*V|HOR@+ktsPXxa#-DPqMMdU(Pz|-UkFF0Bv2cD9
z;(hR%U*c%Kw4p#ld+pXXdtmmxJqF8LO1ItY`j<itg}$BBpKP{;oVbu|C(d!ewES!i
z1uWX;#z)+!>HFDv=CxjZp8B|T=&BIom^b(Qit?+^lH}V=Y!DAek$Epwd@658H(1H+
z&tThJ3Fa%oINr9OY~N*$@k!_9T7^Gxj7Bk1uSXA({^e|v>j+0mVj8mxw;!`hM=q|u
zku>ujCxa!5gz5o;W5f-~j!g|rImzS$cw^+RR1S-;@BP9nuB>@^+oEz(F~@#C)P2{{
zk;~g`jqq7A=1t{&xCQfb9)&<2E;~)<DOHpK!AK>bBwt5%HU>*b)p^nhX0>5!-38ZD
zRj$3WavXFYRAP!hWYCVEt~p{W9T7S56i$6rXoO{>_4XExiC)h|eSBue#Ji1WrV3;(
zZ)DP5f0rWeulPCMrZS-Y!hIYyv*{RZ{2-@&^O-q02lls6{+!BM^(tn1R}<O&?&`Ep
z@=Th}Z)CQf$rq=(<uD`}SUt}(E0C;=nUjwY7U#-dJ*66-G19uoNh{f(#=06-L;In4
zq|bg@;Ioor@j4e#QdywjXg~|+D}`a6SDkQC+$9^))P3KRDjbC$g~{Co=6v{wKQVc|
zsPsZ%V;6&UO(8v~k4)B*@Z2ovPT2HEM;(oD3iVB8S8IxM@2d9r>zPLhi&Phwr{xRY
z9Z-AWp7Y?Dbl6n?w`kOjZW6`9WZLm)p5CVX;0V0jYu_-izHMeX_^62E&!6WDdQ?7W
z%Nbp4;z_yra=tPrd|ELsXGHJ^R}lWa%?Htx+Yju5mL;}}1G8=Oqxy%`e2OK_zKzUE
z_CNK<4D}XHiA<_!$66s&?Wtw6<#Lg?5S$KVsFOHv$;))hK?o%gTUjjS`S<YFIr)2n
zt>-@p6np2@<oVk_;!)8kvVXYh+|G15f}iX8^XMtc*Bjf}^Jo^>qEgmjc+PKfiLFVK
zzH7D!CDNWfozjykVm)}{65pmm<4!B|*2KxKpBFqE|GlOi3*EkxLb&CQsUhdx?C@!z
z(xI7%XGdkQKZP;(+&h%-PfQUIRiy>k43TGV1HNFwaC1XcF2q9*(4hGqJNyTOyYp&a
zEPfLHDyh8zSYzX4*_0i)u(G_+uZ~u(fJxNFOBE-rlRsF@08@Qn``KB@MB0T$jOTqF
zjg6`Ky}ON7rK4s+*A5bCCCw@yZ1mf67IQVH;<=S)eXVp=UXNI)LTUUWrLAg<cyuwl
z%9b?gn->30-=K)T9UJR`YvA{Ah6$^s5%PXA4?<p7Lr-!J%NgZH4Mht58*I~6n$y9w
z-VWvWw650yQJc}ZD@*OWHi3685@%AETuU8kcCfq0>uNv4tsfKp*0s2tuaU>QdgSeP
zWrbd6xUsO#XSxBQMuwzr7R0;qx>+Pwcs72H*I{tH)9DC{x0T*i9IhOBbHBPccmJFC
z{ysa;$GcrRQWdU+=FaLGnRq1xsnJRvgeHw6Z%i8VHZdw(jH(JvI24qo-2pYnZh#tc
zrzK!Si@avbyV%OFG+%tOnAq&kMZBOZY{7=8L_G<8J18f2vkPY^!NbCPHju$>e4bb0
zk_-jBf;#Gw(r1e8wsvth8f$IIIoiZRNrw|CkFGavb}6oGT)spr_%m+*;sG#J@CNtB
z2gnB^_>qJ^dqTvKg~g#fX}j^POYV{e?jM<<%e(GYhWUVGQGHsWT*Dgv^c#(nEk>ua
zS1qGM`3w4veziTj$CWK;p`&D$!^5=wfRL_UJ2SL=KrdEHO3=<dXW5=4b%e8CBkmIu
zxh=!%6*C`vqFnV@iyX&TEqtnCZiz^WEZS$n`CrnB231V>%wEk_PG*oLy{sYDszw>4
zt4n21AExb0wu{($5DkclBu{!(Q$rGW;)<h8V@IDU*_24>(tK<7MDyGD48v?T?-!l~
zf^Xln4q39?6=tapT!?S@oVeD^c0C^)t)fsf<DJE+xyoR1V=cxDa6dSWZvwc&58in?
z!uxOdm8m<uzJplObWLyYlc`+<{|Mu|ed|X*bQ<$MN$+Yy&2O_TIFU6^zx*8BT%$b#
zzB<R?CY=df=&R2<IC6kPYrEJ(=*N`^CLyFyPyv(>azj69r-q^gAC-g6v|*5LAdiKk
zz?`}S5CLR>&_Nsr&rAKgH9N9f?;Mr$(J!tCI5kF0ZDHUk)3|1tlRAMuMF$W#xyF9?
zr<_Z^vzUs<wkYMqm(Y}}0nz?B+*1jBnSN3_!XZ1k0?&%nSA^8+Z+0Ipy9SVcMxGD-
zjNR%VPow=M&E1PE8nu4_fss(7=_Nw-AMf*iUL=lV|FGMnWx2CZZ_;?hr?ZebV3mb}
z>vqbp23$vJB_>-2p|XnIqf?1ymbcD!A`avO^URnfNxvO|097-xO=N!(`Dk<hna8^A
zEYrBeLzht64_Ak;)q`w7X{s=$Cj<CRZUOYKldg-Nq5Ods!g}{oKkeqIKLKFb$Pwnb
ziwGw)cC>4YY?5aRQOO?}S6CMG(lWAWOKZTlEZB>wN^sYB-Mm&=0=m-g%@)^i(emhg
zR#l6x*sT^4(ud9|#>bF-Hh8zW@EEe@e5M}rYb_MyL-}8VM@3&Ovzu2nYQ*trRu;_3
z7t|%Jt<75VbFtm)?-)g|dvA+t=5vy;T+!XlY1uZJ5Z6Z3LjDf=C2i`>k1Z=oY@gGF
zDW`odr$s}HrZ=ulDw_xQiF5cg(RNL_WBp~>nz}3mxk#rK9&bKQ{IrvwNG265b5JbU
zv;!AkRH7N}nl3cYq{_P^Y4w;?_DHqR$tGRGsSN~0M;_X#KnC%j?`xcw1MD)7p=^>~
z8-Xuc4lDV)lfCeMtKl8Vhr8OvR<0J(lWFcu8`F=@iF<&zsj$W3`Rxk^;*lyPw`T#=
z7irl<nZTuu^EUES*W~JBW9n-=Aaq1oQ(tZ9kNZTpv{m6J!K=o9^sr)=z&k4Es%{_O
z5{8;+Dnszq*B~@qDtlN>s3{{R{n`%mbst-6yUcJGp~`U5!0+&%X<EfrlXCR!fF9RB
zPO8dzc{d4Y*EQfeU$lG#<WL}O1A7SA#`+C?X0~cGeeCYvezO9vggmKx9T6}c9`}Ps
zvVU|Ia0@16U%J8_%|_+6?%P>r0yKBqay-x*(>QeID^|4%w>E1A>3oFp#vjjiIHUWP
zk4g~7@tx&$IPu1k=JgX_{g^DXgnL?mmpf)UWWCb=L{yFaT5>1z2USIbF$LyBMjK5$
znH^O}K21pQh*(W-$rDeW<kY)a2iDSGJ&ik<Z18GEma-w?%F?|**m?5r>ODxHJ=>u^
z#F{UrzmC2eYx$1Gq>aGGaK*Iz+b8RHdD|uS+Bp(jGg$#tLhh>Fo<Boh$1O~EMc=!w
zEoOo9!;$ROY)V=ON8^-d>x-0r%oL8}ujq@3RI=zsl(GuWv^DGHhh86MTw!Y~5ZX1d
z1iI9P)pb)9slkSA@2{1(?z<US^;89p;)lWp`(|(8)@Q2{bMA6(`;I(*=2iC6*@6@+
zDqG7GsAkT0x+n3`E8g)HeeUnpf~_sGO5XbPz{&l=q|045UQ#nJqt=t*jyfJQyNwrf
zo1d*nmQOa6XjVKm`VN-c=fkjVQj~WU?YlJQKejdbgO_lP?aRdizqzf+H0S&VtJ>=x
zOnCnop4o`<^Y|v~F5}?4SS697Lk3y<CJ?^;vwSOE%ifT6T1h!gmh7FzPTv(y-5nmT
z#!=V{Cpbj}JY+EXEIEmYNQz2%k(0@)R}FM)`$*~SQge(?x&kcBG}Lo-5)U4yl}T=<
z&Xx*Vr|OTcJ9MAM%D~p_Oqf-38;NwSh;6cL8Da_74IJ7m>UfC7{Je#xy+-F>>UGr&
z%qA(x^{W14dPy*yxm=NKba;1w>+UBEw;P0*0X|7t77>|WKpubZ1)rA}L6YyJi8yh;
zDfshAS+=9az4l$E$kI;nMpMWh8OR@{=}!77og&&ih)TwO@;w~7GpiVvG;?o9<qF`&
zfcrmgR8W@hq0{-n3v;_n3=R=kSJ>qfLGfR{q<O6RkaaUMw#v~?1Tu)M?<T!*YeeLF
zAn>O*$x2#%o~5)ydR{WUx307b(WnaP(~iO*7+}A@EHwTzhRYHyof$s)lDv3TU$-Wl
zG?lCq$D&Qnqh+%$^^+?TTEpOTGg1A!&uO;2YfhL!gmPg5DNO7O%U?~rpTG8>Q>A+3
z+VH#k<=%{|o?FS*uZ(|oEIJNC&n|)@nP1uD-=v654m}!|<rUvt+VB;h!RKkuxpHqb
z*A6cF#BgAzD>r9L7kFAgYz8);Ez3DhAh1ktHZ@N}hPdVjqx-~}#B*a4$t#zl6^>GF
z)(D?mkiKp1VVir`AQVa00LV@D5$Z4ia+Br<l?!?Uvm$m!3vDLNcl@P~wcn^8?IpJ%
zIB~3ki{$oyzrxPr=dxQnDJlED6qLKCW>khxY^M<U#E~<N%oPRK@qLgnc_I=&fKgh>
zwc=XH%q3DE4xcnWOU^3u`U<}IbpWVvDR%(^6>3)J=>^{IGe48i8`1tMjiKR2esv5H
zDs7B#0%K0U+!luf$Vhz)2)%Ij*$0Ga2fiTkwlXAP7D<Z2^E0d5?B4PF+Rt;tiD=*Y
z7Jn)uPp}N$42-|8-|S={i@*q#Ph#H}fl>dpf;x44SfbFIPB**i8?CiZ$#*Ib0xjV<
zo=}S(_zeqSb!MFChNMY5MVQu`eW-lby<KTMT4hI3<CwKm50~9h1^B(K@jd-)!%>2G
zpgA&@!dgj+X01fe^~_P^@F#HRAC}&h<A}|sE^UZmJ@AbUjbCZvoq&9zrbZ8!H6|)m
z7v_^1q^oM$d2%P`3U(Vi&(I=uDS6M9i&RSaD5`UOrXZKp9bz%+@)`_^*4jbUuXo@v
zw*XaNxLSE+Y&aTkU?bnvRso($!rTBZoVt|YfV@cUjOuMu-7KUlu-8{PEF7iUy&E!u
zc#p#!i0U<@BwIoHQHsci5aehu>!%~gAtPl+mFD8cp1@8+NiYzZ)pr#o@@2Y$RB8BK
z9{dSJ$_1y_9_sNZPSM^?spMBjC0mY%zP&+?ZcY3Onse)k$2|IL)U9UNH6+u5mZ2UX
zm;Ei9C8JB(-1^$PD{C9o#qK}1IXgaLL0Xn`6SNo7oO}z-NuClfrK(`ULWNqjrFy$(
z)yQ{1P0LyE`aN!QWoS2d0!y8{5bCllLgVo#rV=r&Gu?hm<lfIeB=7<fn5j|aRVRNA
z<76h>y7O-myf9dl@nHq##}moxSK+#~xMWP6*kr>zQiJ0@9u~Qd82=9*{e1zyG*lu9
zGQwQiR5?QakBS8Cw9l+a{mMqlE(*v(Wp}R(A-c(Sqrfiug4fEe8oLuj_X}H{%O$h9
zTdvoF`neX<I;i|q6ppB>d}H%4f$$6yFNK$e^6)Qf)!`ni=*oTX5z6&n0{4xzQ~<2f
zwSz3SfxmlIS{ka;Y2<4`JfZJ?|NoNT8kB|DXVm?Vp{U&kD#gz1dkn4L%#K%pCis_v
zzSLhkLDk4akYZN+kBa=^uT%%%?=8$PP5Ko7Bkt^lzv3?ZEpCI|8HBjs&)u0p_+g0V
z5bIaw9^q`fQX(hcY$Or?DerQGyfyrQZ-hG1|Fyy)5jZ^{VJs=`)jvx95-53SH$?S%
zS<{~XZ(~9z2yQ<rBCSn-FI$-tIIk^OwJ>R8SAfCU$AK!1jj&pU>uQqLB^%E^!4dZN
zACKU}LV#^_R!sll>-VlZ@JEF3ci%u821EWnGLk@(L8X7#@IXRq4cZ|0Q3W5Ce}szS
zVO0uE5f#xe*L`y%5uK7FNPZa7IB!s3z3%3duhqzNE$O?1(!`CPKouoeh`EV-cGC0?
zX=O?5+K=Z1-%VBAT2JGX>`yp(hfxzvg*%sCG9BA?Pc!$+nSmi>mIJ?vT5s5`{>d|M
zoqdLOV&<&L45fgq#yi|Hj)NA%bL0Dh-)DNP_{vwj20>j_f9+r!J5cGq<%n0he7>U6
zoq(S?vbznbc==Z<Unt*Jc!4=f+E^~s7pK36C^SOC92^mxW(2)+i#LqcnIeLRgz@F0
zzYdI-MlB`6re@Wy!V?TI!f#j*m5v!=BsgnMvv7<&v6J}2kT-6vh|mhg_oDDOLYry)
z+@FE(dP>e|nKdNSw#JDn?@_uL8*hO@X4kKJwH|0%_0;3EmOSwJo>^UPDX5n^8?Re4
z?U<AL(sNy#JASr|W49DV3dQ>NGhS-(|5E?ip4E7;e~;1k&Op5k(d@w^J-*&i^{X6h
z2eO4i1xDr50oJ}O%x~U{bnc(I@h*z_<Gs_5kjfbjt&z)gduM9pS6Gt}exMsG`!tsO
zM#NX_Nr)zqc)M;f2@9e4$@(s@L6Zi~yUJ_6g<);Nu_X*TUkffzt8<@EaMeEGYbBO2
zPhhFEpw3W}Y@Rw6!GEe8EjgdMU|CI4>mK$IHlUu5rb)kuPaVKwjH)|-#Hndcs3|M;
zv}!+*rC92NCTXBcXyM15cHtqLhRU+ELhC5w&r@VRVko*5a``dleC4h|yZBE7`RudR
z&@_e9>!J?7u4SSXO=H)xx;%KQ-jyd)q$5ker~dJ1z`~!!n0jqdS6Lc&rEpA?uSJE~
zzc6(`*CHO}9Xs~6T62=MUm^FnqdN0@^^b}cYT!7kZkZOvvSnbnJ^jV|u}^02DpULs
zly;68<LJh6?cp33sQDL0r4HwzX@0<{%`_)lwu}w=jZ5vG>M}rPN70^l5=GObXyxB$
z-ND)Hm&mgmUY_Zl`0)XMK?6!vQloI!<6@M5`mz}J>T3FA%qCTq*}mB^-(IlMRF5RA
zW~qHZw1riw&WB%Jus56ApcHu~tMC(^&2@fde)Ihl1Qvt;7OSB=G>eXv`4wJKJnQSS
z%Kn++g4iG_@YTR_^wQZU52W*tWcis|nT^gqa`*;XLs-{>4NEnm)JkK*Kfp?~P*{ue
zAnTb=l}w60l7Lg9uxtW&Y`EA@^wP+yzETUg0fBr<=rQ3CD}NE<!6@ufcI-nUSTvij
zdY5~tEPX5UBzZP|>jORrNd!JP8jx*_1|u{st;|6w3TqQZA2&XlZ~7jFYEgt)m_!7R
z-3TAXgjdKt3=1HZeF5-@9nJTRx(;u$4$1d*$0}u)?dYJiD*u85)gXV%z}3wh3n?@<
zi@68EN$frmfQ?>jhZnQv!<opT<Lhw{xdviiC*|5)?r~!rcx)MUkqTC+th4kgDiZbU
zT)5+FQP^=pkW&3xG}zR}AB@0RAXoB2HM1Df&kv1_ufh#&Agl!lbP^D3fvm@d1uV@;
zp#G)+asB}mL98tK0Rfzr0usjkgse!NftZ#4cB}g;0o<Yj=fC-Kc~l2O*lW#!Xd_FZ
z0i_wIR8Rf>6!DJg&jvc|L$nD?D{5=?C91~;ZZhil8a+pEC2E54aDAo70piSry|Cu1
z0P}juu3=krxE>GwC6Vk#CebKG++79~D6kJ0t(oCu7*??|=yEz{z6Znft;n-PTlwKY
zAz>zf>1rrNQM+bA5R!6eDVZc-ANM8u(A=0aX0Ti9?|e~(D^x=?$k*Q^nSDkIL<!D5
z^(14hbc^^S&U`40G|&UP2-vB|5b2d+7`_HCP%7{NNdkm8ah|uM>g;$j`!2<oGd^0H
ztR2hhM@mU9J^?!~9w?Y(QAuL~>)`{SH+dg5>t%p|7rPmuB;2nK>`U+54!S$e94$or
zm>Z=io*f!j?f1Vrxsd`C1fi1%{$M9u3U(d{7UO>ei=g>!Is|7DSjhFiG|Q1<_Lk5>
z{)+XF$|yFW{fn6&uK>oQO}yK~2HMq{RE#hr?(qP1W~j!;Px<ixF!w}1O<p5|jdtS^
zUn_~-M<Rq^tuX&@!QQ?9N3cm{6ovAvM#tG62x)Q0@ihQC-AWmBAcf&h<SfaJ8D-Ck
zMHfpxLs+LM|4}n*O*fmyXIQ0`SJ4nsU^e<KFj<7!+_{UC*T^|>`D?EYj42V~$I%~P
zgx~Ugk-(oS`TbS}7Ije=)7w4>g3`8K)QQ!V;KS{0G1R?3<Mq|$^Y)V9XvoRZ);`*S
z@L5+kOVCwz=B!@>&GWG@+PSQMu5p#}=*?=e#K}tgxiP&wu<L&`xr$XRNp`+v>)&~}
zX$!7WPhPxET|G05tj0&%m^mvGt620uc?hw<-{Zq-dw(uk5YR^@uipEn`ZQnE>xa@-
z5#Ni!4bI;8H4X)R1{B`pWbJ)u=iITb%C|x?J(zjFXha?4zft?eNmy`oTRD>afpZT(
z^=tA-!J~7j`qjoy;ZLaf)7AvsRFgaO##af>{08|_BXOOt|K!eBSnz$5?nUr1Qi;Z^
z7*84YDCpTXe7Gy6VP2N{Biug)cT}{GkUexO-}o`NzpvYayipNaV~R3`Yvrom7DV4@
z_dn3>ZAyHgAhI6eOt$6ClHp&TkRP{ftyjo!qc(1O6mEkuHhUA{I$!gWGe~WtcM}-L
zmU$;I>5vjJ;NG<e2aYGQPOkfXCY%DpiWiP9mj*2&4S~iX{M<iI6d1#-v5}mwx`KWr
zFVa6_S5F4gniY-t60>#^z?&ZNlpaM7RrVqcun<R^+Mu?`@BSOfE?J|^4eU~tF*|bk
zxVsLWbH`BFhq(7?=YBU_hP&v(rtjHcRu?kwyxjazQ>!z?9?~WXt)5E4)KPaUnfzR<
zJ?2LhHA5}L2_b2i7z!7y@-H`KH6d?Jx*3pNj`GLfWS8;9l|=AN2B>$jTYP}B8l%FM
zORol0-6-{^AApR9btGV$2crH}${Xvgvcz>hK!x!cpsYn#eLHX70JLZLEqRoH2$E99
z!}ix$v&-;`)DA#Qhzg?o8$tTZ&Q?i%dGBM$u~7bYPeC-ZVcredFP-2f(V{T=hAdjl
z(#h<%)5Rke7uW+2w|eBKaO1}5|2}km-347e&V#m9)`$w0zxJMalK!foZ(yI17bR;C
z!p|pyu!DhxB$gNtuJ^}bS`?uotmN_yz}0l-*j)Pgs{}~kTYp0W68YC=u*R5w&^PJe
zgcZs&!*0+4Qqkh<K0^QTG=E49zmOC{lKQW+xPSZ|(o_Kwg=+Bti^c5_2&-`~eBfMs
ziPvI(K`Owwp}-$EPNP<jAkYKFx{4Q(7U1QTG-efGvY4FRe?2XMi3|z-6L$;cExU&6
z(SRRw^=tJ>`zL~AbA5tMW&wAzODctQ9KiR!*M_RTABLg8N}hsr;OSr2i(nrz9cVE`
zrUOW6#)kMUZRbFWu=do%{}B<0AVBt)5#&$;`cDM0h*-kU1!uWo+VhZcsrfV%EAF!$
z{U7N5eB*xV3fLfCOC>@P(nN0~|1FyEY$q&u(=(6}Xb6D#ersG){~uu@u-ORZMupSv
z!)P%7#9`ndQ{518_`h@!iH~Ls`M)B8h2DcMWYE4m3}PAyQctq$Gb0VG2HxeNLU62r
zo=f8fRP|)}XHQ}RWb8}N?oj=WmY1}$7+am6qyI~uNnVg~xp>I5x;`z!#4D;G<2rp^
zLWtx6dosz#0<$!dEkN`FHTH8>e*;RA7qHMr4gTjZ>#rds8rvUGT+oQR#=?PAT5#UQ
z<NFdKh`lBEu#J`Jhb3hp;C}$zbd~`rfi;`&0Z9edr->bwd^DJ$wbuhGq<{Y>Ef^8H
zOi=!pF)YUGgliBa@&V=uEysv!kwYzI_@D~?tpb0w5v3@y_?TlH1!4anfrpuoQ1;Gc
zLy?JI+aE1QBzib#Hb8qpq8Di0Z_t4`u`xV^GEaG_?3P{5v7e2tZ>7H<#>PZsdM7=F
zJq{dbFr>mGU-5STccS+vYFlVOM99kV|I$kEin#}v|HN%{d2~4hwSk0x)ZnjV2@v=w
z1)?JT*B`kel?=#L4fFq!Yc|!t<f<M2|0h=(34ll3d;K%N9;@MHJ!rAqv^sHCXQ9tq
zcFFlPh>poVypVa@_oPRz03^-TTj}4^5S~;z+;k&Qoq^ZLLJtMTp?Ay3B5<1iZ^psb
zMNZ)zXxZQLvLP<5`1l|aRC18t{!6X2k{yanm5?^_L*<XKSk$nKVuoZ<5Sh|H=8AuQ
zX|CRXWQ7Aqc%;Wnr7F@aSV%%62K*JaAM1(hEKi&eT!Y0K_2WEKkLMpw#z`X7AC*hC
z!~99_%gvx4jwPm&+iC9NQV}ja*8iT@j8Q*B!YY_+Qu?Vu!}F3<`CO&6*Yo_*aG~~r
zxt0T#{WCWGl;rx=i0p+9{S+%j8Xx;Dl-J~V_38>HJT@9JW*;DgM-3`#zg}DmJY}Z;
zqVYje_6{-IQAw16p_SwP>+jDv!c!fRKV11h+30GIx8fvCwBH}*n6qS{eiKW+F$Qgt
z^flV?k6qGb_Qw(Z4DWeFr@EaPY&PEUHHO_MNVv%eoe^t|S<8H`(ueb)3ktH9e7E~#
z)4GodZsR=Ph;gKHWHwGi5Ai&0`+~k!W>~JVFxDCR^W^3_?^oIuMa55wN2ij=AkU`3
z&>Q{YCd<nzRjQ!)(yHYS2r#&&Oa(e5{|+Y5oWCh_;IQm6!+NBB4{mU_4%4Ch6X;`s
z4`_=+VKJ!;xlA>wb=<4=+hiNCW5yjJy!YK`$XY&h)SNM;LPsSh+8T63K9%x5ReiHy
z=LW~V#{5Z~uE6}Y&q|O8Tfy?8q}AFj^9M_|G*lPy2`%yFib)B|_WU&p0c`q1EdKJ*
z4z4SiZb^pBDccsz>Pi&_4q>7Ss=Pd!dbWxM&?Ixq*9<&~4F4Z(Zy6R=uWbwCE-h{?
z?(U_<i@UqKySr1|-QBggQ`{YjJG8hIw{JoByZ1idx%cP&1rH=yGjootBxB5#9PjbX
zK%|ffVzNjA)Vxwwnqoo*CQEy_L0Dmua&4bu<0sWH#4%RK^J|@vRqo6*ibf1mwOu9Q
z&m0h`WP>b}zI-zR@GPqeHYhBCVmpN<vO7ky^(?KBrWam5WM<`psY;cKsqqlmrhq}Y
z@Tp{K*}n^axbn#tLr6~LW~(aDN*)l|p#t`(aATVC#|eLiL}HPQHkAYOFATvjX(_SM
znna`Gldq!?a+76cx$F3B!q3W!YS=|ICTFuj?}~TL`>6VUl7+8ObP7@um3GoWezPr`
zQo#?fWRj*dk*p#o8+Hz4tb|ua8@;7&n6M)p%*^Siw=)q;#EItX77zUG4@LN}uw~>4
z!Q;GCG~y;KbBYY6i!^`ZNYND(KK)t{HuA`IloG#Ky)9-Y!f$J#>cnxt+VwDN6~|Nx
zzmwH2gg<}Y>hqe?<j?5Ms3pQ%vNJ;F<ACMW54GI_@QWLTxyE{fFz5rw>WEXhB2e;%
ziRM-)Lm(;Nf&A_4s-nx!*r9iOR^K@GvfdLZS(ok4EUe^>J!{VOlfQrI-~A(Gq~5BX
ztCbqnIj70`yhFET?T6=`>hR7RxK&|YQgDI;i+)vUk9dn-4egv=F_P!SmMZ|i6b)|a
zp71eA_=k3R<7T72<1MOmz&d2J<Pw1{&IEVJ+5XIcb*N@;R~mAsVjSxunrgs01jnOi
zfo^W#S!>C!W|&Tykh3rh!CT3Mo{7_+M2|9pw|&1lKchVBwIg<Z`0~*UGoP*R*Waen
z{#5FGxvydfGP_N>mWpFL7P#Zyb5exlKs6~o(qPGg)ukf%laj6ANv5D^RWlJ#I-F9y
zhfDNu;05>lcr&?37!EQ==mEW6!=#E}&;$0vZ7RWKfhnj50LV>L#3jtiVfo^XL&PB3
zZsj_P+tkusaqowVy^Z7tS|`n4nHnY)%anB1X5>-ybyv9(d=_<NDG%{m=C~Dmf6h~`
z;UKR)9xGC-m}vts&e{1Qy_J6}%5K}^d$Xf+p`K#`y0QE&hTx;*Tz{4w-g)q-YFGru
z_~9+)rRC%C&#97m6<W(WoGgJy+@vV0x=I`I?0#?C(t7pxtmqWOB9N#%3crSDsfK-j
zQ&*P``}5}ev14t%FVQJo$rXW=uP@>K9a+*aC?~==xAoRf$@(U3hVZ2md4*Yl_r;RY
zvNMucqb+2^A25qo6&(1pF{pgi>L_H=N(Ci<L(B@!=l0it&Nih0Rjl;>Q^g^hZ3@hc
z9X;b+aiCZ>1})rdp_#1wXHdtO`eIuP5LO!HSvPP{zBS%=pU+tNwnip={Hj7QZd*#u
zG|tee{(2FPCw<OMk|O|;BnxwbcB4&;H}nn-(}LhgWz+GZoO+J`9d`+$z%}KVnj?6O
z^n?Y0%;dr?JsrVr$Jh3Wp{R8Nbctwr-<DtnhADokrV<|lIlf{6s&5#ARLNBK+nt|6
zW0Vvqb5(e3M!%B_`pqNHj`!q?*PrCW5{aY{#1%eaiKLnM)}@6?!A$d$iiBY-n5QyT
zuGWORjXD47Zc#B;-Tnz;j#k=JE^c~M4oj?(M)3XQL{MQ0%>1?A<$+?=Y>HO0HEgOQ
zsVH#eVdaJq`eEg^+D^$=d}$b{&rRF&kSVN|`_6R3T&LH9m8q+KVu}Mxip_nQ^&@KY
z@iGroBjv~gP%1sX-EIA8OJhIA*4-h@Q4Qwnw4uyVH-(#ox!g8OA?Me0exj5MhOJr`
zwDn=IB8q3z^{dTFYU@>47n-+4JweMPrA`*T%Y~UG8!R^MM3^NrTRD_%E%Es&NoYk4
zE$~ltW{M#Wh|FcTRr1GVXNx<{l*+g$v^K5eQzm_@V41X+Nc{g-gaDj#IM~~)t6sC$
z6keJktF>lqUGztxYdw8rf%W6>gytGtDXP1qbf3KbGxgBt62rOGSq;r)atX&TD@3JY
zn<`I;a=L*f2fT$!HVVP~L?CleN(j`@0CcjUQ>-%1hSCK7xwerA^fO{b3w)AE%Vg({
zzC&H(vJS?{0oO(~=&0)ke$bvd%76C=6gxwwh3hCZyOTrGE#}*!d9btoTotUwn6>4X
zV>A$n%!;|gW_nB9u}IE1d-0od7RmN0g-$vON#4sxVl1jJ2gdSaXgs6{I%>YcX3<p)
z6`7g{Iy-uFuM8Sh3{|dR3{~L|Wa+@Gpdj!dy_kY%Vuia@G%EgxQd<niHs*kvL)_WN
zJNfK}+PcSKtk$71SZ^@cV#)Z%tH(QmqumvSgHLnt^z~+6DbI!tn}=AvdCpsgmw2@M
zqgwPdey}13sexUAqs~1}6&V9-gY3ncMlZuP;SxuNFNs823*8>~zvP)+7QG3Hw=`q@
z*$_MawEp}GEH<e7JkJP;DMANfP<Ok@nSMw@dNSU|ix~u%)V5-8NAAYd?cpHjRbiP6
z<43y2=BrHp`YJRY*)fW<G@5$7qhskenkt}UnF~2@MfI6bg*ripHWjU0a<2A7yoBf#
z;Y^3<LK75+qG_sexauC-*)UAzD90Ks6Q3mn$=&AV=Dt_ft{6<Tl&Z~Z(i+wVT{&3z
zurA>nAzB(qTKUw&0;PTHLjZB@a6h_q7#J1p-PLnEv6N|O<zp%%sccFQX61$%U+f)_
z_}Y2KmqJY*Skb+~G0G*QRpY7vyN)t-jtfx)Qy;WjD#(b4ss!Ww>PvuUZR$NYmfMz)
zkK4{u#0Fn3!5s{zu7JD_4iYePRN87M`6<|#1u;^UFfvGU`TFvbZ+u#qsv|hSaLQ}L
zGqOZCH~cUAFjRmUB|xV_!LQy#4j8o~EoES%FNv&lA9NyGER!8e&=|iV&5?VrLHygW
z|K+g4STI*j16p%DTph%bp7NYAbK+*ud9uNBQHXgmHJ}%{sDAZwu=Ba1-Af9$n=A8=
zj)K*6wTX@$d$%4DvBt@)b=^39<`3ySz>B2j<Rhca>x(4e^IBB|(2X=2c1o2rDtq-y
zXw2@GLACi$d*>YEIOr1$=G2|Tcz)|q4sWKxxLW3}*w!H1{{Q=r0e<)vPY`nj&Ytp$
z>eBKd#GQZQ^FR9k*z(<N{zsu6LUmX@23sU;PiAHgULcq0B?-Tk#e!nAZk!3QX#1&4
z^?9l%vGk);!Y&!)5tX^FJZnSM2NNCXB&4n&@Sf_NvFahjE;ha(Nun-5eQ$DqqLEW<
zMg?nN$7&GRRf*UoL$~-2JjV`rPI+L4Bz{J%?a(KSvWf#1ek+g$SSAY;(1ws&cd&*u
zF)Y)2@81on(ceZfB(K?*%JgZ?sRp`QuzI5I7t5D>7$?%V%Vqx{kT=XJC9pQv^o`(>
zUNXNS@3m*D^Z$hdynp)vjSKKY!>b>v+4zhkiK>Aa>+Q`Q_wAoB{e8@<x7oUI1OZ={
zRZyARf&cY%xny0}lB6Ixgn0q*`u&Sbg-BmuhAX!P1_2H7_aHX<$Q`KHd4cS`3NV+{
zzs@E9HfA#zh~_@wTQu)dw=Y>kGj->c)K#_Y6=CMdM9Lr5`IP^U5Xh2G(|JSM<t?6Z
zM6Pk7<2~u0C9|@Bj{ttHGzw>pqpvH#e7#dIbJcmOOnaT6uUKDPg44>;bgI&qN60{o
zkH~mQDPT>e4o$my>Y|R#`rve~zCTp>5X*1T>1ZW|?+Fgly3P{~ri3+*M!+coin@bF
z@LsM<0G<+9F~$)=28iYRn8@b)lq{iT<GiN?NzqrP%+_A1T(y$#s`G?H)5ee|cp#D^
z$l}ff!?oBEHue=wQ(}Mqbc8W+?)=5TYuj}{_YMt49<)swwBSHK8(95&!YL@Gfhjbv
z;jKth@`l|U{%%W$9QB9;Q(P|KMc=0q9|emW_2k&?J0`zi<)WD8epdsUyoe`)EFiIz
z4&DpRq2tGi7!AXrL-c6#@{j;DNiT@x;;$>d<74u^r?wr^?KrYtlo$P~V_1&C8hN0N
z*_0E-e75#``AlhR4N;3!^Z$$&T&Q2Y3@~N|`<8&AU0TezL1160H{R#UwE?U}^4Q~O
z+mCSa3pg6j1reM27q-EXAg^ptR93a(d~ShFUv!+0fCv~WEs1X$+!hgRfEbCdNzMAM
zQs)w0wirGKi2ipDn;lRW=Jh=v(+AN;m$qc^#Uz$-%fq=AH%>^IedHpaRjFc1UYBSv
zvO!8-qI{na47n~zNShcieo{H!ItsZi1xvU|M3{UK14>Afz5W(;ZUkvT=)wcN4oT3N
zYf7E1wyk1E_O~dEBOA=f`79%Ur;JY0Y#ou6_c<eg1Xf6ZiJ+*o`95iI8~-z=?}+0C
z6Zu0FF$Xwl<tSiSX(n>V%joKUZvI?D==@=J1H)_Scd?80IDW6dX`?CV%BOPfJfKaY
zJ_X;sq%KkV-0x>5&uOb^$RWP)h|P^a@ucVOcz26BXM}(Gt8U)OyJxdPT?NPRS3R6%
zhRNmcZD}QI8)gHxKd$kMT$s3qZ8<`}BscO9a*D8_^F{?+<4Y!6D}EKgw9AD|hOr5T
z=$A@ZdGdYeO7@fREn*B*2NbtsD@jOkNwD(u@f5ql@RE}~K6F}NN5CLZC4h8_+hv1P
zk+0V&0cbNoZ&5hu(HUt6bEmTy1L$s8yZ&iQM1%4WJ95STmWp42Ag_XyN!+S1mr*GO
zaJQ@up*oa%D6H|TMCM4h-v3iitHAw3GF;2&#!!qdCDqJ#?f}K@Us1ba1dyF-)w90K
zU+JN{aw~MJCylCSNdOAh*g|<$N%kav@F$fz$RVu|3Sq&L<4eMq#AP&{F%|e%{cmx2
z%5#LW0l7y<y!}uflob}BxpZ3jYeH)QNo!eb&_u~QMNNVVbUysQJHy+b`wbUL{eU0(
zwfC@0KPw+gb5}$m=Pd>4dlj;QjttqQft8m4R)M}T_f82tIyqziZa=p$)Q%ior4haT
zolb(7538z`ybr75n?bKKRt__uPnNW-=8}QVLtxX4Ie)?2m7=P)qIM&EB~k$uv=GGn
zUrxdWfv0|L8~e=?6qV;bmabF^XSx4`VG1Zr^=M;b{`?cOYwvOZlm0J<RujI9%nt+t
zAYiRQ<^{xcR+SD&v3s@(UgPj;4^(4EJ{zFJL3{thjVt{1tAD`{NFB*Kh}Z54^aB=A
zFQIh`7FX6Alt2>z45@*vFhX4Ybbf3B8Q(la3XLKifq5=z?W_HRR0#ysO9}>(z{ge}
zeE<&IV4@llpY)6A3{7heS)+@30SuFBDX|ls8Ub!YE+&_1$-$5k;GXD;+C-YGjq6E&
z&{`9VWSY7Z8dlg^vO$BAXb@G@&EQt@`6{Y3`i^|DXmrbK_SmwTHw=B>7cN?4RzLxi
zzE34_{|YZqMFrIm;9wik9|ed1ny(`{=U0FPkm{KzfGiUWNT+>(bov%t6)KW{x#tg{
zQ366=9c5Q)DWv$n_|*SLWq%9<WGcYyznTC<6&<N7)daSDIaCYgl`#%|9a)>f{_2-E
znILRgJlq3+Z4NP{@rHxdk&Nz^BLsb=nC7-f4ZvR2Z?ci@qp+$2Rj5WOX(K$Z9GGf`
zy^Sb;K|(+>6$2#G<ToUg691**ssB|;{l9P)_8E}2698%Z?;t4&2l*@fMg!71X;-QR
z=)dufeRPLU(N1QWsxMtKM7wtVORS1j@%>)~v>Ltk<Eyq)Rt_m{-do@Lii4Gp2H*x$
zKTU=+zorez#Ss8<P_2THPk9(v3K6w|A7FkhSr4)>QRvcvns}lcNbTb2l<GBJU@wDe
zndE^1ucRM<VgNO~^MX_2f=YuBss$(pl8G^Y9{dhe-$oS!uzEuRj*J0h7)dG>Gn6+E
zeR%T_nhGK6+aLsF@&CN6&|V?KR-#iP`X=u<Li}Zd10`M&@T#}}gBO6T6&dxDoH)r)
zx0LIaivt86KyiY3%RcCWO97!)c(RWz9r7YpSEN<Gc-h<Nv`1eT3&g(bZA+1!Q0^$9
zdDP`z`q3fj=R^82CBvds+SI8w_%3y3U|s36@I<gZ=u+DT3fYbytQ_6hX+|_W5L87v
zn3O?a>()%5K!hm~h(C_L?rMpz#z)7pPY?S8n8U{d^*Y8NzbN^HNDtta7m)wL%@Uxi
zqZ=rl;r4ckw6pw#SuR!Q>f7lQsKLND4k_li;}-_jJPb*Q`qpHC*m1kWeDpTCd<;Ug
zVC^@9PZ#eE4_(p_3Wicbx?ee?blvxZ+#$+lsh0!zg*?I$9O;Nk4f7V+yu`Q?(cgW=
zBn<q+a=oc=1At#-LM+}<B_NWSe+RA-w(zlF!;Ng4u=rs8J%@!O4v}uq@_I4a6Gi?j
zH&+}&ahP!&A=jm+Re_Tv)Q<oI20ke$s<0S@H!=1dQw#z>X)Ir{0#kCiB-8;&5TQXP
z0<6cEeXUt_Se3Dvbr_eMhsJ?mY4#g@FD{vZmIpwuuDkXMuF}6>PfDhfg1^ANtM2;(
zBN#0zpVB6td!`(Xq)vD!O06iZR&vi&QK~k%^D@@$4Nc2t%s`B3z`P#b;#RIfgt7Au
z0<wl9&EP~HuETO12#)Y7WT@YwY!VQjboc<+W<WKDXHh4>)Id8a(*O*G=O?uT*blno
z(lN*j{AQ38d*$Zrmrstz&S~%kL)*;N-D*qetlS|QCK^)gQ>M9HW8W4vM3~P4S0PK7
z8FcySk_q<tkKm9+Lp5w<2^5<N42UoT#CH5-LNpi@)8Kbrj=Q}l0(&!>wzPU_7XI9L
z&>dY1?TShImBFSTrnsb03UoW#^E=aMk*E`*YP9#sz*h3lVe-z^BvLCrV(ByNY0P1z
zF`d)%On<b|{$fzoJoTG>=68=_e7W^g3ui$oC3|ba56z+#kIxG|!IwM>N`=bDZT3YW
z?1qR|bqK~0tH3h<YmCr*GJ!FoWhw)XCfajJ`TN@0u&>72V){hp@w9eFOO}Q<X{bQ>
zSQ++o6z3((Q-)Kw1imn1(!NmPl;{By%}~cTg`pxv;DRIy`a(;*77kB(Zp(eWn?z&O
z)+ohGKPa4w9}pb$CSk#CHnKmcjZg_uT?rM4=mW%#;>wIA_0GO8iy)|^Nrn^O%#V7c
zVHF<lM{iwh$z^!HFR(u}S1UUt(Hq0-C=*QqMd(QZwOkvS(&0A(Y=*MDjmD-E^AI!w
zMiN2}N(!L@6|+PT{`))h3Yfw0Jr8et$o;E$+0n)n-6d{ji8dBP1MS}U80mdPPs#8j
z6jCUw1q5=TW^e`V^etpaB1Va5RR5OnUcgFvl&^yVdN2th2sv^gy0t-jp^11$M+BF>
zn>sp_^h#onuxwV&2t9P{DtK(W<T_~tJ%zM{I;|8MN{0>6us``pb>I_z3Z|7BN*=;P
z5gLrERV)jin5uRz^QqM7t<rVSNKGtaMm|XIlqP3XptFA2HX5_h`uT*f-Z(+Y6@y7O
z=*pMIy%QLQqQwXkD6tbL6VmpMDh9LA?9xvOa|hDkyQ}R^kLUa;8@+@$Gy1iCUs7M&
zV8^$%!J@exi;8b;O}(`YX_zGknRTXf+(kKcedgK@>_~HjmiJDg@n_er?;H5%_XFjw
zTyqpWwSe6NCK`}O_>zf9iE+&75t8=tyT(jLg=kvyYl0oDM_Wc%=@$V|3wu6Bw-}2+
z37ad7xYC!^4l{WV?!sZFMR~djYotmJRYugF@D-$#yX~x`8u+`4-bVEP>9aH(n*q5&
zWcRGB!P7DoLP}B_W#dnzM@TXmew6SrC|<;-{C-tg1f(XJ{WA8lO;vLIuM$y$2rTLL
zzJJwfJsT;7dJIbS-j1Re8gHHbqVnY!34(f{;sd<30iUfaBYZ7A5&XsPZG6m@bU0&&
z-)GPZv!|S7e3^(u8A!i_CNV*|^;sQ_?|~0t5jD^rZ|QUOnBGx&c{~;<gorBrTskYN
ze&<5EjW}~CS~%d=yfW~4_c6^3zdOB>$5n_j&?GG|(9I;)buYwZf94JYF2Z$1v}7u=
zQT*aU?WE<_Dcwl{#^XJUZ_%^<Xe&jtG!=wavA{;481O@3BO$y9JA8#moETG_F0w@B
zo%u={mXYR({wMRL0w2fsEaj95T}y&P?U}FpC4N#B_yoNQgSHL7f40MW$GY>Ad$1L)
zi}tDzh~`V+zV%_T?p)?MD6d2*234Qh(CxPL-+e8vPK23va{a1ybwMQ0RB#)eUl6M$
z-T!X>kqJmO`4_3<S6RND>9kgsgwiU7_ejbKLgxp?K)VTYl)EF3tWpf2lY`<D7-~(R
zV~bHLzZcebH%R-wmD6^>O+%vJO=2+!auFT$>*Kw7YzfG`qziY3xsDo%4BP~C)9mm^
zolrP14G2je(-I*c&3F$od6huGD=NhTK5swnAI8tbtviP2EIp2sPaE%VTZmMOZ~57P
zQz7nMfSbg-p29`bFvuzs8eQTp2u%1TzXWQcklwV)1eeHM<tUYM&x*|jtCg^MEa+>m
zN;9@|;mPNi1W%)vZhekVyl#kN%PZXdP#l)cCy5K0?Ig>46oylPQXEL@t5ytQma|lD
zDhKjL-2MbHn@#K~7H2&~#flKlrt=F2WO>+GI<b>0RaylwATYE1q%!bxMw0$0#bM=w
z5&Gc8vOf{?=nC@l3LQVbJ>iDR=QWBS|0$fnORIqU{D8>|5DsQ|xV#ayRv3;;&YB6e
z?}`uc9UxZi5F8E}yZ-2J^1c}J=Z9(qxKLV#M0rr@>z$Sw6q(~>R22#BE}19ccb@BF
zUR1<4*5isdHWorDj9PflrE`0^AHwZ!+enDt{q6}SlYnS~(YxK?Hs<jFCa$n=)Qb4F
zIVe5C#R^>s;o6w|T~VCRx*5{j2a<Ew?6qYsn}zcvX<@e9o{xp|=)?1iSVd`SacuOD
zEb_$tf|I?;WIW+!n1K&O{bF+iK)AvK#rjl+*y8h&iNk=5r8F8m`I>A=jNy6R`GTXX
zbAbo)Y5;1E&hpfN77j3Wv8Bee03|3xIWN|bqXGI4ffgSPQ2tYDs+Zp&4v9=uW-2jV
zkAd8(YNgV@;4e_2#`ac3{>%7-m&=YLey4-X|6aHWIWIU_T^NX74y5tG&Wp``$Dry~
zD@HRXU6!fz`8!ZzShddaj65d`@9txR78>Ai=Ic&Z0i}JRW}eE3R`G**$w5P%T>YX<
z=}{R?9`|cR?5r3n*vSj<{?rwwV7&#=og~|7ipH$qKo<Tren8|aTFNU=8jEdzgP6tJ
z0}$c(RcvYl3Jlv~(=xDGU<oInM6DS0h9>}7W<B1YU{wE!xSbW2BPH|)Rzx}gQc$eN
z3IIYjGkGf%xXf~Z!hpI{Iu-;)DubyS2GFZAd2qNwnr529z>y*{?u?uX@h);Y5yp^9
zMfm^JGdL`$BbA|6uPfFTS5HGk6nhgaKC$`W%#AY~$c=EAg?^I3<Qq5hTEi`Vbrmo^
z@?K@9VgV)ixgh*w(0{}IGxV%Xk$T@(dQfXAv2%#)D>h`CB>gVUDBnta_^A7ZyZrLj
z7&67Dc6`b&yJ<&*hMP;2>jYk0L$mE!Zg*4eJaomK0Xd>KmM9Qu&&~|cDWOKq(6gD`
zZpbjm-t-9NO;yg5drxE$)&fgq+-W`4sCms`InJ^U(t%oo0>1*q!fA32*l(u4Bk~{x
z4<1gK%#O@NyKfIfLbo<G*z}z07}Nc%-YSY(Ls&}BUct>26mS0Zor3lO#_4@8O{k7M
zq#rQRKFW7vFuk|PLFvYzLbo9OQee@}<<K=$C_Iw-g~z4m4B3aaUKes?72+q6NtawZ
zut`XTrZ!k1Y5+K(F1Q4+GK0r79$;6GeRO~v-xJ3sDc$B^#ZCs4b*vEwaA{!i6HXOb
zspKsQS`6F!$K~~;FKBh~vQUwqA|*1HzG*yo`9c)q=}avYutn2@D+hK^|1@3nuaqPO
zQ-G03*w+EdTD)h$7Eb{G_XY$V*n$?jv}uYDuocB)ZNTY+YskhT+S8I|*cZt7nZIYz
zD3JgGa_8Mc%c6l*A88X@!UmN>8T>H3O(2l(e^8}cS>R<~i6&-4>lZ|QjM6;^z-x=j
zz_09ekq8u@+pF6La{U)dJp3#|`Kj`@`1)@9mW>ocS@(ej=IaAYzd`|7^EYV9z}hlU
z%mxq;6^q%5Sk|Jeq7iKbUD-zK<L$;1QX!P9t~@pmtXl$rTw;w?U}L77gYs6PRB|cr
zBNgA9K|r>5Wr2xpB};F2J&aw)wX+J4+D=(%1?>F(V^MrR?%M|ij{P(X3OZF{l3<lr
zQm`^^8FEp&`42TV+1|<$!w?+05-VJ?mYEkl8Y-88_3~cteqWKqIZGd1Y&%OI1U^#E
zHrDSJh`E{Z365E%u@ptEv#I8|r9_xzu8Q;R<OQO@5?+T684;cv@5fQBXlqUmx)T}_
z?XBst&97N{ky>u*P=6f^tU>hlNAH1Tg6ycsFFK3x%czq*+r0jIxag$smmE~Md{AMM
z^qSm*3#^p<6-&Kv<ba3`kGH6!#Q|A5rAfNg1q8L>eWy=qMj(gi@&+{M^lyoEzUWLq
zWFb^?<X*GknYQ0xL!lkio!Bz;y0bhCRP-r0c+1xVT&a=+<SvQ%0^eGoP`u`uI4yB}
zWvlhqN{SuqmSX|~P$LhT@V8;Z|3;YczYvDT03b|q=XHmBl}pK#c!2p|dseV=nJaa!
z-Jg5mDBv2p0BYcpfgq9DRnC$$xlN&Ilz4&uFN7VUA1igC*Me43=ma$<rVhTX05K)I
z6CT0-SJ^b?1CqCRLXI*l$f0t)e)R!Z(KM~}UITaoQC9Mk{e>+60n72?xVLXl;<0)(
z#M^f?DABv;;HmbP)^lNil&GebivNQ7zZ*vH1sab3^ww}GY11?}=G_4>IBn6H0IdGS
zp_#o<2Jq=dVzX8GUaC@afqFt5+nh#v=&~ewJUeNjG*Xx`2mr+j6Abql3E(B2h3!FU
z$fZ2DvzJcfb=+^qZ*^N{)(E|5TRqYF<mCNwyLEDYGH`n8<?Z2ewYk0hwD4c2t+8kV
zXRvkRMV@@*et!Oa83&wirrr6n`TGy8&qcmu^Pc)cmh{Jt74LR;kK6m6nFsI3r<3g&
za_{Dc+nyQkXZn|?td~RYhoqPD&X>E+$Eu!+ydLO>3PsPM&d2qa`<Lhamk{wx`Lc=c
z&PxlwF_1J9UM{~?l?`<V&Syf`0cVe0pIx0#L^(&@1g=YOu&*+uA)S8Y1`dw9-Q2Y2
za;!eae7t=sdZ_ALJ3Zm?dW7og^cL#1iR1V{w{X0$eoS8^u4y%(Ty}ch<X$?i;n_H#
zZH8_<ZUYsy6vph5i?Ju;TWpUx!{ITdn9<7lV%6DyDYUh6zXP^kH+E&zf`sp(yr5}O
zXs>*+LfXRRX(FoW%%K^)05jK2{YTgBOd`E!TV$pg-qz}V>B{*w%b$LN3qpQx;cU&*
z<Lc~cW_5czc%qa0?m8;iwocQNU6M`uj3;T`QklFc$v9ZLy5nJY{pI=md1!mRV+A<R
z@99(<xcM=7<*v0gs&n1j{eI_(=ZOiCSwc^{131?1e)HT~BxI<B$7|7d!v6Pm)H>kj
ztLN*J!zz4kZ}*GyXH1f{q3@Sv)RQGI!5@|uE}&U^QwD<RXV7Oby<VO--+O!HJug@T
zXa1cs-k$@n0ckH+m##XwXK>BrrN_&s?NjYckLDhh^L^wOY=~-*?6jLKMjr+#FPD4B
zp1s4>;DM5fzMp0O=#TpY589_|Pse==t({WIonAMf*&Q8T+V^)0!BsCd$#Y(RPXztX
z0gK%nYXly!ARt8aApf@m7MWiUSd2(rx8D*%8Cb8PdI2ve+9C8Y5&~-umk-lDsNAy?
z-K|YB#(+;#<3*}I9P{>G#UXaQG08vbS(<MwdSLGCh}AjqzIWmb??~Jq>G(_=>%b`~
zv}>x)bu2v*wzGYDJ>bgJqQPENG?w!@A#A7WBKGmm*(%S;dg<l<h`6ejaP+2wDhd6<
z;o+)*-C{@lz?h*%dm_1v)7)KC^N+0k{h{3}4Xexpp@AL&$)dZRro}9jtj&{0XFG+~
zRWJ3*(&Hq3*Oq&d{fp{mu$NuK7q@1^hwDF$7hD<a){_gk$b1^E1w%=xKBrCVnPuYj
zt&xp$wp&v_v@qiQt}dGpQ5+HGZS9{Qcdvv+9^o<`>UfT-yysRWKb{;CK3;LUHhC}g
zFl?+ujPF{-c!->8FiP_le|>JGU#Hu-nW}eta&B(rP7LlLQY{*SF+P`9^z0w>=Aw<I
zG@?h|#Tc-!^TpQ|$8Q%a!b$v*<(P4gT+C!TJh^U7YRPrenJFy2YjwG6<5`a6eUw#6
zAC`|*BsBJY@%Uv2<3j!FdcyAI(JrvQxF5>BwgM^o-824&n`!|`rq5O#b3E%FOa%k3
ziQ}mbLnaTqb`_DQ_0u;b9j@1FcwQas6Vo**Ww;?!EveF+0;|h&do8X_Jj&L@Dmn}S
zNehT{FMsGHb<Y}HuD~^dK5A^7Rw0`@@!Y}neD}mmk{E5i9qh%%RF+7$e{YP+XtL`U
z{F8f1uow1E-S5hS6FLp6mNGdl2T{Sirdtug0?5<QQa3sweZ<mV)zh5q1+e+QicS91
znGU;!n|J8@ZQ9Lj=US>wJjaHBnF<Qh_OdE%+ZRjpD3UkUwWEDNkFYZKbA)x8bWcK4
z{Vv|L;y^j4r&(ESM#5&a^E1C;pzyfh7ZFij5aO~RViK+y7pe|*>7Lz_ju0OgX4>#H
zgjy+GA=6nKE*@RuhJ1HJ?tz3w7^@N5#t(fO%c?-Y6o*z)?CbJwHiLxn4ZE<6uyZYa
zVm>mA*j?D$EhhyQ17`*%52ADR*qH9!pizmw2G!Sp@28SY@;fN7w2X}pZmdlSLM7oc
zWrQuN=o3pBEkzu%BTEtp4hS$Ugwq7>x6rY)tyQO#XqY-OgOcmfNE0ex%5!{JYyDh^
zc2Z26F)nz*I;{7LiNk>=P(f2-*TE(4cdkBrw8BXsTH1Ndh(LH>ve9k9fgV*+kGl}&
zhjz?gs;zp5r1erYDcPvhGkOx@<bPYlY57&WTQ={vwpooHJkl3bM>$5I2s{gK4YXyW
zxQbd==MYUD_EQZLZ9fY!`9eil2_BMW2Yh5pBh%KReuf^i6gw(AW*8%4#+x0#{%AVP
zb|;{0*S<apo-DC28Fo%LD6w6U<3o!l<_AaH3@C@6;WNMaE%4H6@#LIjQ^0e7JA=wG
z(+4C~$Xk%!^)}RD%_2n81svrvZOg|jLuy&ars<f^j$y#EvT6>_4cI}{h7IE}*bT`1
zi3F`me!SC*sKw&DQ`1$2D``m{{ylmB^v7st)3oA;x?f7DY6I46WKF!L!XCu2rY~wh
zgLUB#uZr9b{6RV@d$6<pdsc3tEw0QYl(IQ0vkN0C1Iz>t*koJ!5OxPGv8E2i*{Lyw
z*P^lWGk4`KGe)Fxn@38r3v92JqxyJWM+UN+uwj^1^Or#5Qhq^?;}AWZ@}Oyhy{w5Q
zD=&skd#em)GrU%F<}@<EPs10Mg<0RK=rzBc%S1d?v07VGTt$z<eLgMC`0X9cqM)G^
zNdHfEj3r$13{_H|-!)jX(XahYhd8QA>UF0eWz=I=8>3MurUSAm7z(uz>gomg8F$)$
zn3-9Lg&-d1GC})ZEx?1dfWV5WN@CW)@vwysr9)gB(8K-$4f&a>G!s#=gSZ4d2JB02
zQttz0MtXMqoP#>$#g;~=e^c?OXtoeg)K0>HvJATz$%!EW@y;MJ&WH3m)<wIZIiALl
z^+xgB2Z#+h_L<_bXF@F29gP)Z@l~t_XD(13;6(M;le6iJg%fMB1VnnN+W^}Qy0j&O
zJBOtgXrSJs)YNMz?2&*!oAG-qHd7cfev1|fj(9DjCuvecg<0@grrG(eeU+Kbnu~3N
zFunkRHn&&Xpg89pT*@EMdh}$(nc{9T{{1H!L&joK%KR(=pkGo`tzmpgttyGNK}!*t
zQ2M~NyhA<%sgwHtav1)pj8okY02oNXKbrGLA&RLY5Rpvl=P?lvL2+U@GJg5&vfWF-
zPju7|c!+7EM)g;XnwPW=VC1&}PXHM}Lq<6RW_NbxuXgi<yxOh*eNz8QA^x?yJ9Lr%
z{H6Yp`v+hpN*lQFzgzm3OJ2kIw_3f&YQt-_OVKxr(gHu0?XrKw@P`qt4%2`2@Xzud
z{at7f41XLH;!bTF*_1d07YhtG3z=cPcZ9G;<YdgT9$osfm><n|Y@x&W5JQmGg!0}h
zuDH`I7uEvT3k3B-Sm*t%c*2z!3jsKomBilEf-%7!;giM5heW$UehhsaguER|aw_|G
z6jL|J@%~6*0e*i=rs9R3)AzmB$Fev<Y-oIIk>XAV|J51YduuwBqJS|nUvqcatzL%-
zsQ*}dw_I%YTe(5&g|}csrMdeTkbEd8?k+qA2d@f%T0CbJ(dz1MTJ71U$A7texH<e|
zl`-Mnly!7go$f&wJlQbt2L_9p<?G93pqv}hM9w6F$`R)f0$160)+@@3DY~i%?wQ3@
zH~72q_(mb;Ulx+IzUd6x6}D5i^Y>EgQuy5Czy%ff7uEfcpq=uK{rG2g%myVct6F}c
zGqY>`E@IQTsj=6BA3-%RU_MI29-guBvXE+K3Wmuq&(<=uQ%-rU4Wt+52chEmsAH&F
zOR>a8rjLH!Ij=K}x!JQYW-my0aH{9zXrM829KZIBpLl0=f=eDL$EAb6G0HH`$FS_;
zdULiO#p8|4><!&){h&Y>KA;{n4|gzHcHbfms(3<hl1QX7`^-?oqxI0@O6R?no^?|+
z@(YAKans<!1q#*S+SvaI-zK&Bne9>DF>t%%s*2vGt1SSvX~s6O@Y2-j0s6AKtkk>_
zA~@Xhi+b=z^WL7rL(dE7|NRViVBrShVnOd<VrXed|61%n3p*)`2(mLs5D;o?5D?V=
zF7{TK@pVmitSWAe%l@td^Ov{EQG1NR;d|^DaP_FBhzy9BSR!Gwq$R^%O*j%m;YI=u
zbVxWfkuVK7wDvzTXo!;_h)Z8z#5GAoX7Hy7o$HB6sl2*^S-u_lCq9gg4q%_K?;H%z
zLBn1lF=7T3(01CD9Jzl&R1ujj-d)H3!`*!3&Y#O75MR)=J5haBW##=ig<eOhpRR*^
zBwrJ#=0&q>P^N$aia=}|B54D6BNR?9@`E%=j8Is3gFUAp!me3M?4775y&!B;I|oh-
zh`V>^?e-P2^o!dq>EpxlC6*?fuN>tpFR!b%U{_*Jf6#U)|F;wq`I8SsOBaM1gOO0T
zzJItv0|IbqJIi^zOdrHxEq8?!Dr;De-0tI+ccC_2z7Fh6Rl}%N%$Hte{OE*|X%0PP
zYq_#&KPv*IfYB+$##}bm&(j>MfueXgI9oM!V57!ZJL_!z;aXJqOw$Hs_*_PPt5t=l
zT6cyMziCc=yJThGsQ<8#ji9aF%|84k!>s3`ijR@>w+p0Z<sAF+<swG(`#g6km+wl)
ztZa7s@Mz^hdX6RUh!ck$&1v~=uunmGK`CQNu68W^geiRbR)pdaIL@y{(ZtcAEOiZ5
zCW63fnDU9-h&Bv})Srz}A)*F;9FAbpN8)qwc>P&E-yRr<@?vaPcXFqQkZ5J+@p?LS
zMsD}^dU_s<v#y;Sanaq<etPUHTYvFLb9YHbP+RAAzj|C8Dbj9#{vFcufF%4Cm74$-
zV-3+`XVnN+LdJMt&p-Il0>dBc{Rmj!#`0zhwLZLyeo!%dW7sj;+HN*6-A4Uy&oFbI
zJ$X^Qn5uygNKT#b6Q&c1E=Tl{!84syp_2^{vn?xPhhL$qLM4hDCk|j>Vj6VIj14Ah
zxfBT$KPVG3TL${Ez8E=2y`!#zCfSgvj`?%)-Wv10u^5zr32lDh)JM^5I%Z5hiu!~!
z|JF6Syh>H)vz&;40WewUJJ3QUoT{7>fsm115YkzRTkhDJFaz&?aMT5K6sixp!);dI
z0&Nyob{Mqtel75QT`}az{@yEOC)!V!_3(`mby0WQDLgg=ewp0VLXQVsUnO_2wJ#su
ztLundK=bPdnU;nXXV`{e&)Rn@pm!{kv>4x7n0F)9w0cI>I-jsV5SA-K&90&x2jr7e
zxnOK=)h~BH>M1NA{~Uf8`TqL~iF~}s$Xc{uVe>h7X@zg*4@S^{Zauqa^d9o`QRmHc
z+lgw23!jz=!{GNNNTUbK_6MnXs}A9S>5g>SHu^u$>b(1~?hM68f9_B*gKI<)wCCaw
zKxs63V;ass#bu#l-{`aWw!8N!OA*DiMh39!f{ll}{rs)I`J079N7reuTw(T(2^HCQ
zN3TtTx_`5cfZ3tF=94h`3G1>*mh(PD{IRMCR<{L88WKvxUA9;(x8~PrJd!`7bOC}h
z-CMPGJoIyL@YzZVkPSi~EsE8=D&WX;AcDyRY>N-#6Wp{kHAlnB|FjsW0at*YvR|NA
z7dyz?YJTBjZM7)L$eqT3)o)%TaWHZ~MrDMv?f5+R%hV*jett|)l-7+3-IWdjCt}1}
z-*!#Sf3=ova#jH@)lHbTvqRON6g69P1iyRnLkAhE$`^i1)Atb@Tq*>v*Iik{s$?32
zNGP_6Hng8pa7YC7PGn>2JXoJ{5m@GMa+?*|c;Bt5+DS$yI7i^2t<o`ljIbdXtHmXz
znpq^J@F+wdZ(VwP)G-_?lsWOj`{?@h^KRpNni{pdTof!6P<j_CRkp8SrzG%%>gAmU
z{qZA}cXBdSITm<RqTv^jdZDgR3vybMQ_6x!;bk7<(K5uOuEcmkrQNBb^)04TtV~Ge
zttUf5RQ5q8bZ&(ORHf!Eild<n*5KmJoZ4~hDr52p$J0k=DGv1FR`!*S;tv72;=Dh?
z9ywZ0C~^GwEZ>jj7GhNmS5F^#%$|I>gw5nVW|90M^K`#*EVmZ=aT5XBfB)c7r?JgU
z*MwzV`9R`uondqx^XD1&H(}_t9jOwu6ke0bYw!O#K_syeoCyGzfNU6nfFS;zAnYAn
zEe!2nr-nJrP3z@;^cQZO7x3=vhj*ii0<wwmYU6r~5KwhreGR&NEMZJSYMW(qg=JG#
zb9ftAF4YLYgPcZ`&{P(FjBvA9Eg+gl*AMZ?4_y~M!Mi(iemw0Z791iG?Bk`8YjZz+
zT03ob-}x|+#vXN_=rCauRLEsAlyFr`gY6%=$_o8Jdl&3nS06-!sOdR5N9(Rrx1+C5
zvA%K-Tmu+<Qe(Kn&48fnM+eoD=&{if%q~`-yWjQeu*dOX603`yYx(yf9p2}Mg3TQL
zU#o;>vyEb6&26#=hkLwhOL*b;YU>}wKDe{ksMm@~i>|S+pZ*Y4Ol(_Qa>7(-ruN*&
zBwqHs@}`$=M_wo}UvGD+Xw#xwPtZd5c!;aNJ#E*TZ_{SC-jeEYR*n_#@G57TGc_#C
z*G?+z)g(V4JJL=$(YCNCFW92zVBU@>m!Reg@2w~f+@YvlM>#*4H=6heA*E!tVd!9F
zZhu?oAl>NWjSk^7&|o2K=PR^f=wXz7gLoQxS#+At;~i4<c`}2rdcs^qaf)M<%g%5e
z?<dk{)e8fcm(!dwi0SmF_Qdk;PNv7N6-+3qT2(n~T&T=wsox_MG)}H<!7jHXgmwng
zpJpY)NwNYO55AZ(XNAgxjT>(hQH3yuiwrZR_Dq-l-iws=XyG3cn?VWbWf)DtuVK_+
zlUn3FXb}2Fz%M#&zW3}KR+W+Pbd?2L`-1QZ7sQwtTN}eSZs;)}jh`4bg&c2%A{~KV
z)P;Sy-py$90|s<~CaI;Z`*}^aVRTonfKi;9-iq>EshTG^BXN7qK={D-%A70*L7`1i
zk<jw;LK-HhStHynE>;=a6pnz<`8pamVsOI}XCw1V8E4HNY?HHk0q%7U?f^Jv5OyV)
zJrpyJ%L7kgo=V=|=}p~}4Wo3^dYuu6X5MWB^>hbDQ69QTE&VZ|>}t48iFAx`<cd~m
z7$I?mG|gl!Rn%1rX=6rtwNoZ6sb=+lkh_FDn9Mcu7u7+zs^BbXb3*oCL1jibhN_^~
zMwPjHR-C@z@69I~Qir5R@Oq(ZXjaYP)Qic>Qje`1Pq5pSR5>@MsXn9*npq#29j|)W
zj8UF5=A;5=@Z3=1JQ^TS#yFM*c`+pl{y@nTpmXHapPsgREUjN2OP71c>7zw8-^4rW
zrC>Zdx=;`>eT&5D&YS{DyADc<*L;UTzX|F|d4ZiuE65$kk;HGmr$nNC_x!E6{?HX2
zd-PXlyh_=`7p(0sI!%FV-!teWM8yo)-Wdfx+N-A}PT6l-jq@RcZ8n<Y=emDcc0A_x
z_?3F!!8J*Ht8(GCss2NQOhUcE;08qci`xX-Rg8IDNFmBW<{$1$wQ_JJ-MxbB!m8a-
zb1r?OWiYl-nX`w}r97??kR489%9jm7axX3DTY||-nj&k5G1;tP*nL&L^a4`cm7jO6
z;U?%@mNJKC&6V@<h#KF>FpjqeWdpODDzfnfPE!J48<Y9cZ2VPsU>ik->ffKabti;#
z+EPGCW5wkT)`<iW%@7cVN`&Q8+_Qxe)43E=*4i1RRcA1#!O&zZl9g0=OrO*4>jfBr
z^u{f=*d&oFex*q6<>TB)FWtn@Z8BzghxI8>Fg?Ox(vPuPUuE8sMdhhj7@EHxw)v!Z
zfaa_3?q?HCaNu4!?jPU=7gM;8ZT=OKt4uf0p86nVqzD77UrZ_lp^*@w_p9@?a;?e;
z{En5Uk&!F5@x$-kgYq^FxmDmjoN$phyU%I0{WoTDBad-DVA69^`Rh_r!onMemKX${
z%b+JBqsxm!R@@PC%6$s{%7MLowt`pg^RX`=@|<2`5=~Up`geK~`3BP94gJ2>r>>JZ
zf-DHWQc!fiJdeCoM63c8-3VS1S7*mFgIm~3Xu&P=X&TOO%0S6j8s;$c-|s~#{aUF5
z1yKaUvY4sQAegbd5;@3fNdi(Fgs6EEFmqVSKm^cQ^+?aZsrZ6X*x2M`2Lv~w4gc5^
z3ZN>%r_Q!v%rOvwy@&eDpFJ?!grkgLsD4iM%M#j8zrH$Nz!|0^kzyL0r2C3d#3=lO
z8%NJRK~k0MxJIg)$*;4yEfwf}{rKq%gAZ=U0R#gjSW&oDTi3NGPrA82x;kyccT^!P
z>W~_WJ1>eIHJf&m)7aU$0(Evax%?jJgK#HT-GW!Ap(WvU<S7l+&c>sk;0~bt-92<n
zS9}tza}8w#^*!Yhk_t(b3BRuN&4EUX_zBxCD#;*(2ewb?oO;XFYq)6JCzyD^?2Zf!
zhbnkdmF6m0e~K8+?OJTI*{?OR+N`v}E|H;$D9r&~_uCjO%vT%~5!01Nsh+HgY|_PJ
zQXKD~t6@H0YvW`l)vlmtA*KItC6}BQ1qbu#^yW0DU~?K&O8=<sew61T80RH<h{a?z
z<3xHz9J)cj1NK8sAGk?MI_Ha?U$QNk)TT%Re;IbZ_UHS}58E(sq}DO&E7MTbDuaxl
z@QWm!&I)q50>sm=IrKTc;(i<vS!K%CVjI^Y)zgwxwy9?L#veH`-7G5>ke+5-D_)L<
z4*_2yf?+?F6;oAC@`XPjIY0@d-*BUM8eHZgCdp461CI#xYivfSJ>pkcc6OZsl%SmQ
zDR@Q?y7E|a<!Cp=6Wv%+=Z>y$i7WW7;6$xxbuTDx3X+>M8dTMjVfhH{8xVh=?4yX;
zm<rZC@iIL{zC#WLN$U1K@ZSAMglyhQICt8Qp$N0@+(|yBxm=8%;@2RZ%Y1VjM9fx5
zfbV<E6$CZu3%&!R(Xx?=OnnDGm*nwr2OYr-iymLFg*o7-hQGutk-vq5Ca1dJmnXEC
z+TqIqiahbz;cV<P$Z^e}Kae4bp_dpCG-A8d-APO_Oc68jwj&D4X!!5T{BGmZWu;nM
z9t9LI_f#JrF*9$OstnHQ4W{;cP?pjvNTag2T3s&Km{pD=B;XsW&%_k5o(gd-;<aPu
z^Uswh=()Wa?q-H=e{YXO@wB<@!^8eM>V_W*{+%DR&Y5u{7;*p^>QaTNa05}=C5P`z
z2S#h+&Vo8xcjNSQsSRYCXt%joKc3Ad!APcHRIA7k$VN=#_PV<D{2KWq*Y^-f(vW!#
zrc>MQ@<mF@{N<E<+qm<3H@99Oyq#zl(ni+TgoxGz2^A7-d*bCn@3D1ViralX33iTX
z2FBW$+0u+ev#T?J?j5}Zy<%IS=#~|T)ik2?7e$y95MN&8Oxv^RG!Q=#`(NMGH$#-s
zQP^v7#kAXmxNTtCP)R5EwvMd#jiV^RIIlKHN%&Af!F&%m577vn=}%ww(u}1`Br=^C
z@TsG*v5$N&UG7Wxk;0`r3-w(0x<@xS^-8*L6S_eRTnrT^$9A&F;~rkFNb}f{up8Xm
zaizXHKJH?-XBwloAyc574?PWOOAkanfAYH3xtLO}qm?Fg=@FU4*sYG+uNzW8K`m?_
z5++Z=e^G_g*$4rr_7=3u^ssZiIN5nd6}gW?<|zPk9iI*OEQI0%h3_RDdma#dB4CX}
z>~hUxvSZ22ejEm$PU@}kOgWdlA2~@FW12bKUxf)>t9zUe^8Gvydfnp*#%^yH`t)Jz
z{Ngq{r)f1wTO+-_&BMd#xqBJ&#nt6*Eo|si+7y~IFM#iWP*DAh(+@okOp{o$klXK=
zPxU}Ka8-lz>ERan^a9V9dNIgg{jp?<hKY2V5KaiH0ap>P;^iKC5?I6*k*k~&RCC5=
z5KQ2zmwLFB!nVFQP)c3TM%Ylm<j4FCS_+*!>LiaU<ou1ngb*dJHh?nKkP4OBB#?DR
zAsI_VK`u4huvY@tWs2X&HNOIl=?@0OOa#?Y&|o2&Y*8{<18bpEU`%ivRd}VyuBi~D
z<)RhA9we5F?uX%fndWLs-5P>A#Cb<v({(O5Csp3Ej~iG{qk-hfG8Nxj_n_3F9=sL7
ztitrJudmp9uh^A{aivTgFex_aT1ja>J|UMjf4126clOI}{Lr;nIW;4k=pO8~80$Y#
zwN2~l!@X0=KI+~O)@m};ZQPdB!p_v~7qSqfL;aX26uB7dUEiu{eR5<rtd`fdsv=(|
zWLcrQyrx=Ka(tZep+Z$@__&cEc`D1R*;YaJtM_w(wG*DZ$<4|Y($T2FjhoQ`%nN9;
zQOWNYSgc<={gZxWczQIl&rUX#q|DHn_dnyZ*=}dpb6N7eQ;iPat{(gkAEp1Dp34^4
zXEXq}xxM}spsnmpbnOfc<Q?o@?;m{Kb<}IDO5uuPbZDEdgSytcGcWn3l;@g2CAWI|
ztwQs{GKa+TqJ7U>{er4*(bZq=%X<r-867YbCCN{Qm6qi^<e=DCbphwzBHc_`dZ3_~
zSI!cOwQx7?onhb7+7j%2d(++u&J)EmxSo=ZHRO4DC1a)Iv9-5T@dcG9V(0lTs`KSa
z$cli6mCe@t=wzq&Rs^`0?QR7*&-<~*hMR{K<Y&mE$jSBW?9(X}^d-A>)H?2nH<zoo
z2bhvqx`&Om1>EyZx3vG=19Ja>)vk3^l=N!rm)qmX$*XR6eP=Q|aCY(+Rz}v?hvj<Q
z=BdrcjH%5M+4++1_fuyZv%k)C9^s#HGCA2Eaq8f8_erY~@2pe>Au_1i=QD{He(sSq
zV>l=cvd;P?AocWAmWnqmMq)~^^-4X`d3zs`eZp*u$M-(Fbg@DMt!)BjmQI7dmoVXh
zfm_05J2ntDU8-qk;#pC4G%7%xKNjedXX`XoQ`ZuXn5{2<q&jF*@;1B*=5uE>WAh*P
zYk-PPTyXUaN%$gb-g-0gS({5HgjeO(N$M$~^E62OdqAx4g#S#1R&%AF-bms?ppd6)
zmNb<|L0{QSCuX5)d%xPinec3CNa}}M{}-hwEhX+O6F36;S+132zN@?$cAb(%B#5Tp
zw`PH-7AcCtwi`p)4^tadfUG;Hm$gi@v&A-&bn-(xB+bXR$`;RxO;mp}V~W1YGJon1
z+|mA-1^p*g<}XNgsCGCMyzf%5DBs(`eg2?U5x*X6<)BaphIGJZ{9X?0*^x4dK|cdC
z3y%5>znN4{@XnA|#RDGTa!JX11S=%u!2})dWmyP%W(+&r_2{tlEDf`iBTY<dEnpz5
zE2@8l9LVm#=IAf)I#BcbE&dur+p*44WtB#u%SS`o6BWphX|ny0Za@@^Y6P*D=bt5Y
zut7zw10!PH4hBl-W*!SgqzR1w;TRNKY;o3|Iu4K8l+6*0vQhroq5SAMXZevf!Ox^0
z@*1^5)ij?Ab<aSAG!o+wMTgMlSbvKu#~g(<jv(WI6z)9keQEG+Z^7u$(7E(m+H1-S
zo@%W84SFbD3(E}R0PDr&WerX)Q8i3>xZS5UPLCaaPKt`slM1R+r$rKD_#*~BlLpb^
z5)zk`T9eE_qeeNyU+6&bERJ@aE>$PTe3H;)!EG03xhxQ0&BALT3{@xyvt@%0d_;jc
zS&cql995VtU!RlL^h6ircl@{5K#g-A(cl>4eRGdJPO5m7l4*5SAI6V3zGDfLU0uo6
zb3Z-&n}mMB+c6-29+|pBjTwXG>A0?GbVFKT!D>?g1s^*HL!eCcX=heCerFF^8G{;A
zXCZ?5T!|-X{q7>4u@?j}=DUEw899n>_OC^vO%l|Y^go~hvl8TvHVNo9HVLAlm6fgn
zH(8b+r#yG^`z^k*GR)Z&sqMd)lwu<xl|S-a=G04g_1#S}31{8eE^u{sEQBlwo-;EF
z2u>oX4+j<aBNP<B8jvZ6ohNKXwaNy~o3z2sFxe3DSQ|klumb#7t#<lYggj>qlWX;p
z?BEp}so>4@|JT@6z%|vq|G@x-(IKN`G$=@ScS$3nbc1wvNKFus?gj&Ck?xXBkOm3q
z5(H@#LHTds`>Oc<{QS@7v)#Mxe4jk$dG0;;xx3LuT&&%&F>Z=sUao`3_jOiVmN-@E
zMG|A<+;yEf6rs4P8CC9??<ol8C^jFVJG?Rq;CeuA+q^En3YRF+NVwl*ryx|xTJ6bB
z8$uLI<dc$#;zk>vkeQAfAXF4moRSQ?#mG=EWC@so*EC{dP~WixWYsz{y<IVvHf<hS
z!>u%7;|?--!9IIqZl>8Ep_gekiaDkW^wsd%gf$r;wScRwIJ&^+{j2N2?r?B3c8wsQ
z0j->@%`^kX-is~K{l*rfLP6&)@jCs>qkKgQE5IFiB5{bKhYOutS@vXX3>hQ|<8Bc*
zpsd~sP^cv(H*V71PEREyV832N2I1}C1TwoB1z<oNak@a-pVi)C*Iy~0JZ_OPabi->
zWryRIs;7FxSge-{M<&12^X}i<tt2HpjUS-Y7QZu9y@4xSL`hvT_)*zcRtf{mpt32Z
zEL{sbK%Hi2%&5?6AqBY-sd@LZ#c$3_M8Eo?X%_!_)UbJ)xrel<w~Ki)GPEQw`tI7+
zSUHQY%vas?YECi3tn~OIH-f6$gZ(derIrrzJC`BTcK7<w&2lon3iS=8698U6^C!FV
zPKE42VqI!)#i9Z?fzWU<=~K%mqqxaNEubYj+y~U&Jdno{A84*)L$Q4*b^y7BLPjE1
zirLDN7@ffV*(tq{h~TmltbQTE17qc$%^|T__7`I5D({^hIFB4g9yeF}U!OTqo$!~r
zc1b=>p^>9{qJaEENgFWWlEFb`S8aB@3^;Tm&6nGWwU05S`TA~%#e~=VtzsKODi+dj
zF#)D4lNCesibvy=l-EEF@*R4mN%K)YO`>{{hGJ$_P-A?}PU@!Vd2aVTW;7o_wo;x^
zr>B9A_nYTE&4dEF!eRt3N#`FFCa2C2)o2d|bRWBJp?`9K4v@6r#vKo1ig@jzWpq>A
zc|YZW^Mv!+v&&txZY1=k!$js!zyxx%!wt%qh1Fj8;65c6VU3vGiEp72GIu}RC$TBT
zCmuHBW~Sr(n&!WxVR>0pcAE}_htdcG>#@+bUG0Vg(`Z`1VS#Bz$_ojMlS^R)`h(Lg
z7I>~8+=To|nIknB&K%ZmyPLkL_21!{`c&5lqMKET1HQ2`k~>Ef;}Oh=^Y||9Px(`0
z@@{USfnbj#vpACQY%=shQ6iYox7dP%>-EsW+-ffi50BF_7naJZgXJIQ8h^ZEBER_D
zyK^G0=87ckR>q@X!MkWU4<C&@ZJbaS-BNJjdu(jT7L3}c7mCLf5{KB0Umv4oc0%-a
zhL6)?>sK&;2IYUgI{5neLO%+_n;~81iN{ZjTfzCd0_k|@jr4aM<;6H&NFD{1PrMlB
zvwHa4j)F|O`~f_ZvH(E7MS?>kRFt;d65cCX=vsG2hqFp+p<ku$2<3W<5H{Qvx3;(N
zg&4+KZ($5RtdQ%rJj6Vej*_d0j#-F>j5JMqT-eu5>9|cf8e}+Z)&Sp6Ps8m1-CoIm
zs>~12-l*7%$s%272W2qDY%kuO$ii&2*#Fo$jlKB=-*98T)aPd6&eHzCq$W<f=rS;~
zoVQRUBGb3)UUV^JVJtp(U#Lo==>uG}d+{WG_K>Ggm^|FgZ&%Rh$V-xqN_9Lxu5Xm3
zsI3v@ON05TLLxi1V}Mm$I4MZcsTA`*+u=1#Nt&5Bn%J_?T;ngVil6E}3RPG(SG%mu
zE^ST_D@a4AyBdl=21~<N@Jzyzq|J)Ui;W3|m}Fz#_wtm2xshE9RUZ(iL4(*zL0Da-
zB<5T`gCGq`*HTUTML0Sr6^&ncSptG)7StlRy2Qp`i|=r{k3R!4`ob~>f)flDSE#hx
zqzFhNhY~DwzJgyGbsO4JRfP&&{S=Q!*d`q}z;sK8Z8wa6$2e##C2yu9V`07VR3M=(
zHVlg8lw@6UMYh7M$CM#|-Y(;9dM*{V5k&Cb=6=tm=IR@<3q%Gj-zcfC*q|l^WAWdg
zR|av(b7#fXrV%^NMzkwx@>1}EjT;Bn#`O|O64bO+Vzu8#Z^83xv(iU17`UsB6!^@m
zr*pj;zvu$ptRr`Vx`{z7HkXVXD<6|KyO8w@6vZr0%X&F$e7og0-c=Xw=u>?8fRNpK
zfMkWeux)yBw+c?RHN-UMLz3kv7ybNoa=Fd6=H3`y_=3O<<^4r+Nek4BtF!PE?Fp<Y
z*LFCDUo6ADEdOhE8Ra4p^y2y!Z?c>;jwuyS>U?ae!4<1=+H72PkaRZ58LKT?;>6hx
zhq>G!S$csmrpl`3MV6*3ud{QWe+^aZ2bg&Ya|nfm0o`^E^TdI@sqL&yusRSR8pm&E
zq3J;_+GJpH^A=UhA%?uQ0(!~Fj{Jl_IqwqbIFZLgAsn6BI^SSTMOYxah<4b*C7v#Z
z=mlXm_+$Oes6wF--J>c>UD(o#cj+iJI~s(WW3hNo%3~=<aZp;GJytKJPSLQrrCgHX
zqzf7ElIn?>%>c3<wRG@bl}eSAbfVNhkzcdWk2W*KRaiuu6OmTasK@jN4Qo}aC0gGG
z#ZcUK*&G?30`?vksYlHxYm`6^Ss<*p_aXpsF8&ha#&6I{#+`5iMXW$^C(OFrH*b78
z6~`m<iRf12s@}OW#conzBg7Z>9$U2*j_O`38QaH3K8=ND0E-*d0$S4?zChdArK0pb
z7~xB4$6)n$!RfHU%SLHiI<ezr_Tj`)W6vGzyv!1b)pYdD98(#^uku;|!3mu3>YNm+
z?&3DZIyasZ?<_`C;9U9#_qPSBR}lxi{T|-8;ruI2O%(oKO4zK`WB5;IEa_O<##&F-
zGxD}W`1Eh}bvT;1vVC8k9vrOAtvWKZe@5~IT9QQP7{=L^h4?2&wAMiXj(d&aPtqE2
zUwn@LP>2VpsN&_wU?orCQ+Xk7Z-iH&B`otef=z^l#b(ypspl5cp;Fk(_AdU1>v-9c
zpE}<5m+cjCOQ*=CagZ%F0dkfjDbmE)ncbZH@u-Ji%i)kZr->)51ProkstV^weSG(U
zzop^RSasaPd7KVUQu)(Mzh4oGDh#)Pp#T6XKmY*m{1na8(Z$x((a{!pc9x{2rZ&w%
z+^RO^$)QtbI~=Z4a4)!qljjDuO&dx5uCm#}MBG;V#~P3+l*(hR!=BoBm`6;#vAoiX
zR4J&}!)4ajr!~-nvGL*Eco2t<b<$7(dmfs0UcGu%R5s;ytB*>A`%P!Y>fopV3}w&#
z6n4f^zBR4V0ZdfpjG@={mXtj;&vGqmo>Hg_uv8bNbq@ELPJ@l#=>W=-cOi;$&Tm5V
zZ9^-MNU;r)^MgbU`fSx5a7-n*pnLWV<jVVsEcBUWR0QKZ&=R>BkYa@Sc=K8Z%7As`
zV~2%2&cd#~j9OP3=Y|AEAo&_af;<Lj`;)eWE%nzH`cifMT55^DYfu7QPdPB{^~|~;
zGrsN^`AFeu8dMofCJo8Cjp?zC)s2C}?Uj{*u@q`>!@xSA`aokscOEJ@kFs$zwRik>
zWvjfuKevh~%FR>E+gxUb!}tnCIL`wdI&D}UF;?B99cTBaU+rja%?MAE4&R?Ni&05K
z&#`Ma&)vn~h*omK{q8?>5;0WzUS*V8p1QzIAiayKMSl5I8rq*dR0?cZ5{eq;@$MM2
zkbBD9D!|o6y?|9y3kCW?!gRXdf&IL<offl>GMZ0`_F9on$3nOl0D!74N+7rYGz`R!
zk&A_$>xEhpUjdJ%Q^ap`r~m-y-##~xJxk*Ul)5<ZUu_3(<FB@;c#;rIy0O!4s+ju+
zrQSRpWF(5ev(?fpslhthaOqLn(Q3w=pLrw248)N0Nla6)yGF2tBg~^kW5>@+cP3b&
zq<IYJt?kr-*0`}}dK?<EDv~&LgFeo{Pjiq9D$J5#GqkR)E|DY5EBjPX+>9=Suh~J}
z;q{)}tDLLqDk9yp*B<ybVmJ$gH6fm``}{-yyl7g1^Z@tuW$m~uce_}Us1Uz`iB|kW
zSqu!p0T*|%-fd4MXi2Fh8;-1gSgKa!yA}ObXV$bHeO2m6hTJzt5+fsP9qn;LdM|qw
zghCneKb+EY^>i&KdyDZJDY)#h6?^_~TmC4``7d)qzI-G*MwoFFG0(^mTf|bxdADC@
z+nIHn6MFA;a^TB;4*MRG>d!W9BaInX#S&&WeE<v<4ZzpqN?-2`oNIqr7e4QBlP@?;
z@^ki(>~W{s+vn`qqh3~!2vha<E=D|MTszJ_{$3ceb_OPT+k<UEXwc2?4yWOz7WFdj
zBMF2g@)-A41D^7(@OmWE&J`pmu1j0pd9A)ayK1GEr@G`-+-ZaZvrOO61z+wl1#R#g
zES|L1u=g_dkmdw>y#Epz_GAi!byg7OL*K!t4a2b9Qg|R~1ogg45)Rcdbj=5UU^wpK
z-MYio0ry8dk&96oJA;?3#a}=x8b;LfST;WSCZ96LdbG(fL+bJ?j+E4cO?Jz_jM5*g
zM@VD2T3cASx&E-;@4?K5TCsZoVca@IK%+Z1@*jvZI2SUuosZ>M_&p#ew!}8V+C!q_
zH*xb4y<9NE^rgR|bd0mQH5u32?0t4;4#P(CS=X2zNvLUjm@}4Eb(0fp?GB6#iFUvW
zx&L`&dILR?7%OHKJkgef?lH4J@(ISBBt*ZID052*A85w1PNK01%a-Zs%G3FpDw;&T
zib6DrM-G0gQq}G^5aiIVeaQ+!{f>NeJ$+-fb+U4ssrT4gTok%zjGq0iY2e`2qhjsX
zKvLk{f@3(`pn0sCbf;45I7gN5YepGsR6s&$*=eKA{NmgU|L^wbh+f!uh_J;s#3V=7
zgXu{-I=ERlxEX1CJ6X6IoGrg4O{;cD;D>Lk_(3flaSYnJz|sp+2bzjqmvlWZO;tSI
zWPMuedAALX7OK>2GwiT-`aRHc_!GwUf&_Fl*337$O!if1C2r3vMxy*<jPxF{wlkLy
zPThe`kjLVDt>tgtodPmy+jE+EM}3cQO%w#*FWNU=H(v}Uh;!&n^rf*f#cG;%5O-R)
zL!;2E95wzni_d6UX14btzlVYeRB&gn$-7*};-*(Qh=rDH1yqa+VdGCDCQM9ll^$jp
z!wb>X#C{csjy9<Ks3JO6(_#g6zhjANMMR2OEk=G~yjg2oIuAk?fj<|TmzyaS6}%5)
zaq+pk;zyUeS%f;aM~_K!WoPM#UatXgxX^etX{<WJHL8Eq>gr8H9WK(2+v&+ei4-AO
z#qjsQ%VB~NJVG<;ANiJR9f+>F5=i)WNfbxo=uM1>t<jb7@;KxYib}^E3;_%c%5x+c
zTruk0Og^o=E7^4znb)Gj@<nN#A}n0jdUIIxnZLa6Hs;%dA^SR-z(eQLIWe!p{f$7N
zx-tqX@!2}*<+CV#(R&C70#E=D#Cyu&fBN#A!2b^ONCE%=KH^or`!neO&h%o~M<ULd
zj{J)`n>c@ChKz&f4ap4I%pJ|tT^yZ|N#=Kc7QRZO+K3?<fJig{bUx?D^efE7$q6}H
zFQOU!>h7x|(Dx8%f-^?{NLz&X_FtxEjxHAe1^=i97Wj^U1t2;j=LfQ#GiOAE>7Q_S
zS2sudp9KEf!U)8VhScL0+F6YM|6A#J@0X--QO}Fn1Ig%IP}==pV1MM2i*)!c)-;U}
z$};?6ZI5$#%^dCR5dp&WtXA}I!Xt`^el(=Ena*cYn7f#GBG>i*@N!bnBBv^XrzV06
z#Sh%M{I4z`J?!md&Z%(TK<r;s;NlepB&~Boq>E=F{BeEZB87`3P(LX=8#|})Z$Z@G
z^#6T`8zZvLFEzQp5Almtxj#8Ve}(<5(Y+}0#bflJ1RA!_`2OnmzX^?tM4mOI(}0Mq
zfDrnZ4EZ-KG6SEtv*CSk5&O?U&+ocl%*aRz=l+8J4+<CZ^F>=oPgkk%+X4WC!>DKX
zuKgs){)akeq<$I6NEOaQs~Oi!*L4j5!08Lh1u80T7Zv*{&_!7;-beRSma^{uq;hsw
Yow_nQLQ>?NcVNI8qF7t&GxF2_0Zk}rR{#J2

literal 0
HcmV?d00001


From 5250204b5c3989bea949361b4c81b2fb83af42d2 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 28 May 2021 12:38:12 +0800
Subject: [PATCH 103/128] =?UTF-8?q?=E6=B2=BB=E7=90=86=E6=8C=87=E6=95=B0-?=
 =?UTF-8?q?=E7=BD=91=E6=A0=BC=E8=B0=83=E8=AF=951?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ExtractFactGridGovernDailyFromDTO.java    | 22 +++++++++
 .../com/epmet/controller/DemoController.java  | 20 +++++++-
 .../todata/FactGridGovernDailyService.java    |  6 +--
 .../impl/FactGridGovernDailyServiceImpl.java  | 49 ++++++++++---------
 .../resources/mapper/org/CustomerGridDao.xml  |  3 +-
 5 files changed, 71 insertions(+), 29 deletions(-)
 create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/ExtractFactGridGovernDailyFromDTO.java

diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/ExtractFactGridGovernDailyFromDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/ExtractFactGridGovernDailyFromDTO.java
new file mode 100644
index 0000000000..6b1ec0810f
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/ExtractFactGridGovernDailyFromDTO.java
@@ -0,0 +1,22 @@
+package com.epmet.dto.extract.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 治理指数网格-计算入参。
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/5/27 17:28
+ */
+@Data
+public class ExtractFactGridGovernDailyFromDTO implements Serializable {
+    private static final long serialVersionUID = -4511693100253244749L;
+    @NotBlank(message = "customer")
+    private String customerId;
+    private String dateId;
+    private List<String> gridIds;
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
index bf2a5ae63f..a8baf89b38 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
@@ -19,6 +19,7 @@ import com.epmet.dao.stats.DimDateDao;
 import com.epmet.dao.stats.DimMonthDao;
 import com.epmet.dto.AgencySubTreeDto;
 import com.epmet.dto.StatsFormDTO;
+import com.epmet.dto.extract.form.ExtractFactGridGovernDailyFromDTO;
 import com.epmet.dto.extract.form.ExtractOriginFormDTO;
 import com.epmet.dto.extract.form.ExtractScreenFormDTO;
 import com.epmet.dto.indexcal.CalculateCommonFormDTO;
@@ -534,6 +535,14 @@ public class DemoController {
     }
 
 
+    /**
+     * @return com.epmet.commons.tools.utils.Result
+     * @param customerId
+     * @param dateId
+     * @author yinzuomei
+     * @description 话题原始表抽取方法
+     * @Date 2021/5/28 10:23
+     **/
     @PostMapping("inserttopicorigin")
     public Result topicDataCleaning(@RequestParam("customerId") String customerId, @RequestParam("dateId")String dateId) {
         if (StringUtils.isNotBlank(customerId) && StringUtils.isNotBlank(dateId)) {
@@ -903,9 +912,16 @@ public class DemoController {
         return new Result();
     }
 
+    /**
+     * @return com.epmet.commons.tools.utils.Result
+     * @param fromDTO
+     * @author yinzuomei
+     * @description
+     * @Date 2021/5/27 17:28
+     **/
     @PostMapping("extractgridgoverndaily")
-    public Result extractFactGridGovernDaily(@RequestParam("customerId") String customerId,@RequestParam("dateId")String dateId){
-        factGridGovernDailyService.extractFactGridGovernDaily(customerId,dateId);
+    public Result extractFactGridGovernDaily(@RequestBody ExtractFactGridGovernDailyFromDTO fromDTO){
+        factGridGovernDailyService.extractFactGridGovernDaily(fromDTO);
         return new Result();
     }
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactGridGovernDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactGridGovernDailyService.java
index 95185f2134..15447342ab 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactGridGovernDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactGridGovernDailyService.java
@@ -18,6 +18,7 @@
 package com.epmet.service.evaluationindex.extract.todata;
 
 import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.dto.extract.form.ExtractFactGridGovernDailyFromDTO;
 import com.epmet.entity.evaluationindex.extract.FactGridGovernDailyEntity;
 
 /**
@@ -35,10 +36,9 @@ public interface FactGridGovernDailyService extends BaseService<FactGridGovernDa
      * 治理指数-网格相关：问题解决总数、党群自治占比、网格自治占比
      *
      *
-     * @param customerId
-     * @param dateId
+     * @param fromDTO
      * @return
      */
-    void extractFactGridGovernDaily(String customerId, String dateId);
+    void extractFactGridGovernDaily(ExtractFactGridGovernDailyFromDTO fromDTO);
 
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java
index 24136c028f..46c55d8574 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java
@@ -24,6 +24,7 @@ import com.epmet.constant.DimObjectStatusConstant;
 import com.epmet.constant.ProjectConstant;
 import com.epmet.dao.evaluationindex.extract.FactGridGovernDailyDao;
 import com.epmet.dto.extract.FactOriginProjectLogDailyDTO;
+import com.epmet.dto.extract.form.ExtractFactGridGovernDailyFromDTO;
 import com.epmet.dto.org.GridInfoDTO;
 import com.epmet.entity.evaluationindex.extract.FactGridGovernDailyEntity;
 import com.epmet.entity.evaluationindex.extract.GovernGridClosedTotalCommonDTO;
@@ -74,12 +75,13 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
     /**
      * 治理指数-网格相关：问题解决总数、党群自治占比、网格自治占比
      *
-     * @param customerId
-     * @param dateId
+     * @param fromDTO
      * @return
      */
     @Override
-    public void extractFactGridGovernDaily(String customerId, String dateId) {
+    public void extractFactGridGovernDaily(ExtractFactGridGovernDailyFromDTO fromDTO) {
+        String customerId=fromDTO.getCustomerId();
+        String dateId=fromDTO.getDateId();
         log.info("extractFactGridGovernDaily start customerId="+customerId+";dateId="+dateId);
         //客户id, dateId不能为空
         if(StringUtils.isBlank(customerId)||StringUtils.isBlank(dateId)){
@@ -93,7 +95,7 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
         }
         List<String> gridIds=gridInfoDTOList.stream().map(GridInfoDTO::getGridId).collect(Collectors.toList());
         List<FactGridGovernDailyEntity> insertEntityList=this.constructFactGridGovernDailyEntityList(customerId,dateId,gridInfoDTOList);
-        // log.info(JSON.toJSONString(insertEntityList,true));
+        log.info("==========================当前客户下多少个网格？ "+insertEntityList.size());
 
         NumberFormat numberFormat = NumberFormat.getInstance();
         numberFormat.setMaximumFractionDigits(NumConstant.SIX);
@@ -158,26 +160,27 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
                 insertEntity.setInGroupTopicUnResolvedCount(inGroupTopicUnResolvedMap.get(insertEntity.getGridId()));
             }
 
-            // todo
-            // 11、来源于议题的项目，未出网格结案并且已解决的项目数
-            insertEntity.setFromIssueResolvedInGridCount(666);
-            // 12、来源于议题的项目，未出网格结案并且无需解决的项目数
-            insertEntity.setFromIssueUnResolvedInGridCount(666);
-            // 13、来源于项目立项的项目，未出网格结案，并且已解决的项目数；因现在网格不能立项，所以此列默认为0
-            insertEntity.setFromAgencyResolvedInGridCount(666);
-            // 14、来源于项目立项的项目，未出网格结案，并且无需解决的项目数；因现在网格不能立项，所以此列默认为0
-            insertEntity.setFromAgencyUnResolvedInGridCount(666);
-            // 所有网格内结案项目数（未出网格）=来源于议题的项目结案已解决+来源于议题的项目结案无需解决+来源于立项的项目结案已解决+来源于立项的项目结案无需解决
-            // 15、未出当前网格的，结案项目数=11+12+13+14
-            insertEntity.setGridSelfGovernProjectTotal(insertEntity.getFromIssueResolvedInGridCount()+insertEntity.getFromIssueUnResolvedInGridCount()+
+            if (dtoMap.containsKey(insertEntity.getGridId()) && null != dtoMap.get(insertEntity.getGridId())) {
+                // 11、来源于议题的项目，未出网格结案并且已解决的项目数
+                insertEntity.setFromIssueResolvedInGridCount(dtoMap.get(insertEntity.getGridId()).getFromIssueResolvedInGridCount());
+                // 12、来源于议题的项目，未出网格结案并且无需解决的项目数
+                insertEntity.setFromIssueUnResolvedInGridCount(dtoMap.get(insertEntity.getGridId()).getFromIssueUnResolvedInGridCount());
+                // 13、来源于项目立项的项目，未出网格结案，并且已解决的项目数；因现在网格不能立项，所以此列默认为0
+                insertEntity.setFromAgencyResolvedInGridCount(dtoMap.get(insertEntity.getGridId()).getFromAgencyResolvedInGridCount());
+                // 14、来源于项目立项的项目，未出网格结案，并且无需解决的项目数；因现在网格不能立项，所以此列默认为0
+                insertEntity.setFromAgencyUnResolvedInGridCount(dtoMap.get(insertEntity.getGridId()).getFromAgencyUnResolvedInGridCount());
+                // 所有网格内结案项目数（未出网格）=来源于议题的项目结案已解决+来源于议题的项目结案无需解决+来源于立项的项目结案已解决+来源于立项的项目结案无需解决
+                // 15、未出当前网格的，结案项目数=11+12+13+14
+                insertEntity.setGridSelfGovernProjectTotal(insertEntity.getFromIssueResolvedInGridCount()+insertEntity.getFromIssueUnResolvedInGridCount()+
                         insertEntity.getFromAgencyResolvedInGridCount()+insertEntity.getFromAgencyUnResolvedInGridCount());
 
-            //当前网格内出来的项目：由社区结案(已解决+未解决)的项目总数
-            insertEntity.setCommunityClosedCount(666);
-            //当前网格内出来的项目：由街道结案(已解决+未解决)的项目总数
-            insertEntity.setStreetClosedCount(666);
-            //当前网格内出来的项目：由街道结案(已解决+未解决)的项目总数
-            insertEntity.setDistrictDeptClosedCount(666);
+                //当前网格内出来的项目：由社区结案(已解决+未解决)的项目总数
+                insertEntity.setCommunityClosedCount(dtoMap.get(insertEntity.getGridId()).getCommunityClosedCount());
+                //当前网格内出来的项目：由街道结案(已解决+未解决)的项目总数
+                insertEntity.setStreetClosedCount(dtoMap.get(insertEntity.getGridId()).getStreetClosedCount());
+                //当前网格内出来的项目：由街道结案(已解决+未解决)的项目总数
+                insertEntity.setDistrictDeptClosedCount(dtoMap.get(insertEntity.getGridId()).getDistrictDeptClosedCount());
+            }
 
             //界面展示：1、问题解决总数=1+2+3+4+5+6+7+8
             insertEntity.setProblemResolvedCount(insertEntity.getTopicResolvedCount()+insertEntity.getTopicUnResolvedCount()
@@ -447,7 +450,7 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
             entity.setCustomerId(customerId);
             entity.setDateId(dateId);
             entity.setGridId(gridInfoDTO.getGridId());
-            entity.setPid(gridInfoDTO.getPid());
+            entity.setPid(gridInfoDTO.getAgencyId());
             entity.setPids(gridInfoDTO.getPids());
             insertEntityList.add(entity);
         }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerGridDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerGridDao.xml
index ea0d0fc48b..7aa2bf3422 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerGridDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerGridDao.xml
@@ -80,7 +80,8 @@
             ca.ORGANIZATION_NAME as ORG_NAME
         FROM
             customer_grid cg
-            LEFT JOIN customer_agency ca ON ( cg.PID = CA.ID )
+            LEFT JOIN customer_agency ca
+            ON ( cg.PID = CA.ID and ca.del_flag='0')
         WHERE
             CG.CUSTOMER_ID =#{customerId}
             and cg.del_flag='0'

From 0b188fcd834fbcc7fc617dd3edc90a6cafd03e3c Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 28 May 2021 13:50:43 +0800
Subject: [PATCH 104/128] =?UTF-8?q?=E6=B2=BB=E7=90=86=E6=8C=87=E6=95=B0bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataaggre/service/datastats/impl/DataStatsServiceImpl.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index c636d2fe11..25aa4c60c5 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -1224,6 +1224,9 @@ public class DataStatsServiceImpl implements DataStatsService {
                     dto.setProblemResolvedCount(re.getProblemResolvedCount());
                     dto.setGroupSelfGovernRatio(re.getGroupSelfGovernRatio());
                     dto.setGridSelfGovernRatio(re.getGridSelfGovernRatio());
+                    dto.setCommunityResolvedRatio(re.getCommunityResolvedRatio());
+                    dto.setDistrictDeptResolvedRatio(re.getDistrictDeptResolvedRatio());
+                    dto.setStreetResolvedRatio(re.getStreetResolvedRatio());
                 }
             }
             resultList.add(dto);

From 6bf696d540e2fd87d8cec9a8ef34fbf07727725d Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Fri, 28 May 2021 17:17:10 +0800
Subject: [PATCH 105/128] =?UTF-8?q?=E5=9F=BA=E5=B1=82=E6=B2=BB=E7=90=86-?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=9A=84=E6=B2=BB=E7=90=86=E6=8C=87=E6=95=B0?=
 =?UTF-8?q?=EF=BC=8C=E6=8C=89=E5=A4=A9=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/constant/IssueConstant.java     |   3 +
 .../extract/FactOriginProjectLogDailyDao.java |  10 +
 .../FactOriginProjectLogDailyService.java     |  10 +
 .../FactAgencyGovernDailyServiceImpl.java     | 249 ++++++++++++++++--
 .../FactOriginProjectLogDailyServiceImpl.java |  19 ++
 .../extract/FactOriginProjectLogDailyDao.xml  |  40 +++
 6 files changed, 308 insertions(+), 23 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/IssueConstant.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/IssueConstant.java
index c611d4b97e..891f6ef091 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/IssueConstant.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/IssueConstant.java
@@ -26,4 +26,7 @@ public interface IssueConstant {
 	 *未解决
 	 */
 	String UNRESOLVED = "unresolved";
+
+	String CLOSED_RESOLVED = "closed_resolved";
+	String CLOSED_UNRESOLVED = "closed_unresolved";
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectLogDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectLogDailyDao.java
index 3d7371fb56..3bdbc200bd 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectLogDailyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectLogDailyDao.java
@@ -299,6 +299,16 @@ public interface FactOriginProjectLogDailyDao extends BaseDao<FactOriginProjectL
 	 */
 	List<OrgStatisticsResultDTO> selectGridSelfDaily(@Param("customerId") String customerId, @Param("dateId") String dateId);
 
+	/**
+	 * 组织网格自治率统计--按天
+	 * @author zhaoqifeng
+	 * @date 2021/5/24 17:53
+	 * @param customerId
+	 * @param dateId
+	 * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+	 */
+	List<OrgStatisticsResultDTO> selectAgencyGridSelfDaily(@Param("customerId") String customerId, @Param("dateId") String dateId);
+
 	/**
 	 * @return java.util.List<com.epmet.dto.extract.FactOriginProjectLogDailyDTO>
 	 * @param projectId
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectLogDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectLogDailyService.java
index 141a8dc7b8..b925cc31e4 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectLogDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectLogDailyService.java
@@ -320,4 +320,14 @@ public interface FactOriginProjectLogDailyService extends BaseService<FactOrigin
      * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
      */
     List<OrgStatisticsResultDTO> getGridSelfDaily(String customerId, String dateId);
+
+    /**
+     * 组织网格自制率统计-按天
+     * @author zhaoqifeng
+     * @date 2021/5/24 17:52
+     * @param customerId
+     * @param dateId
+     * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     */
+    Map<String, OrgStatisticsResultDTO> getAgencyGridSelfDaily(String customerId, String dateId);
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java
index ba1ee9853d..82e599ff4b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java
@@ -19,22 +19,23 @@ package com.epmet.service.evaluationindex.extract.todata.impl;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.constant.*;
 import com.epmet.dao.evaluationindex.extract.FactAgencyGovernDailyDao;
 import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
 import com.epmet.dto.stats.DimAgencyDTO;
 import com.epmet.entity.evaluationindex.extract.FactAgencyGovernDailyEntity;
-import com.epmet.service.evaluationindex.extract.todata.FactAgencyGovernDailyService;
-import com.epmet.service.evaluationindex.extract.todata.FactOriginIssueMainDailyService;
-import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectMainDailyService;
-import com.epmet.service.evaluationindex.extract.todata.FactOriginTopicMainDailyService;
+import com.epmet.service.evaluationindex.extract.todata.*;
 import com.epmet.service.stats.DimAgencyService;
 import com.epmet.util.DimIdGenerator;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -54,6 +55,8 @@ public class FactAgencyGovernDailyServiceImpl extends BaseServiceImpl<FactAgency
 	private FactOriginIssueMainDailyService factOriginIssueMainDailyService;
 	@Resource
 	private FactOriginProjectMainDailyService factOriginProjectMainDailyService;
+	@Resource
+	private FactOriginProjectLogDailyService factOriginProjectLogDailyService;
 
 	/**
 	 * 治理指数-组织相关
@@ -67,27 +70,227 @@ public class FactAgencyGovernDailyServiceImpl extends BaseServiceImpl<FactAgency
 	@Override
 	public void extractFactAgencyGovernDaily(String customerId, String dateId) {
 		List<DimAgencyDTO> agencyList =  dimAgencyService.getAgencyInfoByCustomerId(customerId);
-		List<FactAgencyGovernDailyEntity> agencyGovernDailyList = agencyList.stream().map(agency -> {
-			FactAgencyGovernDailyEntity entity = initEntity(agency, dateId);
-			return entity;
-		}).collect(Collectors.toList());
-		// 问题解决总数：当前组织下，话题关闭（已解决+无需解决）总数、议题关闭（已解决+无需解决）总数和项目结案（议题转为项目的结案数+项目立项结案数）总数之和
+		List<FactAgencyGovernDailyEntity> agencyGovernDailyList = agencyList.stream().map(agency -> initEntity(agency, dateId)).collect(Collectors.toList());
+		// 1.问题解决总数：当前组织下，话题关闭（已解决+无需解决）总数、议题关闭（已解决+无需解决）总数和项目结案（议题转为项目的结案数+项目立项结案数）总数之和
+		// 话题总数
 		Map<String, OrgStatisticsResultDTO> topicTotal = factOriginTopicMainDailyService.getAgencyClosedTopicCount(customerId, dateId, null,
 				null);
-		// 党群自治占比：当前组织下，所有小组内关闭（已解决+无需解决）的话题数与问题解决总数之比（未出小组：未转议题的）
-		// 网格自治占比：当前组织下，所有网格内结案项目数与问题解决总数之比（未出网格）
-		// 参考：fact_index_govrn_ablity_grid_monthly的SELF_SOLVE_PROJECT_COUNT计算
-		// 社区解决占比：当前组织下，由社区结案的项目数与问题解决总数之比
-		// 区直部门解决占比：当前组织下，由区级部门结案的项目数与问题解决总数之比
-		// 街道解决占比：当前组织下，由街道结案的项目数与问题解决总数之比
-		// 自下而上的项目解决：结案时操作人所代表的的处理部门（可以是网格、街道、组织）
-		// 自上而下的项目解决：向下吹哨，谁立项谁解决（后期在讨论哪样更合理）
-		//
-		// 究竟是谁解决！！：
-		// A社区→A街道→B社区（结案）——A街道解决（自下而上吹（饱含立项往上吹/从话题来的项目），看往上吹的最高层级）
-		// A社区→B社区→C社区（结案）——C社区解决（平级协助解决，看最后结案）
-		// A街道→A社区→B社区（结案）——A街道解决（自上而下吹，谁立项谁解决）
-		// 注：A社区→A街道→（退回）A社区→B社区（结案），A街道不算处理项目，仍是平级协助解决，看最后谁结案
+		if (!topicTotal.isEmpty()) {
+			agencyGovernDailyList.forEach(item -> {
+				OrgStatisticsResultDTO dto = topicTotal.get(item.getAgencyId());
+				if (null != dto) {
+					item.setProblemResolvedCount(dto.getSum());
+				}
+			});
+			//当前组织内，话题关闭已解决数
+			Map<String, OrgStatisticsResultDTO> topicResolvedCount = factOriginTopicMainDailyService.getAgencyClosedTopicCount(customerId, dateId,
+					ProjectConstant.RESOLVED,
+					null);
+			if (!topicResolvedCount.isEmpty()) {
+				agencyGovernDailyList.forEach(item -> {
+					OrgStatisticsResultDTO dto = topicResolvedCount.get(item.getAgencyId());
+					if (null != dto) {
+						item.setTopicResolvedCount(dto.getSum());
+					}
+				});
+			}
+			//当前组织内，话题关闭未解决数
+			Map<String, OrgStatisticsResultDTO> topicUnResolvedCount = factOriginTopicMainDailyService.getAgencyClosedTopicCount(customerId, dateId,
+					ProjectConstant.UNRESOLVED,
+					null);
+			if (!topicUnResolvedCount.isEmpty()) {
+				agencyGovernDailyList.forEach(item -> {
+					OrgStatisticsResultDTO dto = topicUnResolvedCount.get(item.getAgencyId());
+					if (null != dto) {
+						item.setTopicUnResolvedCount(dto.getSum());
+					}
+				});
+			}
+			//当前组织内，话题关闭已解决数
+			Map<String, OrgStatisticsResultDTO> topicSelfResolvedCount = factOriginTopicMainDailyService.getAgencyClosedTopicCount(customerId, dateId,
+					ProjectConstant.RESOLVED,
+					NumConstant.ZERO);
+			if (!topicSelfResolvedCount.isEmpty()) {
+				agencyGovernDailyList.forEach(item -> {
+					OrgStatisticsResultDTO dto = topicSelfResolvedCount.get(item.getAgencyId());
+					if (null != dto) {
+						item.setInGroupTopicResolvedCount(dto.getSum());
+					}
+				});
+			}
+			//当前组织内，话题关闭未解决数
+			Map<String, OrgStatisticsResultDTO> topicSelfUnResolvedCount = factOriginTopicMainDailyService.getAgencyClosedTopicCount(customerId,
+					dateId,
+					ProjectConstant.UNRESOLVED,
+					NumConstant.ZERO);
+			if (!topicSelfUnResolvedCount.isEmpty()) {
+				agencyGovernDailyList.forEach(item -> {
+					OrgStatisticsResultDTO dto = topicSelfUnResolvedCount.get(item.getAgencyId());
+					if (null != dto) {
+						item.setInGroupTopicUnResolvedCount(dto.getSum());
+					}
+				});
+			}
+		}
+		//议题总数
+		Map<String, OrgStatisticsResultDTO> issueTotal = factOriginIssueMainDailyService.getAgencyClosedIssueCount(customerId, dateId, null);
+		if (!issueTotal.isEmpty()) {
+			agencyGovernDailyList.forEach(item -> {
+				OrgStatisticsResultDTO dto = issueTotal.get(item.getAgencyId());
+				if (null != dto) {
+					item.setProblemResolvedCount(item.getProblemResolvedCount() + dto.getSum());
+				}
+			});
+			// 当前组织内，议题关闭已解决数
+			Map<String, OrgStatisticsResultDTO> issueResolvedTotal = factOriginIssueMainDailyService.getAgencyClosedIssueCount(customerId, dateId,
+					IssueConstant.CLOSED_RESOLVED);
+			if (!issueResolvedTotal.isEmpty()) {
+				agencyGovernDailyList.forEach(item -> {
+					OrgStatisticsResultDTO dto = issueResolvedTotal.get(item.getAgencyId());
+					if (null != dto) {
+						item.setIssueResolvedCount(dto.getSum());
+					}
+				});
+			}
+			// 当前组织内，议题关闭未解决数
+			Map<String, OrgStatisticsResultDTO> issueUnResolvedTotal = factOriginIssueMainDailyService.getAgencyClosedIssueCount(customerId, dateId,
+					IssueConstant.CLOSED_UNRESOLVED);
+			if (!issueUnResolvedTotal.isEmpty()) {
+				agencyGovernDailyList.forEach(item -> {
+					OrgStatisticsResultDTO dto = issueUnResolvedTotal.get(item.getAgencyId());
+					if (null != dto) {
+						item.setIssueUnResolvedCount(dto.getSum());
+					}
+				});
+			}
+		}
+		//项目总数
+		Map<String, OrgStatisticsResultDTO> projectTotal = factOriginProjectMainDailyService.getAgencyClosedProjectCount(customerId, dateId, null,
+				null);
+		if (!projectTotal.isEmpty()) {
+			agencyGovernDailyList.forEach(item -> {
+				OrgStatisticsResultDTO dto = projectTotal.get(item.getAgencyId());
+				if (null != dto) {
+					item.setProblemResolvedCount(item.getProblemResolvedCount() + dto.getSum());
+				}
+			});
+			// 当前组织内：来源于议题的项目：结案已解决数
+			Map<String, OrgStatisticsResultDTO> issueProjectResolvedTotal = factOriginProjectMainDailyService.getAgencyClosedProjectCount(customerId,
+					dateId,	ProjectConstant.RESOLVED,
+					"issue");
+			if (!issueProjectResolvedTotal.isEmpty()) {
+				agencyGovernDailyList.forEach(item -> {
+					OrgStatisticsResultDTO dto = issueProjectResolvedTotal.get(item.getAgencyId());
+					if (null != dto) {
+						item.setIssueProjectResolvedCount(dto.getSum());
+					}
+				});
+			}
+			// 当前组织内：来源于议题的项目：结案无需解决数
+			Map<String, OrgStatisticsResultDTO> issueProjectUnResolvedTotal = factOriginProjectMainDailyService.getAgencyClosedProjectCount(customerId,
+					dateId,	ProjectConstant.UNRESOLVED,
+					"issue");
+			if (!issueProjectUnResolvedTotal.isEmpty()) {
+				agencyGovernDailyList.forEach(item -> {
+					OrgStatisticsResultDTO dto = issueProjectUnResolvedTotal.get(item.getAgencyId());
+					if (null != dto) {
+						item.setIssueProjectUnResolvedCount(dto.getSum());
+					}
+				});
+			}
+
+			// 当前组织内：来源于议题的项目：结案已解决数
+			Map<String, OrgStatisticsResultDTO> projectResolvedTotal = factOriginProjectMainDailyService.getAgencyClosedProjectCount(customerId,
+					dateId,	ProjectConstant.RESOLVED,
+					OrgTypeConstant.AGENCY);
+			if (!projectResolvedTotal.isEmpty()) {
+				agencyGovernDailyList.forEach(item -> {
+					OrgStatisticsResultDTO dto = projectResolvedTotal.get(item.getAgencyId());
+					if (null != dto) {
+						item.setApprovalProjectResolvedCount(dto.getSum());
+					}
+				});
+			}
+			// 当前组织内：来源于议题的项目：结案无需解决数
+			Map<String, OrgStatisticsResultDTO> projectUnResolvedTotal = factOriginProjectMainDailyService.getAgencyClosedProjectCount(customerId,
+					dateId,	ProjectConstant.UNRESOLVED,
+					OrgTypeConstant.AGENCY);
+			if (!projectUnResolvedTotal.isEmpty()) {
+				agencyGovernDailyList.forEach(item -> {
+					OrgStatisticsResultDTO dto = projectUnResolvedTotal.get(item.getAgencyId());
+					if (null != dto) {
+						item.setApprovalProjectUnResolvedCount(dto.getSum());
+					}
+				});
+			}
+		}
+		// 2.党群自治占比：当前组织下，所有小组内关闭（已解决+无需解决）的话题数与问题解决总数之比（未出小组：未转议题的）
+		agencyGovernDailyList.forEach(item -> {
+			int count = item.getInGroupTopicResolvedCount() + item.getInGroupTopicUnResolvedCount();
+			int sum = item.getProblemResolvedCount();
+			if (sum != NumConstant.ZERO) {
+				BigDecimal resolveCount = new BigDecimal(sum);
+				BigDecimal selfCount = new BigDecimal(count);
+				item.setGroupSelfGovernRatio(selfCount.divide(resolveCount, NumConstant.SIX, RoundingMode.HALF_UP));
+			}
+		});
+		// 3.网格自治占比：当前组织下，所有网格内结案项目数与问题解决总数之比（未出网格）
+		Map<String, OrgStatisticsResultDTO> gridSelfCount = factOriginProjectLogDailyService.getAgencyGridSelfDaily(customerId, dateId);
+		if (!gridSelfCount.isEmpty()) {
+			agencyGovernDailyList.forEach(item -> {
+				OrgStatisticsResultDTO dto = gridSelfCount.get(item.getAgencyId());
+				if (null != dto) {
+					int count = dto.getCount();
+					int sum = item.getProblemResolvedCount();
+					if (sum != NumConstant.ZERO) {
+						BigDecimal resolveCount = new BigDecimal(sum);
+						BigDecimal selfCount = new BigDecimal(count);
+						item.setGridSelfGovernRatio(selfCount.divide(resolveCount, NumConstant.SIX, RoundingMode.HALF_UP));
+					}
+				}
+			});
+		}
+		// 4.社区解决占比：当前组织下，由社区结案的项目数与问题解决总数之比
+		// 5.区直部门解决占比：当前组织下，由区级部门结案的项目数与问题解决总数之比
+		// 6.街道解决占比：当前组织下，由街道结案的项目数与问题解决总数之比
+		Map<String, List<OrgStatisticsResultDTO>> projectCount = factOriginProjectMainDailyService.getAgencyClosedProjectStatic(customerId, dateId);
+		if (!gridSelfCount.isEmpty()) {
+			agencyGovernDailyList.forEach(item -> {
+				List<OrgStatisticsResultDTO> list = projectCount.get(item.getAgencyId());
+				if (CollectionUtils.isNotEmpty(list)) {
+					Map<String, OrgStatisticsResultDTO> map = list.stream().collect(Collectors.toMap(OrgStatisticsResultDTO::getLevel,
+							Function.identity()));
+					int sum = item.getProblemResolvedCount();
+					BigDecimal resolveCount = new BigDecimal(sum);
+					if (sum != NumConstant.ZERO) {
+						// 社区解决占比
+						OrgStatisticsResultDTO community = map.get(ScreenConstant.COMMUNITY);
+						if (null != community) {
+							int count = community.getCount();
+							BigDecimal selfCount = new BigDecimal(count);
+							item.setCommunityClosedRatio(selfCount.divide(resolveCount, NumConstant.SIX, RoundingMode.HALF_UP));
+							item.setCommunityClosedCount(count);
+						}
+						// 街道解决占比
+						OrgStatisticsResultDTO street = map.get(ScreenConstant.STREET);
+						if (null != street) {
+							int count = street.getCount();
+							BigDecimal selfCount = new BigDecimal(count);
+							item.setStreetClosedRatio(selfCount.divide(resolveCount, NumConstant.SIX, RoundingMode.HALF_UP));
+							item.setStreetClosedCount(count);
+						}
+						// 区直部门解决占比
+						OrgStatisticsResultDTO districtDept = map.get(ScreenConstant.DISTRICT);
+						if (null != districtDept) {
+							int count = districtDept.getCount();
+							BigDecimal selfCount = new BigDecimal(count);
+							item.setDistrictDeptClosedRatio(selfCount.divide(resolveCount, NumConstant.SIX, RoundingMode.HALF_UP));
+							item.setDistrictDeptClosedCount(count);
+						}
+					}
+				}
+			});
+		}
 	}
 
 	private FactAgencyGovernDailyEntity initEntity(DimAgencyDTO agency, String dateId) {
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectLogDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectLogDailyServiceImpl.java
index 3dde0b0032..73de4eb905 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectLogDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectLogDailyServiceImpl.java
@@ -41,6 +41,7 @@ import org.springframework.util.CollectionUtils;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -414,5 +415,23 @@ public class FactOriginProjectLogDailyServiceImpl extends BaseServiceImpl<FactOr
         return baseDao.selectGridSelfDaily(customerId, dateId);
     }
 
+    /**
+     * 组织网格自制率统计-按天
+     *
+     * @param customerId
+     * @param dateId
+     * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
+     * @author zhaoqifeng
+     * @date 2021/5/24 17:52
+     */
+    @Override
+    public Map<String, OrgStatisticsResultDTO> getAgencyGridSelfDaily(String customerId, String dateId) {
+        List<OrgStatisticsResultDTO> list = baseDao.selectAgencyGridSelfDaily(customerId, dateId);
+        if (CollectionUtils.isEmpty(list)) {
+            return Collections.emptyMap();
+        }
+        return list.stream().collect(Collectors.toMap(OrgStatisticsResultDTO::getAgencyId, Function.identity()));
+    }
+
 
 }
\ No newline at end of file
diff --git 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
index c1b12a7da5..a281843411 100644
--- 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
@@ -687,4 +687,44 @@
             and m.ACTION_CODE='close'
             AND m.PROJECT_ID = #{projectId}
     </select>
+    <select id="selectAgencyGridSelfDaily" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
+        SELECT
+            fm.AGENCY_ID,
+            COUNT( ID ) AS "sum",
+            IFNULL(a.count,0) AS "count"
+        FROM
+            fact_origin_project_main_daily fm
+                LEFT JOIN (
+                SELECT
+                    AGENCY_ID,
+                    orgId,
+                    COUNT( PROJECT_ID ) AS "count"
+                FROM
+                    (
+                        SELECT
+                            AGENCY_ID,
+                            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")
+                        GROUP BY
+                            PROJECT_ID
+                        HAVING
+                            COUNT(DISTINCT ( ORG_ID )) = 1) a
+                GROUP BY
+                    AGENCY_ID
+            ) a ON fm.AGENCY_ID = a.AGENCY_ID
+        WHERE
+            PROJECT_STATUS = 'closed'
+          AND ORIGIN = "issue"
+          AND CUSTOMER_ID = #{customerId}
+          AND DATE_ID &lt;= #{dateId}
+        GROUP BY
+            fm.AGENCY_ID
+    </select>
 </mapper>
\ No newline at end of file

From 4d623d98cd30e605503b89ccd484bc047c8ca24a Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 28 May 2021 18:42:57 +0800
Subject: [PATCH 106/128] =?UTF-8?q?=E6=B2=BB=E7=90=86=E6=8C=87=E6=95=B0-?=
 =?UTF-8?q?=E7=BD=91=E6=A0=BC=E7=9B=B8=E5=85=B3=E6=95=B0=E6=8D=AE=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8Cv1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../todata/impl/FactGridGovernDailyServiceImpl.java | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java
index 46c55d8574..2a9b0e4120 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java
@@ -108,8 +108,8 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
         Map<String,Integer>  issueProjectUnResolvedMap=getGridProjectMap(customerId,null,ProjectConstant.CLOSED,ProjectConstant.PROJECT_ORIGIN_ISSUE,DimObjectStatusConstant.UNRESOLVED);
         Map<String,Integer>  approvalProjectResolvedMap=getGridProjectMap(customerId,null,ProjectConstant.CLOSED,ProjectConstant.PROJECT_ORIGIN_AGENCY,DimObjectStatusConstant.RESOLVED);
         Map<String,Integer>  approvalProjectUnResolvedMap=getGridProjectMap(customerId,null,ProjectConstant.CLOSED,ProjectConstant.PROJECT_ORIGIN_AGENCY,DimObjectStatusConstant.UNRESOLVED);
-        Map<String, Integer> inGroupTopicResolvedMap=getTopicMap(customerId, null,ProjectConstant.CLOSED, DimObjectStatusConstant.RESOLVED,NumConstant.ONE_STR);
-        Map<String, Integer> inGroupTopicUnResolvedMap=getTopicMap(customerId, null,ProjectConstant.CLOSED, DimObjectStatusConstant.UNRESOLVED,NumConstant.ONE_STR);
+        Map<String, Integer> inGroupTopicResolvedMap=getTopicMap(customerId, null,ProjectConstant.CLOSED, DimObjectStatusConstant.RESOLVED,NumConstant.ZERO_STR);
+        Map<String, Integer> inGroupTopicUnResolvedMap=getTopicMap(customerId, null,ProjectConstant.CLOSED, DimObjectStatusConstant.UNRESOLVED,NumConstant.ZERO_STR);
         Map<String, GovernGridClosedTotalCommonDTO> dtoMap=getGovernGridClosedTotalCommonDTOMap(customerId,gridIds);
 
         for(FactGridGovernDailyEntity insertEntity:insertEntityList){
@@ -278,6 +278,7 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
                 boolean inGridClosed = checkIsInGridClosed(governProjectInfoDTO.getGridId(),
                         governProjectInfoDTO.getProjectLogDTOList());
                 if (inGridClosed) {
+                    log.info("projectId=【"+governProjectInfoDTO.getId()+"】属于网格自治");
                     // 2、在网格内流转结案的，计算以下下值
                     if (ProjectConstant.PROJECT_ORIGIN_ISSUE.equals(governProjectInfoDTO.getOrigin())) {
                         if (ProjectConstant.RESOLVED.equals(governProjectInfoDTO.getIsResolved())) {
@@ -301,12 +302,15 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
                     String resolveOrgType=getProjectResolveOrgType(governProjectInfoDTO.getProjectLogDTOList());
                     if("community".equals(resolveOrgType)){
                         // 当前网格内出来的项目：由社区结案(已解决+未解决)的项目总数
+                        log.info("projectId=【"+governProjectInfoDTO.getId()+"】属于社区解决");
                         communityClosedCount+=1;
                     }else if("street".equals(resolveOrgType)){
                         // 当前网格内出来的项目：由街道结案(已解决+未解决)的项目总数
+                        log.info("projectId=【"+governProjectInfoDTO.getId()+"】属于街道解决");
                         streetClosedCount+=1;
                     }else if("districtdept".equals(resolveOrgType)){
                         // 当前网格内出来的项目：由街道结案(已解决+未解决)的项目总数
+                        log.info("projectId=【"+governProjectInfoDTO.getId()+"】属于区直部门解决");
                         districtDeptClosedCount+=1;
                     }
                     // todo 可能是 市级解决、省级解决呢？？？
@@ -334,7 +338,7 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
     private String getProjectResolveOrgType(List<FactOriginProjectLogDailyDTO> projectLogDTOList) {
         List<Integer> handleLevelList=new ArrayList<>();
         for (FactOriginProjectLogDailyDTO logDailyDTO : projectLogDTOList) {
-            if(logDailyDTO.getActionCode().equals(DimObjectActionConstant.PROJECT_RETURN)){
+            if(logDailyDTO.getActionCode().equals(DimObjectActionConstant.PROJECT_RETURN)||NumConstant.ZERO==logDailyDTO.getIsActive()){
                 //当前操作如果是退回，不参与比较
                 continue;
             }
@@ -422,7 +426,8 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
     private boolean checkIsInGridClosed(String gridId, List<FactOriginProjectLogDailyDTO> projectLogDTOList) {
         boolean flag = true;
         for (FactOriginProjectLogDailyDTO detail : projectLogDTOList) {
-            if(detail.getActionCode().equals(DimObjectActionConstant.PROJECT_RETURN)){
+            if(detail.getActionCode().equals(DimObjectActionConstant.PROJECT_RETURN)
+                || NumConstant.ZERO==detail.getIsActive()){
                 //当前操作如果是退回，不参与比较
                 continue;
             }

From 8d041bcbdb7d192fce249e80552406e629f16dd1 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 28 May 2021 18:48:08 +0800
Subject: [PATCH 107/128] =?UTF-8?q?=E6=B2=BB=E7=90=86=E6=8C=87=E6=95=B0-?=
 =?UTF-8?q?=E7=BD=91=E6=A0=BC=E6=B7=BB=E5=8A=A0=E5=88=B0=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../toscreen/impl/ScreenExtractServiceImpl.java      | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java
index b69cb0e595..b480c39761 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java
@@ -5,10 +5,12 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.enums.EnvEnum;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.HttpClientManager;
+import com.epmet.dto.extract.form.ExtractFactGridGovernDailyFromDTO;
 import com.epmet.dto.extract.form.ExtractOriginFormDTO;
 import com.epmet.dto.extract.form.ExtractScreenFormDTO;
 import com.epmet.dto.indexcal.CalculateCommonFormDTO;
 import com.epmet.dto.screen.form.ScreenCentralZoneDataFormDTO;
+import com.epmet.service.evaluationindex.extract.todata.FactGridGovernDailyService;
 import com.epmet.service.evaluationindex.extract.toscreen.*;
 import com.epmet.service.evaluationindex.indexcal.IndexCalculateService;
 import com.epmet.service.evaluationindex.screen.*;
@@ -69,6 +71,8 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
     private ScreenProjectCategoryGridDailyService projectCategoryGridDailyService;
     @Autowired
     private ScreenProjectCategoryOrgDailyService projectCategoryOrgDailyService;
+    @Autowired
+    private FactGridGovernDailyService factGridGovernDailyService;
 
     /**
      * @param extractOriginFormDTO
@@ -243,6 +247,14 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
             log.error("治理能力排行【全区】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
         }
 
+        try{
+            ExtractFactGridGovernDailyFromDTO extractFactGridGovernDailyFromDTO=new ExtractFactGridGovernDailyFromDTO();
+            extractFactGridGovernDailyFromDTO.setCustomerId(customerId);
+            extractFactGridGovernDailyFromDTO.setDateId(dateId);
+            factGridGovernDailyService.extractFactGridGovernDaily(extractFactGridGovernDailyFromDTO);
+        }catch(Exception e){
+            log.error("治理指数-网格fact_grid_govern_daily抽取失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+        }
         extractPartData(customerId, dateId);
         log.info("===== extractDaily method end ======");
     }

From 5352aca32b259decdb5ee0653ada6ce4641df073 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Mon, 31 May 2021 09:26:28 +0800
Subject: [PATCH 108/128] =?UTF-8?q?=E5=85=9A=E5=91=98=E5=85=88=E9=94=8Bsql?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../db/migration/V0.0.19__add_vanguard.sql    | 77 +++++++++++++++++++
 1 file changed, 77 insertions(+)
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.19__add_vanguard.sql

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.19__add_vanguard.sql b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.19__add_vanguard.sql
new file mode 100644
index 0000000000..b847790598
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.19__add_vanguard.sql
@@ -0,0 +1,77 @@
+CREATE TABLE `fact_party_member_vanguard_agency_daily`
+(
+    `ID`                   varchar(64) NOT NULL COMMENT '唯一标识',
+    `CUSTOMER_ID`          varchar(32) NOT NULL COMMENT '客户ID',
+    `AGENCY_ID`            varchar(64) NOT NULL COMMENT '机构ID',
+    `PID`                  varchar(64)          DEFAULT NULL COMMENT '父级机关ID',
+    `DATE_ID`              varchar(32) NOT NULL COMMENT '统计日期 关联日期dim表',
+    `WEEK_ID`              varchar(32) NOT NULL COMMENT '周ID',
+    `MONTH_ID`             varchar(32) NOT NULL COMMENT '月ID',
+    `QUARTER_ID`           varchar(32) NOT NULL COMMENT '季ID',
+    `YEAR_ID`              varchar(32) NOT NULL COMMENT '年ID',
+    `GROUP_COUNT`          int(11)              DEFAULT '0' COMMENT '党员建组数',
+    `GROUP_RATIO`          decimal(11, 6)       DEFAULT '0.000000' COMMENT '党员建组数占比',
+    `GROUP_TOTAL`          int(11)              DEFAULT NULL COMMENT '小组总数',
+    `GROUP_MEMBER_COUNT`   int(11)              DEFAULT '0' COMMENT '组内党员人数',
+    `GROUP_MEMBER_RATIO`   decimal(11, 6)       DEFAULT '0.000000' COMMENT '组内党员人数占比',
+    `GROUP_MEMBER_TOTAL`   int(11)              DEFAULT NULL COMMENT '小组成员总数',
+    `TOPIC_COUNT`          int(11)              DEFAULT '0' COMMENT '党员发布话题数',
+    `TOPIC_RATIO`          decimal(11, 6)       DEFAULT '0.000000' COMMENT '党员发布话题数占比',
+    `TOPIC_TOTAL`          int(11)              DEFAULT NULL COMMENT '话题总数',
+    `ISSUE_COUNT`          int(11)              DEFAULT '0' COMMENT '党员发布话题转议题数',
+    `ISSUE_RATIO`          decimal(11, 6)       DEFAULT '0.000000' COMMENT '党员发布话题转议题数占比',
+    `ISSUE_TOTAL`          int(11)              DEFAULT NULL COMMENT '议题总数',
+    `PROJECT_COUNT`        int(11)              DEFAULT '0' COMMENT '党员发布话题转项目数',
+    `PROJECT_RATIO`        decimal(11, 6)       DEFAULT '0.000000' COMMENT '党员发布话题转项目数占比',
+    `PROJECT_TOTAL`        int(11)              DEFAULT NULL COMMENT '项目总数',
+    `PROJECT_CLOSED_COUNT` int(11)              DEFAULT '0' COMMENT '党员发布话题转项目结案数',
+    `PROJECT_CLOSED_RATIO` decimal(11, 6)       DEFAULT '0.000000' COMMENT '党员发布话题转项目结案数占比',
+    `PROJECT_CLOSED_TOTAL` int(11)              DEFAULT NULL COMMENT '结案项目总数',
+    `DEL_FLAG`             char(1)     NOT NULL DEFAULT '0' COMMENT '删除标识 未删除：0,已删除：1',
+    `REVISION`             int(11)     NOT NULL DEFAULT '0' COMMENT '乐观锁',
+    `CREATED_BY`           varchar(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 ='党员先锋-机关日统计数据';
+
+CREATE TABLE `fact_party_member_vanguard_grid_daily`
+(
+    `ID`                   varchar(64) NOT NULL COMMENT '唯一标识',
+    `CUSTOMER_ID`          varchar(32) NOT NULL COMMENT '客户ID',
+    `AGENCY_ID`            varchar(64) NOT NULL COMMENT '机构ID',
+    `GRID_ID`              varchar(64) NOT NULL COMMENT '网格ID',
+    `DATE_ID`              varchar(32) NOT NULL COMMENT '统计日期 关联日期dim表',
+    `WEEK_ID`              varchar(32) NOT NULL COMMENT '周ID',
+    `MONTH_ID`             varchar(32) NOT NULL COMMENT '月ID',
+    `QUARTER_ID`           varchar(32) NOT NULL COMMENT '季ID',
+    `YEAR_ID`              varchar(32) NOT NULL COMMENT '年ID',
+    `GROUP_COUNT`          int(11)              DEFAULT '0' COMMENT '党员建组数',
+    `GROUP_RATIO`          decimal(11, 6)       DEFAULT '0.000000' COMMENT '党员建组数占比',
+    `GROUP_TOTAL`          int(11)              DEFAULT NULL COMMENT '小组成员总数',
+    `GROUP_MEMBER_COUNT`   int(11)              DEFAULT '0' COMMENT '组内党员人数',
+    `GROUP_MEMBER_RATIO`   decimal(11, 6)       DEFAULT '0.000000' COMMENT '组内党员人数占比',
+    `GROUP_MEMBER_TOTAL`   int(11)              DEFAULT NULL COMMENT '小组成员总数',
+    `TOPIC_COUNT`          int(11)              DEFAULT '0' COMMENT '党员发布话题数',
+    `TOPIC_RATIO`          decimal(11, 6)       DEFAULT '0.000000' COMMENT '党员发布话题数占比',
+    `TOPIC_TOTAL`          int(11)              DEFAULT NULL COMMENT '话题总数',
+    `ISSUE_COUNT`          int(11)              DEFAULT '0' COMMENT '党员发布话题转议题数',
+    `ISSUE_RATIO`          decimal(11, 6)       DEFAULT '0.000000' COMMENT '党员发布话题转议题数占比',
+    `ISSUE_TOTAL`          int(11)              DEFAULT NULL COMMENT '议题总数',
+    `PROJECT_COUNT`        int(11)              DEFAULT '0' COMMENT '党员发布话题转项目数',
+    `PROJECT_RATIO`        decimal(11, 6)       DEFAULT '0.000000' COMMENT '党员发布话题转项目数占比',
+    `PROJECT_TOTAL`        int(11)              DEFAULT NULL COMMENT '项目总数',
+    `PROJECT_CLOSED_COUNT` int(11)              DEFAULT '0' COMMENT '党员发布话题转项目结案数',
+    `PROJECT_CLOSED_RATIO` decimal(11, 6)       DEFAULT '0.000000' COMMENT '党员发布话题转项目结案数占比',
+    `PROJECT_CLOSED_TOTAL` int(11)              DEFAULT NULL COMMENT '结案项目总数',
+    `DEL_FLAG`             char(1)     NOT NULL DEFAULT '0' COMMENT '删除标识 未删除：0,已删除：1',
+    `REVISION`             int(11)     NOT NULL DEFAULT '0' COMMENT '乐观锁',
+    `CREATED_BY`           varchar(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 ='党员先锋-网格日统计数据';
\ No newline at end of file

From cb2b13b3206282b5e1c941e950580b0c50c2e32a Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 31 May 2021 09:55:32 +0800
Subject: [PATCH 109/128] =?UTF-8?q?=E7=BB=84=E7=BB=87=E3=80=81=E7=BD=91?=
 =?UTF-8?q?=E6=A0=BC=E6=B2=BB=E7=90=86=E6=8C=87=E6=95=B0=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=EF=BC=8C=E7=99=BE=E5=88=86=E6=95=B0=E6=94=B9=E6=88=90=E5=B8=A6?=
 =?UTF-8?q?%=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../result/AgencyGovrnResultDTO.java          | 10 +++++-----
 .../datastats/result/GridGovrnResultDTO.java  | 10 +++++-----
 .../mapper/datastats/DatsStatsDao.xml         | 20 +++++++++----------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/AgencyGovrnResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/AgencyGovrnResultDTO.java
index b15017ea33..bb5448e7da 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/AgencyGovrnResultDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/AgencyGovrnResultDTO.java
@@ -24,14 +24,14 @@ public class AgencyGovrnResultDTO implements Serializable {
     //问题解决总数
     private Integer problemResolvedCount = 0;
     //党群自治占比
-    private BigDecimal groupSelfGovernRatio = bi;
+    private String groupSelfGovernRatio = "0%";
     //网格自治占比
-    private BigDecimal gridSelfGovernRatio = bi;
+    private String gridSelfGovernRatio = "0%";
     //社区解决占比
-    private BigDecimal communityResolvedRatio = bi;
+    private String communityResolvedRatio = "0%";
     //区直部门解决占比
-    private BigDecimal districtDeptResolvedRatio = bi;
+    private String districtDeptResolvedRatio = "0%";
     //街道解决占比
-    private BigDecimal streetResolvedRatio = bi;
+    private String streetResolvedRatio = "0%";
 
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/GridGovrnResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/GridGovrnResultDTO.java
index cd88c5b0e4..a7c71f1b69 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/GridGovrnResultDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/GridGovrnResultDTO.java
@@ -22,14 +22,14 @@ public class GridGovrnResultDTO implements Serializable {
     //问题解决总数
     private Integer problemResolvedCount = 0;
     //党群自治占比
-    private BigDecimal groupSelfGovernRatio = bi;
+    private String groupSelfGovernRatio = "0%";
     //网格自治占比
-    private BigDecimal gridSelfGovernRatio = bi;
+    private String gridSelfGovernRatio = "0%";
     //社区解决占比
-    private BigDecimal communityResolvedRatio = bi;
+    private String communityResolvedRatio = "0%";
     //区直部门解决占比
-    private BigDecimal districtDeptResolvedRatio = bi;
+    private String districtDeptResolvedRatio = "0%";
     //街道解决占比
-    private BigDecimal streetResolvedRatio = bi;
+    private String streetResolvedRatio = "0%";
 
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
index 6fec43461f..463788def8 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
@@ -618,11 +618,11 @@
             agency_id AS agencyId,
             `level` AS level,
             problem_resolved_count AS problemResolvedCount,
-            ROUND(group_self_govern_ratio, 3) AS groupSelfGovernRatio,
-            ROUND(grid_self_govern_ratio, 3) AS gridSelfGovernRatio,
-            ROUND(community_closed_ratio, 3) AS communityResolvedRatio,
-            ROUND(street_closed_ratio, 3) AS streetResolvedRatio,
-            ROUND(district_dept_closed_ratio, 3) AS districtDeptResolvedRatio
+            concat(ROUND(group_self_govern_ratio*100, 1),'%') AS groupSelfGovernRatio,
+            concat(ROUND(grid_self_govern_ratio*100, 1),'%') AS gridSelfGovernRatio,
+            concat(ROUND(community_closed_ratio*100, 1),'%') AS communityResolvedRatio,
+            concat(ROUND(street_closed_ratio*100, 1),'%') AS streetResolvedRatio,
+            concat(ROUND(district_dept_closed_ratio*100, 1),'%') AS districtDeptResolvedRatio
         FROM
             fact_agency_govern_daily
         WHERE
@@ -638,11 +638,11 @@
         SELECT
             grid_id AS gridId,
             problem_resolved_count AS problemResolvedCount,
-            ROUND(group_self_govern_ratio, 3) AS groupSelfGovernRatio,
-            ROUND(grid_self_govern_ratio, 3) AS gridSelfGovernRatio,
-            ROUND(community_closed_ratio, 3) AS communityResolvedRatio,
-            ROUND(street_closed_ratio, 3) AS streetResolvedRatio,
-            ROUND(district_dept_closed_ratio, 3) AS districtDeptResolvedRatio
+            concat(ROUND(group_self_govern_ratio*100, 1),'%') AS groupSelfGovernRatio,
+            concat(ROUND(grid_self_govern_ratio*100, 1),'%') AS gridSelfGovernRatio,
+            concat(ROUND(community_closed_ratio*100, 1),'%') AS communityResolvedRatio,
+            concat(ROUND(street_closed_ratio*100, 1),'%') AS streetResolvedRatio,
+            concat(ROUND(district_dept_closed_ratio*100, 1),'%') AS districtDeptResolvedRatio
         FROM
             fact_grid_govern_daily
         WHERE

From a7501bd1884ad716f660738bdcacec15861fc424 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 31 May 2021 13:42:44 +0800
Subject: [PATCH 110/128] =?UTF-8?q?=E9=81=97=E6=BC=8F=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataaggre/dto/datastats/form/AgencyGovrnFormDTO.java    | 2 +-
 .../dataaggre/dto/datastats/form/GridGovrnFormDTO.java      | 3 +++
 .../service/datastats/impl/DataStatsServiceImpl.java        | 6 ++++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/AgencyGovrnFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/AgencyGovrnFormDTO.java
index ad33559d5b..82315c125f 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/AgencyGovrnFormDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/AgencyGovrnFormDTO.java
@@ -29,7 +29,7 @@ public class AgencyGovrnFormDTO implements Serializable {
      * 党群自治占比:party
      * 网格自治占比:grid
      * 社区解决占比:community
-     * 区直部门解决占比:dept
+     * 区直部门解决占比:department
      * 街道解决占比:street
      */
     private String type;
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/GridGovrnFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/GridGovrnFormDTO.java
index 45eaa572c5..aaa2828173 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/GridGovrnFormDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/GridGovrnFormDTO.java
@@ -33,6 +33,9 @@ public class GridGovrnFormDTO implements Serializable {
      * 问题解决总数:problem
      * 党群自治占比:party
      * 网格自治占比:grid
+     * 社区解决占比:community
+     * 区直部门解决占比:department
+     * 街道解决占比:street
      */
     private String type;
     public interface Agency extends CustomerClientShowGroup {}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index 25aa4c60c5..fc2b115b2b 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -1240,6 +1240,12 @@ public class DataStatsServiceImpl implements DataStatsService {
                     return o2.getGroupSelfGovernRatio().compareTo(o1.getGroupSelfGovernRatio());
                 } else if ("grid".equals(formDTO.getType())) {
                     return o2.getGridSelfGovernRatio().compareTo(o1.getGridSelfGovernRatio());
+                } else if ("community".equals(formDTO.getType())) {
+                    return o2.getCommunityResolvedRatio().compareTo(o1.getCommunityResolvedRatio());
+                } else if ("department".equals(formDTO.getType())) {
+                    return o2.getDistrictDeptResolvedRatio().compareTo(o1.getDistrictDeptResolvedRatio());
+                } else if ("street".equals(formDTO.getType())) {
+                    return o2.getStreetResolvedRatio().compareTo(o1.getStreetResolvedRatio());
                 } else {
                     return o2.getProblemResolvedCount().compareTo(o1.getProblemResolvedCount());
                 }

From 4b0c913729030b2395c79f78edbe90fb00705d56 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Mon, 31 May 2021 14:55:13 +0800
Subject: [PATCH 111/128] =?UTF-8?q?=E5=9F=BA=E5=B1=82=E6=B2=BB=E7=90=86-?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=9A=84=E6=B2=BB=E7=90=86=E6=8C=87=E6=95=B0?=
 =?UTF-8?q?=EF=BC=8C=E6=8C=89=E5=A4=A9=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/controller/DemoController.java   | 13 +++++++++----
 .../extract/FactAgencyGovernDailyDao.java           | 10 ++++++++++
 .../impl/FactAgencyGovernDailyServiceImpl.java      |  8 ++++++++
 .../extract/FactAgencyGovernDailyDao.xml            |  7 ++++++-
 4 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
index a8baf89b38..108f82d575 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
@@ -38,10 +38,7 @@ import com.epmet.entity.stats.DimMonthEntity;
 import com.epmet.service.StatsDemoService;
 import com.epmet.service.StatsPartyMemberVanguardService;
 import com.epmet.service.evaluationindex.extract.dataToIndex.*;
-import com.epmet.service.evaluationindex.extract.todata.FactGridGovernDailyService;
-import com.epmet.service.evaluationindex.extract.todata.FactGroupActDailyService;
-import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectCategoryDailyService;
-import com.epmet.service.evaluationindex.extract.todata.FactOriginTopicMainDailyService;
+import com.epmet.service.evaluationindex.extract.todata.*;
 import com.epmet.service.evaluationindex.extract.toscreen.*;
 import com.epmet.service.evaluationindex.indexcal.*;
 import com.epmet.service.evaluationindex.screen.*;
@@ -120,6 +117,8 @@ public class DemoController {
     private FactGroupActDailyService factGroupActDailyService;
     @Autowired
     private FactGridGovernDailyService factGridGovernDailyService;
+    @Autowired
+    private FactAgencyGovernDailyService factAgencyGovernDailyService;
 
     @GetMapping("testAlarm")
     public void testAlarm() {
@@ -924,4 +923,10 @@ public class DemoController {
         factGridGovernDailyService.extractFactGridGovernDaily(fromDTO);
         return new Result();
     }
+    @PostMapping("extractFactAgencyGovernDaily")
+    public Result extractFactAgencyGovernDaily(@RequestBody ExtractFactGridGovernDailyFromDTO fromDTO){
+        factAgencyGovernDailyService.extractFactAgencyGovernDaily(fromDTO.getCustomerId(), fromDTO.getDateId());
+        return new Result();
+    }
+
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactAgencyGovernDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactAgencyGovernDailyDao.java
index b88d897543..2671d89c4e 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactAgencyGovernDailyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactAgencyGovernDailyDao.java
@@ -20,6 +20,7 @@ package com.epmet.dao.evaluationindex.extract;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.entity.evaluationindex.extract.FactAgencyGovernDailyEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 组织的治理指数，按天统计
@@ -29,5 +30,14 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface FactAgencyGovernDailyDao extends BaseDao<FactAgencyGovernDailyEntity> {
+	/**
+	 * 删除数据
+	 * @author zhaoqifeng
+	 * @date 2021/5/31 14:47
+	 * @param customerId
+	 * @param dateId
+	 * @return int
+	 */
+	int deleteAgencyGovernDailyData(@Param("customerId") String customerId, @Param("dateId") String dateId, @Param("deleteSize") Integer deleteSize);
 	
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java
index 82e599ff4b..1fbabc764b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java
@@ -291,6 +291,14 @@ public class FactAgencyGovernDailyServiceImpl extends BaseServiceImpl<FactAgency
 				}
 			});
 		}
+		if (CollectionUtils.isNotEmpty(agencyGovernDailyList)) {
+			int deleteNum;
+			do {
+				deleteNum = baseDao.deleteAgencyGovernDailyData(customerId, dateId, IndexCalConstant.DELETE_SIZE);
+			} while (deleteNum != NumConstant.ZERO);
+			//删除旧数据
+			insertBatch(agencyGovernDailyList);
+		}
 	}
 
 	private FactAgencyGovernDailyEntity initEntity(DimAgencyDTO agency, String dateId) {
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactAgencyGovernDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactAgencyGovernDailyDao.xml
index 7b4aa4c504..e8d12dd708 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactAgencyGovernDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactAgencyGovernDailyDao.xml
@@ -4,5 +4,10 @@
 <mapper namespace="com.epmet.dao.evaluationindex.extract.FactAgencyGovernDailyDao">
 
 
-
+    <delete id="deleteAgencyGovernDailyData">
+        delete from fact_agency_govern_daily
+        where CUSTOMER_ID = #{customerId}
+        AND DATE_ID = #{dateId}
+        limit #{deleteSize}
+    </delete>
 </mapper>
\ No newline at end of file

From 8745b52bf07bea40b70d8f4a871fab020aa9c088 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 1 Jun 2021 09:17:11 +0800
Subject: [PATCH 112/128] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=B1=82=E7=BA=A7?=
 =?UTF-8?q?=E6=B2=BB=E7=90=86=E6=8C=87=E6=95=B0table=E8=AF=AD=E5=8F=A5?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=96=E6=B6=88=E6=B3=A8=E9=87=8A=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../db/migration/V0.0.15__govern.sql          | 96 +++++++------------
 1 file changed, 37 insertions(+), 59 deletions(-)

diff --git 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
index 59975cc83f..e83d7f5313 100644
--- 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,64 +1,42 @@
 -- epmet_data_statistical新增两张表，治理指数网格按天统计，治理指数按组织按天统计
 
--- /*
---  Navicat Premium Data Transfer
---
---  Source Server         : 192.168.1.130
---  Source Server Type    : MySQL
---  Source Server Version : 50728
---  Source Host           : 192.168.1.130:3306
---  Source Schema         : epmet_data_statistical
---
---  Target Server Type    : MySQL
---  Target Server Version : 50728
---  File Encoding         : 65001
---
---  Date: 25/05/2021 09:31:39
--- */
---
--- SET NAMES utf8mb4;
--- SET FOREIGN_KEY_CHECKS = 0;
---
--- -- ----------------------------
--- -- Table structure for fact_agency_govern_daily
--- -- ----------------------------
--- CREATE TABLE `fact_agency_govern_daily`  (
---   `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键，customer_id+AGENCY_ID+date_id只有一条记录',
---   `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客户id',
---   `DATE_ID` varchar(8) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '数据更新至：yyyyMMdd; ',
---   `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '组织id',
---   `LEVEL` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'agency_id所属的机关级别（社区级：community，\r\n乡（镇、街道）级:street,\r\n区县级: district,\r\n市级: city\r\n省级:province）',
---   `PID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '组织i所属的组织id',
---   `PIDS` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci 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) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除、1已删除',
---   `REVISION` int(11) NOT NULL DEFAULT 0 COMMENT '乐观锁',
---   `CREATED_BY` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人',
---   `CREATED_TIME` datetime(0) NOT NULL COMMENT '创建时间：第一次提交审核的时间，注意和历史表的第一条记录时间一致',
---   `UPDATED_BY` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新人',
---   `UPDATED_TIME` datetime(0) NOT NULL COMMENT '更新时间',
---   PRIMARY KEY (`ID`) USING BTREE
--- ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '组织的治理指数，按天统计' ROW_FORMAT = Dynamic;
---
+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',

From fd6989e4ff355fedad9bc36b3183799d607f49d7 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Tue, 1 Jun 2021 10:00:40 +0800
Subject: [PATCH 113/128] =?UTF-8?q?=E5=9F=BA=E5=B1=82=E6=B2=BB=E7=90=86-?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=9A=84=E6=B2=BB=E7=90=86=E6=8C=87=E6=95=B0?=
 =?UTF-8?q?=EF=BC=8C=E6=8C=89=E5=A4=A9=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extract/toscreen/impl/ScreenExtractServiceImpl.java  | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java
index b480c39761..51f6e97426 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java
@@ -10,6 +10,7 @@ import com.epmet.dto.extract.form.ExtractOriginFormDTO;
 import com.epmet.dto.extract.form.ExtractScreenFormDTO;
 import com.epmet.dto.indexcal.CalculateCommonFormDTO;
 import com.epmet.dto.screen.form.ScreenCentralZoneDataFormDTO;
+import com.epmet.service.evaluationindex.extract.todata.FactAgencyGovernDailyService;
 import com.epmet.service.evaluationindex.extract.todata.FactGridGovernDailyService;
 import com.epmet.service.evaluationindex.extract.toscreen.*;
 import com.epmet.service.evaluationindex.indexcal.IndexCalculateService;
@@ -73,6 +74,8 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
     private ScreenProjectCategoryOrgDailyService projectCategoryOrgDailyService;
     @Autowired
     private FactGridGovernDailyService factGridGovernDailyService;
+    @Autowired
+    private FactAgencyGovernDailyService factAgencyGovernDailyService;
 
     /**
      * @param extractOriginFormDTO
@@ -255,6 +258,12 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
         }catch(Exception e){
             log.error("治理指数-网格fact_grid_govern_daily抽取失败，customerId为：" + customerId + "dateId为：" + dateId, e);
         }
+
+        try{
+            factAgencyGovernDailyService.extractFactAgencyGovernDaily(customerId, dateId);
+        }catch(Exception e){
+            log.error("治理指数-组织fact_agency_govern_daily抽取失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+        }
         extractPartData(customerId, dateId);
         log.info("===== extractDaily method end ======");
     }

From ea1945336dc05e2d6dc5765edfef86ed0079959a Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 1 Jun 2021 14:36:52 +0800
Subject: [PATCH 114/128] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/datastats/DatsStatsDao.xml        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
index 463788def8..fafc989776 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
@@ -95,7 +95,7 @@
             fact_agency_project_daily
         WHERE
             del_flag = '0'
-        AND agency_id = '8631fa4b22e88fdc259b3f51b5de2be2'
+        AND agency_id = #{agencyId}
         AND date_id = #{dateId}
         LIMIT 1
     </select>

From 6e5b67eff9df9f1bdc77648bee208828d3077b1b Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Tue, 1 Jun 2021 16:08:51 +0800
Subject: [PATCH 115/128] =?UTF-8?q?=E5=9F=BA=E5=B1=82=E6=B2=BB=E7=90=86-?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=9A=84=E6=B2=BB=E7=90=86=E6=8C=87=E6=95=B0?=
 =?UTF-8?q?=EF=BC=8C=E6=8C=89=E5=A4=A9=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datastats/impl/DataStatsServiceImpl.java  | 12 ++-
 .../FactAgencyGovernDailyServiceImpl.java     |  4 +-
 .../extract/FactOriginIssueMainDailyDao.xml   | 21 +++--
 .../extract/FactOriginProjectLogDailyDao.xml  | 76 ++++++++++---------
 .../extract/FactOriginProjectMainDailyDao.xml | 62 +++++++++------
 .../extract/FactOriginTopicMainDailyDao.xml   | 23 +++---
 6 files changed, 122 insertions(+), 76 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index fc2b115b2b..a916acf6cc 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -1,4 +1,4 @@
-package com.epmet.dataaggre.service.datastats.impl;
+ package com.epmet.dataaggre.service.datastats.impl;
 
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
@@ -980,6 +980,16 @@ public class DataStatsServiceImpl implements DataStatsService {
         } else {
             result = dataStatsDao.selectGridVanguardDetail(formDTO.getOrgId());
         }
+        if (null == result) {
+            result = new  PartyMemberVanguardDetailResultDTO();
+            result.setGroupRatio(transform(new BigDecimal(NumConstant.ZERO)));
+            result.setGroupMemberRatio(transform(new BigDecimal(NumConstant.ZERO)));
+            result.setTopicRatio(transform(new BigDecimal(NumConstant.ZERO)));
+            result.setIssueRatio(transform(new BigDecimal(NumConstant.ZERO)));
+            result.setProjectRatio(transform(new BigDecimal(NumConstant.ZERO)));
+            result.setProjectClosedRatio(transform(new BigDecimal(NumConstant.ZERO)));
+            return result;
+        }
         result.setGroupRatio(transform(result.getGroupRatio()));
         result.setGroupMemberRatio(transform(result.getGroupMemberRatio()));
         result.setTopicRatio(transform(result.getTopicRatio()));
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java
index 1fbabc764b..6629836e02 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java
@@ -266,7 +266,7 @@ public class FactAgencyGovernDailyServiceImpl extends BaseServiceImpl<FactAgency
 						// 社区解决占比
 						OrgStatisticsResultDTO community = map.get(ScreenConstant.COMMUNITY);
 						if (null != community) {
-							int count = community.getCount();
+							int count = community.getSum();
 							BigDecimal selfCount = new BigDecimal(count);
 							item.setCommunityClosedRatio(selfCount.divide(resolveCount, NumConstant.SIX, RoundingMode.HALF_UP));
 							item.setCommunityClosedCount(count);
@@ -274,7 +274,7 @@ public class FactAgencyGovernDailyServiceImpl extends BaseServiceImpl<FactAgency
 						// 街道解决占比
 						OrgStatisticsResultDTO street = map.get(ScreenConstant.STREET);
 						if (null != street) {
-							int count = street.getCount();
+							int count = street.getSum();
 							BigDecimal selfCount = new BigDecimal(count);
 							item.setStreetClosedRatio(selfCount.divide(resolveCount, NumConstant.SIX, RoundingMode.HALF_UP));
 							item.setStreetClosedCount(count);
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml
index 12da80a473..a488706d0b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml
@@ -345,17 +345,22 @@
     </select>
     <select id="selectAgencyClosedIssueCount" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
         SELECT
-            AGENCY_ID,
-            COUNT(ID) AS "sum"
-        FROM fact_origin_issue_main_daily
-        WHERE CUSTOMER_ID = #{customerId}
-          AND DATE_ID &lt;= #{dateId}
+            a.ID AS AGENCY_ID,
+            COUNT( b.ID ) AS "sum"
+        FROM
+            dim_agency a
+        INNER JOIN fact_origin_issue_main_daily b ON b.PIDS LIKE CONCAT( '%', a.ID, '%' )
+            AND b.CUSTOMER_ID = #{customerId}
+            AND b.DATE_ID &lt;= #{dateId}
         <if test='null != closedStatus and "" != closedStatus'>
-            AND ISSUE_STATUS = #{closedStatus}
+            AND b.ISSUE_STATUS = #{closedStatus}
         </if>
         <if test='null == closedStatus or "" == closedStatus'>
-            AND (ISSUE_STATUS = 'closed_resolved' OR ISSUE_STATUS = 'closed_unresolved')
+            AND (b.ISSUE_STATUS = 'closed_resolved' OR b.ISSUE_STATUS = 'closed_unresolved')
         </if>
-        GROUP BY AGENCY_ID
+        WHERE
+            a.CUSTOMER_ID = #{customerId}
+        GROUP BY
+            a.ID
     </select>
 </mapper>
\ No newline at end of file
diff --git 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
index a281843411..bd57a4df1e 100644
--- 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
@@ -688,43 +688,51 @@
             AND m.PROJECT_ID = #{projectId}
     </select>
     <select id="selectAgencyGridSelfDaily" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
+
         SELECT
-            fm.AGENCY_ID,
-            COUNT( ID ) AS "sum",
-            IFNULL(a.count,0) AS "count"
+        da.ID AS AGENCY_ID,
+        COUNT( fm.ID ) AS "sum",
+        IFNULL( a.count, 0 ) AS "count"
         FROM
-            fact_origin_project_main_daily fm
-                LEFT JOIN (
-                SELECT
-                    AGENCY_ID,
-                    orgId,
-                    COUNT( PROJECT_ID ) AS "count"
-                FROM
-                    (
-                        SELECT
-                            AGENCY_ID,
-                            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")
-                        GROUP BY
-                            PROJECT_ID
-                        HAVING
-                            COUNT(DISTINCT ( ORG_ID )) = 1) a
-                GROUP BY
-                    AGENCY_ID
-            ) a ON fm.AGENCY_ID = a.AGENCY_ID
+        dim_agency da
+        INNER JOIN fact_origin_project_main_daily fm ON fm.PIDS LIKE CONCAT( '%', da.ID, '%' )
+        LEFT JOIN (
+        SELECT
+        agency.ID,
+        orgId,
+        COUNT( PROJECT_ID ) AS "count"
+        FROM
+        dim_agency agency
+        INNER JOIN (
+        SELECT
+        AGENCY_ID,
+        PIDS,
+        ORG_ID AS orgId,
+        PROJECT_ID
+        FROM
+        fact_origin_project_log_daily
         WHERE
-            PROJECT_STATUS = 'closed'
-          AND ORIGIN = "issue"
-          AND CUSTOMER_ID = #{customerId}
-          AND DATE_ID &lt;= #{dateId}
+        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" )
+        GROUP BY
+        PROJECT_ID
+        HAVING
+        COUNT(
+        DISTINCT ( ORG_ID )) = 1
+        ) a ON a.PIDS LIKE CONCAT( '%', agency.ID, '%' )
+        WHERE
+        agency.CUSTOMER_ID = #{customerId}
+        GROUP BY
+        agency.ID
+        ) a ON a.ID = da.ID
+        WHERE
+        PROJECT_STATUS = 'closed'
+        AND ORIGIN = "issue"
+        AND da.CUSTOMER_ID = #{customerId}
+        AND DATE_ID &lt;= #{dateId}
         GROUP BY
-            fm.AGENCY_ID
+        da.ID
     </select>
 </mapper>
\ No newline at end of file
diff --git 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
index 3e0b110fd6..9213e3c855 100644
--- 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
@@ -949,38 +949,56 @@
     </select>
     <select id="selectAgencyClosedProjectCount" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
         SELECT
-            AGENCY_ID,
-            COUNT(ID) AS "sum"
-        FROM fact_origin_project_main_daily
-        WHERE CUSTOMER_ID = #{customerId}
-          AND DATE_ID &lt;= #{dateId}
-          AND PROJECT_STATUS = 'closed'
+        a.ID AS AGENCY_ID,
+        COUNT( b.ID ) AS "sum"
+        FROM
+        dim_agency a
+        INNER JOIN fact_origin_project_main_daily b ON b.PIDS LIKE CONCAT( '%', a.ID, '%' )
+        AND b.CUSTOMER_ID = #{customerId}
+        AND b.DATE_ID &lt;= #{dateId}
+        AND PROJECT_STATUS = 'closed'
         <if test='null != origin and "" != origin'>
-            AND ORIGIN = #{origin}
+            AND b.ORIGIN = #{origin}
         </if>
         <if test='null != closedStatus and "" != closedStatus'>
-            AND IS_RESOLVED = #{closedStatus}
+            AND b.IS_RESOLVED = #{closedStatus}
         </if>
-        GROUP BY AGENCY_ID
+        WHERE
+        a.CUSTOMER_ID = #{customerId}
+        GROUP BY
+        a.ID
     </select>
     <select id="selectAgencyClosedProjectStaticDaily" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
         SELECT
-            a.AGENCY_ID,
-            c.`LEVEL`,
-            COUNT(a.ID) AS "sum",
-            SUM(IF(b.ORG_TYPE = 'department', 1, 0)) AS "count"
+        a.ID AS AGENCY_ID,
+        b.`LEVEL`,
+        COUNT( b.ID ) AS "sum",
+        SUM(
+        IF
+        ( b.ORG_TYPE = 'department', 1, 0 )) 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.ACTION_CODE = 'close'
-                INNER JOIN dim_agency c ON b.AGENCY_ID = c.ID
+        dim_agency a
+        INNER JOIN (
+        SELECT
+        a.ID,
+        a.PIDS,
+        c.`LEVEL`,
+        b.ORG_TYPE
+        FROM
+        fact_origin_project_main_daily a
+        INNER JOIN fact_origin_project_log_daily b ON a.ID = b.PROJECT_ID
+        AND b.ACTION_CODE = 'close'
+        INNER JOIN dim_agency c ON b.AGENCY_ID = c.ID
         WHERE
-            a.CUSTOMER_ID = #{customerId}
-            AND a.DATE_ID &lt;= #{dateId}
-            AND a.PROJECT_STATUS = 'closed'
+        a.CUSTOMER_ID = #{customerId}
+        AND a.DATE_ID &lt;= #{dateId}
+        AND a.PROJECT_STATUS = 'closed'
+        ) b ON b.PIDS LIKE CONCAT( '%', a.ID, '%' )
+        WHERE
+        a.CUSTOMER_ID = #{customerId}
         GROUP BY
-            a.AGENCY_ID,
-            c.`LEVEL`
+        a.ID,
+        b.`LEVEL`
     </select>
 
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml
index ebf9f0a4f5..59bc2006c0 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml
@@ -243,18 +243,23 @@
     </select>
     <select id="selectAgencyClosedTopicCount" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
         SELECT
-            AGENCY_ID,
-            COUNT(ID) as "sum"
-        FROM fact_origin_topic_main_daily
-        WHERE CUSTOMER_ID = #{customerId}
-          AND DATE_ID &lt;= #{dateId}
-          AND TOPIC_STATUS = 'closed'
+        a.ID AS AGENCY_ID,
+        COUNT( b.ID ) AS "sum"
+        FROM
+        dim_agency a
+        INNER JOIN fact_origin_topic_main_daily b ON b.PIDS LIKE CONCAT( '%', a.ID, '%' )
+        AND b.CUSTOMER_ID = #{customerId}
+        AND b.DATE_ID &lt;= #{dateId}
+        AND b.TOPIC_STATUS = 'closed'
         <if test='null != closedStatus and "" != closedStatus'>
-            AND CLOSED_STATUS = #{closedStatus}
+            AND b.CLOSED_STATUS = #{closedStatus}
         </if>
         <if test='null != shiftIssue'>
-            AND SHIFT_ISSUE = #{shiftIssue}
+            AND b.SHIFT_ISSUE = #{shiftIssue}
         </if>
-        GROUP BY AGENCY_ID
+        WHERE
+        a.CUSTOMER_ID = #{customerId}
+        GROUP BY
+        a.ID
     </select>
 </mapper>
\ No newline at end of file

From d21fc7bf3f04a3faa1c3e69f6645a71c310c4712 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Tue, 1 Jun 2021 16:37:45 +0800
Subject: [PATCH 116/128] =?UTF-8?q?=E4=BF=9D=E7=95=99=E5=B0=8F=E6=95=B0?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fact/FactIndexCommunitySubScoreDao.xml    |  4 ++-
 .../mapper/fact/FactIndexCpcSubScoreDao.xml   | 22 ++++++++--------
 .../mapper/fact/FactIndexDeptSubScoreDao.xml  | 25 +++++++++++--------
 3 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunitySubScoreDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunitySubScoreDao.xml
index 784ab0ccc7..37290ed60a 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunitySubScoreDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunitySubScoreDao.xml
@@ -47,9 +47,11 @@
             IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS origin_value,
             IF(fact.SAMPLE_COUNT='',0,IFNULL(fact.SAMPLE_COUNT,0)) AS quantity,
             round(fact.score,1) AS score,
-            round(fact.WEIGHT,2) AS weight
+            round(fact.WEIGHT,2) AS weight,
+            dict.VALUE_TYPE
         FROM
             fact_index_community_sub_score fact
+             LEFT JOIN index_dict dict ON fact.index_code = dict.index_code
         WHERE
             fact.del_flag = '0'
             AND fact.all_parent_index_code = #{allParentIndexCode}
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCpcSubScoreDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCpcSubScoreDao.xml
index 4e7171912d..fcdbebc6d1 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCpcSubScoreDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCpcSubScoreDao.xml
@@ -28,17 +28,19 @@
 
     <select id="selecCpcAvgScore" resultType="com.epmet.evaluationindex.index.result.IndexScoreResult">
             SELECT
-                id, customer_id, agency_id, grid_id, year_id, month_id, user_id,
+                fact.id, fact.customer_id, fact.agency_id, fact.grid_id, fact.year_id, fact.month_id, fact.user_id,
                 COUNT(*) SAMPLE_COUNT,
-                ROUND(AVG(score),1) score,
-                index_code, all_parent_index_code,
-                ROUND(weight,2) weight
-            FROM  fact_index_cpc_sub_score
-            WHERE ALL_PARENT_INDEX_CODE = #{allParentIndexCode}
-            AND CUSTOMER_ID = #{customerId}
-            and GRID_ID = #{orgId}
-            and MONTH_ID = #{monthId}
-            GROUP BY INDEX_CODE;
+                ROUND(AVG(fact.score),1) score,
+                fact.index_code, fact.all_parent_index_code,
+                ROUND(fact.weight,2) weight,
+                dict.VALUE_TYPE
+            FROM  fact_index_cpc_sub_score fact
+             LEFT JOIN index_dict dict ON fact.index_code = dict.index_code
+            WHERE fact.ALL_PARENT_INDEX_CODE = #{allParentIndexCode}
+            AND fact.CUSTOMER_ID = #{customerId}
+            and fact.GRID_ID = #{orgId}
+            and fact.MONTH_ID = #{monthId}
+            GROUP BY fact.INDEX_CODE;
     </select>
 
  </mapper>
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexDeptSubScoreDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexDeptSubScoreDao.xml
index 8da2f52516..c72adacb3b 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexDeptSubScoreDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexDeptSubScoreDao.xml
@@ -7,19 +7,22 @@
 
     <select id="selecDeptAvgScore" resultType="com.epmet.evaluationindex.index.result.IndexScoreResult">
             SELECT
-                id, customer_id, dept_id, agency_id, month_id,
-                origin_value,
-                index_code, all_parent_index_code, weight,
+                fact.id, fact.customer_id, fact.dept_id, fact.agency_id, fact.month_id,
+                fact.origin_value,
+                fact.index_code, fact.all_parent_index_code,
                 COUNT(*) SAMPLE_COUNT,
-                ROUND(AVG(score),1) score,
-                round(weight,2) AS weight
-            FROM  fact_index_dept_sub_score
+                ROUND(AVG(fact.score),1) score,
+                round(fact.weight,2) AS weight,
+                dict.VALUE_TYPE
+            FROM
+                fact_index_dept_sub_score fact
+                LEFT JOIN index_dict dict ON fact.index_code = dict.index_code
             WHERE
-                ALL_PARENT_INDEX_CODE = #{allParentIndexCode}
-                AND CUSTOMER_ID = #{customerId}
-                and  AGENCY_ID= #{orgId}
-                and MONTH_ID = #{monthId}
-            GROUP BY INDEX_CODE;
+                fact.ALL_PARENT_INDEX_CODE = #{allParentIndexCode}
+                AND fact.CUSTOMER_ID = #{customerId}
+                and  fact.AGENCY_ID= #{orgId}
+                and fact.MONTH_ID = #{monthId}
+            GROUP BY fact.INDEX_CODE;
     </select>
 
  </mapper>

From bb440a72e8aeea5e16fea0fdc359866f54682e54 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Tue, 1 Jun 2021 17:25:48 +0800
Subject: [PATCH 117/128] =?UTF-8?q?=E6=9C=AC=E7=BA=A7=E5=8F=8A=E4=B8=8B?=
 =?UTF-8?q?=E7=BA=A7=E5=88=86=E6=95=B0=E4=BF=9D=E7=95=99=E4=B8=80=E4=BD=8D?=
 =?UTF-8?q?=E5=B0=8F=E6=95=B0=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/fact/FactIndexCommunityScoreDao.xml | 4 ++--
 .../src/main/resources/mapper/fact/FactIndexGridScoreDao.xml  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunityScoreDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunityScoreDao.xml
index c48ba651ac..bd45c22bc4 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunityScoreDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunityScoreDao.xml
@@ -28,10 +28,10 @@
             ROUND(fact.score,1) AS "indexTotalOriginScore",
             fact.WEIGHT AS "indexTotalSupWeight",
             ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore",
-            self.self_score AS selfOriginScore,
+            ROUND(self.self_score, 1) AS selfOriginScore,
             self.SELF_WEIGHT AS agencyWeight,
             ROUND(self.sub_score*fact.WEIGHT, 1) AS "subAgencyScore",
-            self.sub_score AS subOriginScore,
+            ROUND(self.sub_score, 1) AS subOriginScore,
             self.SUB_WEIGHT AS subAgencyWeight
         FROM
             fact_index_community_score fact
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridScoreDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridScoreDao.xml
index a731e9c1db..0458665057 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridScoreDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridScoreDao.xml
@@ -28,10 +28,10 @@
             ROUND(fact.score,1) AS "indexTotalOriginScore",
             fact.WEIGHT AS "indexTotalSupWeight",
             ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore",
-            self.self_score AS selfOriginScore,
+            ROUND(self.self_score, 1) AS selfOriginScore,
             self.SELF_WEIGHT AS agencyWeight,
             ROUND(self.sub_score*fact.WEIGHT, 1) AS "subAgencyScore",
-            self.sub_score AS subOriginScore,
+            ROUND(self.sub_score, 1) AS subOriginScore,
             self.SUB_WEIGHT AS subAgencyWeight
         FROM
             fact_index_grid_score fact

From 1de35ecc5c11102e589cc2431247f75422b9fbf7 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Tue, 1 Jun 2021 17:31:53 +0800
Subject: [PATCH 118/128] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E7=BA=A7=E7=9A=84?=
 =?UTF-8?q?=E4=BF=9D=E7=95=99=E5=B0=8F=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/fact/FactIndexGridSubScoreDao.xml   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridSubScoreDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridSubScoreDao.xml
index 5bbc687e50..1fda25b3ac 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridSubScoreDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridSubScoreDao.xml
@@ -46,9 +46,11 @@
             fact.index_code,
             IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS origin_value,
             round(fact.score,1) AS score,
-            round(fact.WEIGHT,2) AS weight
+            round(fact.WEIGHT,2) AS weight,
+            dict.VALUE_TYPE
         FROM
             fact_index_grid_sub_score fact
+             LEFT JOIN index_dict dict ON fact.index_code = dict.index_code
         WHERE
             fact.del_flag = '0'
             AND fact.all_parent_index_code = #{allParentIndexCode}

From 49c461ecee96546dadf331d409a62910bf4fa888 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 2 Jun 2021 09:58:47 +0800
Subject: [PATCH 119/128] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=B8=8B=E7=BA=A7?=
 =?UTF-8?q?=E7=AD=89=E7=BA=A7=E6=8C=87=E6=A0=87=E5=88=86=E6=95=B0=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E7=BB=84=E7=BB=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/GovProjectServiceImpl.java           |  4 +-
 .../screen/ScreenIndexDataMonthlyDao.xml      | 44 ++++++++++++-------
 2 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java
index abc34e5c5c..d48c31f2d7 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java
@@ -116,10 +116,10 @@ public class GovProjectServiceImpl implements GovProjectService {
 		List<ProjectDistributionResultDTO> resultDTOList = new ArrayList<>();
 		List<IssueInfoDTO> issueInfoDTOList = govIssueService.selectShiftProjectIssueList(formDTO.getCustomerId(), formDTO.getGridId(),formDTO.getPageNo(),formDTO.getPageSize());
 		if (CollectionUtils.isNotEmpty(issueInfoDTOList)) {
-			List<String> topicIds = issueInfoDTOList.stream().map(data -> data.getTopicId()).collect(Collectors.toList());
+			List<String> topicIds = issueInfoDTOList.stream().map(IssueInfoDTO::getTopicId).collect(Collectors.toList());
 			// log.info("话题id集合:" + JSON.toJSONString(topicIds, true));
 			List<ResiTopicDTO> topicInfoDTOList = resiGroupService.selectTopicInfoByIds(topicIds);
-			List<String> issueIds = issueInfoDTOList.stream().map(data -> data.getIssueId()).collect(Collectors.toList());
+			List<String> issueIds = issueInfoDTOList.stream().map(IssueInfoDTO::getIssueId).collect(Collectors.toList());
 			// log.info("议题id集合:" + JSON.toJSONString(issueIds, true));
 			resultDTOList = projectDao.selectList(formDTO.getCustomerId(),issueIds);
 			for (ProjectDistributionResultDTO project : resultDTOList) {
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
index 1dcde880e4..3440e5ab5c 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
@@ -230,46 +230,60 @@
 
     <select id="getSingleIndexRank" resultType="com.epmet.evaluationindex.screen.dto.result.PeerComparisonResultDTO">
         SELECT
-            ORG_ID,
-            ORG_NAME,
+            score.ORG_ID,
+            score.ORG_NAME,
         <choose>
             <when test="indexCode == 'dangjiannengli'">
-                round(party_dev_ablity,1) as score
+                round(score.party_dev_ablity,1) as score
             </when>
             <when test="indexCode == 'zhilinengli'">
-                round(govern_ablity,1) as score
+                round(score.govern_ablity,1) as score
             </when>
             <when test="indexCode == 'fuwunengli'">
-                round(service_ablity,1) as score
+                round(score.service_ablity,1) as score
             </when>
         </choose>
         FROM
-        screen_index_data_monthly
+        screen_index_data_monthly score
+        <if test="orgType != null and orgType != ''">
+            <choose>
+                <when test="orgType == 'grid'">
+                    INNER JOIN screen_customer_grid org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.GRID_ID = score.ORG_ID AND org.DEL_FLAG = '0'
+                </when>
+                <when test="orgType == 'agency'">
+                    INNER JOIN screen_customer_agency org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.GRID_ID = score.ORG_ID AND org.DEL_FLAG = '0'
+                </when>
+                  <when test="orgType == 'department'">
+                    INNER JOIN screen_customer_dept org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.GRID_ID = score.ORG_ID AND org.DEL_FLAG = '0'
+                </when>
+            </choose>
+        </if>
+
         WHERE
-        del_flag = '0'
+        score.del_flag = '0'
         <if test="customerId != null and customerId != ''">
-            AND CUSTOMER_ID = #{customerId,jdbcType=VARCHAR}
+            AND score.CUSTOMER_ID = #{customerId,jdbcType=VARCHAR}
         </if>
-        AND PARENT_ID = #{agencyId,jdbcType=VARCHAR}
-        AND MONTH_ID = #{monthId,jdbcType=VARCHAR}
+        AND score.PARENT_ID = #{agencyId,jdbcType=VARCHAR}
+        AND score.MONTH_ID = #{monthId,jdbcType=VARCHAR}
         <choose>
             <when test="orgType != null and orgType != ''">
-                AND ORG_TYPE = #{orgType,jdbcType=VARCHAR}
+                AND score.ORG_TYPE = #{orgType,jdbcType=VARCHAR}
             </when>
             <otherwise>
-                AND ORG_TYPE != 'department'
+                AND score.ORG_TYPE != 'department'
             </otherwise>
         </choose>
         ORDER BY
         <choose>
             <when test="indexCode == 'dangjiannengli'">
-                party_dev_ablity
+                score.party_dev_ablity
             </when>
             <when test="indexCode == 'zhilinengli'">
-                govern_ablity
+                score.govern_ablity
             </when>
             <when test="indexCode == 'fuwunengli'">
-               service_ablity
+               score.service_ablity
             </when>
         </choose>
         ${sort}

From f84f78e8fd0cccdeaf7d2dcc463f64af3d75ba6c Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 2 Jun 2021 10:36:28 +0800
Subject: [PATCH 120/128] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=B8=8B=E7=BA=A7?=
 =?UTF-8?q?=E7=AD=89=E7=BA=A7=E6=8C=87=E6=A0=87=E5=88=86=E6=95=B0=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E7=BB=84=E7=BB=87=E6=8E=A5=E5=8F=A3=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/screen/ScreenIndexDataMonthlyDao.xml     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
index 3440e5ab5c..ba7056c909 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
@@ -251,10 +251,10 @@
                     INNER JOIN screen_customer_grid org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.GRID_ID = score.ORG_ID AND org.DEL_FLAG = '0'
                 </when>
                 <when test="orgType == 'agency'">
-                    INNER JOIN screen_customer_agency org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.GRID_ID = score.ORG_ID AND org.DEL_FLAG = '0'
+                    INNER JOIN screen_customer_agency org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.AGENCY_ID = score.ORG_ID AND org.DEL_FLAG = '0'
                 </when>
                   <when test="orgType == 'department'">
-                    INNER JOIN screen_customer_dept org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.GRID_ID = score.ORG_ID AND org.DEL_FLAG = '0'
+                    INNER JOIN screen_customer_dept org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.DEPT_ID = score.ORG_ID AND org.DEL_FLAG = '0'
                 </when>
             </choose>
         </if>

From 8668d94b7658c648250ae9f55d4b5b3075edfa36 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 2 Jun 2021 10:46:49 +0800
Subject: [PATCH 121/128] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=B8=8B=E7=BA=A7?=
 =?UTF-8?q?=E7=AD=89=E7=BA=A7=E6=8C=87=E6=A0=87=E5=88=86=E6=95=B0=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E7=BB=84=E7=BB=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/ScreenIndexDataMonthlyDao.xml      | 52 +++++++++++--------
 .../screen/ScreenIndexDataYearlyDao.xml       | 46 +++++++++-------
 2 files changed, 57 insertions(+), 41 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
index ba7056c909..ea9a06365e 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
@@ -72,38 +72,46 @@
     <select id="selectSubAgencyOrGridIndexMonthlyRank" parameterType="com.epmet.evaluationindex.screen.dto.form.SubAgencyIndexRankYMFormDTO"
             resultType="com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankResultDTO">
         SELECT
-        org_name AS `NAME`,
-        service_ablity * SERVICE_ABLITY_WEIGHT AS serviceAbility,
-        party_dev_ablity * PARTY_DEV_WEIGHT AS partyDevAbility,
-        govern_ablity * GOVERN_ABLITY_WEIGHT AS governAbility,
-        PARTY_DEV_WEIGHT AS partyWeight,
-        GOVERN_ABLITY_WEIGHT AS governWeight,
-        SERVICE_ABLITY_WEIGHT AS serviceWeight,
-        ORG_ID orgId,
-        ORG_TYPE orgType
+        score.org_name AS `NAME`,
+        score.service_ablity * score.SERVICE_ABLITY_WEIGHT AS serviceAbility,
+        score.party_dev_ablity * score.PARTY_DEV_WEIGHT AS partyDevAbility,
+        score.govern_ablity * score.GOVERN_ABLITY_WEIGHT AS governAbility,
+        score.PARTY_DEV_WEIGHT AS partyWeight,
+        score.GOVERN_ABLITY_WEIGHT AS governWeight,
+        score.SERVICE_ABLITY_WEIGHT AS serviceWeight,
+        score.ORG_ID orgId,
+        score.ORG_TYPE orgType
         FROM
-        screen_index_data_monthly
+        screen_index_data_monthly score
+        <if test="orgType != null and orgType != ''">
+            <choose>
+                <when test="orgType == 'grid'">
+                    INNER JOIN screen_customer_grid org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.GRID_ID = score.ORG_ID AND org.DEL_FLAG = '0'
+                </when>
+                <when test="orgType == 'agency'">
+                    INNER JOIN screen_customer_agency org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.GRID_ID = score.ORG_ID AND org.DEL_FLAG = '0'
+                </when>
+                  <when test="orgType == 'department'">
+                    INNER JOIN screen_customer_dept org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.GRID_ID = score.ORG_ID AND org.DEL_FLAG = '0'
+                </when>
+            </choose>
+        </if>
         WHERE
-        del_flag = '0'
-        AND parent_id = #{agencyId}
-        AND month_id = #{monthId,jdbcType=VARCHAR}
+        score.del_flag = '0'
+        AND score.parent_id = #{agencyId}
+        AND score.month_id = #{monthId,jdbcType=VARCHAR}
         <if test="customerId != null and customerId != ''">
-            AND  CUSTOMER_ID = #{customerId}
+            AND  score.CUSTOMER_ID = #{customerId}
         </if>
         <choose>
             <when test="orgType != null and orgType != ''">
-                AND ORG_TYPE = #{orgType,jdbcType=VARCHAR}
+                AND score.ORG_TYPE = #{orgType,jdbcType=VARCHAR}
             </when>
             <otherwise>
-                AND ORG_TYPE != 'department'
+                AND score.ORG_TYPE != 'department'
             </otherwise>
         </choose>
-        <if test="sort == 'asc'">
-            ORDER BY index_total ASC
-        </if>
-        <if test="sort == 'desc'">
-            ORDER BY index_total DESC
-        </if>
+        ORDER BY score.index_total ${sort}
         LIMIT #{topNum}
     </select>
 
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml
index 301954275f..7ce435c140 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml
@@ -23,35 +23,43 @@
     <select id="selectAnNingSubAgencyIndexYearlyRank" parameterType="com.epmet.evaluationindex.screen.dto.form.SubAgencyIndexRankYMFormDTO"
             resultType="com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankResultDTO">
         SELECT
-        org_name AS `NAME`,
-        govern_ablity AS governAbility,
-        party_dev_ablity AS partyDevAbility,
-        service_ablity AS serviceAbility,
-        ORG_ID orgId,
-        ORG_TYPE orgType
+        score.org_name AS `NAME`,
+        score.govern_ablity AS governAbility,
+        score.party_dev_ablity AS partyDevAbility,
+        score.service_ablity AS serviceAbility,
+        score.ORG_ID orgId,
+        score.ORG_TYPE orgType
         FROM
-        screen_index_data_yearly
+        screen_index_data_yearly score
+         <if test="orgType != null and orgType != ''">
+            <choose>
+                <when test="orgType == 'grid'">
+                    INNER JOIN screen_customer_grid org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.GRID_ID = score.ORG_ID AND org.DEL_FLAG = '0'
+                </when>
+                <when test="orgType == 'agency'">
+                    INNER JOIN screen_customer_agency org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.GRID_ID = score.ORG_ID AND org.DEL_FLAG = '0'
+                </when>
+                  <when test="orgType == 'department'">
+                    INNER JOIN screen_customer_dept org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.GRID_ID = score.ORG_ID AND org.DEL_FLAG = '0'
+                </when>
+            </choose>
+        </if>
         WHERE
-        del_flag = '0'
-        AND parent_id = #{agencyId}
-        AND year_id = YEAR(CURDATE())
+        score.del_flag = '0'
+        AND score.parent_id = #{agencyId}
+        AND score.year_id = YEAR(CURDATE())
         <if test="customerId != null and customerId != ''">
-            AND  CUSTOMER_ID = #{customerId}
+            AND  score.CUSTOMER_ID = #{customerId}
         </if>
         <choose>
             <when test="orgType != null and orgType != ''">
-                AND ORG_TYPE = #{orgType,jdbcType=VARCHAR}
+                AND score.ORG_TYPE = #{orgType,jdbcType=VARCHAR}
             </when>
             <otherwise>
-                AND ORG_TYPE != 'department'
+                AND score.ORG_TYPE != 'department'
             </otherwise>
         </choose>
-        <if test="sort == 'asc'">
-            ORDER BY index_total ASC
-        </if>
-        <if test="sort == 'desc'">
-            ORDER BY index_total DESC
-        </if>
+        ORDER BY index_total ${sort}
         LIMIT #{topNum}
     </select>
 </mapper>

From 93c9d33072c701e787bda65eab873890170bb128 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 2 Jun 2021 11:04:49 +0800
Subject: [PATCH 122/128] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=B8=8B=E7=BA=A7?=
 =?UTF-8?q?=E7=AD=89=E7=BA=A7=E6=8C=87=E6=A0=87=E5=88=86=E6=95=B0=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E7=BB=84=E7=BB=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/screen/ScreenIndexDataMonthlyDao.xml     | 4 ++--
 .../main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
index ea9a06365e..922bb971d1 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
@@ -89,10 +89,10 @@
                     INNER JOIN screen_customer_grid org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.GRID_ID = score.ORG_ID AND org.DEL_FLAG = '0'
                 </when>
                 <when test="orgType == 'agency'">
-                    INNER JOIN screen_customer_agency org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.GRID_ID = score.ORG_ID AND org.DEL_FLAG = '0'
+                    INNER JOIN screen_customer_agency org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.AGENCY_ID = score.ORG_ID AND org.DEL_FLAG = '0'
                 </when>
                   <when test="orgType == 'department'">
-                    INNER JOIN screen_customer_dept org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.GRID_ID = score.ORG_ID AND org.DEL_FLAG = '0'
+                    INNER JOIN screen_customer_dept org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.DEPT_ID = score.ORG_ID AND org.DEL_FLAG = '0'
                 </when>
             </choose>
         </if>
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml
index 7ce435c140..4184ecd513 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml
@@ -37,10 +37,10 @@
                     INNER JOIN screen_customer_grid org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.GRID_ID = score.ORG_ID AND org.DEL_FLAG = '0'
                 </when>
                 <when test="orgType == 'agency'">
-                    INNER JOIN screen_customer_agency org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.GRID_ID = score.ORG_ID AND org.DEL_FLAG = '0'
+                    INNER JOIN screen_customer_agency org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.AGENCY_ID = score.ORG_ID AND org.DEL_FLAG = '0'
                 </when>
                   <when test="orgType == 'department'">
-                    INNER JOIN screen_customer_dept org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.GRID_ID = score.ORG_ID AND org.DEL_FLAG = '0'
+                    INNER JOIN screen_customer_dept org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.DEPT_ID = score.ORG_ID AND org.DEL_FLAG = '0'
                 </when>
             </choose>
         </if>

From f605590fa86c48a3bd9b8ff14c7be8125a76b566 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 2 Jun 2021 16:26:43 +0800
Subject: [PATCH 123/128] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=85=88=E8=BF=9B?=
 =?UTF-8?q?=E6=8E=92=E8=A1=8C=E5=85=B3=E8=81=94=E7=BB=84=E7=BB=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/ScreenIndexDataMonthlyDao.xml      | 45 ++++++++++++-------
 1 file changed, 29 insertions(+), 16 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
index 922bb971d1..fdea53df9f 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
@@ -185,28 +185,41 @@
 
     <select id="selectMonthData" resultType="com.epmet.evaluationindex.screen.dto.result.IndexScoreResultDTO">
         SELECT
-            index_total AS "total",
-            (party_dev_ablity * party_dev_weight) AS "party",
-            ROUND(party_dev_ablity,1) partyOriginScore,
-            party_dev_weight AS "partyDevAbilityWeight",
-            (govern_ablity * govern_ablity_weight) AS "govern",
-            ROUND(govern_ablity,1) governOriginScore,
-            govern_ablity_weight AS "governAbilityWeight",
-            (service_ablity * service_ablity_weight) AS "service",
-            ROUND(service_ablity,1) serviceOriginScore,
-            service_ablity_weight AS "serviceAbilityWeight"
+            score.index_total AS "total",
+            (score.party_dev_ablity * score.party_dev_weight) AS "party",
+            ROUND(score.party_dev_ablity,1) partyOriginScore,
+            score.party_dev_weight AS "partyDevAbilityWeight",
+            (score.govern_ablity * score.govern_ablity_weight) AS "govern",
+            ROUND(score.govern_ablity,1) governOriginScore,
+            score.govern_ablity_weight AS "governAbilityWeight",
+            (score.service_ablity * score.service_ablity_weight) AS "service",
+            ROUND(score.service_ablity,1) serviceOriginScore,
+            score.service_ablity_weight AS "serviceAbilityWeight"
         FROM
-            screen_index_data_monthly
+            screen_index_data_monthly score
+            <if test="orgType != null and orgType != ''">
+                <choose>
+                    <when test="orgType == 'grid'">
+                        INNER JOIN screen_customer_grid org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.GRID_ID = score.ORG_ID AND org.DEL_FLAG = '0'
+                    </when>
+                    <when test="orgType == 'agency'">
+                        INNER JOIN screen_customer_agency org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.GRID_ID = score.ORG_ID AND org.DEL_FLAG = '0'
+                    </when>
+                      <when test="orgType == 'department'">
+                        INNER JOIN screen_customer_dept org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.GRID_ID = score.ORG_ID AND org.DEL_FLAG = '0'
+                    </when>
+                </choose>
+            </if>
         WHERE
-            del_flag = '0'
-        AND org_id = #{orgId}
+            score.del_flag = '0'
+        AND score.org_id = #{orgId}
         <if test="customerId != null and customerId != ''">
-            AND customer_id = #{customerId}
+            AND score.customer_id = #{customerId}
         </if>
         <if test="orgType != null and orgType != '' ">
-            AND org_type = #{orgType}
+            AND score.org_type = #{orgType}
         </if>
-        AND month_id = #{monthId}
+        AND score.month_id = #{monthId}
     </select>
 
     <select id="selectRankList" resultType="com.epmet.evaluationindex.screen.dto.result.IndexAdvanceBranchRankResultDTO">

From 6886ffd0adfea6098348eda4f6559c1920d25657 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Wed, 2 Jun 2021 16:28:58 +0800
Subject: [PATCH 124/128] =?UTF-8?q?=E5=85=9A=E5=91=98=E5=85=88=E9=94=8B-?=
 =?UTF-8?q?=E4=B8=8B=E7=BA=A7=E7=BB=84=E7=BB=87=E6=8E=92=E8=A1=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datastats/result/PartyMemberVanguardDetailResultDTO.java  | 4 ++++
 .../service/datastats/impl/DataStatsServiceImpl.java          | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/PartyMemberVanguardDetailResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/PartyMemberVanguardDetailResultDTO.java
index 929178031d..ad1d27d9e6 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/PartyMemberVanguardDetailResultDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/PartyMemberVanguardDetailResultDTO.java
@@ -23,6 +23,10 @@ public class PartyMemberVanguardDetailResultDTO implements Serializable {
 	 * 组织名
 	 */
 	private String orgName;
+	/**
+	 * 组织类型  机关 agency 网格 grid
+	 */
+	private String orgType;
 	/**
 	 * 党员建组数
 	 */
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index a916acf6cc..72a5501eb8 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -1025,6 +1025,7 @@ public class DataStatsServiceImpl implements DataStatsService {
             item.setIssueRatio(transform(item.getIssueRatio()));
             item.setProjectRatio(transform(item.getProjectRatio()));
             item.setProjectClosedRatio(transform(item.getProjectClosedRatio()));
+            item.setOrgType(OrgConstant.AGENCY);
         });
         result.getGridRank().forEach(item -> {
             item.setGroupRatio(transform(item.getGroupRatio()));
@@ -1033,6 +1034,7 @@ public class DataStatsServiceImpl implements DataStatsService {
             item.setIssueRatio(transform(item.getIssueRatio()));
             item.setProjectRatio(transform(item.getProjectRatio()));
             item.setProjectClosedRatio(transform(item.getProjectClosedRatio()));
+            item.setOrgType(OrgConstant.GRID);
         });
         result.setAgencyLevel(agency.getLevel());
         return result;

From 49304c1c0d665a9bf5035c69d685940493fea519 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 2 Jun 2021 16:37:12 +0800
Subject: [PATCH 125/128] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=85=88=E8=BF=9B?=
 =?UTF-8?q?=E6=8E=92=E8=A1=8C=E5=85=B3=E8=81=94=E7=BB=84=E7=BB=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/screen/ScreenIndexDataMonthlyDao.xml     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
index fdea53df9f..0c29400553 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
@@ -203,10 +203,10 @@
                         INNER JOIN screen_customer_grid org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.GRID_ID = score.ORG_ID AND org.DEL_FLAG = '0'
                     </when>
                     <when test="orgType == 'agency'">
-                        INNER JOIN screen_customer_agency org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.GRID_ID = score.ORG_ID AND org.DEL_FLAG = '0'
+                        INNER JOIN screen_customer_agency org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.AGENCY_ID = score.ORG_ID AND org.DEL_FLAG = '0'
                     </when>
                       <when test="orgType == 'department'">
-                        INNER JOIN screen_customer_dept org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.GRID_ID = score.ORG_ID AND org.DEL_FLAG = '0'
+                        INNER JOIN screen_customer_dept org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.DEPT_ID = score.ORG_ID AND org.DEL_FLAG = '0'
                     </when>
                 </choose>
             </if>

From 9dbbbf1cd67b0e114ef35a04d0d0185196a00f6e Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 2 Jun 2021 17:06:46 +0800
Subject: [PATCH 126/128] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=85=88=E8=BF=9B**?=
 =?UTF-8?q?=E6=8E=92=E8=A1=8C=20=E5=85=B3=E8=81=94=E7=BB=84=E7=BB=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/form/AdvancedBranchRankFormDTO.java   |  5 ++
 .../screen/ScreenIndexDataMonthlyDao.xml      | 13 ++++
 .../screen/ScreenPartyUserRankDataDao.xml     | 76 +++++++++++++------
 3 files changed, 69 insertions(+), 25 deletions(-)

diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/AdvancedBranchRankFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/AdvancedBranchRankFormDTO.java
index a6e5ecb9b3..27f638f3d2 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/AdvancedBranchRankFormDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/AdvancedBranchRankFormDTO.java
@@ -27,5 +27,10 @@ public class AdvancedBranchRankFormDTO implements Serializable {
      * 月份Id
      * */
     private String monthId;
+
+    /**
+     * 组织类型 agency grid
+     */
+    private String orgType;
     public interface AddUserInternalGroup {}
 }
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
index 0c29400553..15a410753b 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
@@ -238,6 +238,19 @@
         FROM
             screen_index_data_monthly dm
         INNER JOIN screen_org_rank_data rd ON dm.org_id = rd.org_id
+         <if test="orgType != null and orgType != ''">
+                <choose>
+                    <when test="orgType == 'grid'">
+                        INNER JOIN screen_customer_grid org ON org.CUSTOMER_ID = dm.CUSTOMER_ID AND org.GRID_ID = dm.ORG_ID AND org.DEL_FLAG = '0'
+                    </when>
+                    <when test="orgType == 'agency'">
+                        INNER JOIN screen_customer_agency org ON org.CUSTOMER_ID = dm.CUSTOMER_ID AND org.AGENCY_ID = dm.ORG_ID AND org.DEL_FLAG = '0'
+                    </when>
+                      <when test="orgType == 'department'">
+                        INNER JOIN screen_customer_dept org ON org.CUSTOMER_ID = dm.CUSTOMER_ID AND org.DEPT_ID = dm.ORG_ID AND org.DEL_FLAG = '0'
+                    </when>
+                </choose>
+            </if>
         AND dm.month_id = rd.month_id
         WHERE
             dm.del_flag = '0'
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
index aa584adbae..102b78296e 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
@@ -135,56 +135,82 @@
     <select id="selectAgencyResiPointListWithoutPartyMem"
             resultType="com.epmet.evaluationindex.screen.dto.result.UserPointRankListResultDTO">
         SELECT
-        org_id AS "agencyId",
-        org_name AS "agencyName",
-        grid_id AS "gridId",
-        grid_name AS "gridName",
-        user_id AS "userId",
-        user_name AS "userName",
-        point_total AS "pointTotal"
+        u.org_id AS "agencyId",
+        u.org_name AS "agencyName",
+        u.grid_id AS "gridId",
+        u.grid_name AS "gridName",
+        u.user_id AS "userId",
+        u.user_name AS "userName",
+        u.point_total AS "pointTotal"
         FROM
-        screen_party_user_rank_data
+        screen_party_user_rank_data u
+        <if test="orgType != null and orgType != ''">
+                <choose>
+                    <when test="orgType == 'grid'">
+                        INNER JOIN screen_customer_grid org ON org.CUSTOMER_ID = u.CUSTOMER_ID AND org.GRID_ID = u.ORG_ID AND org.DEL_FLAG = '0'
+                    </when>
+                    <when test="orgType == 'agency'">
+                        INNER JOIN screen_customer_agency org ON org.CUSTOMER_ID = u.CUSTOMER_ID AND org.AGENCY_ID = u.ORG_ID AND org.DEL_FLAG = '0'
+                    </when>
+                      <when test="orgType == 'department'">
+                        INNER JOIN screen_customer_dept org ON org.CUSTOMER_ID = u.CUSTOMER_ID AND org.DEPT_ID = u.ORG_ID AND org.DEL_FLAG = '0'
+                    </when>
+                </choose>
+            </if>
         WHERE
-        del_flag = '0'
+        u.del_flag = '0'
         AND PARTY_FLAG = 0
         <if test="orgType != null and orgType !=''">
             <if test="orgType == 'agency'">
-                AND all_parent_ids LIKE CONCAT('%',#{orgId},'%')
+                AND u.all_parent_ids LIKE CONCAT('%',#{orgId},'%')
             </if>
             <if test="orgType == 'grid'">
-                AND grid_id = #{orgId}
+                AND u.grid_id = #{orgId}
             </if>
         </if>
         ORDER BY
-        point_total DESC
+        u.point_total DESC
         LIMIT #{topNum}
     </select>
 
     <!--党员积分排行-->
     <select id="listPartymemberPointRank" resultType="com.epmet.evaluationindex.screen.dto.result.PartyPointRankResultDTO">
         SELECT
-            org_id AS "agencyId",
-            org_name AS "agencyName",
-            grid_id AS "gridId",
-            grid_name AS "gridName",
-            user_id AS "userId",
-            user_name AS "userName",
-            point_total AS "pointTotal"
+            u.org_id AS "agencyId",
+            u.org_name AS "agencyName",
+            u.grid_id AS "gridId",
+            u.grid_name AS "gridName",
+            u.user_id AS "userId",
+            u.user_name AS "userName",
+            u.point_total AS "pointTotal"
             FROM
-            screen_party_user_rank_data
+            screen_party_user_rank_data u
+             <if test="orgType != null and orgType != ''">
+                <choose>
+                    <when test="orgType == 'grid'">
+                        INNER JOIN screen_customer_grid org ON org.CUSTOMER_ID = u.CUSTOMER_ID AND org.GRID_ID = u.ORG_ID AND org.DEL_FLAG = '0'
+                    </when>
+                    <when test="orgType == 'agency'">
+                        INNER JOIN screen_customer_agency org ON org.CUSTOMER_ID = u.CUSTOMER_ID AND org.AGENCY_ID = u.ORG_ID AND org.DEL_FLAG = '0'
+                    </when>
+                      <when test="orgType == 'department'">
+                        INNER JOIN screen_customer_dept org ON org.CUSTOMER_ID = u.CUSTOMER_ID AND org.DEPT_ID = u.ORG_ID AND org.DEL_FLAG = '0'
+                    </when>
+                </choose>
+            </if>
             WHERE
-            del_flag = '0'
+            u.del_flag = '0'
             AND party_flag = '1'<!-- 是否是党员标志：1是。0不是党员 -->
             <if test="orgType != null and orgType !=''">
                 <if test="orgType == 'agency'">
-                    AND all_parent_ids LIKE CONCAT('%',#{orgId},'%')
+                    AND u.all_parent_ids LIKE CONCAT('%',#{orgId},'%')
                 </if>
                 <if test="orgType == 'grid'">
-                    AND grid_id = #{orgId}
+                    AND u.grid_id = #{orgId}
                 </if>
             </if>
             ORDER BY
-            point_total DESC
+            u.point_total DESC
             LIMIT #{topNum}
     </select>
-</mapper>
\ No newline at end of file
+</mapper>

From 3d7acb2ac7a8675515c044c55fb7f100c1095c98 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Fri, 4 Jun 2021 14:52:18 +0800
Subject: [PATCH 127/128] =?UTF-8?q?=E5=85=9A=E5=91=98=E5=85=88=E9=94=8B?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datastats/impl/DataStatsServiceImpl.java  |  3 ++
 .../extract/FactOriginGroupMainDailyDao.xml   | 19 ++++++----
 .../extract/FactOriginGroupMemberDailyDao.xml | 38 +++++++++++--------
 .../extract/FactOriginIssueMainDailyDao.xml   | 19 ++++++----
 .../extract/FactOriginProjectMainDailyDao.xml | 38 ++++++++++++-------
 .../extract/FactOriginTopicMainDailyDao.xml   | 19 ++++++----
 6 files changed, 85 insertions(+), 51 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index 72a5501eb8..0bf1504b81 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -1011,6 +1011,9 @@ public class DataStatsServiceImpl implements DataStatsService {
     public PartyMemberVanguardRankResultDTO vanguardRank(PartyMemberVanguardFormDTO formDTO) {
         //获取组织级别
         DimAgencyEntity agency = dataStatsDao.getAgencyInfo(formDTO.getAgencyId());
+        if (null == agency) {
+        	return new PartyMemberVanguardRankResultDTO();
+		}
         //组织排行
         List<PartyMemberVanguardDetailResultDTO> agencyRank = dataStatsDao.selectAgencyVanguardRank(formDTO.getAgencyId());
         //网格排行
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml
index eeec0fa8e5..21df7f9a68 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml
@@ -352,16 +352,19 @@
     </select>
     <select id="selectPartyMemberGroupStaticByAgency" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
         SELECT
-        AGENCY_ID,
-        count( ID ) AS "sum",
-        sum(IF( IS_OWNER_PARTY = 1, 1, 0 )) AS "count"
+            a.ID AS AGENCY_ID,
+            count( b.ID ) AS "sum",
+            sum( IF( IS_OWNER_PARTY = 1, 1, 0 )) AS "count"
         FROM
-        fact_origin_group_main_daily
-        WHERE CUSTOMER_ID = #{customerId}
-        AND DATE_ID &lt;= #{dateId}
-        AND (GROUP_STATE = 'approved' OR GROUP_STATE = 'hidden')
+            dim_agency a
+        INNER JOIN
+            fact_origin_group_main_daily b ON b.PIDS LIKE CONCAT( '%', a.ID, '%' )
+        WHERE
+            b.CUSTOMER_ID = #{customerId}
+            AND b.DATE_ID &lt;= #{dateId}
+            AND ( GROUP_STATE = 'approved' OR GROUP_STATE = 'hidden' )
         GROUP BY
-        AGENCY_ID
+            a.ID
     </select>
     <select id="selectPartyMemberGroupStaticByGrid" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
         SELECT
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMemberDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMemberDailyDao.xml
index c0fb2fb43c..bb5fc4b2e5 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMemberDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMemberDailyDao.xml
@@ -29,25 +29,33 @@
     </resultMap>
     <select id="selectGroupPartyMemberStaticByAgency" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
         SELECT
-            a.AGENCY_ID,
+            da.ID AS AGENCY_ID,
             COUNT( DISTINCT MEMBER_ID ) AS "sum",
             IFNULL( b.partyCount, 0 ) AS "count"
         FROM
-            fact_origin_group_member_daily a
-                LEFT JOIN
-            (SELECT
-                 AGENCY_ID,
-                 COUNT( DISTINCT MEMBER_ID ) AS partyCount
-             FROM fact_origin_group_member_daily
-             WHERE IS_PARTY = 1
-                 AND CUSTOMER_ID = #{customerId}
-                 AND DATE_ID &lt;= #{dateId}
-             GROUP BY AGENCY_ID
-            ) b ON a.AGENCY_ID = b.AGENCY_ID
-        WHERE a.CUSTOMER_ID = #{customerId}
-          AND a.DATE_ID &lt;= #{dateId}
+            dim_agency da
+        INNER JOIN fact_origin_group_member_daily a ON a.PIDS LIKE CONCAT( '%', da.ID, '%' )
+        AND a.CUSTOMER_ID = #{customerId}
+        AND a.DATE_ID &lt;= #{dateId}
+        LEFT JOIN (
+            SELECT
+                agency.ID AS AGENCY_ID,
+                COUNT( DISTINCT MEMBER_ID ) AS partyCount
+            FROM
+            dim_agency agency
+            INNER JOIN fact_origin_group_member_daily member ON member.PIDS LIKE CONCAT( '%', agency.ID, '%' )
+                AND member.IS_PARTY = 1
+                AND member.CUSTOMER_ID = #{customerId}
+                AND member.DATE_ID &lt;= #{dateId}
+            WHERE
+                agency.CUSTOMER_ID = #{customerId}
+            GROUP BY
+                agency.ID
+        ) b ON da.ID = b.AGENCY_ID
+        WHERE
+            da.CUSTOMER_ID = #{customerId}
         GROUP BY
-            a.AGENCY_ID
+            da.ID
     </select>
     <select id="selectGroupPartyMemberStaticByGrid" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
         SELECT
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml
index a488706d0b..d5bbf0cc29 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml
@@ -293,13 +293,18 @@
     </select>
     <select id="selectPartyMemberIssueStaticByAgency" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
         SELECT
-            AGENCY_ID,
-            COUNT(ID) AS "sum",
-            SUM(IF(IS_PARTY = 1 ,1, 0)) AS "count"
-        FROM fact_origin_issue_main_daily
-        WHERE CUSTOMER_ID = #{customerId}
-          AND DATE_ID &lt;= #{dateId}
-        GROUP BY AGENCY_ID
+            a.ID AS AGENCY_ID,
+            count( b.ID ) AS "sum",
+            sum( IF( IS_PARTY = 1, 1, 0 )) AS "count"
+        FROM
+            dim_agency a
+                INNER JOIN
+            fact_origin_issue_main_daily b ON b.PIDS LIKE CONCAT( '%', a.ID, '%' )
+        WHERE
+            b.CUSTOMER_ID = #{customerId}
+          AND b.DATE_ID &lt;= #{dateId}
+        GROUP BY
+            a.ID
     </select>
     <select id="selectPartyMemberIssueStaticByGrid" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
         SELECT
diff --git 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
index 9213e3c855..c9d6d8bfde 100644
--- 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
@@ -763,14 +763,19 @@
     </select>
     <select id="selectPartyMemberProjectStaticByAgency" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
         SELECT
-            AGENCY_ID,
-            COUNT(ID) AS "sum",
-            SUM(IF(IS_PARTY = 1 ,1, 0)) AS "count"
-        FROM fact_origin_project_main_daily
-        WHERE CUSTOMER_ID = #{customerId}
-          AND DATE_ID &lt;= #{dateId}
+            a.ID AS AGENCY_ID,
+            count( b.ID ) AS "sum",
+            sum( IF( IS_PARTY = 1, 1, 0 )) AS "count"
+        FROM
+            dim_agency a
+                INNER JOIN
+            fact_origin_project_main_daily b ON b.PIDS LIKE CONCAT( '%', a.ID, '%' )
+        WHERE
+            b.CUSTOMER_ID = #{customerId}
+          AND b.DATE_ID &lt;= #{dateId}
           AND ORIGIN = 'issue'
-        GROUP BY AGENCY_ID
+        GROUP BY
+            a.ID
     </select>
     <select id="selectPartyMemberProjectStaticByGrid" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
         SELECT
@@ -785,15 +790,20 @@
     </select>
     <select id="selectPartyMemberClosedProjectStaticByAgency" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
         SELECT
-            AGENCY_ID,
-            COUNT(ID) AS "sum",
-            SUM(IF(IS_PARTY = 1 ,1, 0)) AS "count"
-        FROM fact_origin_project_main_daily
-        WHERE CUSTOMER_ID = #{customerId}
-          AND DATE_ID &lt;= #{dateId}
+            a.ID AS AGENCY_ID,
+            count( b.ID ) AS "sum",
+            sum( IF( IS_PARTY = 1, 1, 0 )) AS "count"
+        FROM
+            dim_agency a
+                INNER JOIN
+            fact_origin_project_main_daily b ON b.PIDS LIKE CONCAT( '%', a.ID, '%' )
+        WHERE
+            b.CUSTOMER_ID = #{customerId}
+          AND b.DATE_ID &lt;= #{dateId}
           AND PROJECT_STATUS = 'closed'
           AND ORIGIN = 'issue'
-        GROUP BY AGENCY_ID
+        GROUP BY
+            a.ID
     </select>
     <select id="selectPartyMemberClosedProjectStaticByGrid" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
         SELECT
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml
index 59bc2006c0..2ee9f8afe1 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml
@@ -192,13 +192,18 @@
     </select>
     <select id="selectPartyMemberTopicStaticByAgency" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
         SELECT
-            AGENCY_ID,
-            COUNT(ID) as "sum",
-            SUM(IF(CREATE_TOPIC_USER_IS_PARTY = 1 ,1, 0)) as "count"
-        FROM fact_origin_topic_main_daily
-        WHERE CUSTOMER_ID = #{customerId}
-          AND DATE_ID &lt;= #{dateId}
-        GROUP BY AGENCY_ID
+            a.ID AS AGENCY_ID,
+            count( b.ID ) AS "sum",
+            sum( IF( CREATE_TOPIC_USER_IS_PARTY = 1, 1, 0 )) AS "count"
+        FROM
+            dim_agency a
+                INNER JOIN
+            fact_origin_topic_main_daily b ON b.PIDS LIKE CONCAT( '%', a.ID, '%' )
+        WHERE
+            b.CUSTOMER_ID = #{customerId}
+          AND b.DATE_ID &lt;= #{dateId}
+        GROUP BY
+            a.ID
     </select>
     <select id="selectPartyMemberTopicStaticByGrid" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
         SELECT

From 7b561fb3b62410fd8d68a07101e862632c5ea200 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 4 Jun 2021 16:40:53 +0800
Subject: [PATCH 128/128] =?UTF-8?q?=E5=85=88=E8=BF=9B=E6=94=AF=E9=83=A8?=
 =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=9F=A5=E8=AF=A2=E7=9A=84=E6=98=AF=E7=BD=91?=
 =?UTF-8?q?=E6=A0=BC=20=E6=89=80=E4=BB=A5=E5=85=B3=E8=81=94grid=E5=8D=B3?=
 =?UTF-8?q?=E5=8F=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/screen/ScreenIndexDataMonthlyDao.xml  | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
index 15a410753b..26c21cd8b1 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
@@ -238,19 +238,9 @@
         FROM
             screen_index_data_monthly dm
         INNER JOIN screen_org_rank_data rd ON dm.org_id = rd.org_id
-         <if test="orgType != null and orgType != ''">
-                <choose>
-                    <when test="orgType == 'grid'">
-                        INNER JOIN screen_customer_grid org ON org.CUSTOMER_ID = dm.CUSTOMER_ID AND org.GRID_ID = dm.ORG_ID AND org.DEL_FLAG = '0'
-                    </when>
-                    <when test="orgType == 'agency'">
-                        INNER JOIN screen_customer_agency org ON org.CUSTOMER_ID = dm.CUSTOMER_ID AND org.AGENCY_ID = dm.ORG_ID AND org.DEL_FLAG = '0'
-                    </when>
-                      <when test="orgType == 'department'">
-                        INNER JOIN screen_customer_dept org ON org.CUSTOMER_ID = dm.CUSTOMER_ID AND org.DEPT_ID = dm.ORG_ID AND org.DEL_FLAG = '0'
-                    </when>
-                </choose>
-            </if>
+        <!--查询的是网格的排行 下面条件是orgType = grid-->
+        INNER JOIN screen_customer_grid org ON org.CUSTOMER_ID = dm.CUSTOMER_ID AND org.GRID_ID = dm.ORG_ID AND org.DEL_FLAG = '0'
+
         AND dm.month_id = rd.month_id
         WHERE
             dm.del_flag = '0'