From 04c5075f875c48a26990ba894865e686c747313a Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 11 May 2020 09:08:18 +0800
Subject: [PATCH 01/45] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E3=80=81=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86controller?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/controller/IssueManageController.java  | 15 +++++++++++++++
 .../epmet/controller/ProjectTraceController.java | 15 +++++++++++++++
 .../com/epmet/controller/IssueController.java    | 16 ++++++++++++++++
 3 files changed, 46 insertions(+)
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTraceController.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java
new file mode 100644
index 0000000000..186e2a2e3a
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java
@@ -0,0 +1,15 @@
+package com.epmet.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description 政府端-基层治理-议题管理
+ * @Author yinzuomei
+ * @Date 2020/5/11 9:06
+ */
+@RestController
+@RequestMapping("manage")
+public class IssueManageController {
+}
+
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTraceController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTraceController.java
new file mode 100644
index 0000000000..9a4329be26
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTraceController.java
@@ -0,0 +1,15 @@
+package com.epmet.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description 政府端-项目跟踪
+ * @Author yinzuomei
+ * @Date 2020/5/11 9:07
+ */
+@RestController
+@RequestMapping("trace")
+public class ProjectTraceController {
+}
+
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java
new file mode 100644
index 0000000000..a88ea4aa78
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java
@@ -0,0 +1,16 @@
+package com.epmet.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description 居民端党群议事
+ * @Author yinzuomei
+ * @Date 2020/5/11 9:04
+ */
+@RestController
+@RequestMapping("issue")
+public class IssueController {
+
+}
+

From d6137d3dd65ee31f7d7058241ddaacbf3ecc2c6f Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Mon, 11 May 2020 11:23:28 +0800
Subject: [PATCH 02/45] =?UTF-8?q?epmet-gov-issue=E5=BA=93=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E5=BB=BA=E8=A1=A8sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/db.migration/db.sql    | 190 ++++++++++++++++++
 1 file changed, 190 insertions(+)
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/resources/db.migration/db.sql

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/db.migration/db.sql b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db.migration/db.sql
new file mode 100644
index 0000000000..a167486154
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db.migration/db.sql
@@ -0,0 +1,190 @@
+-- @Date        2020-05-12 11:16
+-- @Author      wangc
+-- @Description 数据库epmet_gov_issue中的表，db语句：
+
+CREATE TABLE issue(
+    ID VARCHAR(32) NOT NULL   COMMENT '议题ID' ,
+    ISSUE_STATUS VARCHAR(32) NOT NULL   COMMENT '议题状态 表决中：voting 已转项目：shift_project 已关闭：closed' ,
+    SOURCE_TYPE VARCHAR(32) NOT NULL   COMMENT '来源类型 eg:resi_topic' ,
+    SOURCE_ID VARCHAR(32) NOT NULL   COMMENT '来源ID eg:2223232(当SOURCE_TYPE为"resi_topic"时，这里指话题的ID)' ,
+    CLOSE_REASON VARCHAR(32)    COMMENT '关闭理由 【未关闭时可以为空】关闭议题时必填的理由，转项目后而且已经结案，这个字段不回写' ,
+    RESOLVE_TYPE VARCHAR(32)    COMMENT '解决类型 【未关闭时可以为空】已解决resloved、未解决unresloved，对应在关闭议题时所选的checkbox，转项目后而且已经结案，这个字段不回写' ,
+    ISSUE_TITLE VARCHAR(128) NOT NULL   COMMENT '议题名称 最多20字' ,
+    SUGGESTION VARCHAR(1024) NOT NULL   COMMENT '建议 最多1000字' ,
+    CUSTOMER_ID VARCHAR(32) NOT NULL   COMMENT '客户ID' ,
+    GRID_ID VARCHAR(32) NOT NULL   COMMENT '网格ID 居民端议题对应一个网格Id' ,
+    ORG_ID_PATH VARCHAR(1024)    COMMENT '所属机关 【数据权限-非必填】11:22:33(agencyId)数据权限控制' ,
+    ORG_ID VARCHAR(32)    COMMENT '组织ID 【数据权限-非必填】agencyId' ,
+    VOTING_DEADLINE DATE    COMMENT '表决截止日期' ,
+    DECIDED_TIME DATE NOT NULL   COMMENT '表决发起日期（转议题日期）' ,
+    SHIFTED_TIME DATE    COMMENT '转项目日期 （服务间调用日期一致性）' ,
+    CLOSED_TIME DATE    COMMENT '关闭日期' ,
+    DEL_FLAG VARCHAR(1) NOT NULL  DEFAULT 0 COMMENT '删除标识 0未删除、1已删除' ,
+    REVISION INT 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)
+) COMMENT = '议题详情表';;
+
+
+
+-- ------------------------------------------------------------------------------------------------
+
+
+CREATE TABLE issue_process(
+    ID VARCHAR(32) NOT NULL   COMMENT '主键ID' ,
+    ISSUE_ID VARCHAR(32) NOT NULL   COMMENT '议题ID' ,
+    ISSUE_STATUS VARCHAR(32) NOT NULL   COMMENT '操作状态 - 表决中：voting 已转项目：shift_project 已关闭：closed' ,
+    ORG_TYPE VARCHAR(32) NOT NULL   COMMENT '组织类型 操作人所属机构类型（机构：agency | 部门：dept | 网格：grid）操作人可能来源于居民端和政府段，但是只有在“转议题”的时候才是居民端拥有组长权限的人操作，所以当这条记录是转议题时，该记录为grid，ORD_ID相应的也为GRID_ID' ,
+    ORG_ID VARCHAR(32) NOT NULL   COMMENT '组织ID 操作人所属机构ID（对应的有网格ID、部门ID、机构ID）' ,
+    OPERATION_EXPLAIN VARCHAR(512) NOT NULL   COMMENT '操作说明 (节点的说明文案，包含三个节点的文案说明【转议题】、【已关闭】、【转项目】)' ,
+    DEL_FLAG VARCHAR(1) NOT NULL  DEFAULT 0 COMMENT '删除标识 0未删除、1已删除' ,
+    REVISION INT 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)
+) COMMENT = '议题进展记录表';;
+
+
+-- ------------------------------------------------------------------------------------------------
+
+
+CREATE TABLE issue_vote_detail(
+    ID VARCHAR(32) NOT NULL   COMMENT '主键ID' ,
+    ISSUE_ID VARCHAR(32) NOT NULL   COMMENT '议题ID' ,
+    ATTITUDE VARCHAR(32) NOT NULL   COMMENT '态度 - opposition（反对）support（赞成）' ,
+    DEL_FLAG VARCHAR(1) NOT NULL  DEFAULT 0 COMMENT '删除标识 0未删除、1已删除' ,
+    REVISION INT 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)
+) COMMENT = '议题表决记录表';;
+
+
+-- ------------------------------------------------------------------------------------------------
+
+
+CREATE TABLE issue_vote_statistical(
+    ID VARCHAR(32) NOT NULL   COMMENT '主键ID' ,
+    ISSUE_ID VARCHAR(32) NOT NULL   COMMENT '议题ID' ,
+    SUPPORT_COUNT INT NOT NULL  DEFAULT 0 COMMENT '支持数' ,
+    OPPOSITION_COUNT INT NOT NULL  DEFAULT 0 COMMENT '反对数' ,
+    VOTABLE_COUNT INT    COMMENT '应表决数' ,
+    REVISION INT NOT NULL  DEFAULT 0 COMMENT '乐观锁' ,
+    DEL_FLAG VARCHAR(1) NOT NULL  DEFAULT 0 COMMENT '删除标识 0未删除、1已删除' ,
+    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)
+) COMMENT = '议题表决统计表';;
+
+
+-- ------------------------------------------------------------------------------------------------
+
+
+CREATE TABLE issue_vote_statistical_daily(
+    ID VARCHAR(32) NOT NULL   COMMENT '主键ID' ,
+    ISSUE_ID VARCHAR(32) NOT NULL   COMMENT '议题ID' ,
+    STATISTICAL_DATE DATE NOT NULL   COMMENT '统计日期 yyyy-MM-dd' ,
+    SUPPORT_COUNT INT NOT NULL  DEFAULT 0 COMMENT '到该日的总赞成数' ,
+    OPPOSITION_COUNT INT NOT NULL  DEFAULT 0 COMMENT '到该日的总反对数' ,
+    TOTAL_COUNT INT NOT NULL  DEFAULT 0 COMMENT '到该日的总票数' ,
+    TODAY_INCREMENT INT NOT NULL  DEFAULT 0 COMMENT '该日增量' ,
+    SUPPORT_INCREMENT INT NOT NULL  DEFAULT 0 COMMENT '该日赞成增量' ,
+    OPPOSITION_INCREMENT INT NOT NULL  DEFAULT 0 COMMENT '该日反对增量' ,
+    VOTABLE_COUNT INT NOT NULL   COMMENT '到该日的应表决数' ,
+    DEL_FLAG VARCHAR(1) NOT NULL  DEFAULT 0 COMMENT '删除标识 0未删除、1已删除' ,
+    REVISION INT 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)
+) COMMENT = '议题表决按天统计表';;
+
+
+-- ------------------------------------------------------------------------------------------------
+
+
+CREATE TABLE issue_satisfaction_detail(
+    ID VARCHAR(32) NOT NULL   COMMENT '主键ID' ,
+    ISSUE_ID VARCHAR(32) NOT NULL   COMMENT '议题ID' ,
+    COMMENT VARCHAR(512) NOT NULL   COMMENT '评论 - 最多300字' ,
+    SATISFACTION VARCHAR(32) NOT NULL   COMMENT '满意度 满意度 - 不满意:bad、基本满意:good、非常满意:perfect' ,
+    DEL_FLAG VARCHAR(1) NOT NULL  DEFAULT 0 COMMENT '删除标识 0未删除、1已删除' ,
+    REVISION INT 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)
+) COMMENT = '议题满意度调查记录表';;
+
+
+-- ------------------------------------------------------------------------------------------------
+
+
+
+CREATE TABLE issue_satisfaction_statistical(
+    ID VARCHAR(32) NOT NULL   COMMENT '主键ID' ,
+    ISSUE_ID VARCHAR(32) NOT NULL   COMMENT '议题ID' ,
+    GOOD_COUNT INT NOT NULL  DEFAULT 0 COMMENT '一般满意数' ,
+    PERFECT_COUNT INT NOT NULL  DEFAULT 0 COMMENT '非常满意数' ,
+    BAD_COUNT INT NOT NULL  DEFAULT 0 COMMENT '不满意数' ,
+    DEL_FLAG VARCHAR(1) NOT NULL  DEFAULT 0 COMMENT '删除标识 0未删除、1已删除' ,
+    REVISION INT 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)
+) COMMENT = '议题满意度调查统计表';;
+
+
+
+-- ------------------------------------------------------------------------------------------------
+
+
+CREATE TABLE issue_project_relation(
+    ID VARCHAR(32) NOT NULL   COMMENT '主键ID 主键ID' ,
+    ISSUE_ID VARCHAR(32) NOT NULL   COMMENT '议题ID 议题ID' ,
+    PROJECT_ID VARCHAR(32) NOT NULL   COMMENT '项目ID 项目ID' ,
+    DEL_FLAG VARCHAR(1) NOT NULL  DEFAULT 0 COMMENT '删除标识 0：未删除1：已删除' ,
+    REVISION INT 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)
+) COMMENT = '议题项目关系表';;
+
+
+
+-- ------------------------------------------------------------------------------------------------
+
+
+CREATE TABLE issue_customer_parameter(
+    ID VARCHAR(32) NOT NULL   COMMENT '主键ID' ,
+    CUSTOMER_ID VARCHAR(32) NOT NULL   COMMENT '客户ID' ,
+    PARAMETER_KEY VARCHAR(32) NOT NULL   COMMENT '参数键 eg:voting_time_limit' ,
+    PARAMETER_NAME VARCHAR(32) NOT NULL   COMMENT '参数名 eg:表决期限' ,
+    PARAMETER_VALUE VARCHAR(32) NOT NULL   COMMENT '参数值 eg:10（天）' ,
+    DESCRIPTION VARCHAR(512) NOT NULL   COMMENT '参数说明 eg:这个客户下所有的网格议题表决期限都是10天' ,
+    DEL_FLAG VARCHAR(1) NOT NULL  DEFAULT 0 COMMENT '删除标志 0：未删除，1：已删除' ,
+    REVISION INT 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)
+) COMMENT = '议题客户参数定制表';;
+
+
+

From 27ca4af384ba87d0181925a779117a4815157894 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 11 May 2020 12:03:00 +0800
Subject: [PATCH 03/45] =?UTF-8?q?=E6=94=BF=E5=BA=9C=E7=AB=AF-=E5=9F=BA?=
 =?UTF-8?q?=E5=B1=82=E6=B2=BB=E7=90=86-=E5=B1=85=E6=B0=91=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E3=80=81=E7=BE=A4=E7=BB=84=E7=AE=A1=E7=90=86=E3=80=81?=
 =?UTF-8?q?=E5=85=9A=E5=91=98=E8=AE=A4=E8=AF=81=EF=BC=8C=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E6=9C=BA=E6=9E=84=E6=89=80=E6=9C=89=E6=8E=A5=E5=8F=A3=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=93=8D=E4=BD=9C=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/enums/RequirePermissionEnum.java       | 16 +++++++++++++---
 .../epmet/controller/ResiGroupController.java    |  2 ++
 .../controller/ResiPartyMemberController.java    |  4 ++++
 .../controller/ResiWarmheartedController.java    |  5 +++--
 .../com/epmet/controller/AgencyController.java   |  3 +++
 .../epmet/controller/DepartmentController.java   |  3 +++
 .../com/epmet/controller/GridController.java     |  2 ++
 .../com/epmet/controller/StaffController.java    |  3 +++
 8 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java
index 878d3ef1d4..6450c65d29 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java
@@ -9,15 +9,20 @@ public enum RequirePermissionEnum {
     /**
      * 工作-基层治理-群组管理
      */
-    WORK_GRASSROOTS_GROUP_AUDITINGLIST("work_grassroots_group_auditinglist", "基层治理:群组管理:待审核列表", "基层治理:群组管理:待审核列表"),
-    WORK_GRASSROOTS_GROUP_AUDIT("work_grassroots_group_audit", "基层治理:群组管理:审核建组", "基层治理:群组管理:审核建组"),
-    WORK_GRASSROOTS_GROUP_GROUPSINTHEGRID("work_grassroots_group_groupsinthegrid", "基层治理:群组管理:本网格小组列表", "基层治理:群组管理:本网格小组列表"),
+    WORK_GRASSROOTS_GROUP_AUDITINGLIST("work_grassroots_group_auditinglist", "基层治理:群组管理:待审核列表", "基层治理:群组管理:待审核列表查询"),
+    WORK_GRASSROOTS_GROUP_GROUPSINTHEGRID("work_grassroots_group_groupsinthegrid", "基层治理:群组管理:本网格小组列表", "基层治理:群组管理:本网格小组列表查询"),
+    WORK_GRASSROOTS_GROUP_AUDIT("work_grassroots_group_audit", "基层治理:群组管理:审核建组", "基层治理:群组管理:审核建组（通过或驳回）"),
+    WORK_GRASSROOTS_GROUP_AUDITED("work_grassroots_group_audited", "基层治理:群组管理:审核历史", "基层治理:群组管理:审核历史列表查询"),
+    WORK_GRASSROOTS_GROUP_APPLY_DETAIL("work_grassroots_group_apply_detail", "基层治理:群组管理:建组申请", "基层治理:群组管理:建组申请详情"),
+
     /**
      * 工作-基层治理-居民管理
      */
     WORK_GRASSROOTS_RESI_WARMHEARTED_AUDITINGLIST("work_grassroots_resi_warmhearted_auditinglist", "基层治理:居民管理:热心居民待审核列表", "基层治理:居民管理:热心居民待审核列表"),
     WORK_GRASSROOTS_RESI_WARMHEARTED_AUDITHISTORYLIST("work_grassroots_resi_warmhearted_audithistorylist", "基层治理:居民管理:热心审核历史", "基层治理:居民管理:热心审核历史"),
     WORK_GRASSROOTS_RESI_WARMHEARTED_AUDIT("work_grassroots_resi_warmhearted_audit", "基层治理:居民管理:热心居民审核", "基层治理:居民管理:热心居民审核"),
+    WORK_GRASSROOTS_RESI_WARMHEARTED_APPLY_DETAIL("work_grassroots_resi_warmhearted_apply_detail", "基层治理:居民管理:热心居民申请详情", "基层治理:居民管理:查看热心居民申请详情"),
+
     /**
      * 工作-基层治理-党员认证
      */
@@ -25,6 +30,9 @@ public enum RequirePermissionEnum {
     WORK_PARTYAUTH_AUDITEDLIST("work_partyauth_auditedlist","基层治理:党员认证:已认证列表","基层治理:党员认证:已认证列表"),
     WORK_PARTYAUTH_AUDITHISTORY("work_partyauth_audithistory","基层治理:党员认证:审核历史","基层治理:党员认证:审核历史"),
     WORK_PARTYAUTH_AUDITSUBMIT("work_partyauth_auditsubmit","基层治理:党员认证:审核","基层治理:党员认证:审核"),
+    WORK_PARTYAUTH_AUDITED_DETAIL("work_partyauth_audited_detail", "基层治理:党员认证:已认证详情", "基层治理:党员认证:查看已认证党员详情"),
+    WORK_PARTYAUTH_AUDITING_DETAIL("work_partyauth_auditing_detail","基层治理:党员认证:待审核详情","基层治理:党员认证:查看待审核详情"),
+    WORK_PARTYAUTH_AUDITHISTORY_DETAIL("work_partyauth_audithistory_detail","基层治理:党员认证:审核历史详情","基层治理:党员认证:查看审核历史详情（自动审核失败、拒绝的）"),
 
     /**
      * 组织-机关单位
@@ -34,6 +42,7 @@ public enum RequirePermissionEnum {
     ORG_SUBAGENCY_LIST("org_subagency_list", "组织:下级机关:列表", "组织:下级机关:列表"),
     ORG_SUBAGENCY_CREATE("org_subagency_create", "组织:下级机关:新增", "组织:下级机关:新增"),
     ORG_SUBAGENCY_DELETE("org_subagency_delete", "组织:下级机关:删除", "组织:下级机关:删除"),
+
     /**
      * 组织-工作人员
      */
@@ -42,6 +51,7 @@ public enum RequirePermissionEnum {
     ORG_STAFF_CREATE("org_staff_create", "组织:工作人员:新增", "组织:工作人员:新增"),
     ORG_STAFF_UPDATE("org_staff_update", "组织:工作人员:编辑", "组织:工作人员:编辑"),
     ORG_STAFF_FORBIDDEN("org_staff_forbidden", "组织:工作人员:禁用", "组织:工作人员:禁用"),
+
     /**
      * 组织-部门
      */
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiGroupController.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiGroupController.java
index c520c9bd86..207ce24099 100644
--- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiGroupController.java
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiGroupController.java
@@ -38,6 +38,7 @@ public class ResiGroupController {
 	 * @return
 	 */
 	@PostMapping("audited")
+	@RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_GROUP_AUDITED)
 	public Result<List<GroupAuditedResultDTO>> audited(@RequestBody GroupAuditedFromDTO formDTO) {
 		return resiGroupService.audited(formDTO);
 	}
@@ -90,6 +91,7 @@ public class ResiGroupController {
 	 * @Date 2020.04.20 14:08
 	 **/
 	@PostMapping("applygroupdetail")
+	@RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_GROUP_APPLY_DETAIL)
 	public Result<ApplyingGroupDetailResult2DTO> applyGroupDetail(@LoginUser TokenDto tokenDto, @RequestBody CommonGroupIdFromDTO groupIdFromDTO){
 		groupIdFromDTO.setUserId(tokenDto.getUserId());
 		ValidatorUtils.validateEntity(groupIdFromDTO);
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java
index 1ac93d3c4f..48d96dff8f 100644
--- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java
@@ -89,6 +89,7 @@ public class ResiPartyMemberController {
      * @CreatedTime 2020/4/27 13:54
      */
     @PostMapping(value = "/certifieddetail")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTYAUTH_AUDITED_DETAIL)
     public Result<CertifiedDetailResultDTO> certifiedDetail(@RequestBody CertifiedDetailFormDTO formDTO){
         return new Result<CertifiedDetailResultDTO>().ok(resiPartyMemberService.certifiedDetail(formDTO));
     }
@@ -115,6 +116,7 @@ public class ResiPartyMemberController {
      * @author zhaoqifeng
      */
     @PostMapping("auditingdetail")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTYAUTH_AUDITING_DETAIL)
     public Result<AuditingDetailResultDTO> auditingDetail(@RequestBody AuditingDetailFromDTO fromDTO) {
         return resiPartyMemberService.auditingDetail(fromDTO);
     }
@@ -127,6 +129,7 @@ public class ResiPartyMemberController {
      * @author zhaoqifeng
      */
     @PostMapping("autofaileddetail")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTYAUTH_AUDITHISTORY_DETAIL)
     public Result<AutoFailedDetailResultDTO> autoFailedDetail(@RequestBody AutoFailedDetailFromDTO fromDTO) {
         return resiPartyMemberService.autoFailedDetail(fromDTO);
     }
@@ -139,6 +142,7 @@ public class ResiPartyMemberController {
      * @author zhaoqifeng
      */
     @PostMapping("rejecteddetail")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTYAUTH_AUDITHISTORY_DETAIL)
     public Result<RejectedDetailResultDTO> rejectedDetail(@RequestBody RejectedDetailFromDTO fromDTO) {
         return resiPartyMemberService.rejectedDetail(fromDTO);
     }
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiWarmheartedController.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiWarmheartedController.java
index d2c5ae81ef..79bd26adcc 100644
--- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiWarmheartedController.java
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiWarmheartedController.java
@@ -37,9 +37,9 @@ public class ResiWarmheartedController {
 	 * @param formDTO 参数
 	 * @return
 	 */
-    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_RESI_WARMHEARTED_AUDITHISTORYLIST)
 	@PostMapping("audited")
-	public Result<List<ResiWarmheartedAuditedResultDTO>> audited(@RequestBody ResiWarmheartedAuditedFromDTO formDTO) {
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_RESI_WARMHEARTED_AUDITHISTORYLIST)
+    public Result<List<ResiWarmheartedAuditedResultDTO>> audited(@RequestBody ResiWarmheartedAuditedFromDTO formDTO) {
 		return resiWarmheartedService.audited(formDTO);
 	}
 
@@ -85,6 +85,7 @@ public class ResiWarmheartedController {
      * @Description 政府端-热心居民申请详情信息
      **/
     @PostMapping("getdetail")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_RESI_WARMHEARTED_APPLY_DETAIL)
     public Result<ResiWarmAuditResultDTO> getDetail(@LoginUser TokenDto tokenDTO, @RequestBody ResiWarmGetDetailFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
         return resiWarmheartedService.getDetail(formDTO);
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 538f30cff2..59cde8f71c 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
@@ -113,6 +113,7 @@ public class AgencyController {
      * @Description 组织首页-获取组织机构信息
      */
     @PostMapping("agencydetail")
+    @RequirePermission(requirePermission = RequirePermissionEnum.ORG_AGENCY_TRACE)
     public Result<AgencysResultDTO> agencyDetail(@LoginUser TokenDto tokenDTO, @RequestBody AgencydetailFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
         return agencyService.agencyDetail(formDTO);
@@ -125,6 +126,7 @@ public class AgencyController {
      * @Description 组织首页-下级机关列表
      */
     @PostMapping("subagencylist")
+    @RequirePermission(requirePermission = RequirePermissionEnum.ORG_SUBAGENCY_LIST)
     public Result<SubAgencyResultDTO> subAgencyList(@LoginUser TokenDto tokenDTO, @RequestBody SubAgencyFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
         return agencyService.subAgencyList(formDTO);
@@ -137,6 +139,7 @@ public class AgencyController {
      * @Description 获取组织列表
      */
     @PostMapping("agencylist")
+    @RequirePermission(requirePermission = RequirePermissionEnum.ORG_SUBAGENCY_LIST)
     public Result<List<AgencyListResultDTO>> agencyList(@LoginUser TokenDto tokenDTO, @RequestBody AgencyListFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
         return agencyService.agencyList(formDTO);
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java
index 7705d1247c..26273ddd6c 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java
@@ -88,6 +88,7 @@ public class DepartmentController {
      * @Description 获取部门详情
      */
     @PostMapping("departmentdetail")
+    @RequirePermission(requirePermission = RequirePermissionEnum.ORG_DEPARTMENT_STAFF_LIST)
     public Result<DepartmentDetailResultDTO> departmentDetail(@LoginUser TokenDto tokenDTO, @RequestBody DepartmentdetailFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
         return departmentService.departmentDetail(formDTO);
@@ -100,6 +101,7 @@ public class DepartmentController {
      * @Description 组织首页-获取机关下部门列表
      */
     @PostMapping("departmentinagencylist")
+    @RequirePermission(requirePermission = RequirePermissionEnum.ORG_DEPARTMENT_LIST)
     public Result<DepartmentInAgencyResultDTO> departmentInAgencyList(@LoginUser TokenDto tokenDTO, @RequestBody DepartmentInAgencyFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
         return departmentService.departmentInAgencyList(formDTO);
@@ -112,6 +114,7 @@ public class DepartmentController {
      * @Description 获取机构下部门列表
      */
     @PostMapping("departmentlist")
+    @RequirePermission(requirePermission = RequirePermissionEnum.ORG_DEPARTMENT_LIST)
     public Result<List<DepartmentListResultDTO>> departmentList(@LoginUser TokenDto tokenDTO, @RequestBody DepartmentListFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
         return departmentService.departmentList(formDTO);
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java
index 766df22011..0a75e90b63 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java
@@ -76,6 +76,7 @@ public class GridController {
      * @Date 2020.04.23 14:45
      **/
     @PostMapping("gridlist")
+    @RequirePermission(requirePermission = RequirePermissionEnum.ORG_GRID_LIST)
     public Result<GridListInfoResultDTO> gridList(@LoginUser TokenDto tokenDto,@RequestBody CommonAgencyIdFormDTO agencyFormDTO){
         agencyFormDTO.setUserId(tokenDto.getUserId());
         ValidatorUtils.validateEntity(agencyFormDTO);
@@ -90,6 +91,7 @@ public class GridController {
      * @Date 2020.04.23 14:45
      **/
     @PostMapping("allgrids")
+    @RequirePermission(requirePermission = RequirePermissionEnum.ORG_GRID_LIST)
     public Result<List<GridBaseInfoResultDTO>> allGrids(@LoginUser TokenDto tokenDto, @RequestBody CommonAgencyIdFormDTO agencyFormDTO){
         agencyFormDTO.setUserId(tokenDto.getUserId());
         ValidatorUtils.validateEntity(agencyFormDTO);
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java
index 1c46d607ac..72d682688d 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java
@@ -38,6 +38,7 @@ public class StaffController {
 	 * @return
 	 */
 	@PostMapping("staffsinagency")
+	@RequirePermission(requirePermission = RequirePermissionEnum.ORG_STAFF_LIST)
 	public Result<StaffsInAgencyResultDTO> getStaffInfoForHome(@RequestBody StaffsInAgencyFromDTO fromDTO) {
 		return staffService.getStaffInfoForHome(fromDTO);
 	}
@@ -73,6 +74,7 @@ public class StaffController {
 	 * @return Result<StaffInitResultDTO>
 	 */
 	@PostMapping("editstaffinit")
+	@RequirePermission(requirePermission = RequirePermissionEnum.ORG_STAFF_DETAIL)
 	public Result<StaffInitResultDTO> editStaffInit(@RequestBody StaffInfoFromDTO fromDTO){
 		return staffService.editStaffInit(fromDTO);
 	}
@@ -110,6 +112,7 @@ public class StaffController {
 	 * @return Result<StaffDetailResultDTO>
 	 */
 	@PostMapping("staffdetail")
+	@RequirePermission(requirePermission = RequirePermissionEnum.ORG_STAFF_DETAIL)
 	public Result<StaffDetailResultDTO> getStaffDetail(@RequestBody StaffInfoFromDTO fromDTO){
 		return staffService.getStaffDetail(fromDTO);
 	}

From dc78d269e0888c8ac7b67b47306f0d28494ca9ef Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 11 May 2020 12:47:24 +0800
Subject: [PATCH 04/45] =?UTF-8?q?=E6=94=BF=E5=BA=9C=E7=AB=AF-=E8=AE=AE?=
 =?UTF-8?q?=E9=A2=98=E7=AE=A1=E7=90=86=E3=80=81=E9=A1=B9=E7=9B=AE=E8=B7=9F?=
 =?UTF-8?q?=E8=B8=AA=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/enums/RequirePermissionEnum.java    | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java
index 6450c65d29..1e7e8d4016 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java
@@ -71,7 +71,29 @@ public enum RequirePermissionEnum {
     ORG_GRID_DELETE("org_grid_delete", "组织:治理网格:删除", "组织:治理网格:删除"),
     ORG_GRID_STAFF_ADD("org_grid_staff_add", "组织:治理网格:新增网格工作人员", "组织:治理网格:新增网格工作人员"),
     ORG_GRID_STAFF_REMOVE("org_grid_staff_remove", "组织:治理网格:移除网格工作人员", "组织:治理网格:移除网格工作人员"),
-    ORG_PARTYMEMBER_SUMMARY("org_partymember_summary", "组织:党员:汇总信息", "组织:党员:汇总信息");
+    ORG_PARTYMEMBER_SUMMARY("org_partymember_summary", "组织:党员:汇总信息", "组织:党员:汇总信息"),
+
+    /**
+     * 基层治理-议题管理
+     */
+    WORK_GRASSROOTS_ISSUE_VOTINGLIST("work_grassroots_issue_voting_list","表决中列","表决中议题列表查询"),
+    WORK_GRASSROOTS_ISSUE_SHIFTED_PROJECT_LIST("work_grassroots_issue_shifted_project_list", "已转项目列表查询","已转项目议题列表查询"),
+    WORK_GRASSROOTS_ISSUE_CLOSED_LIST("work_grassroots_issue_closed_list","已关闭","已关闭议题列表查询"),
+    WORK_GRASSROOTS_ISSUE_DETAIL("work_grassroots_issue_detail", "议题详情","议题详情界面所有的api添加此校验"),
+    WORK_GRASSROOTS_ISSUE_SHIFT_PROJECT("work_grassroots_issue_shift_project", "转项目","转项目（选择处理部门api也需要添加此校验）"),
+    WORK_GRASSROOTS_ISSUE_CLOSE("work_grassroots_issue_close","关闭议题","关闭议题"),
+
+    /**
+     * 工作-项目跟踪
+     */
+    WORK_PROJECT_TRACE_PENDING_LIST("work_project_trace_pending_list","待处理","待处理的项目，列表查询"),
+    WORK_PROJECT_TRACE_CREATED_LIST("work_project_trace_created_list","我发起","我发起的项目，列表查询"),
+    WORK_PROJECT_TRACE_INVOLVED_LIST("work_project_trace_involved_list","我参与","我参与的项目，列表查询"),
+    WORK_PROJECT_TRACE_DETAIL("work_project_trace_detail","项目详情","项目详情界面所有的api添加此校验"),
+    WORK_PROJECT_TRACE_CLOSE("work_project_trace_close","结案","结案"),
+    WORK_PROJECT_TRACE_TRANSFER("work_project_trace_transfer","转其他部门","转其他部门（选择处理部门api也需要添加此校验）"),
+    WORK_PROJECT_TRACE_RETURN("work_project_trace_return","退回","退回");
+
 
     private String key;
     private String name;

From 3c97e2a153d5b3d4317232c5bba3f5597aec48ea Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 11 May 2020 13:19:20 +0800
Subject: [PATCH 05/45] =?UTF-8?q?gov-issue,gov-project=E6=B7=BB=E5=8A=A0sq?=
 =?UTF-8?q?l?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/db.migration/db.sql    | 190 ----------------
 .../db.migration/epmet_gov_issue.sql          | 209 ++++++++++++++++++
 .../db.migration/epmet_gov_project.sql        | 142 ++++++++++++
 3 files changed, 351 insertions(+), 190 deletions(-)
 delete mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/resources/db.migration/db.sql
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/resources/db.migration/epmet_gov_issue.sql
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/resources/db.migration/epmet_gov_project.sql

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/db.migration/db.sql b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db.migration/db.sql
deleted file mode 100644
index a167486154..0000000000
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/db.migration/db.sql
+++ /dev/null
@@ -1,190 +0,0 @@
--- @Date        2020-05-12 11:16
--- @Author      wangc
--- @Description 数据库epmet_gov_issue中的表，db语句：
-
-CREATE TABLE issue(
-    ID VARCHAR(32) NOT NULL   COMMENT '议题ID' ,
-    ISSUE_STATUS VARCHAR(32) NOT NULL   COMMENT '议题状态 表决中：voting 已转项目：shift_project 已关闭：closed' ,
-    SOURCE_TYPE VARCHAR(32) NOT NULL   COMMENT '来源类型 eg:resi_topic' ,
-    SOURCE_ID VARCHAR(32) NOT NULL   COMMENT '来源ID eg:2223232(当SOURCE_TYPE为"resi_topic"时，这里指话题的ID)' ,
-    CLOSE_REASON VARCHAR(32)    COMMENT '关闭理由 【未关闭时可以为空】关闭议题时必填的理由，转项目后而且已经结案，这个字段不回写' ,
-    RESOLVE_TYPE VARCHAR(32)    COMMENT '解决类型 【未关闭时可以为空】已解决resloved、未解决unresloved，对应在关闭议题时所选的checkbox，转项目后而且已经结案，这个字段不回写' ,
-    ISSUE_TITLE VARCHAR(128) NOT NULL   COMMENT '议题名称 最多20字' ,
-    SUGGESTION VARCHAR(1024) NOT NULL   COMMENT '建议 最多1000字' ,
-    CUSTOMER_ID VARCHAR(32) NOT NULL   COMMENT '客户ID' ,
-    GRID_ID VARCHAR(32) NOT NULL   COMMENT '网格ID 居民端议题对应一个网格Id' ,
-    ORG_ID_PATH VARCHAR(1024)    COMMENT '所属机关 【数据权限-非必填】11:22:33(agencyId)数据权限控制' ,
-    ORG_ID VARCHAR(32)    COMMENT '组织ID 【数据权限-非必填】agencyId' ,
-    VOTING_DEADLINE DATE    COMMENT '表决截止日期' ,
-    DECIDED_TIME DATE NOT NULL   COMMENT '表决发起日期（转议题日期）' ,
-    SHIFTED_TIME DATE    COMMENT '转项目日期 （服务间调用日期一致性）' ,
-    CLOSED_TIME DATE    COMMENT '关闭日期' ,
-    DEL_FLAG VARCHAR(1) NOT NULL  DEFAULT 0 COMMENT '删除标识 0未删除、1已删除' ,
-    REVISION INT 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)
-) COMMENT = '议题详情表';;
-
-
-
--- ------------------------------------------------------------------------------------------------
-
-
-CREATE TABLE issue_process(
-    ID VARCHAR(32) NOT NULL   COMMENT '主键ID' ,
-    ISSUE_ID VARCHAR(32) NOT NULL   COMMENT '议题ID' ,
-    ISSUE_STATUS VARCHAR(32) NOT NULL   COMMENT '操作状态 - 表决中：voting 已转项目：shift_project 已关闭：closed' ,
-    ORG_TYPE VARCHAR(32) NOT NULL   COMMENT '组织类型 操作人所属机构类型（机构：agency | 部门：dept | 网格：grid）操作人可能来源于居民端和政府段，但是只有在“转议题”的时候才是居民端拥有组长权限的人操作，所以当这条记录是转议题时，该记录为grid，ORD_ID相应的也为GRID_ID' ,
-    ORG_ID VARCHAR(32) NOT NULL   COMMENT '组织ID 操作人所属机构ID（对应的有网格ID、部门ID、机构ID）' ,
-    OPERATION_EXPLAIN VARCHAR(512) NOT NULL   COMMENT '操作说明 (节点的说明文案，包含三个节点的文案说明【转议题】、【已关闭】、【转项目】)' ,
-    DEL_FLAG VARCHAR(1) NOT NULL  DEFAULT 0 COMMENT '删除标识 0未删除、1已删除' ,
-    REVISION INT 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)
-) COMMENT = '议题进展记录表';;
-
-
--- ------------------------------------------------------------------------------------------------
-
-
-CREATE TABLE issue_vote_detail(
-    ID VARCHAR(32) NOT NULL   COMMENT '主键ID' ,
-    ISSUE_ID VARCHAR(32) NOT NULL   COMMENT '议题ID' ,
-    ATTITUDE VARCHAR(32) NOT NULL   COMMENT '态度 - opposition（反对）support（赞成）' ,
-    DEL_FLAG VARCHAR(1) NOT NULL  DEFAULT 0 COMMENT '删除标识 0未删除、1已删除' ,
-    REVISION INT 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)
-) COMMENT = '议题表决记录表';;
-
-
--- ------------------------------------------------------------------------------------------------
-
-
-CREATE TABLE issue_vote_statistical(
-    ID VARCHAR(32) NOT NULL   COMMENT '主键ID' ,
-    ISSUE_ID VARCHAR(32) NOT NULL   COMMENT '议题ID' ,
-    SUPPORT_COUNT INT NOT NULL  DEFAULT 0 COMMENT '支持数' ,
-    OPPOSITION_COUNT INT NOT NULL  DEFAULT 0 COMMENT '反对数' ,
-    VOTABLE_COUNT INT    COMMENT '应表决数' ,
-    REVISION INT NOT NULL  DEFAULT 0 COMMENT '乐观锁' ,
-    DEL_FLAG VARCHAR(1) NOT NULL  DEFAULT 0 COMMENT '删除标识 0未删除、1已删除' ,
-    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)
-) COMMENT = '议题表决统计表';;
-
-
--- ------------------------------------------------------------------------------------------------
-
-
-CREATE TABLE issue_vote_statistical_daily(
-    ID VARCHAR(32) NOT NULL   COMMENT '主键ID' ,
-    ISSUE_ID VARCHAR(32) NOT NULL   COMMENT '议题ID' ,
-    STATISTICAL_DATE DATE NOT NULL   COMMENT '统计日期 yyyy-MM-dd' ,
-    SUPPORT_COUNT INT NOT NULL  DEFAULT 0 COMMENT '到该日的总赞成数' ,
-    OPPOSITION_COUNT INT NOT NULL  DEFAULT 0 COMMENT '到该日的总反对数' ,
-    TOTAL_COUNT INT NOT NULL  DEFAULT 0 COMMENT '到该日的总票数' ,
-    TODAY_INCREMENT INT NOT NULL  DEFAULT 0 COMMENT '该日增量' ,
-    SUPPORT_INCREMENT INT NOT NULL  DEFAULT 0 COMMENT '该日赞成增量' ,
-    OPPOSITION_INCREMENT INT NOT NULL  DEFAULT 0 COMMENT '该日反对增量' ,
-    VOTABLE_COUNT INT NOT NULL   COMMENT '到该日的应表决数' ,
-    DEL_FLAG VARCHAR(1) NOT NULL  DEFAULT 0 COMMENT '删除标识 0未删除、1已删除' ,
-    REVISION INT 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)
-) COMMENT = '议题表决按天统计表';;
-
-
--- ------------------------------------------------------------------------------------------------
-
-
-CREATE TABLE issue_satisfaction_detail(
-    ID VARCHAR(32) NOT NULL   COMMENT '主键ID' ,
-    ISSUE_ID VARCHAR(32) NOT NULL   COMMENT '议题ID' ,
-    COMMENT VARCHAR(512) NOT NULL   COMMENT '评论 - 最多300字' ,
-    SATISFACTION VARCHAR(32) NOT NULL   COMMENT '满意度 满意度 - 不满意:bad、基本满意:good、非常满意:perfect' ,
-    DEL_FLAG VARCHAR(1) NOT NULL  DEFAULT 0 COMMENT '删除标识 0未删除、1已删除' ,
-    REVISION INT 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)
-) COMMENT = '议题满意度调查记录表';;
-
-
--- ------------------------------------------------------------------------------------------------
-
-
-
-CREATE TABLE issue_satisfaction_statistical(
-    ID VARCHAR(32) NOT NULL   COMMENT '主键ID' ,
-    ISSUE_ID VARCHAR(32) NOT NULL   COMMENT '议题ID' ,
-    GOOD_COUNT INT NOT NULL  DEFAULT 0 COMMENT '一般满意数' ,
-    PERFECT_COUNT INT NOT NULL  DEFAULT 0 COMMENT '非常满意数' ,
-    BAD_COUNT INT NOT NULL  DEFAULT 0 COMMENT '不满意数' ,
-    DEL_FLAG VARCHAR(1) NOT NULL  DEFAULT 0 COMMENT '删除标识 0未删除、1已删除' ,
-    REVISION INT 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)
-) COMMENT = '议题满意度调查统计表';;
-
-
-
--- ------------------------------------------------------------------------------------------------
-
-
-CREATE TABLE issue_project_relation(
-    ID VARCHAR(32) NOT NULL   COMMENT '主键ID 主键ID' ,
-    ISSUE_ID VARCHAR(32) NOT NULL   COMMENT '议题ID 议题ID' ,
-    PROJECT_ID VARCHAR(32) NOT NULL   COMMENT '项目ID 项目ID' ,
-    DEL_FLAG VARCHAR(1) NOT NULL  DEFAULT 0 COMMENT '删除标识 0：未删除1：已删除' ,
-    REVISION INT 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)
-) COMMENT = '议题项目关系表';;
-
-
-
--- ------------------------------------------------------------------------------------------------
-
-
-CREATE TABLE issue_customer_parameter(
-    ID VARCHAR(32) NOT NULL   COMMENT '主键ID' ,
-    CUSTOMER_ID VARCHAR(32) NOT NULL   COMMENT '客户ID' ,
-    PARAMETER_KEY VARCHAR(32) NOT NULL   COMMENT '参数键 eg:voting_time_limit' ,
-    PARAMETER_NAME VARCHAR(32) NOT NULL   COMMENT '参数名 eg:表决期限' ,
-    PARAMETER_VALUE VARCHAR(32) NOT NULL   COMMENT '参数值 eg:10（天）' ,
-    DESCRIPTION VARCHAR(512) NOT NULL   COMMENT '参数说明 eg:这个客户下所有的网格议题表决期限都是10天' ,
-    DEL_FLAG VARCHAR(1) NOT NULL  DEFAULT 0 COMMENT '删除标志 0：未删除，1：已删除' ,
-    REVISION INT 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)
-) COMMENT = '议题客户参数定制表';;
-
-
-
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/db.migration/epmet_gov_issue.sql b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db.migration/epmet_gov_issue.sql
new file mode 100644
index 0000000000..c9eb447029
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db.migration/epmet_gov_issue.sql
@@ -0,0 +1,209 @@
+-- @Date        2020-05-12 11:16
+-- @Author      wangc
+-- @Description 数据库epmet_gov_issue中的表，db语句：
+CREATE DATABASE `epmet_gov_issue` CHARACTER SET 'utf8mb4' COLLATE 'utf8mb4_general_ci';
+
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : 党群e事通开发库！！！！！
+ Source Server Type    : MySQL
+ Source Server Version : 50728
+ Source Host           : 192.168.1.130:3306
+ Source Schema         : epmet_gov_issue
+
+ Target Server Type    : MySQL
+ Target Server Version : 50728
+ File Encoding         : 65001
+
+ Date: 11/05/2020 13:15:11
+*/
+
+
+-- ----------------------------
+-- Table structure for issue
+-- ----------------------------
+DROP TABLE IF EXISTS `issue`;
+CREATE TABLE `issue`  (
+  `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '议题ID',
+  `ISSUE_STATUS` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '议题状态 表决中：voting 已转项目：shift_project 已关闭：closed',
+  `SOURCE_TYPE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '来源类型 eg:resi_topic',
+  `SOURCE_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '来源ID eg:2223232(当SOURCE_TYPE为\"resi_topic\"时，这里指话题的ID)',
+  `CLOSE_REASON` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '关闭理由 【未关闭时可以为空】关闭议题时必填的理由，转项目后而且已经结案，这个字段不回写',
+  `RESOLVE_TYPE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '解决类型 【未关闭时可以为空】已解决resloved、未解决unresloved，对应在关闭议题时所选的checkbox，转项目后而且已经结案，这个字段不回写',
+  `ISSUE_TITLE` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '议题名称 最多20字',
+  `SUGGESTION` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '建议 最多1000字',
+  `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客户ID',
+  `GRID_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网格ID 居民端议题对应一个网格Id',
+  `ORG_ID_PATH` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '所属机关 【数据权限-非必填】11:22:33(agencyId)数据权限控制',
+  `ORG_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '组织ID 【数据权限-非必填】agencyId',
+  `VOTING_DEADLINE` date DEFAULT NULL COMMENT '表决截止日期',
+  `DECIDED_TIME` date NOT NULL COMMENT '表决发起日期（转议题日期）',
+  `SHIFTED_TIME` date DEFAULT NULL COMMENT '转项目日期 （服务间调用日期一致性）',
+  `CLOSED_TIME` date DEFAULT 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;
+
+-- ----------------------------
+-- Table structure for issue_customer_parameter
+-- ----------------------------
+DROP TABLE IF EXISTS `issue_customer_parameter`;
+CREATE TABLE `issue_customer_parameter`  (
+  `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键ID',
+  `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客户ID',
+  `PARAMETER_KEY` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '参数键 eg:voting_time_limit',
+  `PARAMETER_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '参数名 eg:表决期限',
+  `PARAMETER_VALUE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '参数值 eg:10（天）',
+  `DESCRIPTION` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '参数说明 eg:这个客户下所有的网格议题表决期限都是10天',
+  `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 issue_process
+-- ----------------------------
+DROP TABLE IF EXISTS `issue_process`;
+CREATE TABLE `issue_process`  (
+  `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键ID',
+  `ISSUE_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '议题ID',
+  `ISSUE_STATUS` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '操作状态 - 表决中：voting 已转项目：shift_project 已关闭：closed',
+  `ORG_TYPE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '组织类型 操作人所属机构类型（机构：agency | 部门：dept | 网格：grid）操作人可能来源于居民端和政府段，但是只有在“转议题”的时候才是居民端拥有组长权限的人操作，所以当这条记录是转议题时，该记录为grid，ORD_ID相应的也为GRID_ID',
+  `ORG_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '组织ID 操作人所属机构ID（对应的有网格ID、部门ID、机构ID）',
+  `OPERATION_EXPLAIN` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci 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;
+
+-- ----------------------------
+-- Table structure for issue_project_relation
+-- ----------------------------
+DROP TABLE IF EXISTS `issue_project_relation`;
+CREATE TABLE `issue_project_relation`  (
+  `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键ID 主键ID',
+  `ISSUE_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '议题ID 议题ID',
+  `PROJECT_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '项目ID 项目ID',
+  `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 issue_satisfaction_detail
+-- ----------------------------
+DROP TABLE IF EXISTS `issue_satisfaction_detail`;
+CREATE TABLE `issue_satisfaction_detail`  (
+  `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键ID',
+  `ISSUE_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '议题ID',
+  `COMMENT` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '评论 - 最多300字',
+  `SATISFACTION` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '满意度 满意度 - 不满意:bad、基本满意:good、非常满意:perfect',
+  `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 issue_satisfaction_statistical
+-- ----------------------------
+DROP TABLE IF EXISTS `issue_satisfaction_statistical`;
+CREATE TABLE `issue_satisfaction_statistical`  (
+  `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键ID',
+  `ISSUE_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '议题ID',
+  `GOOD_COUNT` int(11) NOT NULL DEFAULT 0 COMMENT '一般满意数',
+  `PERFECT_COUNT` int(11) NOT NULL DEFAULT 0 COMMENT '非常满意数',
+  `BAD_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 issue_vote_detail
+-- ----------------------------
+DROP TABLE IF EXISTS `issue_vote_detail`;
+CREATE TABLE `issue_vote_detail`  (
+  `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键ID',
+  `ISSUE_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '议题ID',
+  `ATTITUDE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '态度 - opposition（反对）support（赞成）',
+  `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 issue_vote_statistical
+-- ----------------------------
+DROP TABLE IF EXISTS `issue_vote_statistical`;
+CREATE TABLE `issue_vote_statistical`  (
+  `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键ID',
+  `ISSUE_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '议题ID',
+  `SUPPORT_COUNT` int(11) NOT NULL DEFAULT 0 COMMENT '支持数',
+  `OPPOSITION_COUNT` int(11) NOT NULL DEFAULT 0 COMMENT '反对数',
+  `VOTABLE_COUNT` int(11) DEFAULT NULL COMMENT '应表决数',
+  `REVISION` 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已删除',
+  `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 issue_vote_statistical_daily
+-- ----------------------------
+DROP TABLE IF EXISTS `issue_vote_statistical_daily`;
+CREATE TABLE `issue_vote_statistical_daily`  (
+  `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键ID',
+  `ISSUE_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '议题ID',
+  `STATISTICAL_DATE` date NOT NULL COMMENT '统计日期 yyyy-MM-dd',
+  `SUPPORT_COUNT` int(11) NOT NULL DEFAULT 0 COMMENT '到该日的总赞成数',
+  `OPPOSITION_COUNT` int(11) NOT NULL DEFAULT 0 COMMENT '到该日的总反对数',
+  `TOTAL_COUNT` int(11) NOT NULL DEFAULT 0 COMMENT '到该日的总票数',
+  `TODAY_INCREMENT` int(11) NOT NULL DEFAULT 0 COMMENT '该日增量',
+  `SUPPORT_INCREMENT` int(11) NOT NULL DEFAULT 0 COMMENT '该日赞成增量',
+  `OPPOSITION_INCREMENT` int(11) NOT NULL DEFAULT 0 COMMENT '该日反对增量',
+  `VOTABLE_COUNT` 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;
+
+
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db.migration/epmet_gov_project.sql b/epmet-module/gov-project/gov-project-server/src/main/resources/db.migration/epmet_gov_project.sql
new file mode 100644
index 0000000000..e4f2d0ac8d
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/db.migration/epmet_gov_project.sql
@@ -0,0 +1,142 @@
+CREATE DATABASE `epmet_gov_project` CHARACTER SET 'utf8mb4' COLLATE 'utf8mb4_general_ci';
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : 党群e事通开发库！！！！！
+ Source Server Type    : MySQL
+ Source Server Version : 50728
+ Source Host           : 192.168.1.130:3306
+ Source Schema         : epmet_gov_project
+
+ Target Server Type    : MySQL
+ Target Server Version : 50728
+ File Encoding         : 65001
+
+ Date: 11/05/2020 13:17:27
+*/
+
+-- ----------------------------
+-- Table structure for customer_project_parameter
+-- ----------------------------
+DROP TABLE IF EXISTS `customer_project_parameter`;
+CREATE TABLE `customer_project_parameter`  (
+  `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键 唯一标识',
+  `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '客户ID',
+  `PARAMETER_KEY` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '参数KEY值',
+  `PARAMETER_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '参数名称',
+  `PARAMETER_VALUE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '参数VALUE值',
+  `DESCRIPTION` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '说明',
+  `DEL_FLAG` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '删除标识：0.未删除 1.已删除',
+  `REVISION` int(11) NOT NULL 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 project
+-- ----------------------------
+DROP TABLE IF EXISTS `project`;
+CREATE TABLE `project`  (
+  `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '唯一标识',
+  `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT ' 机关ID',
+  `ORIGIN` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '来源：议题issue',
+  `ORIGIN_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '来源ID',
+  `TITLE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '项目标题',
+  `STATUS` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '状态:待处理 pending，结案closed',
+  `CLOSED_STATUS` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '结案状态：已解决 resolved，未解决 unresolved',
+  `ORG_ID_PATH` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '所属机关 11:22:33(本机关以及上级所有机关ID)',
+  `DEL_FLAG` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '删除标识:0.未删除 1.已删除',
+  `REVISION` int(11) NOT NULL 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 project_process
+-- ----------------------------
+DROP TABLE IF EXISTS `project_process`;
+CREATE TABLE `project_process`  (
+  `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '唯一标识',
+  `PROJECT_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '项目ID',
+  `STAFF_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '负负责人ID',
+  `OPERATION` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '处理：结案close，退回return，部门流转transfer，创建项目created',
+  `PUBLIC_REPLY` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '公开答复',
+  `INTERNAL_REMARK` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '内部备注',
+  `END_TIME` datetime(0) DEFAULT NULL COMMENT '结束时间',
+  `COST_WORKDAYS` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '耗费天数',
+  `DEL_FLAG` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '删除标识：0.未删除 1.已删除',
+  `REVISION` int(11) NOT NULL 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 project_satisfaction_detail
+-- ----------------------------
+DROP TABLE IF EXISTS `project_satisfaction_detail`;
+CREATE TABLE `project_satisfaction_detail`  (
+  `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键ID',
+  `PROJECT_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '项目ID',
+  `COMMENT` varchar(600) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '评论 - 最多300字',
+  `SATISFACTION` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '满意度 - 不满意:bad、基本满意:good、非常满意:perfect',
+  `DEL_FLAG` varchar(32) 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 project_satisfaction_statistics
+-- ----------------------------
+DROP TABLE IF EXISTS `project_satisfaction_statistics`;
+CREATE TABLE `project_satisfaction_statistics`  (
+  `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键ID',
+  `PROJECT_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '项目ID',
+  `GOOD_COUNT` int(11) NOT NULL DEFAULT 0 COMMENT '一般满意数',
+  `PERFECT_COUNT` int(11) NOT NULL DEFAULT 0 COMMENT '非常满意数',
+  `BAD_COUNT` int(11) NOT NULL DEFAULT 0 COMMENT '不满意数',
+  `DEL_FLAG` varchar(32) 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 project_staff
+-- ----------------------------
+DROP TABLE IF EXISTS `project_staff`;
+CREATE TABLE `project_staff`  (
+  `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '唯一标识',
+  `PROJECT_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '项目ID',
+  `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客户ID',
+  `ORG_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '机关ID',
+  `DEPARTMENT_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '部门ID',
+  `GRID_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '网格ID',
+  `ORG_ID_PATH` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '所属机关（11:22:33）',
+  `STAFF_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '人员ID',
+  `IS_HANDLE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '是否处理：未处理unhandle，已处理handle',
+  `DEL_FLAG` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '删除标识：0.未删除 1.已删除',
+  `REVISION` int(11) NOT NULL 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 15fb826963f49c7a98e66e57a931116adeeed63c Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 11 May 2020 13:19:54 +0800
Subject: [PATCH 06/45] =?UTF-8?q?gov-issue,gov-project=E6=B7=BB=E5=8A=A0sq?=
 =?UTF-8?q?l?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gov-issue-server/src/main/resources/db.migration/.gitkeep     | 0
 .../gov-project-server/src/main/resources/db.migration/.gitkeep   | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/resources/db.migration/.gitkeep
 delete mode 100644 epmet-module/gov-project/gov-project-server/src/main/resources/db.migration/.gitkeep

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/db.migration/.gitkeep b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db.migration/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db.migration/.gitkeep b/epmet-module/gov-project/gov-project-server/src/main/resources/db.migration/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000

From 2ef7525546c1333ff2f1f73382627ba08f4cd7cf Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Mon, 11 May 2020 13:40:07 +0800
Subject: [PATCH 07/45] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/CustomerProjectParameterDTO.java      |  96 +++++++++++++++
 .../main/java/com/epmet/dto/ProjectDTO.java   | 106 +++++++++++++++++
 .../java/com/epmet/dto/ProjectProcessDTO.java | 106 +++++++++++++++++
 .../dto/ProjectSatisfactionDetailDTO.java     |  86 ++++++++++++++
 .../dto/ProjectSatisfactionStatisticsDTO.java |  91 ++++++++++++++
 .../java/com/epmet/dto/ProjectStaffDTO.java   | 111 ++++++++++++++++++
 .../CustomerProjectParameterController.java   |  94 +++++++++++++++
 .../epmet/controller/ProjectController.java   |  94 +++++++++++++++
 .../controller/ProjectProcessController.java  |  94 +++++++++++++++
 .../ProjectSatisfactionDetailController.java  |  94 +++++++++++++++
 ...ojectSatisfactionStatisticsController.java |  94 +++++++++++++++
 .../controller/ProjectStaffController.java    |  94 +++++++++++++++
 .../dao/CustomerProjectParameterDao.java      |  33 ++++++
 .../main/java/com/epmet/dao/ProjectDao.java   |  33 ++++++
 .../java/com/epmet/dao/ProjectProcessDao.java |  33 ++++++
 .../dao/ProjectSatisfactionDetailDao.java     |  33 ++++++
 .../dao/ProjectSatisfactionStatisticsDao.java |  33 ++++++
 .../java/com/epmet/dao/ProjectStaffDao.java   |  33 ++++++
 .../CustomerProjectParameterEntity.java       |  66 +++++++++++
 .../java/com/epmet/entity/ProjectEntity.java  |  76 ++++++++++++
 .../epmet/entity/ProjectProcessEntity.java    |  76 ++++++++++++
 .../ProjectSatisfactionDetailEntity.java      |  56 +++++++++
 .../ProjectSatisfactionStatisticsEntity.java  |  61 ++++++++++
 .../com/epmet/entity/ProjectStaffEntity.java  |  81 +++++++++++++
 .../excel/CustomerProjectParameterExcel.java  |  71 +++++++++++
 .../java/com/epmet/excel/ProjectExcel.java    |  77 ++++++++++++
 .../com/epmet/excel/ProjectProcessExcel.java  |  77 ++++++++++++
 .../excel/ProjectSatisfactionDetailExcel.java |  65 ++++++++++
 .../ProjectSatisfactionStatisticsExcel.java   |  68 +++++++++++
 .../com/epmet/excel/ProjectStaffExcel.java    |  80 +++++++++++++
 .../redis/CustomerProjectParameterRedis.java  |  47 ++++++++
 .../com/epmet/redis/ProjectProcessRedis.java  |  47 ++++++++
 .../java/com/epmet/redis/ProjectRedis.java    |  47 ++++++++
 .../redis/ProjectSatisfactionDetailRedis.java |  47 ++++++++
 .../ProjectSatisfactionStatisticsRedis.java   |  47 ++++++++
 .../com/epmet/redis/ProjectStaffRedis.java    |  47 ++++++++
 .../CustomerProjectParameterService.java      |  95 +++++++++++++++
 .../epmet/service/ProjectProcessService.java  |  95 +++++++++++++++
 .../ProjectSatisfactionDetailService.java     |  95 +++++++++++++++
 .../ProjectSatisfactionStatisticsService.java |  95 +++++++++++++++
 .../com/epmet/service/ProjectService.java     |  95 +++++++++++++++
 .../epmet/service/ProjectStaffService.java    |  95 +++++++++++++++
 .../CustomerProjectParameterServiceImpl.java  | 104 ++++++++++++++++
 .../impl/ProjectProcessServiceImpl.java       | 104 ++++++++++++++++
 .../ProjectSatisfactionDetailServiceImpl.java | 104 ++++++++++++++++
 ...jectSatisfactionStatisticsServiceImpl.java | 104 ++++++++++++++++
 .../service/impl/ProjectServiceImpl.java      | 104 ++++++++++++++++
 .../service/impl/ProjectStaffServiceImpl.java | 104 ++++++++++++++++
 .../mapper/CustomerProjectParameterDao.xml    |  22 ++++
 .../src/main/resources/mapper/ProjectDao.xml  |  24 ++++
 .../resources/mapper/ProjectProcessDao.xml    |  24 ++++
 .../mapper/ProjectSatisfactionDetailDao.xml   |  20 ++++
 .../ProjectSatisfactionStatisticsDao.xml      |  21 ++++
 .../main/resources/mapper/ProjectStaffDao.xml |  25 ++++
 54 files changed, 3824 insertions(+)
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/CustomerProjectParameterDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectProcessDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectSatisfactionDetailDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectSatisfactionStatisticsDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectStaffDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/CustomerProjectParameterController.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectProcessController.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectSatisfactionDetailController.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectSatisfactionStatisticsController.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectStaffController.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/CustomerProjectParameterDao.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectProcessDao.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSatisfactionDetailDao.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSatisfactionStatisticsDao.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectStaffDao.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/CustomerProjectParameterEntity.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectEntity.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectSatisfactionDetailEntity.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectSatisfactionStatisticsEntity.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectStaffEntity.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/CustomerProjectParameterExcel.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectExcel.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectProcessExcel.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectSatisfactionDetailExcel.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectSatisfactionStatisticsExcel.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectStaffExcel.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/CustomerProjectParameterRedis.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/ProjectProcessRedis.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/ProjectRedis.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/ProjectSatisfactionDetailRedis.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/ProjectSatisfactionStatisticsRedis.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/ProjectStaffRedis.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/CustomerProjectParameterService.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectProcessService.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSatisfactionDetailService.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSatisfactionStatisticsService.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectStaffService.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/CustomerProjectParameterServiceImpl.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionStatisticsServiceImpl.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectStaffServiceImpl.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/resources/mapper/CustomerProjectParameterDao.xml
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSatisfactionDetailDao.xml
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSatisfactionStatisticsDao.xml
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectStaffDao.xml

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/CustomerProjectParameterDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/CustomerProjectParameterDTO.java
new file mode 100644
index 0000000000..7e139fb402
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/CustomerProjectParameterDTO.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.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 项目客户参数订制表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Data
+public class CustomerProjectParameterDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键 唯一标识
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 参数KEY值
+     */
+	private String parameterKey;
+
+    /**
+     * 参数名称
+     */
+	private String parameterName;
+
+    /**
+     * 参数VALUE值
+     */
+	private String parameterValue;
+
+    /**
+     * 说明
+     */
+	private String description;
+
+    /**
+     * 删除标识：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/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectDTO.java
new file mode 100644
index 0000000000..d2c8daf6ed
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectDTO.java
@@ -0,0 +1,106 @@
+/**
+ * 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 2020-05-11
+ */
+@Data
+public class ProjectDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一标识
+     */
+	private String id;
+
+    /**
+     *  机关ID
+     */
+	private String agencyId;
+
+    /**
+     * 来源：议题issue
+     */
+	private String origin;
+
+    /**
+     * 来源ID
+     */
+	private String originId;
+
+    /**
+     * 项目标题
+     */
+	private String title;
+
+    /**
+     * 状态:待处理 pending，结案closed
+     */
+	private String status;
+
+    /**
+     * 结案状态：已解决 resolved，未解决 unresolved
+     */
+	private String closedStatus;
+
+    /**
+     * 所属机关 11:22:33(本机关以及上级所有机关ID)
+     */
+	private String orgIdPath;
+
+    /**
+     * 删除标识: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/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectProcessDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectProcessDTO.java
new file mode 100644
index 0000000000..6c42eb1dd5
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectProcessDTO.java
@@ -0,0 +1,106 @@
+/**
+ * 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 2020-05-11
+ */
+@Data
+public class ProjectProcessDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一标识
+     */
+	private String id;
+
+    /**
+     * 项目ID
+     */
+	private String projectId;
+
+    /**
+     * 负负责人ID
+     */
+	private String staffId;
+
+    /**
+     * 处理：结案close，退回return，部门流转transfer，创建项目created
+     */
+	private String operation;
+
+    /**
+     * 公开答复
+     */
+	private String publicReply;
+
+    /**
+     * 内部备注
+     */
+	private String internalRemark;
+
+    /**
+     * 结束时间
+     */
+	private Date endTime;
+
+    /**
+     * 耗费天数
+     */
+	private String costWorkdays;
+
+    /**
+     * 删除标识：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/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectSatisfactionDetailDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectSatisfactionDetailDTO.java
new file mode 100644
index 0000000000..27437172ed
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectSatisfactionDetailDTO.java
@@ -0,0 +1,86 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 项目满意度调查记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Data
+public class ProjectSatisfactionDetailDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+	private String id;
+
+    /**
+     * 项目ID
+     */
+	private String projectId;
+
+    /**
+     * 评论 - 最多300字
+     */
+	private String comment;
+
+    /**
+     * 满意度 - 不满意:bad、基本满意:good、非常满意:perfect
+     */
+	private String satisfaction;
+
+    /**
+     * 删除标识 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/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectSatisfactionStatisticsDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectSatisfactionStatisticsDTO.java
new file mode 100644
index 0000000000..5af3de6cbc
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectSatisfactionStatisticsDTO.java
@@ -0,0 +1,91 @@
+/**
+ * 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 2020-05-11
+ */
+@Data
+public class ProjectSatisfactionStatisticsDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+	private String id;
+
+    /**
+     * 项目ID
+     */
+	private String projectId;
+
+    /**
+     * 一般满意数
+     */
+	private Integer goodCount;
+
+    /**
+     * 非常满意数
+     */
+	private Integer perfectCount;
+
+    /**
+     * 不满意数
+     */
+	private Integer badCount;
+
+    /**
+     * 删除标识 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/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectStaffDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectStaffDTO.java
new file mode 100644
index 0000000000..223fa90ad7
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectStaffDTO.java
@@ -0,0 +1,111 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 项目人员关联表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Data
+public class ProjectStaffDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一标识
+     */
+	private String id;
+
+    /**
+     * 项目ID
+     */
+	private String projectId;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 机关ID
+     */
+	private String orgId;
+
+    /**
+     * 部门ID
+     */
+	private String departmentId;
+
+    /**
+     * 网格ID
+     */
+	private String gridId;
+
+    /**
+     * 所属机关（11:22:33）
+     */
+	private String orgIdPath;
+
+    /**
+     * 人员ID
+     */
+	private String staffId;
+
+    /**
+     * 是否处理：未处理unhandle，已处理handle
+     */
+	private String isHandle;
+
+    /**
+     * 删除标识：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/gov-project/gov-project-server/src/main/java/com/epmet/controller/CustomerProjectParameterController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/CustomerProjectParameterController.java
new file mode 100644
index 0000000000..93139cfa21
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/CustomerProjectParameterController.java
@@ -0,0 +1,94 @@
+/**
+ * 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.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+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.CustomerProjectParameterDTO;
+import com.epmet.excel.CustomerProjectParameterExcel;
+import com.epmet.service.CustomerProjectParameterService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 项目客户参数订制表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@RestController
+@RequestMapping("customerprojectparameter")
+public class CustomerProjectParameterController {
+    
+    @Autowired
+    private CustomerProjectParameterService customerProjectParameterService;
+
+    @GetMapping("page")
+    public Result<PageData<CustomerProjectParameterDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<CustomerProjectParameterDTO> page = customerProjectParameterService.page(params);
+        return new Result<PageData<CustomerProjectParameterDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<CustomerProjectParameterDTO> get(@PathVariable("id") String id){
+        CustomerProjectParameterDTO data = customerProjectParameterService.get(id);
+        return new Result<CustomerProjectParameterDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody CustomerProjectParameterDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        customerProjectParameterService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody CustomerProjectParameterDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        customerProjectParameterService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        customerProjectParameterService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<CustomerProjectParameterDTO> list = customerProjectParameterService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, CustomerProjectParameterExcel.class);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java
new file mode 100644
index 0000000000..d0ff226582
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java
@@ -0,0 +1,94 @@
+/**
+ * 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.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+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.ProjectDTO;
+import com.epmet.excel.ProjectExcel;
+import com.epmet.service.ProjectService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 项目表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@RestController
+@RequestMapping("project")
+public class ProjectController {
+    
+    @Autowired
+    private ProjectService projectService;
+
+    @GetMapping("page")
+    public Result<PageData<ProjectDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<ProjectDTO> page = projectService.page(params);
+        return new Result<PageData<ProjectDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<ProjectDTO> get(@PathVariable("id") String id){
+        ProjectDTO data = projectService.get(id);
+        return new Result<ProjectDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody ProjectDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        projectService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody ProjectDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        projectService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        projectService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<ProjectDTO> list = projectService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, ProjectExcel.class);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectProcessController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectProcessController.java
new file mode 100644
index 0000000000..116ad85e3a
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectProcessController.java
@@ -0,0 +1,94 @@
+/**
+ * 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.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+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.ProjectProcessDTO;
+import com.epmet.excel.ProjectProcessExcel;
+import com.epmet.service.ProjectProcessService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 项目处理进展表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@RestController
+@RequestMapping("projectprocess")
+public class ProjectProcessController {
+    
+    @Autowired
+    private ProjectProcessService projectProcessService;
+
+    @GetMapping("page")
+    public Result<PageData<ProjectProcessDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<ProjectProcessDTO> page = projectProcessService.page(params);
+        return new Result<PageData<ProjectProcessDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<ProjectProcessDTO> get(@PathVariable("id") String id){
+        ProjectProcessDTO data = projectProcessService.get(id);
+        return new Result<ProjectProcessDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody ProjectProcessDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        projectProcessService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody ProjectProcessDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        projectProcessService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        projectProcessService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<ProjectProcessDTO> list = projectProcessService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, ProjectProcessExcel.class);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectSatisfactionDetailController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectSatisfactionDetailController.java
new file mode 100644
index 0000000000..4505cf4ec7
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectSatisfactionDetailController.java
@@ -0,0 +1,94 @@
+/**
+ * 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.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+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.ProjectSatisfactionDetailDTO;
+import com.epmet.excel.ProjectSatisfactionDetailExcel;
+import com.epmet.service.ProjectSatisfactionDetailService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 项目满意度调查记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@RestController
+@RequestMapping("projectsatisfactiondetail")
+public class ProjectSatisfactionDetailController {
+    
+    @Autowired
+    private ProjectSatisfactionDetailService projectSatisfactionDetailService;
+
+    @GetMapping("page")
+    public Result<PageData<ProjectSatisfactionDetailDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<ProjectSatisfactionDetailDTO> page = projectSatisfactionDetailService.page(params);
+        return new Result<PageData<ProjectSatisfactionDetailDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<ProjectSatisfactionDetailDTO> get(@PathVariable("id") String id){
+        ProjectSatisfactionDetailDTO data = projectSatisfactionDetailService.get(id);
+        return new Result<ProjectSatisfactionDetailDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody ProjectSatisfactionDetailDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        projectSatisfactionDetailService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody ProjectSatisfactionDetailDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        projectSatisfactionDetailService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        projectSatisfactionDetailService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<ProjectSatisfactionDetailDTO> list = projectSatisfactionDetailService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, ProjectSatisfactionDetailExcel.class);
+    }
+
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..8857e92695
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectSatisfactionStatisticsController.java
@@ -0,0 +1,94 @@
+/**
+ * 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.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+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.excel.ProjectSatisfactionStatisticsExcel;
+import com.epmet.service.ProjectSatisfactionStatisticsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 项目满意度调查统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@RestController
+@RequestMapping("projectsatisfactionstatistics")
+public class ProjectSatisfactionStatisticsController {
+    
+    @Autowired
+    private ProjectSatisfactionStatisticsService projectSatisfactionStatisticsService;
+
+    @GetMapping("page")
+    public Result<PageData<ProjectSatisfactionStatisticsDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<ProjectSatisfactionStatisticsDTO> page = projectSatisfactionStatisticsService.page(params);
+        return new Result<PageData<ProjectSatisfactionStatisticsDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<ProjectSatisfactionStatisticsDTO> get(@PathVariable("id") String id){
+        ProjectSatisfactionStatisticsDTO data = projectSatisfactionStatisticsService.get(id);
+        return new Result<ProjectSatisfactionStatisticsDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody ProjectSatisfactionStatisticsDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        projectSatisfactionStatisticsService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody ProjectSatisfactionStatisticsDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        projectSatisfactionStatisticsService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        projectSatisfactionStatisticsService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<ProjectSatisfactionStatisticsDTO> list = projectSatisfactionStatisticsService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, ProjectSatisfactionStatisticsExcel.class);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectStaffController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectStaffController.java
new file mode 100644
index 0000000000..dbe6fef069
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectStaffController.java
@@ -0,0 +1,94 @@
+/**
+ * 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.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+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.ProjectStaffDTO;
+import com.epmet.excel.ProjectStaffExcel;
+import com.epmet.service.ProjectStaffService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 项目人员关联表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@RestController
+@RequestMapping("projectstaff")
+public class ProjectStaffController {
+    
+    @Autowired
+    private ProjectStaffService projectStaffService;
+
+    @GetMapping("page")
+    public Result<PageData<ProjectStaffDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<ProjectStaffDTO> page = projectStaffService.page(params);
+        return new Result<PageData<ProjectStaffDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<ProjectStaffDTO> get(@PathVariable("id") String id){
+        ProjectStaffDTO data = projectStaffService.get(id);
+        return new Result<ProjectStaffDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody ProjectStaffDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        projectStaffService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody ProjectStaffDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        projectStaffService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        projectStaffService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<ProjectStaffDTO> list = projectStaffService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, ProjectStaffExcel.class);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/CustomerProjectParameterDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/CustomerProjectParameterDao.java
new file mode 100644
index 0000000000..715945aaca
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/CustomerProjectParameterDao.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;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.CustomerProjectParameterEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 项目客户参数订制表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Mapper
+public interface CustomerProjectParameterDao extends BaseDao<CustomerProjectParameterEntity> {
+	
+}
\ 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
new file mode 100644
index 0000000000..e7ba5bd385
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.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;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.ProjectEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 项目表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Mapper
+public interface ProjectDao extends BaseDao<ProjectEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectProcessDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectProcessDao.java
new file mode 100644
index 0000000000..5472b13ba0
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectProcessDao.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;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.ProjectProcessEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 项目处理进展表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Mapper
+public interface ProjectProcessDao extends BaseDao<ProjectProcessEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSatisfactionDetailDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSatisfactionDetailDao.java
new file mode 100644
index 0000000000..aacb3e4d87
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSatisfactionDetailDao.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;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.ProjectSatisfactionDetailEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 项目满意度调查记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Mapper
+public interface ProjectSatisfactionDetailDao extends BaseDao<ProjectSatisfactionDetailEntity> {
+	
+}
\ 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
new file mode 100644
index 0000000000..1b05ef5788
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSatisfactionStatisticsDao.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;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.ProjectSatisfactionStatisticsEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 项目满意度调查统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Mapper
+public interface ProjectSatisfactionStatisticsDao extends BaseDao<ProjectSatisfactionStatisticsEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectStaffDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectStaffDao.java
new file mode 100644
index 0000000000..e78229e0f5
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectStaffDao.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;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.ProjectStaffEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 项目人员关联表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Mapper
+public interface ProjectStaffDao extends BaseDao<ProjectStaffEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/CustomerProjectParameterEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/CustomerProjectParameterEntity.java
new file mode 100644
index 0000000000..5d5a578320
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/CustomerProjectParameterEntity.java
@@ -0,0 +1,66 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity;
+
+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-05-11
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("customer_project_parameter")
+public class CustomerProjectParameterEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 参数KEY值
+     */
+	private String parameterKey;
+
+    /**
+     * 参数名称
+     */
+	private String parameterName;
+
+    /**
+     * 参数VALUE值
+     */
+	private String parameterValue;
+
+    /**
+     * 说明
+     */
+	private String description;
+
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectEntity.java
new file mode 100644
index 0000000000..a0c82726ea
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectEntity.java
@@ -0,0 +1,76 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity;
+
+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-05-11
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("project")
+public class ProjectEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     *  机关ID
+     */
+	private String agencyId;
+
+    /**
+     * 来源：议题issue
+     */
+	private String origin;
+
+    /**
+     * 来源ID
+     */
+	private String originId;
+
+    /**
+     * 项目标题
+     */
+	private String title;
+
+    /**
+     * 状态:待处理 pending，结案closed
+     */
+	private String status;
+
+    /**
+     * 结案状态：已解决 resolved，未解决 unresolved
+     */
+	private String closedStatus;
+
+    /**
+     * 所属机关 11:22:33(本机关以及上级所有机关ID)
+     */
+	private String orgIdPath;
+
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java
new file mode 100644
index 0000000000..de53a677c5
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java
@@ -0,0 +1,76 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity;
+
+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-05-11
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("project_process")
+public class ProjectProcessEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 项目ID
+     */
+	private String projectId;
+
+    /**
+     * 负负责人ID
+     */
+	private String staffId;
+
+    /**
+     * 处理：结案close，退回return，部门流转transfer，创建项目created
+     */
+	private String operation;
+
+    /**
+     * 公开答复
+     */
+	private String publicReply;
+
+    /**
+     * 内部备注
+     */
+	private String internalRemark;
+
+    /**
+     * 结束时间
+     */
+	private Date endTime;
+
+    /**
+     * 耗费天数
+     */
+	private String costWorkdays;
+
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectSatisfactionDetailEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectSatisfactionDetailEntity.java
new file mode 100644
index 0000000000..6150cd43eb
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectSatisfactionDetailEntity.java
@@ -0,0 +1,56 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity;
+
+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-05-11
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("project_satisfaction_detail")
+public class ProjectSatisfactionDetailEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 项目ID
+     */
+	private String projectId;
+
+    /**
+     * 评论 - 最多300字
+     */
+	private String comment;
+
+    /**
+     * 满意度 - 不满意:bad、基本满意:good、非常满意:perfect
+     */
+	private String satisfaction;
+
+}
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
new file mode 100644
index 0000000000..51132be956
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectSatisfactionStatisticsEntity.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity;
+
+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-05-11
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("project_satisfaction_statistics")
+public class ProjectSatisfactionStatisticsEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 项目ID
+     */
+	private String projectId;
+
+    /**
+     * 一般满意数
+     */
+	private Integer goodCount;
+
+    /**
+     * 非常满意数
+     */
+	private Integer perfectCount;
+
+    /**
+     * 不满意数
+     */
+	private Integer badCount;
+
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectStaffEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectStaffEntity.java
new file mode 100644
index 0000000000..a971380628
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectStaffEntity.java
@@ -0,0 +1,81 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity;
+
+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-05-11
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("project_staff")
+public class ProjectStaffEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 项目ID
+     */
+	private String projectId;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 机关ID
+     */
+	private String orgId;
+
+    /**
+     * 部门ID
+     */
+	private String departmentId;
+
+    /**
+     * 网格ID
+     */
+	private String gridId;
+
+    /**
+     * 所属机关（11:22:33）
+     */
+	private String orgIdPath;
+
+    /**
+     * 人员ID
+     */
+	private String staffId;
+
+    /**
+     * 是否处理：未处理unhandle，已处理handle
+     */
+	private String isHandle;
+
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/CustomerProjectParameterExcel.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/CustomerProjectParameterExcel.java
new file mode 100644
index 0000000000..92a2448ab5
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/CustomerProjectParameterExcel.java
@@ -0,0 +1,71 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 项目客户参数订制表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Data
+public class CustomerProjectParameterExcel {
+
+    @Excel(name = "主键 唯一标识")
+    private String id;
+
+    @Excel(name = "客户ID")
+    private String customerId;
+
+    @Excel(name = "参数KEY值")
+    private String parameterKey;
+
+    @Excel(name = "参数名称")
+    private String parameterName;
+
+    @Excel(name = "参数VALUE值")
+    private String parameterValue;
+
+    @Excel(name = "说明")
+    private String description;
+
+    @Excel(name = "删除标识：0.未删除 1.已删除")
+    private String delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectExcel.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectExcel.java
new file mode 100644
index 0000000000..00424b5fc6
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectExcel.java
@@ -0,0 +1,77 @@
+/**
+ * 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.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 项目表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Data
+public class ProjectExcel {
+
+    @Excel(name = "唯一标识")
+    private String id;
+
+    @Excel(name = " 机关ID")
+    private String agencyId;
+
+    @Excel(name = "来源：议题issue")
+    private String origin;
+
+    @Excel(name = "来源ID")
+    private String originId;
+
+    @Excel(name = "项目标题")
+    private String title;
+
+    @Excel(name = "状态:待处理 pending，结案closed")
+    private String status;
+
+    @Excel(name = "结案状态：已解决 resolved，未解决 unresolved")
+    private String closedStatus;
+
+    @Excel(name = "所属机关 11:22:33(本机关以及上级所有机关ID)")
+    private String orgIdPath;
+
+    @Excel(name = "删除标识:0.未删除 1.已删除")
+    private String delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectProcessExcel.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectProcessExcel.java
new file mode 100644
index 0000000000..a60f113441
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectProcessExcel.java
@@ -0,0 +1,77 @@
+/**
+ * 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.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 项目处理进展表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Data
+public class ProjectProcessExcel {
+
+    @Excel(name = "唯一标识")
+    private String id;
+
+    @Excel(name = "项目ID")
+    private String projectId;
+
+    @Excel(name = "负负责人ID")
+    private String staffId;
+
+    @Excel(name = "处理：结案close，退回return，部门流转transfer，创建项目created")
+    private String operation;
+
+    @Excel(name = "公开答复")
+    private String publicReply;
+
+    @Excel(name = "内部备注")
+    private String internalRemark;
+
+    @Excel(name = "结束时间")
+    private Date endTime;
+
+    @Excel(name = "耗费天数")
+    private String costWorkdays;
+
+    @Excel(name = "删除标识：0.未删除 1.已删除")
+    private String delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectSatisfactionDetailExcel.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectSatisfactionDetailExcel.java
new file mode 100644
index 0000000000..4dc971307c
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectSatisfactionDetailExcel.java
@@ -0,0 +1,65 @@
+/**
+ * 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.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 项目满意度调查记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Data
+public class ProjectSatisfactionDetailExcel {
+
+    @Excel(name = "主键ID")
+    private String id;
+
+    @Excel(name = "项目ID")
+    private String projectId;
+
+    @Excel(name = "评论 - 最多300字")
+    private String comment;
+
+    @Excel(name = "满意度 - 不满意:bad、基本满意:good、非常满意:perfect")
+    private String satisfaction;
+
+    @Excel(name = "删除标识 0未删除、1已删除")
+    private String delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectSatisfactionStatisticsExcel.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectSatisfactionStatisticsExcel.java
new file mode 100644
index 0000000000..d79669dd01
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectSatisfactionStatisticsExcel.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.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 项目满意度调查统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Data
+public class ProjectSatisfactionStatisticsExcel {
+
+    @Excel(name = "主键ID")
+    private String id;
+
+    @Excel(name = "项目ID")
+    private String projectId;
+
+    @Excel(name = "一般满意数")
+    private Integer goodCount;
+
+    @Excel(name = "非常满意数")
+    private Integer perfectCount;
+
+    @Excel(name = "不满意数")
+    private Integer badCount;
+
+    @Excel(name = "删除标识 0未删除、1已删除")
+    private String delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectStaffExcel.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectStaffExcel.java
new file mode 100644
index 0000000000..1a920d4712
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectStaffExcel.java
@@ -0,0 +1,80 @@
+/**
+ * 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.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 项目人员关联表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Data
+public class ProjectStaffExcel {
+
+    @Excel(name = "唯一标识")
+    private String id;
+
+    @Excel(name = "项目ID")
+    private String projectId;
+
+    @Excel(name = "客户ID")
+    private String customerId;
+
+    @Excel(name = "机关ID")
+    private String orgId;
+
+    @Excel(name = "部门ID")
+    private String departmentId;
+
+    @Excel(name = "网格ID")
+    private String gridId;
+
+    @Excel(name = "所属机关（11:22:33）")
+    private String orgIdPath;
+
+    @Excel(name = "人员ID")
+    private String staffId;
+
+    @Excel(name = "是否处理：未处理unhandle，已处理handle")
+    private String isHandle;
+
+    @Excel(name = "删除标识：0.未删除 1.已删除")
+    private String delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/CustomerProjectParameterRedis.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/CustomerProjectParameterRedis.java
new file mode 100644
index 0000000000..5d59071907
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/CustomerProjectParameterRedis.java
@@ -0,0 +1,47 @@
+/**
+ * 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.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 项目客户参数订制表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Component
+public class CustomerProjectParameterRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/ProjectProcessRedis.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/ProjectProcessRedis.java
new file mode 100644
index 0000000000..e6016a4442
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/ProjectProcessRedis.java
@@ -0,0 +1,47 @@
+/**
+ * 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.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 项目处理进展表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Component
+public class ProjectProcessRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/ProjectRedis.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/ProjectRedis.java
new file mode 100644
index 0000000000..e285bd2572
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/ProjectRedis.java
@@ -0,0 +1,47 @@
+/**
+ * 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.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 项目表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Component
+public class ProjectRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/ProjectSatisfactionDetailRedis.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/ProjectSatisfactionDetailRedis.java
new file mode 100644
index 0000000000..dbcbe2af12
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/ProjectSatisfactionDetailRedis.java
@@ -0,0 +1,47 @@
+/**
+ * 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.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 项目满意度调查记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Component
+public class ProjectSatisfactionDetailRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/ProjectSatisfactionStatisticsRedis.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/ProjectSatisfactionStatisticsRedis.java
new file mode 100644
index 0000000000..845edbbe10
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/ProjectSatisfactionStatisticsRedis.java
@@ -0,0 +1,47 @@
+/**
+ * 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.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 项目满意度调查统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Component
+public class ProjectSatisfactionStatisticsRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/ProjectStaffRedis.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/ProjectStaffRedis.java
new file mode 100644
index 0000000000..6bbd715d4f
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/ProjectStaffRedis.java
@@ -0,0 +1,47 @@
+/**
+ * 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.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 项目人员关联表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Component
+public class ProjectStaffRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/CustomerProjectParameterService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/CustomerProjectParameterService.java
new file mode 100644
index 0000000000..ba787d4171
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/CustomerProjectParameterService.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;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.CustomerProjectParameterDTO;
+import com.epmet.entity.CustomerProjectParameterEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 项目客户参数订制表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+public interface CustomerProjectParameterService extends BaseService<CustomerProjectParameterEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<CustomerProjectParameterDTO>
+     * @author generator
+     * @date 2020-05-11
+     */
+    PageData<CustomerProjectParameterDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<CustomerProjectParameterDTO>
+     * @author generator
+     * @date 2020-05-11
+     */
+    List<CustomerProjectParameterDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return CustomerProjectParameterDTO
+     * @author generator
+     * @date 2020-05-11
+     */
+    CustomerProjectParameterDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void save(CustomerProjectParameterDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void update(CustomerProjectParameterDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectProcessService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectProcessService.java
new file mode 100644
index 0000000000..b44896e261
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectProcessService.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;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.ProjectProcessDTO;
+import com.epmet.entity.ProjectProcessEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 项目处理进展表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+public interface ProjectProcessService extends BaseService<ProjectProcessEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<ProjectProcessDTO>
+     * @author generator
+     * @date 2020-05-11
+     */
+    PageData<ProjectProcessDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<ProjectProcessDTO>
+     * @author generator
+     * @date 2020-05-11
+     */
+    List<ProjectProcessDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return ProjectProcessDTO
+     * @author generator
+     * @date 2020-05-11
+     */
+    ProjectProcessDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void save(ProjectProcessDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void update(ProjectProcessDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSatisfactionDetailService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSatisfactionDetailService.java
new file mode 100644
index 0000000000..a1fef8ff1c
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSatisfactionDetailService.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;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.ProjectSatisfactionDetailDTO;
+import com.epmet.entity.ProjectSatisfactionDetailEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 项目满意度调查记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+public interface ProjectSatisfactionDetailService extends BaseService<ProjectSatisfactionDetailEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<ProjectSatisfactionDetailDTO>
+     * @author generator
+     * @date 2020-05-11
+     */
+    PageData<ProjectSatisfactionDetailDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<ProjectSatisfactionDetailDTO>
+     * @author generator
+     * @date 2020-05-11
+     */
+    List<ProjectSatisfactionDetailDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return ProjectSatisfactionDetailDTO
+     * @author generator
+     * @date 2020-05-11
+     */
+    ProjectSatisfactionDetailDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void save(ProjectSatisfactionDetailDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void update(ProjectSatisfactionDetailDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void delete(String[] ids);
+}
\ 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
new file mode 100644
index 0000000000..770a98d174
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSatisfactionStatisticsService.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;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.ProjectSatisfactionStatisticsDTO;
+import com.epmet.entity.ProjectSatisfactionStatisticsEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 项目满意度调查统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+public interface ProjectSatisfactionStatisticsService extends BaseService<ProjectSatisfactionStatisticsEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<ProjectSatisfactionStatisticsDTO>
+     * @author generator
+     * @date 2020-05-11
+     */
+    PageData<ProjectSatisfactionStatisticsDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<ProjectSatisfactionStatisticsDTO>
+     * @author generator
+     * @date 2020-05-11
+     */
+    List<ProjectSatisfactionStatisticsDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return ProjectSatisfactionStatisticsDTO
+     * @author generator
+     * @date 2020-05-11
+     */
+    ProjectSatisfactionStatisticsDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void save(ProjectSatisfactionStatisticsDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void update(ProjectSatisfactionStatisticsDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java
new file mode 100644
index 0000000000..d7c57fdf82
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.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;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.ProjectDTO;
+import com.epmet.entity.ProjectEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 项目表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+public interface ProjectService extends BaseService<ProjectEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<ProjectDTO>
+     * @author generator
+     * @date 2020-05-11
+     */
+    PageData<ProjectDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<ProjectDTO>
+     * @author generator
+     * @date 2020-05-11
+     */
+    List<ProjectDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return ProjectDTO
+     * @author generator
+     * @date 2020-05-11
+     */
+    ProjectDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void save(ProjectDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void update(ProjectDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectStaffService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectStaffService.java
new file mode 100644
index 0000000000..30b07ac3b1
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectStaffService.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;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.ProjectStaffDTO;
+import com.epmet.entity.ProjectStaffEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 项目人员关联表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+public interface ProjectStaffService extends BaseService<ProjectStaffEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<ProjectStaffDTO>
+     * @author generator
+     * @date 2020-05-11
+     */
+    PageData<ProjectStaffDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<ProjectStaffDTO>
+     * @author generator
+     * @date 2020-05-11
+     */
+    List<ProjectStaffDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return ProjectStaffDTO
+     * @author generator
+     * @date 2020-05-11
+     */
+    ProjectStaffDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void save(ProjectStaffDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void update(ProjectStaffDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/CustomerProjectParameterServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/CustomerProjectParameterServiceImpl.java
new file mode 100644
index 0000000000..a3942c0295
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/CustomerProjectParameterServiceImpl.java
@@ -0,0 +1,104 @@
+/**
+ * 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.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.CustomerProjectParameterDao;
+import com.epmet.dto.CustomerProjectParameterDTO;
+import com.epmet.entity.CustomerProjectParameterEntity;
+import com.epmet.redis.CustomerProjectParameterRedis;
+import com.epmet.service.CustomerProjectParameterService;
+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 2020-05-11
+ */
+@Service
+public class CustomerProjectParameterServiceImpl extends BaseServiceImpl<CustomerProjectParameterDao, CustomerProjectParameterEntity> implements CustomerProjectParameterService {
+
+    @Autowired
+    private CustomerProjectParameterRedis customerProjectParameterRedis;
+
+    @Override
+    public PageData<CustomerProjectParameterDTO> page(Map<String, Object> params) {
+        IPage<CustomerProjectParameterEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, CustomerProjectParameterDTO.class);
+    }
+
+    @Override
+    public List<CustomerProjectParameterDTO> list(Map<String, Object> params) {
+        List<CustomerProjectParameterEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, CustomerProjectParameterDTO.class);
+    }
+
+    private QueryWrapper<CustomerProjectParameterEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<CustomerProjectParameterEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public CustomerProjectParameterDTO get(String id) {
+        CustomerProjectParameterEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, CustomerProjectParameterDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(CustomerProjectParameterDTO dto) {
+        CustomerProjectParameterEntity entity = ConvertUtils.sourceToTarget(dto, CustomerProjectParameterEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(CustomerProjectParameterDTO dto) {
+        CustomerProjectParameterEntity entity = ConvertUtils.sourceToTarget(dto, CustomerProjectParameterEntity.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/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
new file mode 100644
index 0000000000..3d43b730eb
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
@@ -0,0 +1,104 @@
+/**
+ * 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.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.ProjectProcessDao;
+import com.epmet.dto.ProjectProcessDTO;
+import com.epmet.entity.ProjectProcessEntity;
+import com.epmet.redis.ProjectProcessRedis;
+import com.epmet.service.ProjectProcessService;
+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 2020-05-11
+ */
+@Service
+public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao, ProjectProcessEntity> implements ProjectProcessService {
+
+    @Autowired
+    private ProjectProcessRedis projectProcessRedis;
+
+    @Override
+    public PageData<ProjectProcessDTO> page(Map<String, Object> params) {
+        IPage<ProjectProcessEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, ProjectProcessDTO.class);
+    }
+
+    @Override
+    public List<ProjectProcessDTO> list(Map<String, Object> params) {
+        List<ProjectProcessEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, ProjectProcessDTO.class);
+    }
+
+    private QueryWrapper<ProjectProcessEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<ProjectProcessEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public ProjectProcessDTO get(String id) {
+        ProjectProcessEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, ProjectProcessDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(ProjectProcessDTO dto) {
+        ProjectProcessEntity entity = ConvertUtils.sourceToTarget(dto, ProjectProcessEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(ProjectProcessDTO dto) {
+        ProjectProcessEntity entity = ConvertUtils.sourceToTarget(dto, ProjectProcessEntity.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/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java
new file mode 100644
index 0000000000..8a0e4705a8
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java
@@ -0,0 +1,104 @@
+/**
+ * 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.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.ProjectSatisfactionDetailDao;
+import com.epmet.dto.ProjectSatisfactionDetailDTO;
+import com.epmet.entity.ProjectSatisfactionDetailEntity;
+import com.epmet.redis.ProjectSatisfactionDetailRedis;
+import com.epmet.service.ProjectSatisfactionDetailService;
+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 2020-05-11
+ */
+@Service
+public class ProjectSatisfactionDetailServiceImpl extends BaseServiceImpl<ProjectSatisfactionDetailDao, ProjectSatisfactionDetailEntity> implements ProjectSatisfactionDetailService {
+
+    @Autowired
+    private ProjectSatisfactionDetailRedis projectSatisfactionDetailRedis;
+
+    @Override
+    public PageData<ProjectSatisfactionDetailDTO> page(Map<String, Object> params) {
+        IPage<ProjectSatisfactionDetailEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, ProjectSatisfactionDetailDTO.class);
+    }
+
+    @Override
+    public List<ProjectSatisfactionDetailDTO> list(Map<String, Object> params) {
+        List<ProjectSatisfactionDetailEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, ProjectSatisfactionDetailDTO.class);
+    }
+
+    private QueryWrapper<ProjectSatisfactionDetailEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<ProjectSatisfactionDetailEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public ProjectSatisfactionDetailDTO get(String id) {
+        ProjectSatisfactionDetailEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, ProjectSatisfactionDetailDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(ProjectSatisfactionDetailDTO dto) {
+        ProjectSatisfactionDetailEntity entity = ConvertUtils.sourceToTarget(dto, ProjectSatisfactionDetailEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(ProjectSatisfactionDetailDTO dto) {
+        ProjectSatisfactionDetailEntity entity = ConvertUtils.sourceToTarget(dto, ProjectSatisfactionDetailEntity.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/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
new file mode 100644
index 0000000000..7769eb2ef4
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionStatisticsServiceImpl.java
@@ -0,0 +1,104 @@
+/**
+ * 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.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.ProjectSatisfactionStatisticsDao;
+import com.epmet.dto.ProjectSatisfactionStatisticsDTO;
+import com.epmet.entity.ProjectSatisfactionStatisticsEntity;
+import com.epmet.redis.ProjectSatisfactionStatisticsRedis;
+import com.epmet.service.ProjectSatisfactionStatisticsService;
+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 2020-05-11
+ */
+@Service
+public class ProjectSatisfactionStatisticsServiceImpl extends BaseServiceImpl<ProjectSatisfactionStatisticsDao, ProjectSatisfactionStatisticsEntity> implements ProjectSatisfactionStatisticsService {
+
+    @Autowired
+    private ProjectSatisfactionStatisticsRedis projectSatisfactionStatisticsRedis;
+
+    @Override
+    public PageData<ProjectSatisfactionStatisticsDTO> page(Map<String, Object> params) {
+        IPage<ProjectSatisfactionStatisticsEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, ProjectSatisfactionStatisticsDTO.class);
+    }
+
+    @Override
+    public List<ProjectSatisfactionStatisticsDTO> list(Map<String, Object> params) {
+        List<ProjectSatisfactionStatisticsEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, ProjectSatisfactionStatisticsDTO.class);
+    }
+
+    private QueryWrapper<ProjectSatisfactionStatisticsEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<ProjectSatisfactionStatisticsEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public ProjectSatisfactionStatisticsDTO get(String id) {
+        ProjectSatisfactionStatisticsEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, ProjectSatisfactionStatisticsDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(ProjectSatisfactionStatisticsDTO dto) {
+        ProjectSatisfactionStatisticsEntity entity = ConvertUtils.sourceToTarget(dto, ProjectSatisfactionStatisticsEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(ProjectSatisfactionStatisticsDTO dto) {
+        ProjectSatisfactionStatisticsEntity entity = ConvertUtils.sourceToTarget(dto, ProjectSatisfactionStatisticsEntity.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/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
new file mode 100644
index 0000000000..c377c8a49e
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
@@ -0,0 +1,104 @@
+/**
+ * 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.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.ProjectDao;
+import com.epmet.dto.ProjectDTO;
+import com.epmet.entity.ProjectEntity;
+import com.epmet.redis.ProjectRedis;
+import com.epmet.service.ProjectService;
+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 2020-05-11
+ */
+@Service
+public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntity> implements ProjectService {
+
+    @Autowired
+    private ProjectRedis projectRedis;
+
+    @Override
+    public PageData<ProjectDTO> page(Map<String, Object> params) {
+        IPage<ProjectEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, ProjectDTO.class);
+    }
+
+    @Override
+    public List<ProjectDTO> list(Map<String, Object> params) {
+        List<ProjectEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, ProjectDTO.class);
+    }
+
+    private QueryWrapper<ProjectEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<ProjectEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public ProjectDTO get(String id) {
+        ProjectEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, ProjectDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(ProjectDTO dto) {
+        ProjectEntity entity = ConvertUtils.sourceToTarget(dto, ProjectEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(ProjectDTO dto) {
+        ProjectEntity entity = ConvertUtils.sourceToTarget(dto, ProjectEntity.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/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectStaffServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectStaffServiceImpl.java
new file mode 100644
index 0000000000..0eea5ed1fc
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectStaffServiceImpl.java
@@ -0,0 +1,104 @@
+/**
+ * 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.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.ProjectStaffDao;
+import com.epmet.dto.ProjectStaffDTO;
+import com.epmet.entity.ProjectStaffEntity;
+import com.epmet.redis.ProjectStaffRedis;
+import com.epmet.service.ProjectStaffService;
+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 2020-05-11
+ */
+@Service
+public class ProjectStaffServiceImpl extends BaseServiceImpl<ProjectStaffDao, ProjectStaffEntity> implements ProjectStaffService {
+
+    @Autowired
+    private ProjectStaffRedis projectStaffRedis;
+
+    @Override
+    public PageData<ProjectStaffDTO> page(Map<String, Object> params) {
+        IPage<ProjectStaffEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, ProjectStaffDTO.class);
+    }
+
+    @Override
+    public List<ProjectStaffDTO> list(Map<String, Object> params) {
+        List<ProjectStaffEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, ProjectStaffDTO.class);
+    }
+
+    private QueryWrapper<ProjectStaffEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<ProjectStaffEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public ProjectStaffDTO get(String id) {
+        ProjectStaffEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, ProjectStaffDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(ProjectStaffDTO dto) {
+        ProjectStaffEntity entity = ConvertUtils.sourceToTarget(dto, ProjectStaffEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(ProjectStaffDTO dto) {
+        ProjectStaffEntity entity = ConvertUtils.sourceToTarget(dto, ProjectStaffEntity.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/gov-project/gov-project-server/src/main/resources/mapper/CustomerProjectParameterDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/CustomerProjectParameterDao.xml
new file mode 100644
index 0000000000..5883ac863f
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/CustomerProjectParameterDao.xml
@@ -0,0 +1,22 @@
+<?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.CustomerProjectParameterDao">
+
+    <resultMap type="com.epmet.entity.CustomerProjectParameterEntity" id="customerProjectParameterMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="parameterKey" column="PARAMETER_KEY"/>
+        <result property="parameterName" column="PARAMETER_NAME"/>
+        <result property="parameterValue" column="PARAMETER_VALUE"/>
+        <result property="description" column="DESCRIPTION"/>
+        <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/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
new file mode 100644
index 0000000000..e14269cbb7
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.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.dao.ProjectDao">
+
+    <resultMap type="com.epmet.entity.ProjectEntity" id="projectMap">
+        <result property="id" column="ID"/>
+        <result property="agencyId" column="AGENCY_ID"/>
+        <result property="origin" column="ORIGIN"/>
+        <result property="originId" column="ORIGIN_ID"/>
+        <result property="title" column="TITLE"/>
+        <result property="status" column="STATUS"/>
+        <result property="closedStatus" column="CLOSED_STATUS"/>
+        <result property="orgIdPath" column="ORG_ID_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>
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml
new file mode 100644
index 0000000000..9350f107ea
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.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.dao.ProjectProcessDao">
+
+    <resultMap type="com.epmet.entity.ProjectProcessEntity" id="projectProcessMap">
+        <result property="id" column="ID"/>
+        <result property="projectId" column="PROJECT_ID"/>
+        <result property="staffId" column="STAFF_ID"/>
+        <result property="operation" column="OPERATION"/>
+        <result property="publicReply" column="PUBLIC_REPLY"/>
+        <result property="internalRemark" column="INTERNAL_REMARK"/>
+        <result property="endTime" column="END_TIME"/>
+        <result property="costWorkdays" column="COST_WORKDAYS"/>
+        <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/gov-project/gov-project-server/src/main/resources/mapper/ProjectSatisfactionDetailDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSatisfactionDetailDao.xml
new file mode 100644
index 0000000000..a644923a30
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSatisfactionDetailDao.xml
@@ -0,0 +1,20 @@
+<?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.ProjectSatisfactionDetailDao">
+
+    <resultMap type="com.epmet.entity.ProjectSatisfactionDetailEntity" id="projectSatisfactionDetailMap">
+        <result property="id" column="ID"/>
+        <result property="projectId" column="PROJECT_ID"/>
+        <result property="comment" column="COMMENT"/>
+        <result property="satisfaction" column="SATISFACTION"/>
+        <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/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
new file mode 100644
index 0000000000..65324c0d07
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSatisfactionStatisticsDao.xml
@@ -0,0 +1,21 @@
+<?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.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>
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectStaffDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectStaffDao.xml
new file mode 100644
index 0000000000..eb733d0eb7
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectStaffDao.xml
@@ -0,0 +1,25 @@
+<?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.ProjectStaffDao">
+
+    <resultMap type="com.epmet.entity.ProjectStaffEntity" id="projectStaffMap">
+        <result property="id" column="ID"/>
+        <result property="projectId" column="PROJECT_ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="orgId" column="ORG_ID"/>
+        <result property="departmentId" column="DEPARTMENT_ID"/>
+        <result property="gridId" column="GRID_ID"/>
+        <result property="orgIdPath" column="ORG_ID_PATH"/>
+        <result property="staffId" column="STAFF_ID"/>
+        <result property="isHandle" column="IS_HANDLE"/>
+        <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 d58c355e5157d1c4b7bfe8527c21698efa0bdf39 Mon Sep 17 00:00:00 2001
From: zxc <954985706@qq.com>
Date: Mon, 11 May 2020 13:41:31 +0800
Subject: [PATCH 08/45] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/IssueCustomerParameterDTO.java  |  96 ++++++++++++
 .../src/main/java/com/epmet/dto/IssueDTO.java | 146 ++++++++++++++++++
 .../java/com/epmet/dto/IssueProcessDTO.java   |  96 ++++++++++++
 .../epmet/dto/IssueProjectRelationDTO.java    |  81 ++++++++++
 .../epmet/dto/IssueSatisfactionDetailDTO.java |  86 +++++++++++
 .../dto/IssueSatisfactionStatisticalDTO.java  |  91 +++++++++++
 .../com/epmet/dto/IssueVoteDetailDTO.java     |  81 ++++++++++
 .../epmet/dto/IssueVoteStatisticalDTO.java    |  91 +++++++++++
 .../dto/IssueVoteStatisticalDailyDTO.java     | 116 ++++++++++++++
 .../main/java/com/epmet/dto/TopicInfoDTO.java |  43 ++++++
 .../epmet/dto/form/IssueDetailFormDTO.java    |  21 +++
 .../epmet/dto/form/IssueInitiatorFormDTO.java |  23 +++
 .../dto/result/IssueDetailResultDTO.java      |  49 ++++++
 .../dto/result/IssueInitiatorResultDTO.java   |  20 +++
 .../resi-hall/resi-hall-server/pom.xml        |   5 +
 .../com/epmet/controller/IssueController.java |  24 +++
 .../IssueCustomerParameterController.java     |  94 +++++++++++
 .../controller/IssueProcessController.java    |  94 +++++++++++
 .../IssueProjectRelationController.java       |  94 +++++++++++
 .../IssueSatisfactionDetailController.java    |  94 +++++++++++
 ...ssueSatisfactionStatisticalController.java |  94 +++++++++++
 .../controller/IssueVoteDetailController.java |  94 +++++++++++
 .../IssueVoteStatisticalController.java       |  94 +++++++++++
 .../IssueVoteStatisticalDailyController.java  |  94 +++++++++++
 .../epmet/dao/IssueCustomerParameterDao.java  |  33 ++++
 .../src/main/java/com/epmet/dao/IssueDao.java |  43 ++++++
 .../java/com/epmet/dao/IssueProcessDao.java   |  33 ++++
 .../epmet/dao/IssueProjectRelationDao.java    |  33 ++++
 .../epmet/dao/IssueSatisfactionDetailDao.java |  33 ++++
 .../dao/IssueSatisfactionStatisticalDao.java  |  33 ++++
 .../com/epmet/dao/IssueVoteDetailDao.java     |  33 ++++
 .../dao/IssueVoteStatisticalDailyDao.java     |  33 ++++
 .../epmet/dao/IssueVoteStatisticalDao.java    |  33 ++++
 .../entity/IssueCustomerParameterEntity.java  |  66 ++++++++
 .../java/com/epmet/entity/IssueEntity.java    | 116 ++++++++++++++
 .../com/epmet/entity/IssueProcessEntity.java  |  66 ++++++++
 .../entity/IssueProjectRelationEntity.java    |  51 ++++++
 .../entity/IssueSatisfactionDetailEntity.java |  56 +++++++
 .../IssueSatisfactionStatisticalEntity.java   |  61 ++++++++
 .../epmet/entity/IssueVoteDetailEntity.java   |  51 ++++++
 .../IssueVoteStatisticalDailyEntity.java      |  86 +++++++++++
 .../entity/IssueVoteStatisticalEntity.java    |  61 ++++++++
 .../excel/IssueCustomerParameterExcel.java    |  71 +++++++++
 .../main/java/com/epmet/excel/IssueExcel.java | 101 ++++++++++++
 .../com/epmet/excel/IssueProcessExcel.java    |  71 +++++++++
 .../excel/IssueProjectRelationExcel.java      |  62 ++++++++
 .../excel/IssueSatisfactionDetailExcel.java   |  65 ++++++++
 .../IssueSatisfactionStatisticalExcel.java    |  68 ++++++++
 .../com/epmet/excel/IssueVoteDetailExcel.java |  62 ++++++++
 .../excel/IssueVoteStatisticalDailyExcel.java |  83 ++++++++++
 .../excel/IssueVoteStatisticalExcel.java      |  68 ++++++++
 .../com/epmet/feign/EpmetUserFeignClient.java |  30 ++++
 .../EpmetUserFeignClientFallBack.java         |  28 ++++
 .../redis/IssueCustomerParameterRedis.java    |  47 ++++++
 .../com/epmet/redis/IssueProcessRedis.java    |  47 ++++++
 .../redis/IssueProjectRelationRedis.java      |  47 ++++++
 .../main/java/com/epmet/redis/IssueRedis.java |  47 ++++++
 .../redis/IssueSatisfactionDetailRedis.java   |  47 ++++++
 .../IssueSatisfactionStatisticalRedis.java    |  47 ++++++
 .../com/epmet/redis/IssueVoteDetailRedis.java |  47 ++++++
 .../redis/IssueVoteStatisticalDailyRedis.java |  47 ++++++
 .../redis/IssueVoteStatisticalRedis.java      |  47 ++++++
 .../IssueCustomerParameterService.java        |  95 ++++++++++++
 .../epmet/service/IssueProcessService.java    |  95 ++++++++++++
 .../service/IssueProjectRelationService.java  |  95 ++++++++++++
 .../IssueSatisfactionDetailService.java       |  95 ++++++++++++
 .../IssueSatisfactionStatisticalService.java  |  95 ++++++++++++
 .../java/com/epmet/service/IssueService.java  |  22 +++
 .../epmet/service/IssueVoteDetailService.java |  95 ++++++++++++
 .../IssueVoteStatisticalDailyService.java     |  95 ++++++++++++
 .../service/IssueVoteStatisticalService.java  |  95 ++++++++++++
 .../IssueCustomerParameterServiceImpl.java    |  99 ++++++++++++
 .../service/impl/IssueProcessServiceImpl.java | 104 +++++++++++++
 .../impl/IssueProjectRelationServiceImpl.java | 104 +++++++++++++
 .../IssueSatisfactionDetailServiceImpl.java   | 104 +++++++++++++
 ...sueSatisfactionStatisticalServiceImpl.java | 104 +++++++++++++
 .../epmet/service/impl/IssueServiceImpl.java  |  34 ++++
 .../impl/IssueVoteDetailServiceImpl.java      | 104 +++++++++++++
 .../IssueVoteStatisticalDailyServiceImpl.java | 104 +++++++++++++
 .../impl/IssueVoteStatisticalServiceImpl.java | 104 +++++++++++++
 .../mapper/IssueCustomerParameterDao.xml      |  22 +++
 .../src/main/resources/mapper/IssueDao.xml    |  46 ++++++
 .../main/resources/mapper/IssueProcessDao.xml |  22 +++
 .../mapper/IssueProjectRelationDao.xml        |  19 +++
 .../mapper/IssueSatisfactionDetailDao.xml     |  20 +++
 .../IssueSatisfactionStatisticalDao.xml       |  21 +++
 .../resources/mapper/IssueVoteDetailDao.xml   |  19 +++
 .../mapper/IssueVoteStatisticalDailyDao.xml   |  26 ++++
 .../mapper/IssueVoteStatisticalDao.xml        |  21 +++
 89 files changed, 5733 insertions(+)
 create mode 100644 epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueCustomerParameterDTO.java
 create mode 100644 epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueDTO.java
 create mode 100644 epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueProcessDTO.java
 create mode 100644 epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueProjectRelationDTO.java
 create mode 100644 epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueSatisfactionDetailDTO.java
 create mode 100644 epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueSatisfactionStatisticalDTO.java
 create mode 100644 epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueVoteDetailDTO.java
 create mode 100644 epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueVoteStatisticalDTO.java
 create mode 100644 epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueVoteStatisticalDailyDTO.java
 create mode 100644 epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/TopicInfoDTO.java
 create mode 100644 epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/IssueDetailFormDTO.java
 create mode 100644 epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/IssueInitiatorFormDTO.java
 create mode 100644 epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java
 create mode 100644 epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueInitiatorResultDTO.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueCustomerParameterController.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueProcessController.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueProjectRelationController.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueSatisfactionDetailController.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueSatisfactionStatisticalController.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteDetailController.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteStatisticalController.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteStatisticalDailyController.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueCustomerParameterDao.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueDao.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueProcessDao.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueProjectRelationDao.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueSatisfactionDetailDao.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueSatisfactionStatisticalDao.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDailyDao.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueCustomerParameterEntity.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueEntity.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueProcessEntity.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueProjectRelationEntity.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueSatisfactionDetailEntity.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueSatisfactionStatisticalEntity.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteDetailEntity.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteStatisticalDailyEntity.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteStatisticalEntity.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueCustomerParameterExcel.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueExcel.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueProcessExcel.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueProjectRelationExcel.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueSatisfactionDetailExcel.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueSatisfactionStatisticalExcel.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueVoteDetailExcel.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueVoteStatisticalDailyExcel.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueVoteStatisticalExcel.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueCustomerParameterRedis.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueProcessRedis.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueProjectRelationRedis.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueRedis.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueSatisfactionDetailRedis.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueSatisfactionStatisticalRedis.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueVoteStatisticalDailyRedis.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueVoteStatisticalRedis.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueCustomerParameterService.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueProcessService.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueProjectRelationService.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueSatisfactionDetailService.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueSatisfactionStatisticalService.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueService.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteDetailService.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteStatisticalDailyService.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueCustomerParameterServiceImpl.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueProjectRelationServiceImpl.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueSatisfactionStatisticalServiceImpl.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalDailyServiceImpl.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueCustomerParameterDao.xml
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueDao.xml
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueProcessDao.xml
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueProjectRelationDao.xml
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueSatisfactionDetailDao.xml
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueSatisfactionStatisticalDao.xml
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueVoteDetailDao.xml
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueVoteStatisticalDailyDao.xml
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml

diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueCustomerParameterDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueCustomerParameterDTO.java
new file mode 100644
index 0000000000..1058658f37
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueCustomerParameterDTO.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.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 议题客户参数定制表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Data
+public class IssueCustomerParameterDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 参数键 eg:voting_time_limit
+     */
+	private String parameterKey;
+
+    /**
+     * 参数名 eg:表决期限
+     */
+	private String parameterName;
+
+    /**
+     * 参数值 eg:10（天）
+     */
+	private String parameterValue;
+
+    /**
+     * 参数说明 eg:这个客户下所有的网格议题表决期限都是10天
+     */
+	private String description;
+
+    /**
+     * 删除标志 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/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueDTO.java
new file mode 100644
index 0000000000..d92ea44b9d
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueDTO.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;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 议题详情表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Data
+public class IssueDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 议题ID
+     */
+	private String id;
+
+    /**
+     * 议题状态 表决中：voting 已转项目：shift_project 已关闭：closed
+     */
+	private String issueStatus;
+
+    /**
+     * 来源类型 eg:resi_topic
+     */
+	private String sourceType;
+
+    /**
+     * 来源ID eg:2223232(当SOURCE_TYPE为"resi_topic"时，这里指话题的ID)
+     */
+	private String sourceId;
+
+    /**
+     * 关闭理由 【未关闭时可以为空】关闭议题时必填的理由，转项目后而且已经结案，这个字段不回写
+     */
+	private String closeReason;
+
+    /**
+     * 解决类型 【未关闭时可以为空】已解决resloved、未解决unresloved，对应在关闭议题时所选的checkbox，转项目后而且已经结案，这个字段不回写
+     */
+	private String resolveType;
+
+    /**
+     * 议题名称 最多20字
+     */
+	private String issueTitle;
+
+    /**
+     * 建议 最多1000字
+     */
+	private String suggestion;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 网格ID 居民端议题对应一个网格Id
+     */
+	private String gridId;
+
+    /**
+     * 所属机关 【数据权限-非必填】11:22:33(agencyId)数据权限控制
+     */
+	private String orgIdPath;
+
+    /**
+     * 组织ID 【数据权限-非必填】agencyId
+     */
+	private String orgId;
+
+    /**
+     * 表决截止日期
+     */
+	private Date votingDeadline;
+
+    /**
+     * 表决发起日期（转议题日期）
+     */
+	private Date decidedTime;
+
+    /**
+     * 转项目日期 （服务间调用日期一致性）
+     */
+	private Date shiftedTime;
+
+    /**
+     * 关闭日期
+     */
+	private Date closedTime;
+
+    /**
+     * 删除标识 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/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueProcessDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueProcessDTO.java
new file mode 100644
index 0000000000..7f0cbd1977
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueProcessDTO.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.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 议题进展记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Data
+public class IssueProcessDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+	private String id;
+
+    /**
+     * 议题ID
+     */
+	private String issueId;
+
+    /**
+     * 操作状态 - 表决中：voting 已转项目：shift_project 已关闭：closed
+     */
+	private String issueStatus;
+
+    /**
+     * 组织类型 操作人所属机构类型（机构：agency | 部门：dept | 网格：grid）操作人可能来源于居民端和政府段，但是只有在“转议题”的时候才是居民端拥有组长权限的人操作，所以当这条记录是转议题时，该记录为grid，ORD_ID相应的也为GRID_ID
+     */
+	private String orgType;
+
+    /**
+     * 组织ID 操作人所属机构ID（对应的有网格ID、部门ID、机构ID）
+     */
+	private String orgId;
+
+    /**
+     * 操作说明 (节点的说明文案，包含三个节点的文案说明【转议题】、【已关闭】、【转项目】)
+     */
+	private String operationExplain;
+
+    /**
+     * 删除标识 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/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueProjectRelationDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueProjectRelationDTO.java
new file mode 100644
index 0000000000..60f2ee0e97
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueProjectRelationDTO.java
@@ -0,0 +1,81 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 议题项目关系表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Data
+public class IssueProjectRelationDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID 主键ID
+     */
+	private String id;
+
+    /**
+     * 议题ID 议题ID
+     */
+	private String issueId;
+
+    /**
+     * 项目ID 项目ID
+     */
+	private String projectId;
+
+    /**
+     * 删除标识 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/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueSatisfactionDetailDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueSatisfactionDetailDTO.java
new file mode 100644
index 0000000000..04193ca547
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueSatisfactionDetailDTO.java
@@ -0,0 +1,86 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 议题满意度调查记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Data
+public class IssueSatisfactionDetailDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+	private String id;
+
+    /**
+     * 议题ID
+     */
+	private String issueId;
+
+    /**
+     * 评论 - 最多300字
+     */
+	private String comment;
+
+    /**
+     * 满意度 满意度 - 不满意:bad、基本满意:good、非常满意:perfect
+     */
+	private String satisfaction;
+
+    /**
+     * 删除标识 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/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueSatisfactionStatisticalDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueSatisfactionStatisticalDTO.java
new file mode 100644
index 0000000000..3e473491d6
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueSatisfactionStatisticalDTO.java
@@ -0,0 +1,91 @@
+/**
+ * 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 2020-05-11
+ */
+@Data
+public class IssueSatisfactionStatisticalDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+	private String id;
+
+    /**
+     * 议题ID
+     */
+	private String issueId;
+
+    /**
+     * 一般满意数
+     */
+	private Integer goodCount;
+
+    /**
+     * 非常满意数
+     */
+	private Integer perfectCount;
+
+    /**
+     * 不满意数
+     */
+	private Integer badCount;
+
+    /**
+     * 删除标识 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/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueVoteDetailDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueVoteDetailDTO.java
new file mode 100644
index 0000000000..6347f25532
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueVoteDetailDTO.java
@@ -0,0 +1,81 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 议题表决记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Data
+public class IssueVoteDetailDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+	private String id;
+
+    /**
+     * 议题ID
+     */
+	private String issueId;
+
+    /**
+     * 态度 - opposition（反对）support（赞成）
+     */
+	private String attitude;
+
+    /**
+     * 删除标识 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/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueVoteStatisticalDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueVoteStatisticalDTO.java
new file mode 100644
index 0000000000..1cee6baee6
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueVoteStatisticalDTO.java
@@ -0,0 +1,91 @@
+/**
+ * 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 2020-05-11
+ */
+@Data
+public class IssueVoteStatisticalDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+	private String id;
+
+    /**
+     * 议题ID
+     */
+	private String issueId;
+
+    /**
+     * 支持数
+     */
+	private Integer supportCount;
+
+    /**
+     * 反对数
+     */
+	private Integer oppositionCount;
+
+    /**
+     * 应表决数
+     */
+	private Integer votableCount;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 删除标识 0未删除、1已删除
+     */
+	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/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueVoteStatisticalDailyDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueVoteStatisticalDailyDTO.java
new file mode 100644
index 0000000000..73292ac02d
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/IssueVoteStatisticalDailyDTO.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.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 议题表决按天统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Data
+public class IssueVoteStatisticalDailyDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+	private String id;
+
+    /**
+     * 议题ID
+     */
+	private String issueId;
+
+    /**
+     * 统计日期 yyyy-MM-dd
+     */
+	private Date statisticalDate;
+
+    /**
+     * 到该日的总赞成数
+     */
+	private Integer supportCount;
+
+    /**
+     * 到该日的总反对数
+     */
+	private Integer oppositionCount;
+
+    /**
+     * 到该日的总票数
+     */
+	private Integer totalCount;
+
+    /**
+     * 该日增量
+     */
+	private Integer todayIncrement;
+
+    /**
+     * 该日赞成增量
+     */
+	private Integer supportIncrement;
+
+    /**
+     * 该日反对增量
+     */
+	private Integer oppositionIncrement;
+
+    /**
+     * 到该日的应表决数
+     */
+	private Integer votableCount;
+
+    /**
+     * 删除标识 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/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/TopicInfoDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/TopicInfoDTO.java
new file mode 100644
index 0000000000..6dcf993139
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/TopicInfoDTO.java
@@ -0,0 +1,43 @@
+package com.epmet.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * 话题详情(议题详情中的)
+ * @CreateTime 2020/5/11 9:36
+ */
+@Data
+public class TopicInfoDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 话题id
+     */
+    private String topicId;
+
+    /**
+     * 话题内容
+     */
+    private String topicContent;
+
+    /**
+     * 图片列表
+     */
+    private List<String> topicImgs;
+
+    /**
+     * 话题发表人（山东路168-尹女士）
+     */
+    private String publishedUser;
+
+    /**
+     * 话题发表时间 (时间戳 毫秒级)
+     */
+    private Long publishedTime;
+
+}
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/IssueDetailFormDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/IssueDetailFormDTO.java
new file mode 100644
index 0000000000..84b0d8f5e6
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/IssueDetailFormDTO.java
@@ -0,0 +1,21 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 议题详情入参
+ * @Author zxc
+ * @Date 2020/5/11 9:30
+ */
+@Data
+public class IssueDetailFormDTO implements Serializable {
+    private static final long serialVersionUID = 4859779755214503489L;
+
+    @NotBlank(message = "议题id不能为空")
+    private String issueId;
+
+}
+
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/IssueInitiatorFormDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/IssueInitiatorFormDTO.java
new file mode 100644
index 0000000000..42b2885f66
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/IssueInitiatorFormDTO.java
@@ -0,0 +1,23 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 查询议题发起人dto
+ * @CreateTime 2020/5/11 9:36
+ */
+@Data
+public class IssueInitiatorFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 话题id
+     */
+    private String topicId;
+
+
+}
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java
new file mode 100644
index 0000000000..8769c93e5b
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java
@@ -0,0 +1,49 @@
+package com.epmet.dto.result;
+
+import com.epmet.dto.TopicInfoDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 议题详情回参
+ * @CreateTime 2020/5/11 9:31
+ */
+@Data
+public class IssueDetailResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -1L;
+
+    /**
+     * 议题标题
+     */
+    private String issueTitle;
+
+    /**
+     * 议题状态(voting 已转项目：shift_project 已关闭：closed)
+     */
+    private String issueStatus;
+
+    /**
+     * 话题信息
+     */
+    private TopicInfoDTO topicInfo;
+
+    /**
+     * 议题建议
+     */
+    private String issueSuggestion;
+
+    /**
+     * 所属网格(网格所属机关单位名称-网格名称)
+     */
+    private String belongsGridName;
+
+    /**
+     * 议题发起人（山东路168-尹女士）
+     */
+    private String issueInitiator;
+
+
+}
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueInitiatorResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueInitiatorResultDTO.java
new file mode 100644
index 0000000000..08e0113ace
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueInitiatorResultDTO.java
@@ -0,0 +1,20 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 返回议题发起人dto     eg：山东路178号——刘女士
+ * @CreateTime 2020/5/11 10:49
+ */
+@Data
+public class IssueInitiatorResultDTO implements Serializable {
+
+    /**
+     * 议题发起人（山东路168-尹女士）
+     */
+    private String issueInitiator;
+
+}
diff --git a/epmet-module/resi-hall/resi-hall-server/pom.xml b/epmet-module/resi-hall/resi-hall-server/pom.xml
index 4c3d9cdefc..66d1426a33 100644
--- a/epmet-module/resi-hall/resi-hall-server/pom.xml
+++ b/epmet-module/resi-hall/resi-hall-server/pom.xml
@@ -19,6 +19,11 @@
             <artifactId>resi-hall-client</artifactId>
             <version>2.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-commons-mybatis</artifactId>
+            <version>2.0.0</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java
index a88ea4aa78..e14c45ec0c 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java
@@ -1,5 +1,14 @@
 package com.epmet.controller;
 
+import com.epmet.commons.tools.annotation.RequirePermission;
+import com.epmet.commons.tools.enums.RequirePermissionEnum;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.IssueDetailFormDTO;
+import com.epmet.dto.result.IssueDetailResultDTO;
+import com.epmet.service.IssueService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,5 +21,20 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("issue")
 public class IssueController {
 
+    @Autowired
+    private IssueService issueService;
+
+    /**
+     * @Description  议题详情
+     * @param issueDetail
+     * @author zxc
+     * @date 2020/5/11 9:42
+     */
+    @PostMapping(value = "/detail")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
+    public Result<IssueDetailResultDTO> detail(@RequestBody IssueDetailFormDTO issueDetail){
+        return new Result<IssueDetailResultDTO>().ok(issueService.detail(issueDetail));
+    }
+
 }
 
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueCustomerParameterController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueCustomerParameterController.java
new file mode 100644
index 0000000000..7371c32666
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueCustomerParameterController.java
@@ -0,0 +1,94 @@
+/**
+ * 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.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+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.IssueCustomerParameterDTO;
+import com.epmet.excel.IssueCustomerParameterExcel;
+import com.epmet.service.IssueCustomerParameterService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 议题客户参数定制表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@RestController
+@RequestMapping("issuecustomerparameter")
+public class IssueCustomerParameterController {
+    
+    @Autowired
+    private IssueCustomerParameterService issueCustomerParameterService;
+
+    @GetMapping("page")
+    public Result<PageData<IssueCustomerParameterDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<IssueCustomerParameterDTO> page = issueCustomerParameterService.page(params);
+        return new Result<PageData<IssueCustomerParameterDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<IssueCustomerParameterDTO> get(@PathVariable("id") String id){
+        IssueCustomerParameterDTO data = issueCustomerParameterService.get(id);
+        return new Result<IssueCustomerParameterDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody IssueCustomerParameterDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        issueCustomerParameterService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody IssueCustomerParameterDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        issueCustomerParameterService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        issueCustomerParameterService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<IssueCustomerParameterDTO> list = issueCustomerParameterService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, IssueCustomerParameterExcel.class);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueProcessController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueProcessController.java
new file mode 100644
index 0000000000..bf6c57f863
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueProcessController.java
@@ -0,0 +1,94 @@
+/**
+ * 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.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+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.IssueProcessDTO;
+import com.epmet.excel.IssueProcessExcel;
+import com.epmet.service.IssueProcessService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 议题进展记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@RestController
+@RequestMapping("issueprocess")
+public class IssueProcessController {
+    
+    @Autowired
+    private IssueProcessService issueProcessService;
+
+    @GetMapping("page")
+    public Result<PageData<IssueProcessDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<IssueProcessDTO> page = issueProcessService.page(params);
+        return new Result<PageData<IssueProcessDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<IssueProcessDTO> get(@PathVariable("id") String id){
+        IssueProcessDTO data = issueProcessService.get(id);
+        return new Result<IssueProcessDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody IssueProcessDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        issueProcessService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody IssueProcessDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        issueProcessService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        issueProcessService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<IssueProcessDTO> list = issueProcessService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, IssueProcessExcel.class);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueProjectRelationController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueProjectRelationController.java
new file mode 100644
index 0000000000..7efd1b1394
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueProjectRelationController.java
@@ -0,0 +1,94 @@
+/**
+ * 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.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+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.IssueProjectRelationDTO;
+import com.epmet.excel.IssueProjectRelationExcel;
+import com.epmet.service.IssueProjectRelationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 议题项目关系表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@RestController
+@RequestMapping("issueprojectrelation")
+public class IssueProjectRelationController {
+    
+    @Autowired
+    private IssueProjectRelationService issueProjectRelationService;
+
+    @GetMapping("page")
+    public Result<PageData<IssueProjectRelationDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<IssueProjectRelationDTO> page = issueProjectRelationService.page(params);
+        return new Result<PageData<IssueProjectRelationDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<IssueProjectRelationDTO> get(@PathVariable("id") String id){
+        IssueProjectRelationDTO data = issueProjectRelationService.get(id);
+        return new Result<IssueProjectRelationDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody IssueProjectRelationDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        issueProjectRelationService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody IssueProjectRelationDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        issueProjectRelationService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        issueProjectRelationService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<IssueProjectRelationDTO> list = issueProjectRelationService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, IssueProjectRelationExcel.class);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueSatisfactionDetailController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueSatisfactionDetailController.java
new file mode 100644
index 0000000000..8772539ab3
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueSatisfactionDetailController.java
@@ -0,0 +1,94 @@
+/**
+ * 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.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+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.IssueSatisfactionDetailDTO;
+import com.epmet.excel.IssueSatisfactionDetailExcel;
+import com.epmet.service.IssueSatisfactionDetailService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 议题满意度调查记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@RestController
+@RequestMapping("issuesatisfactiondetail")
+public class IssueSatisfactionDetailController {
+    
+    @Autowired
+    private IssueSatisfactionDetailService issueSatisfactionDetailService;
+
+    @GetMapping("page")
+    public Result<PageData<IssueSatisfactionDetailDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<IssueSatisfactionDetailDTO> page = issueSatisfactionDetailService.page(params);
+        return new Result<PageData<IssueSatisfactionDetailDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<IssueSatisfactionDetailDTO> get(@PathVariable("id") String id){
+        IssueSatisfactionDetailDTO data = issueSatisfactionDetailService.get(id);
+        return new Result<IssueSatisfactionDetailDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody IssueSatisfactionDetailDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        issueSatisfactionDetailService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody IssueSatisfactionDetailDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        issueSatisfactionDetailService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        issueSatisfactionDetailService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<IssueSatisfactionDetailDTO> list = issueSatisfactionDetailService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, IssueSatisfactionDetailExcel.class);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueSatisfactionStatisticalController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueSatisfactionStatisticalController.java
new file mode 100644
index 0000000000..f9412e0996
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueSatisfactionStatisticalController.java
@@ -0,0 +1,94 @@
+/**
+ * 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.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+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.IssueSatisfactionStatisticalDTO;
+import com.epmet.excel.IssueSatisfactionStatisticalExcel;
+import com.epmet.service.IssueSatisfactionStatisticalService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 议题满意度调查统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@RestController
+@RequestMapping("issuesatisfactionstatistical")
+public class IssueSatisfactionStatisticalController {
+    
+    @Autowired
+    private IssueSatisfactionStatisticalService issueSatisfactionStatisticalService;
+
+    @GetMapping("page")
+    public Result<PageData<IssueSatisfactionStatisticalDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<IssueSatisfactionStatisticalDTO> page = issueSatisfactionStatisticalService.page(params);
+        return new Result<PageData<IssueSatisfactionStatisticalDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<IssueSatisfactionStatisticalDTO> get(@PathVariable("id") String id){
+        IssueSatisfactionStatisticalDTO data = issueSatisfactionStatisticalService.get(id);
+        return new Result<IssueSatisfactionStatisticalDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody IssueSatisfactionStatisticalDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        issueSatisfactionStatisticalService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody IssueSatisfactionStatisticalDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        issueSatisfactionStatisticalService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        issueSatisfactionStatisticalService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<IssueSatisfactionStatisticalDTO> list = issueSatisfactionStatisticalService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, IssueSatisfactionStatisticalExcel.class);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteDetailController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteDetailController.java
new file mode 100644
index 0000000000..981aacf50e
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteDetailController.java
@@ -0,0 +1,94 @@
+/**
+ * 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.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+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.IssueVoteDetailDTO;
+import com.epmet.excel.IssueVoteDetailExcel;
+import com.epmet.service.IssueVoteDetailService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 议题表决记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@RestController
+@RequestMapping("issuevotedetail")
+public class IssueVoteDetailController {
+    
+    @Autowired
+    private IssueVoteDetailService issueVoteDetailService;
+
+    @GetMapping("page")
+    public Result<PageData<IssueVoteDetailDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<IssueVoteDetailDTO> page = issueVoteDetailService.page(params);
+        return new Result<PageData<IssueVoteDetailDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<IssueVoteDetailDTO> get(@PathVariable("id") String id){
+        IssueVoteDetailDTO data = issueVoteDetailService.get(id);
+        return new Result<IssueVoteDetailDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody IssueVoteDetailDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        issueVoteDetailService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody IssueVoteDetailDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        issueVoteDetailService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        issueVoteDetailService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<IssueVoteDetailDTO> list = issueVoteDetailService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, IssueVoteDetailExcel.class);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteStatisticalController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteStatisticalController.java
new file mode 100644
index 0000000000..ab98b72498
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteStatisticalController.java
@@ -0,0 +1,94 @@
+/**
+ * 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.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+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.IssueVoteStatisticalDTO;
+import com.epmet.excel.IssueVoteStatisticalExcel;
+import com.epmet.service.IssueVoteStatisticalService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 议题表决统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@RestController
+@RequestMapping("issuevotestatistical")
+public class IssueVoteStatisticalController {
+    
+    @Autowired
+    private IssueVoteStatisticalService issueVoteStatisticalService;
+
+    @GetMapping("page")
+    public Result<PageData<IssueVoteStatisticalDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<IssueVoteStatisticalDTO> page = issueVoteStatisticalService.page(params);
+        return new Result<PageData<IssueVoteStatisticalDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<IssueVoteStatisticalDTO> get(@PathVariable("id") String id){
+        IssueVoteStatisticalDTO data = issueVoteStatisticalService.get(id);
+        return new Result<IssueVoteStatisticalDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody IssueVoteStatisticalDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        issueVoteStatisticalService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody IssueVoteStatisticalDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        issueVoteStatisticalService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        issueVoteStatisticalService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<IssueVoteStatisticalDTO> list = issueVoteStatisticalService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, IssueVoteStatisticalExcel.class);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteStatisticalDailyController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteStatisticalDailyController.java
new file mode 100644
index 0000000000..7e5506354a
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteStatisticalDailyController.java
@@ -0,0 +1,94 @@
+/**
+ * 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.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+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.IssueVoteStatisticalDailyDTO;
+import com.epmet.excel.IssueVoteStatisticalDailyExcel;
+import com.epmet.service.IssueVoteStatisticalDailyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 议题表决按天统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@RestController
+@RequestMapping("issuevotestatisticaldaily")
+public class IssueVoteStatisticalDailyController {
+    
+    @Autowired
+    private IssueVoteStatisticalDailyService issueVoteStatisticalDailyService;
+
+    @GetMapping("page")
+    public Result<PageData<IssueVoteStatisticalDailyDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<IssueVoteStatisticalDailyDTO> page = issueVoteStatisticalDailyService.page(params);
+        return new Result<PageData<IssueVoteStatisticalDailyDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<IssueVoteStatisticalDailyDTO> get(@PathVariable("id") String id){
+        IssueVoteStatisticalDailyDTO data = issueVoteStatisticalDailyService.get(id);
+        return new Result<IssueVoteStatisticalDailyDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody IssueVoteStatisticalDailyDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        issueVoteStatisticalDailyService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody IssueVoteStatisticalDailyDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        issueVoteStatisticalDailyService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        issueVoteStatisticalDailyService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<IssueVoteStatisticalDailyDTO> list = issueVoteStatisticalDailyService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, IssueVoteStatisticalDailyExcel.class);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueCustomerParameterDao.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueCustomerParameterDao.java
new file mode 100644
index 0000000000..48fa1e3491
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueCustomerParameterDao.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;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IssueCustomerParameterEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 议题客户参数定制表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Mapper
+public interface IssueCustomerParameterDao extends BaseDao<IssueCustomerParameterEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueDao.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueDao.java
new file mode 100644
index 0000000000..8f390edc63
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueDao.java
@@ -0,0 +1,43 @@
+/**
+ * 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;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.form.IssueDetailFormDTO;
+import com.epmet.dto.result.IssueDetailResultDTO;
+import com.epmet.entity.IssueEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 议题详情 关联话题，转议题时间必须要和话题转议题时间一致、关闭时间必须要和操作记录表的关闭记录时间一致、转项目时间必须要和项目记录生成时间一致，注意服务间调用的时间一致性。每个议题最后总会被关闭。
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Mapper
+public interface IssueDao extends BaseDao<IssueEntity> {
+
+    /**
+     * @Description  议题详情
+     * @param formDTO
+     * @author zxc
+     * @date 2020/5/11 10:11
+     */
+    IssueDetailResultDTO issueDetail(IssueDetailFormDTO formDTO);
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueProcessDao.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueProcessDao.java
new file mode 100644
index 0000000000..26603169ae
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueProcessDao.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;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IssueProcessEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 议题进展记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Mapper
+public interface IssueProcessDao extends BaseDao<IssueProcessEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueProjectRelationDao.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueProjectRelationDao.java
new file mode 100644
index 0000000000..430dc74741
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueProjectRelationDao.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;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IssueProjectRelationEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 议题项目关系表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Mapper
+public interface IssueProjectRelationDao extends BaseDao<IssueProjectRelationEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueSatisfactionDetailDao.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueSatisfactionDetailDao.java
new file mode 100644
index 0000000000..01727f507a
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueSatisfactionDetailDao.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;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IssueSatisfactionDetailEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 议题满意度调查记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Mapper
+public interface IssueSatisfactionDetailDao extends BaseDao<IssueSatisfactionDetailEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueSatisfactionStatisticalDao.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueSatisfactionStatisticalDao.java
new file mode 100644
index 0000000000..e3eeabb823
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueSatisfactionStatisticalDao.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;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IssueSatisfactionStatisticalEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 议题满意度调查统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Mapper
+public interface IssueSatisfactionStatisticalDao extends BaseDao<IssueSatisfactionStatisticalEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java
new file mode 100644
index 0000000000..f8a41e3747
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.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;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IssueVoteDetailEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 议题表决记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Mapper
+public interface IssueVoteDetailDao extends BaseDao<IssueVoteDetailEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDailyDao.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDailyDao.java
new file mode 100644
index 0000000000..e09695b2b8
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDailyDao.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;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IssueVoteStatisticalDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 议题表决按天统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Mapper
+public interface IssueVoteStatisticalDailyDao extends BaseDao<IssueVoteStatisticalDailyEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java
new file mode 100644
index 0000000000..7f833487d8
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.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;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IssueVoteStatisticalEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 议题表决统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Mapper
+public interface IssueVoteStatisticalDao extends BaseDao<IssueVoteStatisticalEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueCustomerParameterEntity.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueCustomerParameterEntity.java
new file mode 100644
index 0000000000..72e7769da7
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueCustomerParameterEntity.java
@@ -0,0 +1,66 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity;
+
+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-05-11
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("issue_customer_parameter")
+public class IssueCustomerParameterEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 参数键 eg:voting_time_limit
+     */
+	private String parameterKey;
+
+    /**
+     * 参数名 eg:表决期限
+     */
+	private String parameterName;
+
+    /**
+     * 参数值 eg:10（天）
+     */
+	private String parameterValue;
+
+    /**
+     * 参数说明 eg:这个客户下所有的网格议题表决期限都是10天
+     */
+	private String description;
+
+}
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueEntity.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueEntity.java
new file mode 100644
index 0000000000..cfa9b8c046
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueEntity.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;
+
+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-05-11
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("issue")
+public class IssueEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 议题状态 表决中：voting 已转项目：shift_project 已关闭：closed
+     */
+	private String issueStatus;
+
+    /**
+     * 来源类型 eg:resi_topic
+     */
+	private String sourceType;
+
+    /**
+     * 来源ID eg:2223232(当SOURCE_TYPE为"resi_topic"时，这里指话题的ID)
+     */
+	private String sourceId;
+
+    /**
+     * 关闭理由 【未关闭时可以为空】关闭话题时必填的理由，转项目后而且已经结案，这个字段不回写
+     */
+	private String closeReason;
+
+    /**
+     * 解决类型 【未关闭时可以为空】已解决resloved、未解决unresloved，对应在关闭议题时所选的checkbox，转项目后而且已经结案，这个字段不回写
+     */
+	private String resolveType;
+
+    /**
+     * 议题名称 最多20字
+     */
+	private String issueTitle;
+
+    /**
+     * 建议 建议
+     */
+	private String suggestion;
+
+    /**
+     * 客户ID 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 网格ID 居民端议题对应一个网格iId
+     */
+	private String gridId;
+
+    /**
+     * 所属机关 【数据权限-非必填】11:22:33(agencyId)数据权限控制
+     */
+	private String orgIdPath;
+
+    /**
+     * 组织ID 【数据权限-非必填】agencyId
+     */
+	private String orgId;
+
+    /**
+     * 表决截止日期 表决截止日期
+     */
+	private Date votingDeadline;
+
+    /**
+     * 表决发起日期（转议题日期） 表决发起日期（转议题日期）
+     */
+	private Date decidedTime;
+
+    /**
+     * 转项目日期 转项目日期（服务间调用日期一致性）
+     */
+	private Date shiftedTime;
+
+    /**
+     * 关闭日期 关闭日期
+     */
+	private Date closedTime;
+
+}
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueProcessEntity.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueProcessEntity.java
new file mode 100644
index 0000000000..701a3c6c61
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueProcessEntity.java
@@ -0,0 +1,66 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity;
+
+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-05-11
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("issue_process")
+public class IssueProcessEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 议题ID
+     */
+	private String issueId;
+
+    /**
+     * 操作状态 - 表决中：voting 已转项目：shift_project 已关闭：closed
+     */
+	private String issueStatus;
+
+    /**
+     * 组织类型 操作人所属机构类型（机构：agency | 部门：dept | 网格：grid）操作人可能来源于居民端和政府段，但是只有在“转议题”的时候才是居民端拥有组长权限的人操作，所以当这条记录是转议题时，该记录为grid，ORD_ID相应的也为GRID_ID
+     */
+	private String orgType;
+
+    /**
+     * 组织ID 操作人所属机构ID（对应的有网格ID、部门ID、机构ID）
+     */
+	private String orgId;
+
+    /**
+     * 操作说明 (节点的说明文案，包含三个节点的文案说明【转议题】、【已关闭】、【转项目】)
+     */
+	private String operationExplain;
+
+}
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueProjectRelationEntity.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueProjectRelationEntity.java
new file mode 100644
index 0000000000..c1fcf5f579
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueProjectRelationEntity.java
@@ -0,0 +1,51 @@
+/**
+ * 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;
+
+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-05-11
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("issue_project_relation")
+public class IssueProjectRelationEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 议题ID 议题ID
+     */
+	private String issueId;
+
+    /**
+     * 项目ID 项目ID
+     */
+	private String projectId;
+
+}
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueSatisfactionDetailEntity.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueSatisfactionDetailEntity.java
new file mode 100644
index 0000000000..d36fdababc
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueSatisfactionDetailEntity.java
@@ -0,0 +1,56 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity;
+
+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-05-11
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("issue_satisfaction_detail")
+public class IssueSatisfactionDetailEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 议题ID
+     */
+	private String issueId;
+
+    /**
+     * 评论 - 最多300字
+     */
+	private String comment;
+
+    /**
+     * 满意度 满意度 - 不满意:bad、基本满意:good、非常满意:perfect
+     */
+	private String satisfaction;
+
+}
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueSatisfactionStatisticalEntity.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueSatisfactionStatisticalEntity.java
new file mode 100644
index 0000000000..243b1e441a
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueSatisfactionStatisticalEntity.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity;
+
+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-05-11
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("issue_satisfaction_statistical")
+public class IssueSatisfactionStatisticalEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 议题ID
+     */
+	private String issueId;
+
+    /**
+     * 一般满意数
+     */
+	private Integer goodCount;
+
+    /**
+     * 非常满意数
+     */
+	private Integer perfectCount;
+
+    /**
+     * 不满意数
+     */
+	private Integer badCount;
+
+}
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteDetailEntity.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteDetailEntity.java
new file mode 100644
index 0000000000..1f3381b687
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteDetailEntity.java
@@ -0,0 +1,51 @@
+/**
+ * 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;
+
+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-05-11
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("issue_vote_detail")
+public class IssueVoteDetailEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 议题ID
+     */
+	private String issueId;
+
+    /**
+     * 态度 - opposition（反对）support（赞成）
+     */
+	private String attitude;
+
+}
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteStatisticalDailyEntity.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteStatisticalDailyEntity.java
new file mode 100644
index 0000000000..92feff0236
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteStatisticalDailyEntity.java
@@ -0,0 +1,86 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity;
+
+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-05-11
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("issue_vote_statistical_daily")
+public class IssueVoteStatisticalDailyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 议题ID
+     */
+	private String issueId;
+
+    /**
+     * 统计日期 yyyy-MM-dd
+     */
+	private Date statisticalDate;
+
+    /**
+     * 到该日的总赞成数
+     */
+	private Integer supportCount;
+
+    /**
+     * 到该日的总反对数
+     */
+	private Integer oppositionCount;
+
+    /**
+     * 到该日的总票数
+     */
+	private Integer totalCount;
+
+    /**
+     * 该日增量
+     */
+	private Integer todayIncrement;
+
+    /**
+     * 该日赞成增量
+     */
+	private Integer supportIncrement;
+
+    /**
+     * 该日反对增量
+     */
+	private Integer oppositionIncrement;
+
+    /**
+     * 到该日的应表决数
+     */
+	private Integer votableCount;
+
+}
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteStatisticalEntity.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteStatisticalEntity.java
new file mode 100644
index 0000000000..d287eddf27
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteStatisticalEntity.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity;
+
+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-05-11
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("issue_vote_statistical")
+public class IssueVoteStatisticalEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 议题ID
+     */
+	private String issueId;
+
+    /**
+     * 支持数
+     */
+	private Integer supportCount;
+
+    /**
+     * 反对数
+     */
+	private Integer oppositionCount;
+
+    /**
+     * 应表决数
+     */
+	private Integer votableCount;
+
+}
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueCustomerParameterExcel.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueCustomerParameterExcel.java
new file mode 100644
index 0000000000..9ede57879c
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueCustomerParameterExcel.java
@@ -0,0 +1,71 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 议题客户参数定制表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Data
+public class IssueCustomerParameterExcel {
+
+    @Excel(name = "主键ID")
+    private String id;
+
+    @Excel(name = "客户ID")
+    private String customerId;
+
+    @Excel(name = "参数键 eg:voting_time_limit")
+    private String parameterKey;
+
+    @Excel(name = "参数名 eg:表决期限")
+    private String parameterName;
+
+    @Excel(name = "参数值 eg:10（天）")
+    private String parameterValue;
+
+    @Excel(name = "参数说明 eg:这个客户下所有的网格议题表决期限都是10天")
+    private String description;
+
+    @Excel(name = "删除标志 0：未删除，1：已删除")
+    private String delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueExcel.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueExcel.java
new file mode 100644
index 0000000000..0f674d8e26
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueExcel.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.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 议题详情表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Data
+public class IssueExcel {
+
+    @Excel(name = "议题ID")
+    private String id;
+
+    @Excel(name = "议题状态 表决中：voting 已转项目：shift_project 已关闭：closed")
+    private String issueStatus;
+
+    @Excel(name = "来源类型 eg:resi_topic")
+    private String sourceType;
+
+    @Excel(name = "来源ID eg:2223232(当SOURCE_TYPE为"resi_topic"时，这里指话题的ID)")
+    private String sourceId;
+
+    @Excel(name = "关闭理由 【未关闭时可以为空】关闭议题时必填的理由，转项目后而且已经结案，这个字段不回写")
+    private String closeReason;
+
+    @Excel(name = "解决类型 【未关闭时可以为空】已解决resloved、未解决unresloved，对应在关闭议题时所选的checkbox，转项目后而且已经结案，这个字段不回写")
+    private String resolveType;
+
+    @Excel(name = "议题名称 最多20字")
+    private String issueTitle;
+
+    @Excel(name = "建议 最多1000字")
+    private String suggestion;
+
+    @Excel(name = "客户ID")
+    private String customerId;
+
+    @Excel(name = "网格ID 居民端议题对应一个网格Id")
+    private String gridId;
+
+    @Excel(name = "所属机关 【数据权限-非必填】11:22:33(agencyId)数据权限控制")
+    private String orgIdPath;
+
+    @Excel(name = "组织ID 【数据权限-非必填】agencyId")
+    private String orgId;
+
+    @Excel(name = "表决截止日期")
+    private Date votingDeadline;
+
+    @Excel(name = "表决发起日期（转议题日期）")
+    private Date decidedTime;
+
+    @Excel(name = "转项目日期 （服务间调用日期一致性）")
+    private Date shiftedTime;
+
+    @Excel(name = "关闭日期")
+    private Date closedTime;
+
+    @Excel(name = "删除标识 0未删除、1已删除")
+    private String delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueProcessExcel.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueProcessExcel.java
new file mode 100644
index 0000000000..587e28e8c2
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueProcessExcel.java
@@ -0,0 +1,71 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 议题进展记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Data
+public class IssueProcessExcel {
+
+    @Excel(name = "主键ID")
+    private String id;
+
+    @Excel(name = "议题ID")
+    private String issueId;
+
+    @Excel(name = "操作状态 - 表决中：voting 已转项目：shift_project 已关闭：closed")
+    private String issueStatus;
+
+    @Excel(name = "组织类型 操作人所属机构类型（机构：agency | 部门：dept | 网格：grid）操作人可能来源于居民端和政府段，但是只有在“转议题”的时候才是居民端拥有组长权限的人操作，所以当这条记录是转议题时，该记录为grid，ORD_ID相应的也为GRID_ID")
+    private String orgType;
+
+    @Excel(name = "组织ID 操作人所属机构ID（对应的有网格ID、部门ID、机构ID）")
+    private String orgId;
+
+    @Excel(name = "操作说明 (节点的说明文案，包含三个节点的文案说明【转议题】、【已关闭】、【转项目】)")
+    private String operationExplain;
+
+    @Excel(name = "删除标识 0未删除、1已删除")
+    private String delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueProjectRelationExcel.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueProjectRelationExcel.java
new file mode 100644
index 0000000000..620eee36c1
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueProjectRelationExcel.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.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 议题项目关系表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Data
+public class IssueProjectRelationExcel {
+
+    @Excel(name = "主键ID 主键ID")
+    private String id;
+
+    @Excel(name = "议题ID 议题ID")
+    private String issueId;
+
+    @Excel(name = "项目ID 项目ID")
+    private String projectId;
+
+    @Excel(name = "删除标识 0：未删除1：已删除")
+    private String delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间 议题转项目时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueSatisfactionDetailExcel.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueSatisfactionDetailExcel.java
new file mode 100644
index 0000000000..804d0bbacc
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueSatisfactionDetailExcel.java
@@ -0,0 +1,65 @@
+/**
+ * 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.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 议题满意度调查记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Data
+public class IssueSatisfactionDetailExcel {
+
+    @Excel(name = "主键ID")
+    private String id;
+
+    @Excel(name = "议题ID")
+    private String issueId;
+
+    @Excel(name = "评论 - 最多300字")
+    private String comment;
+
+    @Excel(name = "满意度 满意度 - 不满意:bad、基本满意:good、非常满意:perfect")
+    private String satisfaction;
+
+    @Excel(name = "删除标识 0未删除、1已删除")
+    private String delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueSatisfactionStatisticalExcel.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueSatisfactionStatisticalExcel.java
new file mode 100644
index 0000000000..be2b748413
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueSatisfactionStatisticalExcel.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.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 议题满意度调查统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Data
+public class IssueSatisfactionStatisticalExcel {
+
+    @Excel(name = "主键ID")
+    private String id;
+
+    @Excel(name = "议题ID")
+    private String issueId;
+
+    @Excel(name = "一般满意数")
+    private Integer goodCount;
+
+    @Excel(name = "非常满意数")
+    private Integer perfectCount;
+
+    @Excel(name = "不满意数")
+    private Integer badCount;
+
+    @Excel(name = "删除标识 0未删除、1已删除")
+    private String delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueVoteDetailExcel.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueVoteDetailExcel.java
new file mode 100644
index 0000000000..5ea0c106a3
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueVoteDetailExcel.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.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 议题表决记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Data
+public class IssueVoteDetailExcel {
+
+    @Excel(name = "主键ID")
+    private String id;
+
+    @Excel(name = "议题ID")
+    private String issueId;
+
+    @Excel(name = "态度 - opposition（反对）support（赞成）")
+    private String attitude;
+
+    @Excel(name = "删除标识 0未删除、1已删除")
+    private String delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueVoteStatisticalDailyExcel.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueVoteStatisticalDailyExcel.java
new file mode 100644
index 0000000000..deafe9f0b9
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueVoteStatisticalDailyExcel.java
@@ -0,0 +1,83 @@
+/**
+ * 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.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 议题表决按天统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Data
+public class IssueVoteStatisticalDailyExcel {
+
+    @Excel(name = "主键ID")
+    private String id;
+
+    @Excel(name = "议题ID")
+    private String issueId;
+
+    @Excel(name = "统计日期 yyyy-MM-dd")
+    private Date statisticalDate;
+
+    @Excel(name = "到该日的总赞成数")
+    private Integer supportCount;
+
+    @Excel(name = "到该日的总反对数")
+    private Integer oppositionCount;
+
+    @Excel(name = "到该日的总票数")
+    private Integer totalCount;
+
+    @Excel(name = "该日增量")
+    private Integer todayIncrement;
+
+    @Excel(name = "该日赞成增量")
+    private Integer supportIncrement;
+
+    @Excel(name = "该日反对增量")
+    private Integer oppositionIncrement;
+
+    @Excel(name = "到该日的应表决数")
+    private Integer votableCount;
+
+    @Excel(name = "删除标识 0未删除、1已删除")
+    private String delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueVoteStatisticalExcel.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueVoteStatisticalExcel.java
new file mode 100644
index 0000000000..ffa83424a8
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueVoteStatisticalExcel.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.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 议题表决统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Data
+public class IssueVoteStatisticalExcel {
+
+    @Excel(name = "主键ID")
+    private String id;
+
+    @Excel(name = "议题ID")
+    private String issueId;
+
+    @Excel(name = "支持数")
+    private Integer supportCount;
+
+    @Excel(name = "反对数")
+    private Integer oppositionCount;
+
+    @Excel(name = "应表决数")
+    private Integer votableCount;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "删除标识 0未删除、1已删除")
+    private String delFlag;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
new file mode 100644
index 0000000000..168555cc4a
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
@@ -0,0 +1,30 @@
+package com.epmet.feign;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.IssueInitiatorFormDTO;
+import com.epmet.dto.result.IssueInitiatorResultDTO;
+import com.epmet.feign.fallback.EpmetUserFeignClientFallBack;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * @author zxc
+ * @dscription
+ * @date 2020/5/11 10:32
+ */
+//url = "8087"
+@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class)
+public interface EpmetUserFeignClient {
+
+	/**
+	 * @Description  查询议题发起人
+	 * @param formDTO
+	 * @author zxc
+	 * @date 2020/5/11 10:53
+	 */
+	@PostMapping(value = "/epmetuser/userresiinfo/selectissueinitiator")
+	Result<IssueInitiatorResultDTO> selectIssueInitiator(@RequestBody IssueInitiatorFormDTO formDTO);
+
+}
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
new file mode 100644
index 0000000000..e7003949aa
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
@@ -0,0 +1,28 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.IssueInitiatorFormDTO;
+import com.epmet.dto.result.IssueInitiatorResultDTO;
+import com.epmet.feign.EpmetUserFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Auther zxc
+ * @Create 2020-05-11 10:33
+ */
+@Component
+public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
+
+    /**
+     * @Description  查询议题发起人
+     * @param formDTO
+     * @author zxc
+     * @date 2020/5/11 10:52
+     */
+    @Override
+    public Result<IssueInitiatorResultDTO> selectIssueInitiator(IssueInitiatorFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "selectIssueInitiator", formDTO);
+    }
+}
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueCustomerParameterRedis.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueCustomerParameterRedis.java
new file mode 100644
index 0000000000..1152ccab05
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueCustomerParameterRedis.java
@@ -0,0 +1,47 @@
+/**
+ * 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.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 议题客户参数定制表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Component
+public class IssueCustomerParameterRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueProcessRedis.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueProcessRedis.java
new file mode 100644
index 0000000000..d550f5bf5e
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueProcessRedis.java
@@ -0,0 +1,47 @@
+/**
+ * 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.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 议题进展记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Component
+public class IssueProcessRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueProjectRelationRedis.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueProjectRelationRedis.java
new file mode 100644
index 0000000000..75ec7d9d0d
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueProjectRelationRedis.java
@@ -0,0 +1,47 @@
+/**
+ * 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.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 议题项目关系表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Component
+public class IssueProjectRelationRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueRedis.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueRedis.java
new file mode 100644
index 0000000000..cfed63cb4d
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueRedis.java
@@ -0,0 +1,47 @@
+/**
+ * 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.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 议题详情表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Component
+public class IssueRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueSatisfactionDetailRedis.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueSatisfactionDetailRedis.java
new file mode 100644
index 0000000000..706304b1ff
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueSatisfactionDetailRedis.java
@@ -0,0 +1,47 @@
+/**
+ * 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.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 议题满意度调查记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Component
+public class IssueSatisfactionDetailRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueSatisfactionStatisticalRedis.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueSatisfactionStatisticalRedis.java
new file mode 100644
index 0000000000..6d5d8ec0dc
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueSatisfactionStatisticalRedis.java
@@ -0,0 +1,47 @@
+/**
+ * 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.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 议题满意度调查统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Component
+public class IssueSatisfactionStatisticalRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java
new file mode 100644
index 0000000000..89c8f04994
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java
@@ -0,0 +1,47 @@
+/**
+ * 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.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 议题表决记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Component
+public class IssueVoteDetailRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueVoteStatisticalDailyRedis.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueVoteStatisticalDailyRedis.java
new file mode 100644
index 0000000000..852ff4a3e7
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueVoteStatisticalDailyRedis.java
@@ -0,0 +1,47 @@
+/**
+ * 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.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 议题表决按天统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Component
+public class IssueVoteStatisticalDailyRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueVoteStatisticalRedis.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueVoteStatisticalRedis.java
new file mode 100644
index 0000000000..c9c928f08f
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueVoteStatisticalRedis.java
@@ -0,0 +1,47 @@
+/**
+ * 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.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 议题表决统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Component
+public class IssueVoteStatisticalRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueCustomerParameterService.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueCustomerParameterService.java
new file mode 100644
index 0000000000..941d8efde9
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueCustomerParameterService.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;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.IssueCustomerParameterDTO;
+import com.epmet.entity.IssueCustomerParameterEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 议题客户参数定制表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+public interface IssueCustomerParameterService extends BaseService<IssueCustomerParameterEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<IssueCustomerParameterDTO>
+     * @author generator
+     * @date 2020-05-11
+     */
+    PageData<IssueCustomerParameterDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<IssueCustomerParameterDTO>
+     * @author generator
+     * @date 2020-05-11
+     */
+    List<IssueCustomerParameterDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return IssueCustomerParameterDTO
+     * @author generator
+     * @date 2020-05-11
+     */
+    IssueCustomerParameterDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void save(IssueCustomerParameterDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void update(IssueCustomerParameterDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueProcessService.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueProcessService.java
new file mode 100644
index 0000000000..fa285655aa
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueProcessService.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;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.IssueProcessDTO;
+import com.epmet.entity.IssueProcessEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 议题进展记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+public interface IssueProcessService extends BaseService<IssueProcessEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<IssueProcessDTO>
+     * @author generator
+     * @date 2020-05-11
+     */
+    PageData<IssueProcessDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<IssueProcessDTO>
+     * @author generator
+     * @date 2020-05-11
+     */
+    List<IssueProcessDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return IssueProcessDTO
+     * @author generator
+     * @date 2020-05-11
+     */
+    IssueProcessDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void save(IssueProcessDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void update(IssueProcessDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueProjectRelationService.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueProjectRelationService.java
new file mode 100644
index 0000000000..1381151c65
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueProjectRelationService.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;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.IssueProjectRelationDTO;
+import com.epmet.entity.IssueProjectRelationEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 议题项目关系表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+public interface IssueProjectRelationService extends BaseService<IssueProjectRelationEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<IssueProjectRelationDTO>
+     * @author generator
+     * @date 2020-05-11
+     */
+    PageData<IssueProjectRelationDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<IssueProjectRelationDTO>
+     * @author generator
+     * @date 2020-05-11
+     */
+    List<IssueProjectRelationDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return IssueProjectRelationDTO
+     * @author generator
+     * @date 2020-05-11
+     */
+    IssueProjectRelationDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void save(IssueProjectRelationDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void update(IssueProjectRelationDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueSatisfactionDetailService.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueSatisfactionDetailService.java
new file mode 100644
index 0000000000..ab47a3797a
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueSatisfactionDetailService.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;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.IssueSatisfactionDetailDTO;
+import com.epmet.entity.IssueSatisfactionDetailEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 议题满意度调查记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+public interface IssueSatisfactionDetailService extends BaseService<IssueSatisfactionDetailEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<IssueSatisfactionDetailDTO>
+     * @author generator
+     * @date 2020-05-11
+     */
+    PageData<IssueSatisfactionDetailDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<IssueSatisfactionDetailDTO>
+     * @author generator
+     * @date 2020-05-11
+     */
+    List<IssueSatisfactionDetailDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return IssueSatisfactionDetailDTO
+     * @author generator
+     * @date 2020-05-11
+     */
+    IssueSatisfactionDetailDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void save(IssueSatisfactionDetailDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void update(IssueSatisfactionDetailDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueSatisfactionStatisticalService.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueSatisfactionStatisticalService.java
new file mode 100644
index 0000000000..0d21c0cc99
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueSatisfactionStatisticalService.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;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.IssueSatisfactionStatisticalDTO;
+import com.epmet.entity.IssueSatisfactionStatisticalEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 议题满意度调查统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+public interface IssueSatisfactionStatisticalService extends BaseService<IssueSatisfactionStatisticalEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<IssueSatisfactionStatisticalDTO>
+     * @author generator
+     * @date 2020-05-11
+     */
+    PageData<IssueSatisfactionStatisticalDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<IssueSatisfactionStatisticalDTO>
+     * @author generator
+     * @date 2020-05-11
+     */
+    List<IssueSatisfactionStatisticalDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return IssueSatisfactionStatisticalDTO
+     * @author generator
+     * @date 2020-05-11
+     */
+    IssueSatisfactionStatisticalDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void save(IssueSatisfactionStatisticalDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void update(IssueSatisfactionStatisticalDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueService.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueService.java
new file mode 100644
index 0000000000..a6bc3862f2
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueService.java
@@ -0,0 +1,22 @@
+package com.epmet.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.dto.form.IssueDetailFormDTO;
+import com.epmet.dto.result.IssueDetailResultDTO;
+import com.epmet.entity.IssueEntity;
+
+/**
+ * @Author zxc
+ * @CreateTime 2020/5/11 9:44
+ */
+public interface IssueService extends BaseService<IssueEntity> {
+
+    /**
+     * @Description  议题详情
+     * @param issueDetail
+     * @author zxc
+     * @date 2020/5/11 10:04
+     */
+    IssueDetailResultDTO detail(IssueDetailFormDTO issueDetail);
+
+}
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteDetailService.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteDetailService.java
new file mode 100644
index 0000000000..36f3e0579c
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteDetailService.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;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.IssueVoteDetailDTO;
+import com.epmet.entity.IssueVoteDetailEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 议题表决记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+public interface IssueVoteDetailService extends BaseService<IssueVoteDetailEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<IssueVoteDetailDTO>
+     * @author generator
+     * @date 2020-05-11
+     */
+    PageData<IssueVoteDetailDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<IssueVoteDetailDTO>
+     * @author generator
+     * @date 2020-05-11
+     */
+    List<IssueVoteDetailDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return IssueVoteDetailDTO
+     * @author generator
+     * @date 2020-05-11
+     */
+    IssueVoteDetailDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void save(IssueVoteDetailDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void update(IssueVoteDetailDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteStatisticalDailyService.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteStatisticalDailyService.java
new file mode 100644
index 0000000000..c40851887d
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteStatisticalDailyService.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;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.IssueVoteStatisticalDailyDTO;
+import com.epmet.entity.IssueVoteStatisticalDailyEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 议题表决按天统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+public interface IssueVoteStatisticalDailyService extends BaseService<IssueVoteStatisticalDailyEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<IssueVoteStatisticalDailyDTO>
+     * @author generator
+     * @date 2020-05-11
+     */
+    PageData<IssueVoteStatisticalDailyDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<IssueVoteStatisticalDailyDTO>
+     * @author generator
+     * @date 2020-05-11
+     */
+    List<IssueVoteStatisticalDailyDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return IssueVoteStatisticalDailyDTO
+     * @author generator
+     * @date 2020-05-11
+     */
+    IssueVoteStatisticalDailyDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void save(IssueVoteStatisticalDailyDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void update(IssueVoteStatisticalDailyDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java
new file mode 100644
index 0000000000..4d54243be0
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.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;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.IssueVoteStatisticalDTO;
+import com.epmet.entity.IssueVoteStatisticalEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 议题表决统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+public interface IssueVoteStatisticalService extends BaseService<IssueVoteStatisticalEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<IssueVoteStatisticalDTO>
+     * @author generator
+     * @date 2020-05-11
+     */
+    PageData<IssueVoteStatisticalDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<IssueVoteStatisticalDTO>
+     * @author generator
+     * @date 2020-05-11
+     */
+    List<IssueVoteStatisticalDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return IssueVoteStatisticalDTO
+     * @author generator
+     * @date 2020-05-11
+     */
+    IssueVoteStatisticalDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void save(IssueVoteStatisticalDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void update(IssueVoteStatisticalDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueCustomerParameterServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueCustomerParameterServiceImpl.java
new file mode 100644
index 0000000000..1a751ab574
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueCustomerParameterServiceImpl.java
@@ -0,0 +1,99 @@
+/**
+ * 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.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.IssueCustomerParameterDao;
+import com.epmet.dto.IssueCustomerParameterDTO;
+import com.epmet.entity.IssueCustomerParameterEntity;
+import com.epmet.service.IssueCustomerParameterService;
+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 2020-05-11
+ */
+@Service
+public class IssueCustomerParameterServiceImpl extends BaseServiceImpl<IssueCustomerParameterDao, IssueCustomerParameterEntity> implements IssueCustomerParameterService {
+
+    @Override
+    public PageData<IssueCustomerParameterDTO> page(Map<String, Object> params) {
+        IPage<IssueCustomerParameterEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, IssueCustomerParameterDTO.class);
+    }
+
+    @Override
+    public List<IssueCustomerParameterDTO> list(Map<String, Object> params) {
+        List<IssueCustomerParameterEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, IssueCustomerParameterDTO.class);
+    }
+
+    private QueryWrapper<IssueCustomerParameterEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<IssueCustomerParameterEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public IssueCustomerParameterDTO get(String id) {
+        IssueCustomerParameterEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, IssueCustomerParameterDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(IssueCustomerParameterDTO dto) {
+        IssueCustomerParameterEntity entity = ConvertUtils.sourceToTarget(dto, IssueCustomerParameterEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(IssueCustomerParameterDTO dto) {
+        IssueCustomerParameterEntity entity = ConvertUtils.sourceToTarget(dto, IssueCustomerParameterEntity.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/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java
new file mode 100644
index 0000000000..fad2ebfb01
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java
@@ -0,0 +1,104 @@
+/**
+ * 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.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.IssueProcessDao;
+import com.epmet.dto.IssueProcessDTO;
+import com.epmet.entity.IssueProcessEntity;
+import com.epmet.redis.IssueProcessRedis;
+import com.epmet.service.IssueProcessService;
+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 2020-05-11
+ */
+@Service
+public class IssueProcessServiceImpl extends BaseServiceImpl<IssueProcessDao, IssueProcessEntity> implements IssueProcessService {
+
+    @Autowired
+    private IssueProcessRedis issueProcessRedis;
+
+    @Override
+    public PageData<IssueProcessDTO> page(Map<String, Object> params) {
+        IPage<IssueProcessEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, IssueProcessDTO.class);
+    }
+
+    @Override
+    public List<IssueProcessDTO> list(Map<String, Object> params) {
+        List<IssueProcessEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, IssueProcessDTO.class);
+    }
+
+    private QueryWrapper<IssueProcessEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<IssueProcessEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public IssueProcessDTO get(String id) {
+        IssueProcessEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, IssueProcessDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(IssueProcessDTO dto) {
+        IssueProcessEntity entity = ConvertUtils.sourceToTarget(dto, IssueProcessEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(IssueProcessDTO dto) {
+        IssueProcessEntity entity = ConvertUtils.sourceToTarget(dto, IssueProcessEntity.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/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueProjectRelationServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueProjectRelationServiceImpl.java
new file mode 100644
index 0000000000..2b40a83079
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueProjectRelationServiceImpl.java
@@ -0,0 +1,104 @@
+/**
+ * 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.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.IssueProjectRelationDao;
+import com.epmet.dto.IssueProjectRelationDTO;
+import com.epmet.entity.IssueProjectRelationEntity;
+import com.epmet.redis.IssueProjectRelationRedis;
+import com.epmet.service.IssueProjectRelationService;
+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 2020-05-11
+ */
+@Service
+public class IssueProjectRelationServiceImpl extends BaseServiceImpl<IssueProjectRelationDao, IssueProjectRelationEntity> implements IssueProjectRelationService {
+
+    @Autowired
+    private IssueProjectRelationRedis issueProjectRelationRedis;
+
+    @Override
+    public PageData<IssueProjectRelationDTO> page(Map<String, Object> params) {
+        IPage<IssueProjectRelationEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, IssueProjectRelationDTO.class);
+    }
+
+    @Override
+    public List<IssueProjectRelationDTO> list(Map<String, Object> params) {
+        List<IssueProjectRelationEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, IssueProjectRelationDTO.class);
+    }
+
+    private QueryWrapper<IssueProjectRelationEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<IssueProjectRelationEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public IssueProjectRelationDTO get(String id) {
+        IssueProjectRelationEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, IssueProjectRelationDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(IssueProjectRelationDTO dto) {
+        IssueProjectRelationEntity entity = ConvertUtils.sourceToTarget(dto, IssueProjectRelationEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(IssueProjectRelationDTO dto) {
+        IssueProjectRelationEntity entity = ConvertUtils.sourceToTarget(dto, IssueProjectRelationEntity.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/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java
new file mode 100644
index 0000000000..5662e355c4
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java
@@ -0,0 +1,104 @@
+/**
+ * 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.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.IssueSatisfactionDetailDao;
+import com.epmet.dto.IssueSatisfactionDetailDTO;
+import com.epmet.entity.IssueSatisfactionDetailEntity;
+import com.epmet.redis.IssueSatisfactionDetailRedis;
+import com.epmet.service.IssueSatisfactionDetailService;
+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 2020-05-11
+ */
+@Service
+public class IssueSatisfactionDetailServiceImpl extends BaseServiceImpl<IssueSatisfactionDetailDao, IssueSatisfactionDetailEntity> implements IssueSatisfactionDetailService {
+
+    @Autowired
+    private IssueSatisfactionDetailRedis issueSatisfactionDetailRedis;
+
+    @Override
+    public PageData<IssueSatisfactionDetailDTO> page(Map<String, Object> params) {
+        IPage<IssueSatisfactionDetailEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, IssueSatisfactionDetailDTO.class);
+    }
+
+    @Override
+    public List<IssueSatisfactionDetailDTO> list(Map<String, Object> params) {
+        List<IssueSatisfactionDetailEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, IssueSatisfactionDetailDTO.class);
+    }
+
+    private QueryWrapper<IssueSatisfactionDetailEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<IssueSatisfactionDetailEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public IssueSatisfactionDetailDTO get(String id) {
+        IssueSatisfactionDetailEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, IssueSatisfactionDetailDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(IssueSatisfactionDetailDTO dto) {
+        IssueSatisfactionDetailEntity entity = ConvertUtils.sourceToTarget(dto, IssueSatisfactionDetailEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(IssueSatisfactionDetailDTO dto) {
+        IssueSatisfactionDetailEntity entity = ConvertUtils.sourceToTarget(dto, IssueSatisfactionDetailEntity.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/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueSatisfactionStatisticalServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueSatisfactionStatisticalServiceImpl.java
new file mode 100644
index 0000000000..f912e4d4c9
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueSatisfactionStatisticalServiceImpl.java
@@ -0,0 +1,104 @@
+/**
+ * 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.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.IssueSatisfactionStatisticalDao;
+import com.epmet.dto.IssueSatisfactionStatisticalDTO;
+import com.epmet.entity.IssueSatisfactionStatisticalEntity;
+import com.epmet.redis.IssueSatisfactionStatisticalRedis;
+import com.epmet.service.IssueSatisfactionStatisticalService;
+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 2020-05-11
+ */
+@Service
+public class IssueSatisfactionStatisticalServiceImpl extends BaseServiceImpl<IssueSatisfactionStatisticalDao, IssueSatisfactionStatisticalEntity> implements IssueSatisfactionStatisticalService {
+
+    @Autowired
+    private IssueSatisfactionStatisticalRedis issueSatisfactionStatisticalRedis;
+
+    @Override
+    public PageData<IssueSatisfactionStatisticalDTO> page(Map<String, Object> params) {
+        IPage<IssueSatisfactionStatisticalEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, IssueSatisfactionStatisticalDTO.class);
+    }
+
+    @Override
+    public List<IssueSatisfactionStatisticalDTO> list(Map<String, Object> params) {
+        List<IssueSatisfactionStatisticalEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, IssueSatisfactionStatisticalDTO.class);
+    }
+
+    private QueryWrapper<IssueSatisfactionStatisticalEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<IssueSatisfactionStatisticalEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public IssueSatisfactionStatisticalDTO get(String id) {
+        IssueSatisfactionStatisticalEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, IssueSatisfactionStatisticalDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(IssueSatisfactionStatisticalDTO dto) {
+        IssueSatisfactionStatisticalEntity entity = ConvertUtils.sourceToTarget(dto, IssueSatisfactionStatisticalEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(IssueSatisfactionStatisticalDTO dto) {
+        IssueSatisfactionStatisticalEntity entity = ConvertUtils.sourceToTarget(dto, IssueSatisfactionStatisticalEntity.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/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
new file mode 100644
index 0000000000..ccf27d6be4
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
@@ -0,0 +1,34 @@
+package com.epmet.service.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.dao.IssueDao;
+import com.epmet.dto.form.IssueDetailFormDTO;
+import com.epmet.dto.result.IssueDetailResultDTO;
+import com.epmet.entity.IssueEntity;
+import com.epmet.service.IssueService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author zxc
+ * @CreateTime 2020/5/11 9:46
+ */
+@Service
+public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> implements IssueService {
+
+    @Autowired
+    private IssueDao issueDao;
+
+    /**
+     * @Description  议题详情
+     * @param issueDetail
+     * @author zxc
+     * @date 2020/5/11 10:04
+     */
+    @Override
+    public IssueDetailResultDTO detail(IssueDetailFormDTO issueDetail) {
+        IssueDetailResultDTO issueDetailResult = issueDao.issueDetail(issueDetail);
+
+        return issueDetailResult;
+    }
+}
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java
new file mode 100644
index 0000000000..e63133484c
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java
@@ -0,0 +1,104 @@
+/**
+ * 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.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.IssueVoteDetailDao;
+import com.epmet.dto.IssueVoteDetailDTO;
+import com.epmet.entity.IssueVoteDetailEntity;
+import com.epmet.redis.IssueVoteDetailRedis;
+import com.epmet.service.IssueVoteDetailService;
+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 2020-05-11
+ */
+@Service
+public class IssueVoteDetailServiceImpl extends BaseServiceImpl<IssueVoteDetailDao, IssueVoteDetailEntity> implements IssueVoteDetailService {
+
+    @Autowired
+    private IssueVoteDetailRedis issueVoteDetailRedis;
+
+    @Override
+    public PageData<IssueVoteDetailDTO> page(Map<String, Object> params) {
+        IPage<IssueVoteDetailEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, IssueVoteDetailDTO.class);
+    }
+
+    @Override
+    public List<IssueVoteDetailDTO> list(Map<String, Object> params) {
+        List<IssueVoteDetailEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, IssueVoteDetailDTO.class);
+    }
+
+    private QueryWrapper<IssueVoteDetailEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<IssueVoteDetailEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public IssueVoteDetailDTO get(String id) {
+        IssueVoteDetailEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, IssueVoteDetailDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(IssueVoteDetailDTO dto) {
+        IssueVoteDetailEntity entity = ConvertUtils.sourceToTarget(dto, IssueVoteDetailEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(IssueVoteDetailDTO dto) {
+        IssueVoteDetailEntity entity = ConvertUtils.sourceToTarget(dto, IssueVoteDetailEntity.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/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalDailyServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalDailyServiceImpl.java
new file mode 100644
index 0000000000..e356e2fa0a
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalDailyServiceImpl.java
@@ -0,0 +1,104 @@
+/**
+ * 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.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.IssueVoteStatisticalDailyDao;
+import com.epmet.dto.IssueVoteStatisticalDailyDTO;
+import com.epmet.entity.IssueVoteStatisticalDailyEntity;
+import com.epmet.redis.IssueVoteStatisticalDailyRedis;
+import com.epmet.service.IssueVoteStatisticalDailyService;
+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 2020-05-11
+ */
+@Service
+public class IssueVoteStatisticalDailyServiceImpl extends BaseServiceImpl<IssueVoteStatisticalDailyDao, IssueVoteStatisticalDailyEntity> implements IssueVoteStatisticalDailyService {
+
+    @Autowired
+    private IssueVoteStatisticalDailyRedis issueVoteStatisticalDailyRedis;
+
+    @Override
+    public PageData<IssueVoteStatisticalDailyDTO> page(Map<String, Object> params) {
+        IPage<IssueVoteStatisticalDailyEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, IssueVoteStatisticalDailyDTO.class);
+    }
+
+    @Override
+    public List<IssueVoteStatisticalDailyDTO> list(Map<String, Object> params) {
+        List<IssueVoteStatisticalDailyEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, IssueVoteStatisticalDailyDTO.class);
+    }
+
+    private QueryWrapper<IssueVoteStatisticalDailyEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<IssueVoteStatisticalDailyEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public IssueVoteStatisticalDailyDTO get(String id) {
+        IssueVoteStatisticalDailyEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, IssueVoteStatisticalDailyDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(IssueVoteStatisticalDailyDTO dto) {
+        IssueVoteStatisticalDailyEntity entity = ConvertUtils.sourceToTarget(dto, IssueVoteStatisticalDailyEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(IssueVoteStatisticalDailyDTO dto) {
+        IssueVoteStatisticalDailyEntity entity = ConvertUtils.sourceToTarget(dto, IssueVoteStatisticalDailyEntity.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/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
new file mode 100644
index 0000000000..bff7fd4f94
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
@@ -0,0 +1,104 @@
+/**
+ * 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.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.IssueVoteStatisticalDao;
+import com.epmet.dto.IssueVoteStatisticalDTO;
+import com.epmet.entity.IssueVoteStatisticalEntity;
+import com.epmet.redis.IssueVoteStatisticalRedis;
+import com.epmet.service.IssueVoteStatisticalService;
+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 2020-05-11
+ */
+@Service
+public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteStatisticalDao, IssueVoteStatisticalEntity> implements IssueVoteStatisticalService {
+
+    @Autowired
+    private IssueVoteStatisticalRedis issueVoteStatisticalRedis;
+
+    @Override
+    public PageData<IssueVoteStatisticalDTO> page(Map<String, Object> params) {
+        IPage<IssueVoteStatisticalEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, IssueVoteStatisticalDTO.class);
+    }
+
+    @Override
+    public List<IssueVoteStatisticalDTO> list(Map<String, Object> params) {
+        List<IssueVoteStatisticalEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, IssueVoteStatisticalDTO.class);
+    }
+
+    private QueryWrapper<IssueVoteStatisticalEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<IssueVoteStatisticalEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public IssueVoteStatisticalDTO get(String id) {
+        IssueVoteStatisticalEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, IssueVoteStatisticalDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(IssueVoteStatisticalDTO dto) {
+        IssueVoteStatisticalEntity entity = ConvertUtils.sourceToTarget(dto, IssueVoteStatisticalEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(IssueVoteStatisticalDTO dto) {
+        IssueVoteStatisticalEntity entity = ConvertUtils.sourceToTarget(dto, IssueVoteStatisticalEntity.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/resi-hall/resi-hall-server/src/main/resources/mapper/IssueCustomerParameterDao.xml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueCustomerParameterDao.xml
new file mode 100644
index 0000000000..d0934a775e
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueCustomerParameterDao.xml
@@ -0,0 +1,22 @@
+<?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.IssueCustomerParameterDao">
+
+    <resultMap type="com.epmet.entity.IssueCustomerParameterEntity" id="issueCustomerParameterMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="parameterKey" column="PARAMETER_KEY"/>
+        <result property="parameterName" column="PARAMETER_NAME"/>
+        <result property="parameterValue" column="PARAMETER_VALUE"/>
+        <result property="description" column="DESCRIPTION"/>
+        <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/resi-hall/resi-hall-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueDao.xml
new file mode 100644
index 0000000000..5a93dcd218
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueDao.xml
@@ -0,0 +1,46 @@
+<?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.IssueDao">
+
+    <resultMap type="com.epmet.entity.IssueEntity" id="issueMap">
+        <result property="id" column="ID"/>
+        <result property="issueStatus" column="ISSUE_STATUS"/>
+        <result property="sourceType" column="SOURCE_TYPE"/>
+        <result property="sourceId" column="SOURCE_ID"/>
+        <result property="closeReason" column="CLOSE_REASON"/>
+        <result property="resolveType" column="RESOLVE_TYPE"/>
+        <result property="issueTitle" column="ISSUE_TITLE"/>
+        <result property="suggestion" column="SUGGESTION"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="gridId" column="GRID_ID"/>
+        <result property="orgIdPath" column="ORG_ID_PATH"/>
+        <result property="orgId" column="ORG_ID"/>
+        <result property="votingDeadline" column="VOTING_DEADLINE"/>
+        <result property="decidedTime" column="DECIDED_TIME"/>
+        <result property="shiftedTime" column="SHIFTED_TIME"/>
+        <result property="closedTime" column="CLOSED_TIME"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+    <!-- 议题详情 -->
+    <select id="issueDetail" parameterType="com.epmet.dto.form.IssueDetailFormDTO" resultType="com.epmet.dto.result.IssueDetailResultDTO">
+        SELECT
+            issue_title AS issueTitle,
+            issue_status AS issueStatus,
+            suggestion AS issueSuggestion,
+            grid_id AS belongsGridName,
+            created_by AS issueInitiator
+        FROM
+            issue
+        WHERE
+            id = #{IssueId}
+            AND del_flag = 0
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueProcessDao.xml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueProcessDao.xml
new file mode 100644
index 0000000000..81b04ec584
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueProcessDao.xml
@@ -0,0 +1,22 @@
+<?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.IssueProcessDao">
+
+    <resultMap type="com.epmet.entity.IssueProcessEntity" id="issueProcessMap">
+        <result property="id" column="ID"/>
+        <result property="issueId" column="ISSUE_ID"/>
+        <result property="issueStatus" column="ISSUE_STATUS"/>
+        <result property="orgType" column="ORG_TYPE"/>
+        <result property="orgId" column="ORG_ID"/>
+        <result property="operationExplain" column="OPERATION_EXPLAIN"/>
+        <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/resi-hall/resi-hall-server/src/main/resources/mapper/IssueProjectRelationDao.xml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueProjectRelationDao.xml
new file mode 100644
index 0000000000..d7188c1811
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueProjectRelationDao.xml
@@ -0,0 +1,19 @@
+<?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.IssueProjectRelationDao">
+
+    <resultMap type="com.epmet.entity.IssueProjectRelationEntity" id="issueProjectRelationMap">
+        <result property="id" column="ID"/>
+        <result property="issueId" column="ISSUE_ID"/>
+        <result property="projectId" column="PROJECT_ID"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueSatisfactionDetailDao.xml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueSatisfactionDetailDao.xml
new file mode 100644
index 0000000000..86f0a14d13
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueSatisfactionDetailDao.xml
@@ -0,0 +1,20 @@
+<?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.IssueSatisfactionDetailDao">
+
+    <resultMap type="com.epmet.entity.IssueSatisfactionDetailEntity" id="issueSatisfactionDetailMap">
+        <result property="id" column="ID"/>
+        <result property="issueId" column="ISSUE_ID"/>
+        <result property="comment" column="COMMENT"/>
+        <result property="satisfaction" column="SATISFACTION"/>
+        <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/resi-hall/resi-hall-server/src/main/resources/mapper/IssueSatisfactionStatisticalDao.xml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueSatisfactionStatisticalDao.xml
new file mode 100644
index 0000000000..ccc9f115c6
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueSatisfactionStatisticalDao.xml
@@ -0,0 +1,21 @@
+<?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.IssueSatisfactionStatisticalDao">
+
+    <resultMap type="com.epmet.entity.IssueSatisfactionStatisticalEntity" id="issueSatisfactionStatisticalMap">
+        <result property="id" column="ID"/>
+        <result property="issueId" column="ISSUE_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>
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueVoteDetailDao.xml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueVoteDetailDao.xml
new file mode 100644
index 0000000000..93a382ef60
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueVoteDetailDao.xml
@@ -0,0 +1,19 @@
+<?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.IssueVoteDetailDao">
+
+    <resultMap type="com.epmet.entity.IssueVoteDetailEntity" id="issueVoteDetailMap">
+        <result property="id" column="ID"/>
+        <result property="issueId" column="ISSUE_ID"/>
+        <result property="attitude" column="ATTITUDE"/>
+        <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/resi-hall/resi-hall-server/src/main/resources/mapper/IssueVoteStatisticalDailyDao.xml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueVoteStatisticalDailyDao.xml
new file mode 100644
index 0000000000..fc9b69d379
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueVoteStatisticalDailyDao.xml
@@ -0,0 +1,26 @@
+<?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.IssueVoteStatisticalDailyDao">
+
+    <resultMap type="com.epmet.entity.IssueVoteStatisticalDailyEntity" id="issueVoteStatisticalDailyMap">
+        <result property="id" column="ID"/>
+        <result property="issueId" column="ISSUE_ID"/>
+        <result property="statisticalDate" column="STATISTICAL_DATE"/>
+        <result property="supportCount" column="SUPPORT_COUNT"/>
+        <result property="oppositionCount" column="OPPOSITION_COUNT"/>
+        <result property="totalCount" column="TOTAL_COUNT"/>
+        <result property="todayIncrement" column="TODAY_INCREMENT"/>
+        <result property="supportIncrement" column="SUPPORT_INCREMENT"/>
+        <result property="oppositionIncrement" column="OPPOSITION_INCREMENT"/>
+        <result property="votableCount" column="VOTABLE_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>
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml
new file mode 100644
index 0000000000..d34f9eb2ae
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml
@@ -0,0 +1,21 @@
+<?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.IssueVoteStatisticalDao">
+
+    <resultMap type="com.epmet.entity.IssueVoteStatisticalEntity" id="issueVoteStatisticalMap">
+        <result property="id" column="ID"/>
+        <result property="issueId" column="ISSUE_ID"/>
+        <result property="supportCount" column="SUPPORT_COUNT"/>
+        <result property="oppositionCount" column="OPPOSITION_COUNT"/>
+        <result property="votableCount" column="VOTABLE_COUNT"/>
+        <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

From 8ef667e52c0f35c2657437d0778a24d804112734 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Mon, 11 May 2020 15:09:29 +0800
Subject: [PATCH 09/45] =?UTF-8?q?resi=5Ftopic=E8=AF=9D=E9=A2=98=E8=A1=A8?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5(=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E8=BD=AC=E8=AE=AE=E9=A2=98=EF=BC=8C=E8=AE=AE=E9=A2=98ID)sql?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/db/migration/db.sql    | 28 ++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/db.sql b/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/db.sql
index 04a3e6e9bf..a966031574 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/db.sql
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/db.sql
@@ -4,4 +4,30 @@
 ALTER TABLE resi_group_operation ADD (
   READ_FLAG VARCHAR (8) DEFAULT NULL COMMENT '审核人员已读未读标识(未读:unread 界面显示红点; 已读:read 不显示红点)',
   MESSAGE_TEXT VARCHAR (500) DEFAULT NULL COMMENT '消息通知内容'
-  );
\ No newline at end of file
+  );
+
+
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : 党群e事通开发库
+ Source Server Type    : MySQL
+ Source Server Version : 50728
+ Source Host           : 192.168.1.130:3306
+ Source Schema         : epmet_resi_group
+
+ Target Server Type    : MySQL
+ Target Server Version : 50728
+ File Encoding         : 65001
+
+ Date: 11/05/2020 14:00:00
+*/
+-- @Date        2020-05-11 14:00
+-- @Author      wangc
+-- @Description 数据库epmet_resi_group中的resi_topic(话题表)表新增两个字段，db语句：
+ALTER TABLE RESI_TOPIC ADD (
+  SHIFT_ISSUE tinyint(1) DEFAULT 0 NOT NULL COMMENT '是否转为议题，0:false，1:true',
+  ISSUE_ID VARCHAR (64) DEFAULT NULL COMMENT '议题ID，可为空'
+  );
+
+

From c99a01cad894708a0c612e4a9c0a0e55dc27d8fe Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Mon, 11 May 2020 15:30:56 +0800
Subject: [PATCH 10/45] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/ProjectStaffDTO.java         | 5 +++++
 .../src/main/java/com/epmet/entity/ProjectProcessEntity.java | 5 +++++
 .../src/main/java/com/epmet/excel/ProjectStaffExcel.java     | 3 +++
 3 files changed, 13 insertions(+)

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectStaffDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectStaffDTO.java
index 223fa90ad7..9072cfbb3d 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectStaffDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectStaffDTO.java
@@ -43,6 +43,11 @@ public class ProjectStaffDTO implements Serializable {
      */
 	private String projectId;
 
+	/**
+	 * 项目处理进展ID
+	 */
+	private String processId;
+
     /**
      * 客户ID
      */
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java
index de53a677c5..68f06bb6eb 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java
@@ -43,6 +43,11 @@ public class ProjectProcessEntity extends BaseEpmetEntity {
      */
 	private String projectId;
 
+	/**
+	 * 项目处理进展ID
+	 */
+	private String processId;
+
     /**
      * 负负责人ID
      */
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectStaffExcel.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectStaffExcel.java
index 1a920d4712..bfa228dd25 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectStaffExcel.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectStaffExcel.java
@@ -37,6 +37,9 @@ public class ProjectStaffExcel {
     @Excel(name = "项目ID")
     private String projectId;
 
+    @Excel(name = "项目处理进展ID")
+    private String processId;
+
     @Excel(name = "客户ID")
     private String customerId;
 

From 09972f3eafadf206ef09ef42cfee1b2433e66679 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Mon, 11 May 2020 15:31:38 +0800
Subject: [PATCH 11/45] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/db.migration/epmet_gov_project.sql       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db.migration/epmet_gov_project.sql b/epmet-module/gov-project/gov-project-server/src/main/resources/db.migration/epmet_gov_project.sql
index e4f2d0ac8d..f6a22b3126 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/db.migration/epmet_gov_project.sql
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/db.migration/epmet_gov_project.sql
@@ -140,3 +140,5 @@ CREATE TABLE `project_staff`  (
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '项目人员关联表' ROW_FORMAT = Dynamic;
 
 SET FOREIGN_KEY_CHECKS = 1;
+
+alter table project_staff add column PROCESS_ID varchar(64) NOT NULL COMMENT '处理进展ID';
\ No newline at end of file

From 2c50aafcfeb75c66163662b2e8a5dd64dd7f2c19 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 11 May 2020 16:34:43 +0800
Subject: [PATCH 12/45] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=B7=9F=E8=B8=AA-?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0feign=E6=8E=A5=E5=8F=A3=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/feign/EpmetUserFeignClient.java   | 16 ++++++++++++++++
 .../java/com/epmet/feign/GovOrgFeignClient.java | 17 +++++++++++++++++
 .../fallback/EpmetUserFeignClientFallBack.java  | 13 +++++++++++++
 .../fallback/GovOrgFeignClientFallBack.java     | 13 +++++++++++++
 4 files changed, 59 insertions(+)
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
new file mode 100644
index 0000000000..cc2404269e
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
@@ -0,0 +1,16 @@
+package com.epmet.feign;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.feign.fallback.EpmetUserFeignClientFallBack;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * @Description 调用epmet-user服务
+ * @Author sun
+ */
+@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class)
+public interface EpmetUserFeignClient {
+
+
+
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
new file mode 100644
index 0000000000..e4ae2ffc95
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
@@ -0,0 +1,17 @@
+package com.epmet.feign;
+
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.feign.fallback.GovOrgFeignClientFallBack;
+import org.springframework.cloud.openfeign.FeignClient;
+
+
+/**
+ * @Description 调用gov-org-server
+ * @Author sun
+ */
+@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class)
+public interface GovOrgFeignClient {
+
+
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
new file mode 100644
index 0000000000..cfb62dcabf
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
@@ -0,0 +1,13 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.feign.EpmetUserFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description 调用epmet-user服务
+ * @Author sun
+ */
+@Component
+public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
+
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
new file mode 100644
index 0000000000..6eccf9cb4a
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
@@ -0,0 +1,13 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.feign.GovOrgFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description 调用gov-org-server
+ * @Author sun
+ */
+@Component
+public class GovOrgFeignClientFallBack implements GovOrgFeignClient {
+
+}

From af5a5ac4b5ef59572438bc42aa2488acf2d105a2 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Mon, 11 May 2020 18:43:22 +0800
Subject: [PATCH 13/45] =?UTF-8?q?resi=5Ftopic=E8=AF=9D=E9=A2=98=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E8=AE=AE=E9=A2=98?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ResiTopicIncludeIssueDetailResultDTO.java |  68 ++++++++
 .../ResiTopicIncludeIssueInfoResultDTO.java   |  74 ++++++++
 .../topic/result/ResiTopicInfoResultDTO.java  |   5 -
 .../member/redis/ResiGroupMemberRedis.java    |   2 +-
 .../topic/controller/ResiTopicController.java |  10 +-
 .../epmet/modules/topic/dao/ResiTopicDao.java |  14 +-
 .../modules/topic/entity/ResiTopicEntity.java |  12 +-
 .../topic/service/ResiTopicService.java       |   8 +-
 .../service/impl/ResiTopicServiceImpl.java    | 160 +++++++++++++-----
 .../resources/mapper/topic/ResiTopicDao.xml   |  57 ++++++-
 .../main/java/com/epmet/excel/IssueExcel.java |   2 +-
 11 files changed, 345 insertions(+), 67 deletions(-)
 create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicIncludeIssueDetailResultDTO.java
 create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicIncludeIssueInfoResultDTO.java

diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicIncludeIssueDetailResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicIncludeIssueDetailResultDTO.java
new file mode 100644
index 0000000000..4ac316638c
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicIncludeIssueDetailResultDTO.java
@@ -0,0 +1,68 @@
+package com.epmet.resi.group.dto.topic.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description  话题详情DTO(包含议题Id和是否转为议题Flag)
+ * @ClassName ResiTopicIncludeIssueDetailResultDTO
+ * @Auth wangc
+ * @Date 2020-05-11 17:31
+ */
+@Data
+public class ResiTopicIncludeIssueDetailResultDTO implements Serializable {
+    private static final long serialVersionUID = -6790536784979922200L;
+
+    /**
+     * 话题Id
+     * */
+    private String topicId;
+
+
+    /**
+     * 发布人名称
+     * */
+    private String releaseUserName;
+
+    /**
+     * 发布人头像
+     * */
+    private String releaseUserHeadPhoto;
+
+    /**
+     * 发布时间 yyyy-MM-dd HH:mm
+     * */
+    private String releaseTime;
+
+    /**
+     * 发布地址
+     * */
+    private String releaseAddress;
+
+    /**
+     * 话题内容
+     * */
+    private String topicContent;
+
+    /**
+     * 话题状态
+     * */
+    private String topicStatus;
+
+    /**
+     * 图片访问地址
+     * */
+    private List<String> topicImgs;
+
+    /**
+     * 是否被转为议题true,false
+     * */
+    private Boolean shiftIssueFlag;
+
+    /**
+     * 议题Id，当shiftIssueFlag为false时返回""
+     * */
+    private String issueId;
+}
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicIncludeIssueInfoResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicIncludeIssueInfoResultDTO.java
new file mode 100644
index 0000000000..55fe66f286
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicIncludeIssueInfoResultDTO.java
@@ -0,0 +1,74 @@
+package com.epmet.resi.group.dto.topic.result;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 话题信息返回DTO(包含议题Id和是否转为议题Flag)
+ * @ClassName ResiTopicIncludeIssueInfoResultDTO
+ * @Auth wangc
+ * @Date 2020-05-11 15:56
+ */
+@Data
+public class ResiTopicIncludeIssueInfoResultDTO implements Serializable {
+    private static final long serialVersionUID = -7029232911456325417L;
+
+    /**
+     * 话题Id
+     * */
+    private String topicId;
+
+    /**
+     * 用户Id 话题发布人
+     * */
+    private String userId;
+
+    /**
+     * 发布人名称
+     * */
+    private String releaseUserName;
+
+    /**
+     * 发布人头像
+     * */
+    private String releaseUserHeadPhoto;
+
+    /**
+     * 发布时间 yyyy-MM-dd HH:mm
+     * */
+    @JSONField(format="yyyy-MM-dd HH:mm")
+    private Date releaseTime;
+
+    /**
+     * 话题内容
+     * */
+    private String topicContent;
+
+    /**
+     * 话题状态 讨论中  已关闭
+     * */
+    private String status;
+
+    /**
+     * 是否本人 me other
+     * */
+    private String releaseUserFlag;
+
+    /**
+     * 第一张图片
+     * */
+    private String firstPhoto;
+
+    /**
+     * 是否被转为议题true,false
+     * */
+    private Boolean shiftIssueFlag;
+
+    /**
+     * 议题Id，当shiftIssueFlag为false时返回""
+     * */
+    private String issueId;
+}
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicInfoResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicInfoResultDTO.java
index 278a75e45e..613b506acf 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicInfoResultDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicInfoResultDTO.java
@@ -53,11 +53,6 @@ public class ResiTopicInfoResultDTO  implements Serializable{
      * */
     private String status;
 
-    /**
-     * 网格名称
-     * */
-    private String gridName;
-
     /**
      * 是否本人 me other
      * */
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/redis/ResiGroupMemberRedis.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/redis/ResiGroupMemberRedis.java
index d59e819155..2fc537cdb2 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/redis/ResiGroupMemberRedis.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/redis/ResiGroupMemberRedis.java
@@ -96,7 +96,7 @@ public class ResiGroupMemberRedis {
         ResiGroupMemberInfoRedisDTO memberCache =
         (ResiGroupMemberInfoRedisDTO) redisUtils.get(RedisKeys.getResiGroupMemberInfoKey(groupId,userId));
         //如果缓存中没有该成员数据
-        if(null == memberCache && StringUtils.isNotBlank(memberCache.getUserId())){
+        if(null == memberCache || StringUtils.isNotBlank(memberCache.getUserId())){
             Map<String,Object> param = new HashMap<>();
             param.put(TopicConstant.CUSTOMER_USER_ID,userId);
             param.put(TopicConstant.RESI_GROUP_ID,groupId);
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 4bc5da215b..f0f488efe5 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
@@ -7,6 +7,8 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.modules.topic.service.ResiTopicService;
 import com.epmet.resi.group.dto.topic.form.*;
 import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO;
+import com.epmet.resi.group.dto.topic.result.ResiTopicIncludeIssueDetailResultDTO;
+import com.epmet.resi.group.dto.topic.result.ResiTopicIncludeIssueInfoResultDTO;
 import com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -54,7 +56,7 @@ public class ResiTopicController {
      * @Date 2020.04.01 23:48
      **/
     @PostMapping("gettopicdetail")
-    public Result<ResiTopicDetailResultDTO> getTopicDetail(@LoginUser TokenDto tokenDto, @RequestBody ResiTopicDetailFormDTO topicDetailFormDTO ){
+    public Result<ResiTopicIncludeIssueDetailResultDTO> getTopicDetail(@LoginUser TokenDto tokenDto, @RequestBody ResiTopicDetailFormDTO topicDetailFormDTO ){
         ValidatorUtils.validateEntity(topicDetailFormDTO);
         return topicService.getTopicDetail(tokenDto,topicDetailFormDTO.getTopicId());
     }
@@ -68,7 +70,7 @@ public class ResiTopicController {
      * @Date 2020.04.01 10:36
      **/
     @PostMapping("getpasttopiclist")
-    public Result<List<ResiTopicInfoResultDTO>> getPastTopicList(@LoginUser TokenDto tokenDto, @RequestBody ResiTopicPageFormDTO topicPageFormDTO){
+    public Result<List<ResiTopicIncludeIssueInfoResultDTO>> getPastTopicList(@LoginUser TokenDto tokenDto, @RequestBody ResiTopicPageFormDTO topicPageFormDTO){
         topicPageFormDTO.setUserId(tokenDto.getUserId());
         ValidatorUtils.validateEntity(topicPageFormDTO);
         return topicService.getPastTopicList(tokenDto,topicPageFormDTO);
@@ -78,12 +80,12 @@ public class ResiTopicController {
      * @Description 查看组内最近十条话题
      * @Param tokenDto
      * @Param ResiTopicDefaultPageFormDTO
-     * @return Result<List<ResiTopicInfoResultDTO>>
+     * @return Result<List<ResiTopicIncludeIssueInfoResultDTO>>
      * @Author wangc
      * @Date 2020.04.02 00:01
      **/
     @PostMapping("getlatesttopics")
-    public Result<List<ResiTopicInfoResultDTO>> getLatestTopics(@LoginUser  TokenDto tokenDto,@RequestBody ResiTopicDefaultPageFormDTO topicDefaultPageFormDTO){
+    public Result<List<ResiTopicIncludeIssueInfoResultDTO>> getLatestTopics(@LoginUser  TokenDto tokenDto,@RequestBody ResiTopicDefaultPageFormDTO topicDefaultPageFormDTO){
         ValidatorUtils.validateEntity(topicDefaultPageFormDTO);
         return topicService.getLatestTopics(tokenDto,topicDefaultPageFormDTO.getGroupId());
     }
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 7c602bc126..7399e0ca43 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
@@ -22,6 +22,7 @@ import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.modules.topic.entity.ResiTopicEntity;
 import com.epmet.resi.group.dto.topic.ResiTopicDTO;
 import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO;
+import com.epmet.resi.group.dto.topic.result.ResiTopicIncludeIssueInfoResultDTO;
 import com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -49,11 +50,11 @@ public interface ResiTopicDao extends BaseDao<ResiTopicEntity> {
     /**
      * @Description 查询该组内最近十条话题信息
      * @Param groupId
-     * @return List<ResiTopicInfoResultDTO>
+     * @return List<ResiTopicIncludeIssueInfoResultDTO>
      * @Author wangc
      * @Date 2020.04.01 09:40
      **/
-    List<ResiTopicInfoResultDTO> getLatestTenTopics(@Param("groupId")String groupId,@Param("userId")String userId);
+    List<ResiTopicIncludeIssueInfoResultDTO> getLatestTenTopics(@Param("groupId")String groupId,@Param("userId")String userId);
 
     /**
      * @Description 查看历史话题(分页,允许状态筛选)
@@ -64,6 +65,15 @@ public interface ResiTopicDao extends BaseDao<ResiTopicEntity> {
      **/
     List<ResiTopicInfoResultDTO> getPastTopics(ResiTopicPageFormDTO topicPageFormDTO);
 
+    /**
+     * @Description 查看历史话题(分页,允许状态筛选)
+     * @param topicPageFormDTO
+     * @return List<ResiTopicIncludeIssueInfoResultDTO> 每个实体类里包含shiftIssueFlag和issueId字段
+     * @author wangc
+     * @date 2020.05.11 16:06
+    **/
+    List<ResiTopicIncludeIssueInfoResultDTO> getTopicsIncludeIssueInfoByConditions(ResiTopicPageFormDTO topicPageFormDTO);
+
     /**
      * @Description 修改话题
      * @Param ResiTopicEntity.class
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicEntity.java
index c3f9bfc0b1..d16ba57c73 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicEntity.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicEntity.java
@@ -23,7 +23,7 @@ import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
+
 
 /**
  * 话题信息表
@@ -83,4 +83,14 @@ public class ResiTopicEntity extends BaseEpmetEntity {
      */
 	private String dimension;
 
+	/**
+	 * 议题Id
+	 */
+	private String issueId;
+
+	/**
+	 * 是否转为议题标识 true：已转为议题 false：未转为议题
+	 * */
+	private Boolean shiftIssue;
+
 }
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 b15e4b6b44..2282d66cb9 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
@@ -30,6 +30,8 @@ import com.epmet.resi.group.dto.topic.form.ResiTopicOperationFormDTO;
 import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO;
 import com.epmet.resi.group.dto.topic.form.ResiTopicPublishFormDTO;
 import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO;
+import com.epmet.resi.group.dto.topic.result.ResiTopicIncludeIssueDetailResultDTO;
+import com.epmet.resi.group.dto.topic.result.ResiTopicIncludeIssueInfoResultDTO;
 import com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO;
 
 
@@ -122,7 +124,7 @@ public interface ResiTopicService extends BaseService<ResiTopicEntity> {
      * @Author wangc
      * @Date 2020.04.01 08:59
      **/
-    Result<List<ResiTopicInfoResultDTO>> getLatestTopics(TokenDto tokenDto, String groupId);
+    Result<List<ResiTopicIncludeIssueInfoResultDTO>> getLatestTopics(TokenDto tokenDto, String groupId);
 
     /**
      * @return Result<List < ResiTopicInfoResultDTO>>
@@ -132,7 +134,7 @@ public interface ResiTopicService extends BaseService<ResiTopicEntity> {
      * @Author wangc
      * @Date 2020.04.01 10:36
      **/
-    Result<List<ResiTopicInfoResultDTO>> getPastTopicList(TokenDto tokenDto, ResiTopicPageFormDTO topicPageFormDTO);
+    Result<List<ResiTopicIncludeIssueInfoResultDTO>> getPastTopicList(TokenDto tokenDto, ResiTopicPageFormDTO topicPageFormDTO);
 
     /**
      * @return Result
@@ -172,7 +174,7 @@ public interface ResiTopicService extends BaseService<ResiTopicEntity> {
      * @Author wangc
      * @Date 2020.04.01 15:56
      **/
-    Result<ResiTopicDetailResultDTO> getTopicDetail(TokenDto tokenDto, String topicId);
+    Result<ResiTopicIncludeIssueDetailResultDTO> getTopicDetail(TokenDto tokenDto, String topicId);
 
     /**
      * @return List<ResiTopicInfoResultDTO>
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 0733a02226..aa688b9d26 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
@@ -64,6 +64,8 @@ import com.epmet.resi.group.dto.topic.form.ResiTopicOperationFormDTO;
 import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO;
 import com.epmet.resi.group.dto.topic.form.ResiTopicPublishFormDTO;
 import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO;
+import com.epmet.resi.group.dto.topic.result.ResiTopicIncludeIssueDetailResultDTO;
+import com.epmet.resi.group.dto.topic.result.ResiTopicIncludeIssueInfoResultDTO;
 import com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
@@ -274,36 +276,21 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
      * @Date 2020.04.01 08:59
      **/
     @Override
-    public Result<List<ResiTopicInfoResultDTO>> getLatestTopics(TokenDto tokenDto, String groupId) {
+    public Result<List<ResiTopicIncludeIssueInfoResultDTO>> getLatestTopics(TokenDto tokenDto, String groupId) {
         if (null == tokenDto) {
             logger.error(ModuleConstant.USER_NOT_NULL);
             throw new RenException(ModuleConstant.USER_NOT_NULL);
         }
-        if (StringUtils.isBlank(groupId)) {
-            return new Result<List<ResiTopicInfoResultDTO>>().error();
-        }
-
         //1.查询话题列表
-        List<ResiTopicInfoResultDTO> lastestTenTopics =
+        List<ResiTopicIncludeIssueInfoResultDTO> latestTenTopics =
                 baseDao.getLatestTenTopics(groupId, tokenDto.getUserId());
+        if(null != latestTenTopics && latestTenTopics.size() > 0) {
 
-        if(null != lastestTenTopics && lastestTenTopics.size() > 0) {
-
-        //2.遍历存储用户信息 从数据库中查找
-        /*List<String> userIdList = new ArrayList<>();
-        for (ResiTopicInfoResultDTO topic : lastestTenTopics) {
-            userIdList.add(topic.getUserId());
-        }
-        UserResiInfoListFormDTO formDTO = new UserResiInfoListFormDTO();
-        formDTO.setUserIdList(userIdList);
-        Result<List<UserResiInfoResultDTO>> userResiInfoDTOListResult = epmetUserFeignClient.getUserResiInfoList(formDTO);
-        setUserInfo(userResiInfoDTOListResult, lastestTenTopics);
-        */
 
         //2.2从缓存中查找用户信息
-        setCacheUserInfo(groupId,lastestTenTopics);
+        setCacheUserInfoWithIssue(groupId,latestTenTopics);
     }
-        return new Result<List<ResiTopicInfoResultDTO>>().ok(lastestTenTopics);
+        return new Result<List<ResiTopicIncludeIssueInfoResultDTO>>().ok(latestTenTopics);
     }
 
     /**
@@ -315,36 +302,22 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
      * @Date 2020.04.01 10:36
      **/
     @Override
-    public Result<List<ResiTopicInfoResultDTO>> getPastTopicList(TokenDto tokenDto, ResiTopicPageFormDTO topicPageFormDTO) {
+    public Result<List<ResiTopicIncludeIssueInfoResultDTO>> getPastTopicList(TokenDto tokenDto, ResiTopicPageFormDTO topicPageFormDTO) {
      //1.查询历史话题列表
 
         topicPageFormDTO.setUserId(topicPageFormDTO.getUserId());
 
         topicPageFormDTO.setPageNo((topicPageFormDTO.getPageNo() - NumConstant.ONE) * topicPageFormDTO.getPageSize());
 
-        List<ResiTopicInfoResultDTO> pastTopics =
-                baseDao.getPastTopics(topicPageFormDTO);
-
+        List<ResiTopicIncludeIssueInfoResultDTO> pastTopics =
+                baseDao.getTopicsIncludeIssueInfoByConditions(topicPageFormDTO);
 
         if (null != pastTopics && pastTopics.size() > 0) {
 
-       /*
-       //2.遍历用户信息
-        List<String> userIdList = new ArrayList<>();
-        for (ResiTopicInfoResultDTO topic : pastTopics) {
-            userIdList.add(topic.getUserId());
+        //2. 在缓存中拉取用户信息
+        setCacheUserInfoWithIssue(topicPageFormDTO.getGroupId(), pastTopics);
         }
-        UserResiInfoListFormDTO formDTO = new UserResiInfoListFormDTO();
-        formDTO.setUserIdList(userIdList);
-        Result<List<UserResiInfoResultDTO>> userResiInfoDTOListResult = epmetUserFeignClient.getUserResiInfoList(formDTO);
-        setUserInfo(userResiInfoDTOListResult, pastTopics);
-
-        */
-
-       //2.2 在缓存中拉取用户信息
-       setCacheUserInfo(topicPageFormDTO.getGroupId(), pastTopics);
-        }
-        return new Result<List<ResiTopicInfoResultDTO>>().ok(pastTopics);
+        return new Result<List<ResiTopicIncludeIssueInfoResultDTO>>().ok(pastTopics);
     }
 
     /**
@@ -505,19 +478,21 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
      * @Date 2020.04.01 15:56
      **/
     @Override
-    public Result<ResiTopicDetailResultDTO> getTopicDetail(TokenDto tokenDto, String topicId) {
+    public Result<ResiTopicIncludeIssueDetailResultDTO> getTopicDetail(TokenDto tokenDto, String topicId) {
         //1.获取话题基本信息
         ResiTopicEntity topicDetail = baseDao.selectById(topicId);
         if(null == topicDetail || !StringUtils.equals(topicDetail.getId(),topicId)){
             logger.error(ModuleConstant.NO_SUCH_TOPIC);
             throw new RenException(ModuleConstant.NO_SUCH_TOPIC);
         }
-        ResiTopicDetailResultDTO resultDTO = new ResiTopicDetailResultDTO();
+        ResiTopicIncludeIssueDetailResultDTO resultDTO =
+                ConvertUtils.sourceToTarget(topicDetail,ResiTopicIncludeIssueDetailResultDTO.class);
         resultDTO.setTopicId(topicId);
         resultDTO.setReleaseTime(new SimpleDateFormat("yyyy-MM-dd HH:mm").format(topicDetail.getCreatedTime()));
         resultDTO.setTopicContent(topicDetail.getTopicContent());
         resultDTO.setReleaseAddress(topicDetail.getAddress());
         resultDTO.setTopicStatus(topicDetail.getStatus());
+        resultDTO.setShiftIssueFlag(topicDetail.getShiftIssue());
         //2.查询话题附件
         QueryWrapper<ResiTopicAttachmentEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(FieldConstant.DEL_FLAG,NumConstant.ZERO_STR);
@@ -537,11 +512,11 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         ResiGroupMemberInfoRedisDTO memberRedis =
         resiGroupMemberRedis.get(group.getId(),topic.getCreatedBy());
         if(null != memberRedis && StringUtils.isNotBlank(memberRedis.getUserId())){
-            resultDTO.setReleaseUserName(memberRedis.getUserShowName());
-            resultDTO.setReleaseUserHeadPhoto(memberRedis.getUserHeadPhoto());
+            resultDTO.setReleaseUserName(StringUtils.isBlank(memberRedis.getUserShowName()) ? "" : memberRedis.getUserShowName());
+            resultDTO.setReleaseUserHeadPhoto(StringUtils.isBlank(memberRedis.getUserHeadPhoto()) ? "" : memberRedis.getUserHeadPhoto());
         }
 
-        return new Result<ResiTopicDetailResultDTO>().ok(resultDTO);
+        return new Result<ResiTopicIncludeIssueDetailResultDTO>().ok(resultDTO);
     }
 
     /**
@@ -703,7 +678,22 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
      **/
     @Override
     public Result<List<ResiTopicInfoResultDTO>> getPastTopicListGov(ResiTopicPageFormDTO topicPageFormDTO) {
-        return getPastTopicList(null,topicPageFormDTO);
+        //1.查询历史话题列表
+
+        topicPageFormDTO.setUserId(topicPageFormDTO.getUserId());
+
+        topicPageFormDTO.setPageNo((topicPageFormDTO.getPageNo() - NumConstant.ONE) * topicPageFormDTO.getPageSize());
+
+        List<ResiTopicInfoResultDTO> pastTopics =
+                baseDao.getPastTopics(topicPageFormDTO);
+
+        if (null != pastTopics && pastTopics.size() > 0) {
+
+            //2. 在缓存中拉取用户信息
+            setCacheUserInfo(topicPageFormDTO.getGroupId(), pastTopics);
+        }
+        return new Result<List<ResiTopicInfoResultDTO>>().ok(pastTopics);
+
     }
 
     /**
@@ -720,7 +710,12 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
 
     @Override
     public Result<ResiTopicDetailResultDTO> getTopicDetailGov(String topicId) {
-        return getTopicDetail(null,topicId);
+        Result<ResiTopicIncludeIssueDetailResultDTO> result = getTopicDetail(null,topicId);
+        if(result.success() && null != result.getData() && StringUtils.isNotBlank(result.getData().getTopicId())){
+            return new  Result<ResiTopicDetailResultDTO>().ok(ConvertUtils.sourceToTarget(result.getData(),ResiTopicDetailResultDTO.class));
+        }
+        logger.error(ModuleConstant.NO_SUCH_TOPIC);
+        throw new RenException(ModuleConstant.NO_SUCH_TOPIC);
     }
 
     /**
@@ -794,6 +789,77 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
 
     }
 
+    /**
+     * @Description 将缓存中的用户信息存放到话题列表当中
+     * @Param  groupId
+     * @Param List<ResiTopicIncludeIssueInfoResultDTO>
+     * @return void
+     * @Author wangc
+     * @Date 2020.04.14 10:32
+     **/
+    private void setCacheUserInfoWithIssue(String groupId ,List<ResiTopicIncludeIssueInfoResultDTO> topics) {
+
+        //1.初始化存储缺失缓存信息的组员Id的容器，默认去重
+        Set<String> usersNotInCache = new HashSet<>();
+
+        //2.读取用户缓存信息
+        ResiGroupMemberInfoRedisResultDTO memberRedis = resiGroupMemberRedis.getKeys(groupId);
+        if (null != memberRedis && null != memberRedis.getMemberKeys() && null != memberRedis.getMemberMap()) {
+            String keyPrefix = RedisKeys.getResiGroupMemberInfoKey(groupId, "");
+            for (ResiTopicIncludeIssueInfoResultDTO topic : topics) {
+                //缓存中有该用户的key
+                if (memberRedis.getMemberKeys().contains(keyPrefix.concat(topic.getUserId()))) {
+                    ResiGroupMemberInfoRedisDTO memberInfoCache = memberRedis.getMemberMap().get(topic.getUserId());
+                    if (null != memberInfoCache) {
+                        //缓存中有该用户信息
+                        topic.setReleaseUserName(StringUtils.isBlank(memberInfoCache.getUserShowName())?"":memberInfoCache.getUserShowName());
+                        topic.setReleaseUserHeadPhoto(StringUtils.isBlank(memberInfoCache.getUserHeadPhoto())?"":memberInfoCache.getUserHeadPhoto());
+                    } else {
+                        //缓存中没有该用户信息
+                        usersNotInCache.add(topic.getUserId());
+                    }
+                } else {
+                    //缓存中没有该用户的key
+                    usersNotInCache.add(topic.getUserId());
+                }
+            }
+        }
+
+        //3.如果存在缺失缓存的组员，去数据库中查找，并存入缓存
+        if (usersNotInCache.size() > 0) {
+            Map<String, List<ResiTopicIncludeIssueInfoResultDTO>> topicMap
+                    = topics.stream().collect(Collectors.groupingBy(ResiTopicIncludeIssueInfoResultDTO::getUserId));
+            List<String> userIds = new ArrayList<>(usersNotInCache);
+            Result<List<UserResiInfoResultDTO>> result =
+                    epmetUserFeignClient.getUserResiInfoList(new UserResiInfoListFormDTO(userIds));
+
+            if (result.success() && null != result.getData() && result.getData().size() > 0) {
+                for (UserResiInfoResultDTO user : result.getData()) {
+                    ResiTopicIncludeIssueInfoResultDTO topic =
+                            topicMap.get(user.getUserId()).get(0);
+                    topic.setReleaseUserHeadPhoto(user.getHeadPhoto());
+                    topic.setReleaseUserName(user.getShowName());
+
+                    //存入缓存
+                    ResiGroupMemberInfoRedisDTO memberRedisDTO = new ResiGroupMemberInfoRedisDTO();
+                    ResiGroupMemberDTO memberMySql = resiGroupMemberDao.selectGroupMemberInfo(groupId, user.getUserId());
+                    memberRedisDTO.setMemberStatus(memberMySql.getStatus());
+                    memberRedisDTO.setUserId(user.getUserId());
+                    memberRedisDTO.setUserShowName(user.getShowName());
+                    memberRedisDTO.setEnterGroupType(memberMySql.getEnterGroupType());
+                    memberRedisDTO.setGroupLeaderFlag(memberMySql.getGroupLeaderFlag());
+                    memberRedisDTO.setUserHeadPhoto(user.getHeadPhoto());
+                    memberRedisDTO.setGroupId(groupId);
+                    resiGroupMemberRedis.set(memberRedisDTO);
+                }
+            } else {
+
+                logger.warn(ModuleConstant.USER_INFO_LIST_NOT_FOUND);
+            }
+        }
+
+    }
+
     /**
      * @Description 更新组统计缓存信息
      * @Param groupId
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 57ba94d5b6..f274faffff 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
@@ -109,7 +109,7 @@
     </insert>
 
     <!-- 查询最近十条话题 -->
-    <select id="getLatestTenTopics" parameterType="string" resultType="com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO">
+    <select id="getLatestTenTopics" parameterType="string" resultType="com.epmet.resi.group.dto.topic.result.ResiTopicIncludeIssueInfoResultDTO">
         SELECT
         topic.ID AS topicId,
         topic.GROUP_ID,
@@ -117,7 +117,9 @@
         topic.STATUS,
         topic.CREATED_TIME AS releaseTime,
         topic.CREATED_BY AS userId,
-        attachement2.firstPhoto,
+        topic.SHIFT_ISSUE AS shiftIssueFlag,
+        IFNULL(topic.ISSUE_ID,'') AS issueId,
+        IFNULL(attachement2.firstPhoto,'') AS firstPhoto,
         CASE
           WHEN topic.CREATED_BY = #{userId} THEN 'me'
           ELSE 'other'
@@ -157,7 +159,56 @@
         topic.STATUS,
         topic.CREATED_TIME AS releaseTime,
         topic.CREATED_BY AS userId,
-        attachement2.firstPhoto,
+        IFNULL(attachement2.firstPhoto,'') AS firstPhoto,
+        CASE
+        WHEN topic.CREATED_BY = #{userId} THEN 'me'
+        ELSE 'other'
+        END  AS releaseUserFlag
+        FROM
+        RESI_TOPIC topic
+        LEFT JOIN
+        (
+        SELECT
+        attachment.TOPIC_ID AS attachmentTopicId,
+        attachment.ATTACHMENT_URL as firstPhoto,
+        MIN(attachment.SORT)
+        FROM
+        RESI_TOPIC_ATTACHMENT attachment
+        WHERE
+        attachment.DEL_FLAG = '0'
+        GROUP BY attachment.TOPIC_ID
+        ) attachement2
+        ON
+        topic.ID = attachement2.attachmentTopicId
+        <where>
+            topic.DEL_FLAG = '0'
+            AND topic.GROUP_ID = #{groupId}
+            <if test='"hidden" != status'>
+                AND <![CDATA[ topic.STATUS <> 'hidden' ]]>
+            </if>
+            <if test='null != status and "" != status'>
+                AND topic.STATUS = #{status}
+            </if>
+
+        </where>
+        ORDER BY
+        topic.CREATED_TIME DESC
+        LIMIT #{pageNo},#{pageSize}
+
+    </select>
+
+    <!-- 查询历史话题，分页，参数查询 ，返回时携带shift_issue、issue_id字段-->
+    <select id="getTopicsIncludeIssueInfoByConditions" parameterType="com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO" resultType="com.epmet.resi.group.dto.topic.result.ResiTopicIncludeIssueInfoResultDTO">
+        SELECT
+        topic.ID AS topicId,
+        topic.GROUP_ID,
+        topic.TOPIC_CONTENT,
+        topic.STATUS,
+        topic.CREATED_TIME AS releaseTime,
+        topic.CREATED_BY AS userId,
+        topic.SHIFT_ISSUE AS shiftIssueFlag,
+        IFNULL(topic.ISSUE_ID,'') AS issueId,
+        IFNULL(attachement2.firstPhoto,'') AS firstPhoto,
         CASE
         WHEN topic.CREATED_BY = #{userId} THEN 'me'
         ELSE 'other'
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueExcel.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueExcel.java
index 0f674d8e26..f7df76d076 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueExcel.java
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueExcel.java
@@ -40,7 +40,7 @@ public class IssueExcel {
     @Excel(name = "来源类型 eg:resi_topic")
     private String sourceType;
 
-    @Excel(name = "来源ID eg:2223232(当SOURCE_TYPE为"resi_topic"时，这里指话题的ID)")
+    @Excel(name = "来源ID eg:2223232(当SOURCE_TYPE为\"resi_topic\"时，这里指话题的ID)")
     private String sourceId;
 
     @Excel(name = "关闭理由 【未关闭时可以为空】关闭议题时必填的理由，转项目后而且已经结案，这个字段不回写")

From 1d4c09868bcadaf60810207f0c158f0a9b8a35ed Mon Sep 17 00:00:00 2001
From: zxc <954985706@qq.com>
Date: Mon, 11 May 2020 19:49:52 +0800
Subject: [PATCH 14/45] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/form/BelongGridNameFormDTO.java | 23 +++++++++
 .../dto/result/BelongGridNameResultDTO.java   | 21 ++++++++
 .../controller/CustomerGridController.java    | 12 +++++
 .../java/com/epmet/dao/CustomerGridDao.java   | 13 +++--
 .../epmet/service/CustomerGridService.java    |  8 +++
 .../service/impl/CustomerGridServiceImpl.java | 11 ++++
 .../main/resources/mapper/CustomerGridDao.xml | 15 ++++++
 .../resi/group/dto/topic/TopicInfoDTO.java    | 43 ++++++++++++++++
 .../dto/topic/form/TopicInfoFormDTO.java      | 23 +++++++++
 .../modules/feign/EpmetUserFeignClient.java   | 11 ++++
 .../EpmetUserFeignClientFallback.java         |  6 +++
 .../topic/controller/ResiTopicController.java | 12 +++++
 .../epmet/modules/topic/dao/ResiTopicDao.java | 10 ++++
 .../topic/service/ResiTopicService.java       | 10 ++++
 .../service/impl/ResiTopicServiceImpl.java    | 35 +++++++++++++
 .../resources/mapper/topic/ResiTopicDao.xml   | 14 +++++
 .../main/java/com/epmet/dto/PolyLineDTO.java  | 43 ++++++++++++++++
 .../epmet/dto/form/BelongGridNameFormDTO.java | 23 +++++++++
 .../com/epmet/dto/form/IssueIdFormDTO.java    | 21 ++++++++
 .../epmet/dto/form/IssueInitiatorFormDTO.java |  4 +-
 .../com/epmet/dto/form/TopicInfoFormDTO.java  | 23 +++++++++
 .../dto/result/BelongGridNameResultDTO.java   | 23 +++++++++
 .../com/epmet/dto/result/IssueResultDTO.java  | 48 +++++++++++++++++
 .../dto/result/VotingTrendResultDTO.java      | 38 ++++++++++++++
 .../resi-hall/resi-hall-server/pom.xml        |  5 --
 .../com/epmet/controller/IssueController.java |  7 ++-
 .../com/epmet/feign/EpmetUserFeignClient.java |  2 +-
 .../com/epmet/feign/GovIssueFeignClient.java  | 29 +++++++++++
 .../com/epmet/feign/GovOrgFeignClient.java    | 24 +++++++++
 .../com/epmet/feign/ResiGroupFeignClient.java | 28 ++++++++++
 .../fallback/GovIssueFeignClientFallBack.java | 22 ++++++++
 .../fallback/GovOrgFeignClientFallBack.java   | 23 +++++++++
 .../ResiGroupFeignClientFallBack.java         | 21 ++++++++
 .../java/com/epmet/service/IssueService.java  |  4 +-
 .../epmet/service/impl/IssueServiceImpl.java  | 51 ++++++++++++++++---
 .../epmet/dto/form/IssueInitiatorFormDTO.java | 23 +++++++++
 .../dto/result/IssueInitiatorResultDTO.java   | 20 ++++++++
 .../controller/UserResiInfoController.java    | 12 +++++
 .../java/com/epmet/dao/UserResiInfoDao.java   | 10 ++++
 .../epmet/service/UserResiInfoService.java    | 10 ++++
 .../service/impl/UserResiInfoServiceImpl.java | 13 +++++
 .../main/resources/mapper/UserResiInfoDao.xml | 24 +++++++++
 42 files changed, 795 insertions(+), 23 deletions(-)
 create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/BelongGridNameFormDTO.java
 create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BelongGridNameResultDTO.java
 create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicInfoDTO.java
 create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/TopicInfoFormDTO.java
 create mode 100644 epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/PolyLineDTO.java
 create mode 100644 epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/BelongGridNameFormDTO.java
 create mode 100644 epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/IssueIdFormDTO.java
 create mode 100644 epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/TopicInfoFormDTO.java
 create mode 100644 epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/BelongGridNameResultDTO.java
 create mode 100644 epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java
 create mode 100644 epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VotingTrendResultDTO.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java
 create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IssueInitiatorFormDTO.java
 create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IssueInitiatorResultDTO.java

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/BelongGridNameFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/BelongGridNameFormDTO.java
new file mode 100644
index 0000000000..8df402c618
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/BelongGridNameFormDTO.java
@@ -0,0 +1,23 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 查询所属网格
+ * @CreateTime 2020/5/11 9:36
+ */
+@Data
+public class BelongGridNameFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BelongGridNameResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BelongGridNameResultDTO.java
new file mode 100644
index 0000000000..f4a0b8a9c7
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BelongGridNameResultDTO.java
@@ -0,0 +1,21 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @CreateTime 2020/5/11 18:30
+ */
+@Data
+public class BelongGridNameResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -5513674274570554563L;
+
+    /**
+     * 所属网格(网格所属机关单位名称-网格名称)
+     */
+    private String BelongsGridName;
+
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java
index 5e092efda6..c5a2779d16 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java
@@ -26,6 +26,7 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.CustomerGridDTO;
+import com.epmet.dto.form.BelongGridNameFormDTO;
 import com.epmet.dto.form.SelectGridNameByGridIdFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.dto.form.CustomerGridFormDTO;
@@ -182,4 +183,15 @@ public class CustomerGridController {
         return customerGridService.getGridListByGridIds(gridIdList);
     }
 
+    /**
+     * @Description  获取所属网格
+     * @param formDTO
+     * @author zxc
+     * @date 2020/5/11 18:37
+     */
+    @PostMapping("getgridnamebygridid")
+    public Result<BelongGridNameResultDTO> getGridNameByGridId(@RequestBody BelongGridNameFormDTO formDTO){
+        return new Result<BelongGridNameResultDTO>().ok(customerGridService.getGridNameByGridId(formDTO));
+    }
+
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
index ccf6d62ed9..cc9f544cfb 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
@@ -19,11 +19,8 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.*;
-import com.epmet.dto.form.ListCustomerGridFormDTO;
-import com.epmet.dto.form.SelectGridNameByGridIdFormDTO;
+import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
-import com.epmet.dto.form.CustomerGridFormDTO;
-import com.epmet.dto.form.DeleteGridFormDTO;
 import com.epmet.dto.result.CustomerGridForStrangerResultDTO;
 import com.epmet.entity.CustomerGridEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -155,4 +152,12 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
      * @Author sun
      */
     List<AllGridsByUserIdResultDTO> selectGridByIds(@Param("gridIdList") List<String> gridIdList);
+
+    /**
+     * @Description  获取所属网格
+     * @param formDTO
+     * @author zxc
+     * @date 2020/5/11 18:50
+     */
+    BelongGridNameResultDTO getGridNameByGridId(BelongGridNameFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
index 0553e60758..0f62db96e5 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
@@ -228,4 +228,12 @@ public interface CustomerGridService extends BaseService<CustomerGridEntity> {
      */
     Result<List<AllGridsByUserIdResultDTO>> getGridListByGridIds(List<String> gridIdList);
 
+    /**
+     * @Description  获取所属网格
+     * @param formDTO
+     * @author zxc
+     * @date 2020/5/11 18:36
+     */
+    BelongGridNameResultDTO getGridNameByGridId(BelongGridNameFormDTO formDTO);
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
index 367ee133fa..da1371aca7 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
@@ -536,4 +536,15 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
         List<AllGridsByUserIdResultDTO> list = baseDao.selectGridByIds(gridIdList);
         return result.ok(list);
     }
+
+    /**
+     * @Description  获取所属网格
+     * @param formDTO
+     * @author zxc
+     * @date 2020/5/11 18:37
+     */
+    @Override
+    public BelongGridNameResultDTO getGridNameByGridId(BelongGridNameFormDTO formDTO) {
+        return baseDao.getGridNameByGridId(formDTO);
+    }
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
index aebba044c4..5f40d5c0d8 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
@@ -270,4 +270,19 @@
         )<!-- 按照foreach中遍历的Id顺序排序(按网格访问时间倒序) -->
     </select>
 
+    <!-- 获取所属网格 -->
+    <select id="getGridNameByGridId" parameterType="com.epmet.dto.form.BelongGridNameFormDTO" resultType="com.epmet.dto.result.BelongGridNameResultDTO">
+        SELECT
+            CONCAT(
+                IFNULL( ca.organization_name, '' ),
+                '-',
+            IFNULL( cg.grid_name, '' )) AS belongsGridName
+        FROM
+            customer_grid cg
+            LEFT JOIN customer_agency ca ON ca.id = cg.pid
+        WHERE
+            cg.id = #{gridId}
+            AND cg.del_flag = 0
+    </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/TopicInfoDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicInfoDTO.java
new file mode 100644
index 0000000000..e643a1bd75
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicInfoDTO.java
@@ -0,0 +1,43 @@
+package com.epmet.resi.group.dto.topic;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * 话题详情(议题详情中的)
+ * @CreateTime 2020/5/11 9:36
+ */
+@Data
+public class TopicInfoDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 话题id
+     */
+    private String topicId;
+
+    /**
+     * 话题内容
+     */
+    private String topicContent;
+
+    /**
+     * 图片列表
+     */
+    private List<String> topicImgs;
+
+    /**
+     * 话题发表人（山东路168-尹女士）
+     */
+    private String publishedUser;
+
+    /**
+     * 话题发表时间 (时间戳 毫秒级)
+     */
+    private Long publishedTime;
+
+}
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/TopicInfoFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/TopicInfoFormDTO.java
new file mode 100644
index 0000000000..9c8c2dc5e4
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/TopicInfoFormDTO.java
@@ -0,0 +1,23 @@
+package com.epmet.resi.group.dto.topic.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 查询话题信息
+ * @CreateTime 2020/5/11 9:36
+ */
+@Data
+public class TopicInfoFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 话题id
+     */
+    private String topicId;
+
+
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java
index c9ad7e98a8..5ce70364f8 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java
@@ -3,6 +3,7 @@ package com.epmet.modules.feign;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.*;
+import com.epmet.dto.result.IssueInitiatorResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.dto.result.UserRoleResultDTO;
 import com.epmet.modules.feign.fallback.EpmetUserFeignClientFallback;
@@ -17,6 +18,7 @@ import java.util.List;
  * @Description epmet_user服务fegin
  * @Author yinzuomei
  * @Date 2020/3/16 14:48
+ * url = "localhost:8087"
  */
 @FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallback.class)
 public interface EpmetUserFeignClient {
@@ -63,4 +65,13 @@ public interface EpmetUserFeignClient {
 
 	@PostMapping(value = "epmetuser/staffrole/specificrolesstaffs", consumes = MediaType.APPLICATION_JSON_VALUE)
 	Result<List<String>> specificRolesStaffs(RolesUsersListFormDTO rolesUsersListFormDTO);
+
+	/**
+	 * @Description  查询议题发起人
+	 * @param formDTO
+	 * @author zxc
+	 * @date 2020/5/11 10:53
+	 */
+	@PostMapping(value = "/epmetuser/userresiinfo/selectissueinitiator")
+	Result<IssueInitiatorResultDTO> selectIssueInitiator(@RequestBody IssueInitiatorFormDTO formDTO);
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallback.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallback.java
index e778691743..3f2377fa95 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallback.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallback.java
@@ -4,6 +4,7 @@ import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.*;
+import com.epmet.dto.result.IssueInitiatorResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.dto.result.UserRoleResultDTO;
 import com.epmet.modules.feign.EpmetUserFeignClient;
@@ -43,4 +44,9 @@ public class EpmetUserFeignClientFallback implements EpmetUserFeignClient {
 	public Result<List<String>> specificRolesStaffs(RolesUsersListFormDTO rolesUsersListFormDTO) {
 		return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "specificRolesStaffs", rolesUsersListFormDTO);
 	}
+
+	@Override
+	public Result<IssueInitiatorResultDTO> selectIssueInitiator(IssueInitiatorFormDTO formDTO) {
+		return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "selectIssueInitiator", formDTO);
+	}
 }
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 f0f488efe5..6a86db52ff 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
@@ -5,6 +5,7 @@ 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.modules.topic.service.ResiTopicService;
+import com.epmet.resi.group.dto.topic.TopicInfoDTO;
 import com.epmet.resi.group.dto.topic.form.*;
 import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO;
 import com.epmet.resi.group.dto.topic.result.ResiTopicIncludeIssueDetailResultDTO;
@@ -187,4 +188,15 @@ public class ResiTopicController {
         return topicService.getTopicDetailGov(topicDetailFormDTO.getTopicId());
     }
 
+    /**
+     * @Description  根据topicId查询话题信息 （议题详情——话题信息）
+     * @param topicInfo
+     * @author zxc
+     * @date 2020/5/11 14:15
+     */
+    @PostMapping(value = "selectdetail")
+    public Result<TopicInfoDTO> selectDetail(@RequestBody TopicInfoFormDTO topicInfo){
+        return new Result<TopicInfoDTO>().ok(topicService.selectDetail(topicInfo));
+    }
+
 }
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 7399e0ca43..95d679080a 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
@@ -21,8 +21,10 @@ package com.epmet.modules.topic.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.modules.topic.entity.ResiTopicEntity;
 import com.epmet.resi.group.dto.topic.ResiTopicDTO;
+import com.epmet.resi.group.dto.topic.TopicInfoDTO;
 import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO;
 import com.epmet.resi.group.dto.topic.result.ResiTopicIncludeIssueInfoResultDTO;
+import com.epmet.resi.group.dto.topic.form.TopicInfoFormDTO;
 import com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -110,4 +112,12 @@ public interface ResiTopicDao extends BaseDao<ResiTopicEntity> {
      * @Date 2020.04.01 15:21
      **/
     List<ResiTopicDTO> selectTopicList(ResiTopicDTO resiTopicDTO);
+
+    /**
+     * @Description  根据topicId查询话题信息 （议题详情——话题信息）
+     * @param formDTO
+     * @author zxc
+     * @date 2020/5/11 15:28
+     */
+    TopicInfoDTO selectDetail(TopicInfoFormDTO formDTO);
 }
\ 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 2282d66cb9..f7694dcf76 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
@@ -26,9 +26,11 @@ import com.epmet.modules.topic.entity.ResiTopicEntity;
 import com.epmet.resi.group.dto.member.form.RemoveMemberFormDTO;
 import com.epmet.resi.group.dto.topic.ResiTopicDTO;
 
+import com.epmet.resi.group.dto.topic.TopicInfoDTO;
 import com.epmet.resi.group.dto.topic.form.ResiTopicOperationFormDTO;
 import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO;
 import com.epmet.resi.group.dto.topic.form.ResiTopicPublishFormDTO;
+import com.epmet.resi.group.dto.topic.form.TopicInfoFormDTO;
 import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO;
 import com.epmet.resi.group.dto.topic.result.ResiTopicIncludeIssueDetailResultDTO;
 import com.epmet.resi.group.dto.topic.result.ResiTopicIncludeIssueInfoResultDTO;
@@ -219,4 +221,12 @@ public interface ResiTopicService extends BaseService<ResiTopicEntity> {
      **/
     Result<ResiTopicDetailResultDTO> getTopicDetailGov(String topicId);
 
+    /**
+     * @Description  根据topicId查询话题信息 （议题详情——话题信息）
+     * @param formDTO
+     * @author zxc
+     * @date 2020/5/11 14:16
+     */
+    TopicInfoDTO selectDetail(TopicInfoFormDTO formDTO);
+
 }
\ No newline at end of file
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 aa688b9d26..920c6cfda4 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
@@ -29,7 +29,9 @@ import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.IssueInitiatorFormDTO;
 import com.epmet.dto.form.UserResiInfoListFormDTO;
+import com.epmet.dto.result.IssueInitiatorResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.modules.constant.GroupMemberConstant;
 import com.epmet.modules.feign.EpmetUserFeignClient;
@@ -60,9 +62,11 @@ import com.epmet.resi.group.dto.member.ResiGroupMemberInfoRedisDTO;
 import com.epmet.resi.group.dto.member.form.RemoveMemberFormDTO;
 import com.epmet.resi.group.dto.member.result.ResiGroupMemberInfoRedisResultDTO;
 import com.epmet.resi.group.dto.topic.ResiTopicDTO;
+import com.epmet.resi.group.dto.topic.TopicInfoDTO;
 import com.epmet.resi.group.dto.topic.form.ResiTopicOperationFormDTO;
 import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO;
 import com.epmet.resi.group.dto.topic.form.ResiTopicPublishFormDTO;
+import com.epmet.resi.group.dto.topic.form.TopicInfoFormDTO;
 import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO;
 import com.epmet.resi.group.dto.topic.result.ResiTopicIncludeIssueDetailResultDTO;
 import com.epmet.resi.group.dto.topic.result.ResiTopicIncludeIssueInfoResultDTO;
@@ -117,6 +121,9 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
     @Autowired
     private ResiGroupRedis resiGroupRedis;
 
+    @Autowired
+    private ResiTopicDao resiTopicDao;
+
     private final Log logger = LogFactory.getLog(getClass());
 
     @Override
@@ -896,6 +903,34 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         }
 
     }
+
+    /**
+     * @Description  根据topicId查询话题信息 （议题详情——话题信息）
+     * @param formDTO
+     * @author zxc
+     * @date 2020/5/11 14:16
+     */
+    @Override
+    public TopicInfoDTO selectDetail(TopicInfoFormDTO formDTO) {
+        TopicInfoDTO topicInfo = resiTopicDao.selectDetail(formDTO);
+        //话题图片
+        QueryWrapper<ResiTopicAttachmentEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(FieldConstant.DEL_FLAG,NumConstant.ZERO_STR);
+        wrapper.eq(TopicConstant.TOPIC_ID,formDTO.getTopicId());
+        wrapper.orderByAsc(TopicConstant.SORT);
+        List<ResiTopicAttachmentEntity> attachments = resiTopicAttachmentDao.selectList(wrapper);
+        List<String> attachmentUrls = new ArrayList<>();
+        for(ResiTopicAttachmentEntity attachment : attachments){
+            attachmentUrls.add(attachment.getAttachmentUrl());
+        }
+        topicInfo.setTopicImgs(attachmentUrls);
+        //话题发起人
+        IssueInitiatorFormDTO issueInitiator = new IssueInitiatorFormDTO();
+        issueInitiator.setUserId(topicInfo.getTopicId());
+        Result<IssueInitiatorResultDTO> issueInitiatorResult = epmetUserFeignClient.selectIssueInitiator(issueInitiator);
+        topicInfo.setPublishedUser(issueInitiatorResult.getData().getIssueInitiator());
+        return topicInfo;
+    }
 }
 
 
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 f274faffff..62cef3f328 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
@@ -337,4 +337,18 @@
         </foreach>
     </update>
 
+    <!-- 根据topicId查询话题信息 （议题详情——话题信息） -->
+    <select id="selectDetail" parameterType="com.epmet.resi.group.dto.topic.form.TopicInfoFormDTO" resultType="com.epmet.resi.group.dto.topic.TopicInfoDTO">
+        SELECT
+            id AS topicId,
+            topic_content AS topicContent,
+            created_by AS publishedUser,
+            UNIX_TIMESTAMP( created_time ) AS publishedTime
+        FROM
+            resi_topic
+        WHERE
+            id = #{topicId}
+            AND del_flag = 0
+    </select>
+
 </mapper>
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/PolyLineDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/PolyLineDTO.java
new file mode 100644
index 0000000000..b4fee06837
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/PolyLineDTO.java
@@ -0,0 +1,43 @@
+package com.epmet.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * 投票折线数据
+ * @CreateTime 2020/5/11 9:36
+ */
+@Data
+public class PolyLineDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 话题id
+     */
+    private String topicId;
+
+    /**
+     * 话题内容
+     */
+    private String topicContent;
+
+    /**
+     * 图片列表
+     */
+    private List<String> topicImgs;
+
+    /**
+     * 话题发表人（山东路168-尹女士）
+     */
+    private String publishedUser;
+
+    /**
+     * 话题发表时间 (时间戳 毫秒级)
+     */
+    private Long publishedTime;
+
+}
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/BelongGridNameFormDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/BelongGridNameFormDTO.java
new file mode 100644
index 0000000000..8df402c618
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/BelongGridNameFormDTO.java
@@ -0,0 +1,23 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 查询所属网格
+ * @CreateTime 2020/5/11 9:36
+ */
+@Data
+public class BelongGridNameFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+
+}
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/IssueIdFormDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/IssueIdFormDTO.java
new file mode 100644
index 0000000000..6b16e733ec
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/IssueIdFormDTO.java
@@ -0,0 +1,21 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 议题Id
+ * @Author zxc
+ * @Date 2020/5/11 9:30
+ */
+@Data
+public class IssueIdFormDTO implements Serializable {
+    private static final long serialVersionUID = 4859779755214503489L;
+
+    @NotBlank(message = "议题id不能为空")
+    private String issueId;
+
+}
+
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/IssueInitiatorFormDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/IssueInitiatorFormDTO.java
index 42b2885f66..00231b0b9d 100644
--- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/IssueInitiatorFormDTO.java
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/IssueInitiatorFormDTO.java
@@ -15,9 +15,9 @@ public class IssueInitiatorFormDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 话题id
+     * userId 用户id
      */
-    private String topicId;
+    private String userId;
 
 
 }
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/TopicInfoFormDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/TopicInfoFormDTO.java
new file mode 100644
index 0000000000..cf85fae8c8
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/TopicInfoFormDTO.java
@@ -0,0 +1,23 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 查询话题信息
+ * @CreateTime 2020/5/11 9:36
+ */
+@Data
+public class TopicInfoFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 话题id
+     */
+    private String topicId;
+
+
+}
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/BelongGridNameResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/BelongGridNameResultDTO.java
new file mode 100644
index 0000000000..5d7091a66d
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/BelongGridNameResultDTO.java
@@ -0,0 +1,23 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 查询所属网格
+ * @CreateTime 2020/5/11 9:36
+ */
+@Data
+public class BelongGridNameResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -1L;
+
+    /**
+     * 所属网格名称  eg:所属网格(网格所属机关单位名称-网格名称)
+     */
+    private String belongsGridName;
+
+
+}
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java
new file mode 100644
index 0000000000..b278b9f585
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java
@@ -0,0 +1,48 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 议题详情回参
+ * @CreateTime 2020/5/11 9:31
+ */
+@Data
+public class IssueResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -1L;
+
+    /**
+     * 议题标题
+     */
+    private String issueTitle;
+
+    /**
+     * 议题状态(voting 已转项目：shift_project 已关闭：closed)
+     */
+    private String issueStatus;
+
+    /**
+     * 议题建议
+     */
+    private String issueSuggestion;
+
+    /**
+     * 网格Id
+     */
+    private String gridId;
+
+    /**
+     * 用户id
+     */
+    private String userId;
+
+    /**
+     * 话题Id
+     */
+    private String topicId;
+
+
+}
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VotingTrendResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VotingTrendResultDTO.java
new file mode 100644
index 0000000000..b92e466fce
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VotingTrendResultDTO.java
@@ -0,0 +1,38 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 议题表决折线图
+ * @CreateTime 2020/5/11 9:36
+ */
+@Data
+public class VotingTrendResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -1L;
+
+    /**
+     * 应表决数量
+     */
+    private Integer shouldVoteCount;
+
+    /**
+     * 实际表决数量
+     */
+    private Integer realityVoteCount;
+
+    /**
+     * 截至今日赞成票总数
+     */
+    private Integer supportAmount;
+
+    /**
+     * 截至今日反对票总数
+     */
+    private Integer oppositionAmount;
+
+
+}
diff --git a/epmet-module/resi-hall/resi-hall-server/pom.xml b/epmet-module/resi-hall/resi-hall-server/pom.xml
index 66d1426a33..4c3d9cdefc 100644
--- a/epmet-module/resi-hall/resi-hall-server/pom.xml
+++ b/epmet-module/resi-hall/resi-hall-server/pom.xml
@@ -19,11 +19,6 @@
             <artifactId>resi-hall-client</artifactId>
             <version>2.0.0</version>
         </dependency>
-        <dependency>
-            <groupId>com.epmet</groupId>
-            <artifactId>epmet-commons-mybatis</artifactId>
-            <version>2.0.0</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java
index e14c45ec0c..48d63f37c9 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java
@@ -31,10 +31,15 @@ public class IssueController {
      * @date 2020/5/11 9:42
      */
     @PostMapping(value = "/detail")
-    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
+//    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
     public Result<IssueDetailResultDTO> detail(@RequestBody IssueDetailFormDTO issueDetail){
         return new Result<IssueDetailResultDTO>().ok(issueService.detail(issueDetail));
     }
 
+    /*@PostMapping(value = "votingtrend")
+    public Result<> votingTrend(){
+        return
+    }*/
+
 }
 
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
index 168555cc4a..6b397e298e 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestBody;
  * @dscription
  * @date 2020/5/11 10:32
  */
-//url = "8087"
+//url = "localhost:8087"
 @FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class)
 public interface EpmetUserFeignClient {
 
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java
new file mode 100644
index 0000000000..972dad25ff
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java
@@ -0,0 +1,29 @@
+package com.epmet.feign;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.IssueDetailFormDTO;
+import com.epmet.dto.result.IssueResultDTO;
+import com.epmet.feign.fallback.GovIssueFeignClientFallBack;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+
+/**
+ * @Description Feign调用gov-issue-server模块
+ * @ClassName GovIssueFeignFallBack
+ * url = "localhost:8101"
+ */
+@FeignClient(name = ServiceConstant.GOV_ISSUE_SERVER, fallback = GovIssueFeignClientFallBack.class)
+public interface GovIssueFeignClient {
+
+    /**
+     * @Description  议题详情
+     * @param issueDetail
+     * @author zxc
+     * @date 2020/5/11 16:50
+     */
+    @PostMapping("/gov/issue/issue/issuedetail")
+    Result<IssueResultDTO> issueDetail(@RequestBody IssueDetailFormDTO issueDetail);
+}
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
new file mode 100644
index 0000000000..fbb1aeea7e
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
@@ -0,0 +1,24 @@
+package com.epmet.feign;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.BelongGridNameFormDTO;
+import com.epmet.dto.result.BelongGridNameResultDTO;
+import com.epmet.feign.fallback.GovOrgFeignClientFallBack;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+
+/**
+ * @Description Feign调用gov-org-server模块
+ * @ClassName GovOrgFeginFallBack
+ * url = "localhost:8092"
+ */
+@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class)
+public interface GovOrgFeignClient {
+
+
+    @PostMapping("/gov/org/customergrid/getgridnamebygridid")
+    Result<BelongGridNameResultDTO> getGridNameByGridId(@RequestBody BelongGridNameFormDTO formDTO);
+}
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java
new file mode 100644
index 0000000000..661ef0e761
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java
@@ -0,0 +1,28 @@
+package com.epmet.feign;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.TopicInfoDTO;
+import com.epmet.dto.form.TopicInfoFormDTO;
+import com.epmet.feign.fallback.ResiGroupFeignClientFallBack;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+
+/**
+ * @author zxc
+ * url = "localhost:8095"
+ */
+@FeignClient(name = ServiceConstant.RESI_GROUP_SERVER, fallback = ResiGroupFeignClientFallBack.class)
+public interface ResiGroupFeignClient {
+
+	/**
+	 * @Description  获取话题详情
+	 * @param formDTO
+	 * @author zxc
+	 * @date 2020/5/11 15:42
+	 */
+	@PostMapping("/resi/group/topic/selectdetail")
+	Result<TopicInfoDTO> selectDetail(TopicInfoFormDTO formDTO);
+
+
+}
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java
new file mode 100644
index 0000000000..62d2ceb77b
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java
@@ -0,0 +1,22 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.IssueDetailFormDTO;
+import com.epmet.dto.result.IssueResultDTO;
+import com.epmet.feign.GovIssueFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description Feign
+ * @ClassName GovIssueFeginFallBack
+ */
+@Component
+public class GovIssueFeignClientFallBack implements GovIssueFeignClient {
+
+    @Override
+    public Result<IssueResultDTO> issueDetail(IssueDetailFormDTO issueDetail) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "issueDetail", issueDetail);
+    }
+}
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
new file mode 100644
index 0000000000..1c58c6f9ed
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
@@ -0,0 +1,23 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.BelongGridNameFormDTO;
+import com.epmet.dto.result.BelongGridNameResultDTO;
+import com.epmet.feign.GovOrgFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description Feign
+ * @ClassName GovOrgFeginFallBack
+ */
+@Component
+public class GovOrgFeignClientFallBack implements GovOrgFeignClient {
+
+
+    @Override
+    public Result<BelongGridNameResultDTO> getGridNameByGridId(BelongGridNameFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getGridNameByGridId", formDTO);
+    }
+}
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java
new file mode 100644
index 0000000000..d75c1a0f91
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java
@@ -0,0 +1,21 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.TopicInfoDTO;
+import com.epmet.dto.form.TopicInfoFormDTO;
+import com.epmet.feign.ResiGroupFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author zxc
+ */
+@Component
+public class ResiGroupFeignClientFallBack implements ResiGroupFeignClient {
+
+    @Override
+    public Result<TopicInfoDTO> selectDetail(TopicInfoFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "selectDetail", formDTO);
+    }
+}
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueService.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueService.java
index a6bc3862f2..999fb46355 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueService.java
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueService.java
@@ -1,15 +1,13 @@
 package com.epmet.service;
 
-import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.dto.form.IssueDetailFormDTO;
 import com.epmet.dto.result.IssueDetailResultDTO;
-import com.epmet.entity.IssueEntity;
 
 /**
  * @Author zxc
  * @CreateTime 2020/5/11 9:44
  */
-public interface IssueService extends BaseService<IssueEntity> {
+public interface IssueService {
 
     /**
      * @Description  议题详情
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
index ccf27d6be4..b27ed53daf 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
@@ -1,11 +1,21 @@
 package com.epmet.service.impl;
 
-import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
-import com.epmet.dao.IssueDao;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.TopicInfoDTO;
+import com.epmet.dto.form.BelongGridNameFormDTO;
 import com.epmet.dto.form.IssueDetailFormDTO;
+import com.epmet.dto.form.IssueInitiatorFormDTO;
+import com.epmet.dto.form.TopicInfoFormDTO;
+import com.epmet.dto.result.BelongGridNameResultDTO;
 import com.epmet.dto.result.IssueDetailResultDTO;
-import com.epmet.entity.IssueEntity;
+import com.epmet.dto.result.IssueInitiatorResultDTO;
+import com.epmet.dto.result.IssueResultDTO;
+import com.epmet.feign.EpmetUserFeignClient;
+import com.epmet.feign.GovIssueFeignClient;
+import com.epmet.feign.GovOrgFeignClient;
+import com.epmet.feign.ResiGroupFeignClient;
 import com.epmet.service.IssueService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -14,10 +24,16 @@ import org.springframework.stereotype.Service;
  * @CreateTime 2020/5/11 9:46
  */
 @Service
-public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> implements IssueService {
+public class IssueServiceImpl implements IssueService {
 
     @Autowired
-    private IssueDao issueDao;
+    private EpmetUserFeignClient userFeignClient;
+    @Autowired
+    private GovOrgFeignClient govOrgFeignClient;
+    @Autowired
+    private ResiGroupFeignClient resiGroupFeignClient;
+    @Autowired
+    private GovIssueFeignClient govIssueFeignClient;
 
     /**
      * @Description  议题详情
@@ -27,8 +43,29 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
      */
     @Override
     public IssueDetailResultDTO detail(IssueDetailFormDTO issueDetail) {
-        IssueDetailResultDTO issueDetailResult = issueDao.issueDetail(issueDetail);
-
+        IssueDetailResultDTO issueDetailResult = new IssueDetailResultDTO();
+        //议题信息
+        Result<IssueResultDTO> issueResultDTOResult = govIssueFeignClient.issueDetail(issueDetail);
+        IssueResultDTO issueResult = issueResultDTOResult.getData();
+        if (issueResult==null){
+            return issueDetailResult;
+        }
+        BeanUtils.copyProperties(issueResult,issueDetailResult);
+        //话题发起人
+        IssueInitiatorFormDTO initiatorFormDTO = new IssueInitiatorFormDTO();
+        initiatorFormDTO.setUserId(issueResult.getUserId());
+        Result<IssueInitiatorResultDTO> initiatorResult = userFeignClient.selectIssueInitiator(initiatorFormDTO);
+        issueDetailResult.setIssueInitiator(initiatorResult.getData().getIssueInitiator());
+        //网格名称
+        BelongGridNameFormDTO belongGridName = new BelongGridNameFormDTO();
+        belongGridName.setGridId(issueResult.getGridId());
+        Result<BelongGridNameResultDTO> belongGridNameResult = govOrgFeignClient.getGridNameByGridId(belongGridName);
+        issueDetailResult.setBelongsGridName(belongGridNameResult.getData().getBelongsGridName());
+        //话题信息
+        TopicInfoFormDTO topicInfoFormDTO = new TopicInfoFormDTO();
+        topicInfoFormDTO.setTopicId(issueResult.getTopicId());
+        Result<TopicInfoDTO> topicInfoDTOResult = resiGroupFeignClient.selectDetail(topicInfoFormDTO);
+        issueDetailResult.setTopicInfo(topicInfoDTOResult.getData());
         return issueDetailResult;
     }
 }
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IssueInitiatorFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IssueInitiatorFormDTO.java
new file mode 100644
index 0000000000..e52d7c19e6
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IssueInitiatorFormDTO.java
@@ -0,0 +1,23 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 查询议题发起人dto
+ * @CreateTime 2020/5/11 9:36
+ */
+@Data
+public class IssueInitiatorFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 话题id
+     */
+    private String userId;
+
+
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IssueInitiatorResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IssueInitiatorResultDTO.java
new file mode 100644
index 0000000000..08e0113ace
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IssueInitiatorResultDTO.java
@@ -0,0 +1,20 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 返回议题发起人dto     eg：山东路178号——刘女士
+ * @CreateTime 2020/5/11 10:49
+ */
+@Data
+public class IssueInitiatorResultDTO implements Serializable {
+
+    /**
+     * 议题发起人（山东路168-尹女士）
+     */
+    private String issueInitiator;
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java
index 825cc6e78b..8844cfbdc1 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java
@@ -26,9 +26,11 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.UserResiInfoDTO;
+import com.epmet.dto.form.IssueInitiatorFormDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
 import com.epmet.dto.form.UserResiInfoListFormDTO;
 import com.epmet.dto.form.VerificationCodeFormDTO;
+import com.epmet.dto.result.IssueInitiatorResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.excel.UserResiInfoExcel;
 import com.epmet.service.UserResiInfoService;
@@ -150,4 +152,14 @@ public class UserResiInfoController {
         return userResiInfoService.saveResiInfo(userResiInfoDTO);
     }
 
+    /**
+     * @Description  根据userId查询议题发起人 eg:山东路168号——刘女士
+     * @param formDTO
+     * @author zxc
+     */
+    @PostMapping("selectissueinitiator")
+    public Result<IssueInitiatorResultDTO> selectIssueInitiator(@RequestBody IssueInitiatorFormDTO formDTO){
+        return new Result<IssueInitiatorResultDTO>().ok(userResiInfoService.selectIssueInitiator(formDTO));
+    }
+
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java
index e14b927f1b..4f57bfa73c 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java
@@ -19,7 +19,9 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.UserResiInfoDTO;
+import com.epmet.dto.form.IssueInitiatorFormDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
+import com.epmet.dto.result.IssueInitiatorResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.entity.UserResiInfoEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -59,4 +61,12 @@ public interface UserResiInfoDao extends BaseDao<UserResiInfoEntity> {
 	 * @Date 2020/4/7 18:26
 	 **/
 	List<UserResiInfoResultDTO> selectListUserResiInfoDTO(@Param("userIdList") List<String> userIdList);
+
+	/**
+	 * @Description  根据userId查询议题发起人
+	 * @param formDTO
+	 * @author zxc
+	 * @date 2020/5/11 11:18
+	 */
+	IssueInitiatorResultDTO selectIssueInitiator(IssueInitiatorFormDTO formDTO);
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiInfoService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiInfoService.java
index 5f0817a62e..d01c706fd5 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiInfoService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiInfoService.java
@@ -21,9 +21,11 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.UserResiInfoDTO;
+import com.epmet.dto.form.IssueInitiatorFormDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
 import com.epmet.dto.form.UserResiInfoListFormDTO;
 import com.epmet.dto.form.VerificationCodeFormDTO;
+import com.epmet.dto.result.IssueInitiatorResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.entity.UserResiInfoEntity;
 
@@ -141,4 +143,12 @@ public interface UserResiInfoService extends BaseService<UserResiInfoEntity> {
 	 * @Date 2020/4/7 18:21
 	 **/
 	Result<List<UserResiInfoResultDTO>> getUserResiInfoList(UserResiInfoListFormDTO userResiInfoListFormDTO);
+
+	/**
+	 * @Description  根据userId查询议题发起人
+	 * @param formDTO
+	 * @author zxc
+	 * @date 2020/5/11 10:59
+	 */
+	IssueInitiatorResultDTO selectIssueInitiator(IssueInitiatorFormDTO formDTO);
 }
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 b11fd29898..af31e780ec 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
@@ -31,9 +31,11 @@ import com.epmet.constant.UserRoleConstant;
 import com.epmet.dao.UserResiInfoDao;
 import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.UserRoleDTO;
+import com.epmet.dto.form.IssueInitiatorFormDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
 import com.epmet.dto.form.UserResiInfoListFormDTO;
 import com.epmet.dto.form.VerificationCodeFormDTO;
+import com.epmet.dto.result.IssueInitiatorResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.entity.UserResiInfoEntity;
 import com.epmet.feign.MessageFeignClient;
@@ -272,4 +274,15 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 		return bl;
 	}
 
+	/**
+	 * @Description 根据userId查询议题发起人
+	 * @param formDTO
+	 * @author zxc
+	 * @date 2020/5/11 11:00
+	 */
+	@Override
+	public IssueInitiatorResultDTO selectIssueInitiator(IssueInitiatorFormDTO formDTO) {
+		return userResiInfoDao.selectIssueInitiator(formDTO);
+	}
+
 }
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml
index a8aa71d4dc..c889d350da 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml
@@ -108,4 +108,28 @@
             #{userId}
         </foreach>
     </select>
+
+    <!-- 根据userId查询议题发起人 -->
+    <select id="selectIssueInitiator" parameterType="com.epmet.dto.form.IssueInitiatorFormDTO" resultType="com.epmet.dto.result.IssueInitiatorResultDTO">
+        SELECT
+            CONCAT(
+                uri.street,
+                '-',
+                uri.surname,
+                CASE
+                    WHEN uw.sex = '1' THEN
+                    '先生'
+                    WHEN uw.sex = '2' THEN
+                    '女士'
+                    ELSE '某某'
+                END
+                ) AS issueInitiator
+        FROM
+            user_resi_info uri
+            LEFT JOIN user_wechat uw ON uw.user_id = uri.user_id
+        WHERE
+            uri.user_id = #{userId}
+            AND uri.del_flag = 0
+            AND uw.del_flag = 0
+    </select>
 </mapper>

From d9e91c7349c7386bb87ed09e53c5009f493f82a9 Mon Sep 17 00:00:00 2001
From: zxc <954985706@qq.com>
Date: Mon, 11 May 2020 20:12:04 +0800
Subject: [PATCH 15/45] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E8=AE=AE=E9=A2=98?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resi-hall-client/resi-hall-client.iml     | 145 +++++++++++++
 .../resi-hall-server/resi-hall-server.iml     | 196 ++++++++++++++++++
 .../IssueCustomerParameterController.java     |  94 ---------
 .../controller/IssueProcessController.java    |  94 ---------
 .../IssueProjectRelationController.java       |  94 ---------
 .../IssueSatisfactionDetailController.java    |  94 ---------
 ...ssueSatisfactionStatisticalController.java |  94 ---------
 .../controller/IssueVoteDetailController.java |  94 ---------
 .../IssueVoteStatisticalController.java       |  94 ---------
 .../IssueVoteStatisticalDailyController.java  |  94 ---------
 .../controller/ResiHallDemoController.java    |  27 ---
 .../epmet/dao/IssueCustomerParameterDao.java  |  33 ---
 .../src/main/java/com/epmet/dao/IssueDao.java |  43 ----
 .../java/com/epmet/dao/IssueProcessDao.java   |  33 ---
 .../epmet/dao/IssueProjectRelationDao.java    |  33 ---
 .../epmet/dao/IssueSatisfactionDetailDao.java |  33 ---
 .../dao/IssueSatisfactionStatisticalDao.java  |  33 ---
 .../com/epmet/dao/IssueVoteDetailDao.java     |  33 ---
 .../dao/IssueVoteStatisticalDailyDao.java     |  33 ---
 .../epmet/dao/IssueVoteStatisticalDao.java    |  33 ---
 .../entity/IssueCustomerParameterEntity.java  |  66 ------
 .../java/com/epmet/entity/IssueEntity.java    | 116 -----------
 .../com/epmet/entity/IssueProcessEntity.java  |  66 ------
 .../entity/IssueProjectRelationEntity.java    |  51 -----
 .../entity/IssueSatisfactionDetailEntity.java |  56 -----
 .../IssueSatisfactionStatisticalEntity.java   |  61 ------
 .../epmet/entity/IssueVoteDetailEntity.java   |  51 -----
 .../IssueVoteStatisticalDailyEntity.java      |  86 --------
 .../entity/IssueVoteStatisticalEntity.java    |  61 ------
 .../excel/IssueCustomerParameterExcel.java    |  71 -------
 .../main/java/com/epmet/excel/IssueExcel.java | 101 ---------
 .../com/epmet/excel/IssueProcessExcel.java    |  71 -------
 .../excel/IssueProjectRelationExcel.java      |  62 ------
 .../excel/IssueSatisfactionDetailExcel.java   |  65 ------
 .../IssueSatisfactionStatisticalExcel.java    |  68 ------
 .../com/epmet/excel/IssueVoteDetailExcel.java |  62 ------
 .../excel/IssueVoteStatisticalDailyExcel.java |  83 --------
 .../excel/IssueVoteStatisticalExcel.java      |  68 ------
 .../redis/IssueCustomerParameterRedis.java    |  47 -----
 .../com/epmet/redis/IssueProcessRedis.java    |  47 -----
 .../redis/IssueProjectRelationRedis.java      |  47 -----
 .../main/java/com/epmet/redis/IssueRedis.java |  47 -----
 .../redis/IssueSatisfactionDetailRedis.java   |  47 -----
 .../IssueSatisfactionStatisticalRedis.java    |  47 -----
 .../com/epmet/redis/IssueVoteDetailRedis.java |  47 -----
 .../redis/IssueVoteStatisticalDailyRedis.java |  47 -----
 .../redis/IssueVoteStatisticalRedis.java      |  47 -----
 .../IssueCustomerParameterService.java        |  95 ---------
 .../epmet/service/IssueProcessService.java    |  95 ---------
 .../service/IssueProjectRelationService.java  |  95 ---------
 .../IssueSatisfactionDetailService.java       |  95 ---------
 .../IssueSatisfactionStatisticalService.java  |  95 ---------
 .../epmet/service/IssueVoteDetailService.java |  95 ---------
 .../IssueVoteStatisticalDailyService.java     |  95 ---------
 .../service/IssueVoteStatisticalService.java  |  95 ---------
 .../IssueCustomerParameterServiceImpl.java    |  99 ---------
 .../service/impl/IssueProcessServiceImpl.java | 104 ----------
 .../impl/IssueProjectRelationServiceImpl.java | 104 ----------
 .../IssueSatisfactionDetailServiceImpl.java   | 104 ----------
 ...sueSatisfactionStatisticalServiceImpl.java | 104 ----------
 .../impl/IssueVoteDetailServiceImpl.java      | 104 ----------
 .../IssueVoteStatisticalDailyServiceImpl.java | 104 ----------
 .../impl/IssueVoteStatisticalServiceImpl.java | 104 ----------
 .../mapper/IssueCustomerParameterDao.xml      |  22 --
 .../main/resources/mapper/IssueProcessDao.xml |  22 --
 .../mapper/IssueProjectRelationDao.xml        |  19 --
 .../mapper/IssueSatisfactionDetailDao.xml     |  20 --
 .../IssueSatisfactionStatisticalDao.xml       |  21 --
 .../resources/mapper/IssueVoteDetailDao.xml   |  19 --
 .../mapper/IssueVoteStatisticalDailyDao.xml   |  26 ---
 .../mapper/IssueVoteStatisticalDao.xml        |  21 --
 epmet-module/resi-hall/resi-hall.iml          |  51 +++++
 72 files changed, 392 insertions(+), 4531 deletions(-)
 create mode 100644 epmet-module/resi-hall/resi-hall-client/resi-hall-client.iml
 create mode 100644 epmet-module/resi-hall/resi-hall-server/resi-hall-server.iml
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueCustomerParameterController.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueProcessController.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueProjectRelationController.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueSatisfactionDetailController.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueSatisfactionStatisticalController.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteDetailController.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteStatisticalController.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteStatisticalDailyController.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/ResiHallDemoController.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueCustomerParameterDao.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueDao.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueProcessDao.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueProjectRelationDao.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueSatisfactionDetailDao.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueSatisfactionStatisticalDao.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDailyDao.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueCustomerParameterEntity.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueEntity.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueProcessEntity.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueProjectRelationEntity.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueSatisfactionDetailEntity.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueSatisfactionStatisticalEntity.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteDetailEntity.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteStatisticalDailyEntity.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteStatisticalEntity.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueCustomerParameterExcel.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueExcel.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueProcessExcel.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueProjectRelationExcel.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueSatisfactionDetailExcel.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueSatisfactionStatisticalExcel.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueVoteDetailExcel.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueVoteStatisticalDailyExcel.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueVoteStatisticalExcel.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueCustomerParameterRedis.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueProcessRedis.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueProjectRelationRedis.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueRedis.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueSatisfactionDetailRedis.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueSatisfactionStatisticalRedis.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueVoteStatisticalDailyRedis.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueVoteStatisticalRedis.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueCustomerParameterService.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueProcessService.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueProjectRelationService.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueSatisfactionDetailService.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueSatisfactionStatisticalService.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteDetailService.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteStatisticalDailyService.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueCustomerParameterServiceImpl.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueProjectRelationServiceImpl.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueSatisfactionStatisticalServiceImpl.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalDailyServiceImpl.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueCustomerParameterDao.xml
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueProcessDao.xml
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueProjectRelationDao.xml
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueSatisfactionDetailDao.xml
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueSatisfactionStatisticalDao.xml
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueVoteDetailDao.xml
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueVoteStatisticalDailyDao.xml
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml
 create mode 100644 epmet-module/resi-hall/resi-hall.iml

diff --git a/epmet-module/resi-hall/resi-hall-client/resi-hall-client.iml b/epmet-module/resi-hall/resi-hall-client/resi-hall-client.iml
new file mode 100644
index 0000000000..f1936e17be
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-client/resi-hall-client.iml
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="epmet-commons-tools" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:2.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:2.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:2.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.60" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.60" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:2.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:2.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.1.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:10.4.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:10.4.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-hystrix:10.4.0" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-core:0.7.6" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.google.code.findbugs:jsr305:3.0.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.5.18" level="project" />
+    <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.3.8" level="project" />
+    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.9" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.1.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.1.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.1.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.1.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.43.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.43.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.43.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.43.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.43.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.43.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.2.13.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.10.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.10" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.10" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.18.Final" level="project" />
+    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.3.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.6" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:4.6.1" level="project" />
+    <orderEntry type="library" name="Maven: cn.afterturn:easypoi-base:4.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.18" level="project" />
+    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: ognl:ognl:3.2.6" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
+    <orderEntry type="library" name="Maven: cn.afterturn:easypoi-annotation:4.1.0" level="project" />
+    <orderEntry type="library" name="Maven: cn.afterturn:easypoi-web:4.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: joda-time:joda-time:2.10.5" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.60" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
+    <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.11.3" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.10" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.13" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.13" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.11" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:18.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.29" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.1.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.7.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.11.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.11.2" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.29" level="project" />
+    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.11.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:2.23.4" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.16" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.16" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.6.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/resi-hall-server.iml b/epmet-module/resi-hall/resi-hall-server/resi-hall-server.iml
new file mode 100644
index 0000000000..9b122af4a2
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/resi-hall-server.iml
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="resi-hall-client" />
+    <orderEntry type="module" module-name="epmet-commons-tools" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:2.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:2.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.60" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.60" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:2.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:10.4.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-hystrix:10.4.0" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-core:0.7.6" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.google.code.findbugs:jsr305:3.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.5.18" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.1.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.1.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.1.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.1.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.43.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.43.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.43.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.43.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.43.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.43.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.2.13.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.10.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.10" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.10" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.6" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:4.6.1" level="project" />
+    <orderEntry type="library" name="Maven: cn.afterturn:easypoi-base:4.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.18" level="project" />
+    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: ognl:ognl:3.2.6" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
+    <orderEntry type="library" name="Maven: cn.afterturn:easypoi-annotation:4.1.0" level="project" />
+    <orderEntry type="library" name="Maven: cn.afterturn:easypoi-web:4.1.0" level="project" />
+    <orderEntry type="library" name="Maven: joda-time:joda-time:2.10.5" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.60" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
+    <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.11.3" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.10" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.13" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.13" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.11" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:18.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.29" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.1.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.11.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.11.2" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.29" level="project" />
+    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.10" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.10" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.10" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.29" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.29" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.29" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.18.Final" level="project" />
+    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.3.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.micrometer:micrometer-core:1.1.9" level="project" />
+    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.9" level="project" />
+    <orderEntry type="library" name="Maven: org.latencyutils:LatencyUtils:2.0.3" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-alibaba-nacos-discovery:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-client:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-common:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-api:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: io.prometheus:simpleclient:0.5.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:2.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.1.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:2.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-ribbon:2.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-archaius:2.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.ribbon:ribbon-transport:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-contexts:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-servo:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.inject:javax.inject:1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty:0.4.9" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-core:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-httpclient:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-client:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-core:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.ws.rs:jsr311-api:1.1.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey.contribs:jersey-apache-client4:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.servo:servo-core:0.12.21" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-commons-util:0.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-loadbalancer:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-statistics:0.1.1" level="project" />
+    <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.3.8" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-config:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-alibaba-nacos-config:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-httpclient:10.3.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:10.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.10" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.12" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.11.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:2.23.4" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.16" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.16" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.6.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueCustomerParameterController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueCustomerParameterController.java
deleted file mode 100644
index 7371c32666..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueCustomerParameterController.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * 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.controller;
-
-import com.epmet.commons.tools.page.PageData;
-import com.epmet.commons.tools.utils.ExcelUtils;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.commons.tools.validator.AssertUtils;
-import com.epmet.commons.tools.validator.ValidatorUtils;
-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.IssueCustomerParameterDTO;
-import com.epmet.excel.IssueCustomerParameterExcel;
-import com.epmet.service.IssueCustomerParameterService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * 议题客户参数定制表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-@RestController
-@RequestMapping("issuecustomerparameter")
-public class IssueCustomerParameterController {
-    
-    @Autowired
-    private IssueCustomerParameterService issueCustomerParameterService;
-
-    @GetMapping("page")
-    public Result<PageData<IssueCustomerParameterDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<IssueCustomerParameterDTO> page = issueCustomerParameterService.page(params);
-        return new Result<PageData<IssueCustomerParameterDTO>>().ok(page);
-    }
-
-    @GetMapping("{id}")
-    public Result<IssueCustomerParameterDTO> get(@PathVariable("id") String id){
-        IssueCustomerParameterDTO data = issueCustomerParameterService.get(id);
-        return new Result<IssueCustomerParameterDTO>().ok(data);
-    }
-
-    @PostMapping
-    public Result save(@RequestBody IssueCustomerParameterDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        issueCustomerParameterService.save(dto);
-        return new Result();
-    }
-
-    @PutMapping
-    public Result update(@RequestBody IssueCustomerParameterDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-        issueCustomerParameterService.update(dto);
-        return new Result();
-    }
-
-    @DeleteMapping
-    public Result delete(@RequestBody String[] ids){
-        //效验数据
-        AssertUtils.isArrayEmpty(ids, "id");
-        issueCustomerParameterService.delete(ids);
-        return new Result();
-    }
-
-    @GetMapping("export")
-    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<IssueCustomerParameterDTO> list = issueCustomerParameterService.list(params);
-        ExcelUtils.exportExcelToTarget(response, null, list, IssueCustomerParameterExcel.class);
-    }
-
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueProcessController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueProcessController.java
deleted file mode 100644
index bf6c57f863..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueProcessController.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * 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.controller;
-
-import com.epmet.commons.tools.page.PageData;
-import com.epmet.commons.tools.utils.ExcelUtils;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.commons.tools.validator.AssertUtils;
-import com.epmet.commons.tools.validator.ValidatorUtils;
-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.IssueProcessDTO;
-import com.epmet.excel.IssueProcessExcel;
-import com.epmet.service.IssueProcessService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * 议题进展记录表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-@RestController
-@RequestMapping("issueprocess")
-public class IssueProcessController {
-    
-    @Autowired
-    private IssueProcessService issueProcessService;
-
-    @GetMapping("page")
-    public Result<PageData<IssueProcessDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<IssueProcessDTO> page = issueProcessService.page(params);
-        return new Result<PageData<IssueProcessDTO>>().ok(page);
-    }
-
-    @GetMapping("{id}")
-    public Result<IssueProcessDTO> get(@PathVariable("id") String id){
-        IssueProcessDTO data = issueProcessService.get(id);
-        return new Result<IssueProcessDTO>().ok(data);
-    }
-
-    @PostMapping
-    public Result save(@RequestBody IssueProcessDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        issueProcessService.save(dto);
-        return new Result();
-    }
-
-    @PutMapping
-    public Result update(@RequestBody IssueProcessDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-        issueProcessService.update(dto);
-        return new Result();
-    }
-
-    @DeleteMapping
-    public Result delete(@RequestBody String[] ids){
-        //效验数据
-        AssertUtils.isArrayEmpty(ids, "id");
-        issueProcessService.delete(ids);
-        return new Result();
-    }
-
-    @GetMapping("export")
-    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<IssueProcessDTO> list = issueProcessService.list(params);
-        ExcelUtils.exportExcelToTarget(response, null, list, IssueProcessExcel.class);
-    }
-
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueProjectRelationController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueProjectRelationController.java
deleted file mode 100644
index 7efd1b1394..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueProjectRelationController.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * 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.controller;
-
-import com.epmet.commons.tools.page.PageData;
-import com.epmet.commons.tools.utils.ExcelUtils;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.commons.tools.validator.AssertUtils;
-import com.epmet.commons.tools.validator.ValidatorUtils;
-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.IssueProjectRelationDTO;
-import com.epmet.excel.IssueProjectRelationExcel;
-import com.epmet.service.IssueProjectRelationService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * 议题项目关系表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-@RestController
-@RequestMapping("issueprojectrelation")
-public class IssueProjectRelationController {
-    
-    @Autowired
-    private IssueProjectRelationService issueProjectRelationService;
-
-    @GetMapping("page")
-    public Result<PageData<IssueProjectRelationDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<IssueProjectRelationDTO> page = issueProjectRelationService.page(params);
-        return new Result<PageData<IssueProjectRelationDTO>>().ok(page);
-    }
-
-    @GetMapping("{id}")
-    public Result<IssueProjectRelationDTO> get(@PathVariable("id") String id){
-        IssueProjectRelationDTO data = issueProjectRelationService.get(id);
-        return new Result<IssueProjectRelationDTO>().ok(data);
-    }
-
-    @PostMapping
-    public Result save(@RequestBody IssueProjectRelationDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        issueProjectRelationService.save(dto);
-        return new Result();
-    }
-
-    @PutMapping
-    public Result update(@RequestBody IssueProjectRelationDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-        issueProjectRelationService.update(dto);
-        return new Result();
-    }
-
-    @DeleteMapping
-    public Result delete(@RequestBody String[] ids){
-        //效验数据
-        AssertUtils.isArrayEmpty(ids, "id");
-        issueProjectRelationService.delete(ids);
-        return new Result();
-    }
-
-    @GetMapping("export")
-    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<IssueProjectRelationDTO> list = issueProjectRelationService.list(params);
-        ExcelUtils.exportExcelToTarget(response, null, list, IssueProjectRelationExcel.class);
-    }
-
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueSatisfactionDetailController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueSatisfactionDetailController.java
deleted file mode 100644
index 8772539ab3..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueSatisfactionDetailController.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * 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.controller;
-
-import com.epmet.commons.tools.page.PageData;
-import com.epmet.commons.tools.utils.ExcelUtils;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.commons.tools.validator.AssertUtils;
-import com.epmet.commons.tools.validator.ValidatorUtils;
-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.IssueSatisfactionDetailDTO;
-import com.epmet.excel.IssueSatisfactionDetailExcel;
-import com.epmet.service.IssueSatisfactionDetailService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * 议题满意度调查记录表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-@RestController
-@RequestMapping("issuesatisfactiondetail")
-public class IssueSatisfactionDetailController {
-    
-    @Autowired
-    private IssueSatisfactionDetailService issueSatisfactionDetailService;
-
-    @GetMapping("page")
-    public Result<PageData<IssueSatisfactionDetailDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<IssueSatisfactionDetailDTO> page = issueSatisfactionDetailService.page(params);
-        return new Result<PageData<IssueSatisfactionDetailDTO>>().ok(page);
-    }
-
-    @GetMapping("{id}")
-    public Result<IssueSatisfactionDetailDTO> get(@PathVariable("id") String id){
-        IssueSatisfactionDetailDTO data = issueSatisfactionDetailService.get(id);
-        return new Result<IssueSatisfactionDetailDTO>().ok(data);
-    }
-
-    @PostMapping
-    public Result save(@RequestBody IssueSatisfactionDetailDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        issueSatisfactionDetailService.save(dto);
-        return new Result();
-    }
-
-    @PutMapping
-    public Result update(@RequestBody IssueSatisfactionDetailDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-        issueSatisfactionDetailService.update(dto);
-        return new Result();
-    }
-
-    @DeleteMapping
-    public Result delete(@RequestBody String[] ids){
-        //效验数据
-        AssertUtils.isArrayEmpty(ids, "id");
-        issueSatisfactionDetailService.delete(ids);
-        return new Result();
-    }
-
-    @GetMapping("export")
-    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<IssueSatisfactionDetailDTO> list = issueSatisfactionDetailService.list(params);
-        ExcelUtils.exportExcelToTarget(response, null, list, IssueSatisfactionDetailExcel.class);
-    }
-
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueSatisfactionStatisticalController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueSatisfactionStatisticalController.java
deleted file mode 100644
index f9412e0996..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueSatisfactionStatisticalController.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * 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.controller;
-
-import com.epmet.commons.tools.page.PageData;
-import com.epmet.commons.tools.utils.ExcelUtils;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.commons.tools.validator.AssertUtils;
-import com.epmet.commons.tools.validator.ValidatorUtils;
-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.IssueSatisfactionStatisticalDTO;
-import com.epmet.excel.IssueSatisfactionStatisticalExcel;
-import com.epmet.service.IssueSatisfactionStatisticalService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * 议题满意度调查统计表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-@RestController
-@RequestMapping("issuesatisfactionstatistical")
-public class IssueSatisfactionStatisticalController {
-    
-    @Autowired
-    private IssueSatisfactionStatisticalService issueSatisfactionStatisticalService;
-
-    @GetMapping("page")
-    public Result<PageData<IssueSatisfactionStatisticalDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<IssueSatisfactionStatisticalDTO> page = issueSatisfactionStatisticalService.page(params);
-        return new Result<PageData<IssueSatisfactionStatisticalDTO>>().ok(page);
-    }
-
-    @GetMapping("{id}")
-    public Result<IssueSatisfactionStatisticalDTO> get(@PathVariable("id") String id){
-        IssueSatisfactionStatisticalDTO data = issueSatisfactionStatisticalService.get(id);
-        return new Result<IssueSatisfactionStatisticalDTO>().ok(data);
-    }
-
-    @PostMapping
-    public Result save(@RequestBody IssueSatisfactionStatisticalDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        issueSatisfactionStatisticalService.save(dto);
-        return new Result();
-    }
-
-    @PutMapping
-    public Result update(@RequestBody IssueSatisfactionStatisticalDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-        issueSatisfactionStatisticalService.update(dto);
-        return new Result();
-    }
-
-    @DeleteMapping
-    public Result delete(@RequestBody String[] ids){
-        //效验数据
-        AssertUtils.isArrayEmpty(ids, "id");
-        issueSatisfactionStatisticalService.delete(ids);
-        return new Result();
-    }
-
-    @GetMapping("export")
-    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<IssueSatisfactionStatisticalDTO> list = issueSatisfactionStatisticalService.list(params);
-        ExcelUtils.exportExcelToTarget(response, null, list, IssueSatisfactionStatisticalExcel.class);
-    }
-
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteDetailController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteDetailController.java
deleted file mode 100644
index 981aacf50e..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteDetailController.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * 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.controller;
-
-import com.epmet.commons.tools.page.PageData;
-import com.epmet.commons.tools.utils.ExcelUtils;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.commons.tools.validator.AssertUtils;
-import com.epmet.commons.tools.validator.ValidatorUtils;
-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.IssueVoteDetailDTO;
-import com.epmet.excel.IssueVoteDetailExcel;
-import com.epmet.service.IssueVoteDetailService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * 议题表决记录表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-@RestController
-@RequestMapping("issuevotedetail")
-public class IssueVoteDetailController {
-    
-    @Autowired
-    private IssueVoteDetailService issueVoteDetailService;
-
-    @GetMapping("page")
-    public Result<PageData<IssueVoteDetailDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<IssueVoteDetailDTO> page = issueVoteDetailService.page(params);
-        return new Result<PageData<IssueVoteDetailDTO>>().ok(page);
-    }
-
-    @GetMapping("{id}")
-    public Result<IssueVoteDetailDTO> get(@PathVariable("id") String id){
-        IssueVoteDetailDTO data = issueVoteDetailService.get(id);
-        return new Result<IssueVoteDetailDTO>().ok(data);
-    }
-
-    @PostMapping
-    public Result save(@RequestBody IssueVoteDetailDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        issueVoteDetailService.save(dto);
-        return new Result();
-    }
-
-    @PutMapping
-    public Result update(@RequestBody IssueVoteDetailDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-        issueVoteDetailService.update(dto);
-        return new Result();
-    }
-
-    @DeleteMapping
-    public Result delete(@RequestBody String[] ids){
-        //效验数据
-        AssertUtils.isArrayEmpty(ids, "id");
-        issueVoteDetailService.delete(ids);
-        return new Result();
-    }
-
-    @GetMapping("export")
-    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<IssueVoteDetailDTO> list = issueVoteDetailService.list(params);
-        ExcelUtils.exportExcelToTarget(response, null, list, IssueVoteDetailExcel.class);
-    }
-
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteStatisticalController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteStatisticalController.java
deleted file mode 100644
index ab98b72498..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteStatisticalController.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * 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.controller;
-
-import com.epmet.commons.tools.page.PageData;
-import com.epmet.commons.tools.utils.ExcelUtils;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.commons.tools.validator.AssertUtils;
-import com.epmet.commons.tools.validator.ValidatorUtils;
-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.IssueVoteStatisticalDTO;
-import com.epmet.excel.IssueVoteStatisticalExcel;
-import com.epmet.service.IssueVoteStatisticalService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * 议题表决统计表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-@RestController
-@RequestMapping("issuevotestatistical")
-public class IssueVoteStatisticalController {
-    
-    @Autowired
-    private IssueVoteStatisticalService issueVoteStatisticalService;
-
-    @GetMapping("page")
-    public Result<PageData<IssueVoteStatisticalDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<IssueVoteStatisticalDTO> page = issueVoteStatisticalService.page(params);
-        return new Result<PageData<IssueVoteStatisticalDTO>>().ok(page);
-    }
-
-    @GetMapping("{id}")
-    public Result<IssueVoteStatisticalDTO> get(@PathVariable("id") String id){
-        IssueVoteStatisticalDTO data = issueVoteStatisticalService.get(id);
-        return new Result<IssueVoteStatisticalDTO>().ok(data);
-    }
-
-    @PostMapping
-    public Result save(@RequestBody IssueVoteStatisticalDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        issueVoteStatisticalService.save(dto);
-        return new Result();
-    }
-
-    @PutMapping
-    public Result update(@RequestBody IssueVoteStatisticalDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-        issueVoteStatisticalService.update(dto);
-        return new Result();
-    }
-
-    @DeleteMapping
-    public Result delete(@RequestBody String[] ids){
-        //效验数据
-        AssertUtils.isArrayEmpty(ids, "id");
-        issueVoteStatisticalService.delete(ids);
-        return new Result();
-    }
-
-    @GetMapping("export")
-    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<IssueVoteStatisticalDTO> list = issueVoteStatisticalService.list(params);
-        ExcelUtils.exportExcelToTarget(response, null, list, IssueVoteStatisticalExcel.class);
-    }
-
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteStatisticalDailyController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteStatisticalDailyController.java
deleted file mode 100644
index 7e5506354a..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteStatisticalDailyController.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * 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.controller;
-
-import com.epmet.commons.tools.page.PageData;
-import com.epmet.commons.tools.utils.ExcelUtils;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.commons.tools.validator.AssertUtils;
-import com.epmet.commons.tools.validator.ValidatorUtils;
-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.IssueVoteStatisticalDailyDTO;
-import com.epmet.excel.IssueVoteStatisticalDailyExcel;
-import com.epmet.service.IssueVoteStatisticalDailyService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * 议题表决按天统计表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-@RestController
-@RequestMapping("issuevotestatisticaldaily")
-public class IssueVoteStatisticalDailyController {
-    
-    @Autowired
-    private IssueVoteStatisticalDailyService issueVoteStatisticalDailyService;
-
-    @GetMapping("page")
-    public Result<PageData<IssueVoteStatisticalDailyDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<IssueVoteStatisticalDailyDTO> page = issueVoteStatisticalDailyService.page(params);
-        return new Result<PageData<IssueVoteStatisticalDailyDTO>>().ok(page);
-    }
-
-    @GetMapping("{id}")
-    public Result<IssueVoteStatisticalDailyDTO> get(@PathVariable("id") String id){
-        IssueVoteStatisticalDailyDTO data = issueVoteStatisticalDailyService.get(id);
-        return new Result<IssueVoteStatisticalDailyDTO>().ok(data);
-    }
-
-    @PostMapping
-    public Result save(@RequestBody IssueVoteStatisticalDailyDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        issueVoteStatisticalDailyService.save(dto);
-        return new Result();
-    }
-
-    @PutMapping
-    public Result update(@RequestBody IssueVoteStatisticalDailyDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-        issueVoteStatisticalDailyService.update(dto);
-        return new Result();
-    }
-
-    @DeleteMapping
-    public Result delete(@RequestBody String[] ids){
-        //效验数据
-        AssertUtils.isArrayEmpty(ids, "id");
-        issueVoteStatisticalDailyService.delete(ids);
-        return new Result();
-    }
-
-    @GetMapping("export")
-    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<IssueVoteStatisticalDailyDTO> list = issueVoteStatisticalDailyService.list(params);
-        ExcelUtils.exportExcelToTarget(response, null, list, IssueVoteStatisticalDailyExcel.class);
-    }
-
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/ResiHallDemoController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/ResiHallDemoController.java
deleted file mode 100644
index 56c01421a7..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/ResiHallDemoController.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.epmet.controller;
-
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.dto.form.DemoTestFormDTO;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @Description 测试
- * @Author yinzuomei
- * @Date 2020/5/7 22:47
- */
-@RestController
-@RequestMapping("demo")
-public class ResiHallDemoController {
-    private static final Logger logger = LoggerFactory.getLogger(ResiHallDemoController.class);
-
-    @PostMapping("test")
-    public Result test(@RequestBody DemoTestFormDTO formDTO) {
-        logger.info(String.format("请求成功客户id[%s],网格id[%s]",formDTO.getCustomerId(),formDTO.getGridId()));
-        ValidatorUtils.validateEntity(formDTO);
-        return new Result().ok("resi-hall-server请求成功");
-    }
-}
-
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueCustomerParameterDao.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueCustomerParameterDao.java
deleted file mode 100644
index 48fa1e3491..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueCustomerParameterDao.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * 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;
-
-import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.entity.IssueCustomerParameterEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 议题客户参数定制表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-@Mapper
-public interface IssueCustomerParameterDao extends BaseDao<IssueCustomerParameterEntity> {
-	
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueDao.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueDao.java
deleted file mode 100644
index 8f390edc63..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueDao.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * 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;
-
-import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dto.form.IssueDetailFormDTO;
-import com.epmet.dto.result.IssueDetailResultDTO;
-import com.epmet.entity.IssueEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 议题详情 关联话题，转议题时间必须要和话题转议题时间一致、关闭时间必须要和操作记录表的关闭记录时间一致、转项目时间必须要和项目记录生成时间一致，注意服务间调用的时间一致性。每个议题最后总会被关闭。
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-@Mapper
-public interface IssueDao extends BaseDao<IssueEntity> {
-
-    /**
-     * @Description  议题详情
-     * @param formDTO
-     * @author zxc
-     * @date 2020/5/11 10:11
-     */
-    IssueDetailResultDTO issueDetail(IssueDetailFormDTO formDTO);
-
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueProcessDao.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueProcessDao.java
deleted file mode 100644
index 26603169ae..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueProcessDao.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * 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;
-
-import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.entity.IssueProcessEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 议题进展记录表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-@Mapper
-public interface IssueProcessDao extends BaseDao<IssueProcessEntity> {
-	
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueProjectRelationDao.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueProjectRelationDao.java
deleted file mode 100644
index 430dc74741..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueProjectRelationDao.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * 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;
-
-import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.entity.IssueProjectRelationEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 议题项目关系表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-@Mapper
-public interface IssueProjectRelationDao extends BaseDao<IssueProjectRelationEntity> {
-	
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueSatisfactionDetailDao.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueSatisfactionDetailDao.java
deleted file mode 100644
index 01727f507a..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueSatisfactionDetailDao.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * 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;
-
-import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.entity.IssueSatisfactionDetailEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 议题满意度调查记录表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-@Mapper
-public interface IssueSatisfactionDetailDao extends BaseDao<IssueSatisfactionDetailEntity> {
-	
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueSatisfactionStatisticalDao.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueSatisfactionStatisticalDao.java
deleted file mode 100644
index e3eeabb823..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueSatisfactionStatisticalDao.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * 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;
-
-import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.entity.IssueSatisfactionStatisticalEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 议题满意度调查统计表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-@Mapper
-public interface IssueSatisfactionStatisticalDao extends BaseDao<IssueSatisfactionStatisticalEntity> {
-	
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java
deleted file mode 100644
index f8a41e3747..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * 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;
-
-import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.entity.IssueVoteDetailEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 议题表决记录表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-@Mapper
-public interface IssueVoteDetailDao extends BaseDao<IssueVoteDetailEntity> {
-	
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDailyDao.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDailyDao.java
deleted file mode 100644
index e09695b2b8..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDailyDao.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * 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;
-
-import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.entity.IssueVoteStatisticalDailyEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 议题表决按天统计表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-@Mapper
-public interface IssueVoteStatisticalDailyDao extends BaseDao<IssueVoteStatisticalDailyEntity> {
-	
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java
deleted file mode 100644
index 7f833487d8..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * 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;
-
-import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.entity.IssueVoteStatisticalEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 议题表决统计表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-@Mapper
-public interface IssueVoteStatisticalDao extends BaseDao<IssueVoteStatisticalEntity> {
-	
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueCustomerParameterEntity.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueCustomerParameterEntity.java
deleted file mode 100644
index 72e7769da7..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueCustomerParameterEntity.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * 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;
-
-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-05-11
- */
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("issue_customer_parameter")
-public class IssueCustomerParameterEntity extends BaseEpmetEntity {
-
-	private static final long serialVersionUID = 1L;
-
-    /**
-     * 客户ID
-     */
-	private String customerId;
-
-    /**
-     * 参数键 eg:voting_time_limit
-     */
-	private String parameterKey;
-
-    /**
-     * 参数名 eg:表决期限
-     */
-	private String parameterName;
-
-    /**
-     * 参数值 eg:10（天）
-     */
-	private String parameterValue;
-
-    /**
-     * 参数说明 eg:这个客户下所有的网格议题表决期限都是10天
-     */
-	private String description;
-
-}
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueEntity.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueEntity.java
deleted file mode 100644
index cfa9b8c046..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueEntity.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/**
- * 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;
-
-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-05-11
- */
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("issue")
-public class IssueEntity extends BaseEpmetEntity {
-
-	private static final long serialVersionUID = 1L;
-
-    /**
-     * 议题状态 表决中：voting 已转项目：shift_project 已关闭：closed
-     */
-	private String issueStatus;
-
-    /**
-     * 来源类型 eg:resi_topic
-     */
-	private String sourceType;
-
-    /**
-     * 来源ID eg:2223232(当SOURCE_TYPE为"resi_topic"时，这里指话题的ID)
-     */
-	private String sourceId;
-
-    /**
-     * 关闭理由 【未关闭时可以为空】关闭话题时必填的理由，转项目后而且已经结案，这个字段不回写
-     */
-	private String closeReason;
-
-    /**
-     * 解决类型 【未关闭时可以为空】已解决resloved、未解决unresloved，对应在关闭议题时所选的checkbox，转项目后而且已经结案，这个字段不回写
-     */
-	private String resolveType;
-
-    /**
-     * 议题名称 最多20字
-     */
-	private String issueTitle;
-
-    /**
-     * 建议 建议
-     */
-	private String suggestion;
-
-    /**
-     * 客户ID 客户ID
-     */
-	private String customerId;
-
-    /**
-     * 网格ID 居民端议题对应一个网格iId
-     */
-	private String gridId;
-
-    /**
-     * 所属机关 【数据权限-非必填】11:22:33(agencyId)数据权限控制
-     */
-	private String orgIdPath;
-
-    /**
-     * 组织ID 【数据权限-非必填】agencyId
-     */
-	private String orgId;
-
-    /**
-     * 表决截止日期 表决截止日期
-     */
-	private Date votingDeadline;
-
-    /**
-     * 表决发起日期（转议题日期） 表决发起日期（转议题日期）
-     */
-	private Date decidedTime;
-
-    /**
-     * 转项目日期 转项目日期（服务间调用日期一致性）
-     */
-	private Date shiftedTime;
-
-    /**
-     * 关闭日期 关闭日期
-     */
-	private Date closedTime;
-
-}
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueProcessEntity.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueProcessEntity.java
deleted file mode 100644
index 701a3c6c61..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueProcessEntity.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * 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;
-
-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-05-11
- */
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("issue_process")
-public class IssueProcessEntity extends BaseEpmetEntity {
-
-	private static final long serialVersionUID = 1L;
-
-    /**
-     * 议题ID
-     */
-	private String issueId;
-
-    /**
-     * 操作状态 - 表决中：voting 已转项目：shift_project 已关闭：closed
-     */
-	private String issueStatus;
-
-    /**
-     * 组织类型 操作人所属机构类型（机构：agency | 部门：dept | 网格：grid）操作人可能来源于居民端和政府段，但是只有在“转议题”的时候才是居民端拥有组长权限的人操作，所以当这条记录是转议题时，该记录为grid，ORD_ID相应的也为GRID_ID
-     */
-	private String orgType;
-
-    /**
-     * 组织ID 操作人所属机构ID（对应的有网格ID、部门ID、机构ID）
-     */
-	private String orgId;
-
-    /**
-     * 操作说明 (节点的说明文案，包含三个节点的文案说明【转议题】、【已关闭】、【转项目】)
-     */
-	private String operationExplain;
-
-}
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueProjectRelationEntity.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueProjectRelationEntity.java
deleted file mode 100644
index c1fcf5f579..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueProjectRelationEntity.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * 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;
-
-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-05-11
- */
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("issue_project_relation")
-public class IssueProjectRelationEntity extends BaseEpmetEntity {
-
-	private static final long serialVersionUID = 1L;
-
-    /**
-     * 议题ID 议题ID
-     */
-	private String issueId;
-
-    /**
-     * 项目ID 项目ID
-     */
-	private String projectId;
-
-}
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueSatisfactionDetailEntity.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueSatisfactionDetailEntity.java
deleted file mode 100644
index d36fdababc..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueSatisfactionDetailEntity.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * 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;
-
-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-05-11
- */
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("issue_satisfaction_detail")
-public class IssueSatisfactionDetailEntity extends BaseEpmetEntity {
-
-	private static final long serialVersionUID = 1L;
-
-    /**
-     * 议题ID
-     */
-	private String issueId;
-
-    /**
-     * 评论 - 最多300字
-     */
-	private String comment;
-
-    /**
-     * 满意度 满意度 - 不满意:bad、基本满意:good、非常满意:perfect
-     */
-	private String satisfaction;
-
-}
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueSatisfactionStatisticalEntity.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueSatisfactionStatisticalEntity.java
deleted file mode 100644
index 243b1e441a..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueSatisfactionStatisticalEntity.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * 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;
-
-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-05-11
- */
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("issue_satisfaction_statistical")
-public class IssueSatisfactionStatisticalEntity extends BaseEpmetEntity {
-
-	private static final long serialVersionUID = 1L;
-
-    /**
-     * 议题ID
-     */
-	private String issueId;
-
-    /**
-     * 一般满意数
-     */
-	private Integer goodCount;
-
-    /**
-     * 非常满意数
-     */
-	private Integer perfectCount;
-
-    /**
-     * 不满意数
-     */
-	private Integer badCount;
-
-}
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteDetailEntity.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteDetailEntity.java
deleted file mode 100644
index 1f3381b687..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteDetailEntity.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * 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;
-
-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-05-11
- */
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("issue_vote_detail")
-public class IssueVoteDetailEntity extends BaseEpmetEntity {
-
-	private static final long serialVersionUID = 1L;
-
-    /**
-     * 议题ID
-     */
-	private String issueId;
-
-    /**
-     * 态度 - opposition（反对）support（赞成）
-     */
-	private String attitude;
-
-}
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteStatisticalDailyEntity.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteStatisticalDailyEntity.java
deleted file mode 100644
index 92feff0236..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteStatisticalDailyEntity.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
- * 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;
-
-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-05-11
- */
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("issue_vote_statistical_daily")
-public class IssueVoteStatisticalDailyEntity extends BaseEpmetEntity {
-
-	private static final long serialVersionUID = 1L;
-
-    /**
-     * 议题ID
-     */
-	private String issueId;
-
-    /**
-     * 统计日期 yyyy-MM-dd
-     */
-	private Date statisticalDate;
-
-    /**
-     * 到该日的总赞成数
-     */
-	private Integer supportCount;
-
-    /**
-     * 到该日的总反对数
-     */
-	private Integer oppositionCount;
-
-    /**
-     * 到该日的总票数
-     */
-	private Integer totalCount;
-
-    /**
-     * 该日增量
-     */
-	private Integer todayIncrement;
-
-    /**
-     * 该日赞成增量
-     */
-	private Integer supportIncrement;
-
-    /**
-     * 该日反对增量
-     */
-	private Integer oppositionIncrement;
-
-    /**
-     * 到该日的应表决数
-     */
-	private Integer votableCount;
-
-}
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteStatisticalEntity.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteStatisticalEntity.java
deleted file mode 100644
index d287eddf27..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteStatisticalEntity.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * 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;
-
-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-05-11
- */
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("issue_vote_statistical")
-public class IssueVoteStatisticalEntity extends BaseEpmetEntity {
-
-	private static final long serialVersionUID = 1L;
-
-    /**
-     * 议题ID
-     */
-	private String issueId;
-
-    /**
-     * 支持数
-     */
-	private Integer supportCount;
-
-    /**
-     * 反对数
-     */
-	private Integer oppositionCount;
-
-    /**
-     * 应表决数
-     */
-	private Integer votableCount;
-
-}
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueCustomerParameterExcel.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueCustomerParameterExcel.java
deleted file mode 100644
index 9ede57879c..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueCustomerParameterExcel.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * 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.excel;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 议题客户参数定制表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-@Data
-public class IssueCustomerParameterExcel {
-
-    @Excel(name = "主键ID")
-    private String id;
-
-    @Excel(name = "客户ID")
-    private String customerId;
-
-    @Excel(name = "参数键 eg:voting_time_limit")
-    private String parameterKey;
-
-    @Excel(name = "参数名 eg:表决期限")
-    private String parameterName;
-
-    @Excel(name = "参数值 eg:10（天）")
-    private String parameterValue;
-
-    @Excel(name = "参数说明 eg:这个客户下所有的网格议题表决期限都是10天")
-    private String description;
-
-    @Excel(name = "删除标志 0：未删除，1：已删除")
-    private String delFlag;
-
-    @Excel(name = "乐观锁")
-    private Integer revision;
-
-    @Excel(name = "创建人")
-    private String createdBy;
-
-    @Excel(name = "创建时间")
-    private Date createdTime;
-
-    @Excel(name = "更新人")
-    private String updatedBy;
-
-    @Excel(name = "更新时间")
-    private Date updatedTime;
-
-
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueExcel.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueExcel.java
deleted file mode 100644
index f7df76d076..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueExcel.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/**
- * 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.excel;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 议题详情表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-@Data
-public class IssueExcel {
-
-    @Excel(name = "议题ID")
-    private String id;
-
-    @Excel(name = "议题状态 表决中：voting 已转项目：shift_project 已关闭：closed")
-    private String issueStatus;
-
-    @Excel(name = "来源类型 eg:resi_topic")
-    private String sourceType;
-
-    @Excel(name = "来源ID eg:2223232(当SOURCE_TYPE为\"resi_topic\"时，这里指话题的ID)")
-    private String sourceId;
-
-    @Excel(name = "关闭理由 【未关闭时可以为空】关闭议题时必填的理由，转项目后而且已经结案，这个字段不回写")
-    private String closeReason;
-
-    @Excel(name = "解决类型 【未关闭时可以为空】已解决resloved、未解决unresloved，对应在关闭议题时所选的checkbox，转项目后而且已经结案，这个字段不回写")
-    private String resolveType;
-
-    @Excel(name = "议题名称 最多20字")
-    private String issueTitle;
-
-    @Excel(name = "建议 最多1000字")
-    private String suggestion;
-
-    @Excel(name = "客户ID")
-    private String customerId;
-
-    @Excel(name = "网格ID 居民端议题对应一个网格Id")
-    private String gridId;
-
-    @Excel(name = "所属机关 【数据权限-非必填】11:22:33(agencyId)数据权限控制")
-    private String orgIdPath;
-
-    @Excel(name = "组织ID 【数据权限-非必填】agencyId")
-    private String orgId;
-
-    @Excel(name = "表决截止日期")
-    private Date votingDeadline;
-
-    @Excel(name = "表决发起日期（转议题日期）")
-    private Date decidedTime;
-
-    @Excel(name = "转项目日期 （服务间调用日期一致性）")
-    private Date shiftedTime;
-
-    @Excel(name = "关闭日期")
-    private Date closedTime;
-
-    @Excel(name = "删除标识 0未删除、1已删除")
-    private String delFlag;
-
-    @Excel(name = "乐观锁")
-    private Integer revision;
-
-    @Excel(name = "创建人")
-    private String createdBy;
-
-    @Excel(name = "创建时间")
-    private Date createdTime;
-
-    @Excel(name = "更新人")
-    private String updatedBy;
-
-    @Excel(name = "更新时间")
-    private Date updatedTime;
-
-
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueProcessExcel.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueProcessExcel.java
deleted file mode 100644
index 587e28e8c2..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueProcessExcel.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * 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.excel;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 议题进展记录表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-@Data
-public class IssueProcessExcel {
-
-    @Excel(name = "主键ID")
-    private String id;
-
-    @Excel(name = "议题ID")
-    private String issueId;
-
-    @Excel(name = "操作状态 - 表决中：voting 已转项目：shift_project 已关闭：closed")
-    private String issueStatus;
-
-    @Excel(name = "组织类型 操作人所属机构类型（机构：agency | 部门：dept | 网格：grid）操作人可能来源于居民端和政府段，但是只有在“转议题”的时候才是居民端拥有组长权限的人操作，所以当这条记录是转议题时，该记录为grid，ORD_ID相应的也为GRID_ID")
-    private String orgType;
-
-    @Excel(name = "组织ID 操作人所属机构ID（对应的有网格ID、部门ID、机构ID）")
-    private String orgId;
-
-    @Excel(name = "操作说明 (节点的说明文案，包含三个节点的文案说明【转议题】、【已关闭】、【转项目】)")
-    private String operationExplain;
-
-    @Excel(name = "删除标识 0未删除、1已删除")
-    private String delFlag;
-
-    @Excel(name = "乐观锁")
-    private Integer revision;
-
-    @Excel(name = "创建人")
-    private String createdBy;
-
-    @Excel(name = "创建时间")
-    private Date createdTime;
-
-    @Excel(name = "更新人")
-    private String updatedBy;
-
-    @Excel(name = "更新时间")
-    private Date updatedTime;
-
-
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueProjectRelationExcel.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueProjectRelationExcel.java
deleted file mode 100644
index 620eee36c1..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueProjectRelationExcel.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * 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.excel;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 议题项目关系表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-@Data
-public class IssueProjectRelationExcel {
-
-    @Excel(name = "主键ID 主键ID")
-    private String id;
-
-    @Excel(name = "议题ID 议题ID")
-    private String issueId;
-
-    @Excel(name = "项目ID 项目ID")
-    private String projectId;
-
-    @Excel(name = "删除标识 0：未删除1：已删除")
-    private String delFlag;
-
-    @Excel(name = "乐观锁")
-    private Integer revision;
-
-    @Excel(name = "创建人")
-    private String createdBy;
-
-    @Excel(name = "创建时间 议题转项目时间")
-    private Date createdTime;
-
-    @Excel(name = "更新人")
-    private String updatedBy;
-
-    @Excel(name = "更新时间")
-    private Date updatedTime;
-
-
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueSatisfactionDetailExcel.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueSatisfactionDetailExcel.java
deleted file mode 100644
index 804d0bbacc..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueSatisfactionDetailExcel.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * 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.excel;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 议题满意度调查记录表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-@Data
-public class IssueSatisfactionDetailExcel {
-
-    @Excel(name = "主键ID")
-    private String id;
-
-    @Excel(name = "议题ID")
-    private String issueId;
-
-    @Excel(name = "评论 - 最多300字")
-    private String comment;
-
-    @Excel(name = "满意度 满意度 - 不满意:bad、基本满意:good、非常满意:perfect")
-    private String satisfaction;
-
-    @Excel(name = "删除标识 0未删除、1已删除")
-    private String delFlag;
-
-    @Excel(name = "乐观锁")
-    private Integer revision;
-
-    @Excel(name = "创建人")
-    private String createdBy;
-
-    @Excel(name = "创建时间")
-    private Date createdTime;
-
-    @Excel(name = "更新人")
-    private String updatedBy;
-
-    @Excel(name = "更新时间")
-    private Date updatedTime;
-
-
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueSatisfactionStatisticalExcel.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueSatisfactionStatisticalExcel.java
deleted file mode 100644
index be2b748413..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueSatisfactionStatisticalExcel.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * 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.excel;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 议题满意度调查统计表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-@Data
-public class IssueSatisfactionStatisticalExcel {
-
-    @Excel(name = "主键ID")
-    private String id;
-
-    @Excel(name = "议题ID")
-    private String issueId;
-
-    @Excel(name = "一般满意数")
-    private Integer goodCount;
-
-    @Excel(name = "非常满意数")
-    private Integer perfectCount;
-
-    @Excel(name = "不满意数")
-    private Integer badCount;
-
-    @Excel(name = "删除标识 0未删除、1已删除")
-    private String delFlag;
-
-    @Excel(name = "乐观锁")
-    private Integer revision;
-
-    @Excel(name = "创建人")
-    private String createdBy;
-
-    @Excel(name = "创建时间")
-    private Date createdTime;
-
-    @Excel(name = "更新人")
-    private String updatedBy;
-
-    @Excel(name = "更新时间")
-    private Date updatedTime;
-
-
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueVoteDetailExcel.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueVoteDetailExcel.java
deleted file mode 100644
index 5ea0c106a3..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueVoteDetailExcel.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * 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.excel;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 议题表决记录表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-@Data
-public class IssueVoteDetailExcel {
-
-    @Excel(name = "主键ID")
-    private String id;
-
-    @Excel(name = "议题ID")
-    private String issueId;
-
-    @Excel(name = "态度 - opposition（反对）support（赞成）")
-    private String attitude;
-
-    @Excel(name = "删除标识 0未删除、1已删除")
-    private String delFlag;
-
-    @Excel(name = "乐观锁")
-    private Integer revision;
-
-    @Excel(name = "创建人")
-    private String createdBy;
-
-    @Excel(name = "创建时间")
-    private Date createdTime;
-
-    @Excel(name = "更新人")
-    private String updatedBy;
-
-    @Excel(name = "更新时间")
-    private Date updatedTime;
-
-
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueVoteStatisticalDailyExcel.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueVoteStatisticalDailyExcel.java
deleted file mode 100644
index deafe9f0b9..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueVoteStatisticalDailyExcel.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * 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.excel;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 议题表决按天统计表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-@Data
-public class IssueVoteStatisticalDailyExcel {
-
-    @Excel(name = "主键ID")
-    private String id;
-
-    @Excel(name = "议题ID")
-    private String issueId;
-
-    @Excel(name = "统计日期 yyyy-MM-dd")
-    private Date statisticalDate;
-
-    @Excel(name = "到该日的总赞成数")
-    private Integer supportCount;
-
-    @Excel(name = "到该日的总反对数")
-    private Integer oppositionCount;
-
-    @Excel(name = "到该日的总票数")
-    private Integer totalCount;
-
-    @Excel(name = "该日增量")
-    private Integer todayIncrement;
-
-    @Excel(name = "该日赞成增量")
-    private Integer supportIncrement;
-
-    @Excel(name = "该日反对增量")
-    private Integer oppositionIncrement;
-
-    @Excel(name = "到该日的应表决数")
-    private Integer votableCount;
-
-    @Excel(name = "删除标识 0未删除、1已删除")
-    private String delFlag;
-
-    @Excel(name = "乐观锁")
-    private Integer revision;
-
-    @Excel(name = "创建人")
-    private String createdBy;
-
-    @Excel(name = "创建时间")
-    private Date createdTime;
-
-    @Excel(name = "更新人")
-    private String updatedBy;
-
-    @Excel(name = "更新时间")
-    private Date updatedTime;
-
-
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueVoteStatisticalExcel.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueVoteStatisticalExcel.java
deleted file mode 100644
index ffa83424a8..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueVoteStatisticalExcel.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * 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.excel;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 议题表决统计表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-@Data
-public class IssueVoteStatisticalExcel {
-
-    @Excel(name = "主键ID")
-    private String id;
-
-    @Excel(name = "议题ID")
-    private String issueId;
-
-    @Excel(name = "支持数")
-    private Integer supportCount;
-
-    @Excel(name = "反对数")
-    private Integer oppositionCount;
-
-    @Excel(name = "应表决数")
-    private Integer votableCount;
-
-    @Excel(name = "乐观锁")
-    private Integer revision;
-
-    @Excel(name = "删除标识 0未删除、1已删除")
-    private String delFlag;
-
-    @Excel(name = "创建人")
-    private String createdBy;
-
-    @Excel(name = "创建时间")
-    private Date createdTime;
-
-    @Excel(name = "更新人")
-    private String updatedBy;
-
-    @Excel(name = "更新时间")
-    private Date updatedTime;
-
-
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueCustomerParameterRedis.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueCustomerParameterRedis.java
deleted file mode 100644
index 1152ccab05..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueCustomerParameterRedis.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * 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.redis;
-
-import com.epmet.commons.tools.redis.RedisUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-/**
- * 议题客户参数定制表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-@Component
-public class IssueCustomerParameterRedis {
-    @Autowired
-    private RedisUtils redisUtils;
-
-    public void delete(Object[] ids) {
-
-    }
-
-    public void set(){
-
-    }
-
-    public String get(String id){
-        return null;
-    }
-
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueProcessRedis.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueProcessRedis.java
deleted file mode 100644
index d550f5bf5e..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueProcessRedis.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * 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.redis;
-
-import com.epmet.commons.tools.redis.RedisUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-/**
- * 议题进展记录表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-@Component
-public class IssueProcessRedis {
-    @Autowired
-    private RedisUtils redisUtils;
-
-    public void delete(Object[] ids) {
-
-    }
-
-    public void set(){
-
-    }
-
-    public String get(String id){
-        return null;
-    }
-
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueProjectRelationRedis.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueProjectRelationRedis.java
deleted file mode 100644
index 75ec7d9d0d..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueProjectRelationRedis.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * 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.redis;
-
-import com.epmet.commons.tools.redis.RedisUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-/**
- * 议题项目关系表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-@Component
-public class IssueProjectRelationRedis {
-    @Autowired
-    private RedisUtils redisUtils;
-
-    public void delete(Object[] ids) {
-
-    }
-
-    public void set(){
-
-    }
-
-    public String get(String id){
-        return null;
-    }
-
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueRedis.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueRedis.java
deleted file mode 100644
index cfed63cb4d..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueRedis.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * 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.redis;
-
-import com.epmet.commons.tools.redis.RedisUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-/**
- * 议题详情表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-@Component
-public class IssueRedis {
-    @Autowired
-    private RedisUtils redisUtils;
-
-    public void delete(Object[] ids) {
-
-    }
-
-    public void set(){
-
-    }
-
-    public String get(String id){
-        return null;
-    }
-
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueSatisfactionDetailRedis.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueSatisfactionDetailRedis.java
deleted file mode 100644
index 706304b1ff..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueSatisfactionDetailRedis.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * 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.redis;
-
-import com.epmet.commons.tools.redis.RedisUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-/**
- * 议题满意度调查记录表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-@Component
-public class IssueSatisfactionDetailRedis {
-    @Autowired
-    private RedisUtils redisUtils;
-
-    public void delete(Object[] ids) {
-
-    }
-
-    public void set(){
-
-    }
-
-    public String get(String id){
-        return null;
-    }
-
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueSatisfactionStatisticalRedis.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueSatisfactionStatisticalRedis.java
deleted file mode 100644
index 6d5d8ec0dc..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueSatisfactionStatisticalRedis.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * 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.redis;
-
-import com.epmet.commons.tools.redis.RedisUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-/**
- * 议题满意度调查统计表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-@Component
-public class IssueSatisfactionStatisticalRedis {
-    @Autowired
-    private RedisUtils redisUtils;
-
-    public void delete(Object[] ids) {
-
-    }
-
-    public void set(){
-
-    }
-
-    public String get(String id){
-        return null;
-    }
-
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java
deleted file mode 100644
index 89c8f04994..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * 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.redis;
-
-import com.epmet.commons.tools.redis.RedisUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-/**
- * 议题表决记录表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-@Component
-public class IssueVoteDetailRedis {
-    @Autowired
-    private RedisUtils redisUtils;
-
-    public void delete(Object[] ids) {
-
-    }
-
-    public void set(){
-
-    }
-
-    public String get(String id){
-        return null;
-    }
-
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueVoteStatisticalDailyRedis.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueVoteStatisticalDailyRedis.java
deleted file mode 100644
index 852ff4a3e7..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueVoteStatisticalDailyRedis.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * 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.redis;
-
-import com.epmet.commons.tools.redis.RedisUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-/**
- * 议题表决按天统计表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-@Component
-public class IssueVoteStatisticalDailyRedis {
-    @Autowired
-    private RedisUtils redisUtils;
-
-    public void delete(Object[] ids) {
-
-    }
-
-    public void set(){
-
-    }
-
-    public String get(String id){
-        return null;
-    }
-
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueVoteStatisticalRedis.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueVoteStatisticalRedis.java
deleted file mode 100644
index c9c928f08f..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueVoteStatisticalRedis.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * 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.redis;
-
-import com.epmet.commons.tools.redis.RedisUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-/**
- * 议题表决统计表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-@Component
-public class IssueVoteStatisticalRedis {
-    @Autowired
-    private RedisUtils redisUtils;
-
-    public void delete(Object[] ids) {
-
-    }
-
-    public void set(){
-
-    }
-
-    public String get(String id){
-        return null;
-    }
-
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueCustomerParameterService.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueCustomerParameterService.java
deleted file mode 100644
index 941d8efde9..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueCustomerParameterService.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * 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;
-
-import com.epmet.commons.mybatis.service.BaseService;
-import com.epmet.commons.tools.page.PageData;
-import com.epmet.dto.IssueCustomerParameterDTO;
-import com.epmet.entity.IssueCustomerParameterEntity;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 议题客户参数定制表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-public interface IssueCustomerParameterService extends BaseService<IssueCustomerParameterEntity> {
-
-    /**
-     * 默认分页
-     *
-     * @param params
-     * @return PageData<IssueCustomerParameterDTO>
-     * @author generator
-     * @date 2020-05-11
-     */
-    PageData<IssueCustomerParameterDTO> page(Map<String, Object> params);
-
-    /**
-     * 默认查询
-     *
-     * @param params
-     * @return java.util.List<IssueCustomerParameterDTO>
-     * @author generator
-     * @date 2020-05-11
-     */
-    List<IssueCustomerParameterDTO> list(Map<String, Object> params);
-
-    /**
-     * 单条查询
-     *
-     * @param id
-     * @return IssueCustomerParameterDTO
-     * @author generator
-     * @date 2020-05-11
-     */
-    IssueCustomerParameterDTO get(String id);
-
-    /**
-     * 默认保存
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void save(IssueCustomerParameterDTO dto);
-
-    /**
-     * 默认更新
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void update(IssueCustomerParameterDTO dto);
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void delete(String[] ids);
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueProcessService.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueProcessService.java
deleted file mode 100644
index fa285655aa..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueProcessService.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * 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;
-
-import com.epmet.commons.mybatis.service.BaseService;
-import com.epmet.commons.tools.page.PageData;
-import com.epmet.dto.IssueProcessDTO;
-import com.epmet.entity.IssueProcessEntity;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 议题进展记录表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-public interface IssueProcessService extends BaseService<IssueProcessEntity> {
-
-    /**
-     * 默认分页
-     *
-     * @param params
-     * @return PageData<IssueProcessDTO>
-     * @author generator
-     * @date 2020-05-11
-     */
-    PageData<IssueProcessDTO> page(Map<String, Object> params);
-
-    /**
-     * 默认查询
-     *
-     * @param params
-     * @return java.util.List<IssueProcessDTO>
-     * @author generator
-     * @date 2020-05-11
-     */
-    List<IssueProcessDTO> list(Map<String, Object> params);
-
-    /**
-     * 单条查询
-     *
-     * @param id
-     * @return IssueProcessDTO
-     * @author generator
-     * @date 2020-05-11
-     */
-    IssueProcessDTO get(String id);
-
-    /**
-     * 默认保存
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void save(IssueProcessDTO dto);
-
-    /**
-     * 默认更新
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void update(IssueProcessDTO dto);
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void delete(String[] ids);
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueProjectRelationService.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueProjectRelationService.java
deleted file mode 100644
index 1381151c65..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueProjectRelationService.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * 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;
-
-import com.epmet.commons.mybatis.service.BaseService;
-import com.epmet.commons.tools.page.PageData;
-import com.epmet.dto.IssueProjectRelationDTO;
-import com.epmet.entity.IssueProjectRelationEntity;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 议题项目关系表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-public interface IssueProjectRelationService extends BaseService<IssueProjectRelationEntity> {
-
-    /**
-     * 默认分页
-     *
-     * @param params
-     * @return PageData<IssueProjectRelationDTO>
-     * @author generator
-     * @date 2020-05-11
-     */
-    PageData<IssueProjectRelationDTO> page(Map<String, Object> params);
-
-    /**
-     * 默认查询
-     *
-     * @param params
-     * @return java.util.List<IssueProjectRelationDTO>
-     * @author generator
-     * @date 2020-05-11
-     */
-    List<IssueProjectRelationDTO> list(Map<String, Object> params);
-
-    /**
-     * 单条查询
-     *
-     * @param id
-     * @return IssueProjectRelationDTO
-     * @author generator
-     * @date 2020-05-11
-     */
-    IssueProjectRelationDTO get(String id);
-
-    /**
-     * 默认保存
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void save(IssueProjectRelationDTO dto);
-
-    /**
-     * 默认更新
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void update(IssueProjectRelationDTO dto);
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void delete(String[] ids);
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueSatisfactionDetailService.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueSatisfactionDetailService.java
deleted file mode 100644
index ab47a3797a..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueSatisfactionDetailService.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * 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;
-
-import com.epmet.commons.mybatis.service.BaseService;
-import com.epmet.commons.tools.page.PageData;
-import com.epmet.dto.IssueSatisfactionDetailDTO;
-import com.epmet.entity.IssueSatisfactionDetailEntity;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 议题满意度调查记录表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-public interface IssueSatisfactionDetailService extends BaseService<IssueSatisfactionDetailEntity> {
-
-    /**
-     * 默认分页
-     *
-     * @param params
-     * @return PageData<IssueSatisfactionDetailDTO>
-     * @author generator
-     * @date 2020-05-11
-     */
-    PageData<IssueSatisfactionDetailDTO> page(Map<String, Object> params);
-
-    /**
-     * 默认查询
-     *
-     * @param params
-     * @return java.util.List<IssueSatisfactionDetailDTO>
-     * @author generator
-     * @date 2020-05-11
-     */
-    List<IssueSatisfactionDetailDTO> list(Map<String, Object> params);
-
-    /**
-     * 单条查询
-     *
-     * @param id
-     * @return IssueSatisfactionDetailDTO
-     * @author generator
-     * @date 2020-05-11
-     */
-    IssueSatisfactionDetailDTO get(String id);
-
-    /**
-     * 默认保存
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void save(IssueSatisfactionDetailDTO dto);
-
-    /**
-     * 默认更新
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void update(IssueSatisfactionDetailDTO dto);
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void delete(String[] ids);
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueSatisfactionStatisticalService.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueSatisfactionStatisticalService.java
deleted file mode 100644
index 0d21c0cc99..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueSatisfactionStatisticalService.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * 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;
-
-import com.epmet.commons.mybatis.service.BaseService;
-import com.epmet.commons.tools.page.PageData;
-import com.epmet.dto.IssueSatisfactionStatisticalDTO;
-import com.epmet.entity.IssueSatisfactionStatisticalEntity;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 议题满意度调查统计表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-public interface IssueSatisfactionStatisticalService extends BaseService<IssueSatisfactionStatisticalEntity> {
-
-    /**
-     * 默认分页
-     *
-     * @param params
-     * @return PageData<IssueSatisfactionStatisticalDTO>
-     * @author generator
-     * @date 2020-05-11
-     */
-    PageData<IssueSatisfactionStatisticalDTO> page(Map<String, Object> params);
-
-    /**
-     * 默认查询
-     *
-     * @param params
-     * @return java.util.List<IssueSatisfactionStatisticalDTO>
-     * @author generator
-     * @date 2020-05-11
-     */
-    List<IssueSatisfactionStatisticalDTO> list(Map<String, Object> params);
-
-    /**
-     * 单条查询
-     *
-     * @param id
-     * @return IssueSatisfactionStatisticalDTO
-     * @author generator
-     * @date 2020-05-11
-     */
-    IssueSatisfactionStatisticalDTO get(String id);
-
-    /**
-     * 默认保存
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void save(IssueSatisfactionStatisticalDTO dto);
-
-    /**
-     * 默认更新
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void update(IssueSatisfactionStatisticalDTO dto);
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void delete(String[] ids);
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteDetailService.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteDetailService.java
deleted file mode 100644
index 36f3e0579c..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteDetailService.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * 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;
-
-import com.epmet.commons.mybatis.service.BaseService;
-import com.epmet.commons.tools.page.PageData;
-import com.epmet.dto.IssueVoteDetailDTO;
-import com.epmet.entity.IssueVoteDetailEntity;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 议题表决记录表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-public interface IssueVoteDetailService extends BaseService<IssueVoteDetailEntity> {
-
-    /**
-     * 默认分页
-     *
-     * @param params
-     * @return PageData<IssueVoteDetailDTO>
-     * @author generator
-     * @date 2020-05-11
-     */
-    PageData<IssueVoteDetailDTO> page(Map<String, Object> params);
-
-    /**
-     * 默认查询
-     *
-     * @param params
-     * @return java.util.List<IssueVoteDetailDTO>
-     * @author generator
-     * @date 2020-05-11
-     */
-    List<IssueVoteDetailDTO> list(Map<String, Object> params);
-
-    /**
-     * 单条查询
-     *
-     * @param id
-     * @return IssueVoteDetailDTO
-     * @author generator
-     * @date 2020-05-11
-     */
-    IssueVoteDetailDTO get(String id);
-
-    /**
-     * 默认保存
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void save(IssueVoteDetailDTO dto);
-
-    /**
-     * 默认更新
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void update(IssueVoteDetailDTO dto);
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void delete(String[] ids);
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteStatisticalDailyService.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteStatisticalDailyService.java
deleted file mode 100644
index c40851887d..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteStatisticalDailyService.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * 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;
-
-import com.epmet.commons.mybatis.service.BaseService;
-import com.epmet.commons.tools.page.PageData;
-import com.epmet.dto.IssueVoteStatisticalDailyDTO;
-import com.epmet.entity.IssueVoteStatisticalDailyEntity;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 议题表决按天统计表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-public interface IssueVoteStatisticalDailyService extends BaseService<IssueVoteStatisticalDailyEntity> {
-
-    /**
-     * 默认分页
-     *
-     * @param params
-     * @return PageData<IssueVoteStatisticalDailyDTO>
-     * @author generator
-     * @date 2020-05-11
-     */
-    PageData<IssueVoteStatisticalDailyDTO> page(Map<String, Object> params);
-
-    /**
-     * 默认查询
-     *
-     * @param params
-     * @return java.util.List<IssueVoteStatisticalDailyDTO>
-     * @author generator
-     * @date 2020-05-11
-     */
-    List<IssueVoteStatisticalDailyDTO> list(Map<String, Object> params);
-
-    /**
-     * 单条查询
-     *
-     * @param id
-     * @return IssueVoteStatisticalDailyDTO
-     * @author generator
-     * @date 2020-05-11
-     */
-    IssueVoteStatisticalDailyDTO get(String id);
-
-    /**
-     * 默认保存
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void save(IssueVoteStatisticalDailyDTO dto);
-
-    /**
-     * 默认更新
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void update(IssueVoteStatisticalDailyDTO dto);
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void delete(String[] ids);
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java
deleted file mode 100644
index 4d54243be0..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * 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;
-
-import com.epmet.commons.mybatis.service.BaseService;
-import com.epmet.commons.tools.page.PageData;
-import com.epmet.dto.IssueVoteStatisticalDTO;
-import com.epmet.entity.IssueVoteStatisticalEntity;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 议题表决统计表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-public interface IssueVoteStatisticalService extends BaseService<IssueVoteStatisticalEntity> {
-
-    /**
-     * 默认分页
-     *
-     * @param params
-     * @return PageData<IssueVoteStatisticalDTO>
-     * @author generator
-     * @date 2020-05-11
-     */
-    PageData<IssueVoteStatisticalDTO> page(Map<String, Object> params);
-
-    /**
-     * 默认查询
-     *
-     * @param params
-     * @return java.util.List<IssueVoteStatisticalDTO>
-     * @author generator
-     * @date 2020-05-11
-     */
-    List<IssueVoteStatisticalDTO> list(Map<String, Object> params);
-
-    /**
-     * 单条查询
-     *
-     * @param id
-     * @return IssueVoteStatisticalDTO
-     * @author generator
-     * @date 2020-05-11
-     */
-    IssueVoteStatisticalDTO get(String id);
-
-    /**
-     * 默认保存
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void save(IssueVoteStatisticalDTO dto);
-
-    /**
-     * 默认更新
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void update(IssueVoteStatisticalDTO dto);
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void delete(String[] ids);
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueCustomerParameterServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueCustomerParameterServiceImpl.java
deleted file mode 100644
index 1a751ab574..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueCustomerParameterServiceImpl.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * 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.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.IssueCustomerParameterDao;
-import com.epmet.dto.IssueCustomerParameterDTO;
-import com.epmet.entity.IssueCustomerParameterEntity;
-import com.epmet.service.IssueCustomerParameterService;
-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 2020-05-11
- */
-@Service
-public class IssueCustomerParameterServiceImpl extends BaseServiceImpl<IssueCustomerParameterDao, IssueCustomerParameterEntity> implements IssueCustomerParameterService {
-
-    @Override
-    public PageData<IssueCustomerParameterDTO> page(Map<String, Object> params) {
-        IPage<IssueCustomerParameterEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, IssueCustomerParameterDTO.class);
-    }
-
-    @Override
-    public List<IssueCustomerParameterDTO> list(Map<String, Object> params) {
-        List<IssueCustomerParameterEntity> entityList = baseDao.selectList(getWrapper(params));
-
-        return ConvertUtils.sourceToTarget(entityList, IssueCustomerParameterDTO.class);
-    }
-
-    private QueryWrapper<IssueCustomerParameterEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
-
-        QueryWrapper<IssueCustomerParameterEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-
-        return wrapper;
-    }
-
-    @Override
-    public IssueCustomerParameterDTO get(String id) {
-        IssueCustomerParameterEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, IssueCustomerParameterDTO.class);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void save(IssueCustomerParameterDTO dto) {
-        IssueCustomerParameterEntity entity = ConvertUtils.sourceToTarget(dto, IssueCustomerParameterEntity.class);
-        insert(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(IssueCustomerParameterDTO dto) {
-        IssueCustomerParameterEntity entity = ConvertUtils.sourceToTarget(dto, IssueCustomerParameterEntity.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/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java
deleted file mode 100644
index fad2ebfb01..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- * 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.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.IssueProcessDao;
-import com.epmet.dto.IssueProcessDTO;
-import com.epmet.entity.IssueProcessEntity;
-import com.epmet.redis.IssueProcessRedis;
-import com.epmet.service.IssueProcessService;
-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 2020-05-11
- */
-@Service
-public class IssueProcessServiceImpl extends BaseServiceImpl<IssueProcessDao, IssueProcessEntity> implements IssueProcessService {
-
-    @Autowired
-    private IssueProcessRedis issueProcessRedis;
-
-    @Override
-    public PageData<IssueProcessDTO> page(Map<String, Object> params) {
-        IPage<IssueProcessEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, IssueProcessDTO.class);
-    }
-
-    @Override
-    public List<IssueProcessDTO> list(Map<String, Object> params) {
-        List<IssueProcessEntity> entityList = baseDao.selectList(getWrapper(params));
-
-        return ConvertUtils.sourceToTarget(entityList, IssueProcessDTO.class);
-    }
-
-    private QueryWrapper<IssueProcessEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
-
-        QueryWrapper<IssueProcessEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-
-        return wrapper;
-    }
-
-    @Override
-    public IssueProcessDTO get(String id) {
-        IssueProcessEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, IssueProcessDTO.class);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void save(IssueProcessDTO dto) {
-        IssueProcessEntity entity = ConvertUtils.sourceToTarget(dto, IssueProcessEntity.class);
-        insert(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(IssueProcessDTO dto) {
-        IssueProcessEntity entity = ConvertUtils.sourceToTarget(dto, IssueProcessEntity.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/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueProjectRelationServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueProjectRelationServiceImpl.java
deleted file mode 100644
index 2b40a83079..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueProjectRelationServiceImpl.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- * 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.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.IssueProjectRelationDao;
-import com.epmet.dto.IssueProjectRelationDTO;
-import com.epmet.entity.IssueProjectRelationEntity;
-import com.epmet.redis.IssueProjectRelationRedis;
-import com.epmet.service.IssueProjectRelationService;
-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 2020-05-11
- */
-@Service
-public class IssueProjectRelationServiceImpl extends BaseServiceImpl<IssueProjectRelationDao, IssueProjectRelationEntity> implements IssueProjectRelationService {
-
-    @Autowired
-    private IssueProjectRelationRedis issueProjectRelationRedis;
-
-    @Override
-    public PageData<IssueProjectRelationDTO> page(Map<String, Object> params) {
-        IPage<IssueProjectRelationEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, IssueProjectRelationDTO.class);
-    }
-
-    @Override
-    public List<IssueProjectRelationDTO> list(Map<String, Object> params) {
-        List<IssueProjectRelationEntity> entityList = baseDao.selectList(getWrapper(params));
-
-        return ConvertUtils.sourceToTarget(entityList, IssueProjectRelationDTO.class);
-    }
-
-    private QueryWrapper<IssueProjectRelationEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
-
-        QueryWrapper<IssueProjectRelationEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-
-        return wrapper;
-    }
-
-    @Override
-    public IssueProjectRelationDTO get(String id) {
-        IssueProjectRelationEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, IssueProjectRelationDTO.class);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void save(IssueProjectRelationDTO dto) {
-        IssueProjectRelationEntity entity = ConvertUtils.sourceToTarget(dto, IssueProjectRelationEntity.class);
-        insert(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(IssueProjectRelationDTO dto) {
-        IssueProjectRelationEntity entity = ConvertUtils.sourceToTarget(dto, IssueProjectRelationEntity.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/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java
deleted file mode 100644
index 5662e355c4..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- * 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.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.IssueSatisfactionDetailDao;
-import com.epmet.dto.IssueSatisfactionDetailDTO;
-import com.epmet.entity.IssueSatisfactionDetailEntity;
-import com.epmet.redis.IssueSatisfactionDetailRedis;
-import com.epmet.service.IssueSatisfactionDetailService;
-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 2020-05-11
- */
-@Service
-public class IssueSatisfactionDetailServiceImpl extends BaseServiceImpl<IssueSatisfactionDetailDao, IssueSatisfactionDetailEntity> implements IssueSatisfactionDetailService {
-
-    @Autowired
-    private IssueSatisfactionDetailRedis issueSatisfactionDetailRedis;
-
-    @Override
-    public PageData<IssueSatisfactionDetailDTO> page(Map<String, Object> params) {
-        IPage<IssueSatisfactionDetailEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, IssueSatisfactionDetailDTO.class);
-    }
-
-    @Override
-    public List<IssueSatisfactionDetailDTO> list(Map<String, Object> params) {
-        List<IssueSatisfactionDetailEntity> entityList = baseDao.selectList(getWrapper(params));
-
-        return ConvertUtils.sourceToTarget(entityList, IssueSatisfactionDetailDTO.class);
-    }
-
-    private QueryWrapper<IssueSatisfactionDetailEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
-
-        QueryWrapper<IssueSatisfactionDetailEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-
-        return wrapper;
-    }
-
-    @Override
-    public IssueSatisfactionDetailDTO get(String id) {
-        IssueSatisfactionDetailEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, IssueSatisfactionDetailDTO.class);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void save(IssueSatisfactionDetailDTO dto) {
-        IssueSatisfactionDetailEntity entity = ConvertUtils.sourceToTarget(dto, IssueSatisfactionDetailEntity.class);
-        insert(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(IssueSatisfactionDetailDTO dto) {
-        IssueSatisfactionDetailEntity entity = ConvertUtils.sourceToTarget(dto, IssueSatisfactionDetailEntity.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/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueSatisfactionStatisticalServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueSatisfactionStatisticalServiceImpl.java
deleted file mode 100644
index f912e4d4c9..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueSatisfactionStatisticalServiceImpl.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- * 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.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.IssueSatisfactionStatisticalDao;
-import com.epmet.dto.IssueSatisfactionStatisticalDTO;
-import com.epmet.entity.IssueSatisfactionStatisticalEntity;
-import com.epmet.redis.IssueSatisfactionStatisticalRedis;
-import com.epmet.service.IssueSatisfactionStatisticalService;
-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 2020-05-11
- */
-@Service
-public class IssueSatisfactionStatisticalServiceImpl extends BaseServiceImpl<IssueSatisfactionStatisticalDao, IssueSatisfactionStatisticalEntity> implements IssueSatisfactionStatisticalService {
-
-    @Autowired
-    private IssueSatisfactionStatisticalRedis issueSatisfactionStatisticalRedis;
-
-    @Override
-    public PageData<IssueSatisfactionStatisticalDTO> page(Map<String, Object> params) {
-        IPage<IssueSatisfactionStatisticalEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, IssueSatisfactionStatisticalDTO.class);
-    }
-
-    @Override
-    public List<IssueSatisfactionStatisticalDTO> list(Map<String, Object> params) {
-        List<IssueSatisfactionStatisticalEntity> entityList = baseDao.selectList(getWrapper(params));
-
-        return ConvertUtils.sourceToTarget(entityList, IssueSatisfactionStatisticalDTO.class);
-    }
-
-    private QueryWrapper<IssueSatisfactionStatisticalEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
-
-        QueryWrapper<IssueSatisfactionStatisticalEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-
-        return wrapper;
-    }
-
-    @Override
-    public IssueSatisfactionStatisticalDTO get(String id) {
-        IssueSatisfactionStatisticalEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, IssueSatisfactionStatisticalDTO.class);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void save(IssueSatisfactionStatisticalDTO dto) {
-        IssueSatisfactionStatisticalEntity entity = ConvertUtils.sourceToTarget(dto, IssueSatisfactionStatisticalEntity.class);
-        insert(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(IssueSatisfactionStatisticalDTO dto) {
-        IssueSatisfactionStatisticalEntity entity = ConvertUtils.sourceToTarget(dto, IssueSatisfactionStatisticalEntity.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/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java
deleted file mode 100644
index e63133484c..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- * 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.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.IssueVoteDetailDao;
-import com.epmet.dto.IssueVoteDetailDTO;
-import com.epmet.entity.IssueVoteDetailEntity;
-import com.epmet.redis.IssueVoteDetailRedis;
-import com.epmet.service.IssueVoteDetailService;
-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 2020-05-11
- */
-@Service
-public class IssueVoteDetailServiceImpl extends BaseServiceImpl<IssueVoteDetailDao, IssueVoteDetailEntity> implements IssueVoteDetailService {
-
-    @Autowired
-    private IssueVoteDetailRedis issueVoteDetailRedis;
-
-    @Override
-    public PageData<IssueVoteDetailDTO> page(Map<String, Object> params) {
-        IPage<IssueVoteDetailEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, IssueVoteDetailDTO.class);
-    }
-
-    @Override
-    public List<IssueVoteDetailDTO> list(Map<String, Object> params) {
-        List<IssueVoteDetailEntity> entityList = baseDao.selectList(getWrapper(params));
-
-        return ConvertUtils.sourceToTarget(entityList, IssueVoteDetailDTO.class);
-    }
-
-    private QueryWrapper<IssueVoteDetailEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
-
-        QueryWrapper<IssueVoteDetailEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-
-        return wrapper;
-    }
-
-    @Override
-    public IssueVoteDetailDTO get(String id) {
-        IssueVoteDetailEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, IssueVoteDetailDTO.class);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void save(IssueVoteDetailDTO dto) {
-        IssueVoteDetailEntity entity = ConvertUtils.sourceToTarget(dto, IssueVoteDetailEntity.class);
-        insert(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(IssueVoteDetailDTO dto) {
-        IssueVoteDetailEntity entity = ConvertUtils.sourceToTarget(dto, IssueVoteDetailEntity.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/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalDailyServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalDailyServiceImpl.java
deleted file mode 100644
index e356e2fa0a..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalDailyServiceImpl.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- * 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.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.IssueVoteStatisticalDailyDao;
-import com.epmet.dto.IssueVoteStatisticalDailyDTO;
-import com.epmet.entity.IssueVoteStatisticalDailyEntity;
-import com.epmet.redis.IssueVoteStatisticalDailyRedis;
-import com.epmet.service.IssueVoteStatisticalDailyService;
-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 2020-05-11
- */
-@Service
-public class IssueVoteStatisticalDailyServiceImpl extends BaseServiceImpl<IssueVoteStatisticalDailyDao, IssueVoteStatisticalDailyEntity> implements IssueVoteStatisticalDailyService {
-
-    @Autowired
-    private IssueVoteStatisticalDailyRedis issueVoteStatisticalDailyRedis;
-
-    @Override
-    public PageData<IssueVoteStatisticalDailyDTO> page(Map<String, Object> params) {
-        IPage<IssueVoteStatisticalDailyEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, IssueVoteStatisticalDailyDTO.class);
-    }
-
-    @Override
-    public List<IssueVoteStatisticalDailyDTO> list(Map<String, Object> params) {
-        List<IssueVoteStatisticalDailyEntity> entityList = baseDao.selectList(getWrapper(params));
-
-        return ConvertUtils.sourceToTarget(entityList, IssueVoteStatisticalDailyDTO.class);
-    }
-
-    private QueryWrapper<IssueVoteStatisticalDailyEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
-
-        QueryWrapper<IssueVoteStatisticalDailyEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-
-        return wrapper;
-    }
-
-    @Override
-    public IssueVoteStatisticalDailyDTO get(String id) {
-        IssueVoteStatisticalDailyEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, IssueVoteStatisticalDailyDTO.class);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void save(IssueVoteStatisticalDailyDTO dto) {
-        IssueVoteStatisticalDailyEntity entity = ConvertUtils.sourceToTarget(dto, IssueVoteStatisticalDailyEntity.class);
-        insert(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(IssueVoteStatisticalDailyDTO dto) {
-        IssueVoteStatisticalDailyEntity entity = ConvertUtils.sourceToTarget(dto, IssueVoteStatisticalDailyEntity.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/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
deleted file mode 100644
index bff7fd4f94..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- * 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.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.IssueVoteStatisticalDao;
-import com.epmet.dto.IssueVoteStatisticalDTO;
-import com.epmet.entity.IssueVoteStatisticalEntity;
-import com.epmet.redis.IssueVoteStatisticalRedis;
-import com.epmet.service.IssueVoteStatisticalService;
-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 2020-05-11
- */
-@Service
-public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteStatisticalDao, IssueVoteStatisticalEntity> implements IssueVoteStatisticalService {
-
-    @Autowired
-    private IssueVoteStatisticalRedis issueVoteStatisticalRedis;
-
-    @Override
-    public PageData<IssueVoteStatisticalDTO> page(Map<String, Object> params) {
-        IPage<IssueVoteStatisticalEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, IssueVoteStatisticalDTO.class);
-    }
-
-    @Override
-    public List<IssueVoteStatisticalDTO> list(Map<String, Object> params) {
-        List<IssueVoteStatisticalEntity> entityList = baseDao.selectList(getWrapper(params));
-
-        return ConvertUtils.sourceToTarget(entityList, IssueVoteStatisticalDTO.class);
-    }
-
-    private QueryWrapper<IssueVoteStatisticalEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
-
-        QueryWrapper<IssueVoteStatisticalEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-
-        return wrapper;
-    }
-
-    @Override
-    public IssueVoteStatisticalDTO get(String id) {
-        IssueVoteStatisticalEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, IssueVoteStatisticalDTO.class);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void save(IssueVoteStatisticalDTO dto) {
-        IssueVoteStatisticalEntity entity = ConvertUtils.sourceToTarget(dto, IssueVoteStatisticalEntity.class);
-        insert(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(IssueVoteStatisticalDTO dto) {
-        IssueVoteStatisticalEntity entity = ConvertUtils.sourceToTarget(dto, IssueVoteStatisticalEntity.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/resi-hall/resi-hall-server/src/main/resources/mapper/IssueCustomerParameterDao.xml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueCustomerParameterDao.xml
deleted file mode 100644
index d0934a775e..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueCustomerParameterDao.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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.IssueCustomerParameterDao">
-
-    <resultMap type="com.epmet.entity.IssueCustomerParameterEntity" id="issueCustomerParameterMap">
-        <result property="id" column="ID"/>
-        <result property="customerId" column="CUSTOMER_ID"/>
-        <result property="parameterKey" column="PARAMETER_KEY"/>
-        <result property="parameterName" column="PARAMETER_NAME"/>
-        <result property="parameterValue" column="PARAMETER_VALUE"/>
-        <result property="description" column="DESCRIPTION"/>
-        <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/resi-hall/resi-hall-server/src/main/resources/mapper/IssueProcessDao.xml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueProcessDao.xml
deleted file mode 100644
index 81b04ec584..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueProcessDao.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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.IssueProcessDao">
-
-    <resultMap type="com.epmet.entity.IssueProcessEntity" id="issueProcessMap">
-        <result property="id" column="ID"/>
-        <result property="issueId" column="ISSUE_ID"/>
-        <result property="issueStatus" column="ISSUE_STATUS"/>
-        <result property="orgType" column="ORG_TYPE"/>
-        <result property="orgId" column="ORG_ID"/>
-        <result property="operationExplain" column="OPERATION_EXPLAIN"/>
-        <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/resi-hall/resi-hall-server/src/main/resources/mapper/IssueProjectRelationDao.xml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueProjectRelationDao.xml
deleted file mode 100644
index d7188c1811..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueProjectRelationDao.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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.IssueProjectRelationDao">
-
-    <resultMap type="com.epmet.entity.IssueProjectRelationEntity" id="issueProjectRelationMap">
-        <result property="id" column="ID"/>
-        <result property="issueId" column="ISSUE_ID"/>
-        <result property="projectId" column="PROJECT_ID"/>
-        <result property="delFlag" column="DEL_FLAG"/>
-        <result property="revision" column="REVISION"/>
-        <result property="createdBy" column="CREATED_BY"/>
-        <result property="createdTime" column="CREATED_TIME"/>
-        <result property="updatedBy" column="UPDATED_BY"/>
-        <result property="updatedTime" column="UPDATED_TIME"/>
-    </resultMap>
-
-
-</mapper>
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueSatisfactionDetailDao.xml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueSatisfactionDetailDao.xml
deleted file mode 100644
index 86f0a14d13..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueSatisfactionDetailDao.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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.IssueSatisfactionDetailDao">
-
-    <resultMap type="com.epmet.entity.IssueSatisfactionDetailEntity" id="issueSatisfactionDetailMap">
-        <result property="id" column="ID"/>
-        <result property="issueId" column="ISSUE_ID"/>
-        <result property="comment" column="COMMENT"/>
-        <result property="satisfaction" column="SATISFACTION"/>
-        <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/resi-hall/resi-hall-server/src/main/resources/mapper/IssueSatisfactionStatisticalDao.xml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueSatisfactionStatisticalDao.xml
deleted file mode 100644
index ccc9f115c6..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueSatisfactionStatisticalDao.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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.IssueSatisfactionStatisticalDao">
-
-    <resultMap type="com.epmet.entity.IssueSatisfactionStatisticalEntity" id="issueSatisfactionStatisticalMap">
-        <result property="id" column="ID"/>
-        <result property="issueId" column="ISSUE_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>
-
-
-</mapper>
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueVoteDetailDao.xml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueVoteDetailDao.xml
deleted file mode 100644
index 93a382ef60..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueVoteDetailDao.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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.IssueVoteDetailDao">
-
-    <resultMap type="com.epmet.entity.IssueVoteDetailEntity" id="issueVoteDetailMap">
-        <result property="id" column="ID"/>
-        <result property="issueId" column="ISSUE_ID"/>
-        <result property="attitude" column="ATTITUDE"/>
-        <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/resi-hall/resi-hall-server/src/main/resources/mapper/IssueVoteStatisticalDailyDao.xml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueVoteStatisticalDailyDao.xml
deleted file mode 100644
index fc9b69d379..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueVoteStatisticalDailyDao.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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.IssueVoteStatisticalDailyDao">
-
-    <resultMap type="com.epmet.entity.IssueVoteStatisticalDailyEntity" id="issueVoteStatisticalDailyMap">
-        <result property="id" column="ID"/>
-        <result property="issueId" column="ISSUE_ID"/>
-        <result property="statisticalDate" column="STATISTICAL_DATE"/>
-        <result property="supportCount" column="SUPPORT_COUNT"/>
-        <result property="oppositionCount" column="OPPOSITION_COUNT"/>
-        <result property="totalCount" column="TOTAL_COUNT"/>
-        <result property="todayIncrement" column="TODAY_INCREMENT"/>
-        <result property="supportIncrement" column="SUPPORT_INCREMENT"/>
-        <result property="oppositionIncrement" column="OPPOSITION_INCREMENT"/>
-        <result property="votableCount" column="VOTABLE_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>
-
-
-</mapper>
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml
deleted file mode 100644
index d34f9eb2ae..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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.IssueVoteStatisticalDao">
-
-    <resultMap type="com.epmet.entity.IssueVoteStatisticalEntity" id="issueVoteStatisticalMap">
-        <result property="id" column="ID"/>
-        <result property="issueId" column="ISSUE_ID"/>
-        <result property="supportCount" column="SUPPORT_COUNT"/>
-        <result property="oppositionCount" column="OPPOSITION_COUNT"/>
-        <result property="votableCount" column="VOTABLE_COUNT"/>
-        <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/resi-hall/resi-hall.iml b/epmet-module/resi-hall/resi-hall.iml
new file mode 100644
index 0000000000..0d9345ff78
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall.iml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-context:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-aop:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-beans:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-expression:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.11.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache.logging.log4j:log4j-api:2.11.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:jul-to-slf4j:1.7.29" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-api:1.7.29" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.11.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:2.23.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.9.16" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.16" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-core:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-jcl:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.6.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
+  </component>
+</module>
\ No newline at end of file

From c4d0632bd6d1885810ff3a98bdd7af6da0bce7ec Mon Sep 17 00:00:00 2001
From: zxc <954985706@qq.com>
Date: Tue, 12 May 2020 09:25:57 +0800
Subject: [PATCH 16/45] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/form/IssueDetailFormDTO.java    |  21 ++++
 .../dto/result/IssueDetailResultDTO.java      |  49 ++++++++
 .../com/epmet/dto/result/IssueResultDTO.java  |  48 ++++++++
 .../com/epmet/controller/IssueController.java |  40 ++++++
 .../IssueCustomerParameterController.java     |  94 ++++++++++++++
 .../controller/IssueProcessController.java    |  94 ++++++++++++++
 .../IssueProjectRelationController.java       |  94 ++++++++++++++
 .../IssueSatisfactionDetailController.java    |  94 ++++++++++++++
 ...ssueSatisfactionStatisticalController.java |  94 ++++++++++++++
 .../controller/IssueVoteDetailController.java |  94 ++++++++++++++
 .../IssueVoteStatisticalController.java       |  94 ++++++++++++++
 .../IssueVoteStatisticalDailyController.java  |  94 ++++++++++++++
 .../controller/ResiHallDemoController.java    |  27 ++++
 .../epmet/dao/IssueCustomerParameterDao.java  |  33 +++++
 .../src/main/java/com/epmet/dao/IssueDao.java |  43 +++++++
 .../java/com/epmet/dao/IssueProcessDao.java   |  33 +++++
 .../epmet/dao/IssueProjectRelationDao.java    |  33 +++++
 .../epmet/dao/IssueSatisfactionDetailDao.java |  33 +++++
 .../dao/IssueSatisfactionStatisticalDao.java  |  33 +++++
 .../com/epmet/dao/IssueVoteDetailDao.java     |  33 +++++
 .../dao/IssueVoteStatisticalDailyDao.java     |  33 +++++
 .../epmet/dao/IssueVoteStatisticalDao.java    |  33 +++++
 .../entity/IssueCustomerParameterEntity.java  |  66 ++++++++++
 .../java/com/epmet/entity/IssueEntity.java    | 116 ++++++++++++++++++
 .../com/epmet/entity/IssueProcessEntity.java  |  66 ++++++++++
 .../entity/IssueProjectRelationEntity.java    |  51 ++++++++
 .../entity/IssueSatisfactionDetailEntity.java |  56 +++++++++
 .../IssueSatisfactionStatisticalEntity.java   |  61 +++++++++
 .../epmet/entity/IssueVoteDetailEntity.java   |  51 ++++++++
 .../IssueVoteStatisticalDailyEntity.java      |  86 +++++++++++++
 .../entity/IssueVoteStatisticalEntity.java    |  61 +++++++++
 .../excel/IssueCustomerParameterExcel.java    |  71 +++++++++++
 .../main/java/com/epmet/excel/IssueExcel.java | 101 +++++++++++++++
 .../com/epmet/excel/IssueProcessExcel.java    |  71 +++++++++++
 .../excel/IssueProjectRelationExcel.java      |  62 ++++++++++
 .../excel/IssueSatisfactionDetailExcel.java   |  65 ++++++++++
 .../IssueSatisfactionStatisticalExcel.java    |  68 ++++++++++
 .../com/epmet/excel/IssueVoteDetailExcel.java |  62 ++++++++++
 .../excel/IssueVoteStatisticalDailyExcel.java |  83 +++++++++++++
 .../excel/IssueVoteStatisticalExcel.java      |  68 ++++++++++
 .../redis/IssueCustomerParameterRedis.java    |  47 +++++++
 .../com/epmet/redis/IssueProcessRedis.java    |  47 +++++++
 .../redis/IssueProjectRelationRedis.java      |  47 +++++++
 .../main/java/com/epmet/redis/IssueRedis.java |  47 +++++++
 .../redis/IssueSatisfactionDetailRedis.java   |  47 +++++++
 .../IssueSatisfactionStatisticalRedis.java    |  47 +++++++
 .../com/epmet/redis/IssueVoteDetailRedis.java |  47 +++++++
 .../redis/IssueVoteStatisticalDailyRedis.java |  47 +++++++
 .../redis/IssueVoteStatisticalRedis.java      |  47 +++++++
 .../IssueCustomerParameterService.java        |  95 ++++++++++++++
 .../epmet/service/IssueProcessService.java    |  95 ++++++++++++++
 .../service/IssueProjectRelationService.java  |  95 ++++++++++++++
 .../IssueSatisfactionDetailService.java       |  95 ++++++++++++++
 .../IssueSatisfactionStatisticalService.java  |  95 ++++++++++++++
 .../java/com/epmet/service/IssueService.java  |  22 ++++
 .../epmet/service/IssueVoteDetailService.java |  95 ++++++++++++++
 .../IssueVoteStatisticalDailyService.java     |  95 ++++++++++++++
 .../service/IssueVoteStatisticalService.java  |  95 ++++++++++++++
 .../main/java/com/epmet/service/impl/.gitkeep |   0
 .../IssueCustomerParameterServiceImpl.java    |  99 +++++++++++++++
 .../service/impl/IssueProcessServiceImpl.java | 104 ++++++++++++++++
 .../impl/IssueProjectRelationServiceImpl.java | 104 ++++++++++++++++
 .../IssueSatisfactionDetailServiceImpl.java   | 104 ++++++++++++++++
 ...sueSatisfactionStatisticalServiceImpl.java | 104 ++++++++++++++++
 .../epmet/service/impl/IssueServiceImpl.java  |  34 +++++
 .../impl/IssueVoteDetailServiceImpl.java      | 104 ++++++++++++++++
 .../IssueVoteStatisticalDailyServiceImpl.java | 104 ++++++++++++++++
 .../impl/IssueVoteStatisticalServiceImpl.java | 104 ++++++++++++++++
 .../mapper/IssueCustomerParameterDao.xml      |  22 ++++
 .../src/main/resources/mapper/IssueDao.xml    |  46 +++++++
 .../main/resources/mapper/IssueProcessDao.xml |  22 ++++
 .../mapper/IssueProjectRelationDao.xml        |  19 +++
 .../mapper/IssueSatisfactionDetailDao.xml     |  20 +++
 .../IssueSatisfactionStatisticalDao.xml       |  21 ++++
 .../resources/mapper/IssueVoteDetailDao.xml   |  19 +++
 .../mapper/IssueVoteStatisticalDailyDao.xml   |  26 ++++
 .../mapper/IssueVoteStatisticalDao.xml        |  21 ++++
 77 files changed, 4791 insertions(+)
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueDetailFormDTO.java
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueCustomerParameterController.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProcessController.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectRelationController.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueSatisfactionDetailController.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueSatisfactionStatisticalController.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteDetailController.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteStatisticalController.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteStatisticalDailyController.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/ResiHallDemoController.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCustomerParameterDao.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProcessDao.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectRelationDao.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueSatisfactionDetailDao.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueSatisfactionStatisticalDao.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDailyDao.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueCustomerParameterEntity.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueEntity.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProcessEntity.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectRelationEntity.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueSatisfactionDetailEntity.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueSatisfactionStatisticalEntity.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueVoteDetailEntity.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueVoteStatisticalDailyEntity.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueVoteStatisticalEntity.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueCustomerParameterExcel.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueExcel.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueProcessExcel.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueProjectRelationExcel.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueSatisfactionDetailExcel.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueSatisfactionStatisticalExcel.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueVoteDetailExcel.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueVoteStatisticalDailyExcel.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueVoteStatisticalExcel.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueCustomerParameterRedis.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProcessRedis.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectRelationRedis.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueRedis.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueSatisfactionDetailRedis.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueSatisfactionStatisticalRedis.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteStatisticalDailyRedis.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteStatisticalRedis.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueCustomerParameterService.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProcessService.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectRelationService.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueSatisfactionDetailService.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueSatisfactionStatisticalService.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteDetailService.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteStatisticalDailyService.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/.gitkeep
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCustomerParameterServiceImpl.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectRelationServiceImpl.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionStatisticalServiceImpl.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalDailyServiceImpl.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCustomerParameterDao.xml
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProcessDao.xml
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectRelationDao.xml
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueSatisfactionDetailDao.xml
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueSatisfactionStatisticalDao.xml
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteDetailDao.xml
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDailyDao.xml
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml

diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueDetailFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueDetailFormDTO.java
new file mode 100644
index 0000000000..84b0d8f5e6
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueDetailFormDTO.java
@@ -0,0 +1,21 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 议题详情入参
+ * @Author zxc
+ * @Date 2020/5/11 9:30
+ */
+@Data
+public class IssueDetailFormDTO implements Serializable {
+    private static final long serialVersionUID = 4859779755214503489L;
+
+    @NotBlank(message = "议题id不能为空")
+    private String issueId;
+
+}
+
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java
new file mode 100644
index 0000000000..8769c93e5b
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java
@@ -0,0 +1,49 @@
+package com.epmet.dto.result;
+
+import com.epmet.dto.TopicInfoDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 议题详情回参
+ * @CreateTime 2020/5/11 9:31
+ */
+@Data
+public class IssueDetailResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -1L;
+
+    /**
+     * 议题标题
+     */
+    private String issueTitle;
+
+    /**
+     * 议题状态(voting 已转项目：shift_project 已关闭：closed)
+     */
+    private String issueStatus;
+
+    /**
+     * 话题信息
+     */
+    private TopicInfoDTO topicInfo;
+
+    /**
+     * 议题建议
+     */
+    private String issueSuggestion;
+
+    /**
+     * 所属网格(网格所属机关单位名称-网格名称)
+     */
+    private String belongsGridName;
+
+    /**
+     * 议题发起人（山东路168-尹女士）
+     */
+    private String issueInitiator;
+
+
+}
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java
new file mode 100644
index 0000000000..b278b9f585
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java
@@ -0,0 +1,48 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 议题详情回参
+ * @CreateTime 2020/5/11 9:31
+ */
+@Data
+public class IssueResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -1L;
+
+    /**
+     * 议题标题
+     */
+    private String issueTitle;
+
+    /**
+     * 议题状态(voting 已转项目：shift_project 已关闭：closed)
+     */
+    private String issueStatus;
+
+    /**
+     * 议题建议
+     */
+    private String issueSuggestion;
+
+    /**
+     * 网格Id
+     */
+    private String gridId;
+
+    /**
+     * 用户id
+     */
+    private String userId;
+
+    /**
+     * 话题Id
+     */
+    private String topicId;
+
+
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java
new file mode 100644
index 0000000000..05cdb50892
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java
@@ -0,0 +1,40 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.annotation.RequirePermission;
+import com.epmet.commons.tools.enums.RequirePermissionEnum;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.IssueDetailFormDTO;
+import com.epmet.dto.result.IssueResultDTO;
+import com.epmet.service.IssueService;
+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;
+
+/**
+ * @Description 居民端党群议事
+ * @Author yinzuomei
+ * @Date 2020/5/11 9:04
+ */
+@RestController
+@RequestMapping("issue")
+public class IssueController {
+
+    @Autowired
+    private IssueService issueService;
+
+    /**
+     * @Description  议题详情
+     * @param issueDetail
+     * @author zxc
+     * @date 2020/5/11 9:42
+     */
+    @PostMapping(value = "/detail")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
+    public Result<IssueResultDTO> detail(@RequestBody IssueDetailFormDTO issueDetail){
+        return new Result<IssueResultDTO>().ok(issueService.detail(issueDetail));
+    }
+
+}
+
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueCustomerParameterController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueCustomerParameterController.java
new file mode 100644
index 0000000000..7371c32666
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueCustomerParameterController.java
@@ -0,0 +1,94 @@
+/**
+ * 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.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+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.IssueCustomerParameterDTO;
+import com.epmet.excel.IssueCustomerParameterExcel;
+import com.epmet.service.IssueCustomerParameterService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 议题客户参数定制表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@RestController
+@RequestMapping("issuecustomerparameter")
+public class IssueCustomerParameterController {
+    
+    @Autowired
+    private IssueCustomerParameterService issueCustomerParameterService;
+
+    @GetMapping("page")
+    public Result<PageData<IssueCustomerParameterDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<IssueCustomerParameterDTO> page = issueCustomerParameterService.page(params);
+        return new Result<PageData<IssueCustomerParameterDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<IssueCustomerParameterDTO> get(@PathVariable("id") String id){
+        IssueCustomerParameterDTO data = issueCustomerParameterService.get(id);
+        return new Result<IssueCustomerParameterDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody IssueCustomerParameterDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        issueCustomerParameterService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody IssueCustomerParameterDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        issueCustomerParameterService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        issueCustomerParameterService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<IssueCustomerParameterDTO> list = issueCustomerParameterService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, IssueCustomerParameterExcel.class);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProcessController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProcessController.java
new file mode 100644
index 0000000000..bf6c57f863
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProcessController.java
@@ -0,0 +1,94 @@
+/**
+ * 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.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+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.IssueProcessDTO;
+import com.epmet.excel.IssueProcessExcel;
+import com.epmet.service.IssueProcessService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 议题进展记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@RestController
+@RequestMapping("issueprocess")
+public class IssueProcessController {
+    
+    @Autowired
+    private IssueProcessService issueProcessService;
+
+    @GetMapping("page")
+    public Result<PageData<IssueProcessDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<IssueProcessDTO> page = issueProcessService.page(params);
+        return new Result<PageData<IssueProcessDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<IssueProcessDTO> get(@PathVariable("id") String id){
+        IssueProcessDTO data = issueProcessService.get(id);
+        return new Result<IssueProcessDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody IssueProcessDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        issueProcessService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody IssueProcessDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        issueProcessService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        issueProcessService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<IssueProcessDTO> list = issueProcessService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, IssueProcessExcel.class);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectRelationController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectRelationController.java
new file mode 100644
index 0000000000..7efd1b1394
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectRelationController.java
@@ -0,0 +1,94 @@
+/**
+ * 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.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+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.IssueProjectRelationDTO;
+import com.epmet.excel.IssueProjectRelationExcel;
+import com.epmet.service.IssueProjectRelationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 议题项目关系表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@RestController
+@RequestMapping("issueprojectrelation")
+public class IssueProjectRelationController {
+    
+    @Autowired
+    private IssueProjectRelationService issueProjectRelationService;
+
+    @GetMapping("page")
+    public Result<PageData<IssueProjectRelationDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<IssueProjectRelationDTO> page = issueProjectRelationService.page(params);
+        return new Result<PageData<IssueProjectRelationDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<IssueProjectRelationDTO> get(@PathVariable("id") String id){
+        IssueProjectRelationDTO data = issueProjectRelationService.get(id);
+        return new Result<IssueProjectRelationDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody IssueProjectRelationDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        issueProjectRelationService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody IssueProjectRelationDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        issueProjectRelationService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        issueProjectRelationService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<IssueProjectRelationDTO> list = issueProjectRelationService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, IssueProjectRelationExcel.class);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueSatisfactionDetailController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueSatisfactionDetailController.java
new file mode 100644
index 0000000000..8772539ab3
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueSatisfactionDetailController.java
@@ -0,0 +1,94 @@
+/**
+ * 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.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+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.IssueSatisfactionDetailDTO;
+import com.epmet.excel.IssueSatisfactionDetailExcel;
+import com.epmet.service.IssueSatisfactionDetailService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 议题满意度调查记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@RestController
+@RequestMapping("issuesatisfactiondetail")
+public class IssueSatisfactionDetailController {
+    
+    @Autowired
+    private IssueSatisfactionDetailService issueSatisfactionDetailService;
+
+    @GetMapping("page")
+    public Result<PageData<IssueSatisfactionDetailDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<IssueSatisfactionDetailDTO> page = issueSatisfactionDetailService.page(params);
+        return new Result<PageData<IssueSatisfactionDetailDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<IssueSatisfactionDetailDTO> get(@PathVariable("id") String id){
+        IssueSatisfactionDetailDTO data = issueSatisfactionDetailService.get(id);
+        return new Result<IssueSatisfactionDetailDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody IssueSatisfactionDetailDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        issueSatisfactionDetailService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody IssueSatisfactionDetailDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        issueSatisfactionDetailService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        issueSatisfactionDetailService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<IssueSatisfactionDetailDTO> list = issueSatisfactionDetailService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, IssueSatisfactionDetailExcel.class);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueSatisfactionStatisticalController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueSatisfactionStatisticalController.java
new file mode 100644
index 0000000000..f9412e0996
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueSatisfactionStatisticalController.java
@@ -0,0 +1,94 @@
+/**
+ * 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.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+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.IssueSatisfactionStatisticalDTO;
+import com.epmet.excel.IssueSatisfactionStatisticalExcel;
+import com.epmet.service.IssueSatisfactionStatisticalService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 议题满意度调查统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@RestController
+@RequestMapping("issuesatisfactionstatistical")
+public class IssueSatisfactionStatisticalController {
+    
+    @Autowired
+    private IssueSatisfactionStatisticalService issueSatisfactionStatisticalService;
+
+    @GetMapping("page")
+    public Result<PageData<IssueSatisfactionStatisticalDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<IssueSatisfactionStatisticalDTO> page = issueSatisfactionStatisticalService.page(params);
+        return new Result<PageData<IssueSatisfactionStatisticalDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<IssueSatisfactionStatisticalDTO> get(@PathVariable("id") String id){
+        IssueSatisfactionStatisticalDTO data = issueSatisfactionStatisticalService.get(id);
+        return new Result<IssueSatisfactionStatisticalDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody IssueSatisfactionStatisticalDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        issueSatisfactionStatisticalService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody IssueSatisfactionStatisticalDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        issueSatisfactionStatisticalService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        issueSatisfactionStatisticalService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<IssueSatisfactionStatisticalDTO> list = issueSatisfactionStatisticalService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, IssueSatisfactionStatisticalExcel.class);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteDetailController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteDetailController.java
new file mode 100644
index 0000000000..981aacf50e
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteDetailController.java
@@ -0,0 +1,94 @@
+/**
+ * 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.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+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.IssueVoteDetailDTO;
+import com.epmet.excel.IssueVoteDetailExcel;
+import com.epmet.service.IssueVoteDetailService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 议题表决记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@RestController
+@RequestMapping("issuevotedetail")
+public class IssueVoteDetailController {
+    
+    @Autowired
+    private IssueVoteDetailService issueVoteDetailService;
+
+    @GetMapping("page")
+    public Result<PageData<IssueVoteDetailDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<IssueVoteDetailDTO> page = issueVoteDetailService.page(params);
+        return new Result<PageData<IssueVoteDetailDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<IssueVoteDetailDTO> get(@PathVariable("id") String id){
+        IssueVoteDetailDTO data = issueVoteDetailService.get(id);
+        return new Result<IssueVoteDetailDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody IssueVoteDetailDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        issueVoteDetailService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody IssueVoteDetailDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        issueVoteDetailService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        issueVoteDetailService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<IssueVoteDetailDTO> list = issueVoteDetailService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, IssueVoteDetailExcel.class);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteStatisticalController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteStatisticalController.java
new file mode 100644
index 0000000000..ab98b72498
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteStatisticalController.java
@@ -0,0 +1,94 @@
+/**
+ * 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.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+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.IssueVoteStatisticalDTO;
+import com.epmet.excel.IssueVoteStatisticalExcel;
+import com.epmet.service.IssueVoteStatisticalService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 议题表决统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@RestController
+@RequestMapping("issuevotestatistical")
+public class IssueVoteStatisticalController {
+    
+    @Autowired
+    private IssueVoteStatisticalService issueVoteStatisticalService;
+
+    @GetMapping("page")
+    public Result<PageData<IssueVoteStatisticalDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<IssueVoteStatisticalDTO> page = issueVoteStatisticalService.page(params);
+        return new Result<PageData<IssueVoteStatisticalDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<IssueVoteStatisticalDTO> get(@PathVariable("id") String id){
+        IssueVoteStatisticalDTO data = issueVoteStatisticalService.get(id);
+        return new Result<IssueVoteStatisticalDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody IssueVoteStatisticalDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        issueVoteStatisticalService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody IssueVoteStatisticalDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        issueVoteStatisticalService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        issueVoteStatisticalService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<IssueVoteStatisticalDTO> list = issueVoteStatisticalService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, IssueVoteStatisticalExcel.class);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteStatisticalDailyController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteStatisticalDailyController.java
new file mode 100644
index 0000000000..7e5506354a
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteStatisticalDailyController.java
@@ -0,0 +1,94 @@
+/**
+ * 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.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+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.IssueVoteStatisticalDailyDTO;
+import com.epmet.excel.IssueVoteStatisticalDailyExcel;
+import com.epmet.service.IssueVoteStatisticalDailyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 议题表决按天统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@RestController
+@RequestMapping("issuevotestatisticaldaily")
+public class IssueVoteStatisticalDailyController {
+    
+    @Autowired
+    private IssueVoteStatisticalDailyService issueVoteStatisticalDailyService;
+
+    @GetMapping("page")
+    public Result<PageData<IssueVoteStatisticalDailyDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<IssueVoteStatisticalDailyDTO> page = issueVoteStatisticalDailyService.page(params);
+        return new Result<PageData<IssueVoteStatisticalDailyDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<IssueVoteStatisticalDailyDTO> get(@PathVariable("id") String id){
+        IssueVoteStatisticalDailyDTO data = issueVoteStatisticalDailyService.get(id);
+        return new Result<IssueVoteStatisticalDailyDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody IssueVoteStatisticalDailyDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        issueVoteStatisticalDailyService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody IssueVoteStatisticalDailyDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        issueVoteStatisticalDailyService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        issueVoteStatisticalDailyService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<IssueVoteStatisticalDailyDTO> list = issueVoteStatisticalDailyService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, IssueVoteStatisticalDailyExcel.class);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/ResiHallDemoController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/ResiHallDemoController.java
new file mode 100644
index 0000000000..56c01421a7
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/ResiHallDemoController.java
@@ -0,0 +1,27 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.form.DemoTestFormDTO;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @Description 测试
+ * @Author yinzuomei
+ * @Date 2020/5/7 22:47
+ */
+@RestController
+@RequestMapping("demo")
+public class ResiHallDemoController {
+    private static final Logger logger = LoggerFactory.getLogger(ResiHallDemoController.class);
+
+    @PostMapping("test")
+    public Result test(@RequestBody DemoTestFormDTO formDTO) {
+        logger.info(String.format("请求成功客户id[%s],网格id[%s]",formDTO.getCustomerId(),formDTO.getGridId()));
+        ValidatorUtils.validateEntity(formDTO);
+        return new Result().ok("resi-hall-server请求成功");
+    }
+}
+
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCustomerParameterDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCustomerParameterDao.java
new file mode 100644
index 0000000000..48fa1e3491
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCustomerParameterDao.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;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IssueCustomerParameterEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 议题客户参数定制表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Mapper
+public interface IssueCustomerParameterDao extends BaseDao<IssueCustomerParameterEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java
new file mode 100644
index 0000000000..8c601bd3ca
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java
@@ -0,0 +1,43 @@
+/**
+ * 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;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.form.IssueDetailFormDTO;
+import com.epmet.dto.result.IssueResultDTO;
+import com.epmet.entity.IssueEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 议题详情 关联话题，转议题时间必须要和话题转议题时间一致、关闭时间必须要和操作记录表的关闭记录时间一致、转项目时间必须要和项目记录生成时间一致，注意服务间调用的时间一致性。每个议题最后总会被关闭。
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Mapper
+public interface IssueDao extends BaseDao<IssueEntity> {
+
+    /**
+     * @Description  议题详情
+     * @param formDTO
+     * @author zxc
+     * @date 2020/5/11 10:11
+     */
+    IssueResultDTO issueDetail(IssueDetailFormDTO formDTO);
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProcessDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProcessDao.java
new file mode 100644
index 0000000000..26603169ae
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProcessDao.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;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IssueProcessEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 议题进展记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Mapper
+public interface IssueProcessDao extends BaseDao<IssueProcessEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectRelationDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectRelationDao.java
new file mode 100644
index 0000000000..430dc74741
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectRelationDao.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;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IssueProjectRelationEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 议题项目关系表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Mapper
+public interface IssueProjectRelationDao extends BaseDao<IssueProjectRelationEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueSatisfactionDetailDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueSatisfactionDetailDao.java
new file mode 100644
index 0000000000..01727f507a
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueSatisfactionDetailDao.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;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IssueSatisfactionDetailEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 议题满意度调查记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Mapper
+public interface IssueSatisfactionDetailDao extends BaseDao<IssueSatisfactionDetailEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueSatisfactionStatisticalDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueSatisfactionStatisticalDao.java
new file mode 100644
index 0000000000..e3eeabb823
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueSatisfactionStatisticalDao.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;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IssueSatisfactionStatisticalEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 议题满意度调查统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Mapper
+public interface IssueSatisfactionStatisticalDao extends BaseDao<IssueSatisfactionStatisticalEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java
new file mode 100644
index 0000000000..f8a41e3747
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.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;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IssueVoteDetailEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 议题表决记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Mapper
+public interface IssueVoteDetailDao extends BaseDao<IssueVoteDetailEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDailyDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDailyDao.java
new file mode 100644
index 0000000000..e09695b2b8
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDailyDao.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;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IssueVoteStatisticalDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 议题表决按天统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Mapper
+public interface IssueVoteStatisticalDailyDao extends BaseDao<IssueVoteStatisticalDailyEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java
new file mode 100644
index 0000000000..7f833487d8
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.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;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IssueVoteStatisticalEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 议题表决统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Mapper
+public interface IssueVoteStatisticalDao extends BaseDao<IssueVoteStatisticalEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueCustomerParameterEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueCustomerParameterEntity.java
new file mode 100644
index 0000000000..72e7769da7
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueCustomerParameterEntity.java
@@ -0,0 +1,66 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity;
+
+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-05-11
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("issue_customer_parameter")
+public class IssueCustomerParameterEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 参数键 eg:voting_time_limit
+     */
+	private String parameterKey;
+
+    /**
+     * 参数名 eg:表决期限
+     */
+	private String parameterName;
+
+    /**
+     * 参数值 eg:10（天）
+     */
+	private String parameterValue;
+
+    /**
+     * 参数说明 eg:这个客户下所有的网格议题表决期限都是10天
+     */
+	private String description;
+
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueEntity.java
new file mode 100644
index 0000000000..cfa9b8c046
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueEntity.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;
+
+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-05-11
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("issue")
+public class IssueEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 议题状态 表决中：voting 已转项目：shift_project 已关闭：closed
+     */
+	private String issueStatus;
+
+    /**
+     * 来源类型 eg:resi_topic
+     */
+	private String sourceType;
+
+    /**
+     * 来源ID eg:2223232(当SOURCE_TYPE为"resi_topic"时，这里指话题的ID)
+     */
+	private String sourceId;
+
+    /**
+     * 关闭理由 【未关闭时可以为空】关闭话题时必填的理由，转项目后而且已经结案，这个字段不回写
+     */
+	private String closeReason;
+
+    /**
+     * 解决类型 【未关闭时可以为空】已解决resloved、未解决unresloved，对应在关闭议题时所选的checkbox，转项目后而且已经结案，这个字段不回写
+     */
+	private String resolveType;
+
+    /**
+     * 议题名称 最多20字
+     */
+	private String issueTitle;
+
+    /**
+     * 建议 建议
+     */
+	private String suggestion;
+
+    /**
+     * 客户ID 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 网格ID 居民端议题对应一个网格iId
+     */
+	private String gridId;
+
+    /**
+     * 所属机关 【数据权限-非必填】11:22:33(agencyId)数据权限控制
+     */
+	private String orgIdPath;
+
+    /**
+     * 组织ID 【数据权限-非必填】agencyId
+     */
+	private String orgId;
+
+    /**
+     * 表决截止日期 表决截止日期
+     */
+	private Date votingDeadline;
+
+    /**
+     * 表决发起日期（转议题日期） 表决发起日期（转议题日期）
+     */
+	private Date decidedTime;
+
+    /**
+     * 转项目日期 转项目日期（服务间调用日期一致性）
+     */
+	private Date shiftedTime;
+
+    /**
+     * 关闭日期 关闭日期
+     */
+	private Date closedTime;
+
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProcessEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProcessEntity.java
new file mode 100644
index 0000000000..701a3c6c61
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProcessEntity.java
@@ -0,0 +1,66 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity;
+
+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-05-11
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("issue_process")
+public class IssueProcessEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 议题ID
+     */
+	private String issueId;
+
+    /**
+     * 操作状态 - 表决中：voting 已转项目：shift_project 已关闭：closed
+     */
+	private String issueStatus;
+
+    /**
+     * 组织类型 操作人所属机构类型（机构：agency | 部门：dept | 网格：grid）操作人可能来源于居民端和政府段，但是只有在“转议题”的时候才是居民端拥有组长权限的人操作，所以当这条记录是转议题时，该记录为grid，ORD_ID相应的也为GRID_ID
+     */
+	private String orgType;
+
+    /**
+     * 组织ID 操作人所属机构ID（对应的有网格ID、部门ID、机构ID）
+     */
+	private String orgId;
+
+    /**
+     * 操作说明 (节点的说明文案，包含三个节点的文案说明【转议题】、【已关闭】、【转项目】)
+     */
+	private String operationExplain;
+
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectRelationEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectRelationEntity.java
new file mode 100644
index 0000000000..c1fcf5f579
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectRelationEntity.java
@@ -0,0 +1,51 @@
+/**
+ * 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;
+
+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-05-11
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("issue_project_relation")
+public class IssueProjectRelationEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 议题ID 议题ID
+     */
+	private String issueId;
+
+    /**
+     * 项目ID 项目ID
+     */
+	private String projectId;
+
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueSatisfactionDetailEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueSatisfactionDetailEntity.java
new file mode 100644
index 0000000000..d36fdababc
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueSatisfactionDetailEntity.java
@@ -0,0 +1,56 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity;
+
+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-05-11
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("issue_satisfaction_detail")
+public class IssueSatisfactionDetailEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 议题ID
+     */
+	private String issueId;
+
+    /**
+     * 评论 - 最多300字
+     */
+	private String comment;
+
+    /**
+     * 满意度 满意度 - 不满意:bad、基本满意:good、非常满意:perfect
+     */
+	private String satisfaction;
+
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueSatisfactionStatisticalEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueSatisfactionStatisticalEntity.java
new file mode 100644
index 0000000000..243b1e441a
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueSatisfactionStatisticalEntity.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity;
+
+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-05-11
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("issue_satisfaction_statistical")
+public class IssueSatisfactionStatisticalEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 议题ID
+     */
+	private String issueId;
+
+    /**
+     * 一般满意数
+     */
+	private Integer goodCount;
+
+    /**
+     * 非常满意数
+     */
+	private Integer perfectCount;
+
+    /**
+     * 不满意数
+     */
+	private Integer badCount;
+
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueVoteDetailEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueVoteDetailEntity.java
new file mode 100644
index 0000000000..1f3381b687
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueVoteDetailEntity.java
@@ -0,0 +1,51 @@
+/**
+ * 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;
+
+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-05-11
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("issue_vote_detail")
+public class IssueVoteDetailEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 议题ID
+     */
+	private String issueId;
+
+    /**
+     * 态度 - opposition（反对）support（赞成）
+     */
+	private String attitude;
+
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueVoteStatisticalDailyEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueVoteStatisticalDailyEntity.java
new file mode 100644
index 0000000000..92feff0236
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueVoteStatisticalDailyEntity.java
@@ -0,0 +1,86 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity;
+
+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-05-11
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("issue_vote_statistical_daily")
+public class IssueVoteStatisticalDailyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 议题ID
+     */
+	private String issueId;
+
+    /**
+     * 统计日期 yyyy-MM-dd
+     */
+	private Date statisticalDate;
+
+    /**
+     * 到该日的总赞成数
+     */
+	private Integer supportCount;
+
+    /**
+     * 到该日的总反对数
+     */
+	private Integer oppositionCount;
+
+    /**
+     * 到该日的总票数
+     */
+	private Integer totalCount;
+
+    /**
+     * 该日增量
+     */
+	private Integer todayIncrement;
+
+    /**
+     * 该日赞成增量
+     */
+	private Integer supportIncrement;
+
+    /**
+     * 该日反对增量
+     */
+	private Integer oppositionIncrement;
+
+    /**
+     * 到该日的应表决数
+     */
+	private Integer votableCount;
+
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueVoteStatisticalEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueVoteStatisticalEntity.java
new file mode 100644
index 0000000000..d287eddf27
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueVoteStatisticalEntity.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity;
+
+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-05-11
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("issue_vote_statistical")
+public class IssueVoteStatisticalEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 议题ID
+     */
+	private String issueId;
+
+    /**
+     * 支持数
+     */
+	private Integer supportCount;
+
+    /**
+     * 反对数
+     */
+	private Integer oppositionCount;
+
+    /**
+     * 应表决数
+     */
+	private Integer votableCount;
+
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueCustomerParameterExcel.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueCustomerParameterExcel.java
new file mode 100644
index 0000000000..9ede57879c
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueCustomerParameterExcel.java
@@ -0,0 +1,71 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 议题客户参数定制表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Data
+public class IssueCustomerParameterExcel {
+
+    @Excel(name = "主键ID")
+    private String id;
+
+    @Excel(name = "客户ID")
+    private String customerId;
+
+    @Excel(name = "参数键 eg:voting_time_limit")
+    private String parameterKey;
+
+    @Excel(name = "参数名 eg:表决期限")
+    private String parameterName;
+
+    @Excel(name = "参数值 eg:10（天）")
+    private String parameterValue;
+
+    @Excel(name = "参数说明 eg:这个客户下所有的网格议题表决期限都是10天")
+    private String description;
+
+    @Excel(name = "删除标志 0：未删除，1：已删除")
+    private String delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueExcel.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueExcel.java
new file mode 100644
index 0000000000..e012192a3f
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueExcel.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.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 议题详情表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Data
+public class IssueExcel {
+
+    @Excel(name = "议题ID")
+    private String id;
+
+    @Excel(name = "议题状态 表决中：voting 已转项目：shift_project 已关闭：closed")
+    private String issueStatus;
+
+    @Excel(name = "来源类型 eg:resi_topic")
+    private String sourceType;
+
+    @Excel(name = "来源ID eg:2223232(当SOURCE_TYPE为 resi_topic 时，这里指话题的ID)")
+    private String sourceId;
+
+    @Excel(name = "关闭理由 【未关闭时可以为空】关闭议题时必填的理由，转项目后而且已经结案，这个字段不回写")
+    private String closeReason;
+
+    @Excel(name = "解决类型 【未关闭时可以为空】已解决resloved、未解决unresloved，对应在关闭议题时所选的checkbox，转项目后而且已经结案，这个字段不回写")
+    private String resolveType;
+
+    @Excel(name = "议题名称 最多20字")
+    private String issueTitle;
+
+    @Excel(name = "建议 最多1000字")
+    private String suggestion;
+
+    @Excel(name = "客户ID")
+    private String customerId;
+
+    @Excel(name = "网格ID 居民端议题对应一个网格Id")
+    private String gridId;
+
+    @Excel(name = "所属机关 【数据权限-非必填】11:22:33(agencyId)数据权限控制")
+    private String orgIdPath;
+
+    @Excel(name = "组织ID 【数据权限-非必填】agencyId")
+    private String orgId;
+
+    @Excel(name = "表决截止日期")
+    private Date votingDeadline;
+
+    @Excel(name = "表决发起日期（转议题日期）")
+    private Date decidedTime;
+
+    @Excel(name = "转项目日期 （服务间调用日期一致性）")
+    private Date shiftedTime;
+
+    @Excel(name = "关闭日期")
+    private Date closedTime;
+
+    @Excel(name = "删除标识 0未删除、1已删除")
+    private String delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueProcessExcel.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueProcessExcel.java
new file mode 100644
index 0000000000..587e28e8c2
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueProcessExcel.java
@@ -0,0 +1,71 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 议题进展记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Data
+public class IssueProcessExcel {
+
+    @Excel(name = "主键ID")
+    private String id;
+
+    @Excel(name = "议题ID")
+    private String issueId;
+
+    @Excel(name = "操作状态 - 表决中：voting 已转项目：shift_project 已关闭：closed")
+    private String issueStatus;
+
+    @Excel(name = "组织类型 操作人所属机构类型（机构：agency | 部门：dept | 网格：grid）操作人可能来源于居民端和政府段，但是只有在“转议题”的时候才是居民端拥有组长权限的人操作，所以当这条记录是转议题时，该记录为grid，ORD_ID相应的也为GRID_ID")
+    private String orgType;
+
+    @Excel(name = "组织ID 操作人所属机构ID（对应的有网格ID、部门ID、机构ID）")
+    private String orgId;
+
+    @Excel(name = "操作说明 (节点的说明文案，包含三个节点的文案说明【转议题】、【已关闭】、【转项目】)")
+    private String operationExplain;
+
+    @Excel(name = "删除标识 0未删除、1已删除")
+    private String delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueProjectRelationExcel.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueProjectRelationExcel.java
new file mode 100644
index 0000000000..620eee36c1
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueProjectRelationExcel.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.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 议题项目关系表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Data
+public class IssueProjectRelationExcel {
+
+    @Excel(name = "主键ID 主键ID")
+    private String id;
+
+    @Excel(name = "议题ID 议题ID")
+    private String issueId;
+
+    @Excel(name = "项目ID 项目ID")
+    private String projectId;
+
+    @Excel(name = "删除标识 0：未删除1：已删除")
+    private String delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间 议题转项目时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueSatisfactionDetailExcel.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueSatisfactionDetailExcel.java
new file mode 100644
index 0000000000..804d0bbacc
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueSatisfactionDetailExcel.java
@@ -0,0 +1,65 @@
+/**
+ * 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.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 议题满意度调查记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Data
+public class IssueSatisfactionDetailExcel {
+
+    @Excel(name = "主键ID")
+    private String id;
+
+    @Excel(name = "议题ID")
+    private String issueId;
+
+    @Excel(name = "评论 - 最多300字")
+    private String comment;
+
+    @Excel(name = "满意度 满意度 - 不满意:bad、基本满意:good、非常满意:perfect")
+    private String satisfaction;
+
+    @Excel(name = "删除标识 0未删除、1已删除")
+    private String delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueSatisfactionStatisticalExcel.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueSatisfactionStatisticalExcel.java
new file mode 100644
index 0000000000..be2b748413
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueSatisfactionStatisticalExcel.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.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 议题满意度调查统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Data
+public class IssueSatisfactionStatisticalExcel {
+
+    @Excel(name = "主键ID")
+    private String id;
+
+    @Excel(name = "议题ID")
+    private String issueId;
+
+    @Excel(name = "一般满意数")
+    private Integer goodCount;
+
+    @Excel(name = "非常满意数")
+    private Integer perfectCount;
+
+    @Excel(name = "不满意数")
+    private Integer badCount;
+
+    @Excel(name = "删除标识 0未删除、1已删除")
+    private String delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueVoteDetailExcel.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueVoteDetailExcel.java
new file mode 100644
index 0000000000..5ea0c106a3
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueVoteDetailExcel.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.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 议题表决记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Data
+public class IssueVoteDetailExcel {
+
+    @Excel(name = "主键ID")
+    private String id;
+
+    @Excel(name = "议题ID")
+    private String issueId;
+
+    @Excel(name = "态度 - opposition（反对）support（赞成）")
+    private String attitude;
+
+    @Excel(name = "删除标识 0未删除、1已删除")
+    private String delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueVoteStatisticalDailyExcel.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueVoteStatisticalDailyExcel.java
new file mode 100644
index 0000000000..deafe9f0b9
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueVoteStatisticalDailyExcel.java
@@ -0,0 +1,83 @@
+/**
+ * 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.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 议题表决按天统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Data
+public class IssueVoteStatisticalDailyExcel {
+
+    @Excel(name = "主键ID")
+    private String id;
+
+    @Excel(name = "议题ID")
+    private String issueId;
+
+    @Excel(name = "统计日期 yyyy-MM-dd")
+    private Date statisticalDate;
+
+    @Excel(name = "到该日的总赞成数")
+    private Integer supportCount;
+
+    @Excel(name = "到该日的总反对数")
+    private Integer oppositionCount;
+
+    @Excel(name = "到该日的总票数")
+    private Integer totalCount;
+
+    @Excel(name = "该日增量")
+    private Integer todayIncrement;
+
+    @Excel(name = "该日赞成增量")
+    private Integer supportIncrement;
+
+    @Excel(name = "该日反对增量")
+    private Integer oppositionIncrement;
+
+    @Excel(name = "到该日的应表决数")
+    private Integer votableCount;
+
+    @Excel(name = "删除标识 0未删除、1已删除")
+    private String delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueVoteStatisticalExcel.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueVoteStatisticalExcel.java
new file mode 100644
index 0000000000..ffa83424a8
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueVoteStatisticalExcel.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.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 议题表决统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Data
+public class IssueVoteStatisticalExcel {
+
+    @Excel(name = "主键ID")
+    private String id;
+
+    @Excel(name = "议题ID")
+    private String issueId;
+
+    @Excel(name = "支持数")
+    private Integer supportCount;
+
+    @Excel(name = "反对数")
+    private Integer oppositionCount;
+
+    @Excel(name = "应表决数")
+    private Integer votableCount;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "删除标识 0未删除、1已删除")
+    private String delFlag;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueCustomerParameterRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueCustomerParameterRedis.java
new file mode 100644
index 0000000000..1152ccab05
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueCustomerParameterRedis.java
@@ -0,0 +1,47 @@
+/**
+ * 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.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 议题客户参数定制表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Component
+public class IssueCustomerParameterRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProcessRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProcessRedis.java
new file mode 100644
index 0000000000..d550f5bf5e
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProcessRedis.java
@@ -0,0 +1,47 @@
+/**
+ * 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.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 议题进展记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Component
+public class IssueProcessRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectRelationRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectRelationRedis.java
new file mode 100644
index 0000000000..75ec7d9d0d
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectRelationRedis.java
@@ -0,0 +1,47 @@
+/**
+ * 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.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 议题项目关系表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Component
+public class IssueProjectRelationRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueRedis.java
new file mode 100644
index 0000000000..cfed63cb4d
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueRedis.java
@@ -0,0 +1,47 @@
+/**
+ * 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.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 议题详情表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Component
+public class IssueRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueSatisfactionDetailRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueSatisfactionDetailRedis.java
new file mode 100644
index 0000000000..706304b1ff
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueSatisfactionDetailRedis.java
@@ -0,0 +1,47 @@
+/**
+ * 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.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 议题满意度调查记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Component
+public class IssueSatisfactionDetailRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueSatisfactionStatisticalRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueSatisfactionStatisticalRedis.java
new file mode 100644
index 0000000000..6d5d8ec0dc
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueSatisfactionStatisticalRedis.java
@@ -0,0 +1,47 @@
+/**
+ * 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.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 议题满意度调查统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Component
+public class IssueSatisfactionStatisticalRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java
new file mode 100644
index 0000000000..89c8f04994
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java
@@ -0,0 +1,47 @@
+/**
+ * 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.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 议题表决记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Component
+public class IssueVoteDetailRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteStatisticalDailyRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteStatisticalDailyRedis.java
new file mode 100644
index 0000000000..852ff4a3e7
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteStatisticalDailyRedis.java
@@ -0,0 +1,47 @@
+/**
+ * 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.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 议题表决按天统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Component
+public class IssueVoteStatisticalDailyRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteStatisticalRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteStatisticalRedis.java
new file mode 100644
index 0000000000..c9c928f08f
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteStatisticalRedis.java
@@ -0,0 +1,47 @@
+/**
+ * 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.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 议题表决统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Component
+public class IssueVoteStatisticalRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueCustomerParameterService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueCustomerParameterService.java
new file mode 100644
index 0000000000..941d8efde9
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueCustomerParameterService.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;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.IssueCustomerParameterDTO;
+import com.epmet.entity.IssueCustomerParameterEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 议题客户参数定制表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+public interface IssueCustomerParameterService extends BaseService<IssueCustomerParameterEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<IssueCustomerParameterDTO>
+     * @author generator
+     * @date 2020-05-11
+     */
+    PageData<IssueCustomerParameterDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<IssueCustomerParameterDTO>
+     * @author generator
+     * @date 2020-05-11
+     */
+    List<IssueCustomerParameterDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return IssueCustomerParameterDTO
+     * @author generator
+     * @date 2020-05-11
+     */
+    IssueCustomerParameterDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void save(IssueCustomerParameterDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void update(IssueCustomerParameterDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProcessService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProcessService.java
new file mode 100644
index 0000000000..fa285655aa
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProcessService.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;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.IssueProcessDTO;
+import com.epmet.entity.IssueProcessEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 议题进展记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+public interface IssueProcessService extends BaseService<IssueProcessEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<IssueProcessDTO>
+     * @author generator
+     * @date 2020-05-11
+     */
+    PageData<IssueProcessDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<IssueProcessDTO>
+     * @author generator
+     * @date 2020-05-11
+     */
+    List<IssueProcessDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return IssueProcessDTO
+     * @author generator
+     * @date 2020-05-11
+     */
+    IssueProcessDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void save(IssueProcessDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void update(IssueProcessDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectRelationService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectRelationService.java
new file mode 100644
index 0000000000..1381151c65
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectRelationService.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;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.IssueProjectRelationDTO;
+import com.epmet.entity.IssueProjectRelationEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 议题项目关系表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+public interface IssueProjectRelationService extends BaseService<IssueProjectRelationEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<IssueProjectRelationDTO>
+     * @author generator
+     * @date 2020-05-11
+     */
+    PageData<IssueProjectRelationDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<IssueProjectRelationDTO>
+     * @author generator
+     * @date 2020-05-11
+     */
+    List<IssueProjectRelationDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return IssueProjectRelationDTO
+     * @author generator
+     * @date 2020-05-11
+     */
+    IssueProjectRelationDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void save(IssueProjectRelationDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void update(IssueProjectRelationDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueSatisfactionDetailService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueSatisfactionDetailService.java
new file mode 100644
index 0000000000..ab47a3797a
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueSatisfactionDetailService.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;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.IssueSatisfactionDetailDTO;
+import com.epmet.entity.IssueSatisfactionDetailEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 议题满意度调查记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+public interface IssueSatisfactionDetailService extends BaseService<IssueSatisfactionDetailEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<IssueSatisfactionDetailDTO>
+     * @author generator
+     * @date 2020-05-11
+     */
+    PageData<IssueSatisfactionDetailDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<IssueSatisfactionDetailDTO>
+     * @author generator
+     * @date 2020-05-11
+     */
+    List<IssueSatisfactionDetailDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return IssueSatisfactionDetailDTO
+     * @author generator
+     * @date 2020-05-11
+     */
+    IssueSatisfactionDetailDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void save(IssueSatisfactionDetailDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void update(IssueSatisfactionDetailDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueSatisfactionStatisticalService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueSatisfactionStatisticalService.java
new file mode 100644
index 0000000000..0d21c0cc99
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueSatisfactionStatisticalService.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;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.IssueSatisfactionStatisticalDTO;
+import com.epmet.entity.IssueSatisfactionStatisticalEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 议题满意度调查统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+public interface IssueSatisfactionStatisticalService extends BaseService<IssueSatisfactionStatisticalEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<IssueSatisfactionStatisticalDTO>
+     * @author generator
+     * @date 2020-05-11
+     */
+    PageData<IssueSatisfactionStatisticalDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<IssueSatisfactionStatisticalDTO>
+     * @author generator
+     * @date 2020-05-11
+     */
+    List<IssueSatisfactionStatisticalDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return IssueSatisfactionStatisticalDTO
+     * @author generator
+     * @date 2020-05-11
+     */
+    IssueSatisfactionStatisticalDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void save(IssueSatisfactionStatisticalDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void update(IssueSatisfactionStatisticalDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java
new file mode 100644
index 0000000000..7890e150fa
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java
@@ -0,0 +1,22 @@
+package com.epmet.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.dto.form.IssueDetailFormDTO;
+import com.epmet.dto.result.IssueResultDTO;
+import com.epmet.entity.IssueEntity;
+
+/**
+ * @Author zxc
+ * @CreateTime 2020/5/11 9:44
+ */
+public interface IssueService extends BaseService<IssueEntity> {
+
+    /**
+     * @Description  议题详情
+     * @param issueDetail
+     * @author zxc
+     * @date 2020/5/11 10:04
+     */
+    IssueResultDTO detail(IssueDetailFormDTO issueDetail);
+
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteDetailService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteDetailService.java
new file mode 100644
index 0000000000..36f3e0579c
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteDetailService.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;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.IssueVoteDetailDTO;
+import com.epmet.entity.IssueVoteDetailEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 议题表决记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+public interface IssueVoteDetailService extends BaseService<IssueVoteDetailEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<IssueVoteDetailDTO>
+     * @author generator
+     * @date 2020-05-11
+     */
+    PageData<IssueVoteDetailDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<IssueVoteDetailDTO>
+     * @author generator
+     * @date 2020-05-11
+     */
+    List<IssueVoteDetailDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return IssueVoteDetailDTO
+     * @author generator
+     * @date 2020-05-11
+     */
+    IssueVoteDetailDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void save(IssueVoteDetailDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void update(IssueVoteDetailDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteStatisticalDailyService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteStatisticalDailyService.java
new file mode 100644
index 0000000000..c40851887d
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteStatisticalDailyService.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;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.IssueVoteStatisticalDailyDTO;
+import com.epmet.entity.IssueVoteStatisticalDailyEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 议题表决按天统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+public interface IssueVoteStatisticalDailyService extends BaseService<IssueVoteStatisticalDailyEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<IssueVoteStatisticalDailyDTO>
+     * @author generator
+     * @date 2020-05-11
+     */
+    PageData<IssueVoteStatisticalDailyDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<IssueVoteStatisticalDailyDTO>
+     * @author generator
+     * @date 2020-05-11
+     */
+    List<IssueVoteStatisticalDailyDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return IssueVoteStatisticalDailyDTO
+     * @author generator
+     * @date 2020-05-11
+     */
+    IssueVoteStatisticalDailyDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void save(IssueVoteStatisticalDailyDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void update(IssueVoteStatisticalDailyDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java
new file mode 100644
index 0000000000..4d54243be0
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.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;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.IssueVoteStatisticalDTO;
+import com.epmet.entity.IssueVoteStatisticalEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 议题表决统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+public interface IssueVoteStatisticalService extends BaseService<IssueVoteStatisticalEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<IssueVoteStatisticalDTO>
+     * @author generator
+     * @date 2020-05-11
+     */
+    PageData<IssueVoteStatisticalDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<IssueVoteStatisticalDTO>
+     * @author generator
+     * @date 2020-05-11
+     */
+    List<IssueVoteStatisticalDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return IssueVoteStatisticalDTO
+     * @author generator
+     * @date 2020-05-11
+     */
+    IssueVoteStatisticalDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void save(IssueVoteStatisticalDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void update(IssueVoteStatisticalDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/.gitkeep b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCustomerParameterServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCustomerParameterServiceImpl.java
new file mode 100644
index 0000000000..1a751ab574
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCustomerParameterServiceImpl.java
@@ -0,0 +1,99 @@
+/**
+ * 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.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.IssueCustomerParameterDao;
+import com.epmet.dto.IssueCustomerParameterDTO;
+import com.epmet.entity.IssueCustomerParameterEntity;
+import com.epmet.service.IssueCustomerParameterService;
+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 2020-05-11
+ */
+@Service
+public class IssueCustomerParameterServiceImpl extends BaseServiceImpl<IssueCustomerParameterDao, IssueCustomerParameterEntity> implements IssueCustomerParameterService {
+
+    @Override
+    public PageData<IssueCustomerParameterDTO> page(Map<String, Object> params) {
+        IPage<IssueCustomerParameterEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, IssueCustomerParameterDTO.class);
+    }
+
+    @Override
+    public List<IssueCustomerParameterDTO> list(Map<String, Object> params) {
+        List<IssueCustomerParameterEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, IssueCustomerParameterDTO.class);
+    }
+
+    private QueryWrapper<IssueCustomerParameterEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<IssueCustomerParameterEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public IssueCustomerParameterDTO get(String id) {
+        IssueCustomerParameterEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, IssueCustomerParameterDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(IssueCustomerParameterDTO dto) {
+        IssueCustomerParameterEntity entity = ConvertUtils.sourceToTarget(dto, IssueCustomerParameterEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(IssueCustomerParameterDTO dto) {
+        IssueCustomerParameterEntity entity = ConvertUtils.sourceToTarget(dto, IssueCustomerParameterEntity.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/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java
new file mode 100644
index 0000000000..fad2ebfb01
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java
@@ -0,0 +1,104 @@
+/**
+ * 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.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.IssueProcessDao;
+import com.epmet.dto.IssueProcessDTO;
+import com.epmet.entity.IssueProcessEntity;
+import com.epmet.redis.IssueProcessRedis;
+import com.epmet.service.IssueProcessService;
+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 2020-05-11
+ */
+@Service
+public class IssueProcessServiceImpl extends BaseServiceImpl<IssueProcessDao, IssueProcessEntity> implements IssueProcessService {
+
+    @Autowired
+    private IssueProcessRedis issueProcessRedis;
+
+    @Override
+    public PageData<IssueProcessDTO> page(Map<String, Object> params) {
+        IPage<IssueProcessEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, IssueProcessDTO.class);
+    }
+
+    @Override
+    public List<IssueProcessDTO> list(Map<String, Object> params) {
+        List<IssueProcessEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, IssueProcessDTO.class);
+    }
+
+    private QueryWrapper<IssueProcessEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<IssueProcessEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public IssueProcessDTO get(String id) {
+        IssueProcessEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, IssueProcessDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(IssueProcessDTO dto) {
+        IssueProcessEntity entity = ConvertUtils.sourceToTarget(dto, IssueProcessEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(IssueProcessDTO dto) {
+        IssueProcessEntity entity = ConvertUtils.sourceToTarget(dto, IssueProcessEntity.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/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectRelationServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectRelationServiceImpl.java
new file mode 100644
index 0000000000..2b40a83079
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectRelationServiceImpl.java
@@ -0,0 +1,104 @@
+/**
+ * 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.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.IssueProjectRelationDao;
+import com.epmet.dto.IssueProjectRelationDTO;
+import com.epmet.entity.IssueProjectRelationEntity;
+import com.epmet.redis.IssueProjectRelationRedis;
+import com.epmet.service.IssueProjectRelationService;
+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 2020-05-11
+ */
+@Service
+public class IssueProjectRelationServiceImpl extends BaseServiceImpl<IssueProjectRelationDao, IssueProjectRelationEntity> implements IssueProjectRelationService {
+
+    @Autowired
+    private IssueProjectRelationRedis issueProjectRelationRedis;
+
+    @Override
+    public PageData<IssueProjectRelationDTO> page(Map<String, Object> params) {
+        IPage<IssueProjectRelationEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, IssueProjectRelationDTO.class);
+    }
+
+    @Override
+    public List<IssueProjectRelationDTO> list(Map<String, Object> params) {
+        List<IssueProjectRelationEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, IssueProjectRelationDTO.class);
+    }
+
+    private QueryWrapper<IssueProjectRelationEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<IssueProjectRelationEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public IssueProjectRelationDTO get(String id) {
+        IssueProjectRelationEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, IssueProjectRelationDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(IssueProjectRelationDTO dto) {
+        IssueProjectRelationEntity entity = ConvertUtils.sourceToTarget(dto, IssueProjectRelationEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(IssueProjectRelationDTO dto) {
+        IssueProjectRelationEntity entity = ConvertUtils.sourceToTarget(dto, IssueProjectRelationEntity.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/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java
new file mode 100644
index 0000000000..5662e355c4
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java
@@ -0,0 +1,104 @@
+/**
+ * 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.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.IssueSatisfactionDetailDao;
+import com.epmet.dto.IssueSatisfactionDetailDTO;
+import com.epmet.entity.IssueSatisfactionDetailEntity;
+import com.epmet.redis.IssueSatisfactionDetailRedis;
+import com.epmet.service.IssueSatisfactionDetailService;
+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 2020-05-11
+ */
+@Service
+public class IssueSatisfactionDetailServiceImpl extends BaseServiceImpl<IssueSatisfactionDetailDao, IssueSatisfactionDetailEntity> implements IssueSatisfactionDetailService {
+
+    @Autowired
+    private IssueSatisfactionDetailRedis issueSatisfactionDetailRedis;
+
+    @Override
+    public PageData<IssueSatisfactionDetailDTO> page(Map<String, Object> params) {
+        IPage<IssueSatisfactionDetailEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, IssueSatisfactionDetailDTO.class);
+    }
+
+    @Override
+    public List<IssueSatisfactionDetailDTO> list(Map<String, Object> params) {
+        List<IssueSatisfactionDetailEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, IssueSatisfactionDetailDTO.class);
+    }
+
+    private QueryWrapper<IssueSatisfactionDetailEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<IssueSatisfactionDetailEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public IssueSatisfactionDetailDTO get(String id) {
+        IssueSatisfactionDetailEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, IssueSatisfactionDetailDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(IssueSatisfactionDetailDTO dto) {
+        IssueSatisfactionDetailEntity entity = ConvertUtils.sourceToTarget(dto, IssueSatisfactionDetailEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(IssueSatisfactionDetailDTO dto) {
+        IssueSatisfactionDetailEntity entity = ConvertUtils.sourceToTarget(dto, IssueSatisfactionDetailEntity.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/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionStatisticalServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionStatisticalServiceImpl.java
new file mode 100644
index 0000000000..f912e4d4c9
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionStatisticalServiceImpl.java
@@ -0,0 +1,104 @@
+/**
+ * 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.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.IssueSatisfactionStatisticalDao;
+import com.epmet.dto.IssueSatisfactionStatisticalDTO;
+import com.epmet.entity.IssueSatisfactionStatisticalEntity;
+import com.epmet.redis.IssueSatisfactionStatisticalRedis;
+import com.epmet.service.IssueSatisfactionStatisticalService;
+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 2020-05-11
+ */
+@Service
+public class IssueSatisfactionStatisticalServiceImpl extends BaseServiceImpl<IssueSatisfactionStatisticalDao, IssueSatisfactionStatisticalEntity> implements IssueSatisfactionStatisticalService {
+
+    @Autowired
+    private IssueSatisfactionStatisticalRedis issueSatisfactionStatisticalRedis;
+
+    @Override
+    public PageData<IssueSatisfactionStatisticalDTO> page(Map<String, Object> params) {
+        IPage<IssueSatisfactionStatisticalEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, IssueSatisfactionStatisticalDTO.class);
+    }
+
+    @Override
+    public List<IssueSatisfactionStatisticalDTO> list(Map<String, Object> params) {
+        List<IssueSatisfactionStatisticalEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, IssueSatisfactionStatisticalDTO.class);
+    }
+
+    private QueryWrapper<IssueSatisfactionStatisticalEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<IssueSatisfactionStatisticalEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public IssueSatisfactionStatisticalDTO get(String id) {
+        IssueSatisfactionStatisticalEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, IssueSatisfactionStatisticalDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(IssueSatisfactionStatisticalDTO dto) {
+        IssueSatisfactionStatisticalEntity entity = ConvertUtils.sourceToTarget(dto, IssueSatisfactionStatisticalEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(IssueSatisfactionStatisticalDTO dto) {
+        IssueSatisfactionStatisticalEntity entity = ConvertUtils.sourceToTarget(dto, IssueSatisfactionStatisticalEntity.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/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
new file mode 100644
index 0000000000..327d135bd8
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
@@ -0,0 +1,34 @@
+package com.epmet.service.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.dao.IssueDao;
+import com.epmet.dto.form.IssueDetailFormDTO;
+import com.epmet.dto.result.IssueResultDTO;
+import com.epmet.entity.IssueEntity;
+import com.epmet.service.IssueService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author zxc
+ * @CreateTime 2020/5/11 9:46
+ */
+@Service
+public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> implements IssueService {
+
+    @Autowired
+    private IssueDao issueDao;
+
+    /**
+     * @Description  议题详情
+     * @param issueDetail
+     * @author zxc
+     * @date 2020/5/11 10:04
+     */
+    @Override
+    public IssueResultDTO detail(IssueDetailFormDTO issueDetail) {
+        //议题信息
+        IssueResultDTO issueResult = issueDao.issueDetail(issueDetail);
+        return issueResult;
+    }
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java
new file mode 100644
index 0000000000..e63133484c
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java
@@ -0,0 +1,104 @@
+/**
+ * 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.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.IssueVoteDetailDao;
+import com.epmet.dto.IssueVoteDetailDTO;
+import com.epmet.entity.IssueVoteDetailEntity;
+import com.epmet.redis.IssueVoteDetailRedis;
+import com.epmet.service.IssueVoteDetailService;
+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 2020-05-11
+ */
+@Service
+public class IssueVoteDetailServiceImpl extends BaseServiceImpl<IssueVoteDetailDao, IssueVoteDetailEntity> implements IssueVoteDetailService {
+
+    @Autowired
+    private IssueVoteDetailRedis issueVoteDetailRedis;
+
+    @Override
+    public PageData<IssueVoteDetailDTO> page(Map<String, Object> params) {
+        IPage<IssueVoteDetailEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, IssueVoteDetailDTO.class);
+    }
+
+    @Override
+    public List<IssueVoteDetailDTO> list(Map<String, Object> params) {
+        List<IssueVoteDetailEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, IssueVoteDetailDTO.class);
+    }
+
+    private QueryWrapper<IssueVoteDetailEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<IssueVoteDetailEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public IssueVoteDetailDTO get(String id) {
+        IssueVoteDetailEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, IssueVoteDetailDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(IssueVoteDetailDTO dto) {
+        IssueVoteDetailEntity entity = ConvertUtils.sourceToTarget(dto, IssueVoteDetailEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(IssueVoteDetailDTO dto) {
+        IssueVoteDetailEntity entity = ConvertUtils.sourceToTarget(dto, IssueVoteDetailEntity.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/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalDailyServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalDailyServiceImpl.java
new file mode 100644
index 0000000000..e356e2fa0a
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalDailyServiceImpl.java
@@ -0,0 +1,104 @@
+/**
+ * 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.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.IssueVoteStatisticalDailyDao;
+import com.epmet.dto.IssueVoteStatisticalDailyDTO;
+import com.epmet.entity.IssueVoteStatisticalDailyEntity;
+import com.epmet.redis.IssueVoteStatisticalDailyRedis;
+import com.epmet.service.IssueVoteStatisticalDailyService;
+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 2020-05-11
+ */
+@Service
+public class IssueVoteStatisticalDailyServiceImpl extends BaseServiceImpl<IssueVoteStatisticalDailyDao, IssueVoteStatisticalDailyEntity> implements IssueVoteStatisticalDailyService {
+
+    @Autowired
+    private IssueVoteStatisticalDailyRedis issueVoteStatisticalDailyRedis;
+
+    @Override
+    public PageData<IssueVoteStatisticalDailyDTO> page(Map<String, Object> params) {
+        IPage<IssueVoteStatisticalDailyEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, IssueVoteStatisticalDailyDTO.class);
+    }
+
+    @Override
+    public List<IssueVoteStatisticalDailyDTO> list(Map<String, Object> params) {
+        List<IssueVoteStatisticalDailyEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, IssueVoteStatisticalDailyDTO.class);
+    }
+
+    private QueryWrapper<IssueVoteStatisticalDailyEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<IssueVoteStatisticalDailyEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public IssueVoteStatisticalDailyDTO get(String id) {
+        IssueVoteStatisticalDailyEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, IssueVoteStatisticalDailyDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(IssueVoteStatisticalDailyDTO dto) {
+        IssueVoteStatisticalDailyEntity entity = ConvertUtils.sourceToTarget(dto, IssueVoteStatisticalDailyEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(IssueVoteStatisticalDailyDTO dto) {
+        IssueVoteStatisticalDailyEntity entity = ConvertUtils.sourceToTarget(dto, IssueVoteStatisticalDailyEntity.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/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
new file mode 100644
index 0000000000..bff7fd4f94
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
@@ -0,0 +1,104 @@
+/**
+ * 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.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.IssueVoteStatisticalDao;
+import com.epmet.dto.IssueVoteStatisticalDTO;
+import com.epmet.entity.IssueVoteStatisticalEntity;
+import com.epmet.redis.IssueVoteStatisticalRedis;
+import com.epmet.service.IssueVoteStatisticalService;
+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 2020-05-11
+ */
+@Service
+public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteStatisticalDao, IssueVoteStatisticalEntity> implements IssueVoteStatisticalService {
+
+    @Autowired
+    private IssueVoteStatisticalRedis issueVoteStatisticalRedis;
+
+    @Override
+    public PageData<IssueVoteStatisticalDTO> page(Map<String, Object> params) {
+        IPage<IssueVoteStatisticalEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, IssueVoteStatisticalDTO.class);
+    }
+
+    @Override
+    public List<IssueVoteStatisticalDTO> list(Map<String, Object> params) {
+        List<IssueVoteStatisticalEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, IssueVoteStatisticalDTO.class);
+    }
+
+    private QueryWrapper<IssueVoteStatisticalEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<IssueVoteStatisticalEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public IssueVoteStatisticalDTO get(String id) {
+        IssueVoteStatisticalEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, IssueVoteStatisticalDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(IssueVoteStatisticalDTO dto) {
+        IssueVoteStatisticalEntity entity = ConvertUtils.sourceToTarget(dto, IssueVoteStatisticalEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(IssueVoteStatisticalDTO dto) {
+        IssueVoteStatisticalEntity entity = ConvertUtils.sourceToTarget(dto, IssueVoteStatisticalEntity.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/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCustomerParameterDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCustomerParameterDao.xml
new file mode 100644
index 0000000000..d0934a775e
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCustomerParameterDao.xml
@@ -0,0 +1,22 @@
+<?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.IssueCustomerParameterDao">
+
+    <resultMap type="com.epmet.entity.IssueCustomerParameterEntity" id="issueCustomerParameterMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="parameterKey" column="PARAMETER_KEY"/>
+        <result property="parameterName" column="PARAMETER_NAME"/>
+        <result property="parameterValue" column="PARAMETER_VALUE"/>
+        <result property="description" column="DESCRIPTION"/>
+        <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/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml
new file mode 100644
index 0000000000..212d8066dd
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml
@@ -0,0 +1,46 @@
+<?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.IssueDao">
+
+    <resultMap type="com.epmet.entity.IssueEntity" id="issueMap">
+        <result property="id" column="ID"/>
+        <result property="issueStatus" column="ISSUE_STATUS"/>
+        <result property="sourceType" column="SOURCE_TYPE"/>
+        <result property="sourceId" column="SOURCE_ID"/>
+        <result property="closeReason" column="CLOSE_REASON"/>
+        <result property="resolveType" column="RESOLVE_TYPE"/>
+        <result property="issueTitle" column="ISSUE_TITLE"/>
+        <result property="suggestion" column="SUGGESTION"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="gridId" column="GRID_ID"/>
+        <result property="orgIdPath" column="ORG_ID_PATH"/>
+        <result property="orgId" column="ORG_ID"/>
+        <result property="votingDeadline" column="VOTING_DEADLINE"/>
+        <result property="decidedTime" column="DECIDED_TIME"/>
+        <result property="shiftedTime" column="SHIFTED_TIME"/>
+        <result property="closedTime" column="CLOSED_TIME"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+    <!-- 议题详情 -->
+    <select id="issueDetail" parameterType="com.epmet.dto.form.IssueDetailFormDTO" resultType="com.epmet.dto.result.IssueResultDTO">
+        SELECT
+            issue_title AS issueTitle,
+            issue_status AS issueStatus,
+            suggestion AS issueSuggestion,
+            grid_id AS belongsGridName,
+            created_by AS issueInitiator
+        FROM
+            issue
+        WHERE
+            id = #{IssueId}
+            AND del_flag = 0
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProcessDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProcessDao.xml
new file mode 100644
index 0000000000..81b04ec584
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProcessDao.xml
@@ -0,0 +1,22 @@
+<?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.IssueProcessDao">
+
+    <resultMap type="com.epmet.entity.IssueProcessEntity" id="issueProcessMap">
+        <result property="id" column="ID"/>
+        <result property="issueId" column="ISSUE_ID"/>
+        <result property="issueStatus" column="ISSUE_STATUS"/>
+        <result property="orgType" column="ORG_TYPE"/>
+        <result property="orgId" column="ORG_ID"/>
+        <result property="operationExplain" column="OPERATION_EXPLAIN"/>
+        <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/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectRelationDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectRelationDao.xml
new file mode 100644
index 0000000000..d7188c1811
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectRelationDao.xml
@@ -0,0 +1,19 @@
+<?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.IssueProjectRelationDao">
+
+    <resultMap type="com.epmet.entity.IssueProjectRelationEntity" id="issueProjectRelationMap">
+        <result property="id" column="ID"/>
+        <result property="issueId" column="ISSUE_ID"/>
+        <result property="projectId" column="PROJECT_ID"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueSatisfactionDetailDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueSatisfactionDetailDao.xml
new file mode 100644
index 0000000000..86f0a14d13
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueSatisfactionDetailDao.xml
@@ -0,0 +1,20 @@
+<?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.IssueSatisfactionDetailDao">
+
+    <resultMap type="com.epmet.entity.IssueSatisfactionDetailEntity" id="issueSatisfactionDetailMap">
+        <result property="id" column="ID"/>
+        <result property="issueId" column="ISSUE_ID"/>
+        <result property="comment" column="COMMENT"/>
+        <result property="satisfaction" column="SATISFACTION"/>
+        <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/gov-issue/gov-issue-server/src/main/resources/mapper/IssueSatisfactionStatisticalDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueSatisfactionStatisticalDao.xml
new file mode 100644
index 0000000000..ccc9f115c6
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueSatisfactionStatisticalDao.xml
@@ -0,0 +1,21 @@
+<?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.IssueSatisfactionStatisticalDao">
+
+    <resultMap type="com.epmet.entity.IssueSatisfactionStatisticalEntity" id="issueSatisfactionStatisticalMap">
+        <result property="id" column="ID"/>
+        <result property="issueId" column="ISSUE_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>
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteDetailDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteDetailDao.xml
new file mode 100644
index 0000000000..93a382ef60
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteDetailDao.xml
@@ -0,0 +1,19 @@
+<?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.IssueVoteDetailDao">
+
+    <resultMap type="com.epmet.entity.IssueVoteDetailEntity" id="issueVoteDetailMap">
+        <result property="id" column="ID"/>
+        <result property="issueId" column="ISSUE_ID"/>
+        <result property="attitude" column="ATTITUDE"/>
+        <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/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDailyDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDailyDao.xml
new file mode 100644
index 0000000000..fc9b69d379
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDailyDao.xml
@@ -0,0 +1,26 @@
+<?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.IssueVoteStatisticalDailyDao">
+
+    <resultMap type="com.epmet.entity.IssueVoteStatisticalDailyEntity" id="issueVoteStatisticalDailyMap">
+        <result property="id" column="ID"/>
+        <result property="issueId" column="ISSUE_ID"/>
+        <result property="statisticalDate" column="STATISTICAL_DATE"/>
+        <result property="supportCount" column="SUPPORT_COUNT"/>
+        <result property="oppositionCount" column="OPPOSITION_COUNT"/>
+        <result property="totalCount" column="TOTAL_COUNT"/>
+        <result property="todayIncrement" column="TODAY_INCREMENT"/>
+        <result property="supportIncrement" column="SUPPORT_INCREMENT"/>
+        <result property="oppositionIncrement" column="OPPOSITION_INCREMENT"/>
+        <result property="votableCount" column="VOTABLE_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>
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml
new file mode 100644
index 0000000000..d34f9eb2ae
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml
@@ -0,0 +1,21 @@
+<?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.IssueVoteStatisticalDao">
+
+    <resultMap type="com.epmet.entity.IssueVoteStatisticalEntity" id="issueVoteStatisticalMap">
+        <result property="id" column="ID"/>
+        <result property="issueId" column="ISSUE_ID"/>
+        <result property="supportCount" column="SUPPORT_COUNT"/>
+        <result property="oppositionCount" column="OPPOSITION_COUNT"/>
+        <result property="votableCount" column="VOTABLE_COUNT"/>
+        <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

From 5c2746e53f88e85b9341c071a32ffec33680e0d6 Mon Sep 17 00:00:00 2001
From: zxc <954985706@qq.com>
Date: Tue, 12 May 2020 09:35:09 +0800
Subject: [PATCH 17/45] =?UTF-8?q?=E8=A1=A5=E6=BC=8FDTO?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/IssueCustomerParameterDTO.java  |  96 ++++++++++++
 .../src/main/java/com/epmet/dto/IssueDTO.java | 146 ++++++++++++++++++
 .../java/com/epmet/dto/IssueProcessDTO.java   |  96 ++++++++++++
 .../epmet/dto/IssueProjectRelationDTO.java    |  81 ++++++++++
 .../epmet/dto/IssueSatisfactionDetailDTO.java |  86 +++++++++++
 .../dto/IssueSatisfactionStatisticalDTO.java  |  91 +++++++++++
 .../com/epmet/dto/IssueVoteDetailDTO.java     |  81 ++++++++++
 .../epmet/dto/IssueVoteStatisticalDTO.java    |  91 +++++++++++
 .../dto/IssueVoteStatisticalDailyDTO.java     | 116 ++++++++++++++
 9 files changed, 884 insertions(+)
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueCustomerParameterDTO.java
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueDTO.java
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProcessDTO.java
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProjectRelationDTO.java
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueSatisfactionDetailDTO.java
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueSatisfactionStatisticalDTO.java
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueVoteDetailDTO.java
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueVoteStatisticalDTO.java
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueVoteStatisticalDailyDTO.java

diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueCustomerParameterDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueCustomerParameterDTO.java
new file mode 100644
index 0000000000..1d713b3b12
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueCustomerParameterDTO.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.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 议题客户参数定制表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-12
+ */
+@Data
+public class IssueCustomerParameterDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 参数键 eg:voting_time_limit
+     */
+	private String parameterKey;
+
+    /**
+     * 参数名 eg:表决期限
+     */
+	private String parameterName;
+
+    /**
+     * 参数值 eg:10（天）
+     */
+	private String parameterValue;
+
+    /**
+     * 参数说明 eg:这个客户下所有的网格议题表决期限都是10天
+     */
+	private String description;
+
+    /**
+     * 删除标志 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/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueDTO.java
new file mode 100644
index 0000000000..fe12ca4a76
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueDTO.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;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 议题详情表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-12
+ */
+@Data
+public class IssueDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 议题ID
+     */
+	private String id;
+
+    /**
+     * 议题状态 表决中：voting 已转项目：shift_project 已关闭：closed
+     */
+	private String issueStatus;
+
+    /**
+     * 来源类型 eg:resi_topic
+     */
+	private String sourceType;
+
+    /**
+     * 来源ID eg:2223232(当SOURCE_TYPE为"resi_topic"时，这里指话题的ID)
+     */
+	private String sourceId;
+
+    /**
+     * 关闭理由 【未关闭时可以为空】关闭议题时必填的理由，转项目后而且已经结案，这个字段不回写
+     */
+	private String closeReason;
+
+    /**
+     * 解决类型 【未关闭时可以为空】已解决resloved、未解决unresloved，对应在关闭议题时所选的checkbox，转项目后而且已经结案，这个字段不回写
+     */
+	private String resolveType;
+
+    /**
+     * 议题名称 最多20字
+     */
+	private String issueTitle;
+
+    /**
+     * 建议 最多1000字
+     */
+	private String suggestion;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 网格ID 居民端议题对应一个网格Id
+     */
+	private String gridId;
+
+    /**
+     * 所属机关 【数据权限-非必填】11:22:33(agencyId)数据权限控制
+     */
+	private String orgIdPath;
+
+    /**
+     * 组织ID 【数据权限-非必填】agencyId
+     */
+	private String orgId;
+
+    /**
+     * 表决截止日期
+     */
+	private Date votingDeadline;
+
+    /**
+     * 表决发起日期（转议题日期）
+     */
+	private Date decidedTime;
+
+    /**
+     * 转项目日期 （服务间调用日期一致性）
+     */
+	private Date shiftedTime;
+
+    /**
+     * 关闭日期
+     */
+	private Date closedTime;
+
+    /**
+     * 删除标识 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/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProcessDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProcessDTO.java
new file mode 100644
index 0000000000..20f2992fda
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProcessDTO.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.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 议题进展记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-12
+ */
+@Data
+public class IssueProcessDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+	private String id;
+
+    /**
+     * 议题ID
+     */
+	private String issueId;
+
+    /**
+     * 操作状态 - 表决中：voting 已转项目：shift_project 已关闭：closed
+     */
+	private String issueStatus;
+
+    /**
+     * 组织类型 操作人所属机构类型（机构：agency | 部门：dept | 网格：grid）操作人可能来源于居民端和政府段，但是只有在“转议题”的时候才是居民端拥有组长权限的人操作，所以当这条记录是转议题时，该记录为grid，ORD_ID相应的也为GRID_ID
+     */
+	private String orgType;
+
+    /**
+     * 组织ID 操作人所属机构ID（对应的有网格ID、部门ID、机构ID）
+     */
+	private String orgId;
+
+    /**
+     * 操作说明 (节点的说明文案，包含三个节点的文案说明【转议题】、【已关闭】、【转项目】)
+     */
+	private String operationExplain;
+
+    /**
+     * 删除标识 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/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProjectRelationDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProjectRelationDTO.java
new file mode 100644
index 0000000000..dc58cbb60c
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProjectRelationDTO.java
@@ -0,0 +1,81 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 议题项目关系表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-12
+ */
+@Data
+public class IssueProjectRelationDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID 主键ID
+     */
+	private String id;
+
+    /**
+     * 议题ID 议题ID
+     */
+	private String issueId;
+
+    /**
+     * 项目ID 项目ID
+     */
+	private String projectId;
+
+    /**
+     * 删除标识 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/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueSatisfactionDetailDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueSatisfactionDetailDTO.java
new file mode 100644
index 0000000000..ddf04a4ece
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueSatisfactionDetailDTO.java
@@ -0,0 +1,86 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 议题满意度调查记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-12
+ */
+@Data
+public class IssueSatisfactionDetailDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+	private String id;
+
+    /**
+     * 议题ID
+     */
+	private String issueId;
+
+    /**
+     * 评论 - 最多300字
+     */
+	private String comment;
+
+    /**
+     * 满意度 满意度 - 不满意:bad、基本满意:good、非常满意:perfect
+     */
+	private String satisfaction;
+
+    /**
+     * 删除标识 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/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueSatisfactionStatisticalDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueSatisfactionStatisticalDTO.java
new file mode 100644
index 0000000000..935feef5cd
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueSatisfactionStatisticalDTO.java
@@ -0,0 +1,91 @@
+/**
+ * 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 2020-05-12
+ */
+@Data
+public class IssueSatisfactionStatisticalDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+	private String id;
+
+    /**
+     * 议题ID
+     */
+	private String issueId;
+
+    /**
+     * 一般满意数
+     */
+	private Integer goodCount;
+
+    /**
+     * 非常满意数
+     */
+	private Integer perfectCount;
+
+    /**
+     * 不满意数
+     */
+	private Integer badCount;
+
+    /**
+     * 删除标识 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/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueVoteDetailDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueVoteDetailDTO.java
new file mode 100644
index 0000000000..777f2dfbbc
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueVoteDetailDTO.java
@@ -0,0 +1,81 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 议题表决记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-12
+ */
+@Data
+public class IssueVoteDetailDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+	private String id;
+
+    /**
+     * 议题ID
+     */
+	private String issueId;
+
+    /**
+     * 态度 - opposition（反对）support（赞成）
+     */
+	private String attitude;
+
+    /**
+     * 删除标识 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/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueVoteStatisticalDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueVoteStatisticalDTO.java
new file mode 100644
index 0000000000..3c25a4dcd5
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueVoteStatisticalDTO.java
@@ -0,0 +1,91 @@
+/**
+ * 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 2020-05-12
+ */
+@Data
+public class IssueVoteStatisticalDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+	private String id;
+
+    /**
+     * 议题ID
+     */
+	private String issueId;
+
+    /**
+     * 支持数
+     */
+	private Integer supportCount;
+
+    /**
+     * 反对数
+     */
+	private Integer oppositionCount;
+
+    /**
+     * 应表决数
+     */
+	private Integer votableCount;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 删除标识 0未删除、1已删除
+     */
+	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/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueVoteStatisticalDailyDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueVoteStatisticalDailyDTO.java
new file mode 100644
index 0000000000..1434cef2db
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueVoteStatisticalDailyDTO.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.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 议题表决按天统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-12
+ */
+@Data
+public class IssueVoteStatisticalDailyDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+	private String id;
+
+    /**
+     * 议题ID
+     */
+	private String issueId;
+
+    /**
+     * 统计日期 yyyy-MM-dd
+     */
+	private Date statisticalDate;
+
+    /**
+     * 到该日的总赞成数
+     */
+	private Integer supportCount;
+
+    /**
+     * 到该日的总反对数
+     */
+	private Integer oppositionCount;
+
+    /**
+     * 到该日的总票数
+     */
+	private Integer totalCount;
+
+    /**
+     * 该日增量
+     */
+	private Integer todayIncrement;
+
+    /**
+     * 该日赞成增量
+     */
+	private Integer supportIncrement;
+
+    /**
+     * 该日反对增量
+     */
+	private Integer oppositionIncrement;
+
+    /**
+     * 到该日的应表决数
+     */
+	private Integer votableCount;
+
+    /**
+     * 删除标识 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

From 5313b95651ec9dfcd4d34e4d751fe23a117bdfdb Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Tue, 12 May 2020 09:50:24 +0800
Subject: [PATCH 18/45] =?UTF-8?q?=E9=A1=B9=E7=9B=AEDB=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/db.migration/epmet_gov_project.sql | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db.migration/epmet_gov_project.sql b/epmet-module/gov-project/gov-project-server/src/main/resources/db.migration/epmet_gov_project.sql
index f6a22b3126..f87285eecd 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/db.migration/epmet_gov_project.sql
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/db.migration/epmet_gov_project.sql
@@ -141,4 +141,10 @@ CREATE TABLE `project_staff`  (
 
 SET FOREIGN_KEY_CHECKS = 1;
 
-alter table project_staff add column PROCESS_ID varchar(64) NOT NULL COMMENT '处理进展ID';
\ No newline at end of file
+alter table project_staff add column PROCESS_ID varchar(64) NOT NULL COMMENT '处理进展ID';
+
+alter table project_process add column OPERATION_NAME varchar(200) NOT NULL COMMENT  '处理名称' after OPERATION;
+
+alter table project_staff add column DEPARTMENT_NAME varchar(200) NOT NULL COMMENT '处理部门' after STAFF_ID;
+
+alter table project_process add column DEPARTMENT_NAME varchar(200) NOT NULL COMMENT '处理部门' after PROJECT_ID;

From be05d5aad5d7c60104eb6392c82b84884ffddc8e Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Tue, 12 May 2020 09:59:30 +0800
Subject: [PATCH 19/45] =?UTF-8?q?=E9=A1=B9=E7=9B=AEDB=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/ProjectProcessDTO.java | 97 +++++++++++--------
 .../java/com/epmet/dto/ProjectStaffDTO.java   |  5 +
 .../epmet/entity/ProjectProcessEntity.java    | 10 ++
 .../com/epmet/entity/ProjectStaffEntity.java  |  5 +
 .../com/epmet/excel/ProjectProcessExcel.java  |  6 ++
 .../com/epmet/excel/ProjectStaffExcel.java    |  3 +
 6 files changed, 83 insertions(+), 43 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectProcessDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectProcessDTO.java
index 6c42eb1dd5..4a0e30f907 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectProcessDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectProcessDTO.java
@@ -19,6 +19,7 @@ package com.epmet.dto;
 
 import java.io.Serializable;
 import java.util.Date;
+
 import lombok.Data;
 
 
@@ -31,76 +32,86 @@ import lombok.Data;
 @Data
 public class ProjectProcessDTO implements Serializable {
 
-    private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 1L;
 
-    /**
-     * 唯一标识
-     */
+	/**
+	 * 唯一标识
+	 */
 	private String id;
 
-    /**
-     * 项目ID
-     */
+	/**
+	 * 项目ID
+	 */
 	private String projectId;
 
-    /**
-     * 负负责人ID
-     */
+	/**
+	 * 部门名
+	 */
+	private String departmentName;
+
+	/**
+	 * 负负责人ID
+	 */
 	private String staffId;
 
-    /**
-     * 处理：结案close，退回return，部门流转transfer，创建项目created
-     */
+	/**
+	 * 处理：结案close，退回return，部门流转transfer，创建项目created
+	 */
 	private String operation;
 
-    /**
-     * 公开答复
-     */
+	/**
+	 * 处理名
+	 */
+	private String operationName;
+
+	/**
+	 * 公开答复
+	 */
 	private String publicReply;
 
-    /**
-     * 内部备注
-     */
+	/**
+	 * 内部备注
+	 */
 	private String internalRemark;
 
-    /**
-     * 结束时间
-     */
+	/**
+	 * 结束时间
+	 */
 	private Date endTime;
 
-    /**
-     * 耗费天数
-     */
+	/**
+	 * 耗费天数
+	 */
 	private String costWorkdays;
 
-    /**
-     * 删除标识：0.未删除 1.已删除
-     */
+	/**
+	 * 删除标识：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/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectStaffDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectStaffDTO.java
index 9072cfbb3d..ea0ef88350 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectStaffDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectStaffDTO.java
@@ -78,6 +78,11 @@ public class ProjectStaffDTO implements Serializable {
      */
 	private String staffId;
 
+	/**
+	 * 部门名
+	 */
+	private String departmentName;
+
     /**
      * 是否处理：未处理unhandle，已处理handle
      */
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java
index 68f06bb6eb..0890e5dec8 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java
@@ -48,6 +48,11 @@ public class ProjectProcessEntity extends BaseEpmetEntity {
 	 */
 	private String processId;
 
+	/**
+	 * 部门名
+	 */
+	private String departmentName;
+
     /**
      * 负负责人ID
      */
@@ -58,6 +63,11 @@ public class ProjectProcessEntity extends BaseEpmetEntity {
      */
 	private String operation;
 
+	/**
+	 * 处理名
+	 */
+	private String operationName;
+
     /**
      * 公开答复
      */
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectStaffEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectStaffEntity.java
index a971380628..dc8e798090 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectStaffEntity.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectStaffEntity.java
@@ -73,6 +73,11 @@ public class ProjectStaffEntity extends BaseEpmetEntity {
      */
 	private String staffId;
 
+	/**
+	 * 部门名
+	 */
+	private String departmentName;
+
     /**
      * 是否处理：未处理unhandle，已处理handle
      */
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectProcessExcel.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectProcessExcel.java
index a60f113441..263745f2bf 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectProcessExcel.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectProcessExcel.java
@@ -37,12 +37,18 @@ public class ProjectProcessExcel {
     @Excel(name = "项目ID")
     private String projectId;
 
+    @Excel(name = "部门名")
+    private String departmentName;
+
     @Excel(name = "负负责人ID")
     private String staffId;
 
     @Excel(name = "处理：结案close，退回return，部门流转transfer，创建项目created")
     private String operation;
 
+    @Excel(name = "处理名")
+    private String operationName;
+
     @Excel(name = "公开答复")
     private String publicReply;
 
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectStaffExcel.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectStaffExcel.java
index bfa228dd25..d9e54ca24b 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectStaffExcel.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectStaffExcel.java
@@ -58,6 +58,9 @@ public class ProjectStaffExcel {
     @Excel(name = "人员ID")
     private String staffId;
 
+    @Excel(name = "部门名")
+    private String departmentName;
+
     @Excel(name = "是否处理：未处理unhandle，已处理handle")
     private String isHandle;
 

From 13931105a200be657bcc7bebbfc8c182b9cbb8d5 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 12 May 2020 10:19:04 +0800
Subject: [PATCH 20/45] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=B7=BB=E5=8A=A0feign=E8=B0=83=E7=94=A8?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/constant/IssueConstant.java  | 17 +++++++++++++++++
 .../java/com/epmet/feign/GovOrgFeignClient.java | 14 ++++++++++++++
 .../com/epmet/feign/MessageFeignClient.java     | 14 ++++++++++++++
 .../com/epmet/feign/ResiGroupFeignClient.java   | 14 ++++++++++++++
 .../fallback/GovOrgFeignClientFallBack.java     | 12 ++++++++++++
 .../fallback/MessageFeignClientFallback.java    | 15 +++++++++++++++
 .../fallback/ResiGroupFeignClientFallBack.java  | 12 ++++++++++++
 7 files changed, 98 insertions(+)
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/MessageFeignClient.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/MessageFeignClientFallback.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java
new file mode 100644
index 0000000000..f8c36c2cac
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.epmet.constant;
+
+/**
+ * 常量
+ * @author sun
+ * @since 1.0.0
+ */
+public interface IssueConstant {
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
new file mode 100644
index 0000000000..b8f7090437
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
@@ -0,0 +1,14 @@
+package com.epmet.feign;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.feign.fallback.GovOrgFeignClientFallBack;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * @Description 调用gov-org服务
+ * @Author sun
+ * , url = "localhost:8092"
+ */
+@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class)
+public interface GovOrgFeignClient {
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/MessageFeignClient.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/MessageFeignClient.java
new file mode 100644
index 0000000000..0f61ebfa6b
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/MessageFeignClient.java
@@ -0,0 +1,14 @@
+package com.epmet.feign;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.feign.fallback.MessageFeignClientFallback;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * @Description 调用epmet-message服务
+ * @Author sun
+ * , url = "localhost:8085"
+ */
+@FeignClient(name = ServiceConstant.EPMET_MESSAGE_SERVER, fallback = MessageFeignClientFallback.class)
+public interface MessageFeignClient {
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java
new file mode 100644
index 0000000000..f47fd95a21
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java
@@ -0,0 +1,14 @@
+package com.epmet.feign;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.feign.fallback.ResiGroupFeignClientFallBack;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * @Description 调用resi-group服务
+ * @Author sun
+ * , url = "localhost:8095"
+ */
+@FeignClient(name = ServiceConstant.RESI_GROUP_SERVER, fallback = ResiGroupFeignClientFallBack.class)
+public interface ResiGroupFeignClient {
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
new file mode 100644
index 0000000000..5205700ec6
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
@@ -0,0 +1,12 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.feign.GovOrgFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description 调用gov-org服务
+ * @Author sun
+ */
+@Component
+public class GovOrgFeignClientFallBack implements GovOrgFeignClient {
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/MessageFeignClientFallback.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/MessageFeignClientFallback.java
new file mode 100644
index 0000000000..ebd50f1adc
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/MessageFeignClientFallback.java
@@ -0,0 +1,15 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.feign.MessageFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description 调用epmet-message服务
+ * @Author sun
+ */
+@Component
+public class MessageFeignClientFallback implements MessageFeignClient {
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java
new file mode 100644
index 0000000000..dfb34c250d
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java
@@ -0,0 +1,12 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.feign.ResiGroupFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description 调用resi-group服务
+ * @Author sun
+ */
+@Component
+public class ResiGroupFeignClientFallBack implements ResiGroupFeignClient {
+}

From 5982491b02625d87ed7a1904eeb820c7cc070e48 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Tue, 12 May 2020 10:27:25 +0800
Subject: [PATCH 21/45] =?UTF-8?q?issue=5Fprocess=E8=A1=A8=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E7=BB=84=E7=BB=87=E5=90=8D=E5=AD=97sql=EF=BC=8C?=
 =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=EF=BC=8Cmapper=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=EF=BC=8C=E6=B3=A8=E9=87=8AdemoController=E7=9A=84=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/IssueProcessDTO.java   |  5 +++
 .../main/java/com/epmet/dto/TopicInfoDTO.java | 43 +++++++++++++++++++
 .../controller/GovIssueDemoController.java    |  4 +-
 .../controller/ResiHallDemoController.java    |  4 +-
 .../com/epmet/entity/IssueProcessEntity.java  |  5 +++
 .../com/epmet/excel/IssueProcessExcel.java    | 11 +++--
 .../db.migration/epmet_gov_issue.sql          |  7 +++
 .../main/resources/mapper/IssueProcessDao.xml |  1 +
 8 files changed, 72 insertions(+), 8 deletions(-)
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/TopicInfoDTO.java

diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProcessDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProcessDTO.java
index 20f2992fda..a0eeb2df09 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProcessDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProcessDTO.java
@@ -63,6 +63,11 @@ public class IssueProcessDTO implements Serializable {
      */
 	private String operationExplain;
 
+	/**
+     * 组织名称
+     * */
+	private String orgName;
+
     /**
      * 删除标识 0未删除、1已删除
      */
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/TopicInfoDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/TopicInfoDTO.java
new file mode 100644
index 0000000000..6dcf993139
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/TopicInfoDTO.java
@@ -0,0 +1,43 @@
+package com.epmet.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * 话题详情(议题详情中的)
+ * @CreateTime 2020/5/11 9:36
+ */
+@Data
+public class TopicInfoDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 话题id
+     */
+    private String topicId;
+
+    /**
+     * 话题内容
+     */
+    private String topicContent;
+
+    /**
+     * 图片列表
+     */
+    private List<String> topicImgs;
+
+    /**
+     * 话题发表人（山东路168-尹女士）
+     */
+    private String publishedUser;
+
+    /**
+     * 话题发表时间 (时间戳 毫秒级)
+     */
+    private Long publishedTime;
+
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/GovIssueDemoController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/GovIssueDemoController.java
index 219426566f..174ac7a057 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/GovIssueDemoController.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/GovIssueDemoController.java
@@ -17,11 +17,11 @@ import org.springframework.web.bind.annotation.*;
 public class GovIssueDemoController {
     private static final Logger logger = LoggerFactory.getLogger(GovIssueDemoController.class);
 
-    @PostMapping("test")
+ /*   @PostMapping("test")
     public Result test(@RequestBody DemoTestFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
         logger.info(String.format("请求成功客户id[%s],网格id[%s]",formDTO.getCustomerId(),formDTO.getGridId()));
         return new Result().ok("gov-issue-server请求成功");
-    }
+    }*/
 }
 
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/ResiHallDemoController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/ResiHallDemoController.java
index 56c01421a7..6f8021d0df 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/ResiHallDemoController.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/ResiHallDemoController.java
@@ -17,11 +17,11 @@ import org.springframework.web.bind.annotation.*;
 public class ResiHallDemoController {
     private static final Logger logger = LoggerFactory.getLogger(ResiHallDemoController.class);
 
-    @PostMapping("test")
+   /* @PostMapping("test")
     public Result test(@RequestBody DemoTestFormDTO formDTO) {
         logger.info(String.format("请求成功客户id[%s],网格id[%s]",formDTO.getCustomerId(),formDTO.getGridId()));
         ValidatorUtils.validateEntity(formDTO);
         return new Result().ok("resi-hall-server请求成功");
-    }
+    }*/
 }
 
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProcessEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProcessEntity.java
index 701a3c6c61..3dceb5a1e3 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProcessEntity.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProcessEntity.java
@@ -63,4 +63,9 @@ public class IssueProcessEntity extends BaseEpmetEntity {
      */
 	private String operationExplain;
 
+	/**
+	 * 组织名称
+	 * */
+	private String orgName;
+
 }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueProcessExcel.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueProcessExcel.java
index 587e28e8c2..0873d88c68 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueProcessExcel.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueProcessExcel.java
@@ -37,19 +37,22 @@ public class IssueProcessExcel {
     @Excel(name = "议题ID")
     private String issueId;
 
-    @Excel(name = "操作状态 - 表决中：voting 已转项目：shift_project 已关闭：closed")
+    @Excel(name = "操作状态")
     private String issueStatus;
 
-    @Excel(name = "组织类型 操作人所属机构类型（机构：agency | 部门：dept | 网格：grid）操作人可能来源于居民端和政府段，但是只有在“转议题”的时候才是居民端拥有组长权限的人操作，所以当这条记录是转议题时，该记录为grid，ORD_ID相应的也为GRID_ID")
+    @Excel(name = "组织类型 ")
     private String orgType;
 
     @Excel(name = "组织ID 操作人所属机构ID（对应的有网格ID、部门ID、机构ID）")
     private String orgId;
 
-    @Excel(name = "操作说明 (节点的说明文案，包含三个节点的文案说明【转议题】、【已关闭】、【转项目】)")
+    @Excel(name = "部门名称")
+    private String orgName;
+
+    @Excel(name = "操作说明 ")
     private String operationExplain;
 
-    @Excel(name = "删除标识 0未删除、1已删除")
+    @Excel(name = "删除标识")
     private String delFlag;
 
     @Excel(name = "乐观锁")
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/db.migration/epmet_gov_issue.sql b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db.migration/epmet_gov_issue.sql
index c9eb447029..85fc5c249e 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/db.migration/epmet_gov_issue.sql
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db.migration/epmet_gov_issue.sql
@@ -206,4 +206,11 @@ CREATE TABLE `issue_vote_statistical_daily`  (
 
 SET FOREIGN_KEY_CHECKS = 1;
 
+-- @Date        2020-05-12 10:00
+-- @Author      wangc
+-- @Description 数据库epmet_gov_issue中的ISSUE_PROCESS(议题进展表)表新增一个字段，db语句：
+ALTER TABLE ISSUE_PROCESS ADD (
+  ORG_NAME varchar(128) NOT NULL COMMENT '议题当前处理进度所在的部门名称，因为有存储Id，无需担心部门之后有修改名称的可能'
+  );
+
 
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProcessDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProcessDao.xml
index 81b04ec584..baadaa6e9e 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProcessDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProcessDao.xml
@@ -9,6 +9,7 @@
         <result property="issueStatus" column="ISSUE_STATUS"/>
         <result property="orgType" column="ORG_TYPE"/>
         <result property="orgId" column="ORG_ID"/>
+        <result property="orgName" column="ORG_NAME"/>
         <result property="operationExplain" column="OPERATION_EXPLAIN"/>
         <result property="delFlag" column="DEL_FLAG"/>
         <result property="revision" column="REVISION"/>

From f079a9ae773b327ff8fbd76fdd101bf709147303 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 12 May 2020 10:30:49 +0800
Subject: [PATCH 22/45] =?UTF-8?q?=E6=96=B0=E5=A2=9Eepmet-common-service?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-gateway/pom.xml                         |   7 +
 .../src/main/resources/bootstrap.yml          |   8 +
 .../common-service-client/pom.xml             |  35 +++
 .../main/java/com/epmet/dto/CalenderDTO.java  | 131 ++++++++++++
 .../com/epmet/dto/form/WorkDayFormDTO.java    |  31 +++
 .../epmet/dto/result/WorkDayResultDTO.java    |  37 ++++
 .../common-service-server/Dockerfile          |  11 +
 .../common-service-server/docker-compose.yml  |  15 ++
 .../common-service-server/pom.xml             | 148 +++++++++++++
 .../epmet/EpmetCommonServiceApplication.java  |  31 +++
 .../com/epmet/config/ModuleConfigImpl.java    |  26 +++
 .../com/epmet/constant/ShowApiConstant.java   |  36 ++++
 .../epmet/controller/CalenderController.java  |  85 ++++++++
 .../epmet/controller/ShowApiController.java   |  62 ++++++
 .../epmet/controller/WorkDayController.java   |  41 ++++
 .../main/java/com/epmet/dao/CalenderDao.java  |  44 ++++
 .../java/com/epmet/entity/CalenderEntity.java | 101 +++++++++
 .../com/epmet/exception/ModuleErrorCode.java  |  25 +++
 .../com/epmet/result/DayDetailResultDTO.java  |  77 +++++++
 .../com/epmet/result/HolidayDetailDTO.java    |  44 ++++
 .../com/epmet/result/HolidayResultDTO.java    |  27 +++
 .../java/com/epmet/result/ShowApiResult.java  |  74 +++++++
 .../com/epmet/service/CalenderService.java    |  95 +++++++++
 .../com/epmet/service/ShowApiService.java     |  16 ++
 .../com/epmet/service/WorkDayService.java     |  16 ++
 .../service/impl/CalenderServiceImpl.java     |  97 +++++++++
 .../service/impl/ShowApiServiceImpl.java      | 201 ++++++++++++++++++
 .../service/impl/WorkDayServiceImpl.java      |  82 +++++++
 .../epmet/task/MultithreadScheduleTask.java   |  38 ++++
 .../com/epmet/task/SaticScheduleTask.java     |  31 +++
 .../java/com/epmet/utils/ShowApiUtil.java     | 106 +++++++++
 .../src/main/resources/bootstrap.yml          | 106 +++++++++
 .../src/main/resources/db/migration/db.sql    |   0
 .../src/main/resources/logback-spring.xml     | 158 ++++++++++++++
 .../src/main/resources/mapper/CalenderDao.xml |  64 ++++++
 epmet-module/epmet-common-service/pom.xml     |  21 ++
 epmet-module/pom.xml                          |   1 +
 37 files changed, 2128 insertions(+)
 create mode 100644 epmet-module/epmet-common-service/common-service-client/pom.xml
 create mode 100644 epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/CalenderDTO.java
 create mode 100644 epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/form/WorkDayFormDTO.java
 create mode 100644 epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/WorkDayResultDTO.java
 create mode 100644 epmet-module/epmet-common-service/common-service-server/Dockerfile
 create mode 100644 epmet-module/epmet-common-service/common-service-server/docker-compose.yml
 create mode 100644 epmet-module/epmet-common-service/common-service-server/pom.xml
 create mode 100644 epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/EpmetCommonServiceApplication.java
 create mode 100644 epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/config/ModuleConfigImpl.java
 create mode 100644 epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/constant/ShowApiConstant.java
 create mode 100644 epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/CalenderController.java
 create mode 100644 epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ShowApiController.java
 create mode 100644 epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/WorkDayController.java
 create mode 100644 epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/CalenderDao.java
 create mode 100644 epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/entity/CalenderEntity.java
 create mode 100644 epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/exception/ModuleErrorCode.java
 create mode 100644 epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/result/DayDetailResultDTO.java
 create mode 100644 epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/result/HolidayDetailDTO.java
 create mode 100644 epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/result/HolidayResultDTO.java
 create mode 100644 epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/result/ShowApiResult.java
 create mode 100644 epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/CalenderService.java
 create mode 100644 epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ShowApiService.java
 create mode 100644 epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/WorkDayService.java
 create mode 100644 epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/CalenderServiceImpl.java
 create mode 100644 epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ShowApiServiceImpl.java
 create mode 100644 epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/WorkDayServiceImpl.java
 create mode 100644 epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/task/MultithreadScheduleTask.java
 create mode 100644 epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/task/SaticScheduleTask.java
 create mode 100644 epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/utils/ShowApiUtil.java
 create mode 100644 epmet-module/epmet-common-service/common-service-server/src/main/resources/bootstrap.yml
 create mode 100644 epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/db.sql
 create mode 100644 epmet-module/epmet-common-service/common-service-server/src/main/resources/logback-spring.xml
 create mode 100644 epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/CalenderDao.xml
 create mode 100644 epmet-module/epmet-common-service/pom.xml

diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml
index e3c45756f4..4029f58948 100644
--- a/epmet-gateway/pom.xml
+++ b/epmet-gateway/pom.xml
@@ -174,6 +174,9 @@
                 <!--  23、政府工作端项目管理             -->
 <!--                <gateway.routes.gov-project-server.uri>http://127.0.0.1:8102</gateway.routes.gov-project-server.uri>-->
                 <gateway.routes.gov-project-server.uri>lb://gov-project-server</gateway.routes.gov-project-server.uri>
+                <!--  24、公共服务              -->
+                <gateway.routes.common-service-server.uri>http://127.0.0.1:8103</gateway.routes.common-service-server.uri>
+<!--                <gateway.routes.common-service-server.uri>lb://common-service-server</gateway.routes.common-service-server.uri>-->
             </properties>
         </profile>
         <profile>
@@ -244,6 +247,8 @@
                 <gateway.routes.gov-issue-server.uri>lb://gov-issue-server</gateway.routes.gov-issue-server.uri>
                 <!--  23、政府工作端项目管理             -->
                 <gateway.routes.gov-project-server.uri>lb://gov-project-server</gateway.routes.gov-project-server.uri>
+                <!--  24、公共服务              -->
+                <gateway.routes.common-service-server.uri>lb://common-service-server</gateway.routes.common-service-server.uri>
             </properties>
         </profile>
         <profile>
@@ -312,6 +317,8 @@
                 <gateway.routes.gov-issue-server.uri>lb://gov-issue-server</gateway.routes.gov-issue-server.uri>
                 <!--  23、政府工作端项目管理             -->
                 <gateway.routes.gov-project-server.uri>lb://gov-project-server</gateway.routes.gov-project-server.uri>
+                <!--  24、公共服务              -->
+                <gateway.routes.common-service-server.uri>lb://common-service-server</gateway.routes.common-service-server.uri>
             </properties>
         </profile>
     </profiles>
diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml
index 112369073e..a009c0c628 100644
--- a/epmet-gateway/src/main/resources/bootstrap.yml
+++ b/epmet-gateway/src/main/resources/bootstrap.yml
@@ -224,6 +224,14 @@ spring:
           filters:
             - StripPrefix=1
             - CpAuth=true
+        #政府工作端项目管理
+        - id: common-service-server
+          uri: @gateway.routes.common-service-server.uri@
+          order: 23
+          predicates:
+            - Path=${server.servlet.context-path}/commonservice/**
+          filters:
+            - StripPrefix=1
     nacos:
       discovery:
         server-addr: @nacos.server-addr@
diff --git a/epmet-module/epmet-common-service/common-service-client/pom.xml b/epmet-module/epmet-common-service/common-service-client/pom.xml
new file mode 100644
index 0000000000..d8b8c6d070
--- /dev/null
+++ b/epmet-module/epmet-common-service/common-service-client/pom.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.epmet</groupId>
+        <artifactId>epmet-common-service</artifactId>
+        <version>2.0.0</version>
+    </parent>
+
+    <artifactId>common-service-client</artifactId>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-commons-tools</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+    </build>
+
+</project>
diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/CalenderDTO.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/CalenderDTO.java
new file mode 100644
index 0000000000..77c75ed9e3
--- /dev/null
+++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/CalenderDTO.java
@@ -0,0 +1,131 @@
+/**
+ * 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 2020-05-11
+ */
+@Data
+public class CalenderDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 0表示成功，其他为失败
+     */
+	private Integer retCode;
+
+    /**
+     * 查询的日期:20200510
+     */
+	private String day;
+
+    /**
+     * 查询的日期:20200510
+     */
+	private Date queryDate;
+
+    /**
+     * 星期几的数字
+     */
+	private Integer weekday;
+
+    /**
+     * 节日或周末开始时间，如果是工作日，此字段为空串
+     */
+	private String begin;
+
+    /**
+     * 节日或周末结束时间，如果是工作日，此字段为空串
+     */
+	private String end;
+
+    /**
+     * 节日备注
+     */
+	private String holidayRemark;
+
+    /**
+     * 1为工作日，2为周末，3为节假日
+     */
+	private String type;
+
+    /**
+     * 工作日，周末，节假日
+     */
+	private String typeName;
+
+    /**
+     * 节日名称，工作日时显示“无”，周末时显示“周末”，节日时显示节日名称
+     */
+	private String holiday;
+
+    /**
+     * 星期几的英文名
+     */
+	private String en;
+
+    /**
+     * 星期几的中文名
+     */
+	private String cn;
+
+    /**
+     * 是否删除，0：未删除，1：已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建者id
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新者id
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/form/WorkDayFormDTO.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/form/WorkDayFormDTO.java
new file mode 100644
index 0000000000..3442f81481
--- /dev/null
+++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/form/WorkDayFormDTO.java
@@ -0,0 +1,31 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 工作日计算入参
+ * @Author yinzuomei
+ * @Date 2020/5/11 21:53
+ */
+@Data
+public class WorkDayFormDTO implements Serializable {
+    private static final long serialVersionUID = 5018009446003442250L;
+
+    /**
+     * key
+     */
+    private  String id;
+
+    /**
+     * 起始日期
+     */
+    private String startDate;
+
+    /**
+     * 终止日期
+     */
+    private String endDate;
+}
+
diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/WorkDayResultDTO.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/WorkDayResultDTO.java
new file mode 100644
index 0000000000..8c594b1298
--- /dev/null
+++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/WorkDayResultDTO.java
@@ -0,0 +1,37 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 工作日计算返参
+ * @Author yinzuomei
+ * @Date 2020/5/11 21:48
+ */
+@Data
+public class WorkDayResultDTO implements Serializable {
+    private static final long serialVersionUID = 4578531109651717997L;
+
+    /**
+     * key
+     */
+    private String id;
+
+    /**
+     * 起始日期
+     */
+    private String startDate;
+
+    /**
+     * 终止日期
+     */
+    private String endDate;
+
+    /**
+     * 已滞留工作日
+     */
+    private String detentionDays;
+}
+
diff --git a/epmet-module/epmet-common-service/common-service-server/Dockerfile b/epmet-module/epmet-common-service/common-service-server/Dockerfile
new file mode 100644
index 0000000000..456b190e80
--- /dev/null
+++ b/epmet-module/epmet-common-service/common-service-server/Dockerfile
@@ -0,0 +1,11 @@
+FROM java:8
+
+RUN export LANG="zh_CN.UTF-8"
+RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+RUN echo 'Asia/Shanghai' > /etc/timezone
+
+COPY ./target/*.jar ./app.jar
+
+EXPOSE 8103
+
+ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"]
\ No newline at end of file
diff --git a/epmet-module/epmet-common-service/common-service-server/docker-compose.yml b/epmet-module/epmet-common-service/common-service-server/docker-compose.yml
new file mode 100644
index 0000000000..9af8426d0d
--- /dev/null
+++ b/epmet-module/epmet-common-service/common-service-server/docker-compose.yml
@@ -0,0 +1,15 @@
+version: "3.7"
+services:
+  common-service-server:
+    container_name: common-service-server-dev
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/common-service-server:0.3.0
+    ports:
+      - "8103:8103"
+    network_mode: host # 使用现有网络
+    volumes:
+      - "/opt/epmet-cloud-logs/dev:/logs"
+    deploy:
+      resources:
+        limits:
+          cpus: '0.1'
+          memory: 250M
\ No newline at end of file
diff --git a/epmet-module/epmet-common-service/common-service-server/pom.xml b/epmet-module/epmet-common-service/common-service-server/pom.xml
new file mode 100644
index 0000000000..9bfa6132e5
--- /dev/null
+++ b/epmet-module/epmet-common-service/common-service-server/pom.xml
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <version>0.3.0</version>
+    <parent>
+        <groupId>com.epmet</groupId>
+        <artifactId>epmet-common-service</artifactId>
+        <version>2.0.0</version>
+    </parent>
+    <artifactId>common-service-server</artifactId>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>common-service-client</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-commons-tools</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-commons-mybatis</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-support</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>de.codecentric</groupId>
+            <artifactId>spring-boot-admin-starter-client</artifactId>
+            <version>${spring.boot.admin.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
+        <!-- 替换Feign原生httpclient -->
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-httpclient</artifactId>
+            <version>10.3.0</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+        </plugins>
+        <sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
+        <resources>
+            <resource>
+                <filtering>true</filtering>
+                <directory>${basedir}/src/main/resources</directory>
+            </resource>
+        </resources>
+    </build>
+    <profiles>
+        <profile>
+            <id>dev-local</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <server.port>8103</server.port>
+                <spring.profiles.active>dev</spring.profiles.active>
+
+                <!-- 数据库配置-->
+                <spring.datasource.druid.url>
+                    <![CDATA[jdbc:mysql://localhost:3306/epmet_common_service?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </spring.datasource.druid.url>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>root</spring.datasource.druid.password>
+                <!-- redis配置 -->
+                <spring.redis.index>0</spring.redis.index>
+                <spring.redis.host>192.168.1.130</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>123456</spring.redis.password>
+                <!-- nacos -->
+                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
+                <nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
+                <nacos.config.namespace></nacos.config.namespace>
+                <nacos.config.group></nacos.config.group>
+                <nacos.config-enabled>false</nacos.config-enabled>
+                <nacos.ip/>
+            </properties>
+        </profile>
+        <profile>
+            <id>dev</id>
+            <!--<activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>-->
+            <properties>
+                <server.port>8103</server.port>
+                <spring.profiles.active>dev</spring.profiles.active>
+
+                <!-- 数据库配置-->
+                <spring.datasource.druid.url>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_resi_group_dev?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </spring.datasource.druid.url>
+                <spring.datasource.druid.username>epmet</spring.datasource.druid.username>
+                <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
+                <!-- redis配置 -->
+                <spring.redis.index>0</spring.redis.index>
+                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
+                <!-- nacos -->
+                <nacos.register-enabled>true</nacos.register-enabled>
+                <nacos.server-addr>192.168.10.150:8848</nacos.server-addr>
+                <nacos.discovery.namespace>67e3c350-533e-4d7c-9f8f-faf1b4aa82ae</nacos.discovery.namespace>
+                <nacos.config.namespace></nacos.config.namespace>
+                <nacos.config.group></nacos.config.group>
+                <nacos.config-enabled>false</nacos.config-enabled>
+                <nacos.ip/>
+            </properties>
+        </profile>
+    </profiles>
+</project>
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/EpmetCommonServiceApplication.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/EpmetCommonServiceApplication.java
new file mode 100644
index 0000000000..238b8546d4
--- /dev/null
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/EpmetCommonServiceApplication.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.epmet;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+
+/**
+ * 模块
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@SpringBootApplication
+@EnableDiscoveryClient
+@EnableFeignClients
+public class EpmetCommonServiceApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(EpmetCommonServiceApplication.class, args);
+    }
+
+}
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/config/ModuleConfigImpl.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/config/ModuleConfigImpl.java
new file mode 100644
index 0000000000..6fbaa47ba2
--- /dev/null
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/config/ModuleConfigImpl.java
@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.epmet.config;
+
+import com.epmet.commons.tools.config.ModuleConfig;
+import org.springframework.stereotype.Service;
+
+/**
+ * 模块配置信息
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@Service
+public class ModuleConfigImpl implements ModuleConfig {
+    @Override
+    public String getName() {
+        return "commonservice";
+    }
+}
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/constant/ShowApiConstant.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/constant/ShowApiConstant.java
new file mode 100644
index 0000000000..69799d4fde
--- /dev/null
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/constant/ShowApiConstant.java
@@ -0,0 +1,36 @@
+package com.epmet.constant;
+
+/**
+ * @Description 万维易源API
+ * @Author yinzuomei
+ * @Date 2020/5/11 16:56
+ */
+public interface ShowApiConstant {
+    /**
+     * showapi_appid
+     */
+    String SHOWAPI_APPID = "222733";
+
+    /**
+     * secret
+     */
+    String SHOWAPI_SIGN = "ada451c248454d4eaf2db178482f14a7";
+
+    /**
+     * 2020年我国节假日查询，持续更新中......
+     * api:https://route.showapi.com/894-5
+     * 第一个参数:showapi_appidshowapi_appid
+     * 第二个参数：showapi_sign=secret
+     * 第三个参数：输入格式yyyyMMdd。如果不输入，则默认是当天。
+     */
+    String QUERY_HOLIDAY_V2020 = "http://route.showapi.com/894-5?showapi_appid=%s&showapi_sign=%s&day=%s";
+
+    /**
+     * 根据年份查询当年的节假日列表
+     * api:https://route.showapi.com/894-5
+     * 第一个参数:showapi_appidshowapi_appid
+     * 第二个参数：showapi_sign=secret
+     * 第三个参数：year需要查询的年份,默认查询2019年的节假日列表
+     */
+    String HOLIDAY_LIST = "http://route.showapi.com/894-4?showapi_appid=%s&showapi_sign=%s&year=%s";
+}
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/CalenderController.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/CalenderController.java
new file mode 100644
index 0000000000..a3acf8c5ff
--- /dev/null
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/CalenderController.java
@@ -0,0 +1,85 @@
+/**
+ * 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.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+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.CalenderDTO;
+import com.epmet.service.CalenderService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+
+/**
+ * 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@RestController
+@RequestMapping("calender")
+public class CalenderController {
+    
+    @Autowired
+    private CalenderService calenderService;
+
+    @GetMapping("page")
+    public Result<PageData<CalenderDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<CalenderDTO> page = calenderService.page(params);
+        return new Result<PageData<CalenderDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<CalenderDTO> get(@PathVariable("id") String id){
+        CalenderDTO data = calenderService.get(id);
+        return new Result<CalenderDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody CalenderDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        calenderService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody CalenderDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        calenderService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        calenderService.delete(ids);
+        return new Result();
+    }
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ShowApiController.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ShowApiController.java
new file mode 100644
index 0000000000..209c3f4cc4
--- /dev/null
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ShowApiController.java
@@ -0,0 +1,62 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.service.ShowApiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description 工作日信息维护
+ * @Author yinzuomei
+ * @Date 2020/5/11 21:39
+ */
+@RestController
+@RequestMapping("holiday")
+public class ShowApiController {
+
+    @Autowired
+    private ShowApiService showApiService;
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result
+     * @param year
+     * @Author yinzuomei
+     * @Description 初始化日历插入数据库
+     * @Date 2020/5/11 23:23 
+     **/
+    @PostMapping("init/{year}")
+    public Result initYearCalender(@PathVariable("year") String year) {
+        showApiService.initYearCalender(year);
+        return new Result();
+    }
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result
+     * @Author yinzuomei
+     * @Description 2020年我国节假日查询
+     * @Date 2020/5/11 23:24
+     **/
+    @PostMapping("initWorkDayList/{year}")
+    public Result initWorkDayList(@PathVariable("year") String year) {
+        showApiService.initWorkDayList(year);
+        return new Result();
+    }
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result
+     * @param year
+     * @Author yinzuomei
+     * @Description 根据年份查询当年的节假日列表(调用api同步到本地)
+     * @Date 2020/5/11 23:24 
+     **/
+    @PostMapping("holidayList/{year}")
+    public Result holidayList(@PathVariable("year") String year) {
+        showApiService.holidayList(year);
+        return new Result();
+    }
+
+}
+
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/WorkDayController.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/WorkDayController.java
new file mode 100644
index 0000000000..679613a48d
--- /dev/null
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/WorkDayController.java
@@ -0,0 +1,41 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.WorkDayFormDTO;
+import com.epmet.dto.result.WorkDayResultDTO;
+import com.epmet.service.WorkDayService;
+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;
+import java.util.Set;
+
+/**
+ * @Description 工作日计算
+ * @Author yinzuomei
+ * @Date 2020/5/12 0:27
+ */
+@RestController
+@RequestMapping("workday")
+public class WorkDayController {
+
+    @Autowired
+    private WorkDayService workDayService;
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.WorkDayResultDTO>>
+     * @param formDTO
+     * @Author yinzuomei
+     * @Description 根据每一组起止时间，计算工作日
+     * @Date 2020/5/12 2:08
+     **/
+    @PostMapping("detentiondays")
+    public Result<List<WorkDayResultDTO>> detentionDays(@RequestBody List<WorkDayFormDTO> formDTO) {
+        List<WorkDayResultDTO> list = workDayService.detentionDays(formDTO);
+        return new Result<List<WorkDayResultDTO>>().ok(list);
+    }
+}
+
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/CalenderDao.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/CalenderDao.java
new file mode 100644
index 0000000000..1240add1e1
--- /dev/null
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/CalenderDao.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;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.CalenderEntity;
+import com.epmet.result.HolidayDetailDTO;
+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 2020-05-11
+ */
+@Mapper
+public interface CalenderDao extends BaseDao<CalenderEntity> {
+
+    int updateHoliday(HolidayDetailDTO holidayDetail);
+
+    CalenderEntity selectByDay(String day);
+
+    List<CalenderEntity> selectList(String year);
+
+    List<CalenderEntity> selectByStartAndEnd(@Param("begin")String startDateStr, @Param("end")String endDateStr);
+}
\ No newline at end of file
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/entity/CalenderEntity.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/entity/CalenderEntity.java
new file mode 100644
index 0000000000..831b102b38
--- /dev/null
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/entity/CalenderEntity.java
@@ -0,0 +1,101 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity;
+
+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-05-11
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("calender")
+public class CalenderEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 0表示成功，其他为失败
+     */
+	private Integer retCode;
+
+    /**
+     * 查询的日期:20200510
+     */
+	private String day;
+
+    /**
+     * 查询的日期:20200510
+     */
+	private Date queryDate;
+
+    /**
+     * 星期几的数字
+     */
+	private Integer weekday;
+
+    /**
+     * 节日或周末开始时间，如果是工作日，此字段为空串
+     */
+	private String begin;
+
+    /**
+     * 节日或周末结束时间，如果是工作日，此字段为空串
+     */
+	private String end;
+
+    /**
+     * 节日备注
+     */
+	private String holidayRemark;
+
+    /**
+     * 1为工作日，2为周末，3为节假日
+     */
+	private String type;
+
+    /**
+     * 工作日，周末，节假日
+     */
+	private String typeName;
+
+    /**
+     * 节日名称，工作日时显示“无”，周末时显示“周末”，节日时显示节日名称
+     */
+	private String holiday;
+
+    /**
+     * 星期几的英文名
+     */
+	private String en;
+
+    /**
+     * 星期几的中文名
+     */
+	private String cn;
+
+}
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/exception/ModuleErrorCode.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/exception/ModuleErrorCode.java
new file mode 100644
index 0000000000..1206c71b9a
--- /dev/null
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/exception/ModuleErrorCode.java
@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.epmet.exception;
+
+
+import com.epmet.commons.tools.exception.ErrorCode;
+
+/**
+ * 模块错误编码，由9位数字组成，前6位为模块编码，后3位为业务编码
+ * <p>
+ * 如：100001001（100001代表模块，001代表业务代码）
+ * </p>
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+public interface ModuleErrorCode extends ErrorCode {
+
+}
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/result/DayDetailResultDTO.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/result/DayDetailResultDTO.java
new file mode 100644
index 0000000000..827a27fcf9
--- /dev/null
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/result/DayDetailResultDTO.java
@@ -0,0 +1,77 @@
+package com.epmet.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 2020年我国节假日查询返参
+ * @Author yinzuomei
+ * @Date 2020/5/11 21:27
+ */
+@Data
+public class DayDetailResultDTO implements Serializable {
+    /*{
+        "ret_code": 0,
+            "day": "20200511",
+            "weekDay": 1,
+            "begin": "",
+            "end": "",
+            "holiday_remark": "",
+            "type": "1",
+            "holiday": "无",
+            "en": "Monday",
+            "cn": "周一"
+    }*/
+
+    /**
+     * 0表示成功，其他为失败
+     */
+    private Integer ret_code;
+
+    /**
+     * 查询的日期20200510
+     */
+    private String day;
+
+    /**
+     * 星期几的数字
+     */
+    private Integer weekDay;
+
+    /**
+     * 节日或周末开始时间，如果是工作日，此字段为空串
+     */
+    private String begin;
+
+    /**
+     * 节日或周末结束时间，如果是工作日，此字段为空串
+     */
+    private String end;
+
+    /**
+     * 节日备注
+     */
+    private String holiday_remark;
+
+    /**
+     * 1为工作日，2为周末，3为节假日
+     */
+    private String type;
+
+    /**
+     * 节日名称，工作日时显示“无”，周末时显示“周末”，节日时显示节日名称
+     */
+    private String holiday;
+
+    /**
+     * 星期几（英文文）
+     */
+    private String en;
+
+    /**
+     * 星期几（中文）
+     */
+    private String cn;
+}
+
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/result/HolidayDetailDTO.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/result/HolidayDetailDTO.java
new file mode 100644
index 0000000000..d47713fc3a
--- /dev/null
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/result/HolidayDetailDTO.java
@@ -0,0 +1,44 @@
+package com.epmet.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description TODO
+ * @Author yinzuomei
+ * @Date 2020/5/11 22:55
+ */
+@Data
+public class HolidayDetailDTO implements Serializable {
+    private static final long serialVersionUID = -3840795046551145292L;
+
+    /*{
+        "holiday": "元旦",
+        "holiday_remark": "2020年1月1日放假，共1天。",
+        "end": "20200101",
+        "begin": "20200101"
+    }*/
+
+    /**
+     * 节假日名称:中秋节
+     */
+    private String holiday;
+
+    /**
+     * 节假日描述:共放假3天，周末连休，不需要调休。
+     */
+    private String holiday_remark;
+
+    /**
+     * 节假日的结束时间：20190915
+     */
+    private String end;
+
+    /**
+     * 节假日的开始时间：20190913
+     */
+    private String begin;
+
+}
+
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/result/HolidayResultDTO.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/result/HolidayResultDTO.java
new file mode 100644
index 0000000000..c75adf0cbd
--- /dev/null
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/result/HolidayResultDTO.java
@@ -0,0 +1,27 @@
+package com.epmet.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 根据年份查询当年的节假日列表返参
+ * @Author yinzuomei
+ * @Date 2020/5/11 21:27
+ */
+@Data
+public class HolidayResultDTO implements Serializable {
+
+    /**
+     * 接口调用是否成功,0表示成功,其他值默认失败
+     */
+    private Integer ret_code;
+
+    /**
+     * 整年的节假日列表
+     */
+    private List<HolidayDetailDTO> data;
+
+}
+
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/result/ShowApiResult.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/result/ShowApiResult.java
new file mode 100644
index 0000000000..fbba994ece
--- /dev/null
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/result/ShowApiResult.java
@@ -0,0 +1,74 @@
+package com.epmet.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 万维易源-api返参
+ * @Author yinzuomei
+ * @Date 2020/5/11 16:36
+ */
+@Data
+public class ShowApiResult implements Serializable {
+
+//    {
+//        "showapi_res_error": "",
+//        "showapi_res_id": "5eb90db28d57baae12d8d42d",
+//        "showapi_res_code": 0,
+//        "showapi_res_body": {"ret_code":0,"day":"20200511","weekDay":1,"begin":"","end":"","holiday_remark":"","type":"1","holiday":"无","en":"Monday","cn":"周一"}
+//    }
+
+    /**
+     *易源返回标志,0为成功，其他为失败。
+     * 0成功
+     * -1，系统调用错误
+     * -2，可调用次数或金额为0
+     * -3，读取超时
+     * -4，服务端返回数据解析错误
+     * -5，后端服务器DNS解析错误
+     * -6，服务不存在或未上线
+     * -7, API创建者的网关资源不足
+     * -1000，系统维护
+     * -1002，showapi_appid字段必传
+     * -1003，showapi_sign字段必传
+     * -1004，签名sign验证有误
+     * -1005，showapi_timestamp无效
+     * -1006，app无权限调用接口
+     * -1007，没有订购套餐
+     * -1008，服务商关闭对您的调用权限
+     * -1009，调用频率受限
+     * -1010，找不到您的应用
+     * -1011，子授权app_child_id无效
+     * -1012，子授权已过期或失效
+     * -1013，子授权ip受限
+     * -1014，token权限无效
+     */
+    private int showapi_res_code=0;
+
+    /**
+     * 错误信息的展示 demo:用户输入有误!
+     */
+    private String showapi_res_error;
+
+    /**
+     * 本次请求id demo:ce135f6739294c63be0c021b76b6fbff
+     */
+    private String showapi_res_id;
+
+    /**
+     * 消息体的JSON封装，所有应用级的返回参数将嵌入此对象 。 demo:{"city":"昆明","prov":"云南"}
+     */
+    private String showapi_res_body;
+
+    @Override
+    public String toString() {
+        return "ShowApiResult{" +
+                "showapi_res_code=" + showapi_res_code +
+                ", showapi_res_error='" + showapi_res_error + '\'' +
+                ", showapi_res_id='" + showapi_res_id + '\'' +
+                ", showapi_res_body='" + showapi_res_body + '\'' +
+                '}';
+    }
+}
+
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/CalenderService.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/CalenderService.java
new file mode 100644
index 0000000000..5dbc9c2634
--- /dev/null
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/CalenderService.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;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.CalenderDTO;
+import com.epmet.entity.CalenderEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+public interface CalenderService extends BaseService<CalenderEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<CalenderDTO>
+     * @author generator
+     * @date 2020-05-11
+     */
+    PageData<CalenderDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<CalenderDTO>
+     * @author generator
+     * @date 2020-05-11
+     */
+    List<CalenderDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return CalenderDTO
+     * @author generator
+     * @date 2020-05-11
+     */
+    CalenderDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void save(CalenderDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void update(CalenderDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-05-11
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ShowApiService.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ShowApiService.java
new file mode 100644
index 0000000000..372c247ca7
--- /dev/null
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ShowApiService.java
@@ -0,0 +1,16 @@
+package com.epmet.service;
+
+/**
+ * @Description 工作日信息维护
+ * @Author yinzuomei
+ * @Date 2020/5/11 21:55
+ */
+public interface ShowApiService {
+
+    void initYearCalender(String year);
+
+    void initWorkDayList(String year);
+
+    void holidayList(String year);
+
+}
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/WorkDayService.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/WorkDayService.java
new file mode 100644
index 0000000000..7433b154c1
--- /dev/null
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/WorkDayService.java
@@ -0,0 +1,16 @@
+package com.epmet.service;
+
+import com.epmet.dto.form.WorkDayFormDTO;
+import com.epmet.dto.result.WorkDayResultDTO;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * @Description 工作日计算
+ * @Author yinzuomei
+ * @Date 2020/5/12 0:27
+ */
+public interface WorkDayService {
+    List<WorkDayResultDTO> detentionDays(List<WorkDayFormDTO> formDTO);
+}
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/CalenderServiceImpl.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/CalenderServiceImpl.java
new file mode 100644
index 0000000000..6c0dca44c8
--- /dev/null
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/CalenderServiceImpl.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.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.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dao.CalenderDao;
+import com.epmet.dto.CalenderDTO;
+import com.epmet.entity.CalenderEntity;
+import com.epmet.service.CalenderService;
+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 2020-05-11
+ */
+@Service
+public class CalenderServiceImpl extends BaseServiceImpl<CalenderDao, CalenderEntity> implements CalenderService {
+
+    @Override
+    public PageData<CalenderDTO> page(Map<String, Object> params) {
+        IPage<CalenderEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, CalenderDTO.class);
+    }
+
+    @Override
+    public List<CalenderDTO> list(Map<String, Object> params) {
+        List<CalenderEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, CalenderDTO.class);
+    }
+
+    private QueryWrapper<CalenderEntity> getWrapper(Map<String, Object> params) {
+        String id = (String) params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<CalenderEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public CalenderDTO get(String id) {
+        CalenderEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, CalenderDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(CalenderDTO dto) {
+        CalenderEntity entity = ConvertUtils.sourceToTarget(dto, CalenderEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(CalenderDTO dto) {
+        CalenderEntity entity = ConvertUtils.sourceToTarget(dto, CalenderEntity.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/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ShowApiServiceImpl.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ShowApiServiceImpl.java
new file mode 100644
index 0000000000..25a98d7bce
--- /dev/null
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ShowApiServiceImpl.java
@@ -0,0 +1,201 @@
+package com.epmet.service.impl;
+
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.dao.CalenderDao;
+import com.epmet.entity.CalenderEntity;
+import com.epmet.result.DayDetailResultDTO;
+import com.epmet.result.HolidayDetailDTO;
+import com.epmet.result.HolidayResultDTO;
+import com.epmet.service.ShowApiService;
+import com.epmet.utils.ShowApiUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description 工作日信息维护
+ * @Author yinzuomei
+ * @Date 2020/5/11 21:55
+ */
+@Service
+public class ShowApiServiceImpl implements ShowApiService {
+
+    private static Logger logger = LoggerFactory.getLogger(ShowApiServiceImpl.class);
+    private static SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+    private static SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
+    @Autowired
+    private CalenderDao calenderDao;
+
+    @Override
+    public void initYearCalender(String year) {
+        String dateStart = String.format("%s-01-01", year);
+        String dateEnd = String.format("%s-12-31", year);
+        long startTime = 0;//start
+        try {
+            startTime = dateFormat.parse(dateStart).getTime();
+            long endTime = dateFormat.parse(dateEnd).getTime();//end
+            long day = 1000 * 60 * 60 * 24;
+            for (long i = startTime; i <= endTime; i += day) {
+                CalenderEntity calender = calenderDao.selectByDay(simpleDateFormat.format(new Date(i)));
+                if (null == calender) {
+                    logger.info("日期：" + dateFormat.format(new Date(i)));
+                    CalenderEntity calenderEntity = new CalenderEntity();
+                    calenderEntity.setQueryDate(new Date(i));
+                    calenderEntity.setDay(simpleDateFormat.format(new Date(i)));
+                    calenderEntity.setEn(dateToWeekEn(dateFormat.format(new Date(i))));
+                    calenderEntity.setCn(dateToWeekCn(dateFormat.format(new Date(i))));
+                    calenderEntity.setWeekday(dateToWeek(dateFormat.format(new Date(i))));
+                    if (calenderEntity.getWeekday() >= 1 && calenderEntity.getWeekday() <= 5) {
+                        calenderEntity.setTypeName("工作日");
+                        calenderEntity.setType("1");
+                    } else {
+                        calenderEntity.setTypeName("周末");
+                        calenderEntity.setType("2");
+                    }
+                    calenderDao.insert(calenderEntity);
+                } else {
+                    logger.info(String.format("数据库存在日期：%s的记录", dateFormat.format(new Date(i))));
+                }
+            }
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public void initWorkDayList(String year) {
+        try {
+            List<CalenderEntity> entityList = calenderDao.selectList(year);
+            if (null != entityList && entityList.size() > 0) {
+                CalenderEntity calenderEntity = entityList.get(0);
+                logger.info("要查询的日期：" + calenderEntity.getDay());
+                DayDetailResultDTO dayDetailResultDTO = ShowApiUtil.queryHolidayV2020(calenderEntity.getDay());
+                if (0 == dayDetailResultDTO.getRet_code()) {
+                    calenderEntity.setRetCode(dayDetailResultDTO.getRet_code());
+                    calenderEntity.setWeekday(dayDetailResultDTO.getWeekDay());
+                    calenderEntity.setBegin(dayDetailResultDTO.getBegin());
+                    calenderEntity.setEnd(dayDetailResultDTO.getEnd());
+                    calenderEntity.setHoliday(dayDetailResultDTO.getHoliday());
+                    calenderEntity.setHolidayRemark(dayDetailResultDTO.getHoliday_remark());
+                    calenderEntity.setEn(dayDetailResultDTO.getEn());
+                    calenderEntity.setCn(dayDetailResultDTO.getCn());
+                    calenderEntity.setType(dayDetailResultDTO.getType());
+                    //1为工作日，2为周末，3为节假日
+                    if ("1".equals(dayDetailResultDTO.getType())) {
+                        calenderEntity.setTypeName("工作日");
+                    } else if ("2".equals(dayDetailResultDTO.getType())) {
+                        calenderEntity.setTypeName("周末");
+                    } else if ("3".equals(dayDetailResultDTO.getType())) {
+                        calenderEntity.setTypeName("节假日");
+                    }
+                    calenderDao.updateById(calenderEntity);
+                }
+
+            } else {
+                logger.info("无需更新");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public void holidayList(String year) {
+        HolidayResultDTO holidayResultDTO = null;
+        try {
+            holidayResultDTO = ShowApiUtil.holidayList(year);
+            if (0 != holidayResultDTO.getRet_code()) {
+                throw new RenException("根据年份查询当年的节假日列表API【https://route.showapi.com/894-4】查询失败");
+            }
+            for (HolidayDetailDTO holidayDetail : holidayResultDTO.getData()) {
+                calenderDao.updateHoliday(holidayDetail);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RenException("根据年份查询当年的节假日列表API【https://route.showapi.com/894-4】查询异常");
+        }
+    }
+
+   /* public static void main(String[] args) throws ParseException {
+        String dateStart = "2020-01-01";
+        String dateEnd = "2020-12-31";
+        SimpleDateFormat date = new SimpleDateFormat("yyyy-MM-dd");
+        long startTime = date.parse(dateStart).getTime();//start
+        long endTime = date.parse(dateEnd).getTime();//end
+        long day = 1000 * 60 * 60 * 24;
+        for (long i = startTime; i <= endTime; i += day) {
+            System.out.println(date.format(new Date(i)));
+        }
+    }*/
+
+    /**
+     * 根据日期获取当天是周几
+     *
+     * @param datetime 日期
+     * @return 周几
+     */
+    public static String dateToWeekCn(String datetime) {
+//        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        String[] weekDays = {"周日", "周一", "周二", "周三", "周四", "周五", "周六"};
+        Calendar cal = Calendar.getInstance();
+        Date date;
+        try {
+            date = dateFormat.parse(datetime);
+            cal.setTime(date);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        int w = cal.get(Calendar.DAY_OF_WEEK) - 1;
+        return weekDays[w];
+    }
+
+    /**
+     * 根据日期获取当天是周几
+     *
+     * @param datetime 日期
+     * @return 周几英文
+     */
+    public static String dateToWeekEn(String datetime) {
+//        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        String[] weekDays = {"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"};
+        Calendar cal = Calendar.getInstance();
+        Date date;
+        try {
+            date = dateFormat.parse(datetime);
+            cal.setTime(date);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        int w = cal.get(Calendar.DAY_OF_WEEK) - 1;
+        return weekDays[w];
+    }
+
+    /**
+     * 根据日期获取当天是周几
+     *
+     * @param datetime 日期
+     * @return 周几数字
+     */
+    public static Integer dateToWeek(String datetime) {
+//        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        int[] weekDays = {7, 1, 2, 3, 4, 5, 6};
+        Calendar cal = Calendar.getInstance();
+        Date date;
+        try {
+            date = dateFormat.parse(datetime);
+            cal.setTime(date);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        int w = cal.get(Calendar.DAY_OF_WEEK) - 1;
+        return weekDays[w];
+    }
+}
+
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/WorkDayServiceImpl.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/WorkDayServiceImpl.java
new file mode 100644
index 0000000000..25ede12e88
--- /dev/null
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/WorkDayServiceImpl.java
@@ -0,0 +1,82 @@
+package com.epmet.service.impl;
+
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.dao.CalenderDao;
+import com.epmet.dto.form.WorkDayFormDTO;
+import com.epmet.dto.result.WorkDayResultDTO;
+import com.epmet.entity.CalenderEntity;
+import com.epmet.service.WorkDayService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * @Description 工作日计算
+ * @Author yinzuomei
+ * @Date 2020/5/12 0:27
+ */
+@Service
+public class WorkDayServiceImpl implements WorkDayService {
+    private static Logger logger = LoggerFactory.getLogger(WorkDayServiceImpl.class);
+    @Autowired
+    private CalenderDao calenderDao;
+
+    @Override
+    public List<WorkDayResultDTO> detentionDays(List<WorkDayFormDTO> workDayFormDTO) {
+        List<WorkDayResultDTO> list = new ArrayList<>();
+        if (workDayFormDTO.isEmpty()) {
+            throw new RenException("起始时间、终止时间不能为空");
+        }
+        Iterator it = workDayFormDTO.iterator();
+        while (it.hasNext()) {
+            WorkDayResultDTO workDayResult = new WorkDayResultDTO();
+            WorkDayFormDTO workDayDTO = (WorkDayFormDTO) it.next();
+            workDayResult.setId(workDayDTO.getId());
+            workDayResult.setStartDate(workDayDTO.getStartDate());
+            workDayResult.setEndDate(workDayDTO.getEndDate());
+            workDayResult.setDetentionDays(this.caculateDetentionDays(workDayDTO.getStartDate(), workDayResult.getEndDate()));
+            list.add(workDayResult);
+        }
+        return list;
+    }
+
+    //公式：  当前日期 - 被吹日期 - 期间的节假日
+    private String caculateDetentionDays(String startDateStr, String endDateStr) {
+        if (startDateStr.equals(endDateStr)) {
+            logger.info(String.format("%s-%s起止时间一致，返回<1,",startDateStr,endDateStr));
+            return "<1";
+        }
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
+        try {
+            Date startDate = simpleDateFormat.parse(startDateStr);
+            Date endDate = simpleDateFormat.parse(endDateStr);
+            long day = (endDate.getTime() - startDate.getTime()) / (24 * 60 * 60 * 1000);
+            logger.info(String.format("当前日期[%s]-被吹日期[%s]=%s", endDateStr, startDateStr, day));
+            List<CalenderEntity> list = calenderDao.selectByStartAndEnd(startDateStr, endDateStr);
+
+            long totalHoliday = 0;
+            for (CalenderEntity calenderEntity : list) {
+                if (!"1".equals(calenderEntity.getType())) {
+                    totalHoliday += 1;
+                }
+            }
+            logger.info(String.format("期间的节假日[%s-%s]=%s", endDateStr, startDateStr, totalHoliday));
+            long detentionDay = day - totalHoliday;
+            logger.info(String.format("当前日期[%s]-被吹日期[%s]-期间的节假日[%s]=%s", endDateStr, startDateStr, totalHoliday, detentionDay));
+            if (detentionDay < 1) {
+                return "<1";
+            }
+            return String.valueOf(detentionDay);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return "-1";
+    }
+
+
+}
+
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/task/MultithreadScheduleTask.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/task/MultithreadScheduleTask.java
new file mode 100644
index 0000000000..8485f229cb
--- /dev/null
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/task/MultithreadScheduleTask.java
@@ -0,0 +1,38 @@
+package com.epmet.task;
+
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+
+/**
+ * @Description TODO
+ * @Author yinzuomei
+ * @Date 2020/5/12 0:04
+ */
+//@Component注解用于对那些比较中立的类进行注释；
+//相对与在持久层、业务层和控制层分别采用 @Repository、@Service 和 @Controller 对分层中的类进行注释
+//@Component
+//@EnableScheduling   // 1.开启定时任务
+//@EnableAsync        // 2.开启多线程
+public class MultithreadScheduleTask {
+
+    @Async
+    @Scheduled(fixedDelay = 1000)  //间隔1秒
+    public void first() throws InterruptedException {
+        System.out.println("第一个定时任务开始 : " + LocalDateTime.now().toLocalTime() + "\r\n线程 : " + Thread.currentThread().getName());
+        System.out.println();
+        Thread.sleep(1000 * 10);
+    }
+
+    @Async
+    @Scheduled(fixedDelay = 2000)
+    public void second() {
+        System.out.println("第二个定时任务开始 : " + LocalDateTime.now().toLocalTime() + "\r\n线程 : " + Thread.currentThread().getName());
+        System.out.println();
+    }
+}
+
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/task/SaticScheduleTask.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/task/SaticScheduleTask.java
new file mode 100644
index 0000000000..bdca1553d2
--- /dev/null
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/task/SaticScheduleTask.java
@@ -0,0 +1,31 @@
+package com.epmet.task;
+
+import com.epmet.service.ShowApiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+
+import java.time.LocalDateTime;
+
+/**
+ * @Description TODO
+ * @Author yinzuomei
+ * @Date 2020/5/12 0:01
+ */
+//@Configuration      //1.主要用于标记配置类，兼备Component的效果。
+//@EnableScheduling   // 2.开启定时任务
+public class SaticScheduleTask {
+    @Autowired
+    private ShowApiService showApiService;
+
+    //3.添加定时任务
+    @Scheduled(cron = "0/1 * * * * ?")
+    //或直接指定时间间隔，例如：5秒
+    //@Scheduled(fixedRate=5000)
+    private void configureTasks() {
+        showApiService.initWorkDayList("2020");
+        System.err.println("执行静态定时任务时间: " + LocalDateTime.now());
+    }
+}
+
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/utils/ShowApiUtil.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/utils/ShowApiUtil.java
new file mode 100644
index 0000000000..8e4c8f4de3
--- /dev/null
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/utils/ShowApiUtil.java
@@ -0,0 +1,106 @@
+package com.epmet.utils;
+
+import com.alibaba.fastjson.JSONObject;
+import com.epmet.constant.ShowApiConstant;
+import com.epmet.result.DayDetailResultDTO;
+import com.epmet.result.HolidayResultDTO;
+import com.epmet.result.ShowApiResult;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.net.URL;
+
+/**
+ * @Description 万维易源-api工具类
+ * @Author yinzuomei
+ * @Date 2020/5/11 15:55
+ */
+public class ShowApiUtil {
+    private static Logger logger = LoggerFactory.getLogger(ShowApiUtil.class);
+    
+    /**
+     * @return com.epmet.result.showapi.ShowApiResult
+     * @param day 输入格式yyyyMMdd。如果不输入，则默认是当天
+     * @Author yinzuomei
+     * @Description 2020年我国节假日查询
+     * @Date 2020/5/11 21:20 
+     **/
+    public static DayDetailResultDTO queryHolidayV2020(String day) throws Exception {
+        String url=String.format(ShowApiConstant.QUERY_HOLIDAY_V2020,ShowApiConstant.SHOWAPI_APPID,ShowApiConstant.SHOWAPI_SIGN,day);
+        logger.info(String.format("(1)QUERY_HOLIDAY_V2020入参:%s",url));
+        URL u = new URL(url);
+        InputStream in = u.openStream();
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        try {
+            byte buf[] = new byte[1024];
+            int read = 0;
+            while ((read = in .read(buf)) > 0) {
+                out.write(buf, 0, read);
+            }
+        } finally {
+            if ( in != null) {
+                in .close();
+            }
+        }
+        byte b[] = out.toByteArray();
+        String resultStr=new String(b, "utf-8");
+        logger.info(String.format("(2)QUERY_HOLIDAY_V2020返参:%s",resultStr));
+        JSONObject jsonobject = JSONObject.parseObject(resultStr);
+        ShowApiResult showApiResult= (ShowApiResult)JSONObject.toJavaObject(jsonobject, ShowApiResult.class);
+        logger.info(showApiResult.toString());
+
+        JSONObject holidayJsonObject = JSONObject.parseObject(showApiResult.getShowapi_res_body());
+        DayDetailResultDTO dayDetailResultDTO= (DayDetailResultDTO)JSONObject.toJavaObject(holidayJsonObject, DayDetailResultDTO.class);
+        logger.info(String.format("(3)QUERY_HOLIDAY_V2020返参:%s",dayDetailResultDTO.toString()));
+        return dayDetailResultDTO;
+    }
+
+
+    /**
+     * @return com.epmet.result.HolidayResultDTO
+     * @param year
+     * @Author yinzuomei
+     * @Description 根据年份查询当年的节假日列表
+     * @Date 2020/5/11 22:58 
+     **/
+    public static HolidayResultDTO holidayList(String year) throws Exception {
+        String url=String.format(ShowApiConstant.HOLIDAY_LIST,ShowApiConstant.SHOWAPI_APPID,ShowApiConstant.SHOWAPI_SIGN,year);
+        logger.info(String.format("(1)HOLIDAY_LIST入参:%s",url));
+        URL u = new URL(url);
+        InputStream in = u.openStream();
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        try {
+            byte buf[] = new byte[1024];
+            int read = 0;
+            while ((read = in .read(buf)) > 0) {
+                out.write(buf, 0, read);
+            }
+        } finally {
+            if ( in != null) {
+                in .close();
+            }
+        }
+        byte b[] = out.toByteArray();
+        String resultStr=new String(b, "utf-8");
+        logger.info(String.format("(2)HOLIDAY_LIST返参:%s",resultStr));
+        JSONObject jsonobject = JSONObject.parseObject(resultStr);
+        ShowApiResult showApiResult= (ShowApiResult)JSONObject.toJavaObject(jsonobject, ShowApiResult.class);
+        logger.info(showApiResult.toString());
+
+        JSONObject holidayJsonObject = JSONObject.parseObject(showApiResult.getShowapi_res_body());
+        HolidayResultDTO holidayResultDTO= (HolidayResultDTO)JSONObject.toJavaObject(holidayJsonObject, HolidayResultDTO.class);
+        logger.info(String.format("(3)HOLIDAY_LIST返参:%s",holidayResultDTO.toString()));
+        return holidayResultDTO;
+    }
+    public static void main(String[] args) {
+        try {
+//            queryHolidayV2020("20200503");
+            holidayList("2020");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}
+
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-common-service/common-service-server/src/main/resources/bootstrap.yml
new file mode 100644
index 0000000000..15b337db7c
--- /dev/null
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/resources/bootstrap.yml
@@ -0,0 +1,106 @@
+server:
+  port: @server.port@
+  servlet:
+    context-path: /commonservice
+
+spring:
+  main:
+    allow-bean-definition-overriding: true
+  application:
+    name: common-service-server
+  #环境 dev|test|prod
+  profiles:
+    active: dev
+  messages:
+    encoding: UTF-8
+    basename: i18n/messages,i18n/messages_common
+  jackson:
+    time-zone: GMT+8
+    date-format: yyyy-MM-dd HH:mm:ss
+  redis:
+    database: @spring.redis.index@
+    host: @spring.redis.host@
+    port: @spring.redis.port@
+    password: @spring.redis.password@
+    timeout: 30s
+  datasource:
+    druid:
+      #MySQL
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      url: @spring.datasource.druid.url@
+      username: @spring.datasource.druid.username@
+      password: @spring.datasource.druid.password@
+  cloud:
+    nacos:
+      discovery:
+        server-addr: @nacos.server-addr@
+        #nacos的命名空间ID，默认是public
+        namespace: @nacos.discovery.namespace@
+        #不把自己注册到注册中心的地址
+        register-enabled: @nacos.register-enabled@
+        ip: @nacos.ip@
+      config:
+        enabled: @nacos.config-enabled@
+        server-addr: @nacos.server-addr@
+        namespace: @nacos.config.namespace@
+        group: @nacos.config.group@
+        file-extension: yaml
+        #指定共享配置，且支持动态刷新
+#        ext-config:
+#          - data-id: datasource.yaml
+#            group: ${spring.cloud.nacos.config.group}
+#            refresh: true
+#          - data-id: common.yaml
+#            group: ${spring.cloud.nacos.config.group}
+#            refresh: true
+management:
+  endpoints:
+    web:
+      exposure:
+        include: "*"
+  endpoint:
+    health:
+      show-details: ALWAYS
+
+mybatis-plus:
+  mapper-locations: classpath:/mapper/**/*.xml
+  #实体扫描，多个package用逗号或者分号分隔
+  typeAliasesPackage: com.epmet.modules.*.entity
+  global-config:
+    #数据库相关配置
+    db-config:
+      #主键类型  AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
+      id-type: ID_WORKER
+      #字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断"
+      field-strategy: NOT_NULL
+      #驼峰下划线转换
+      column-underline: true
+    banner: false
+  #原生配置
+  configuration:
+    map-underscore-to-camel-case: true
+    cache-enabled: false
+    call-setters-on-nulls: true
+    jdbc-type-for-null: 'null'
+
+feign:
+  hystrix:
+    enabled: true
+  client:
+    config:
+      default:
+        loggerLevel: BASIC
+  httpclient:
+    enabled: true
+
+hystrix:
+  command:
+    default:
+      execution:
+        isolation:
+          thread:
+            timeoutInMilliseconds: 60000 #缺省为1000
+
+ribbon:
+  ReadTimeout: 300000
+  ConnectTimeout: 300000
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/db.sql b/epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/db.sql
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-common-service/common-service-server/src/main/resources/logback-spring.xml
new file mode 100644
index 0000000000..e3cfdd0927
--- /dev/null
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/resources/logback-spring.xml
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+
+    <property name="log.path" value="logs/common-service"/>
+
+    <!-- 彩色日志格式 -->
+    <property name="CONSOLE_LOG_PATTERN"
+              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+
+    <!--1. 输出到控制台-->
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <!--此日志appender是为开发使用，只配置最底级别，控制台输出的日志级别是大于或等于此级别的日志信息-->
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>debug</level>
+        </filter>
+        <encoder>
+            <Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
+            <!-- 设置字符集 -->
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+
+    <!--2. 输出到文档-->
+    <!-- 2.1 level为 DEBUG 日志，时间滚动输出  -->
+    <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/debug.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志归档 -->
+            <fileNamePattern>${log.path}/debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录debug级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>debug</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 2.2 level为 INFO 日志，时间滚动输出  -->
+    <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/info.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 每天日志归档路径以及格式 -->
+            <fileNamePattern>${log.path}/info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录info级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>info</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 2.3 level为 WARN 日志，时间滚动输出  -->
+    <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/warn.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录warn级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>warn</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 2.4 level为 ERROR 日志，时间滚动输出  -->
+    <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/error.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录ERROR级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 开发、测试环境 -->
+    <springProfile name="dev,test">
+        <logger name="org.springframework.web" level="INFO"/>
+        <logger name="org.springboot.sample" level="INFO"/>
+        <logger name="com.epmet.dao" level="DEBUG"/>
+        <root level="INFO">
+            <appender-ref ref="DEBUG_FILE"/>
+            <appender-ref ref="INFO_FILE"/>
+            <appender-ref ref="WARN_FILE"/>
+            <appender-ref ref="ERROR_FILE"/>
+        </root>
+    </springProfile>
+
+    <!-- 生产环境 -->
+    <springProfile name="prod">
+        <logger name="org.springframework.web" level="INFO"/>
+        <logger name="org.springboot.sample" level="INFO"/>
+        <logger name="com.epmet.dao" level="INFO"/>
+        <root level="INFO">
+            <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="DEBUG_FILE"/>
+            <appender-ref ref="INFO_FILE"/>
+            <appender-ref ref="WARN_FILE"/>
+            <appender-ref ref="ERROR_FILE"/>
+        </root>
+    </springProfile>
+
+</configuration>
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/CalenderDao.xml b/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/CalenderDao.xml
new file mode 100644
index 0000000000..b1a3ab8e8d
--- /dev/null
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/CalenderDao.xml
@@ -0,0 +1,64 @@
+<?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.CalenderDao">
+
+    <resultMap type="com.epmet.entity.CalenderEntity" id="calenderMap">
+        <result property="id" column="ID"/>
+        <result property="retCode" column="RET_CODE"/>
+        <result property="day" column="DAY"/>
+        <result property="queryDate" column="QUERY_DATE"/>
+        <result property="weekday" column="WEEKDAY"/>
+        <result property="begin" column="BEGIN"/>
+        <result property="end" column="END"/>
+        <result property="holidayRemark" column="HOLIDAY_REMARK"/>
+        <result property="type" column="TYPE"/>
+        <result property="typeName" column="TYPE_NAME"/>
+        <result property="holiday" column="HOLIDAY"/>
+        <result property="en" column="EN"/>
+        <result property="cn" column="CN"/>
+        <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="selectByDay" parameterType="java.lang.String" resultType="com.epmet.entity.CalenderEntity">
+        select * from calender c
+        where c.del_flag='0'
+        and c.DAY=#{day}
+    </select>
+
+    <update id="updateHoliday" parameterType="com.epmet.result.HolidayDetailDTO">
+        UPDATE calender
+        SET type = '3',
+        TYPE_NAME = '节假日',
+        HOLIDAY_REMARK = #{holiday_remark},
+        HOLIDAY = #{holiday}
+        WHERE
+            DEL_FLAG = '0'
+            AND QUERY_DATE BETWEEN #{begin}
+            AND #{end}
+    </update>
+
+    <select id="selectList" parameterType="java.lang.String" resultType="com.epmet.entity.CalenderEntity">
+        select * from calender c
+        where c.del_flag='0'
+        AND (c.RET_CODE is null or c.ret_code!='')
+        and c.DAY like concat(#{year}, '%')
+        order by c.query_date asc
+    </select>
+
+    <select id="selectByStartAndEnd" parameterType="map" resultType="com.epmet.entity.CalenderEntity">
+        SELECT
+            *
+        FROM
+            calender
+        WHERE
+            DEL_FLAG = '0'
+            AND QUERY_DATE BETWEEN #{begin}
+            AND #{end}
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/epmet-common-service/pom.xml b/epmet-module/epmet-common-service/pom.xml
new file mode 100644
index 0000000000..7882f594f0
--- /dev/null
+++ b/epmet-module/epmet-common-service/pom.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>com.epmet</groupId>
+		<artifactId>epmet-module</artifactId>
+		<version>2.0.0</version>
+	</parent>
+
+	<groupId>com.epmet</groupId>
+	<artifactId>epmet-common-service</artifactId>
+	<packaging>pom</packaging>
+
+	<modules>
+		<module>common-service-client</module>
+		<module>common-service-server</module>
+	</modules>
+
+</project>
diff --git a/epmet-module/pom.xml b/epmet-module/pom.xml
index 50fdc831c0..5637182706 100644
--- a/epmet-module/pom.xml
+++ b/epmet-module/pom.xml
@@ -33,6 +33,7 @@
         <module>resi-hall</module>
 		<module>gov-issue</module>
 		<module>gov-project</module>
+		<module>epmet-common-service</module>
     </modules>
 
 </project>

From 8800da948b1075697fcc646dd4a7afcbb32cceb3 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 12 May 2020 10:36:31 +0800
Subject: [PATCH 23/45] =?UTF-8?q?=E4=BF=AE=E6=94=B9epmet-common-service?=
 =?UTF-8?q?=EF=BC=8Cdb?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet-common-service/common-service-server/pom.xml    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/epmet-module/epmet-common-service/common-service-server/pom.xml b/epmet-module/epmet-common-service/common-service-server/pom.xml
index 9bfa6132e5..933a40b48d 100644
--- a/epmet-module/epmet-common-service/common-service-server/pom.xml
+++ b/epmet-module/epmet-common-service/common-service-server/pom.xml
@@ -95,10 +95,12 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://localhost:3306/epmet_common_service?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://192.168.1.130:3306/epmet_common_service?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>root</spring.datasource.druid.username>
-                <spring.datasource.druid.password>root</spring.datasource.druid.password>
+<!--                <spring.datasource.druid.username>root</spring.datasource.druid.username>-->
+<!--                <spring.datasource.druid.password>root</spring.datasource.druid.password>-->
+                <spring.datasource.druid.username>epmet_common_service_user</spring.datasource.druid.username>
+                <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.130</spring.redis.host>

From 763d7b1d6fa59109fdb2718cc18dbd5d85af2a9b Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 12 May 2020 15:27:31 +0800
Subject: [PATCH 24/45] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD=E8=AE=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/form/CloseIssueFormDTO.java |  27 +++++
 .../gov-issue/gov-issue-server/pom.xml        |  18 +++
 .../com/epmet/constant/IssueConstant.java     |  38 +++++++
 .../epmet/constant/UserMessageConstant.java   |  25 +++++
 .../controller/IssueManageController.java     |  28 +++++
 .../com/epmet/feign/GovOrgFeignClient.java    |  13 +++
 .../com/epmet/feign/MessageFeignClient.java   |  15 +++
 .../com/epmet/feign/ResiGroupFeignClient.java |  14 +++
 .../fallback/GovOrgFeignClientFallBack.java   |   8 ++
 .../fallback/MessageFeignClientFallback.java  |   8 ++
 .../ResiGroupFeignClientFallBack.java         |   9 ++
 .../java/com/epmet/service/IssueService.java  |   9 ++
 .../epmet/service/impl/IssueServiceImpl.java  | 105 ++++++++++++++++++
 .../epmet/dto/result/AgencyGridResultDTO.java |  52 +++++++++
 .../constant/CustomerAgencyConstant.java      |   4 +
 .../controller/CustomerAgencyController.java  |  13 +++
 .../epmet/service/CustomerAgencyService.java  |   9 ++
 .../impl/CustomerAgencyServiceImpl.java       |  37 +++++-
 .../topic/controller/ResiTopicController.java |  17 ++-
 .../topic/service/ResiTopicService.java       |   8 ++
 .../service/impl/ResiTopicServiceImpl.java    |   6 +
 21 files changed, 455 insertions(+), 8 deletions(-)
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/CloseIssueFormDTO.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/UserMessageConstant.java
 create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyGridResultDTO.java

diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/CloseIssueFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/CloseIssueFormDTO.java
new file mode 100644
index 0000000000..d633a49564
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/CloseIssueFormDTO.java
@@ -0,0 +1,27 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 议题管理-关闭议题-接口入参
+ * @Author sun
+ */
+@Data
+public class CloseIssueFormDTO implements Serializable {
+    private static final long serialVersionUID = 4859779755214502427L;
+
+    @NotBlank(message = "议题Id不能为空")
+    private String issueId;
+
+    @NotBlank(message = "解决状态不能为空")
+    private String resolveType;
+
+    @NotBlank(message = "关闭理由不能为空")
+    @Length(max=1000,message = "手机号不能超过1000位")
+    private String closeReason;
+}
+
diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml
index 98fa317a75..35dc7a854b 100644
--- a/epmet-module/gov-issue/gov-issue-server/pom.xml
+++ b/epmet-module/gov-issue/gov-issue-server/pom.xml
@@ -60,6 +60,24 @@
             <artifactId>feign-httpclient</artifactId>
             <version>10.3.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>gov-org-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>resi-group-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-message-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java
index f8c36c2cac..48ed20352d 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java
@@ -14,4 +14,42 @@ package com.epmet.constant;
  * @since 1.0.0
  */
 public interface IssueConstant {
+    /**
+     * 议题状态-表决中
+     */
+    String ISSUE_VOTING = "voting";
+    /**
+     * 议题状态-已转项目
+     */
+    String ISSUE_SHIFT_PROJECT = "shift_project";
+    /**
+     * 议题状态-已关闭
+     */
+    String ISSUE_CLOSED = "closed";
+    /**
+     * 议题解决类型-已解决
+     */
+    String ISSUE_RESLOVED = "resloved";
+    /**
+     * 议题解决类型-未解决
+     */
+    String ISSUE_UNRESLOVED = "unresloved";
+
+    String SELECT_EXCEPTION = "获取议题详情数据失败";
+    String UPPDATE_EXCEPTION = "议题详情表数据更新失败";
+
+    /**
+     * 议题来源类型类型-话题
+     */
+    String ISSUE_RESI_TOPIC = "resi_topic";
+
+    String SELECT_TOPIC_EXCEPTION = "获取话题数据失败";
+    String SAVE_MSG_EXCEPTION = "关闭议题时给用户发送消息失败";
+
+    /**
+     * 议题管理-操作人所属机构类型（机构：agency | 部门：dept | 网格：grid）
+     */
+    String ISSUE_AGENCY = "agency";
+    String ISSUE_DEPT = "dept";
+    String ISSUE_GRID = "grid";
 }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/UserMessageConstant.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/UserMessageConstant.java
new file mode 100644
index 0000000000..ccbb7faa87
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/UserMessageConstant.java
@@ -0,0 +1,25 @@
+package com.epmet.constant;
+
+/**
+ * @Description 议题管理模块消息通知
+ * @Author sun
+ */
+public interface UserMessageConstant {
+
+    /**
+     * 消息标题
+     */
+    String ISSUE_TITLE = "您有一条议题消息";
+
+    /**
+     * 议题关闭时，选择已解决
+     */
+    String ISSUE_RESLOVED_MSG = "您好，您发表的话题\"%s\"问题已解决，解决方案是：%s";
+
+    /**
+     * 议题关闭时，选择无需解决
+     */
+    String ISSUE_UNRESLOVED_MSG = "您好，您发表的话题\"%s\"问题无需解决，原因：%s";
+
+
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java
index 186e2a2e3a..6ad967cdca 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java
@@ -1,5 +1,16 @@
 package com.epmet.controller;
 
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.annotation.RequirePermission;
+import com.epmet.commons.tools.enums.RequirePermissionEnum;
+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.dto.form.CloseIssueFormDTO;
+import com.epmet.service.IssueService;
+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;
 
@@ -11,5 +22,22 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("manage")
 public class IssueManageController {
+
+    @Autowired
+    private IssueService issueService;
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 议题管理-关闭议题
+     **/
+    @PostMapping("closeissue")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_CLOSE)
+    public Result closeIssue(@LoginUser TokenDto tokenDTO, @RequestBody CloseIssueFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        issueService.closeIssue(formDTO);
+        return new Result();
+    }
 }
 
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
index b8f7090437..9cd829abe4 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
@@ -1,8 +1,13 @@
 package com.epmet.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.CustomerGridDTO;
+import com.epmet.dto.form.CustomerGridFormDTO;
+import com.epmet.dto.result.AgencyGridResultDTO;
 import com.epmet.feign.fallback.GovOrgFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
 
 /**
  * @Description 调用gov-org服务
@@ -11,4 +16,12 @@ import org.springframework.cloud.openfeign.FeignClient;
  */
 @FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class)
 public interface GovOrgFeignClient {
+    /**
+     * @param
+     * @return
+     * @Author sun
+     * @Description 根据组织Id、网格Id查询组织、网格名称
+     **/
+    @PostMapping("/gov/org/customergrid/getcustomergridbygridid")
+    Result<AgencyGridResultDTO> getAgencyAndGrid(AgencyGridResultDTO agencyGridResultDTO);
 }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/MessageFeignClient.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/MessageFeignClient.java
index 0f61ebfa6b..3c994298c5 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/MessageFeignClient.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/MessageFeignClient.java
@@ -1,8 +1,14 @@
 package com.epmet.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.UserMessageFormDTO;
 import com.epmet.feign.fallback.MessageFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PostMapping;
+
+import java.util.List;
 
 /**
  * @Description 调用epmet-message服务
@@ -11,4 +17,13 @@ import org.springframework.cloud.openfeign.FeignClient;
  */
 @FeignClient(name = ServiceConstant.EPMET_MESSAGE_SERVER, fallback = MessageFeignClientFallback.class)
 public interface MessageFeignClient {
+
+    /**
+     * @param msgList
+     * @return com.epmet.commons.tools.utils.Result
+     * @Author sun
+     * @Description 关闭议题给话题创建人和议题发起人发送消息
+     **/
+    @PostMapping(value = "message/usermessage/saveusermessagelist", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    Result saveUserMessageList(List<UserMessageFormDTO> msgList);
 }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java
index f47fd95a21..6ca577ec34 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java
@@ -1,8 +1,13 @@
 package com.epmet.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.result.AgencyGridResultDTO;
 import com.epmet.feign.fallback.ResiGroupFeignClientFallBack;
+import com.epmet.resi.group.dto.topic.ResiTopicDTO;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
 
 /**
  * @Description 调用resi-group服务
@@ -11,4 +16,13 @@ import org.springframework.cloud.openfeign.FeignClient;
  */
 @FeignClient(name = ServiceConstant.RESI_GROUP_SERVER, fallback = ResiGroupFeignClientFallBack.class)
 public interface ResiGroupFeignClient {
+
+    /**
+     * @param
+     * @return
+     * @Author sun
+     * @Description 根据话题Id查询话题信息
+     **/
+    @PostMapping("/resi/group/topic/gettopicbyid/{topicId}")
+    Result<ResiTopicDTO> getTopicById(@PathVariable("topicId") String topicId);
 }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
index 5205700ec6..8aec17593a 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
@@ -1,5 +1,9 @@
 package com.epmet.feign.fallback;
 
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.result.AgencyGridResultDTO;
 import com.epmet.feign.GovOrgFeignClient;
 import org.springframework.stereotype.Component;
 
@@ -9,4 +13,8 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class GovOrgFeignClientFallBack implements GovOrgFeignClient {
+    @Override
+    public Result<AgencyGridResultDTO> getAgencyAndGrid(AgencyGridResultDTO agencyGridResultDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getagencyandgrid", agencyGridResultDTO);
+    }
 }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/MessageFeignClientFallback.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/MessageFeignClientFallback.java
index ebd50f1adc..bb5491ea78 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/MessageFeignClientFallback.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/MessageFeignClientFallback.java
@@ -3,13 +3,21 @@ package com.epmet.feign.fallback;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.UserMessageFormDTO;
 import com.epmet.feign.MessageFeignClient;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * @Description 调用epmet-message服务
  * @Author sun
  */
 @Component
 public class MessageFeignClientFallback implements MessageFeignClient {
+
+    @Override
+    public Result saveUserMessageList(List<UserMessageFormDTO> msgList) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "saveUserMessageList", msgList);
+    }
 }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java
index dfb34c250d..6f09e42b89 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java
@@ -1,6 +1,11 @@
 package com.epmet.feign.fallback;
 
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.result.AgencyGridResultDTO;
 import com.epmet.feign.ResiGroupFeignClient;
+import com.epmet.resi.group.dto.topic.ResiTopicDTO;
 import org.springframework.stereotype.Component;
 
 /**
@@ -9,4 +14,8 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class ResiGroupFeignClientFallBack implements ResiGroupFeignClient {
+    @Override
+    public Result<ResiTopicDTO> getTopicById(String topicId) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "gettopicbyid", topicId);
+    }
 }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java
index 7890e150fa..ab38c329c5 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java
@@ -1,6 +1,7 @@
 package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.dto.form.CloseIssueFormDTO;
 import com.epmet.dto.form.IssueDetailFormDTO;
 import com.epmet.dto.result.IssueResultDTO;
 import com.epmet.entity.IssueEntity;
@@ -19,4 +20,12 @@ public interface IssueService extends BaseService<IssueEntity> {
      */
     IssueResultDTO detail(IssueDetailFormDTO issueDetail);
 
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 议题管理-关闭议题
+     **/
+    void closeIssue(CloseIssueFormDTO formDTO);
+
 }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
index 327d135bd8..536a12307e 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
@@ -1,13 +1,34 @@
 package com.epmet.service.impl;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.AppClientConstant;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.constant.IssueConstant;
+import com.epmet.constant.ReadFlagConstant;
+import com.epmet.constant.UserMessageConstant;
 import com.epmet.dao.IssueDao;
+import com.epmet.dao.IssueProcessDao;
+import com.epmet.dto.form.CloseIssueFormDTO;
 import com.epmet.dto.form.IssueDetailFormDTO;
+import com.epmet.dto.form.UserMessageFormDTO;
+import com.epmet.dto.result.AgencyGridResultDTO;
 import com.epmet.dto.result.IssueResultDTO;
 import com.epmet.entity.IssueEntity;
+import com.epmet.entity.IssueProcessEntity;
+import com.epmet.feign.GovOrgFeignClient;
+import com.epmet.feign.MessageFeignClient;
+import com.epmet.feign.ResiGroupFeignClient;
+import com.epmet.resi.group.dto.topic.ResiTopicDTO;
 import com.epmet.service.IssueService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 /**
  * @Author zxc
@@ -18,6 +39,14 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
 
     @Autowired
     private IssueDao issueDao;
+    @Autowired
+    private GovOrgFeignClient govOrgFeignClient;
+    @Autowired
+    private IssueProcessDao issueProcessDao;
+    @Autowired
+    private ResiGroupFeignClient resiGroupFeignClient;
+    @Autowired
+    private MessageFeignClient messageFeignClient;
 
     /**
      * @Description  议题详情
@@ -31,4 +60,80 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         IssueResultDTO issueResult = issueDao.issueDetail(issueDetail);
         return issueResult;
     }
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 议题管理-关闭议题
+     **/
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void closeIssue(CloseIssueFormDTO formDTO) {
+        Date date = new Date();
+        //1:更新议题详情表数据
+        IssueEntity entity = baseDao.selectById(formDTO.getIssueId());
+        if (null == entity) {
+            throw new RenException(IssueConstant.SELECT_EXCEPTION);
+        }
+        entity.setIssueStatus(IssueConstant.ISSUE_CLOSED);
+        entity.setCloseReason(formDTO.getCloseReason());
+        entity.setResolveType(formDTO.getResolveType());
+        entity.setVotingDeadline(date);
+        entity.setClosedTime(date);
+        if (baseDao.updateById(entity) < NumConstant.ONE) {
+            throw new RenException(IssueConstant.UPPDATE_EXCEPTION);
+        }
+        //2:调用gov-org服务，查询组织网格名称
+        AgencyGridResultDTO agencyGridResultDTO = new AgencyGridResultDTO();
+        agencyGridResultDTO.setAgencyId(entity.getOrgId());
+        agencyGridResultDTO.setGridId(entity.getGridId());
+        Result<AgencyGridResultDTO> resultDTO = govOrgFeignClient.getAgencyAndGrid(agencyGridResultDTO);
+        agencyGridResultDTO = resultDTO.getData();
+        //3:议题进展记录表新增数据
+        IssueProcessEntity processEntity = new IssueProcessEntity();
+        processEntity.setIssueId(formDTO.getIssueId());
+        processEntity.setIssueStatus(IssueConstant.ISSUE_CLOSED);
+        processEntity.setOrgType(IssueConstant.ISSUE_GRID);
+        processEntity.setOrgId(entity.getOrgId());
+        processEntity.setOperationExplain(formDTO.getCloseReason());
+        processEntity.setOrgName(agencyGridResultDTO.getAgencyName()+"-"+agencyGridResultDTO.getGridName());
+        issueProcessDao.insert(processEntity);
+        //4:调用epmet-message服务，给居民端话题创建人和议题发起人发送消息
+        if(!saveUserMessageList(formDTO, entity).success()){
+            throw new RenException(IssueConstant.SAVE_MSG_EXCEPTION);
+        }
+    }
+    /**
+     * @Description 关闭议题给话题创建人和议题发起人发送消息
+     * @author sun
+     */
+    private Result saveUserMessageList(CloseIssueFormDTO formDTO, IssueEntity entity){
+        //1:调用resi-group查询话题创建人数据(目前议题来源只有来自话题)
+        Result<ResiTopicDTO> resultTopicDTO = resiGroupFeignClient.getTopicById(entity.getSourceId());
+        if (!resultTopicDTO.success() || null == resultTopicDTO.getData()) {
+            throw new RenException(IssueConstant.SELECT_TOPIC_EXCEPTION);
+        }
+        ResiTopicDTO topicDTO = resultTopicDTO.getData();
+        //2:分别给话题创建人、议题发起人发送消息
+        List<UserMessageFormDTO> msgList = new ArrayList<>();
+        UserMessageFormDTO msgDTO = new UserMessageFormDTO();
+        msgDTO.setCustomerId(entity.getCustomerId());
+        msgDTO.setGridId(entity.getGridId());
+        msgDTO.setApp(AppClientConstant.APP_RESI);
+        msgDTO.setTitle(UserMessageConstant.ISSUE_TITLE);
+        String messageContent = "";
+        if (IssueConstant.ISSUE_RESLOVED.equals(formDTO.getResolveType())) {
+            messageContent = String.format(UserMessageConstant.ISSUE_RESLOVED_MSG, topicDTO.getTopicContent(), formDTO.getCloseReason());
+        } else if (IssueConstant.ISSUE_UNRESLOVED.equals(formDTO.getResolveType())) {
+            messageContent = String.format(UserMessageConstant.ISSUE_UNRESLOVED_MSG, topicDTO.getTopicContent(), formDTO.getCloseReason());
+        }
+        msgDTO.setMessageContent(messageContent);
+        msgDTO.setReadFlag(ReadFlagConstant.UN_READ);
+        msgDTO.setUserId(topicDTO.getCreatedBy());
+        msgList.add(msgDTO);
+        msgDTO.setUserId(entity.getCreatedBy());
+        msgList.add(msgDTO);
+        return messageFeignClient.saveUserMessageList(msgList);
+    }
 }
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyGridResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyGridResultDTO.java
new file mode 100644
index 0000000000..26fe8f9292
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyGridResultDTO.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.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 查询组织网格名称-接口返参
+ *
+ * @author sun
+ */
+@Data
+public class AgencyGridResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 机关组织Id
+     */
+    private String agencyId;
+    /**
+     * 机关组织名称
+     */
+    private String agencyName;
+    /**
+     * 网格Id
+     */
+    private String gridId;
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java
index 7200bca2a3..330185b612 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java
@@ -34,4 +34,8 @@ public interface CustomerAgencyConstant {
 	 * 区县名称不能为空
 	 */
 	String DISTRICT_EXCEPTION = "区县级机关名称不能为空";
+	/**
+	 * 组织信息查询失败
+	 */
+	String SELECT_EXCEPTION = "根据组织ID未查询到机构组织信息";
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
index 9de0e27f8e..ee839de020 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
@@ -27,6 +27,7 @@ import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.form.StaffOrgFormDTO;
+import com.epmet.dto.result.AgencyGridResultDTO;
 import com.epmet.dto.result.StaffOrgsResultDTO;
 import com.epmet.excel.CustomerAgencyExcel;
 import com.epmet.service.CustomerAgencyService;
@@ -104,4 +105,16 @@ public class CustomerAgencyController {
     public Result<List<StaffOrgsResultDTO>> getStaffOrgList(@RequestBody StaffOrgFormDTO staffOrgsFormDTO) {
         return customerAgencyService.getStaffOrgList(staffOrgsFormDTO);
     }
+
+    /**
+     * @param agencyGridResultDTO
+     * @return
+     * @Author sun
+     * @Description 根据组织Id、网格Id查询组织、网格名称
+     **/
+    @PostMapping("getagencyandgrid")
+    public Result<AgencyGridResultDTO> getAgencyAndGrid(@RequestBody AgencyGridResultDTO agencyGridResultDTO) {
+        return new Result<AgencyGridResultDTO>().ok(customerAgencyService.getAgencyAndGrid(agencyGridResultDTO));
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
index 62892b4576..dceb37c12e 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
@@ -22,6 +22,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.form.StaffOrgFormDTO;
+import com.epmet.dto.result.AgencyGridResultDTO;
 import com.epmet.dto.result.StaffOrgsResultDTO;
 import com.epmet.entity.CustomerAgencyEntity;
 
@@ -104,4 +105,12 @@ public interface CustomerAgencyService extends BaseService<CustomerAgencyEntity>
      * @Date 2020/4/20 21:45
      **/
     Result<List<StaffOrgsResultDTO>> getStaffOrgList(StaffOrgFormDTO staffOrgsFormDTO);
+
+    /**
+     * @param agencyGridResultDTO
+     * @return
+     * @Author sun
+     * @Description 根据组织Id、网格Id查询组织、网格名称
+     **/
+    AgencyGridResultDTO getAgencyAndGrid(AgencyGridResultDTO agencyGridResultDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
index 06f83a0d25..43d442b32e 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
@@ -21,19 +21,22 @@ 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.constant.NumConstant;
-import com.epmet.commons.tools.exception.EpmetErrorCode;
 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.utils.Result;
 import com.epmet.constant.CustomerAgencyConstant;
+import com.epmet.constant.CustomerGridConstant;
 import com.epmet.dao.CustomerAgencyDao;
+import com.epmet.dao.CustomerGridDao;
 import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.CustomerDTO;
-import com.epmet.dto.form.*;
-import com.epmet.dto.result.*;
+import com.epmet.dto.form.CustomerFormDTO;
+import com.epmet.dto.form.StaffOrgFormDTO;
+import com.epmet.dto.result.AgencyGridResultDTO;
+import com.epmet.dto.result.StaffOrgsResultDTO;
 import com.epmet.entity.CustomerAgencyEntity;
+import com.epmet.entity.CustomerGridEntity;
 import com.epmet.feign.OperCrmFeignClient;
 import com.epmet.redis.CustomerAgencyRedis;
 import com.epmet.service.CustomerAgencyService;
@@ -62,6 +65,8 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
     private CustomerAgencyRedis customerAgencyRedis;
     @Autowired
     private OperCrmFeignClient operCrmFeignClient;
+    @Autowired
+    private CustomerGridDao customerGridDao;
     @Override
     public PageData<CustomerAgencyDTO> page(Map<String, Object> params) {
         IPage<CustomerAgencyEntity> page = baseDao.selectPage(
@@ -138,4 +143,28 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         }
         return new Result<List<StaffOrgsResultDTO>>().ok(list);
     }
+
+    /**
+     * @param agencyGridResultDTO
+     * @return
+     * @Author sun
+     * @Description 根据组织Id、网格Id查询组织、网格名称
+     **/
+    @Override
+    public AgencyGridResultDTO getAgencyAndGrid(AgencyGridResultDTO agencyGridResultDTO) {
+        //1:查询组织机关信息
+        CustomerAgencyEntity agencyEntity = baseDao.selectById(agencyGridResultDTO.getAgencyId());
+        if (null == agencyEntity) {
+            throw new RenException(CustomerAgencyConstant.SELECT_EXCEPTION);
+        }
+        agencyGridResultDTO.setAgencyName(agencyEntity.getOrganizationName());
+        //2:查询网格信
+        CustomerGridEntity gridEntity = customerGridDao.selectById(agencyGridResultDTO.getGridId());
+        if (null == gridEntity) {
+            throw new RenException(CustomerGridConstant.SELECT_EXCEPTION);
+        }
+        agencyGridResultDTO.setGridName(gridEntity.getGridName());
+        return agencyGridResultDTO;
+    }
+
 }
\ No newline at end of file
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 6a86db52ff..9391a4c9d6 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
@@ -5,6 +5,7 @@ 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.modules.topic.service.ResiTopicService;
+import com.epmet.resi.group.dto.topic.ResiTopicDTO;
 import com.epmet.resi.group.dto.topic.TopicInfoDTO;
 import com.epmet.resi.group.dto.topic.form.*;
 import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO;
@@ -12,10 +13,7 @@ import com.epmet.resi.group.dto.topic.result.ResiTopicIncludeIssueDetailResultDT
 import com.epmet.resi.group.dto.topic.result.ResiTopicIncludeIssueInfoResultDTO;
 import com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO;
 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 org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -199,4 +197,15 @@ public class ResiTopicController {
         return new Result<TopicInfoDTO>().ok(topicService.selectDetail(topicInfo));
     }
 
+    /**
+     * @param topicId
+     * @return
+     * @Author sun
+     * @Description 根据话题Id查询话题信息
+     **/
+    @PostMapping(value = "gettopicbyid/{topicId}")
+    public Result<ResiTopicDTO> getTopicById(@PathVariable("topicId") String topicId){
+        return new Result<ResiTopicDTO>().ok(topicService.getTopicById(topicId));
+    }
+
 }
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 f7694dcf76..74cc6c3633 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
@@ -229,4 +229,12 @@ public interface ResiTopicService extends BaseService<ResiTopicEntity> {
      */
     TopicInfoDTO selectDetail(TopicInfoFormDTO formDTO);
 
+    /**
+     * @param topicId
+     * @return
+     * @Author sun
+     * @Description 根据话题Id查询话题信息
+     **/
+    ResiTopicDTO getTopicById(String topicId);
+
 }
\ No newline at end of file
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 920c6cfda4..f775c004d6 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
@@ -931,6 +931,12 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         topicInfo.setPublishedUser(issueInitiatorResult.getData().getIssueInitiator());
         return topicInfo;
     }
+
+    @Override
+    public ResiTopicDTO getTopicById(String topicId) {
+        ResiTopicEntity entity = baseDao.selectById(topicId);
+        return ConvertUtils.sourceToTarget(entity, ResiTopicDTO.class);
+    }
 }
 
 

From 46d7aa095ee0df8ac7c3e9642fd3c212f5fb81f2 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 12 May 2020 15:35:21 +0800
Subject: [PATCH 25/45] =?UTF-8?q?=E6=BB=9E=E7=95=99=E5=A4=A9=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../handler/FieldMetaObjectHandler.java       |  2 +-
 .../main/java/com/epmet/dto/CalenderDTO.java  |  6 ++
 .../com/epmet/dto/form/CalenderFormDTO.java   | 68 +++++++++++++
 .../epmet/controller/CalenderController.java  |  3 +-
 .../epmet/controller/ShowApiController.java   | 20 +++-
 .../main/java/com/epmet/dao/CalenderDao.java  |  2 +-
 .../com/epmet/service/CalenderService.java    |  3 +-
 .../com/epmet/service/ShowApiService.java     |  4 +
 .../service/impl/CalenderServiceImpl.java     | 96 ++++++++++++++++++-
 .../service/impl/ShowApiServiceImpl.java      | 71 +++++++++++++-
 ...duleTask.java => WorkDayScheduleTask.java} | 20 ++--
 .../java/com/epmet/dao/OperLanguageDao.java   |  1 +
 .../service/impl/OperLanguageServiceImpl.java |  2 +-
 .../main/resources/mapper/OperLanguageDao.xml |  5 +
 14 files changed, 280 insertions(+), 23 deletions(-)
 create mode 100644 epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/form/CalenderFormDTO.java
 rename epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/task/{SaticScheduleTask.java => WorkDayScheduleTask.java} (51%)

diff --git a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/handler/FieldMetaObjectHandler.java b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/handler/FieldMetaObjectHandler.java
index fcd85b0c0e..1b9215e22a 100644
--- a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/handler/FieldMetaObjectHandler.java
+++ b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/handler/FieldMetaObjectHandler.java
@@ -61,7 +61,7 @@ public class FieldMetaObjectHandler implements MetaObjectHandler {
             setFieldValByName(FieldConstant.DEL_FLAG_HUMP, EpmetDelFlagEnum.NORMAL.value(), metaObject);
             // 数据权限标志
             //setInsertFieldValByName(DEPT_ID, deptId, metaObject);
-        } else {
+        } else if (metaObject.getOriginalObject() instanceof BaseEntity) {
             UserDetail user = SecurityUser.getUser();
             // renren自带的
             if (user == null) {
diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/CalenderDTO.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/CalenderDTO.java
index 77c75ed9e3..220ec8ef12 100644
--- a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/CalenderDTO.java
+++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/CalenderDTO.java
@@ -19,7 +19,10 @@ package com.epmet.dto;
 
 import java.io.Serializable;
 import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.hibernate.validator.constraints.Length;
 
 
 /**
@@ -51,6 +54,7 @@ public class CalenderDTO implements Serializable {
     /**
      * 查询的日期:20200510
      */
+    @JsonFormat(pattern="yyyy-MM-dd")
 	private Date queryDate;
 
     /**
@@ -61,11 +65,13 @@ public class CalenderDTO implements Serializable {
     /**
      * 节日或周末开始时间，如果是工作日，此字段为空串
      */
+    @Length(max = 8)
 	private String begin;
 
     /**
      * 节日或周末结束时间，如果是工作日，此字段为空串
      */
+    @Length(max = 8)
 	private String end;
 
     /**
diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/form/CalenderFormDTO.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/form/CalenderFormDTO.java
new file mode 100644
index 0000000000..e2e8ab6512
--- /dev/null
+++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/form/CalenderFormDTO.java
@@ -0,0 +1,68 @@
+package com.epmet.dto.form;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description TODO
+ * @Author yinzuomei
+ * @Date 2020/5/12 14:09
+ */
+@Data
+public class CalenderFormDTO implements Serializable {
+    private static final long serialVersionUID = -62868343447396944L;
+
+    /**
+     * 查询的日期:20200510
+     */
+    @JsonFormat(pattern="yyyy-MM-dd")
+    private Date queryDate;
+
+    /**
+     * 星期几的数字
+     */
+    private Integer weekday;
+
+    /**
+     * 节日或周末开始时间，如果是工作日，此字段为空串
+     */
+    @Length(max = 8)
+    private String begin;
+
+    /**
+     * 节日或周末结束时间，如果是工作日，此字段为空串
+     */
+    @Length(max = 8)
+    private String end;
+
+    /**
+     * 节日备注
+     */
+    private String holidayRemark;
+
+    /**
+     * 1为工作日，2为周末，3为节假日
+     */
+    private String type;
+
+    /**
+     * 节日名称，工作日时显示“无”，周末时显示“周末”，节日时显示节日名称
+     */
+    private String holiday;
+
+    /**
+     * 星期几的英文名
+     */
+    private String en;
+
+    /**
+     * 星期几的中文名
+     */
+    private String cn;
+
+}
+
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/CalenderController.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/CalenderController.java
index a3acf8c5ff..80d0062bec 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/CalenderController.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/CalenderController.java
@@ -25,6 +25,7 @@ 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.CalenderDTO;
+import com.epmet.dto.form.CalenderFormDTO;
 import com.epmet.service.CalenderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -58,7 +59,7 @@ public class CalenderController {
     }
 
     @PostMapping
-    public Result save(@RequestBody CalenderDTO dto){
+    public Result save(@RequestBody CalenderFormDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
         calenderService.save(dto);
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ShowApiController.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ShowApiController.java
index 209c3f4cc4..7b01acac0c 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ShowApiController.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ShowApiController.java
@@ -21,11 +21,11 @@ public class ShowApiController {
     private ShowApiService showApiService;
 
     /**
-     * @return com.epmet.commons.tools.utils.Result
      * @param year
+     * @return com.epmet.commons.tools.utils.Result
      * @Author yinzuomei
      * @Description 初始化日历插入数据库
-     * @Date 2020/5/11 23:23 
+     * @Date 2020/5/11 23:23
      **/
     @PostMapping("init/{year}")
     public Result initYearCalender(@PathVariable("year") String year) {
@@ -46,11 +46,11 @@ public class ShowApiController {
     }
 
     /**
-     * @return com.epmet.commons.tools.utils.Result
      * @param year
+     * @return com.epmet.commons.tools.utils.Result
      * @Author yinzuomei
      * @Description 根据年份查询当年的节假日列表(调用api同步到本地)
-     * @Date 2020/5/11 23:24 
+     * @Date 2020/5/11 23:24
      **/
     @PostMapping("holidayList/{year}")
     public Result holidayList(@PathVariable("year") String year) {
@@ -58,5 +58,17 @@ public class ShowApiController {
         return new Result();
     }
 
+    /**
+     * @param day yyyyMMdd
+     * @return com.epmet.commons.tools.utils.Result
+     * @Author yinzuomei
+     * @Description 拉取某一天的日历详情
+     * @Date 2020/5/12 14:45
+     **/
+    @PostMapping("initWorkDay/{day}")
+    public Result initWorkDay(@PathVariable("day") String day) {
+        showApiService.initWorkDay(day);
+        return new Result();
+    }
 }
 
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/CalenderDao.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/CalenderDao.java
index 1240add1e1..2d18e22648 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/CalenderDao.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/CalenderDao.java
@@ -36,7 +36,7 @@ public interface CalenderDao extends BaseDao<CalenderEntity> {
 
     int updateHoliday(HolidayDetailDTO holidayDetail);
 
-    CalenderEntity selectByDay(String day);
+    List<CalenderEntity> selectByDay(String day);
 
     List<CalenderEntity> selectList(String year);
 
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/CalenderService.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/CalenderService.java
index 5dbc9c2634..0f4fac02b8 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/CalenderService.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/CalenderService.java
@@ -20,6 +20,7 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.CalenderDTO;
+import com.epmet.dto.form.CalenderFormDTO;
 import com.epmet.entity.CalenderEntity;
 
 import java.util.List;
@@ -71,7 +72,7 @@ public interface CalenderService extends BaseService<CalenderEntity> {
      * @author generator
      * @date 2020-05-11
      */
-    void save(CalenderDTO dto);
+    void save(CalenderFormDTO dto);
 
     /**
      * 默认更新
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ShowApiService.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ShowApiService.java
index 372c247ca7..b5dc546c2b 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ShowApiService.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ShowApiService.java
@@ -1,5 +1,7 @@
 package com.epmet.service;
 
+import java.util.Date;
+
 /**
  * @Description 工作日信息维护
  * @Author yinzuomei
@@ -13,4 +15,6 @@ public interface ShowApiService {
 
     void holidayList(String year);
 
+    void initWorkDay(String currentDate);
+
 }
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/CalenderServiceImpl.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/CalenderServiceImpl.java
index 6c0dca44c8..518577e6c0 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/CalenderServiceImpl.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/CalenderServiceImpl.java
@@ -25,13 +25,16 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.CalenderDao;
 import com.epmet.dto.CalenderDTO;
+import com.epmet.dto.form.CalenderFormDTO;
 import com.epmet.entity.CalenderEntity;
 import com.epmet.service.CalenderService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.text.SimpleDateFormat;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -60,9 +63,11 @@ public class CalenderServiceImpl extends BaseServiceImpl<CalenderDao, CalenderEn
 
     private QueryWrapper<CalenderEntity> getWrapper(Map<String, Object> params) {
         String id = (String) params.get(FieldConstant.ID_HUMP);
-
+        String day = (String) params.get("day");
         QueryWrapper<CalenderEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id)
+                .like(StringUtils.isNotBlank(day),"day",day);
+        wrapper.orderByAsc("QUERY_DATE");
 
         return wrapper;
     }
@@ -75,18 +80,91 @@ public class CalenderServiceImpl extends BaseServiceImpl<CalenderDao, CalenderEn
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void save(CalenderDTO dto) {
+    public void save(CalenderFormDTO dto) {
         CalenderEntity entity = ConvertUtils.sourceToTarget(dto, CalenderEntity.class);
+        SimpleDateFormat format=new SimpleDateFormat("yyyyMMdd");
+        entity.setDay(format.format(dto.getQueryDate()));
+        entity.setTypeName(this.getTypeName(dto.getType()));
+        entity.setCn(this.getCnValue(dto.getWeekday()));
+        entity.setEn(this.getEnValue(dto.getWeekday()));
         insert(entity);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(CalenderDTO dto) {
+        dto.setTypeName(this.getTypeName(dto.getType()));
+        dto.setCn(this.getCnValue(dto.getWeekday()));
+        dto.setEn(this.getEnValue(dto.getWeekday()));
+
         CalenderEntity entity = ConvertUtils.sourceToTarget(dto, CalenderEntity.class);
         updateById(entity);
     }
 
+    private String getCnValue(Integer weekday) {
+        String cn="";
+        switch(weekday)
+        {
+            case 1:
+                cn="周一";
+                break;
+            case 2:
+                cn="周二";
+                break;
+            case 3:
+                cn="周三";
+                break;
+            case 4:
+                cn="周四";
+                break;
+            case 5:
+                cn="周五";
+                break;
+            case 6:
+                cn="周六";
+                break;
+            case 7:
+                cn="周日";
+                break;
+            default:
+                System.out.println("default");
+                break;
+        }
+        return  cn;
+    }
+
+    private String getEnValue(Integer weekday) {
+        String en="";
+        switch(weekday)
+        {
+            case 1:
+                en="Monday";
+                break;
+            case 2:
+                en="Tuesday";
+                break;
+            case 3:
+                en="Wednesday";
+                break;
+            case 4:
+                en="Thursday";
+                break;
+            case 5:
+                en="Friday";
+                break;
+            case 6:
+                en="Saturday";
+                break;
+            case 7:
+                en="Sunday";
+                break;
+            default:
+                System.out.println("default");
+                break;
+        }
+        return en;
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(String[] ids) {
@@ -94,4 +172,16 @@ public class CalenderServiceImpl extends BaseServiceImpl<CalenderDao, CalenderEn
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    private String getTypeName(String type) {
+        //1为工作日，2为周末，3为节假日
+        String typeName = "";
+        if ("1".equals(type)) {
+            typeName = "工作日";
+        } else if ("2".equals(type)) {
+            typeName = "周末";
+        } else if ("3".equals(type)) {
+            typeName = "节假日";
+        }
+        return typeName;
+    }
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ShowApiServiceImpl.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ShowApiServiceImpl.java
index 25a98d7bce..fbe6f7bb5b 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ShowApiServiceImpl.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ShowApiServiceImpl.java
@@ -13,6 +13,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.Format;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
@@ -43,8 +44,8 @@ public class ShowApiServiceImpl implements ShowApiService {
             long endTime = dateFormat.parse(dateEnd).getTime();//end
             long day = 1000 * 60 * 60 * 24;
             for (long i = startTime; i <= endTime; i += day) {
-                CalenderEntity calender = calenderDao.selectByDay(simpleDateFormat.format(new Date(i)));
-                if (null == calender) {
+                List<CalenderEntity> calenderList = calenderDao.selectByDay(simpleDateFormat.format(new Date(i)));
+                if (null == calenderList || calenderList.size() < 1) {
                     logger.info("日期：" + dateFormat.format(new Date(i)));
                     CalenderEntity calenderEntity = new CalenderEntity();
                     calenderEntity.setQueryDate(new Date(i));
@@ -123,6 +124,72 @@ public class ShowApiServiceImpl implements ShowApiService {
         }
     }
 
+    @Override
+    public void initWorkDay(String currentDate) {
+        DayDetailResultDTO dayDetailResultDTO = null;
+        try {
+            dayDetailResultDTO = ShowApiUtil.queryHolidayV2020(currentDate);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        List<CalenderEntity> list = calenderDao.selectByDay(currentDate);
+        if(null!=list&&list.size()>0){
+            if (null != dayDetailResultDTO && 0 == dayDetailResultDTO.getRet_code()) {
+                for (CalenderEntity calenderEntity : list) {
+                    calenderEntity.setRetCode(dayDetailResultDTO.getRet_code());
+                    calenderEntity.setWeekday(dayDetailResultDTO.getWeekDay());
+                    calenderEntity.setBegin(dayDetailResultDTO.getBegin());
+                    calenderEntity.setEnd(dayDetailResultDTO.getEnd());
+                    calenderEntity.setHoliday(dayDetailResultDTO.getHoliday());
+                    calenderEntity.setHolidayRemark(dayDetailResultDTO.getHoliday_remark());
+                    calenderEntity.setEn(dayDetailResultDTO.getEn());
+                    calenderEntity.setCn(dayDetailResultDTO.getCn());
+                    calenderEntity.setType(dayDetailResultDTO.getType());
+                    //1为工作日，2为周末，3为节假日
+                    if ("1".equals(dayDetailResultDTO.getType())) {
+                        calenderEntity.setTypeName("工作日");
+                    } else if ("2".equals(dayDetailResultDTO.getType())) {
+                        calenderEntity.setTypeName("周末");
+                    } else if ("3".equals(dayDetailResultDTO.getType())) {
+                        calenderEntity.setTypeName("节假日");
+                    }
+                    calenderDao.updateById(calenderEntity);
+                }
+            }
+        }else {
+            calenderDao.insert(getCalenderEntity(dayDetailResultDTO));
+        }
+    }
+
+    public CalenderEntity getCalenderEntity(DayDetailResultDTO dayDetailResultDTO) {
+        CalenderEntity calenderEntity = new CalenderEntity();
+        calenderEntity.setDay(dayDetailResultDTO.getDay());
+        try {
+            Date queryDate=simpleDateFormat.parse(dayDetailResultDTO.getDay());
+            calenderEntity.setQueryDate(queryDate);
+        } catch (ParseException e) {
+            logger.error("QUERY_DATE 赋值 错误");
+            e.printStackTrace();
+        }
+        calenderEntity.setRetCode(dayDetailResultDTO.getRet_code());
+        calenderEntity.setWeekday(dayDetailResultDTO.getWeekDay());
+        calenderEntity.setBegin(dayDetailResultDTO.getBegin());
+        calenderEntity.setEnd(dayDetailResultDTO.getEnd());
+        calenderEntity.setHoliday(dayDetailResultDTO.getHoliday());
+        calenderEntity.setHolidayRemark(dayDetailResultDTO.getHoliday_remark());
+        calenderEntity.setEn(dayDetailResultDTO.getEn());
+        calenderEntity.setCn(dayDetailResultDTO.getCn());
+        calenderEntity.setType(dayDetailResultDTO.getType());
+        //1为工作日，2为周末，3为节假日
+        if ("1".equals(dayDetailResultDTO.getType())) {
+            calenderEntity.setTypeName("工作日");
+        } else if ("2".equals(dayDetailResultDTO.getType())) {
+            calenderEntity.setTypeName("周末");
+        } else if ("3".equals(dayDetailResultDTO.getType())) {
+            calenderEntity.setTypeName("节假日");
+        }
+        return calenderEntity;
+    }
    /* public static void main(String[] args) throws ParseException {
         String dateStart = "2020-01-01";
         String dateEnd = "2020-12-31";
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/task/SaticScheduleTask.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/task/WorkDayScheduleTask.java
similarity index 51%
rename from epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/task/SaticScheduleTask.java
rename to epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/task/WorkDayScheduleTask.java
index bdca1553d2..b26ab24cb7 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/task/SaticScheduleTask.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/task/WorkDayScheduleTask.java
@@ -6,25 +6,27 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 
+import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
- * @Description TODO
+ * @Description 定时任务
  * @Author yinzuomei
  * @Date 2020/5/12 0:01
  */
-//@Configuration      //1.主要用于标记配置类，兼备Component的效果。
-//@EnableScheduling   // 2.开启定时任务
-public class SaticScheduleTask {
+@Configuration      //1.主要用于标记配置类，兼备Component的效果。
+@EnableScheduling   // 2.开启定时任务
+public class WorkDayScheduleTask {
     @Autowired
     private ShowApiService showApiService;
 
-    //3.添加定时任务
-    @Scheduled(cron = "0/1 * * * * ?")
-    //或直接指定时间间隔，例如：5秒
-    //@Scheduled(fixedRate=5000)
+    //每天晚上00:00:01执行{秒数} {分钟} {小时} {日期} {月份} {星期} {年份(可为空)}
+    @Scheduled(cron = "1 0 0 * * ?")
     private void configureTasks() {
-        showApiService.initWorkDayList("2020");
+        Date nowDate = new Date();
+        SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
+        showApiService.initWorkDay(format.format(nowDate));
         System.err.println("执行静态定时任务时间: " + LocalDateTime.now());
     }
 }
diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/dao/OperLanguageDao.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/dao/OperLanguageDao.java
index d681d328c3..0085399c5b 100644
--- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/dao/OperLanguageDao.java
+++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/dao/OperLanguageDao.java
@@ -24,4 +24,5 @@ public interface OperLanguageDao extends BaseDao<OperLanguageEntity> {
 
     void updateLanguage(OperLanguageEntity entity);
 
+    void insert1(OperLanguageEntity entity);
 }
diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperLanguageServiceImpl.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperLanguageServiceImpl.java
index ee486aa224..04c85454f7 100644
--- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperLanguageServiceImpl.java
+++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperLanguageServiceImpl.java
@@ -112,7 +112,7 @@ public class OperLanguageServiceImpl extends BaseServiceImpl<OperLanguageDao, Op
 
         //判断是否有数据
         if(baseDao.getLanguage(entity) == null){
-            baseDao.insert(entity);
+            baseDao.insert1(entity);
         }else {
             baseDao.updateLanguage(entity);
         }
diff --git a/epmet-module/oper-access/oper-access-server/src/main/resources/mapper/OperLanguageDao.xml b/epmet-module/oper-access/oper-access-server/src/main/resources/mapper/OperLanguageDao.xml
index 2b3f63c0e0..970afe91ca 100644
--- a/epmet-module/oper-access/oper-access-server/src/main/resources/mapper/OperLanguageDao.xml
+++ b/epmet-module/oper-access/oper-access-server/src/main/resources/mapper/OperLanguageDao.xml
@@ -13,4 +13,9 @@
           where table_name=#{tableName} and table_id=#{tableId} and field_name=#{fieldName} and language=#{language}
     </select>
 
+    <insert id="insert1" parameterType="com.epmet.entity.OperLanguageEntity">
+        INSERT INTO `oper_language` ( `table_name`, `table_id`, `field_name`, `field_value`, `language` )
+        VALUES
+        ( #{tableName}, #{tableId}, #{fieldName}, #{fieldValue}, #{language} )
+    </insert>
 </mapper>

From 15e78da1ac7c91a4435294079b59c048ef1e5f51 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 12 May 2020 15:37:40 +0800
Subject: [PATCH 26/45] insertOperLanguageEntity

---
 .../src/main/java/com/epmet/dao/OperLanguageDao.java            | 2 +-
 .../java/com/epmet/service/impl/OperLanguageServiceImpl.java    | 2 +-
 .../src/main/resources/mapper/OperLanguageDao.xml               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/dao/OperLanguageDao.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/dao/OperLanguageDao.java
index 0085399c5b..dfca54a9ab 100644
--- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/dao/OperLanguageDao.java
+++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/dao/OperLanguageDao.java
@@ -24,5 +24,5 @@ public interface OperLanguageDao extends BaseDao<OperLanguageEntity> {
 
     void updateLanguage(OperLanguageEntity entity);
 
-    void insert1(OperLanguageEntity entity);
+    void insertOperLanguageEntity(OperLanguageEntity entity);
 }
diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperLanguageServiceImpl.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperLanguageServiceImpl.java
index 04c85454f7..7ed89ecf7b 100644
--- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperLanguageServiceImpl.java
+++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperLanguageServiceImpl.java
@@ -112,7 +112,7 @@ public class OperLanguageServiceImpl extends BaseServiceImpl<OperLanguageDao, Op
 
         //判断是否有数据
         if(baseDao.getLanguage(entity) == null){
-            baseDao.insert1(entity);
+            baseDao.insertOperLanguageEntity(entity);
         }else {
             baseDao.updateLanguage(entity);
         }
diff --git a/epmet-module/oper-access/oper-access-server/src/main/resources/mapper/OperLanguageDao.xml b/epmet-module/oper-access/oper-access-server/src/main/resources/mapper/OperLanguageDao.xml
index 970afe91ca..a64735e21f 100644
--- a/epmet-module/oper-access/oper-access-server/src/main/resources/mapper/OperLanguageDao.xml
+++ b/epmet-module/oper-access/oper-access-server/src/main/resources/mapper/OperLanguageDao.xml
@@ -13,7 +13,7 @@
           where table_name=#{tableName} and table_id=#{tableId} and field_name=#{fieldName} and language=#{language}
     </select>
 
-    <insert id="insert1" parameterType="com.epmet.entity.OperLanguageEntity">
+    <insert id="insertOperLanguageEntity" parameterType="com.epmet.entity.OperLanguageEntity">
         INSERT INTO `oper_language` ( `table_name`, `table_id`, `field_name`, `field_value`, `language` )
         VALUES
         ( #{tableName}, #{tableId}, #{fieldName}, #{fieldValue}, #{language} )

From f777848ee8085c581c659b0f033916ff110a01bd Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 12 May 2020 15:40:22 +0800
Subject: [PATCH 27/45] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E5=BC=95=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/controller/WorkDayController.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/WorkDayController.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/WorkDayController.java
index 679613a48d..0d975a0c31 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/WorkDayController.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/WorkDayController.java
@@ -11,7 +11,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
-import java.util.Set;
 
 /**
  * @Description 工作日计算

From 68c87a9197d5b74a9fb55eb94ed548a76d23d18d Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 12 May 2020 15:49:58 +0800
Subject: [PATCH 28/45] =?UTF-8?q?=E5=88=A0=E9=99=A4resi-hall,gov-issue,gov?=
 =?UTF-8?q?-projecctdemo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/form/DemoTestFormDTO.java   | 21 ---------------
 .../controller/GovIssueDemoController.java    | 27 -------------------
 .../controller/ResiHallDemoController.java    | 27 -------------------
 .../com/epmet/dto/form/DemoTestFormDTO.java   | 21 ---------------
 .../controller/GovProjectDemoController.java  | 27 -------------------
 .../com/epmet/dto/form/DemoTestFormDTO.java   | 21 ---------------
 6 files changed, 144 deletions(-)
 delete mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/DemoTestFormDTO.java
 delete mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/GovIssueDemoController.java
 delete mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/ResiHallDemoController.java
 delete mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/DemoTestFormDTO.java
 delete mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/GovProjectDemoController.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/DemoTestFormDTO.java

diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/DemoTestFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/DemoTestFormDTO.java
deleted file mode 100644
index fc93172558..0000000000
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/DemoTestFormDTO.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.epmet.dto.form;
-
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import java.io.Serializable;
-
-/**
- * @Description 测试入参
- * @Author yinzuomei
- * @Date 2020/5/8 10:00
- */
-@Data
-public class DemoTestFormDTO implements Serializable {
-    private static final long serialVersionUID = 4859779755214502427L;
-    @NotBlank(message = "客户id不能为空")
-    private String customerId;
-    @NotBlank(message = "网格id不能为空")
-    private String gridId;
-}
-
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/GovIssueDemoController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/GovIssueDemoController.java
deleted file mode 100644
index 174ac7a057..0000000000
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/GovIssueDemoController.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.epmet.controller;
-
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.dto.form.DemoTestFormDTO;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @Description 测试
- * @Author yinzuomei
- * @Date 2020/5/7 22:47
- */
-@RestController
-@RequestMapping("demo")
-public class GovIssueDemoController {
-    private static final Logger logger = LoggerFactory.getLogger(GovIssueDemoController.class);
-
- /*   @PostMapping("test")
-    public Result test(@RequestBody DemoTestFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO);
-        logger.info(String.format("请求成功客户id[%s],网格id[%s]",formDTO.getCustomerId(),formDTO.getGridId()));
-        return new Result().ok("gov-issue-server请求成功");
-    }*/
-}
-
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/ResiHallDemoController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/ResiHallDemoController.java
deleted file mode 100644
index 6f8021d0df..0000000000
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/ResiHallDemoController.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.epmet.controller;
-
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.dto.form.DemoTestFormDTO;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @Description 测试
- * @Author yinzuomei
- * @Date 2020/5/7 22:47
- */
-@RestController
-@RequestMapping("demo")
-public class ResiHallDemoController {
-    private static final Logger logger = LoggerFactory.getLogger(ResiHallDemoController.class);
-
-   /* @PostMapping("test")
-    public Result test(@RequestBody DemoTestFormDTO formDTO) {
-        logger.info(String.format("请求成功客户id[%s],网格id[%s]",formDTO.getCustomerId(),formDTO.getGridId()));
-        ValidatorUtils.validateEntity(formDTO);
-        return new Result().ok("resi-hall-server请求成功");
-    }*/
-}
-
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/DemoTestFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/DemoTestFormDTO.java
deleted file mode 100644
index fc93172558..0000000000
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/DemoTestFormDTO.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.epmet.dto.form;
-
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import java.io.Serializable;
-
-/**
- * @Description 测试入参
- * @Author yinzuomei
- * @Date 2020/5/8 10:00
- */
-@Data
-public class DemoTestFormDTO implements Serializable {
-    private static final long serialVersionUID = 4859779755214502427L;
-    @NotBlank(message = "客户id不能为空")
-    private String customerId;
-    @NotBlank(message = "网格id不能为空")
-    private String gridId;
-}
-
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/GovProjectDemoController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/GovProjectDemoController.java
deleted file mode 100644
index e099bd801c..0000000000
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/GovProjectDemoController.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.epmet.controller;
-
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.dto.form.DemoTestFormDTO;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @Description 测试
- * @Author yinzuomei
- * @Date 2020/5/7 22:47
- */
-@RestController
-@RequestMapping("demo")
-public class GovProjectDemoController {
-    private static final Logger logger = LoggerFactory.getLogger(GovProjectDemoController.class);
-
-    @PostMapping("test")
-    public Result test(@RequestBody DemoTestFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO);
-        logger.info(String.format("请求成功客户id[%s],网格id[%s]",formDTO.getCustomerId(),formDTO.getGridId()));
-        return new Result().ok("gov-project-server请求成功");
-    }
-}
-
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/DemoTestFormDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/DemoTestFormDTO.java
deleted file mode 100644
index fc93172558..0000000000
--- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/DemoTestFormDTO.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.epmet.dto.form;
-
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import java.io.Serializable;
-
-/**
- * @Description 测试入参
- * @Author yinzuomei
- * @Date 2020/5/8 10:00
- */
-@Data
-public class DemoTestFormDTO implements Serializable {
-    private static final long serialVersionUID = 4859779755214502427L;
-    @NotBlank(message = "客户id不能为空")
-    private String customerId;
-    @NotBlank(message = "网格id不能为空")
-    private String gridId;
-}
-

From 077409f35e9004db0d84f13f0df9ca9e1b0f84bd Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 12 May 2020 15:57:34 +0800
Subject: [PATCH 29/45] =?UTF-8?q?calender=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/db/migration/db.sql    |   0
 .../db/migration/epmet_common_service.sql     | 418 ++++++++++++++++++
 2 files changed, 418 insertions(+)
 delete mode 100644 epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/db.sql
 create mode 100644 epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/epmet_common_service.sql

diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/db.sql b/epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/db.sql
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/epmet_common_service.sql b/epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/epmet_common_service.sql
new file mode 100644
index 0000000000..1e2005a491
--- /dev/null
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/epmet_common_service.sql
@@ -0,0 +1,418 @@
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : 党群e事通开发库！！！！！
+ Source Server Type    : MySQL
+ Source Server Version : 50728
+ Source Host           : 192.168.1.130:3306
+ Source Schema         : epmet_common_service
+
+ Target Server Type    : MySQL
+ Target Server Version : 50728
+ File Encoding         : 65001
+
+ Date: 12/05/2020 15:55:09
+*/
+CREATE DATABASE `epmet_common_service` CHARACTER SET 'utf8mb4' COLLATE 'utf8mb4_general_ci';
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for calender
+-- ----------------------------
+DROP TABLE IF EXISTS `calender`;
+CREATE TABLE `calender`  (
+  `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键',
+  `RET_CODE` int(11) DEFAULT NULL COMMENT '0表示成功，其他为失败',
+  `DAY` varchar(8) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '查询的日期:20200510',
+  `QUERY_DATE` date NOT NULL COMMENT '查询的日期:2020-05-10',
+  `WEEKDAY` int(11) DEFAULT NULL COMMENT '星期几的数字',
+  `BEGIN` varchar(8) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '节日或周末开始时间，如果是工作日，此字段为空串',
+  `END` varchar(8) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '节日或周末结束时间，如果是工作日，此字段为空串',
+  `HOLIDAY_REMARK` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '节日备注',
+  `TYPE` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '1为工作日，2为周末，3为节假日',
+  `TYPE_NAME` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '工作日，周末，节假日',
+  `HOLIDAY` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '节日名称，工作日时显示“无”，周末时显示“周末”，节日时显示节日名称',
+  `EN` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '星期几的英文名',
+  `CN` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '星期几的中文名',
+  `DEL_FLAG` tinyint(1) DEFAULT NULL COMMENT '是否删除，0：未删除，1：已删除',
+  `REVISION` int(10) DEFAULT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建者id',
+  `CREATED_TIME` datetime(0) DEFAULT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '更新者id',
+  `UPDATED_TIME` datetime(0) DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of calender
+-- ----------------------------
+INSERT INTO `calender` VALUES ('00772611b7a8b243e7483ac969069ad7', 0, '20200127', '2020-01-27', 1, '20200124', '20200202', '1月24日至2月2日放假，共8天。1月19日（星期日）上班。', '3', '节假日', '春节', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:03:38');
+INSERT INTO `calender` VALUES ('015563ec89e212d364f68f4f3403c5d5', 0, '20200923', '2020-09-23', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:53');
+INSERT INTO `calender` VALUES ('01e663161394a1f140492a5f7d8b97eb', 0, '20201003', '2020-10-03', 6, '20201001', '20201008', '10月1日至8日放假调休，共8天。9月27日（星期日）、10月10日（星期六）上班。', '3', '节假日', '国庆节、中秋节', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:03');
+INSERT INTO `calender` VALUES ('04086dfd9da61e4458a707e3acd0332d', 0, '20201126', '2020-11-26', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:27', 'APP_USER', '2020-05-12 10:08:57');
+INSERT INTO `calender` VALUES ('043fbcccb3041e7bdb91f39ec1a034d0', 0, '20201218', '2020-12-18', 5, '', '', '', '1', '工作日', '无', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:27', 'APP_USER', '2020-05-12 10:09:19');
+INSERT INTO `calender` VALUES ('04c71d105ee141fdbdf861a3bd6909a8', 0, '20200920', '2020-09-20', 7, '20200919', '20200920', '', '2', '周末', '周末', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:50');
+INSERT INTO `calender` VALUES ('0557c67c004e2fceb263710a83085b9c', 0, '20200530', '2020-05-30', 6, '20200530', '20200531', '', '2', '周末', '周末', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:05:47');
+INSERT INTO `calender` VALUES ('05f13378cf30526a739ba4a106a1afdf', 0, '20200625', '2020-06-25', 4, '20200625', '20200627', '6月25日至27日放假调休，共3天。6月28日（星期日）上班。', '3', '节假日', '端午节', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:13');
+INSERT INTO `calender` VALUES ('0618e52ca29f63a1ea3abf379616212b', 0, '20200713', '2020-07-13', 1, '', '', '', '1', '工作日', '无', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:34');
+INSERT INTO `calender` VALUES ('07a46691ca6a6d7e3976066a4f7f34a5', 0, '20201204', '2020-12-04', 5, '', '', '', '1', '工作日', '无', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:27', 'APP_USER', '2020-05-12 10:09:05');
+INSERT INTO `calender` VALUES ('07a71b25734c80c43a45e950d3fa2e0c', 0, '20200622', '2020-06-22', 1, '', '', '', '1', '工作日', '无', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:10');
+INSERT INTO `calender` VALUES ('07e47b290d4406e5ebd3febe83c487b6', 0, '20200727', '2020-07-27', 1, '', '', '', '1', '工作日', '无', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:55');
+INSERT INTO `calender` VALUES ('083ecab55950baf3d88ae1f74cafc0ba', 0, '20201022', '2020-10-22', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:22');
+INSERT INTO `calender` VALUES ('08dbe97e3bc9093aa5c4ff86f1684bc0', 0, '20201012', '2020-10-12', 1, '', '', '', '1', '工作日', '无', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:12');
+INSERT INTO `calender` VALUES ('0a864c30779ddb5bc8a745a48c3bf3c9', 0, '20201010', '2020-10-10', 6, '', '', '调休', '1', '工作日', '无', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:10');
+INSERT INTO `calender` VALUES ('0b4aacfe39f3a811cfd155aa260cecee', 0, '20200324', '2020-03-24', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:35');
+INSERT INTO `calender` VALUES ('0b827ba3f7378db479ff1a7ab903e078', 0, '20200429', '2020-04-29', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:05:16');
+INSERT INTO `calender` VALUES ('0b8fb4322ecd09d860d86b2c58c43a39', 0, '20200115', '2020-01-15', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:03:26');
+INSERT INTO `calender` VALUES ('0c9f5fa23d92635f5ed11a7bf6cae56e', 0, '20200909', '2020-09-09', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:39');
+INSERT INTO `calender` VALUES ('0e63308f0414891105084a474d8c769e', 0, '20201127', '2020-11-27', 5, '', '', '', '1', '工作日', '无', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:27', 'APP_USER', '2020-05-12 10:08:58');
+INSERT INTO `calender` VALUES ('0f5c75c7e3e1e5ee5c2bd194c90c9871', 0, '20201211', '2020-12-11', 5, '', '', '', '1', '工作日', '无', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:27', 'APP_USER', '2020-05-12 10:09:12');
+INSERT INTO `calender` VALUES ('0fd9e1f8cb216b88c30e1a59ccbda280', 0, '20200219', '2020-02-19', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:01');
+INSERT INTO `calender` VALUES ('1101f3fced7c928de1084da60149ad6e', 0, '20200216', '2020-02-16', 7, '20200215', '20200216', '', '2', '周末', '周末', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:03:58');
+INSERT INTO `calender` VALUES ('11287964df15adc3686181b09d73413c', 0, '20200415', '2020-04-15', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:05:02');
+INSERT INTO `calender` VALUES ('117d392a4b50198fcc04904783884258', 0, '20200627', '2020-06-27', 6, '20200625', '20200627', '6月25日至27日放假调休，共3天。6月28日（星期日）上班。', '3', '节假日', '端午节', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:15');
+INSERT INTO `calender` VALUES ('11b71e4b502cda8ac2ec1639b34ae7ba', 0, '20200210', '2020-02-10', 1, '', '', '', '1', '工作日', '无', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:03:52');
+INSERT INTO `calender` VALUES ('120c79f65227a5e4f6b1eb250ee582d4', 0, '20200402', '2020-04-02', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:44');
+INSERT INTO `calender` VALUES ('1315ab74554c2eada60f990648c727a2', 0, '20200520', '2020-05-20', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:05:37');
+INSERT INTO `calender` VALUES ('14c0af69f33054a1908b74dcd0014ccc', 0, '20200914', '2020-09-14', 1, '', '', '', '1', '工作日', '无', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:44');
+INSERT INTO `calender` VALUES ('15788edb4a2b74f6184d09b4bdedc744', 0, '20200618', '2020-06-18', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:06');
+INSERT INTO `calender` VALUES ('15eb046a77104526826011455885ed1e', 0, '20201030', '2020-10-30', 5, '', '', '', '1', '工作日', '无', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:30');
+INSERT INTO `calender` VALUES ('16ffbe75a5e481b8db707f27cf311938', 0, '20200621', '2020-06-21', 7, '20200620', '20200621', '', '2', '周末', '周末', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:09');
+INSERT INTO `calender` VALUES ('177c471557a6f1b166aa0f95154cbdc4', 0, '20200608', '2020-06-08', 1, '', '', '', '1', '工作日', '无', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:05:56');
+INSERT INTO `calender` VALUES ('17abef8746f124276dbdfc030ff61242', 0, '20200218', '2020-02-18', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:00');
+INSERT INTO `calender` VALUES ('1beeb2e463a26e9ce9b646ec6f957d46', 0, '20200409', '2020-04-09', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:56');
+INSERT INTO `calender` VALUES ('1ddc589480effe59966c8921648e0b35', 0, '20200701', '2020-07-01', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:19');
+INSERT INTO `calender` VALUES ('1e61f63af7016b8be15d61d7e0234423', 0, '20200620', '2020-06-20', 6, '20200620', '20200621', '', '2', '周末', '周末', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:08');
+INSERT INTO `calender` VALUES ('1e6cc5df300bb7b92d46195993f98b18', 0, '20201124', '2020-11-24', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:27', 'APP_USER', '2020-05-12 10:08:55');
+INSERT INTO `calender` VALUES ('1edc7bcaca576ad95b3a02ae86912fd4', 0, '20200313', '2020-03-13', 5, '', '', '', '1', '工作日', '无', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:24');
+INSERT INTO `calender` VALUES ('200d6379adf4ffbec93401c740402cb6', 0, '20201109', '2020-11-09', 1, '', '', '', '1', '工作日', '无', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:40');
+INSERT INTO `calender` VALUES ('2088057fcddf14eb8745f6256bc1dac7', 0, '20201203', '2020-12-03', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:27', 'APP_USER', '2020-05-12 10:09:04');
+INSERT INTO `calender` VALUES ('235023dcae390acc4e7321c4e181d704', 0, '20200525', '2020-05-25', 1, '', '', '', '1', '工作日', '无', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:05:42');
+INSERT INTO `calender` VALUES ('23e4ecb7cc8a14278a3b290df6d2a25f', 0, '20200616', '2020-06-16', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:04');
+INSERT INTO `calender` VALUES ('24316d9923eff4145bcec276e77c4799', 0, '20201002', '2020-10-02', 5, '20201001', '20201008', '10月1日至8日放假调休，共8天。9月27日（星期日）、10月10日（星期六）上班。', '3', '节假日', '国庆节、中秋节', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:02');
+INSERT INTO `calender` VALUES ('2435690c26aaf4501da48d1e4822621e', 0, '20200802', '2020-08-02', 7, '20200801', '20200802', '', '2', '周末', '周末', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:01');
+INSERT INTO `calender` VALUES ('250a13d98c6505c40e4101b75bdf18bc', 0, '20200112', '2020-01-12', 7, '20200111', '20200112', '', '2', '周末', '周末', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:03:23');
+INSERT INTO `calender` VALUES ('25186aec5e48d8271439015d36851953', 0, '20200528', '2020-05-28', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:05:45');
+INSERT INTO `calender` VALUES ('253d7cbe2043adb6f991764f63b4e40d', 0, '20200812', '2020-08-12', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:11');
+INSERT INTO `calender` VALUES ('260ba059b8beb21bd859e33b709e761f', 0, '20200821', '2020-08-21', 5, '', '', '', '1', '工作日', '无', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:20');
+INSERT INTO `calender` VALUES ('2639911071b61a79495a9d2b6407dff6', 0, '20200617', '2020-06-17', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:05');
+INSERT INTO `calender` VALUES ('26576a2b746a8ec8d143728d4221aa9e', 0, '20201217', '2020-12-17', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:27', 'APP_USER', '2020-05-12 10:09:18');
+INSERT INTO `calender` VALUES ('26d7b7234c6fb53bb18e4177410bd3d9', 0, '20201004', '2020-10-04', 7, '20201001', '20201008', '10月1日至8日放假调休，共8天。9月27日（星期日）、10月10日（星期六）上班。', '3', '节假日', '国庆节、中秋节', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:04');
+INSERT INTO `calender` VALUES ('280714eb7ffab1a0acbe41209cd7dc01', 0, '20200507', '2020-05-07', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:05:24');
+INSERT INTO `calender` VALUES ('284c8b466b6ac1fd4d362b0ae05e9e2a', 0, '20201206', '2020-12-06', 7, '20201205', '20201206', '', '2', '周末', '周末', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:27', 'APP_USER', '2020-05-12 10:09:07');
+INSERT INTO `calender` VALUES ('287b7c1aa0790162598f10dbc8346e1c', 0, '20200908', '2020-09-08', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:38');
+INSERT INTO `calender` VALUES ('289838dfb96ddf77a6cfc879474ca8ab', 0, '20201108', '2020-11-08', 7, '20201107', '20201108', '', '2', '周末', '周末', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:39');
+INSERT INTO `calender` VALUES ('28bd0ae01f313542f4e46bdbe5aa9409', 0, '20200714', '2020-07-14', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:35');
+INSERT INTO `calender` VALUES ('28ea70a7fef8c4eb9f17b28e29bc817c', 0, '20200205', '2020-02-05', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:03:47');
+INSERT INTO `calender` VALUES ('2935651d95ad7e4deeda0d382648c25e', 0, '20200910', '2020-09-10', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:40');
+INSERT INTO `calender` VALUES ('295271c37d6000964c0001d131862c1d', 0, '20200420', '2020-04-20', 1, '', '', '', '1', '工作日', '无', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:05:07');
+INSERT INTO `calender` VALUES ('2a5c2946835dcf2ee1defe93c3c78a7b', 0, '20200404', '2020-04-04', 6, '20200404', '20200406', '4月4日至6日放假调休，共3天。', '3', '节假日', '清明节', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:46');
+INSERT INTO `calender` VALUES ('2a866f98885a810387e6c3ee61a8741f', 0, '20200213', '2020-02-13', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:03:55');
+INSERT INTO `calender` VALUES ('2acfc102d2d9d75938ac5df07e106acd', 0, '20201111', '2020-11-11', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:42');
+INSERT INTO `calender` VALUES ('2aea7d3e6fbcc129b62dba7de380ed51', 0, '20200206', '2020-02-06', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:03:48');
+INSERT INTO `calender` VALUES ('2b0192a253a17e826bbd1d4b03ffe193', 0, '20200221', '2020-02-21', 5, '', '', '', '1', '工作日', '无', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:03');
+INSERT INTO `calender` VALUES ('2b1b42fa7780f15dc37674f209a029c7', 0, '20200628', '2020-06-28', 7, '', '', '调休', '1', '工作日', '无', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:16');
+INSERT INTO `calender` VALUES ('2b41b96f3a0ab22d51ae44fecf3bcd96', 0, '20201222', '2020-12-22', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:27', 'APP_USER', '2020-05-12 10:09:23');
+INSERT INTO `calender` VALUES ('2baba2f670b4c163c5caf4265d57abb3', 0, '20201031', '2020-10-31', 6, '20201031', '20201101', '', '2', '周末', '周末', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:31');
+INSERT INTO `calender` VALUES ('2c379162cb1722267b3e476fddeb6635', 0, '20200105', '2020-01-05', 7, '20200104', '20200105', '', '2', '周末', '周末', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:03:16');
+INSERT INTO `calender` VALUES ('2cdabfe51f604876a593080fd774f00b', 0, '20200508', '2020-05-08', 5, '', '', '', '1', '工作日', '无', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:05:25');
+INSERT INTO `calender` VALUES ('2da80e1e1b742bff640dbd6ddc34dd0f', 0, '20200422', '2020-04-22', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:05:09');
+INSERT INTO `calender` VALUES ('2e2391d3a4e48028d544e59df58b957f', 0, '20200117', '2020-01-17', 5, '', '', '', '1', '工作日', '无', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:03:28');
+INSERT INTO `calender` VALUES ('31e9754502ee9536d4f7a538db562441', 0, '20200817', '2020-08-17', 1, '', '', '', '1', '工作日', '无', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:16');
+INSERT INTO `calender` VALUES ('32333db31fe5f85734cccf6de4de3306', 0, '20200629', '2020-06-29', 1, '', '', '', '1', '工作日', '无', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:17');
+INSERT INTO `calender` VALUES ('325ff6deeab73321c6414bab9d0f92c8', 0, '20201123', '2020-11-23', 1, '', '', '', '1', '工作日', '无', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:27', 'APP_USER', '2020-05-12 10:08:54');
+INSERT INTO `calender` VALUES ('32c29f3f2a7357ef1fda873463ce2d51', 0, '20200524', '2020-05-24', 7, '20200523', '20200524', '', '2', '周末', '周末', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:05:41');
+INSERT INTO `calender` VALUES ('3338470760bd4a130d4ca00b48f1a307', 0, '20200228', '2020-02-28', 5, '', '', '', '1', '工作日', '无', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:10');
+INSERT INTO `calender` VALUES ('3400841da13e6120a07d38e85f69b09a', 0, '20201013', '2020-10-13', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:13');
+INSERT INTO `calender` VALUES ('373ea083f70ec4983b59b444ea89b5d6', 0, '20200114', '2020-01-14', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:03:25');
+INSERT INTO `calender` VALUES ('37bb0ba68b6c078976749b0e6c864fac', 0, '20201212', '2020-12-12', 6, '20201212', '20201213', '', '2', '周末', '周末', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:27', 'APP_USER', '2020-05-12 10:09:13');
+INSERT INTO `calender` VALUES ('37d2de5e0bbfebc54132b6cc9717ba19', 0, '20200109', '2020-01-09', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:03:20');
+INSERT INTO `calender` VALUES ('37f2113f4305b0507400b745e94b2e25', 0, '20200720', '2020-07-20', 1, '', '', '', '1', '工作日', '无', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:48');
+INSERT INTO `calender` VALUES ('381483f9bb8f6bd2f0f74b8626e151ca', 0, '20200131', '2020-01-31', 5, '20200124', '20200202', '1月24日至2月2日放假，共8天。1月19日（星期日）上班。', '3', '节假日', '春节', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:03:42');
+INSERT INTO `calender` VALUES ('388c1e01adf0e544056f99d2aa14554b', 0, '20200911', '2020-09-11', 5, '', '', '', '1', '工作日', '无', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:41');
+INSERT INTO `calender` VALUES ('399c52c96937cfb5b8e33806c81bf7df', 0, '20201006', '2020-10-06', 2, '20201001', '20201008', '10月1日至8日放假调休，共8天。9月27日（星期日）、10月10日（星期六）上班。', '3', '节假日', '国庆节、中秋节', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:06');
+INSERT INTO `calender` VALUES ('3a79f5f0d110f04ffd2cf63074722cf8', 0, '20201209', '2020-12-09', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:27', 'APP_USER', '2020-05-12 10:09:10');
+INSERT INTO `calender` VALUES ('3b15fed402667e5d6c9e36dfee52402e', 0, '20201130', '2020-11-30', 1, '', '', '', '1', '工作日', '无', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:27', 'APP_USER', '2020-05-12 10:09:01');
+INSERT INTO `calender` VALUES ('3c2540b55ef42725a194204c9fe00ed7', 0, '20200927', '2020-09-27', 7, '', '', '调休', '1', '工作日', '无', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:57');
+INSERT INTO `calender` VALUES ('3e5edafa4fdeecea63a8b3c816a9c5da', 0, '20200411', '2020-04-11', 6, '20200411', '20200412', '', '2', '周末', '周末', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:58');
+INSERT INTO `calender` VALUES ('3e942bd8b06010b4d4d93d0ab4f2359b', 0, '20200417', '2020-04-17', 5, '', '', '', '1', '工作日', '无', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:05:04');
+INSERT INTO `calender` VALUES ('3ef43497b5de651f4e68571a2025f84d', 0, '20200425', '2020-04-25', 6, '20200425', '20200426', '', '2', '周末', '周末', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:05:12');
+INSERT INTO `calender` VALUES ('405c8b61fff45de8c43e4ad159e0bcf9', 0, '20200406', '2020-04-06', 1, '20200404', '20200406', '4月4日至6日放假调休，共3天。', '3', '节假日', '清明节', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:54');
+INSERT INTO `calender` VALUES ('41ac7c37cd7c785cbd367efaf7c0a8d9', 0, '20200905', '2020-09-05', 6, '20200905', '20200906', '', '2', '周末', '周末', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:35');
+INSERT INTO `calender` VALUES ('41b172f48b8f899f3079c53740d91959', 0, '20200410', '2020-04-10', 5, '', '', '', '1', '工作日', '无', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:57');
+INSERT INTO `calender` VALUES ('425504d92c453c4816de11faaaf46fa8', 0, '20201121', '2020-11-21', 6, '20201121', '20201122', '', '2', '周末', '周末', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:52');
+INSERT INTO `calender` VALUES ('4333496d67495985712be0e415b540bf', 0, '20200825', '2020-08-25', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:24');
+INSERT INTO `calender` VALUES ('43a4c8acfce501e1bb93fe94470b4365', 0, '20200102', '2020-01-02', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:03:13');
+INSERT INTO `calender` VALUES ('43b90b7dfecb085965e93e5f266c0080', 0, '20200119', '2020-01-19', 7, '', '', '调休', '1', '工作日', '无', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:03:30');
+INSERT INTO `calender` VALUES ('45ab33adabf4c310cb87aa9263f9984f', 0, '20200930', '2020-09-30', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:00');
+INSERT INTO `calender` VALUES ('466174553709b06c8f5d3cc423c706d6', 0, '20200501', '2020-05-01', 5, '20200501', '20200505', '5月1日至5日放假调休，共5天。4月26日（星期日）、5月9日（星期六）上班。', '3', '节假日', '劳动节', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:00', 'fa5e50ca724911eab9c900163e08c0f9', '2020-05-12 13:25:40');
+INSERT INTO `calender` VALUES ('497a55e25d4873f5834277675f455949', 0, '20200814', '2020-08-14', 5, '', '', '', '1', '工作日', '无', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:13');
+INSERT INTO `calender` VALUES ('49b966643f4e462dabf84f0794252dfb', 0, '20200421', '2020-04-21', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:05:08');
+INSERT INTO `calender` VALUES ('4abe3faa45c1f2f742f74685fcef3396', 0, '20201014', '2020-10-14', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:14');
+INSERT INTO `calender` VALUES ('4bedb3e95445daeee80e81465404e1a1', 0, '20200222', '2020-02-22', 6, '20200222', '20200223', '', '2', '周末', '周末', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:04');
+INSERT INTO `calender` VALUES ('4c07241907b8191fd072d119c0de1499', 0, '20200726', '2020-07-26', 7, '20200725', '20200726', '', '2', '周末', '周末', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:54');
+INSERT INTO `calender` VALUES ('4d5ffbc450704e0c34c2937e232327e8', 0, '20200209', '2020-02-09', 7, '20200208', '20200209', '', '2', '周末', '周末', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:03:51');
+INSERT INTO `calender` VALUES ('4d96c864299c75af30bf1ef8abda79c0', 0, '20200907', '2020-09-07', 1, '', '', '', '1', '工作日', '无', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:37');
+INSERT INTO `calender` VALUES ('4e9708999d7f1c44474a9566f6ef87a3', 0, '20201007', '2020-10-07', 3, '20201001', '20201008', '10月1日至8日放假调休，共8天。9月27日（星期日）、10月10日（星期六）上班。', '3', '节假日', '国庆节、中秋节', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:07');
+INSERT INTO `calender` VALUES ('4ea0549e3df1f00a01d4ed47b6505806', 0, '20201216', '2020-12-16', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:27', 'APP_USER', '2020-05-12 10:09:17');
+INSERT INTO `calender` VALUES ('4eaabd3b9a2d7d41bad412f799287a8b', 0, '20200917', '2020-09-17', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:47');
+INSERT INTO `calender` VALUES ('4f44c462d822633211a01f2414dff6b2', 0, '20200719', '2020-07-19', 7, '20200718', '20200719', '', '2', '周末', '周末', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:47');
+INSERT INTO `calender` VALUES ('4f771427c832f53dca43d8e12ba5d9f3', 0, '20200706', '2020-07-06', 1, '', '', '', '1', '工作日', '无', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:24');
+INSERT INTO `calender` VALUES ('4f8e34a9114a839f138cabb7608cd1f9', 0, '20200427', '2020-04-27', 1, '', '', '', '1', '工作日', '无', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:05:14');
+INSERT INTO `calender` VALUES ('503739a1645e5c3abd3fc11f32d1f5bc', 0, '20201228', '2020-12-28', 1, '', '', '', '1', '工作日', '无', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:27', 'APP_USER', '2020-05-12 10:09:29');
+INSERT INTO `calender` VALUES ('528b4f7a35799bba7ebcece0c467f5c7', 0, '20201225', '2020-12-25', 5, '', '', '', '1', '工作日', '无', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:27', 'APP_USER', '2020-05-12 10:09:26');
+INSERT INTO `calender` VALUES ('5456c30f69404e853f359afaa2125aed', 0, '20200816', '2020-08-16', 7, '20200815', '20200816', '', '2', '周末', '周末', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:15');
+INSERT INTO `calender` VALUES ('55e3cd4240f91ec5ba48f3c4eaa6109a', 0, '20200510', '2020-05-10', 7, '20200509', '20200510', '', '2', '周末', '周末', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:05:27');
+INSERT INTO `calender` VALUES ('5695115b49fad95392b89f921836d50f', 0, '20200808', '2020-08-08', 6, '20200808', '20200809', '', '2', '周末', '周末', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:07');
+INSERT INTO `calender` VALUES ('56bccf7bc2544f4af86ac20aa8fa19a3', 0, '20200724', '2020-07-24', 5, '', '', '', '1', '工作日', '无', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:52');
+INSERT INTO `calender` VALUES ('572647c501e6d4b1872f16e962f33396', 0, '20201229', '2020-12-29', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:27', 'APP_USER', '2020-05-12 10:09:30');
+INSERT INTO `calender` VALUES ('574df73fc7f7f71cbd0c99756e611fe3', 0, '20200413', '2020-04-13', 1, '', '', '', '1', '工作日', '无', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:05:00');
+INSERT INTO `calender` VALUES ('578a1bfdf1157fdf6e25ea055d0d2fc0', 0, '20201027', '2020-10-27', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:27');
+INSERT INTO `calender` VALUES ('5799f19de34ce3cc709572a3e95637c8', 0, '20200929', '2020-09-29', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:59');
+INSERT INTO `calender` VALUES ('579a9b8b394683fb859d0d678a0a911f', 0, '20200122', '2020-01-22', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:03:33');
+INSERT INTO `calender` VALUES ('57c0d73f761c533561d7a02e06b7334a', 0, '20201113', '2020-11-13', 5, '', '', '', '1', '工作日', '无', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:44');
+INSERT INTO `calender` VALUES ('5829c9a0cf12a74c18f88dd365aceb0a', 0, '20201129', '2020-11-29', 7, '20201128', '20201129', '', '2', '周末', '周末', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:27', 'APP_USER', '2020-05-12 10:09:00');
+INSERT INTO `calender` VALUES ('5a9addfc372e1b260d1469e441941e1e', 0, '20201028', '2020-10-28', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:28');
+INSERT INTO `calender` VALUES ('5c2ea6d391dea3fc37204df982cc0085', 0, '20200830', '2020-08-30', 7, '20200829', '20200830', '', '2', '周末', '周末', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:29');
+INSERT INTO `calender` VALUES ('5c6a4083b28afe7bcb5d7c77af36f7db', 0, '20200601', '2020-06-01', 1, '', '', '', '1', '工作日', '无', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:05:49');
+INSERT INTO `calender` VALUES ('5e2c90dd98b0e1c5da3834fdcf06041b', 0, '20200613', '2020-06-13', 6, '20200613', '20200614', '', '2', '周末', '周末', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:01');
+INSERT INTO `calender` VALUES ('5e3577c73f5222322473a422467720a3', 0, '20200702', '2020-07-02', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:20');
+INSERT INTO `calender` VALUES ('5ee07ad9dd5cc393059670189656fb56', 0, '20200405', '2020-04-05', 7, '20200404', '20200406', '4月4日至6日放假调休，共3天。', '3', '节假日', '清明节', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:47');
+INSERT INTO `calender` VALUES ('5f36c0eb792ba6df86fbf1904757723b', 0, '20200604', '2020-06-04', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:05:52');
+INSERT INTO `calender` VALUES ('5fe174bb9d525769c189d4533eba68ae', 0, '20200813', '2020-08-13', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:12');
+INSERT INTO `calender` VALUES ('5fe27a25bcb9b7700c2abb1457125a96', 0, '20200315', '2020-03-15', 7, '20200314', '20200315', '', '2', '周末', '周末', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:26');
+INSERT INTO `calender` VALUES ('602b1df285eb9ed688fa72bd550c080e', 0, '20200818', '2020-08-18', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:17');
+INSERT INTO `calender` VALUES ('60b4e174c6678fd476f0c7216f33c737', 0, '20200605', '2020-06-05', 5, '', '', '', '1', '工作日', '无', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:05:53');
+INSERT INTO `calender` VALUES ('6183f599f32bba424f0ad2412c6de8fa', 0, '20200217', '2020-02-17', 1, '', '', '', '1', '工作日', '无', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:03:59');
+INSERT INTO `calender` VALUES ('61b69da6b60c57ad9b04e60548f94738', 0, '20200309', '2020-03-09', 1, '', '', '', '1', '工作日', '无', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:20');
+INSERT INTO `calender` VALUES ('62286591902fe09200caaf0c96fd3c32', 0, '20200722', '2020-07-22', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:50');
+INSERT INTO `calender` VALUES ('627101bb1e345917fa876bf0b3059ca2', 0, '20200311', '2020-03-11', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:22');
+INSERT INTO `calender` VALUES ('638699eec96c32ca687ec14ed69bd9b5', 0, '20200314', '2020-03-14', 6, '20200314', '20200315', '', '2', '周末', '周末', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:25');
+INSERT INTO `calender` VALUES ('639ad0b81360034a767bcc6f1fc2da8d', 0, '20200301', '2020-03-01', 7, '20200229', '20200301', '', '2', '周末', '周末', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:12');
+INSERT INTO `calender` VALUES ('63d607d61d097a75ce89070129996c52', 0, '20200823', '2020-08-23', 7, '20200822', '20200823', '', '2', '周末', '周末', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:22');
+INSERT INTO `calender` VALUES ('63f0c4adefad4300739b0154f97d5fb0', 0, '20200906', '2020-09-06', 7, '20200905', '20200906', '', '2', '周末', '周末', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:36');
+INSERT INTO `calender` VALUES ('63fecd4c197a5df375c5e1a19d792bf9', 0, '20200805', '2020-08-05', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:04');
+INSERT INTO `calender` VALUES ('6423caaf3807ff6ac86ab8f6d118cc56', 0, '20200822', '2020-08-22', 6, '20200822', '20200823', '', '2', '周末', '周末', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:21');
+INSERT INTO `calender` VALUES ('643d46399faa6923f376464ff9476e8e', 0, '20200318', '2020-03-18', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:29');
+INSERT INTO `calender` VALUES ('650d6c705a0bdec2f1e41500834bdd3d', 0, '20200916', '2020-09-16', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:46');
+INSERT INTO `calender` VALUES ('65afbf89b4a18c263fbc82748782dad1', 0, '20201021', '2020-10-21', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:21');
+INSERT INTO `calender` VALUES ('65ecd41d0d8fc4481cf453195f69602c', 0, '20200928', '2020-09-28', 1, '', '', '', '1', '工作日', '无', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:58');
+INSERT INTO `calender` VALUES ('66d928d9ab3a6308827572f696173aa7', 0, '20201208', '2020-12-08', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:27', 'APP_USER', '2020-05-12 10:09:09');
+INSERT INTO `calender` VALUES ('677c9a5f08ef2e4cead832fb34a50507', 0, '20200913', '2020-09-13', 7, '20200912', '20200913', '', '2', '周末', '周末', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:43');
+INSERT INTO `calender` VALUES ('67eb65a1f399bf18efa389761841b8e3', 0, '20200926', '2020-09-26', 6, '20200926', '20200927', '', '2', '周末', '周末', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:56');
+INSERT INTO `calender` VALUES ('69a42744623b380b6f93f0a4ee25a012', 0, '20200407', '2020-04-07', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:54');
+INSERT INTO `calender` VALUES ('6acb73aa51e2e6a4c2c7542b2d6da65c', 0, '20200214', '2020-02-14', 5, '', '', '', '1', '工作日', '无', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:03:56');
+INSERT INTO `calender` VALUES ('6aec4a9d14bb264f360e0d5404cce0e4', 0, '20200513', '2020-05-13', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:05:30');
+INSERT INTO `calender` VALUES ('6b782599cb98a39c885e9bc981b8cb8d', 0, '20201024', '2020-10-24', 6, '20201024', '20201025', '', '2', '周末', '周末', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:24');
+INSERT INTO `calender` VALUES ('6ca72d609d74eaada1a1f78c58b6bf8a', 0, '20200207', '2020-02-07', 5, '', '', '', '1', '工作日', '无', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:03:49');
+INSERT INTO `calender` VALUES ('6d435cb2af1d32985d9cb4648356bc3a', 0, '20200116', '2020-01-16', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:03:27');
+INSERT INTO `calender` VALUES ('6e9d5b2323b457108b17268a2aa15727', 0, '20201213', '2020-12-13', 7, '20201212', '20201213', '', '2', '周末', '周末', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:27', 'APP_USER', '2020-05-12 10:09:14');
+INSERT INTO `calender` VALUES ('6ff46ba71c64fb5ab07fb3170966e807', 0, '20200527', '2020-05-27', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:05:44');
+INSERT INTO `calender` VALUES ('70936a4d29c398e5056aeae3ad3f7bee', 0, '20201017', '2020-10-17', 6, '20201017', '20201018', '', '2', '周末', '周末', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:17');
+INSERT INTO `calender` VALUES ('711f8295c0c724983542b49232f32f1b', 0, '20201112', '2020-11-12', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:43');
+INSERT INTO `calender` VALUES ('713cef5cea8098aa265216a067413df1', 0, '20200211', '2020-02-11', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:03:53');
+INSERT INTO `calender` VALUES ('7167b3c5a72fc825c45ff0c40b005ff2', 0, '20200304', '2020-03-04', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:15');
+INSERT INTO `calender` VALUES ('722ce498729fbaf200815e69ce40fb8e', 0, '20200506', '2020-05-06', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:05:23');
+INSERT INTO `calender` VALUES ('727131cfdbed81741c64ec6c37dfe0ab', 0, '20201226', '2020-12-26', 6, '20201226', '20201227', '', '2', '周末', '周末', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:27', 'APP_USER', '2020-05-12 10:09:27');
+INSERT INTO `calender` VALUES ('72b063e24e0a248571062abf7b54a008', 0, '20200709', '2020-07-09', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:30');
+INSERT INTO `calender` VALUES ('74477c2f229cc5b97186858a93e94ca7', 0, '20200828', '2020-08-28', 5, '', '', '', '1', '工作日', '无', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:27');
+INSERT INTO `calender` VALUES ('74a40753287c8dbbcd336b337642bec1', 0, '20200118', '2020-01-18', 6, '20200118', '20200119', '', '2', '周末', '周末', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:03:29');
+INSERT INTO `calender` VALUES ('7541358d6048f240b9dc7e736240d214', 0, '20200416', '2020-04-16', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:05:03');
+INSERT INTO `calender` VALUES ('75e091dccff0d94d6cce9baeb3a4fd88', 0, '20201223', '2020-12-23', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:27', 'APP_USER', '2020-05-12 10:09:24');
+INSERT INTO `calender` VALUES ('77fb505be58a4faa56005e9745d2ffbf', 0, '20201016', '2020-10-16', 5, '', '', '', '1', '工作日', '无', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:16');
+INSERT INTO `calender` VALUES ('77fe0cbba30685282bd732b45e0c478d', 0, '20201119', '2020-11-19', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:50');
+INSERT INTO `calender` VALUES ('7834e6a35a8de08c7091f39d5960368f', 0, '20200321', '2020-03-21', 6, '20200321', '20200322', '', '2', '周末', '周末', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:32');
+INSERT INTO `calender` VALUES ('7af0abffbcf9a9cbd2c19bf84208dd0c', 0, '20201202', '2020-12-02', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:27', 'APP_USER', '2020-05-12 10:09:03');
+INSERT INTO `calender` VALUES ('7bfbdb63ef08e278de7d27b5df3320bf', 0, '20200225', '2020-02-25', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:07');
+INSERT INTO `calender` VALUES ('7d73458d55241b8d463626189344dc0f', 0, '20200731', '2020-07-31', 5, '', '', '', '1', '工作日', '无', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:59');
+INSERT INTO `calender` VALUES ('7e93d473eb0660db990425f1f66d0d89', 0, '20201221', '2020-12-21', 1, '', '', '', '1', '工作日', '无', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:27', 'APP_USER', '2020-05-12 10:09:22');
+INSERT INTO `calender` VALUES ('7ec9ba846980898696189790f44b12f9', 0, '20200522', '2020-05-22', 5, '', '', '', '1', '工作日', '无', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:05:39');
+INSERT INTO `calender` VALUES ('7f994602a59a4eae7319a7bfe1b0842b', 0, '20201009', '2020-10-09', 5, '', '', '', '1', '工作日', '无', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:09');
+INSERT INTO `calender` VALUES ('8160bc4a4ddb02dd1ed50d4810b1afd0', 0, '20201214', '2020-12-14', 1, '', '', '', '1', '工作日', '无', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:27', 'APP_USER', '2020-05-12 10:09:15');
+INSERT INTO `calender` VALUES ('82615c65b4719ba5ddb3ff50e51cbbab', 0, '20200801', '2020-08-01', 6, '20200801', '20200802', '', '2', '周末', '周末', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:00');
+INSERT INTO `calender` VALUES ('84cb6529a88b9042aaf2d6ff24f24242', 0, '20201120', '2020-11-20', 5, '', '', '', '1', '工作日', '无', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:51');
+INSERT INTO `calender` VALUES ('8525e5587c3b0e993f9cb7318fbe9069', 0, '20200414', '2020-04-14', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:05:01');
+INSERT INTO `calender` VALUES ('894e892afc0fa37ef2d04b97f59197e3', 0, '20200223', '2020-02-23', 7, '20200222', '20200223', '', '2', '周末', '周末', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:05');
+INSERT INTO `calender` VALUES ('89a5585272d7f73536e7f94f8d466b60', 0, '20200208', '2020-02-08', 6, '20200208', '20200209', '', '2', '周末', '周末', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:03:50');
+INSERT INTO `calender` VALUES ('8a345d642de6a7599b7793912e7d0dc6', 0, '20201104', '2020-11-04', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:35');
+INSERT INTO `calender` VALUES ('8a9375f65b259543b92262ef09cef9a6', 0, '20200922', '2020-09-22', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:52');
+INSERT INTO `calender` VALUES ('8fd168963beed42c166e89068b2356aa', 0, '20200302', '2020-03-02', 1, '', '', '', '1', '工作日', '无', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:13');
+INSERT INTO `calender` VALUES ('9003359311238972047df6792ae036b1', 0, '20200918', '2020-09-18', 5, '', '', '', '1', '工作日', '无', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:48');
+INSERT INTO `calender` VALUES ('9018aed1fb8bab39ef8b0d890cb917c3', 0, '20201107', '2020-11-07', 6, '20201107', '20201108', '', '2', '周末', '周末', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:38');
+INSERT INTO `calender` VALUES ('905c4a507f375f4982d1899e7af08d92', 0, '20200526', '2020-05-26', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:05:43');
+INSERT INTO `calender` VALUES ('911212b3d29c571198b06485e4e22abb', 0, '20200227', '2020-02-27', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:09');
+INSERT INTO `calender` VALUES ('9291313a667d094d501c47dee9bf4a1a', 0, '20200915', '2020-09-15', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:45');
+INSERT INTO `calender` VALUES ('93e4caa95884e65d47d49074cad1fa07', 0, '20200815', '2020-08-15', 6, '20200815', '20200816', '', '2', '周末', '周末', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:14');
+INSERT INTO `calender` VALUES ('957a5fd2df242bc4e8e7b6eb4d155894', 0, '20200305', '2020-03-05', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:16');
+INSERT INTO `calender` VALUES ('957c9224115ba031b9bc5ef8263378e2', 0, '20201103', '2020-11-03', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:34');
+INSERT INTO `calender` VALUES ('962ea61a07c55ab064f3cea26a5f04e3', 0, '20201224', '2020-12-24', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:27', 'APP_USER', '2020-05-12 10:09:25');
+INSERT INTO `calender` VALUES ('965b2c9ea31049e79f8083af4b158b1f', 0, '20200104', '2020-01-04', 6, '20200104', '20200105', '', '2', '周末', '周末', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:03:15');
+INSERT INTO `calender` VALUES ('96b159463a35806414a361e65d18d75f', 0, '20201011', '2020-10-11', 7, '20201010', '20201011', '', '2', '周末', '周末', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:11');
+INSERT INTO `calender` VALUES ('972dce32107b1d4544d1cbcbe080fdda', 0, '20201125', '2020-11-25', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:27', 'APP_USER', '2020-05-12 10:08:56');
+INSERT INTO `calender` VALUES ('9747a58c8b33a35fc5b17cafe0007089', 0, '20200419', '2020-04-19', 7, '20200418', '20200419', '', '2', '周末', '周末', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:05:06');
+INSERT INTO `calender` VALUES ('97a6ae19ff9ff2080e3466fe2f64d0d6', 0, '20200229', '2020-02-29', 6, '20200229', '20200301', '', '2', '周末', '周末', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:11');
+INSERT INTO `calender` VALUES ('98cb573a23f892db776cb051edf770a8', 0, '20200312', '2020-03-12', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:23');
+INSERT INTO `calender` VALUES ('9944c3a188f8a511c556da17e90c99e6', 0, '20201220', '2020-12-20', 7, '20201219', '20201220', '', '2', '周末', '周末', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:27', 'APP_USER', '2020-05-12 10:09:21');
+INSERT INTO `calender` VALUES ('996d36d081ba61239fd8c972016a30bf', 0, '20200723', '2020-07-23', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:51');
+INSERT INTO `calender` VALUES ('99a15f8af7817ccaa311d20c5114d5b3', 0, '20200716', '2020-07-16', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:44');
+INSERT INTO `calender` VALUES ('9a2ec07e2e3a9a4a6a5368073bd3b85e', 0, '20201101', '2020-11-01', 7, '20201031', '20201101', '', '2', '周末', '周末', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:32');
+INSERT INTO `calender` VALUES ('9ad9626d555a3a8140ef0e1d5d02ce76', 0, '20201015', '2020-10-15', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:15');
+INSERT INTO `calender` VALUES ('9c2542eb5ef7c08d3f82cce32e7e0c18', 0, '20200107', '2020-01-07', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:03:18');
+INSERT INTO `calender` VALUES ('9c4b4bc32bb61d9da24c9a90fa524d77', 0, '20200602', '2020-06-02', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:05:50');
+INSERT INTO `calender` VALUES ('9c9ac3c629ae1b5b370e0963a8449f54', 0, '20200226', '2020-02-26', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:08');
+INSERT INTO `calender` VALUES ('9d0f767f9d0393389a7c077737d07784', 0, '20200804', '2020-08-04', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:03');
+INSERT INTO `calender` VALUES ('9de2dfaf07e74819a60e1d52e0de8155', 0, '20200121', '2020-01-21', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:03:32');
+INSERT INTO `calender` VALUES ('9f61e0b49c7d46bb5fe926b9fd09d049', 0, '20200824', '2020-08-24', 1, '', '', '', '1', '工作日', '无', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:23');
+INSERT INTO `calender` VALUES ('a1f25a7e1f9c72e1e041ea0b0f4baabb', 0, '20200531', '2020-05-31', 7, '20200530', '20200531', '', '2', '周末', '周末', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:05:48');
+INSERT INTO `calender` VALUES ('a220f73c1e4c1a8949c3e0b3f6588113', 0, '20201117', '2020-11-17', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:48');
+INSERT INTO `calender` VALUES ('a26694dba8bc36ac7d2f005976c66682', 0, '20200715', '2020-07-15', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:44');
+INSERT INTO `calender` VALUES ('a2f3859d691ba6e2e20eeaf50a2ac2e8', 0, '20201116', '2020-11-16', 1, '', '', '', '1', '工作日', '无', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:47');
+INSERT INTO `calender` VALUES ('a38af258bd29555cf080683ae15afa25', 0, '20200212', '2020-02-12', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:03:54');
+INSERT INTO `calender` VALUES ('a39fb936fcb1c921185b9576fe6deec3', 0, '20200712', '2020-07-12', 7, '20200711', '20200712', '', '2', '周末', '周末', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:33');
+INSERT INTO `calender` VALUES ('a3c483ade5847a2fc1134fa7623d8299', 0, '20201001', '2020-10-01', 4, '20201001', '20201008', '10月1日至8日放假调休，共8天。9月27日（星期日）、10月10日（星期六）上班。', '3', '节假日', '国庆节、中秋节', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:01');
+INSERT INTO `calender` VALUES ('a4422d3af0500379a2e50de1e17ed777', 0, '20200113', '2020-01-13', 1, '', '', '', '1', '工作日', '无', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:03:24');
+INSERT INTO `calender` VALUES ('a6e84df4f6ba1e4226a26a6ec866dd0c', 0, '20200707', '2020-07-07', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:25');
+INSERT INTO `calender` VALUES ('a6e890984e034c980287720f9d0fcaf3', 0, '20200329', '2020-03-29', 7, '20200328', '20200329', '', '2', '周末', '周末', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:40');
+INSERT INTO `calender` VALUES ('a7192be90a5771777b4b45ae8ce3f81a', 0, '20200106', '2020-01-06', 1, '', '', '', '1', '工作日', '无', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:03:17');
+INSERT INTO `calender` VALUES ('a74e5bd1c6c789686444f821ca41ecfd', 0, '20200327', '2020-03-27', 5, '', '', '', '1', '工作日', '无', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:38');
+INSERT INTO `calender` VALUES ('a8a42e37b75deb49a8e9ec5d5e447420', 0, '20200220', '2020-02-20', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:02');
+INSERT INTO `calender` VALUES ('a8e78ba44f004579851bef77937169ff', 0, '20200919', '2020-09-19', 6, '20200919', '20200920', '', '2', '周末', '周末', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:49');
+INSERT INTO `calender` VALUES ('a988f55221d30358ebd514800f18a729', 0, '20200704', '2020-07-04', 6, '20200704', '20200705', '', '2', '周末', '周末', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:22');
+INSERT INTO `calender` VALUES ('a9a8f9d624a7c4fd69edf3d74147694b', 0, '20200623', '2020-06-23', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:11');
+INSERT INTO `calender` VALUES ('ab979f394ce5d92518f3bc19d7717533', 0, '20200128', '2020-01-28', 2, '20200124', '20200202', '1月24日至2月2日放假，共8天。1月19日（星期日）上班。', '3', '节假日', '春节', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:03:39');
+INSERT INTO `calender` VALUES ('abd19dddb8395cb60a6a86101bfe1e37', 0, '20200514', '2020-05-14', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:05:31');
+INSERT INTO `calender` VALUES ('acaca3af51abaf9e27809f496c5526d8', 0, '20201020', '2020-10-20', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:20');
+INSERT INTO `calender` VALUES ('ad20289feb817e89c88eefd2e32eb8e7', 0, '20200512', '2020-05-12', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 15:13:00', 'APP_USER', '2020-05-12 15:20:16');
+INSERT INTO `calender` VALUES ('ad43595b890c2506f0395701872dbd28', 0, '20201025', '2020-10-25', 7, '20201024', '20201025', '', '2', '周末', '周末', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:25');
+INSERT INTO `calender` VALUES ('ad4cef1494372f2916e615e33a9786b2', 0, '20200319', '2020-03-19', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:30');
+INSERT INTO `calender` VALUES ('ae219cfaf884e87bcfe43169351c376e', 0, '20201227', '2020-12-27', 7, '20201226', '20201227', '', '2', '周末', '周末', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:27', 'APP_USER', '2020-05-12 10:09:28');
+INSERT INTO `calender` VALUES ('ae7abb91187d64643028e15d565a8af5', 0, '20200322', '2020-03-22', 7, '20200321', '20200322', '', '2', '周末', '周末', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:33');
+INSERT INTO `calender` VALUES ('aefdc740c53135b161bb1cf856182c82', 0, '20200323', '2020-03-23', 1, '', '', '', '1', '工作日', '无', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:34');
+INSERT INTO `calender` VALUES ('af558b6871e0bbc9f7849d753834d743', 0, '20200310', '2020-03-10', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:21');
+INSERT INTO `calender` VALUES ('af5c4970e8c2ebc91b3dc3e8c86a6685', 0, '20201128', '2020-11-28', 6, '20201128', '20201129', '', '2', '周末', '周末', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:27', 'APP_USER', '2020-05-12 10:08:59');
+INSERT INTO `calender` VALUES ('af92d34b56bd10bb4053d748c7369afe', 0, '20200607', '2020-06-07', 7, '20200606', '20200607', '', '2', '周末', '周末', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:05:55');
+INSERT INTO `calender` VALUES ('b001a9d059daf65591410098e01ab9fc', 0, '20200624', '2020-06-24', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:12');
+INSERT INTO `calender` VALUES ('b1cdcd8ae1a8d664bef145d22748ca12', 0, '20201207', '2020-12-07', 1, '', '', '', '1', '工作日', '无', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:27', 'APP_USER', '2020-05-12 10:09:08');
+INSERT INTO `calender` VALUES ('b3a48d7a40374388c3fbe8ce334fff79', 0, '20200108', '2020-01-08', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:03:19');
+INSERT INTO `calender` VALUES ('b50e17770f2d938b07592556975c6fae', 0, '20200921', '2020-09-21', 1, '', '', '', '1', '工作日', '无', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:51');
+INSERT INTO `calender` VALUES ('b5626f521fd021963129722902b8eed5', 0, '20200320', '2020-03-20', 5, '', '', '', '1', '工作日', '无', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:31');
+INSERT INTO `calender` VALUES ('b569b83a1ac18c0946cb497af732462e', 0, '20200328', '2020-03-28', 6, '20200328', '20200329', '', '2', '周末', '周末', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:39');
+INSERT INTO `calender` VALUES ('b6002c882de5667ad1cfd209a3f6470e', 0, '20201205', '2020-12-05', 6, '20201205', '20201206', '', '2', '周末', '周末', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:27', 'APP_USER', '2020-05-12 10:09:06');
+INSERT INTO `calender` VALUES ('b72f5e80d3af1c0b304c852677911f9a', 0, '20201102', '2020-11-02', 1, '', '', '', '1', '工作日', '无', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:33');
+INSERT INTO `calender` VALUES ('b7e0b1301db848599b7f795f5df43bc8', 0, '20200201', '2020-02-01', 6, '20200124', '20200202', '1月24日至2月2日放假，共8天。1月19日（星期日）上班。', '3', '节假日', '春节', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:03:43');
+INSERT INTO `calender` VALUES ('b7eaea10818d42112597e33f9a4eda43', 0, '20200827', '2020-08-27', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:26');
+INSERT INTO `calender` VALUES ('b802c436d0a48141936a24cada58790d', 0, '20200326', '2020-03-26', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:37');
+INSERT INTO `calender` VALUES ('b80adb6cbd61dae541d1f1ca44e610ea', 0, '20200519', '2020-05-19', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:05:36');
+INSERT INTO `calender` VALUES ('ba39168e4dbd363f0f7d37dd5a5d0559', 0, '20200703', '2020-07-03', 5, '', '', '', '1', '工作日', '无', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:21');
+INSERT INTO `calender` VALUES ('bbd1953264041dcd491e3b87b533b985', 0, '20200202', '2020-02-02', 7, '20200124', '20200202', '1月24日至2月2日放假，共8天。1月19日（星期日）上班。', '3', '节假日', '春节', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:03:44');
+INSERT INTO `calender` VALUES ('bca5f780c44b64cf9fd6a78017fc9c76', 0, '20200502', '2020-05-02', 6, '20200501', '20200505', '5月1日至5日放假调休，共5天。4月26日（星期日）、5月9日（星期六）上班。', '3', '节假日', '劳动节', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:05:19');
+INSERT INTO `calender` VALUES ('bd4bf9f82d91d2196757ebba7bc5e15c', 0, '20200826', '2020-08-26', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:25');
+INSERT INTO `calender` VALUES ('bdb5fcb7b59f12d0f7099568ec5c110b', 0, '20201110', '2020-11-10', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:41');
+INSERT INTO `calender` VALUES ('bec5e8e884c96ecb38338cc525dd2596', 0, '20201019', '2020-10-19', 1, '', '', '', '1', '工作日', '无', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:19');
+INSERT INTO `calender` VALUES ('bf4111aa99a4f7fa514df2b017c16751', 0, '20200403', '2020-04-03', 5, '', '', '', '1', '工作日', '无', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:45');
+INSERT INTO `calender` VALUES ('c12e129828fccc5b04ccce4c0e018fbf', 0, '20200401', '2020-04-01', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:43');
+INSERT INTO `calender` VALUES ('c17f20250a118441752664a8f067a6cf', 0, '20200708', '2020-07-08', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:29');
+INSERT INTO `calender` VALUES ('c1e31cdac72e2e9e029540cca8bdfdba', 0, '20200717', '2020-07-17', 5, '', '', '', '1', '工作日', '无', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:45');
+INSERT INTO `calender` VALUES ('c29792f840935b31d96a009fcdb727c0', 0, '20201018', '2020-10-18', 7, '20201017', '20201018', '', '2', '周末', '周末', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:18');
+INSERT INTO `calender` VALUES ('c37e020ddc1b41bba979403c99d4a30e', 0, '20201231', '2020-12-31', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:27', 'APP_USER', '2020-05-12 10:09:32');
+INSERT INTO `calender` VALUES ('c49971e3825c6dcac005512de1ee9fb3', 0, '20200619', '2020-06-19', 5, '', '', '', '1', '工作日', '无', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:07');
+INSERT INTO `calender` VALUES ('c4c446b4eebe9601abcf49ea38fda2af', 0, '20200204', '2020-02-04', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:03:46');
+INSERT INTO `calender` VALUES ('c539bdbfa0890f009f4621cdb163eb84', 0, '20200718', '2020-07-18', 6, '20200718', '20200719', '', '2', '周末', '周末', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:46');
+INSERT INTO `calender` VALUES ('c5acee5c1223adb9cd2c0163355329ad', 0, '20200518', '2020-05-18', 1, '', '', '', '1', '工作日', '无', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:05:35');
+INSERT INTO `calender` VALUES ('c65763e6f67bcd9aa5017683582c9e67', 0, '20200412', '2020-04-12', 7, '20200411', '20200412', '', '2', '周末', '周末', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:59');
+INSERT INTO `calender` VALUES ('c68ffa615ab4935a01562dadbf2d4164', 0, '20200331', '2020-03-31', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:42');
+INSERT INTO `calender` VALUES ('c6ee81702bbe1766969dfa0cbc978755', 0, '20200511', '2020-05-11', 1, '', '', '', '1', '工作日', '无', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:05:28');
+INSERT INTO `calender` VALUES ('c702f672cb824f7b18f7efb0ef6d8535', 0, '20200307', '2020-03-07', 6, '20200307', '20200308', '', '2', '周末', '周末', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:18');
+INSERT INTO `calender` VALUES ('c7e5ba7dd3e1e235f0ba35a198491886', 0, '20200408', '2020-04-08', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:55');
+INSERT INTO `calender` VALUES ('c7fd43d7bc3bed38f7f822436ec3fca6', 0, '20201215', '2020-12-15', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:27', 'APP_USER', '2020-05-12 10:09:16');
+INSERT INTO `calender` VALUES ('c8407ba7fdfad2ab0f800a2d81ae6e7c', 0, '20201106', '2020-11-06', 5, '', '', '', '1', '工作日', '无', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:37');
+INSERT INTO `calender` VALUES ('c983a79355646c357231d75bc4ee6325', 0, '20200725', '2020-07-25', 6, '20200725', '20200726', '', '2', '周末', '周末', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:53');
+INSERT INTO `calender` VALUES ('c9a8708b7e06862bb54d299bbe93ed7b', 0, '20200103', '2020-01-03', 5, '', '', '', '1', '工作日', '无', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:03:14');
+INSERT INTO `calender` VALUES ('c9af06bda9dad8c1c95323c516144f0c', 0, '20200303', '2020-03-03', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:14');
+INSERT INTO `calender` VALUES ('c9c34f244eedd2d6531e69b64e972c4c', 0, '20200626', '2020-06-26', 5, '20200625', '20200627', '6月25日至27日放假调休，共3天。6月28日（星期日）上班。', '3', '节假日', '端午节', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:14');
+INSERT INTO `calender` VALUES ('c9d71d90951d24c0b6c2473bd64e997f', 0, '20200615', '2020-06-15', 1, '', '', '', '1', '工作日', '无', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:03');
+INSERT INTO `calender` VALUES ('ca2cbd7a8fca795523f036bc556dd9c8', 0, '20200819', '2020-08-19', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:18');
+INSERT INTO `calender` VALUES ('ca91ce6d49f32351936625a782048f37', 0, '20200418', '2020-04-18', 6, '20200418', '20200419', '', '2', '周末', '周末', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:05:05');
+INSERT INTO `calender` VALUES ('caeb4101a59994f4d6c5f9fc2abf7d85', 0, '20200523', '2020-05-23', 6, '20200523', '20200524', '', '2', '周末', '周末', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:05:40');
+INSERT INTO `calender` VALUES ('cb2f8f5feb2b53beb656ae79f19a5e0a', 0, '20200110', '2020-01-10', 5, '', '', '', '1', '工作日', '无', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:03:21');
+INSERT INTO `calender` VALUES ('cc3e4ed16b2618e77f6388e05cf1ac3b', 0, '20200829', '2020-08-29', 6, '20200829', '20200830', '', '2', '周末', '周末', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:28');
+INSERT INTO `calender` VALUES ('cc702f50b9969de7ce7848dbc7bbb9f7', 0, '20200428', '2020-04-28', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:05:15');
+INSERT INTO `calender` VALUES ('cce60aad407c8c81f9fc201047ff9bc1', 0, '20200426', '2020-04-26', 7, '', '', '调休', '1', '工作日', '无', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:05:13');
+INSERT INTO `calender` VALUES ('cd028fff99e9ac69bab3d61388016d43', 0, '20200809', '2020-08-09', 7, '20200808', '20200809', '', '2', '周末', '周末', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:08');
+INSERT INTO `calender` VALUES ('cd565b415036df24075d4de19ef5a7cb', 0, '20200306', '2020-03-06', 5, '', '', '', '1', '工作日', '无', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:17');
+INSERT INTO `calender` VALUES ('cdc332fb34673a8b3d0c21be380314b6', 0, '20201029', '2020-10-29', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:29');
+INSERT INTO `calender` VALUES ('cdd673d1816f5e6831f54075ec26d9c4', 0, '20201201', '2020-12-01', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:27', 'APP_USER', '2020-05-12 10:09:02');
+INSERT INTO `calender` VALUES ('cde81c3d82e8a44c268e736d6dfaa9aa', 0, '20200729', '2020-07-29', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:57');
+INSERT INTO `calender` VALUES ('cf8129d0a7d4ee8c2a8bd00a8de2552d', 0, '20200330', '2020-03-30', 1, '', '', '', '1', '工作日', '无', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:41');
+INSERT INTO `calender` VALUES ('d0b8b7fde6e0a0e76a49108c11f8f8a1', 0, '20200924', '2020-09-24', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:54');
+INSERT INTO `calender` VALUES ('d0da8d5ae49f15fac5922e852b24ff35', 0, '20200224', '2020-02-24', 1, '', '', '', '1', '工作日', '无', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:06');
+INSERT INTO `calender` VALUES ('d10e7145a8a9a5668072f6e772775554', 0, '20201118', '2020-11-18', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:49');
+INSERT INTO `calender` VALUES ('d11f4c89b5fbed55298f79b2fc5d67b6', 0, '20200203', '2020-02-03', 1, '', '', '', '1', '工作日', '无', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:03:45');
+INSERT INTO `calender` VALUES ('d18bf8256f1144cd56fbae9bee2e333a', 0, '20200807', '2020-08-07', 5, '', '', '', '1', '工作日', '无', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:06');
+INSERT INTO `calender` VALUES ('d18c5725a73f6053b9f77410b6bea392', 0, '20201008', '2020-10-08', 4, '20201001', '20201008', '10月1日至8日放假调休，共8天。9月27日（星期日）、10月10日（星期六）上班。', '3', '节假日', '国庆节、中秋节', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:08');
+INSERT INTO `calender` VALUES ('d26f0417bfbdf7cadaac7e8ce4b5f4a5', 0, '20200925', '2020-09-25', 5, '', '', '', '1', '工作日', '无', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:55');
+INSERT INTO `calender` VALUES ('d50647890023f9d8161a0e3835caeb04', 0, '20200129', '2020-01-29', 3, '20200124', '20200202', '1月24日至2月2日放假，共8天。1月19日（星期日）上班。', '3', '节假日', '春节', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:03:40');
+INSERT INTO `calender` VALUES ('d5eaba89a103b378d24fad69a24e8a0c', 0, '20201219', '2020-12-19', 6, '20201219', '20201220', '', '2', '周末', '周末', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:27', 'APP_USER', '2020-05-12 10:09:20');
+INSERT INTO `calender` VALUES ('d5ede55a05374c0fc31ac3aee1a714ab', 0, '20200609', '2020-06-09', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:05:57');
+INSERT INTO `calender` VALUES ('d64c473a123605fa1442f4ef2322ced5', 0, '20200529', '2020-05-29', 5, '', '', '', '1', '工作日', '无', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:05:46');
+INSERT INTO `calender` VALUES ('d765cf0bcaa3679bc41524f9706ffe72', 0, '20200612', '2020-06-12', 5, '', '', '', '1', '工作日', '无', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:00');
+INSERT INTO `calender` VALUES ('d7fa163e01713d5d500ebf8f83db2395', 0, '20200503', '2020-05-03', 7, '20200501', '20200505', '5月1日至5日放假调休，共5天。4月26日（星期日）、5月9日（星期六）上班。', '3', '节假日', '劳动节', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:05:20');
+INSERT INTO `calender` VALUES ('d8bd7296f660a3bf16de959b4431341a', 0, '20200517', '2020-05-17', 7, '20200516', '20200517', '', '2', '周末', '周末', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:05:34');
+INSERT INTO `calender` VALUES ('d90e6be07881b5899d57882b07461c62', 0, '20200125', '2020-01-25', 6, '20200124', '20200202', '1月24日至2月2日放假，共8天。1月19日（星期日）上班。', '3', '节假日', '春节', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:03:36');
+INSERT INTO `calender` VALUES ('da255693a2012a4c3e79b257eadb9deb', 0, '20200614', '2020-06-14', 7, '20200613', '20200614', '', '2', '周末', '周末', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:02');
+INSERT INTO `calender` VALUES ('db4018d06ab9e21759892b18d4f0a90d', 0, '20200705', '2020-07-05', 7, '20200704', '20200705', '', '2', '周末', '周末', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:23');
+INSERT INTO `calender` VALUES ('dc66f6a90771ee625c68cb35bd12caaa', 0, '20200111', '2020-01-11', 6, '20200111', '20200112', '', '2', '周末', '周末', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:03:22');
+INSERT INTO `calender` VALUES ('dc734aa279bc49d095e9943d4aaa926a', 0, '20200504', '2020-05-04', 1, '20200501', '20200505', '5月1日至5日放假调休，共5天。4月26日（星期日）、5月9日（星期六）上班。', '3', '节假日', '劳动节', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:05:21');
+INSERT INTO `calender` VALUES ('dcd679675734164f9a42c11ee42f37df', 0, '20200515', '2020-05-15', 5, '', '', '', '1', '工作日', '无', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:05:32');
+INSERT INTO `calender` VALUES ('dd57752897902f2d36ae7e2530d6a0bc', 0, '20200831', '2020-08-31', 1, '', '', '', '1', '工作日', '无', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:30');
+INSERT INTO `calender` VALUES ('dd90ae4c03f15a7623300dee293af6d7', 0, '20201230', '2020-12-30', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:27', 'APP_USER', '2020-05-12 10:09:31');
+INSERT INTO `calender` VALUES ('ddf4c93eb9a52a31a2c132c9b71d5ae9', 0, '20200611', '2020-06-11', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:05:59');
+INSERT INTO `calender` VALUES ('df53b975c872875e564f237e892a7f45', 0, '20200606', '2020-06-06', 6, '20200606', '20200607', '', '2', '周末', '周末', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:05:54');
+INSERT INTO `calender` VALUES ('df772282ee6f8e0062fb5cc6e97ae90d', 0, '20200803', '2020-08-03', 1, '', '', '', '1', '工作日', '无', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:02');
+INSERT INTO `calender` VALUES ('e182ab81b8a209acc50e0a64549aca88', 0, '20200325', '2020-03-25', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:36');
+INSERT INTO `calender` VALUES ('e1ca27bc239520538806abf727bfc200', 0, '20201026', '2020-10-26', 1, '', '', '', '1', '工作日', '无', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:26');
+INSERT INTO `calender` VALUES ('e2f0428aafcb13bf08e65bea14419a66', 0, '20200710', '2020-07-10', 5, '', '', '', '1', '工作日', '无', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:31');
+INSERT INTO `calender` VALUES ('e3967c80b22f8a37d9c025b0e56e5834', 0, '20200903', '2020-09-03', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:33');
+INSERT INTO `calender` VALUES ('e3f3e1f7a18c0239ac47980c8ca278ec', 0, '20200730', '2020-07-30', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:58');
+INSERT INTO `calender` VALUES ('e4a873788c057b427e5fbf5feca8efdc', 0, '20200130', '2020-01-30', 4, '20200124', '20200202', '1月24日至2月2日放假，共8天。1月19日（星期日）上班。', '3', '节假日', '春节', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:03:41');
+INSERT INTO `calender` VALUES ('e510c73bf124435322c309b64bf4e962', 0, '20201122', '2020-11-22', 7, '20201121', '20201122', '', '2', '周末', '周末', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:53');
+INSERT INTO `calender` VALUES ('e520597165e33e4153c3d1f413ae21a1', 0, '20201115', '2020-11-15', 7, '20201114', '20201115', '', '2', '周末', '周末', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:46');
+INSERT INTO `calender` VALUES ('e629863ed9e816ef5f7dddcf8c58fe5e', 0, '20200123', '2020-01-23', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:03:34');
+INSERT INTO `calender` VALUES ('e6374c05c6971018d931c67359fa1535', 0, '20200215', '2020-02-15', 6, '20200215', '20200216', '', '2', '周末', '周末', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:03:57');
+INSERT INTO `calender` VALUES ('e701c2bfc6364efe9d0192a54a371202', 0, '20201114', '2020-11-14', 6, '20201114', '20201115', '', '2', '周末', '周末', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:45');
+INSERT INTO `calender` VALUES ('e8ce8b627acff52e69de7eaf43a69d4e', 0, '20200630', '2020-06-30', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:18');
+INSERT INTO `calender` VALUES ('ea12f27e6f7c334883c5fc3cd6c9e2a7', 0, '20200120', '2020-01-20', 1, '', '', '', '1', '工作日', '无', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:03:31');
+INSERT INTO `calender` VALUES ('ea42c692fa8b41a63a2bad81581eeed2', 0, '20200806', '2020-08-06', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:05');
+INSERT INTO `calender` VALUES ('ead79d70f88de33eb312d685543ca39f', 0, '20200317', '2020-03-17', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:28');
+INSERT INTO `calender` VALUES ('ec9cc81dc46a38b05e6c9d6111b5a747', 0, '20200610', '2020-06-10', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:05:58');
+INSERT INTO `calender` VALUES ('ecb2989db7e4947262e26fc391078d91', 0, '20200124', '2020-01-24', 5, '20200124', '20200202', '1月24日至2月2日放假，共8天。1月19日（星期日）上班。', '3', '节假日', '春节', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:03:35');
+INSERT INTO `calender` VALUES ('eccc0c1b98d1c2fe893e034b63949a1e', 0, '20200721', '2020-07-21', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:49');
+INSERT INTO `calender` VALUES ('ecd5cec32212253b2e75206f48109aa6', 0, '20200811', '2020-08-11', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:10');
+INSERT INTO `calender` VALUES ('ed64f2920a350691ba8e35e4be53efe2', 0, '20200820', '2020-08-20', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:19');
+INSERT INTO `calender` VALUES ('edc0394f130c6541c9929902428e920f', 0, '20200505', '2020-05-05', 2, '20200501', '20200505', '5月1日至5日放假调休，共5天。4月26日（星期日）、5月9日（星期六）上班。', '3', '节假日', '劳动节', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:05:22');
+INSERT INTO `calender` VALUES ('edc0b603d0180d7a7d458729207d321c', 0, '20200423', '2020-04-23', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:05:10');
+INSERT INTO `calender` VALUES ('ee4ee5fe78a69c126df116db0469eb49', 0, '20201105', '2020-11-05', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:36');
+INSERT INTO `calender` VALUES ('f211b321e826467d855312b2990c3ab6', 0, '20200810', '2020-08-10', 1, '', '', '', '1', '工作日', '无', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:09');
+INSERT INTO `calender` VALUES ('f2feb01264e6514b3b302f0cc1ec24f0', 0, '20200316', '2020-03-16', 1, '', '', '', '1', '工作日', '无', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:27');
+INSERT INTO `calender` VALUES ('f38bd5ad9aa6b4e729aff1a0a3d99bd6', 0, '20200904', '2020-09-04', 5, '', '', '', '1', '工作日', '无', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:34');
+INSERT INTO `calender` VALUES ('f3fb39f3eeeceebdbd57ede89623cb28', 0, '20200430', '2020-04-30', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:05:17');
+INSERT INTO `calender` VALUES ('f4317a5304c4753a8ea3d70efab3ecaa', 0, '20200516', '2020-05-16', 6, '20200516', '20200517', '', '2', '周末', '周末', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:05:33');
+INSERT INTO `calender` VALUES ('f447b913d68dd9ff3de429e7b531bede', 0, '20200901', '2020-09-01', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:31');
+INSERT INTO `calender` VALUES ('f51d1825b43afe99f478664bfc179f1f', 0, '20200728', '2020-07-28', 2, '', '', '', '1', '工作日', '无', 'Tuesday', '周二', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:56');
+INSERT INTO `calender` VALUES ('f6b262efde2bb391bfe1ca3db9a56472', 0, '20201210', '2020-12-10', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:27', 'APP_USER', '2020-05-12 10:09:11');
+INSERT INTO `calender` VALUES ('f762a73ff252cb0eb9e05534ad849d1e', 0, '20200521', '2020-05-21', 4, '', '', '', '1', '工作日', '无', 'Thursday', '周四', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:05:38');
+INSERT INTO `calender` VALUES ('f806b608c775f98ee4bc398b7725d3ad', 0, '20200308', '2020-03-08', 7, '20200307', '20200308', '', '2', '周末', '周末', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:04:19');
+INSERT INTO `calender` VALUES ('fa73f2294e0a4eee0c69615c974168cb', 0, '20200912', '2020-09-12', 6, '20200912', '20200913', '', '2', '周末', '周末', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:42');
+INSERT INTO `calender` VALUES ('fae8a185567ae608b0817da8344ae306', 0, '20200126', '2020-01-26', 7, '20200124', '20200202', '1月24日至2月2日放假，共8天。1月19日（星期日）上班。', '3', '节假日', '春节', 'Sunday', '周日', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:03:37');
+INSERT INTO `calender` VALUES ('fb90507b253c954641fa5c12d40fd8fa', 0, '20200509', '2020-05-09', 6, '', '', '调休', '1', '工作日', '无', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:05:26');
+INSERT INTO `calender` VALUES ('fcee0731147e0d43a3c9ec9753177943', 0, '20200603', '2020-06-03', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:05:51');
+INSERT INTO `calender` VALUES ('fd059c1e43782ca8cc076f0ad49df900', 0, '20201005', '2020-10-05', 1, '20201001', '20201008', '10月1日至8日放假调休，共8天。9月27日（星期日）、10月10日（星期六）上班。', '3', '节假日', '国庆节、中秋节', 'Monday', '周一', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:05');
+INSERT INTO `calender` VALUES ('fd1845c5ac1eb3ca2e1ddb3cc85f7f54', 0, '20201023', '2020-10-23', 5, '', '', '', '1', '工作日', '无', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:08:23');
+INSERT INTO `calender` VALUES ('fd4a1e46c44e492c460fab94c1071452', 0, '20200902', '2020-09-02', 3, '', '', '', '1', '工作日', '无', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:07:32');
+INSERT INTO `calender` VALUES ('fe45e48535e36660744c5856def4b64d', 0, '20200101', '2020-01-01', 3, '20200101', '20200101', '2020年1月1日放假，共1天。', '3', '节假日', '元旦', 'Wednesday', '周三', 0, 0, 'APP_USER', '2020-05-12 01:32:00', 'fa5e50ca724911eab9c900163e08c0f9', '2020-05-12 13:48:50');
+INSERT INTO `calender` VALUES ('ff7e08ece3008eeb1661a2b1d8b4e20e', 0, '20200711', '2020-07-11', 6, '20200711', '20200712', '', '2', '周末', '周末', 'Saturday', '周六', 0, 0, 'APP_USER', '2020-05-12 01:32:26', 'APP_USER', '2020-05-12 10:06:32');
+INSERT INTO `calender` VALUES ('ffe45e7059c67874f88498cfcfd19b4c', 0, '20200424', '2020-04-24', 5, '', '', '', '1', '工作日', '无', 'Friday', '周五', 0, 0, 'APP_USER', '2020-05-12 01:32:25', 'APP_USER', '2020-05-12 10:05:11');
+
+SET FOREIGN_KEY_CHECKS = 1;

From 9778dd748cc68aa4c1998b8fad0c8cc4991e6af5 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 12 May 2020 16:15:29 +0800
Subject: [PATCH 30/45] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=B7=9F=E8=B8=AA-?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=A4=84=E7=90=86=E8=BF=9B=E5=B1=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/form/.gitkeep |  0
 .../epmet/dto/form/ProcessListFormDTO.java    | 20 ++++++
 .../main/java/com/epmet/dto/result/.gitkeep   |  0
 .../dto/result/ProcesslistResultDTO.java      | 71 +++++++++++++++++++
 .../main/java/com/epmet/controller/.gitkeep   |  0
 .../controller/ProjectTraceController.java    | 30 ++++++++
 .../src/main/java/com/epmet/dao/.gitkeep      |  0
 .../java/com/epmet/dao/ProjectProcessDao.java | 13 +++-
 .../src/main/java/com/epmet/entity/.gitkeep   |  0
 .../src/main/java/com/epmet/service/.gitkeep  |  0
 .../epmet/service/ProjectProcessService.java  | 10 +++
 .../impl/ProjectProcessServiceImpl.java       | 26 +++++--
 .../src/main/resources/mapper/.gitkeep        |  0
 .../resources/mapper/ProjectProcessDao.xml    | 32 ++++-----
 14 files changed, 181 insertions(+), 21 deletions(-)
 delete mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/.gitkeep
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProcessListFormDTO.java
 delete mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/.gitkeep
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProcesslistResultDTO.java
 delete mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/.gitkeep
 delete mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/.gitkeep
 delete mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/.gitkeep
 delete mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/.gitkeep
 delete mode 100644 epmet-module/gov-project/gov-project-server/src/main/resources/mapper/.gitkeep

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/.gitkeep b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProcessListFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProcessListFormDTO.java
new file mode 100644
index 0000000000..ec88405a6e
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProcessListFormDTO.java
@@ -0,0 +1,20 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 项目处理进展列表-接口入参
+ * @Author sun
+ */
+@Data
+public class ProcessListFormDTO implements Serializable {
+    private static final long serialVersionUID = 4859779755214502427L;
+
+    @NotBlank(message = "项目Id不能为空")
+    private String projectId;
+
+}
+
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/.gitkeep b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProcesslistResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProcesslistResultDTO.java
new file mode 100644
index 0000000000..d77367e075
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProcesslistResultDTO.java
@@ -0,0 +1,71 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * 项目跟踪-项目处理进展列表-接口返参
+ *
+ * @author sun
+ */
+@Data
+public class ProcesslistResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 项目Id
+     */
+    private String projectId = "";
+
+    /**
+     * 项目处理进展Id
+     */
+    private String processId = "";
+
+    /**
+     * 处理进展名称
+     */
+    private String processName = "";
+
+    /**
+     * 处理进展时间
+     */
+    private Long processTime;
+
+    /**
+     * 处理部门
+     */
+    private String departmentName = "";
+
+    /**
+     * 公开答复
+     */
+    private String publicReply = "";
+
+    /**
+     * 内部备注
+     */
+    private String internalRemark = "";
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/.gitkeep b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTraceController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTraceController.java
index 9a4329be26..6d7d98ba0f 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTraceController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTraceController.java
@@ -1,8 +1,22 @@
 package com.epmet.controller;
 
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.annotation.RequirePermission;
+import com.epmet.commons.tools.enums.RequirePermissionEnum;
+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.dto.form.ProcessListFormDTO;
+import com.epmet.dto.result.ProcesslistResultDTO;
+import com.epmet.service.ProjectProcessService;
+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;
+
 /**
  * @Description 政府端-项目跟踪
  * @Author yinzuomei
@@ -11,5 +25,21 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("trace")
 public class ProjectTraceController {
+
+    @Autowired
+    private ProjectProcessService projectProcessService;
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 项目跟踪-项目处理进展列表
+     **/
+    @PostMapping("processlist")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PROJECT_TRACE_DETAIL)
+    public Result<List<ProcesslistResultDTO>> processList(@LoginUser TokenDto tokenDTO, @RequestBody ProcessListFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        return new Result<List<ProcesslistResultDTO>>().ok(projectProcessService.progressList(formDTO));
+    }
 }
 
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/.gitkeep b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectProcessDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectProcessDao.java
index 5472b13ba0..825918297a 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectProcessDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectProcessDao.java
@@ -18,8 +18,12 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.result.ProcesslistResultDTO;
 import com.epmet.entity.ProjectProcessEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 项目处理进展表
@@ -29,5 +33,12 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface ProjectProcessDao extends BaseDao<ProjectProcessEntity> {
-	
+
+    /**
+     * @param projectId
+     * @return
+     * @Author sun
+     * @Description 根据项目Id查询项目处理进展列表
+     **/
+    List<ProcesslistResultDTO> getProcessListByProjectId(@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/.gitkeep b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/.gitkeep b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectProcessService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectProcessService.java
index b44896e261..ce4889776a 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectProcessService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectProcessService.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.ProjectProcessDTO;
+import com.epmet.dto.form.ProcessListFormDTO;
+import com.epmet.dto.result.ProcesslistResultDTO;
 import com.epmet.entity.ProjectProcessEntity;
 
 import java.util.List;
@@ -92,4 +94,12 @@ public interface ProjectProcessService extends BaseService<ProjectProcessEntity>
      * @date 2020-05-11
      */
     void delete(String[] ids);
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 项目跟踪-项目处理进展列表
+     **/
+    List<ProcesslistResultDTO> progressList(ProcessListFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
index 3d43b730eb..6c45ca75e9 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
@@ -20,12 +20,16 @@ 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.FieldConstant;
 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.ProjectProcessDao;
+import com.epmet.dao.ProjectStaffDao;
 import com.epmet.dto.ProjectProcessDTO;
+import com.epmet.dto.form.ProcessListFormDTO;
+import com.epmet.dto.result.ProcesslistResultDTO;
 import com.epmet.entity.ProjectProcessEntity;
+import com.epmet.feign.GovOrgFeignClient;
 import com.epmet.redis.ProjectProcessRedis;
 import com.epmet.service.ProjectProcessService;
 import org.apache.commons.lang3.StringUtils;
@@ -33,9 +37,7 @@ 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;
+import java.util.*;
 
 /**
  * 项目处理进展表
@@ -48,6 +50,10 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
 
     @Autowired
     private ProjectProcessRedis projectProcessRedis;
+    @Autowired
+    private ProjectStaffDao projectStaffDao;
+    @Autowired
+    private GovOrgFeignClient govOrgFeignClient;
 
     @Override
     public PageData<ProjectProcessDTO> page(Map<String, Object> params) {
@@ -101,4 +107,16 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 项目跟踪-项目处理进展列表
+     **/
+    @Override
+    public List<ProcesslistResultDTO> progressList(ProcessListFormDTO formDTO) {
+        //根据项目Id查询所有处理进展数据，按时间倒序
+        return  baseDao.getProcessListByProjectId(formDTO.getProjectId());
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/.gitkeep b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml
index 9350f107ea..a952540452 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml
@@ -3,22 +3,22 @@
 
 <mapper namespace="com.epmet.dao.ProjectProcessDao">
 
-    <resultMap type="com.epmet.entity.ProjectProcessEntity" id="projectProcessMap">
-        <result property="id" column="ID"/>
-        <result property="projectId" column="PROJECT_ID"/>
-        <result property="staffId" column="STAFF_ID"/>
-        <result property="operation" column="OPERATION"/>
-        <result property="publicReply" column="PUBLIC_REPLY"/>
-        <result property="internalRemark" column="INTERNAL_REMARK"/>
-        <result property="endTime" column="END_TIME"/>
-        <result property="costWorkdays" column="COST_WORKDAYS"/>
-        <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="getProcessListByProjectId" resultType="com.epmet.dto.result.ProcesslistResultDTO">
+        SELECT
+            id AS "processId",
+            project_id AS "projectId",
+            operation_name AS "processName",
+            UNIX_TIMESTAMP(created_time) AS "processTime",
+            department_name AS "departmentName",
+            public_reply AS "publicReply",
+            internal_remark AS "internalRemark"
+        FROM
+            project_process
+        WHERE
+            del_flag = '0'
+        AND project_id = #{projectId}
+        ORDER BY created_time DESC
+    </select>
 
 
 </mapper>
\ No newline at end of file

From ac67a34cea13235bef6237fee05aa95b4625c0e9 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Tue, 12 May 2020 16:58:04 +0800
Subject: [PATCH 31/45] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=92=8C=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/constant/ServiceConstant.java       |   5 +
 .../epmet/dto/form/ProjectClosedFromDTO.java  |  32 ++
 .../epmet/dto/form/ProjectDetailFromDTO.java  |  25 ++
 .../epmet/dto/form/ProjectListFromDTO.java    |  31 ++
 .../com/epmet/dto/form/ReturnFromDTO.java     |  32 ++
 .../com/epmet/dto/form/ReturnListFromDTO.java |  19 ++
 .../dto/result/CreatedListResultDTO.java      |  42 +++
 .../epmet/dto/result/DepartmentResultDTO.java |  23 ++
 .../dto/result/InvolvedListResultDTO.java     |  41 +++
 .../dto/result/PendProjectListResultDTO.java  |  36 +++
 .../dto/result/ProjectDetailResultDTO.java    |  49 +++
 .../epmet/dto/result/ReturnListResultDTO.java |  23 ++
 .../gov-project/gov-project-server/pom.xml    |   6 +
 .../epmet/constant/ParameterKeyConstant.java  |  14 +
 .../com/epmet/constant/ProjectConstant.java   |  71 +++++
 .../controller/ProjectTraceController.java    | 117 ++++++-
 .../dao/CustomerProjectParameterDao.java      |   9 +
 .../main/java/com/epmet/dao/ProjectDao.java   |  57 +++-
 .../java/com/epmet/dao/ProjectStaffDao.java   |  16 +-
 .../com/epmet/feign/CommonFeignClient.java    |  23 ++
 .../fallback/CommonFeignClientFallBack.java   |  24 ++
 .../CustomerProjectParameterService.java      |   9 +
 .../com/epmet/service/ProjectService.java     | 155 ++++++----
 .../epmet/service/ProjectStaffService.java    |  11 +
 .../epmet/service/ProjectTraceService.java    |  91 ++++++
 .../CustomerProjectParameterServiceImpl.java  |   6 +
 .../service/impl/ProjectServiceImpl.java      | 285 ++++++++++++++----
 .../service/impl/ProjectStaffServiceImpl.java |   6 +
 .../service/impl/ProjectTraceServiceImpl.java |  60 ++++
 .../mapper/CustomerProjectParameterDao.xml    |   9 +
 .../src/main/resources/mapper/ProjectDao.xml  |  89 ++++++
 .../main/resources/mapper/ProjectStaffDao.xml |  12 +
 32 files changed, 1311 insertions(+), 117 deletions(-)
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectClosedFromDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectDetailFromDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectListFromDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReturnFromDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReturnListFromDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/CreatedListResultDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/DepartmentResultDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/InvolvedListResultDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PendProjectListResultDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDetailResultDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ReturnListResultDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ParameterKeyConstant.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/CommonFeignClient.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/CommonFeignClientFallBack.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectTraceService.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java
index 5fd9af0bd1..c6b5591ff0 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java
@@ -98,4 +98,9 @@ public interface ServiceConstant {
      * 政府端项目跟踪（项目管理）
      */
     String GOV_PROJECT_SERVER="gov-project-server";
+
+    /**
+     * 共通
+     */
+    String EPMET_COMMON_SERVICE = "epmet-common-service";
 }
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectClosedFromDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectClosedFromDTO.java
new file mode 100644
index 0000000000..29f755243b
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectClosedFromDTO.java
@@ -0,0 +1,32 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription 项目结案
+ * @date 2020/5/11 15:44
+ */
+@Data
+public class ProjectClosedFromDTO implements Serializable {
+
+	private static final long serialVersionUID = -7383213527369892832L;
+	/**
+	 * 项目Id
+	 */
+	private String projectId;
+	/**
+	 * 是否解决(已解决 resolved，未解决 unresolved)
+	 */
+	private String closedStatus;
+	/**
+	 * 公开答复内容
+	 */
+	private String publicReply;
+	/**
+	 * 内部备注内容
+	 */
+	private String internalRemark;
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectDetailFromDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectDetailFromDTO.java
new file mode 100644
index 0000000000..28178701c5
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectDetailFromDTO.java
@@ -0,0 +1,25 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription 项目详情入参
+ * @date 2020/5/11 15:24
+ */
+@Data
+public class ProjectDetailFromDTO implements Serializable {
+	private static final long serialVersionUID = 1246868104866189698L;
+
+	/**
+	 * 项目Id
+	 */
+	private String projectId;
+
+	/**
+	 * 用户ID
+	 */
+	private String userId;
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectListFromDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectListFromDTO.java
new file mode 100644
index 0000000000..d608acf068
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectListFromDTO.java
@@ -0,0 +1,31 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/5/11 14:01
+ */
+@Data
+public class ProjectListFromDTO implements Serializable {
+	private static final long serialVersionUID = 1L;
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
+	/**
+	 * 用户ID
+	 */
+	private String userId;
+	/**
+	 * 页码
+	 */
+	private Integer pageNo;
+	/**
+	 * 每页显示数量
+	 */
+	private Integer pageSize;
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReturnFromDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReturnFromDTO.java
new file mode 100644
index 0000000000..12ec7137d1
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReturnFromDTO.java
@@ -0,0 +1,32 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription 项目退回
+ * @date 2020/5/11 15:55
+ */
+@Data
+public class ReturnFromDTO implements Serializable {
+
+	private static final long serialVersionUID = -8747667324909671154L;
+	/**
+	 * 项目Id
+	 */
+	private String projectId;
+	/**
+	 * 流程节点Id
+	 */
+	private String projectProcessId;
+	/**
+	 * 公开答复内容
+	 */
+	private String publicReply;
+	/**
+	 * 内部流转意见
+	 */
+	private String internalRemark;
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReturnListFromDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReturnListFromDTO.java
new file mode 100644
index 0000000000..cd0aa2638a
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReturnListFromDTO.java
@@ -0,0 +1,19 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription 可退回节点列表
+ * @date 2020/5/11 15:49
+ */
+@Data
+public class ReturnListFromDTO implements Serializable {
+	private static final long serialVersionUID = 741782201514313323L;
+	/**
+	 * 项目Id
+	 */
+	private String projectId;
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/CreatedListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/CreatedListResultDTO.java
new file mode 100644
index 0000000000..3481754cba
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/CreatedListResultDTO.java
@@ -0,0 +1,42 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription 我发起的项目列表
+ * @date 2020/5/11 15:57
+ */
+@Data
+public class CreatedListResultDTO implements Serializable {
+
+	private static final long serialVersionUID = 5957826616179876849L;
+	/**
+	 * 项目Id
+	 */
+	private String projectId;
+	/**
+	 * 项目标题
+	 */
+	private String projectTitle;
+	/**
+	 * 项目创建时间
+	 */
+	private Long projectTime;
+	/**
+	 * 滞留天数
+	 */
+	private String detentionDays;
+	/**
+	 * 当前处理部门(组织-网格、组织-部门 )
+	 */
+	private List<String> departmentNameList;
+	/**
+	 * 是否超期预警
+	 */
+	private Boolean warningFlag;
+
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/DepartmentResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/DepartmentResultDTO.java
new file mode 100644
index 0000000000..d63091b73e
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/DepartmentResultDTO.java
@@ -0,0 +1,23 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/5/12 16:29
+ */
+@Data
+public class DepartmentResultDTO implements Serializable {
+	private static final long serialVersionUID = 394316321928642799L;
+	/**
+	 * 项目人员关联表ID
+	 */
+	private String projectStaffId;
+	/**
+	 * 部门名
+	 */
+	private String departmentName;
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/InvolvedListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/InvolvedListResultDTO.java
new file mode 100644
index 0000000000..39c552f9e5
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/InvolvedListResultDTO.java
@@ -0,0 +1,41 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription 我参与的项目列表
+ * @date 2020/5/11 16:06
+ */
+@Data
+public class InvolvedListResultDTO implements Serializable {
+
+	private static final long serialVersionUID = 6050021263050922594L;
+	/**
+	 * 项目Id
+	 */
+	private String projectId;
+	/**
+	 * 项目标题
+	 */
+	private String projectTitle;
+	/**
+	 * 创建时间
+	 */
+	private Long projectTime;
+	/**
+	 * 滞留天数
+	 */
+	private String detentionDays;
+	/**
+	 * 当前处理部门(组织-网格、组织-部门 )
+	 */
+	private List<String> departmentNameList;
+	/**
+	 * 是否超期预警
+	 */
+	private Boolean warningFlag;
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PendProjectListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PendProjectListResultDTO.java
new file mode 100644
index 0000000000..a2fe308a27
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PendProjectListResultDTO.java
@@ -0,0 +1,36 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription 待处理项目列表
+ * @date 2020/5/11 15:38
+ */
+@Data
+public class PendProjectListResultDTO implements Serializable {
+
+	private static final long serialVersionUID = -7900117646827271573L;
+	/**
+	 * 项目Id
+	 */
+	private String projectId;
+	/**
+	 * 项目标题
+	 */
+	private String projectTitle;
+	/**
+	 * 项目创建时间
+	 */
+	private Long projectTime;
+	/**
+	 * 滞留天数
+	 */
+	private String detentionDays;
+	/**
+	 * 是否超期预警
+	 */
+	private Boolean warningFlag;
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDetailResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDetailResultDTO.java
new file mode 100644
index 0000000000..9c9425d36f
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDetailResultDTO.java
@@ -0,0 +1,49 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/5/11 15:33
+ */
+@Data
+public class ProjectDetailResultDTO implements Serializable {
+
+	private static final long serialVersionUID = -2969103790181586848L;
+	/**
+	 * 项目Id
+	 */
+	private String projectId;
+	/**
+	 * 来源
+	 */
+	private String origin;
+	/**
+	 * 来源Id
+	 */
+	private String originId;
+	/**
+	 * 项目标题
+	 */
+	private String projectTitle;
+	/**
+	 * 项目方案
+	 */
+	private String publicReply;
+	/**
+	 * 内部备注
+	 */
+	private String internalRemark;
+	/**
+	 * 项目状态(待处理 pending，结案closed)
+	 */
+	private String projectStatus;
+	/**
+	 * 处理状态(是否由我处理)
+	 */
+	private Boolean processable;
+
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ReturnListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ReturnListResultDTO.java
new file mode 100644
index 0000000000..229f769753
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ReturnListResultDTO.java
@@ -0,0 +1,23 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription 可退回节点列表
+ * @date 2020/5/11 15:50
+ */
+@Data
+public class ReturnListResultDTO implements Serializable {
+	private static final long serialVersionUID = -7082368401375611559L;
+	/**
+	 * 处理进展表Id
+	 */
+	private String projectProcessId;
+	/**
+	 * 处理人名称(组织-部门-人员 组织-网格-人员 组织-人员)
+	 */
+	private String processor;
+}
diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml
index a1329fba1c..7fa15bd39f 100644
--- a/epmet-module/gov-project/gov-project-server/pom.xml
+++ b/epmet-module/gov-project/gov-project-server/pom.xml
@@ -60,6 +60,12 @@
             <artifactId>feign-httpclient</artifactId>
             <version>10.3.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>common-service-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ParameterKeyConstant.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ParameterKeyConstant.java
new file mode 100644
index 0000000000..502b895544
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ParameterKeyConstant.java
@@ -0,0 +1,14 @@
+package com.epmet.constant;
+
+/**
+ * @author zhaoqifeng
+ * @dscription 客户定制参数key
+ * @date 2020/5/12 11:02
+ */
+public interface ParameterKeyConstant {
+
+	/**
+	 * 可滞留天数
+	 */
+	String DETENTION_DAYS = "detention_days";
+}
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
new file mode 100644
index 0000000000..e9b81ef0f9
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java
@@ -0,0 +1,71 @@
+package com.epmet.constant;
+
+/**
+ * @author zhaoqifeng
+ * @dscription 项目相关常量
+ * @date 2020/5/12 10:47
+ */
+public interface ProjectConstant {
+	/**
+	 * 项目来源-议题
+	 */
+	String ISSUE = "issue";
+	/**
+	 * 状态-待处理
+	 */
+	String PENDING = "pending";
+	/**
+	 * 状态-结案
+	 */
+	String CLOSED = "closed";
+	/**
+	 * 结案状态-已解决
+	 */
+	String RESOLVED = "resolved";
+	/**
+	 * 结案状态-未解决
+	 */
+	String UNRESOLVED = "unresolved";
+
+	/**
+	 * 处理-结案
+	 */
+	String OPERATION_CLOSE = "close";
+	/**
+	 * 处理名-结案
+	 */
+	String OPERATION_CLOSE_NAME = "结案";
+	/**
+	 * 处理-退回
+	 */
+	String OPERATION_RETURN = "return";
+	/**
+	 * 处理名-退回
+	 */
+	String OPERATION_RETURN_NAME = "退回";
+	/**
+	 * 处理-部门流转
+	 */
+	String OPERATION_TRANSFER = "transfer";
+	/**
+	 * 处理名-部门流转
+	 */
+	String OPERATION_TRANSFER_NAME = "部门流转";
+	/**
+	 * 处理-转项目
+	 */
+	String OPERATION_CREATED = "created";
+	/**
+	 * 处理名-转项目
+	 */
+	String OPERATION_CREATED_NAME = "转项目";
+
+	/**
+	 * 是否处理-未处理
+	 */
+	String UNHANDLED = "unhandled";
+	/**
+	 * 是否处理-已处理
+	 */
+	String HANDLE = "handle";
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTraceController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTraceController.java
index 6d7d98ba0f..b862ba1085 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTraceController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTraceController.java
@@ -6,9 +6,10 @@ import com.epmet.commons.tools.enums.RequirePermissionEnum;
 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.dto.form.ProcessListFormDTO;
-import com.epmet.dto.result.ProcesslistResultDTO;
+import com.epmet.dto.form.*;
+import com.epmet.dto.result.*;
 import com.epmet.service.ProjectProcessService;
+import com.epmet.service.ProjectTraceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -26,8 +27,116 @@ import java.util.List;
 @RequestMapping("trace")
 public class ProjectTraceController {
 
-    @Autowired
-    private ProjectProcessService projectProcessService;
+	@Autowired
+	private ProjectTraceService projectTraceService;
+
+	@Autowired
+	private ProjectProcessService projectProcessService;
+
+	/**
+	 * 待处理项目列表
+	 *
+	 * @param tokenDto token
+	 * @param fromDTO  入参
+	 * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.PendProjectListResultDTO>>
+	 * @author zhaoqifeng
+	 * @date 2020/5/11 16:14
+	 */
+	@PostMapping("pendprojectlist")
+	public Result<List<PendProjectListResultDTO>> getPendProjectList(@LoginUser TokenDto tokenDto, @RequestBody ProjectListFromDTO fromDTO) {
+		List<PendProjectListResultDTO> result = projectTraceService.getPendProjectList(tokenDto, fromDTO);
+		return new Result<List<PendProjectListResultDTO>>().ok(result);
+	}
+
+	/**
+	 * 我发起的项目列表
+	 *
+	 * @param tokenDto token
+	 * @param fromDTO  入参
+	 * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.CreatedListResultDTO>>
+	 * @author zhaoqifeng
+	 * @date 2020/5/11 16:19
+	 */
+	@PostMapping("createdlist")
+	public Result<List<CreatedListResultDTO>> getCreatedList(@LoginUser TokenDto tokenDto, @RequestBody ProjectListFromDTO fromDTO) {
+		List<CreatedListResultDTO> result = projectTraceService.getCreatedList(tokenDto, fromDTO);
+		return new Result<List<CreatedListResultDTO>>().ok(result);
+	}
+
+	/**
+	 * 我参与的项目列表
+	 *
+	 * @param tokenDto token
+	 * @param fromDTO  入参
+	 * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.InvolvedListResultDTO>>
+	 * @author zhaoqifeng
+	 * @date 2020/5/11 16:21
+	 */
+	@PostMapping("involvedlist")
+	public Result<List<InvolvedListResultDTO>> getInvolvedList(@LoginUser TokenDto tokenDto, @RequestBody ProjectListFromDTO fromDTO) {
+		List<InvolvedListResultDTO> result = projectTraceService.getInvolvedList(tokenDto, fromDTO);
+		return new Result<List<InvolvedListResultDTO>>().ok(result);
+	}
+
+	/**
+	 * 项目详情
+	 *
+	 * @param tokenDto token
+	 * @param fromDTO  入参
+	 * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.ProjectDetailResultDTO>
+	 * @author zhaoqifeng
+	 * @date 2020/5/11 16:25
+	 */
+	@PostMapping("projectdetail")
+	public Result<ProjectDetailResultDTO> getProjectDetail(@LoginUser TokenDto tokenDto, @RequestBody ProjectDetailFromDTO fromDTO) {
+		ProjectDetailResultDTO result = projectTraceService.getProjectDetail(tokenDto, fromDTO);
+		return new Result<ProjectDetailResultDTO>().ok(result);
+	}
+
+	/**
+	 * 项目结案
+	 *
+	 * @param tokenDto token
+	 * @param fromDTO  入参
+	 * @return com.epmet.commons.tools.utils.Result
+	 * @author zhaoqifeng
+	 * @date 2020/5/11 16:27
+	 */
+	@PostMapping("closeproject")
+	public Result closed(@LoginUser TokenDto tokenDto, @RequestBody ProjectClosedFromDTO fromDTO) {
+		projectTraceService.closed(tokenDto, fromDTO);
+		return new Result();
+	}
+
+	/**
+	 * 可退回节点列表
+	 *
+	 * @param fromDTO 入参
+	 * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.ReturnListResultDTO>>
+	 * @author zhaoqifeng
+	 * @date 2020/5/11 16:30
+	 */
+	@PostMapping("returnablelist")
+	public Result<List<ReturnListResultDTO>> getReturnableList(@RequestBody ReturnListFromDTO fromDTO) {
+		List<ReturnListResultDTO> result = projectTraceService.getReturnableList(fromDTO);
+		return new Result<List<ReturnListResultDTO>>().ok(result);
+	}
+
+	/**
+	 * 项目退回
+	 *
+	 * @param tokenDto token
+	 * @param fromDTO  入参
+	 * @return com.epmet.commons.tools.utils.Result
+	 * @author zhaoqifeng
+	 * @date 2020/5/11 16:32
+	 */
+	@PostMapping("return")
+	public Result projectReturn(@LoginUser TokenDto tokenDto, @RequestBody ReturnFromDTO fromDTO) {
+		projectTraceService.projectReturn(tokenDto, fromDTO);
+		return new Result();
+	}
+
 
     /**
      * @param formDTO
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/CustomerProjectParameterDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/CustomerProjectParameterDao.java
index 715945aaca..c94ad69046 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/CustomerProjectParameterDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/CustomerProjectParameterDao.java
@@ -20,6 +20,7 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.entity.CustomerProjectParameterEntity;
 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 CustomerProjectParameterDao extends BaseDao<CustomerProjectParameterEntity> {
+	/**
+	 * 根据key查找value
+	 * @author zhaoqifeng
+	 * @date 2020/5/12 10:39
+	 * @param entity 参数
+	 * @return java.lang.String
+	 */
+	String selectParameterValueByKey(CustomerProjectParameterEntity entity);
 	
 }
\ 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 e7ba5bd385..c84c8d6f2d 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
@@ -18,8 +18,15 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.ProjectDTO;
+import com.epmet.dto.form.ProjectListFromDTO;
+import com.epmet.dto.result.DepartmentResultDTO;
+import com.epmet.dto.result.ProjectDetailResultDTO;
 import com.epmet.entity.ProjectEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 项目表
@@ -29,5 +36,53 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface ProjectDao extends BaseDao<ProjectEntity> {
-	
+	/**
+	 * 待处理项目列表
+	 *
+	 * @param fromDTO 参数
+	 * @return java.util.List<com.epmet.dto.result.PendProjectListResultDTO>
+	 * @author zhaoqifeng
+	 * @date 2020/5/11 17:04
+	 **/
+	List<ProjectDTO> selectPendList(ProjectListFromDTO fromDTO);
+
+	/**
+	 * 我发起的项目列表
+	 *
+	 * @param fromDTO 参数
+	 * @return java.util.List<com.epmet.dto.result.CreatedListResultDTO>
+	 * @author zhaoqifeng
+	 * @date 2020/5/12 13:59
+	 */
+	List<ProjectDTO> selectCreatedList(ProjectListFromDTO fromDTO);
+
+	/**
+	 * 我参与的项目列表
+	 *
+	 * @param fromDTO 参数
+	 * @return java.util.List<com.epmet.dto.result.InvolvedListResultDTO>
+	 * @author zhaoqifeng
+	 * @date 2020/5/12 14:16
+	 */
+	List<ProjectDTO> selectInvolvedList(ProjectListFromDTO fromDTO);
+
+	/**
+	 * 当前处理部门
+	 *
+	 * @param dto 参数
+	 * @return java.util.List<java.lang.String>
+	 * @author zhaoqifeng
+	 * @date 2020/5/12 14:47
+	 */
+	List<String> selectDepartmentNameList(ProjectDTO dto);
+
+	/**
+	 * 获取项目详情
+	 * @author zhaoqifeng
+	 * @date 2020/5/12 15:18
+	 * @param id
+	 * @return com.epmet.dto.ProjectDTO
+	 */
+	ProjectDetailResultDTO selectProjectDetail(@Param("id") String id);
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectStaffDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectStaffDao.java
index e78229e0f5..b93b670473 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectStaffDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectStaffDao.java
@@ -18,9 +18,13 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.ProjectStaffDTO;
+import com.epmet.dto.result.DepartmentResultDTO;
 import com.epmet.entity.ProjectStaffEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 项目人员关联表
  *
@@ -29,5 +33,15 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface ProjectStaffDao extends BaseDao<ProjectStaffEntity> {
-	
+
+	/**
+	 * 未处理部门列表
+	 *
+	 * @param dto 参数
+	 * @return java.util.List<com.epmet.dto.result.DepartmentResultDTO>
+	 * @author zhaoqifeng
+	 * @date 2020/5/12 16:40
+	 */
+	List<DepartmentResultDTO> selectDepartmentNameList(ProjectStaffDTO dto);
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/CommonFeignClient.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/CommonFeignClient.java
new file mode 100644
index 0000000000..10ed3733c3
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/CommonFeignClient.java
@@ -0,0 +1,23 @@
+package com.epmet.feign;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.WorkDayFormDTO;
+import com.epmet.dto.result.WorkDayResultDTO;
+import com.epmet.feign.fallback.CommonFeignClientFallBack;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/5/12 15:48
+ */
+@FeignClient(name = ServiceConstant.EPMET_COMMON_SERVICE, fallback = CommonFeignClientFallBack.class)
+public interface CommonFeignClient {
+	@PostMapping("commonservice/workday/detentiondays")
+	Result<List<WorkDayResultDTO>> detentionDays(@RequestBody List<WorkDayFormDTO> formDTO);
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/CommonFeignClientFallBack.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/CommonFeignClientFallBack.java
new file mode 100644
index 0000000000..0d7aa93769
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/CommonFeignClientFallBack.java
@@ -0,0 +1,24 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.WorkDayFormDTO;
+import com.epmet.dto.result.WorkDayResultDTO;
+import com.epmet.feign.CommonFeignClient;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/5/12 15:51
+ */
+@Component
+public class CommonFeignClientFallBack implements CommonFeignClient {
+	@Override
+	public Result<List<WorkDayResultDTO>> detentionDays(List<WorkDayFormDTO> formDTO) {
+		return ModuleUtils.feignConError(ServiceConstant.EPMET_COMMON_SERVICE, "detentionDays", formDTO);
+	}
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/CustomerProjectParameterService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/CustomerProjectParameterService.java
index ba787d4171..87664dc583 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/CustomerProjectParameterService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/CustomerProjectParameterService.java
@@ -92,4 +92,13 @@ public interface CustomerProjectParameterService extends BaseService<CustomerPro
      * @date 2020-05-11
      */
     void delete(String[] ids);
+
+    /**
+     *根据key查找value
+     * @author zhaoqifeng
+     * @date 2020/5/12 10:43
+     * @param dto 参数
+     * @return CustomerProjectParameterDTO
+     */
+    String getParameterValueByKey(CustomerProjectParameterDTO dto);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java
index d7c57fdf82..99e0b34b68 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java
@@ -19,7 +19,14 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.ProjectDTO;
+import com.epmet.dto.form.ProjectDetailFromDTO;
+import com.epmet.dto.form.ProjectListFromDTO;
+import com.epmet.dto.result.CreatedListResultDTO;
+import com.epmet.dto.result.InvolvedListResultDTO;
+import com.epmet.dto.result.PendProjectListResultDTO;
+import com.epmet.dto.result.ProjectDetailResultDTO;
 import com.epmet.entity.ProjectEntity;
 
 import java.util.List;
@@ -33,63 +40,103 @@ import java.util.Map;
  */
 public interface ProjectService extends BaseService<ProjectEntity> {
 
-    /**
-     * 默认分页
-     *
-     * @param params
-     * @return PageData<ProjectDTO>
-     * @author generator
-     * @date 2020-05-11
-     */
-    PageData<ProjectDTO> page(Map<String, Object> params);
+	/**
+	 * 默认分页
+	 *
+	 * @param params
+	 * @return PageData<ProjectDTO>
+	 * @author generator
+	 * @date 2020-05-11
+	 */
+	PageData<ProjectDTO> page(Map<String, Object> params);
 
-    /**
-     * 默认查询
-     *
-     * @param params
-     * @return java.util.List<ProjectDTO>
-     * @author generator
-     * @date 2020-05-11
-     */
-    List<ProjectDTO> list(Map<String, Object> params);
+	/**
+	 * 默认查询
+	 *
+	 * @param params
+	 * @return java.util.List<ProjectDTO>
+	 * @author generator
+	 * @date 2020-05-11
+	 */
+	List<ProjectDTO> list(Map<String, Object> params);
 
-    /**
-     * 单条查询
-     *
-     * @param id
-     * @return ProjectDTO
-     * @author generator
-     * @date 2020-05-11
-     */
-    ProjectDTO get(String id);
+	/**
+	 * 单条查询
+	 *
+	 * @param id
+	 * @return ProjectDTO
+	 * @author generator
+	 * @date 2020-05-11
+	 */
+	ProjectDTO get(String id);
 
-    /**
-     * 默认保存
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void save(ProjectDTO dto);
+	/**
+	 * 默认保存
+	 *
+	 * @param dto
+	 * @return void
+	 * @author generator
+	 * @date 2020-05-11
+	 */
+	void save(ProjectDTO dto);
 
-    /**
-     * 默认更新
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void update(ProjectDTO dto);
+	/**
+	 * 默认更新
+	 *
+	 * @param dto
+	 * @return void
+	 * @author generator
+	 * @date 2020-05-11
+	 */
+	void update(ProjectDTO dto);
 
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void delete(String[] ids);
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return void
+	 * @author generator
+	 * @date 2020-05-11
+	 */
+	void delete(String[] ids);
+
+	/**
+	 * 待处理项目列表
+	 *
+	 * @param fromDTO 参数
+	 * @return java.util.List<com.epmet.dto.result.PendProjectListResultDTO>
+	 * @author zhaoqifeng
+	 * @date 2020/5/12 10:23
+	 */
+	List<PendProjectListResultDTO> getPendProjectList(ProjectListFromDTO fromDTO);
+
+	/**
+	 * 我发起的项目列表
+	 *
+	 * @param fromDTO 参数
+	 * @return java.util.List<com.epmet.dto.result.CreatedListResultDTO>
+	 * @author zhaoqifeng
+	 * @date 2020/5/12 13:58
+	 */
+	List<CreatedListResultDTO> getCreatedList(ProjectListFromDTO fromDTO);
+
+	/**
+	 * 我参与的项目列表
+	 *
+	 * @param fromDTO 参数
+	 * @return java.util.List<com.epmet.dto.result.InvolvedListResultDTO>
+	 * @author zhaoqifeng
+	 * @date 2020/5/12 14:57
+	 */
+	List<InvolvedListResultDTO> getInvolvedList(ProjectListFromDTO fromDTO);
+
+	/**
+	 * 项目详情
+	 *
+	 * @param fromDTO 参数
+	 * @return com.epmet.dto.result.ProjectDetailResultDTO
+	 * @author zhaoqifeng
+	 * @date 2020/5/12 15:13
+	 */
+	ProjectDetailResultDTO getProjectDetail(ProjectDetailFromDTO fromDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectStaffService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectStaffService.java
index 30b07ac3b1..62d3b66965 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectStaffService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectStaffService.java
@@ -20,6 +20,7 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.ProjectStaffDTO;
+import com.epmet.dto.result.DepartmentResultDTO;
 import com.epmet.entity.ProjectStaffEntity;
 
 import java.util.List;
@@ -92,4 +93,14 @@ public interface ProjectStaffService extends BaseService<ProjectStaffEntity> {
      * @date 2020-05-11
      */
     void delete(String[] ids);
+
+    /**
+     * 未处理部门列表
+     *
+     * @param dto 参数
+     * @return java.util.List<com.epmet.dto.result.DepartmentResultDTO>
+     * @author zhaoqifeng
+     * @date 2020/5/12 16:40
+     */
+    List<DepartmentResultDTO> getDepartmentNameList(ProjectStaffDTO dto);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectTraceService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectTraceService.java
new file mode 100644
index 0000000000..f91afc3c3a
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectTraceService.java
@@ -0,0 +1,91 @@
+package com.epmet.service;
+
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.*;
+import com.epmet.dto.result.*;
+
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription 项目追踪
+ * @date 2020/5/11 16:34
+ */
+public interface ProjectTraceService {
+	/**
+	 * 待处理项目列表
+	 *
+	 * @param tokenDto token
+	 * @param fromDTO  入参
+	 * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.PendProjectListResultDTO>>
+	 * @author zhaoqifeng
+	 * @date 2020/5/11 16:14
+	 */
+	List<PendProjectListResultDTO> getPendProjectList(TokenDto tokenDto, ProjectListFromDTO fromDTO);
+
+	/**
+	 * 我发起的项目列表
+	 *
+	 * @param tokenDto token
+	 * @param fromDTO  入参
+	 * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.CreatedListResultDTO>>
+	 * @author zhaoqifeng
+	 * @date 2020/5/11 16:19
+	 */
+	List<CreatedListResultDTO> getCreatedList(TokenDto tokenDto, ProjectListFromDTO fromDTO);
+
+	/**
+	 * 我参与的项目列表
+	 *
+	 * @param tokenDto token
+	 * @param fromDTO  入参
+	 * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.InvolvedListResultDTO>>
+	 * @author zhaoqifeng
+	 * @date 2020/5/11 16:21
+	 */
+	List<InvolvedListResultDTO> getInvolvedList(TokenDto tokenDto, ProjectListFromDTO fromDTO);
+
+	/**
+	 * 项目详情
+	 *
+	 * @param tokenDto token
+	 * @param fromDTO  入参
+	 * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.ProjectDetailResultDTO>
+	 * @author zhaoqifeng
+	 * @date 2020/5/11 16:25
+	 */
+	ProjectDetailResultDTO getProjectDetail(TokenDto tokenDto, ProjectDetailFromDTO fromDTO);
+
+	/**
+	 * 项目结案
+	 *
+	 * @param tokenDto token
+	 * @param fromDTO  入参
+	 * @return com.epmet.commons.tools.utils.Result
+	 * @author zhaoqifeng
+	 * @date 2020/5/11 16:27
+	 */
+	void closed(TokenDto tokenDto, ProjectClosedFromDTO fromDTO);
+
+	/**
+	 * 可退回节点列表
+	 *
+	 * @param fromDTO 入参
+	 * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.ReturnListResultDTO>>
+	 * @author zhaoqifeng
+	 * @date 2020/5/11 16:30
+	 */
+	List<ReturnListResultDTO> getReturnableList(ReturnListFromDTO fromDTO);
+
+	/**
+	 * 项目退回
+	 *
+	 * @param tokenDto token
+	 * @param fromDTO  入参
+	 * @return com.epmet.commons.tools.utils.Result
+	 * @author zhaoqifeng
+	 * @date 2020/5/11 16:32
+	 */
+	void projectReturn(TokenDto tokenDto, ReturnFromDTO fromDTO);
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/CustomerProjectParameterServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/CustomerProjectParameterServiceImpl.java
index a3942c0295..3df0971eb3 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/CustomerProjectParameterServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/CustomerProjectParameterServiceImpl.java
@@ -101,4 +101,10 @@ public class CustomerProjectParameterServiceImpl extends BaseServiceImpl<Custome
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public String getParameterValueByKey(CustomerProjectParameterDTO dto) {
+        CustomerProjectParameterEntity entity = ConvertUtils.sourceToTarget(dto, CustomerProjectParameterEntity.class);
+        return baseDao.selectParameterValueByKey(entity);
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
index c377c8a49e..fcb7ee4416 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
@@ -23,19 +23,30 @@ 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.commons.tools.utils.Result;
+import com.epmet.constant.ParameterKeyConstant;
+import com.epmet.constant.ProjectConstant;
 import com.epmet.dao.ProjectDao;
+import com.epmet.dto.CustomerProjectParameterDTO;
 import com.epmet.dto.ProjectDTO;
+import com.epmet.dto.ProjectStaffDTO;
+import com.epmet.dto.form.ProjectDetailFromDTO;
+import com.epmet.dto.form.ProjectListFromDTO;
+import com.epmet.dto.form.WorkDayFormDTO;
+import com.epmet.dto.result.*;
 import com.epmet.entity.ProjectEntity;
+import com.epmet.feign.CommonFeignClient;
 import com.epmet.redis.ProjectRedis;
+import com.epmet.service.CustomerProjectParameterService;
 import com.epmet.service.ProjectService;
+import com.epmet.service.ProjectStaffService;
 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;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 /**
  * 项目表
@@ -46,59 +57,219 @@ import java.util.Map;
 @Service
 public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntity> implements ProjectService {
 
-    @Autowired
-    private ProjectRedis projectRedis;
-
-    @Override
-    public PageData<ProjectDTO> page(Map<String, Object> params) {
-        IPage<ProjectEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, ProjectDTO.class);
-    }
-
-    @Override
-    public List<ProjectDTO> list(Map<String, Object> params) {
-        List<ProjectEntity> entityList = baseDao.selectList(getWrapper(params));
-
-        return ConvertUtils.sourceToTarget(entityList, ProjectDTO.class);
-    }
-
-    private QueryWrapper<ProjectEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
-
-        QueryWrapper<ProjectEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-
-        return wrapper;
-    }
-
-    @Override
-    public ProjectDTO get(String id) {
-        ProjectEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, ProjectDTO.class);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void save(ProjectDTO dto) {
-        ProjectEntity entity = ConvertUtils.sourceToTarget(dto, ProjectEntity.class);
-        insert(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(ProjectDTO dto) {
-        ProjectEntity entity = ConvertUtils.sourceToTarget(dto, ProjectEntity.class);
-        updateById(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void delete(String[] ids) {
-        // 逻辑删除（@TableLogic 注解）
-        baseDao.deleteBatchIds(Arrays.asList(ids));
-    }
+	@Autowired
+	private ProjectRedis projectRedis;
+	@Autowired
+	private CustomerProjectParameterService parameterService;
+	@Autowired
+	private CommonFeignClient commonFeignClient;
+	@Autowired
+	private ProjectStaffService projectStaffService;
+
+	private final static String ONE_DAY = "<1";
+
+	@Override
+	public PageData<ProjectDTO> page(Map<String, Object> params) {
+		IPage<ProjectEntity> page = baseDao.selectPage(
+				getPage(params, FieldConstant.CREATED_TIME, false),
+				getWrapper(params)
+		);
+		return getPageData(page, ProjectDTO.class);
+	}
+
+	@Override
+	public List<ProjectDTO> list(Map<String, Object> params) {
+		List<ProjectEntity> entityList = baseDao.selectList(getWrapper(params));
+
+		return ConvertUtils.sourceToTarget(entityList, ProjectDTO.class);
+	}
+
+	private QueryWrapper<ProjectEntity> getWrapper(Map<String, Object> params) {
+		String id = (String) params.get(FieldConstant.ID_HUMP);
+
+		QueryWrapper<ProjectEntity> wrapper = new QueryWrapper<>();
+		wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+		return wrapper;
+	}
+
+	@Override
+	public ProjectDTO get(String id) {
+		ProjectEntity entity = baseDao.selectById(id);
+		return ConvertUtils.sourceToTarget(entity, ProjectDTO.class);
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void save(ProjectDTO dto) {
+		ProjectEntity entity = ConvertUtils.sourceToTarget(dto, ProjectEntity.class);
+		insert(entity);
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void update(ProjectDTO dto) {
+		ProjectEntity entity = ConvertUtils.sourceToTarget(dto, ProjectEntity.class);
+		updateById(entity);
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void delete(String[] ids) {
+		// 逻辑删除（@TableLogic 注解）
+		baseDao.deleteBatchIds(Arrays.asList(ids));
+	}
+
+	@Override
+	public List<PendProjectListResultDTO> getPendProjectList(ProjectListFromDTO fromDTO) {
+		List<PendProjectListResultDTO> list = new ArrayList<>();
+
+		List<ProjectDTO> projectList = baseDao.selectPendList(fromDTO);
+		//获取客户定制的可滞留天数
+		Integer finalDays = getDays(fromDTO);
+		projectList.forEach(p -> {
+			PendProjectListResultDTO pend = new PendProjectListResultDTO();
+			pend.setProjectId(p.getId());
+			pend.setProjectTitle(p.getTitle());
+			pend.setProjectTime(p.getCreatedTime().getTime());
+			String detentionDays = getDetentionDays(p);
+			if (!ONE_DAY.equals(detentionDays) && Integer.parseInt(detentionDays) > finalDays) {
+				pend.setWarningFlag(true);
+				pend.setDetentionDays(detentionDays);
+			} else {
+				pend.setDetentionDays(detentionDays);
+				pend.setWarningFlag(false);
+			}
+			list.add(pend);
+		});
+
+		return list;
+	}
+
+	@Override
+	public List<CreatedListResultDTO> getCreatedList(ProjectListFromDTO fromDTO) {
+		List<CreatedListResultDTO> list = new ArrayList<>();
+		List<ProjectDTO> projectList = baseDao.selectCreatedList(fromDTO);
+		//获取客户定制的可滞留天数
+		Integer finalDays = getDays(fromDTO);
+		projectList.forEach(p -> {
+			CreatedListResultDTO created = new CreatedListResultDTO();
+			created.setProjectId(p.getId());
+			created.setProjectTitle(p.getTitle());
+			created.setProjectTime(p.getCreatedTime().getTime());
+			String detentionDays = getDetentionDays(p);
+			if (!ONE_DAY.equals(detentionDays) && Integer.parseInt(detentionDays) > finalDays) {
+				created.setWarningFlag(true);
+				created.setDetentionDays(detentionDays);
+			} else {
+				created.setDetentionDays(detentionDays);
+				created.setWarningFlag(false);
+			}
+			//获取当前处理部门
+			List<String> departmentNameList = new ArrayList<>();
+			if (ProjectConstant.CLOSED.equals(p.getStatus())) {
+				created.setDepartmentNameList(departmentNameList);
+			} else {
+				departmentNameList = baseDao.selectDepartmentNameList(p);
+				created.setDepartmentNameList(departmentNameList);
+			}
+			list.add(created);
+		});
+		return list;
+	}
+
+	@Override
+	public List<InvolvedListResultDTO> getInvolvedList(ProjectListFromDTO fromDTO) {
+		List<InvolvedListResultDTO> list = new ArrayList<>();
+		List<ProjectDTO> projectList = baseDao.selectCreatedList(fromDTO);
+		//获取客户定制的可滞留天数
+		Integer finalDays = getDays(fromDTO);
+		projectList.forEach(p -> {
+			InvolvedListResultDTO involved = new InvolvedListResultDTO();
+			involved.setProjectId(p.getId());
+			involved.setProjectTitle(p.getTitle());
+			involved.setProjectTime(p.getCreatedTime().getTime());
+			String detentionDays = getDetentionDays(p);
+			if (!ONE_DAY.equals(detentionDays) && Integer.parseInt(detentionDays) > finalDays) {
+				involved.setWarningFlag(true);
+				involved.setDetentionDays(detentionDays);
+			} else {
+				involved.setDetentionDays(detentionDays);
+				involved.setWarningFlag(false);
+			}
+			//获取当前处理部门
+			List<String> departmentNameList = new ArrayList<>();
+			if (ProjectConstant.CLOSED.equals(p.getStatus())) {
+				involved.setDepartmentNameList(departmentNameList);
+			} else {
+				departmentNameList = baseDao.selectDepartmentNameList(p);
+				involved.setDepartmentNameList(departmentNameList);
+			}
+			list.add(involved);
+		});
+		return list;
+	}
+
+	@Override
+	public ProjectDetailResultDTO getProjectDetail(ProjectDetailFromDTO fromDTO) {
+		ProjectDetailResultDTO resultDTO = baseDao.selectProjectDetail(fromDTO.getProjectId());
+		if (ProjectConstant.CLOSED.equals(resultDTO.getProjectStatus())) {
+			resultDTO.setProcessable(true);
+		} else {
+			//获取我未处理的部门
+			ProjectStaffDTO projectStaffDTO = new ProjectStaffDTO();
+			projectStaffDTO.setProjectId(fromDTO.getProjectId());
+			projectStaffDTO.setStaffId(fromDTO.getUserId());
+			List<DepartmentResultDTO> departmentList = projectStaffService.getDepartmentNameList(projectStaffDTO);
+			if (null != departmentList && departmentList.size() > 0) {
+				resultDTO.setProcessable(false);
+			} else {
+				resultDTO.setProcessable(true);
+			}
+		}
+
+		return resultDTO;
+	}
+
+	/**
+	 * 获取客户定制的可滞留天数
+	 *
+	 * @param fromDTO
+	 * @return java.lang.Integer
+	 * @author zhaoqifeng
+	 * @date 2020/5/12 16:20
+	 */
+	private Integer getDays(ProjectListFromDTO fromDTO) {
+		//获取客户定制的可滞留天数
+		CustomerProjectParameterDTO dto = new CustomerProjectParameterDTO();
+		dto.setCustomerId(fromDTO.getCustomerId());
+		dto.setParameterKey(ParameterKeyConstant.DETENTION_DAYS);
+		String value = parameterService.getParameterValueByKey(dto);
+		Integer days = 5;
+		if (value != null) {
+			days = Integer.valueOf(value);
+		}
+		return days;
+	}
+
+	/**
+	 * 工作日计算
+	 *
+	 * @param projectDTO
+	 * @return java.lang.String
+	 * @author zhaoqifeng
+	 * @date 2020/5/12 16:20
+	 */
+	private String getDetentionDays(ProjectDTO projectDTO) {
+		SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
+
+		List<WorkDayFormDTO> list = new ArrayList<>();
+		WorkDayFormDTO workDayFormDTO = new WorkDayFormDTO();
+		workDayFormDTO.setId(projectDTO.getId());
+		workDayFormDTO.setStartDate(format.format(projectDTO.getCreatedTime()));
+		workDayFormDTO.setEndDate(format.format(new Date()));
+		Result<List<WorkDayResultDTO>> detentionDays = commonFeignClient.detentionDays(list);
+		return detentionDays.getData().get(0).getDetentionDays();
+	}
 
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectStaffServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectStaffServiceImpl.java
index 0eea5ed1fc..bfab5baef5 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectStaffServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectStaffServiceImpl.java
@@ -25,6 +25,7 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.ProjectStaffDao;
 import com.epmet.dto.ProjectStaffDTO;
+import com.epmet.dto.result.DepartmentResultDTO;
 import com.epmet.entity.ProjectStaffEntity;
 import com.epmet.redis.ProjectStaffRedis;
 import com.epmet.service.ProjectStaffService;
@@ -101,4 +102,9 @@ public class ProjectStaffServiceImpl extends BaseServiceImpl<ProjectStaffDao, Pr
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public List<DepartmentResultDTO> getDepartmentNameList(ProjectStaffDTO dto) {
+        return baseDao.selectDepartmentNameList(dto);
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java
new file mode 100644
index 0000000000..d7ff474a5d
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java
@@ -0,0 +1,60 @@
+package com.epmet.service.impl;
+
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.dto.form.*;
+import com.epmet.dto.result.*;
+import com.epmet.service.ProjectService;
+import com.epmet.service.ProjectTraceService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/5/11 16:35
+ */
+@Service
+public class ProjectTraceServiceImpl implements ProjectTraceService {
+	@Autowired
+	private ProjectService projectService;
+
+	@Override
+	public List<PendProjectListResultDTO> getPendProjectList(TokenDto tokenDto, ProjectListFromDTO fromDTO) {
+		fromDTO.setUserId(tokenDto.getUserId());
+		return projectService.getPendProjectList(fromDTO);
+	}
+
+	@Override
+	public List<CreatedListResultDTO> getCreatedList(TokenDto tokenDto, ProjectListFromDTO fromDTO) {
+		fromDTO.setUserId(tokenDto.getUserId());
+		return projectService.getCreatedList(fromDTO);
+	}
+
+	@Override
+	public List<InvolvedListResultDTO> getInvolvedList(TokenDto tokenDto, ProjectListFromDTO fromDTO) {
+		fromDTO.setUserId(tokenDto.getUserId());
+		return projectService.getInvolvedList(fromDTO);
+	}
+
+	@Override
+	public ProjectDetailResultDTO getProjectDetail(TokenDto tokenDto, ProjectDetailFromDTO fromDTO) {
+		return null;
+	}
+
+	@Override
+	public void closed(TokenDto tokenDto, ProjectClosedFromDTO fromDTO) {
+
+	}
+
+	@Override
+	public List<ReturnListResultDTO> getReturnableList(ReturnListFromDTO fromDTO) {
+		return null;
+	}
+
+	@Override
+	public void projectReturn(TokenDto tokenDto, ReturnFromDTO fromDTO) {
+
+	}
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/CustomerProjectParameterDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/CustomerProjectParameterDao.xml
index 5883ac863f..25a30d23a9 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/CustomerProjectParameterDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/CustomerProjectParameterDao.xml
@@ -17,6 +17,15 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
+    <select id="selectParameterValueByKey" resultType="java.lang.String" parameterType="com.epmet.entity.CustomerProjectParameterEntity">
+        select
+               PARAMETER_VALUE
+        from
+             customer_project_parameter
+        where DEL_FLAG = '0'
+          and CUSTOMER_ID = #{customerId}
+          and PARAMETER_KEY = #{parameterKey}
+    </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 e14269cbb7..9b8fd485ff 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
@@ -19,6 +19,95 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
+    <select id="selectPendList" resultType="com.epmet.dto.ProjectDTO" parameterType="com.epmet.dto.form.ProjectListFromDTO">
+        SELECT distinct
+            p.ID,
+            p.TITLE,
+            psp.CREATED_TIME
+        FROM project p
+                 INNER JOIN (SELECT
+                                 ps.PROJECT_ID,
+                                 MAX(ps.CREATED_TIME) AS CREATED_TIME
+                             FROM
+                                 project_staff ps
+                             WHERE
+                                 ps.DEL_FLAG = '0'
+                               AND ps.IS_HANDLE = 'unhandled'
+                               AND ps.STAFF_ID = #{userId}
+                             GROUP BY ps.PROJECT_ID) psp ON p.ID = psp.PROJECT_ID
+        WHERE p.DEL_FLAG = '0'
+        AND p.status = 'pending'
+        ORDER BY psp.CREATED_TIME ASC
+    </select>
+    <select id="selectCreatedList" resultType="com.epmet.dto.ProjectDTO" parameterType="com.epmet.dto.form.ProjectListFromDTO">
+        SELECT distinct
+            p.ID,
+            p.TITLE,
+            p.STATUS,
+            psp.CREATED_TIME
+        FROM project p
+                 INNER JOIN (SELECT
+                                 ps.PROJECT_ID,
+                                 MAX(ps.CREATED_TIME) AS CREATED_TIME
+                             FROM
+                                 project_staff ps
+                             INNER JOIN  project_process pp ON ps.PROCESS_ID = pp.ID AND pp.DEL_FLAG = '0'
+                                        AND pp.OPERATION = 'created'
+                             WHERE
+                                 ps.DEL_FLAG = '0'
+                               AND ps.IS_HANDLE = 'handle'
+                               AND ps.STAFF_ID = #{userId}
+                             GROUP BY ps.PROJECT_ID) psp ON p.ID = psp.PROJECT_ID
+        WHERE p.DEL_FLAG = '0'
+        ORDER BY psp.CREATED_TIME ASC
+    </select>
+    <select id="selectInvolvedList" resultType="com.epmet.dto.ProjectDTO" parameterType="com.epmet.dto.form.ProjectListFromDTO">
+        SELECT distinct
+            p.ID,
+            p.TITLE,
+            p.STATUS,
+            psp.CREATED_TIME
+        FROM project p
+                 INNER JOIN (SELECT
+                                 ps.PROJECT_ID,
+                                 MAX(ps.CREATED_TIME) AS CREATED_TIME
+                             FROM
+                                 project_staff ps
+                                     INNER JOIN  project_process pp ON ps.PROCESS_ID = pp.ID AND pp.DEL_FLAG = '0'
+                                     AND pp.OPERATION != 'created'
+                             WHERE
+                                 ps.DEL_FLAG = '0'
+                               AND ps.IS_HANDLE = 'handle'
+                               AND ps.STAFF_ID = #{userId}
+                             GROUP BY ps.PROJECT_ID) psp ON p.ID = psp.PROJECT_ID
+        WHERE p.DEL_FLAG = '0'
+        ORDER BY psp.CREATED_TIME ASC
+    </select>
+    <select id="selectDepartmentNameList" resultType="java.lang.String" parameterType="com.epmet.dto.ProjectDTO">
+        SELECT DISTINCT
+            DEPARTMENT_NAME
+        FROM
+            project p
+        INNER JOIN project_staff ps ON p.ID = ps.PROJECT_ID
+        WHERE p.DEL_FLAG = '0'
+            AND ps.DEL_FLAG = '0'
+            AND p.ID = #{id}
+            AND ps.IS_HANDLE = 'unhandled'
+    </select>
+    <select id="selectProjectDetail" resultType="com.epmet.dto.result.ProjectDetailResultDTO">
+        SELECT
+               p.ID AS "projectId",
+               p.TITLE AS "projectTitle",
+               p.ORIGIN AS "origin",
+               p.ORIGIN_ID AS "originId",
+               p.STATUS AS "projectStatus",
+               IFNULL(pp.PUBLIC_REPLY, '无') AS "publicReply",
+               IFNULL(pp.INTERNAL_REMARK, '无') AS "internalRemark"
+        FROM project p
+        INNER JOIN project_process pp ON p.ID = pp.PROJECT_ID AND pp.DEL_FLAG = '0' AND pp.OPERATION = 'created'
+        WHERE p.DEL_FLAG = '0'
+            AND p.ID = #{id}
+    </select>
 
 
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectStaffDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectStaffDao.xml
index eb733d0eb7..736a87d3ae 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectStaffDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectStaffDao.xml
@@ -20,6 +20,18 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
+    <select id="selectDepartmentNameList" resultType="com.epmet.dto.result.DepartmentResultDTO" parameterType="com.epmet.dto.ProjectStaffDTO">
+        SELECT
+            ID,
+            DEPARTMENT_NAME
+        FROM
+            project_staff
+        WHERE DEL_FLAG = '0'
+            AND PROJECT_ID = #{projectId}
+            AND STAFF_ID = #{staffId}
+            AND IS_HANDLE = 'unhandled'
+
+    </select>
 
 
 </mapper>
\ No newline at end of file

From 3b8663a7fc6bb46643cef5c1e451ebc029800596 Mon Sep 17 00:00:00 2001
From: zxc <954985706@qq.com>
Date: Tue, 12 May 2020 18:37:30 +0800
Subject: [PATCH 32/45] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E8=A1=A8=E5=86=B3?=
 =?UTF-8?q?=E6=8A=98=E7=BA=BF=E5=9B=BE=E3=80=81=E6=8F=90=E4=BA=A4=E6=BB=A1?=
 =?UTF-8?q?=E6=84=8F=E5=BA=A6=E8=AF=84=E4=BB=B7=E3=80=81=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E3=80=81=E5=8F=8D=E5=AF=B9=E8=AE=AE=E9=A2=98=EF=BC=8C=E6=BB=A1?=
 =?UTF-8?q?=E6=84=8F=E5=BA=A6=E8=AF=84=E4=BB=B7=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=EF=BC=8C=E8=A1=A8=E5=86=B3=E4=B8=AD=E8=AF=A6=E6=83=85=E2=80=94?=
 =?UTF-8?q?=E2=80=94=E6=94=AF=E6=8C=81=E5=8F=8D=E5=AF=B9=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/EvaluateInfoDTO.java   |  26 +++++
 .../main/java/com/epmet/dto/PolyLineDTO.java  |  32 ++++++
 .../com/epmet/dto/form/EvaluateFormDTO.java   |  37 ++++++
 .../epmet/dto/form/InitEvaluationFormDTO.java |  27 +++++
 .../com/epmet/dto/form/IssueIdFormDTO.java    |  21 ++++
 .../java/com/epmet/dto/form/VoteFormDTO.java  |  32 ++++++
 .../dto/result/InitEvaluationResultDTO.java   |  27 +++++
 .../com/epmet/dto/result/VoteResultDTO.java   |  32 ++++++
 .../dto/result/VotingTrendResultDTO.java      |  44 +++++++
 .../IssueSatisfactionDetailController.java    |  24 ++++
 .../controller/IssueVoteDetailController.java |  13 +++
 .../IssueVoteStatisticalController.java       |  27 +++++
 .../epmet/dao/IssueSatisfactionDetailDao.java |  11 +-
 .../com/epmet/dao/IssueVoteDetailDao.java     |  10 +-
 .../dao/IssueVoteStatisticalDailyDao.java     |   2 +-
 .../epmet/dao/IssueVoteStatisticalDao.java    |  38 ++++++-
 .../IssueSatisfactionDetailService.java       |  17 +++
 .../epmet/service/IssueVoteDetailService.java |   8 ++
 .../service/IssueVoteStatisticalService.java  |  19 ++++
 .../IssueSatisfactionDetailServiceImpl.java   |  47 ++++++++
 .../impl/IssueVoteDetailServiceImpl.java      |  22 ++++
 .../impl/IssueVoteStatisticalServiceImpl.java |  44 +++++++
 .../mapper/IssueSatisfactionDetailDao.xml     |  12 ++
 .../resources/mapper/IssueVoteDetailDao.xml   |  11 ++
 .../mapper/IssueVoteStatisticalDao.xml        |  51 +++++++++
 .../java/com/epmet/dto/EvaluateInfoDTO.java   |  26 +++++
 .../main/java/com/epmet/dto/PolyLineDTO.java  |  22 +---
 .../com/epmet/dto/form/EvaluateFormDTO.java   |  37 ++++++
 .../epmet/dto/form/InitEvaluationFormDTO.java |  27 +++++
 .../com/epmet/dto/form/IssueIdFormDTO.java    |   1 -
 .../java/com/epmet/dto/form/VoteFormDTO.java  |  32 ++++++
 .../dto/result/InitEvaluationResultDTO.java   |  28 +++++
 .../com/epmet/dto/result/VoteResultDTO.java   |  32 ++++++
 .../dto/result/VotingTrendResultDTO.java      |   6 +
 .../com/epmet/controller/IssueController.java |  74 +++++++++++-
 .../com/epmet/feign/GovIssueFeignClient.java  |  49 +++++++-
 .../fallback/GovIssueFeignClientFallBack.java |  31 ++++-
 .../java/com/epmet/service/IssueService.java  |  51 +++++++++
 .../epmet/service/impl/IssueServiceImpl.java  | 107 +++++++++++++++---
 39 files changed, 1115 insertions(+), 42 deletions(-)
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/EvaluateInfoDTO.java
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/PolyLineDTO.java
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/EvaluateFormDTO.java
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/InitEvaluationFormDTO.java
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueIdFormDTO.java
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/VoteFormDTO.java
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/InitEvaluationResultDTO.java
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/VoteResultDTO.java
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/VotingTrendResultDTO.java
 create mode 100644 epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/EvaluateInfoDTO.java
 create mode 100644 epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/EvaluateFormDTO.java
 create mode 100644 epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/InitEvaluationFormDTO.java
 create mode 100644 epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/VoteFormDTO.java
 create mode 100644 epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/InitEvaluationResultDTO.java
 create mode 100644 epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VoteResultDTO.java

diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/EvaluateInfoDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/EvaluateInfoDTO.java
new file mode 100644
index 0000000000..6dd8446aef
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/EvaluateInfoDTO.java
@@ -0,0 +1,26 @@
+package com.epmet.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 评价信息
+ */
+@Data
+public class EvaluateInfoDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 评价内容
+     */
+    private String evaluateContent;
+
+    /**
+     * 满意度 - 不满意:bad、基本满意:good、非常满意:perfect
+     */
+    private String satisfaction;
+
+}
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/PolyLineDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/PolyLineDTO.java
new file mode 100644
index 0000000000..975971e403
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/PolyLineDTO.java
@@ -0,0 +1,32 @@
+package com.epmet.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 投票折线数据
+ * @CreateTime 2020/5/11 9:36
+ */
+@Data
+public class PolyLineDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 投票日期
+     */
+    private Long voteDtae;
+
+    /**
+     * 当日赞成票数量
+     */
+    private Integer supportIncrement;
+
+    /**
+     * 当日反对票数量
+     */
+    private Integer oppositionIncrement;
+
+}
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/EvaluateFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/EvaluateFormDTO.java
new file mode 100644
index 0000000000..541b1c6f58
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/EvaluateFormDTO.java
@@ -0,0 +1,37 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 提交满意度评价
+ */
+@Data
+public class EvaluateFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 议题Id
+     */
+    private String IssueId;
+
+    /**
+     * 满意度 - 不满意:bad、基本满意:good、非常满意:perfect
+     */
+    private String satisfaction;
+
+    /**
+     * 评价内容
+     */
+    private String comment;
+
+    /**
+     * 用户id
+     */
+    private String userId;
+
+
+}
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/InitEvaluationFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/InitEvaluationFormDTO.java
new file mode 100644
index 0000000000..c61af4f268
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/InitEvaluationFormDTO.java
@@ -0,0 +1,27 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 满意度评价初始化
+ */
+@Data
+public class InitEvaluationFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 议题Id
+     */
+    private String IssueId;
+
+    /**
+     * 创建人
+     */
+    private String userId;
+
+
+}
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueIdFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueIdFormDTO.java
new file mode 100644
index 0000000000..6b16e733ec
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueIdFormDTO.java
@@ -0,0 +1,21 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 议题Id
+ * @Author zxc
+ * @Date 2020/5/11 9:30
+ */
+@Data
+public class IssueIdFormDTO implements Serializable {
+    private static final long serialVersionUID = 4859779755214503489L;
+
+    @NotBlank(message = "议题id不能为空")
+    private String issueId;
+
+}
+
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/VoteFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/VoteFormDTO.java
new file mode 100644
index 0000000000..126257e37d
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/VoteFormDTO.java
@@ -0,0 +1,32 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 表决中 支持、反对 投票
+ */
+@Data
+public class VoteFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 话题Id
+     */
+    private String IssueId;
+
+    /**
+     * 态度 - opposition（反对）support（赞成）
+     */
+    private String attitude;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+
+}
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/InitEvaluationResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/InitEvaluationResultDTO.java
new file mode 100644
index 0000000000..09d9f16635
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/InitEvaluationResultDTO.java
@@ -0,0 +1,27 @@
+package com.epmet.dto.result;
+
+import com.epmet.dto.EvaluateInfoDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 满意度评价初始化
+ */
+@Data
+public class InitEvaluationResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -1L;
+
+    /**
+     * 评价状态：true已评价，false未评价
+     */
+    private Boolean status;
+
+    /**
+     * 评价信息
+     */
+    private EvaluateInfoDTO evaluateInfo;
+
+}
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/VoteResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/VoteResultDTO.java
new file mode 100644
index 0000000000..3d4db2594e
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/VoteResultDTO.java
@@ -0,0 +1,32 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 表决中议题详情——支持、反对数
+ */
+@Data
+public class VoteResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -1L;
+
+    /**
+     * 表决状态：true已表决    false未表决
+     */
+    private Boolean voteFlag;
+
+    /**
+     * 支持数量
+     */
+    private Integer supportCount;
+
+    /**
+     * 反对数量
+     */
+    private Integer oppositionCount;
+
+
+}
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/VotingTrendResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/VotingTrendResultDTO.java
new file mode 100644
index 0000000000..4718a4f2f0
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/VotingTrendResultDTO.java
@@ -0,0 +1,44 @@
+package com.epmet.dto.result;
+
+import com.epmet.dto.PolyLineDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * 议题表决折线图
+ * @CreateTime 2020/5/11 9:36
+ */
+@Data
+public class VotingTrendResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -1L;
+
+    /**
+     * 应表决数量
+     */
+    private Integer shouldVoteCount;
+
+    /**
+     * 实际表决数量
+     */
+    private Integer realityVoteCount;
+
+    /**
+     * 截至今日赞成票总数
+     */
+    private Integer supportAmount;
+
+    /**
+     * 截至今日反对票总数
+     */
+    private Integer oppositionAmount;
+
+    /**
+     * 投票折线数据
+     */
+    private List<PolyLineDTO> polyLine;
+
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueSatisfactionDetailController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueSatisfactionDetailController.java
index 8772539ab3..b899a287ca 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueSatisfactionDetailController.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueSatisfactionDetailController.java
@@ -26,6 +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.IssueSatisfactionDetailDTO;
+import com.epmet.dto.form.EvaluateFormDTO;
+import com.epmet.dto.form.InitEvaluationFormDTO;
+import com.epmet.dto.result.InitEvaluationResultDTO;
 import com.epmet.excel.IssueSatisfactionDetailExcel;
 import com.epmet.service.IssueSatisfactionDetailService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -91,4 +94,25 @@ public class IssueSatisfactionDetailController {
         ExcelUtils.exportExcelToTarget(response, null, list, IssueSatisfactionDetailExcel.class);
     }
 
+    /**
+     * @Description  满意度评价初始化
+     * @param formDTO
+     * @author zxc
+     */
+    @PostMapping("initevaluation")
+    public Result<InitEvaluationResultDTO> initEvaluation(@RequestBody InitEvaluationFormDTO formDTO){
+        return new Result<InitEvaluationResultDTO>().ok(issueSatisfactionDetailService.initEvaluation(formDTO));
+    }
+
+    /**
+     * @Description  提交满意度评价
+     * @param formDTO
+     * @author zxc
+     */
+    @PostMapping("evaluate")
+    public Result evaluate(@RequestBody EvaluateFormDTO formDTO){
+        issueSatisfactionDetailService.evaluate(formDTO);
+        return new Result();
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteDetailController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteDetailController.java
index 981aacf50e..d7a6153418 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteDetailController.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteDetailController.java
@@ -17,6 +17,7 @@
 
 package com.epmet.controller;
 
+import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -26,6 +27,7 @@ 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.IssueVoteDetailDTO;
+import com.epmet.dto.form.VoteFormDTO;
 import com.epmet.excel.IssueVoteDetailExcel;
 import com.epmet.service.IssueVoteDetailService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -91,4 +93,15 @@ public class IssueVoteDetailController {
         ExcelUtils.exportExcelToTarget(response, null, list, IssueVoteDetailExcel.class);
     }
 
+    /**
+     * @Description  表决中 反对、支持 投票
+     * @param formDTO
+     * @author zxc
+     */
+    @PostMapping("vote")
+    public Result vote(@RequestBody VoteFormDTO formDTO){
+        issueVoteDetailService.vote(formDTO);
+        return new Result();
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteStatisticalController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteStatisticalController.java
index ab98b72498..a1d69e59d9 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteStatisticalController.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteStatisticalController.java
@@ -17,7 +17,9 @@
 
 package com.epmet.controller;
 
+import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
@@ -26,6 +28,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.IssueVoteStatisticalDTO;
+import com.epmet.dto.form.IssueIdFormDTO;
+import com.epmet.dto.result.VoteResultDTO;
+import com.epmet.dto.result.VotingTrendResultDTO;
 import com.epmet.excel.IssueVoteStatisticalExcel;
 import com.epmet.service.IssueVoteStatisticalService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -91,4 +96,26 @@ public class IssueVoteStatisticalController {
         ExcelUtils.exportExcelToTarget(response, null, list, IssueVoteStatisticalExcel.class);
     }
 
+    /**
+     * @Description  表决中议题详情——支持、反对数
+     * @param tokenDto
+     * @param formDTO
+     * @author zxc
+     */
+    @PostMapping("votecount")
+    public Result<VoteResultDTO> voteCount(@LoginUser TokenDto tokenDto, @RequestBody IssueIdFormDTO formDTO){
+        return new Result<VoteResultDTO>().ok(issueVoteStatisticalService.voteCount(tokenDto,formDTO));
+    }
+
+
+    /**
+     * @Description  议题表决折线图
+     * @param formDTO
+     * @author zxc
+     */
+    @PostMapping("votingtrend")
+    public Result<VotingTrendResultDTO> votingTrend(@RequestBody IssueIdFormDTO formDTO){
+        return new Result<VotingTrendResultDTO>().ok(issueVoteStatisticalService.votingTrend(formDTO));
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueSatisfactionDetailDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueSatisfactionDetailDao.java
index 01727f507a..0c29b55ace 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueSatisfactionDetailDao.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueSatisfactionDetailDao.java
@@ -18,6 +18,8 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.EvaluateInfoDTO;
+import com.epmet.dto.form.InitEvaluationFormDTO;
 import com.epmet.entity.IssueSatisfactionDetailEntity;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -29,5 +31,12 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface IssueSatisfactionDetailDao extends BaseDao<IssueSatisfactionDetailEntity> {
-	
+
+    /**
+     * @Description  满意度评价初始化
+     * @param formDTO
+     * @author zxc
+     */
+    EvaluateInfoDTO checkSatisfaction(InitEvaluationFormDTO formDTO);
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java
index f8a41e3747..1b0b35cd83 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java
@@ -18,6 +18,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.form.VoteFormDTO;
 import com.epmet.entity.IssueVoteDetailEntity;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -29,5 +30,12 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface IssueVoteDetailDao extends BaseDao<IssueVoteDetailEntity> {
-	
+
+    /**
+     * @Description  支持、反对校验
+     * @param formDTO
+     * @author zxc
+     */
+    Integer checkoutVote(VoteFormDTO formDTO);
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDailyDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDailyDao.java
index e09695b2b8..06cfea984f 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDailyDao.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDailyDao.java
@@ -29,5 +29,5 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface IssueVoteStatisticalDailyDao extends BaseDao<IssueVoteStatisticalDailyEntity> {
-	
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java
index 7f833487d8..f6aa7956ee 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java
@@ -18,8 +18,15 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.PolyLineDTO;
+import com.epmet.dto.form.IssueIdFormDTO;
+import com.epmet.dto.result.VoteResultDTO;
+import com.epmet.dto.result.VotingTrendResultDTO;
 import com.epmet.entity.IssueVoteStatisticalEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 议题表决统计表
@@ -29,5 +36,34 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface IssueVoteStatisticalDao extends BaseDao<IssueVoteStatisticalEntity> {
-	
+
+    /**
+     * @Description 表决中议题详情——支持、反对数
+     * @param issueId
+     * @author zxc
+     */
+    VoteResultDTO voteCount(IssueIdFormDTO issueId);
+
+    /**
+     * @Description  校验是否投票（表决中详情——支持、反对）
+     * @param issueId
+     * @param userId
+     * @author zxc
+     */
+    Integer checkVote(@Param("issueId")String issueId,@Param("userId")String userId);
+
+    /**
+     * @Description  议题表决折线图
+     * @param issueId
+     * @author zxc
+     */
+    VotingTrendResultDTO votingTrend(IssueIdFormDTO issueId);
+
+    /**
+     * @Description  获取折线每天的支持、反对数量
+     * @param issueId
+     * @author zxc
+     */
+    List<PolyLineDTO> polyLineData(IssueIdFormDTO issueId);
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueSatisfactionDetailService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueSatisfactionDetailService.java
index ab47a3797a..1abbd939af 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueSatisfactionDetailService.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueSatisfactionDetailService.java
@@ -20,6 +20,9 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IssueSatisfactionDetailDTO;
+import com.epmet.dto.form.EvaluateFormDTO;
+import com.epmet.dto.form.InitEvaluationFormDTO;
+import com.epmet.dto.result.InitEvaluationResultDTO;
 import com.epmet.entity.IssueSatisfactionDetailEntity;
 
 import java.util.List;
@@ -92,4 +95,18 @@ public interface IssueSatisfactionDetailService extends BaseService<IssueSatisfa
      * @date 2020-05-11
      */
     void delete(String[] ids);
+
+    /**
+     * @Description   满意度评价初始化
+     * @param formDTO
+     * @author zxc
+     */
+    InitEvaluationResultDTO initEvaluation(InitEvaluationFormDTO formDTO);
+
+    /**
+     * @Description  提交满意度评价
+     * @param formDTO
+     * @author zxc
+     */
+    void evaluate(EvaluateFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteDetailService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteDetailService.java
index 36f3e0579c..da5ca53f7a 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteDetailService.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteDetailService.java
@@ -20,6 +20,7 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IssueVoteDetailDTO;
+import com.epmet.dto.form.VoteFormDTO;
 import com.epmet.entity.IssueVoteDetailEntity;
 
 import java.util.List;
@@ -92,4 +93,11 @@ public interface IssueVoteDetailService extends BaseService<IssueVoteDetailEntit
      * @date 2020-05-11
      */
     void delete(String[] ids);
+
+    /**
+     * @Description  表决中 反对、支持 投票
+     * @param formDTO
+     * @author zxc
+     */
+    void vote(VoteFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java
index 4d54243be0..8e1751de09 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java
@@ -19,7 +19,11 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.IssueVoteStatisticalDTO;
+import com.epmet.dto.form.IssueIdFormDTO;
+import com.epmet.dto.result.VoteResultDTO;
+import com.epmet.dto.result.VotingTrendResultDTO;
 import com.epmet.entity.IssueVoteStatisticalEntity;
 
 import java.util.List;
@@ -92,4 +96,19 @@ public interface IssueVoteStatisticalService extends BaseService<IssueVoteStatis
      * @date 2020-05-11
      */
     void delete(String[] ids);
+
+    /**
+     * @Description  表决中议题详情——支持、反对数
+     * @param issueId
+     * @author zxc
+     */
+    VoteResultDTO voteCount(TokenDto tokenDto,IssueIdFormDTO issueId);
+
+
+    /**
+     * @Description  议题表决折线图
+     * @param issueId
+     * @author zxc
+     */
+    VotingTrendResultDTO votingTrend(IssueIdFormDTO issueId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java
index 5662e355c4..5bd8aff0e6 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java
@@ -20,15 +20,21 @@ 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.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.dao.IssueSatisfactionDetailDao;
+import com.epmet.dto.EvaluateInfoDTO;
 import com.epmet.dto.IssueSatisfactionDetailDTO;
+import com.epmet.dto.form.EvaluateFormDTO;
+import com.epmet.dto.form.InitEvaluationFormDTO;
+import com.epmet.dto.result.InitEvaluationResultDTO;
 import com.epmet.entity.IssueSatisfactionDetailEntity;
 import com.epmet.redis.IssueSatisfactionDetailRedis;
 import com.epmet.service.IssueSatisfactionDetailService;
 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.transaction.annotation.Transactional;
@@ -101,4 +107,45 @@ public class IssueSatisfactionDetailServiceImpl extends BaseServiceImpl<IssueSat
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * @Description  满意度评价初始化
+     * @param formDTO
+     * @author zxc
+     */
+    @Override
+    public InitEvaluationResultDTO initEvaluation(InitEvaluationFormDTO formDTO) {
+        InitEvaluationResultDTO resultDTO = new InitEvaluationResultDTO();
+        EvaluateInfoDTO evaluateInfoDTO = baseDao.checkSatisfaction(formDTO);
+        if (evaluateInfoDTO!=null){
+            resultDTO.setStatus(true);//已评价
+            resultDTO.setEvaluateInfo(evaluateInfoDTO);
+        }else {
+            resultDTO.setStatus(false);
+            EvaluateInfoDTO evaluateInfo = new EvaluateInfoDTO();
+            evaluateInfo.setEvaluateContent("");
+            evaluateInfo.setSatisfaction("");
+            resultDTO.setEvaluateInfo(evaluateInfo);
+        }
+        return resultDTO;
+    }
+
+    /**
+     * @Description  提交满意度评价
+     * @param formDTO
+     * @author zxc
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void evaluate(EvaluateFormDTO formDTO) {
+        IssueSatisfactionDetailEntity entity = new IssueSatisfactionDetailEntity();
+        BeanUtils.copyProperties(formDTO,entity);
+        InitEvaluationFormDTO initEvaluation = new InitEvaluationFormDTO();
+        BeanUtils.copyProperties(formDTO,initEvaluation);
+        EvaluateInfoDTO evaluateInfoDTO = baseDao.checkSatisfaction(initEvaluation);
+        if (evaluateInfoDTO!=null){
+            throw new RenException("您已评价！");
+        }
+        baseDao.insert(entity);
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java
index e63133484c..2f10a43d19 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java
@@ -20,15 +20,19 @@ 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.exception.EpmetErrorCode;
+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.dao.IssueVoteDetailDao;
 import com.epmet.dto.IssueVoteDetailDTO;
+import com.epmet.dto.form.VoteFormDTO;
 import com.epmet.entity.IssueVoteDetailEntity;
 import com.epmet.redis.IssueVoteDetailRedis;
 import com.epmet.service.IssueVoteDetailService;
 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.transaction.annotation.Transactional;
@@ -101,4 +105,22 @@ public class IssueVoteDetailServiceImpl extends BaseServiceImpl<IssueVoteDetailD
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * @Description  表决中 反对、支持 投票
+     * @param formDTO
+     * @author zxc
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void vote(VoteFormDTO formDTO) {
+        IssueVoteDetailEntity entity = new IssueVoteDetailEntity();
+        BeanUtils.copyProperties(formDTO,entity);
+        Integer checkoutVoteCount = baseDao.checkoutVote(formDTO);
+        if (checkoutVoteCount==0){
+            baseDao.insert(entity);
+        }else {
+            throw new RenException("You've voted, please don't repeat the operation!");
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
index bff7fd4f94..55c0b6f692 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
@@ -21,10 +21,15 @@ 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.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.IssueVoteStatisticalDao;
 import com.epmet.dto.IssueVoteStatisticalDTO;
+import com.epmet.dto.PolyLineDTO;
+import com.epmet.dto.form.IssueIdFormDTO;
+import com.epmet.dto.result.VoteResultDTO;
+import com.epmet.dto.result.VotingTrendResultDTO;
 import com.epmet.entity.IssueVoteStatisticalEntity;
 import com.epmet.redis.IssueVoteStatisticalRedis;
 import com.epmet.service.IssueVoteStatisticalService;
@@ -48,6 +53,8 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
 
     @Autowired
     private IssueVoteStatisticalRedis issueVoteStatisticalRedis;
+    @Autowired
+    private IssueVoteStatisticalDao issueVoteStatisticalDao;
 
     @Override
     public PageData<IssueVoteStatisticalDTO> page(Map<String, Object> params) {
@@ -101,4 +108,41 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * @Description  表决中议题详情——支持、反对数
+     * @param issueId
+     * @author zxc
+     */
+    @Override
+    public VoteResultDTO voteCount(TokenDto tokenDto,IssueIdFormDTO issueId) {
+        VoteResultDTO voteResultDTO = issueVoteStatisticalDao.voteCount(issueId);
+        //校验是否已经投票
+        Integer voteStatus = issueVoteStatisticalDao.checkVote(issueId.getIssueId(), tokenDto.getUserId());
+        if (voteResultDTO!=null){
+            if (voteStatus==0){
+                voteResultDTO.setVoteFlag(false);
+            }else {
+                voteResultDTO.setVoteFlag(true);
+            }
+        }
+        return voteResultDTO;
+    }
+
+
+    /**
+     * @Description  议题表决折线图
+     * @param issueId
+     * @author zxc
+     */
+    @Override
+    public VotingTrendResultDTO votingTrend(IssueIdFormDTO issueId) {
+        //应表决数暂时从issue_vote_statistical查询
+        VotingTrendResultDTO votingTrendResultDTO = issueVoteStatisticalDao.votingTrend(issueId);
+        if (votingTrendResultDTO!=null){
+            List<PolyLineDTO> polyLineDTOS = issueVoteStatisticalDao.polyLineData(issueId);
+            votingTrendResultDTO.setPolyLine(polyLineDTOS);
+        }
+        return votingTrendResultDTO;
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueSatisfactionDetailDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueSatisfactionDetailDao.xml
index 86f0a14d13..576f6b859d 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueSatisfactionDetailDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueSatisfactionDetailDao.xml
@@ -16,5 +16,17 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <!-- 满意度评价初始化 -->
+    <select id="checkSatisfaction" parameterType="com.epmet.dto.form.InitEvaluationFormDTO" resultType="com.epmet.dto.EvaluateInfoDTO">
+        SELECT
+            comment AS evaluateContent,
+            satisfaction AS satisfaction
+        FROM
+            issue_satisfaction_detail
+        WHERE
+            del_flag = 0
+            AND issue_id = #{issueId}
+            AND created_by = #{userId}
+    </select>
 
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteDetailDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteDetailDao.xml
index 93a382ef60..6e6166601b 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteDetailDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteDetailDao.xml
@@ -15,5 +15,16 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <!-- 支持、反对校验 -->
+    <select id="checkoutVote" parameterType="com.epmet.dto.form.VoteFormDTO" resultType="integer">
+        SELECT
+            COUNT(*)
+        FROM
+            issue_vote_detail
+        WHERE
+            del_flag = 0
+            AND issue_id = #{issueId}
+            AND created_by = #{createdBy}
+    </select>
 
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml
index d34f9eb2ae..5fe5c88507 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml
@@ -17,5 +17,56 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <!-- 表决中议题详情——支持、反对数 -->
+    <select id="voteCount" parameterType="com.epmet.dto.form.IssueIdFormDTO" resultType="com.epmet.dto.result.VoteResultDTO">
+        SELECT
+            support_count AS supportCount,
+            opposition_count AS oppositionCount
+        FROM
+            issue_vote_statistical
+        WHERE
+            issue_id = #{issueId}
+            AND del_flag = 0
+    </select>
+
+    <!-- 校验是否投票（表决中详情——支持、反对） -->
+    <select id="checkVote" resultType="integer">
+        SELECT
+            COUNT(*) AS voteStatus
+        FROM
+            issue_vote_detail
+        WHERE
+            del_flag = 0
+            AND issue_id = #{issueId}
+            AND created_by = #{userId}
+    </select>
+
+    <!-- 议题表决折线图 -->
+    <select id="votingTrend" resultType="com.epmet.dto.result.VotingTrendResultDTO">
+        SELECT
+            votable_count AS shouldVoteCount,
+            ( support_count + opposition_count ) AS realityVoteCount,
+            support_count AS supportAmount,
+            opposition_count AS oppositionAmount
+        FROM
+            issue_vote_statistical
+        WHERE
+            del_flag = 0
+            AND issue_id = #{issueId}
+    </select>
+
+    <!-- 获取折线每天的支持、反对数量 (按时间正序) -->
+    <select id="polyLineData" parameterType="com.epmet.dto.form.IssueIdFormDTO" resultType="com.epmet.dto.PolyLineDTO">
+        SELECT
+            UNIX_TIMESTAMP(statistical_date) AS voteDtae,
+            support_increment AS supportIncrement,
+            opposition_increment AS oppositionIncrement
+        FROM
+            issue_vote_statistical_daily
+        WHERE
+            issue_id = #{issueId}
+            AND del_flag = 0
+            ORDER BY statistical_date ASC
+    </select>
 
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/EvaluateInfoDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/EvaluateInfoDTO.java
new file mode 100644
index 0000000000..6dd8446aef
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/EvaluateInfoDTO.java
@@ -0,0 +1,26 @@
+package com.epmet.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 评价信息
+ */
+@Data
+public class EvaluateInfoDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 评价内容
+     */
+    private String evaluateContent;
+
+    /**
+     * 满意度 - 不满意:bad、基本满意:good、非常满意:perfect
+     */
+    private String satisfaction;
+
+}
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/PolyLineDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/PolyLineDTO.java
index b4fee06837..838dfbad15 100644
--- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/PolyLineDTO.java
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/PolyLineDTO.java
@@ -16,28 +16,18 @@ public class PolyLineDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 话题id
+     * 投票日期
      */
-    private String topicId;
+    private Long voteDtae;
 
     /**
-     * 话题内容
+     * 当日赞成票数量
      */
-    private String topicContent;
+    private Integer supportIncrement;
 
     /**
-     * 图片列表
+     * 当日反对票数量
      */
-    private List<String> topicImgs;
-
-    /**
-     * 话题发表人（山东路168-尹女士）
-     */
-    private String publishedUser;
-
-    /**
-     * 话题发表时间 (时间戳 毫秒级)
-     */
-    private Long publishedTime;
+    private Integer oppositionIncrement;
 
 }
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/EvaluateFormDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/EvaluateFormDTO.java
new file mode 100644
index 0000000000..4f3b88f227
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/EvaluateFormDTO.java
@@ -0,0 +1,37 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 提交满意度评价
+ */
+@Data
+public class EvaluateFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 议题Id
+     */
+    private String IssueId;
+
+    /**
+     * 满意度 - 不满意:bad、基本满意:good、非常满意:perfect
+     */
+    private String satisfaction;
+
+    /**
+     * 评价内容
+     */
+    private String comment;
+
+    /**
+     * 用户ID
+     */
+    private String userId;
+
+
+}
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/InitEvaluationFormDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/InitEvaluationFormDTO.java
new file mode 100644
index 0000000000..c61af4f268
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/InitEvaluationFormDTO.java
@@ -0,0 +1,27 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 满意度评价初始化
+ */
+@Data
+public class InitEvaluationFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 议题Id
+     */
+    private String IssueId;
+
+    /**
+     * 创建人
+     */
+    private String userId;
+
+
+}
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/IssueIdFormDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/IssueIdFormDTO.java
index 6b16e733ec..9fe2c9f69c 100644
--- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/IssueIdFormDTO.java
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/IssueIdFormDTO.java
@@ -8,7 +8,6 @@ import java.io.Serializable;
 /**
  * @Description 议题Id
  * @Author zxc
- * @Date 2020/5/11 9:30
  */
 @Data
 public class IssueIdFormDTO implements Serializable {
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/VoteFormDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/VoteFormDTO.java
new file mode 100644
index 0000000000..6bde30f08b
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/VoteFormDTO.java
@@ -0,0 +1,32 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 表决中 支持、反对 投票
+ */
+@Data
+public class VoteFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 议题Id
+     */
+    private String IssueId;
+
+    /**
+     * 态度 - opposition（反对）support（赞成）
+     */
+    private String attitude;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+
+}
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/InitEvaluationResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/InitEvaluationResultDTO.java
new file mode 100644
index 0000000000..57fece2b4d
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/InitEvaluationResultDTO.java
@@ -0,0 +1,28 @@
+package com.epmet.dto.result;
+
+import com.epmet.dto.EvaluateInfoDTO;
+import com.sun.org.apache.xpath.internal.operations.Bool;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 满意度评价初始化
+ */
+@Data
+public class InitEvaluationResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -1L;
+
+    /**
+     * 评价状态：true已评价，false未评价
+     */
+    private Boolean status;
+
+    /**
+     * 评价信息
+     */
+    private EvaluateInfoDTO evaluateInfo;
+
+}
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VoteResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VoteResultDTO.java
new file mode 100644
index 0000000000..3d4db2594e
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VoteResultDTO.java
@@ -0,0 +1,32 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 表决中议题详情——支持、反对数
+ */
+@Data
+public class VoteResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -1L;
+
+    /**
+     * 表决状态：true已表决    false未表决
+     */
+    private Boolean voteFlag;
+
+    /**
+     * 支持数量
+     */
+    private Integer supportCount;
+
+    /**
+     * 反对数量
+     */
+    private Integer oppositionCount;
+
+
+}
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VotingTrendResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VotingTrendResultDTO.java
index b92e466fce..4718a4f2f0 100644
--- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VotingTrendResultDTO.java
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VotingTrendResultDTO.java
@@ -1,8 +1,10 @@
 package com.epmet.dto.result;
 
+import com.epmet.dto.PolyLineDTO;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @Author zxc
@@ -34,5 +36,9 @@ public class VotingTrendResultDTO implements Serializable {
      */
     private Integer oppositionAmount;
 
+    /**
+     * 投票折线数据
+     */
+    private List<PolyLineDTO> polyLine;
 
 }
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java
index 48d63f37c9..508694bfea 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java
@@ -1,10 +1,17 @@
 package com.epmet.controller;
 
+import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.annotation.RequirePermission;
 import com.epmet.commons.tools.enums.RequirePermissionEnum;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.EvaluateFormDTO;
 import com.epmet.dto.form.IssueDetailFormDTO;
+import com.epmet.dto.form.IssueIdFormDTO;
+import com.epmet.dto.result.InitEvaluationResultDTO;
 import com.epmet.dto.result.IssueDetailResultDTO;
+import com.epmet.dto.result.VoteResultDTO;
+import com.epmet.dto.result.VotingTrendResultDTO;
 import com.epmet.service.IssueService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -36,10 +43,69 @@ public class IssueController {
         return new Result<IssueDetailResultDTO>().ok(issueService.detail(issueDetail));
     }
 
-    /*@PostMapping(value = "votingtrend")
-    public Result<> votingTrend(){
-        return
-    }*/
+    /**
+     * @Description  议题表决折线图
+     * @param formDTO
+     * @author zxc
+     */
+    @PostMapping(value = "votingtrend")
+    public Result<VotingTrendResultDTO> votingTrend(@RequestBody IssueIdFormDTO formDTO){
+        return new Result<VotingTrendResultDTO>().ok(issueService.votingTrend(formDTO));
+    }
+
+    /**
+     * @Description  支持议题
+     * @param formDTO
+     * @author zxc
+     */
+    @PostMapping(value = "support")
+    public Result support(@LoginUser TokenDto tokenDto, @RequestBody IssueIdFormDTO formDTO){
+        issueService.support(tokenDto,formDTO);
+        return new Result();
+    }
+
+    /**
+     * @Description  反对议题
+     * @param formDTO
+     * @author zxc
+     */
+    @PostMapping(value = "oppose")
+    public Result oppose(@LoginUser TokenDto tokenDto,@RequestBody IssueIdFormDTO formDTO){
+        issueService.oppose(tokenDto,formDTO);
+        return new Result();
+    }
+
+    /**
+     * @Description  表决中议题详情——支持、反对数
+     * @param formDTO
+     * @author zxc
+     */
+    @PostMapping(value = "vote")
+    public Result<VoteResultDTO> vote(@RequestBody IssueIdFormDTO formDTO){
+        return new Result<VoteResultDTO>().ok(issueService.vote(formDTO));
+    }
+
+    /**
+     * @Description  满意度评价初始化
+     * @param tokenDto
+     * @param issueId
+     * @author zxc
+     */
+    @PostMapping("initevaluation")
+    public Result<InitEvaluationResultDTO> initEvaluation(@LoginUser TokenDto tokenDto, @RequestBody IssueIdFormDTO issueId){
+        return new Result<InitEvaluationResultDTO>().ok(issueService.initEvaluation(tokenDto,issueId));
+    }
+
+    /**
+     * @Description  提交满意度评价
+     * @param formDTO
+     * @author zxc
+     */
+    @PostMapping("evaluate")
+    public Result evaluate(@LoginUser TokenDto tokenDto,@RequestBody EvaluateFormDTO formDTO){
+        issueService.evaluate(tokenDto,formDTO);
+        return new Result();
+    }
 
 }
 
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java
index 972dad25ff..c4103e74dc 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java
@@ -1,9 +1,14 @@
 package com.epmet.feign;
 
+import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.form.IssueDetailFormDTO;
+import com.epmet.dto.form.*;
+import com.epmet.dto.result.InitEvaluationResultDTO;
 import com.epmet.dto.result.IssueResultDTO;
+import com.epmet.dto.result.VoteResultDTO;
+import com.epmet.dto.result.VotingTrendResultDTO;
 import com.epmet.feign.fallback.GovIssueFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -22,8 +27,48 @@ public interface GovIssueFeignClient {
      * @Description  议题详情
      * @param issueDetail
      * @author zxc
-     * @date 2020/5/11 16:50
      */
     @PostMapping("/gov/issue/issue/issuedetail")
     Result<IssueResultDTO> issueDetail(@RequestBody IssueDetailFormDTO issueDetail);
+
+    /**
+     * @Description  表决中议题详情——支持、反对数
+     * @param issueId
+     * @author zxc
+     */
+    @PostMapping("/gov/issue/issuevotestatistical/votecount")
+    Result<VoteResultDTO> voteCount(@RequestBody IssueIdFormDTO issueId);
+
+    /**
+     * @Description  议题表决折线图
+     * @param issueId
+     * @author zxc
+     */
+    @PostMapping("/gov/issue/issuevotestatistical/votingtrend")
+    Result<VotingTrendResultDTO> votingTrend(@RequestBody IssueIdFormDTO issueId);
+
+    /**
+     * @Description  表决中的 支持、反对 投票
+     * @param issueId
+     * @author zxc
+     */
+    @PostMapping("/gov/issue/issuevotedetail/vote")
+    Result vote(@RequestBody VoteFormDTO issueId);
+
+    /**
+     * @Description  满意度评价初始化
+     * @param formDTO
+     * @author zxc
+     */
+    @PostMapping("/gov/issue/issuesatisfactiondetail/initevaluation")
+    Result<InitEvaluationResultDTO> initEvaluation(@RequestBody InitEvaluationFormDTO formDTO);
+
+    /**
+     * @Description  提交满意度评价
+     * @param formDTO
+     * @author zxc
+     */
+    @PostMapping("/gov/issue/issuesatisfactiondetail/evaluate")
+    Result evaluate(@RequestBody EvaluateFormDTO formDTO);
+
 }
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java
index 62d2ceb77b..c464a6f5a3 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java
@@ -1,10 +1,14 @@
 package com.epmet.feign.fallback;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.form.IssueDetailFormDTO;
+import com.epmet.dto.form.*;
+import com.epmet.dto.result.InitEvaluationResultDTO;
 import com.epmet.dto.result.IssueResultDTO;
+import com.epmet.dto.result.VoteResultDTO;
+import com.epmet.dto.result.VotingTrendResultDTO;
 import com.epmet.feign.GovIssueFeignClient;
 import org.springframework.stereotype.Component;
 
@@ -19,4 +23,29 @@ public class GovIssueFeignClientFallBack implements GovIssueFeignClient {
     public Result<IssueResultDTO> issueDetail(IssueDetailFormDTO issueDetail) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "issueDetail", issueDetail);
     }
+
+    @Override
+    public Result<VoteResultDTO> voteCount(IssueIdFormDTO issueId) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "voteCount", issueId);
+    }
+
+    @Override
+    public Result<VotingTrendResultDTO> votingTrend(IssueIdFormDTO issueId) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "votingTrend", issueId);
+    }
+
+    @Override
+    public Result vote(VoteFormDTO voteFormDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "vote", voteFormDTO);
+    }
+
+    @Override
+    public Result initEvaluation(InitEvaluationFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "initEvaluation", formDTO);
+    }
+
+    @Override
+    public Result<InitEvaluationResultDTO> evaluate(EvaluateFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "evaluate", formDTO);
+    }
 }
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueService.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueService.java
index 999fb46355..20eace94e3 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueService.java
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueService.java
@@ -1,7 +1,14 @@
 package com.epmet.service;
 
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.dto.form.EvaluateFormDTO;
 import com.epmet.dto.form.IssueDetailFormDTO;
+import com.epmet.dto.form.IssueIdFormDTO;
+import com.epmet.dto.result.InitEvaluationResultDTO;
 import com.epmet.dto.result.IssueDetailResultDTO;
+import com.epmet.dto.result.VoteResultDTO;
+import com.epmet.dto.result.VotingTrendResultDTO;
+import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * @Author zxc
@@ -17,4 +24,48 @@ public interface IssueService {
      */
     IssueDetailResultDTO detail(IssueDetailFormDTO issueDetail);
 
+    /**
+     * @Description  议题表决折线图
+     * @param issueId
+     * @author zxc
+     * @date 2020/5/12 8:48
+     */
+    VotingTrendResultDTO votingTrend(IssueIdFormDTO issueId);
+
+    /**
+     * @Description  支持议题
+     * @param issueId
+     * @author zxc
+     */
+    void support(TokenDto tokenDto,IssueIdFormDTO issueId);
+
+    /**
+     * @Description  反对议题
+     * @param issueId
+     * @author zxc
+     */
+    void oppose(TokenDto tokenDto,IssueIdFormDTO issueId);
+
+    /**
+     * @Description  表决中议题详情——支持、反对数
+     * @param issueId
+     * @author zxc
+     */
+    VoteResultDTO vote(IssueIdFormDTO issueId);
+
+    /**
+     * @Description  满意度评价初始化
+     * @param tokenDto
+     * @param issueId
+     * @author zxc
+     */
+    InitEvaluationResultDTO initEvaluation(TokenDto tokenDto, IssueIdFormDTO issueId);
+
+    /**
+     * @Description  提交满意度评价
+     * @param evaluateFormDTO
+     * @author zxc
+     */
+    void evaluate(TokenDto tokenDto,EvaluateFormDTO evaluateFormDTO);
+
 }
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
index b27ed53daf..2f520351cf 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
@@ -1,20 +1,16 @@
 package com.epmet.service.impl;
 
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.TopicInfoDTO;
-import com.epmet.dto.form.BelongGridNameFormDTO;
-import com.epmet.dto.form.IssueDetailFormDTO;
-import com.epmet.dto.form.IssueInitiatorFormDTO;
-import com.epmet.dto.form.TopicInfoFormDTO;
-import com.epmet.dto.result.BelongGridNameResultDTO;
-import com.epmet.dto.result.IssueDetailResultDTO;
-import com.epmet.dto.result.IssueInitiatorResultDTO;
-import com.epmet.dto.result.IssueResultDTO;
+import com.epmet.dto.form.*;
+import com.epmet.dto.result.*;
 import com.epmet.feign.EpmetUserFeignClient;
 import com.epmet.feign.GovIssueFeignClient;
 import com.epmet.feign.GovOrgFeignClient;
 import com.epmet.feign.ResiGroupFeignClient;
 import com.epmet.service.IssueService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -54,18 +50,101 @@ public class IssueServiceImpl implements IssueService {
         //话题发起人
         IssueInitiatorFormDTO initiatorFormDTO = new IssueInitiatorFormDTO();
         initiatorFormDTO.setUserId(issueResult.getUserId());
-        Result<IssueInitiatorResultDTO> initiatorResult = userFeignClient.selectIssueInitiator(initiatorFormDTO);
-        issueDetailResult.setIssueInitiator(initiatorResult.getData().getIssueInitiator());
+        if (!StringUtils.isBlank(issueResult.getUserId())) {
+            Result<IssueInitiatorResultDTO> initiatorResult = userFeignClient.selectIssueInitiator(initiatorFormDTO);
+            issueDetailResult.setIssueInitiator(initiatorResult.getData().getIssueInitiator());
+        }
         //网格名称
         BelongGridNameFormDTO belongGridName = new BelongGridNameFormDTO();
         belongGridName.setGridId(issueResult.getGridId());
-        Result<BelongGridNameResultDTO> belongGridNameResult = govOrgFeignClient.getGridNameByGridId(belongGridName);
-        issueDetailResult.setBelongsGridName(belongGridNameResult.getData().getBelongsGridName());
+        if (!StringUtils.isBlank(issueResult.getGridId())) {
+            Result<BelongGridNameResultDTO> belongGridNameResult = govOrgFeignClient.getGridNameByGridId(belongGridName);
+            issueDetailResult.setBelongsGridName(belongGridNameResult.getData().getBelongsGridName());
+        }
         //话题信息
         TopicInfoFormDTO topicInfoFormDTO = new TopicInfoFormDTO();
         topicInfoFormDTO.setTopicId(issueResult.getTopicId());
-        Result<TopicInfoDTO> topicInfoDTOResult = resiGroupFeignClient.selectDetail(topicInfoFormDTO);
-        issueDetailResult.setTopicInfo(topicInfoDTOResult.getData());
+        if (!StringUtils.isBlank(issueResult.getTopicId())) {
+            Result<TopicInfoDTO> topicInfoDTOResult = resiGroupFeignClient.selectDetail(topicInfoFormDTO);
+            issueDetailResult.setTopicInfo(topicInfoDTOResult.getData());
+        }
         return issueDetailResult;
     }
+
+    /**
+     * @Description  议题表决折线图
+     * @param issueId
+     * @author zxc
+     * @date 2020/5/12 8:49
+     */
+    @Override
+    public VotingTrendResultDTO votingTrend(IssueIdFormDTO issueId) {
+        Result<VotingTrendResultDTO> votingTrendResultDTOResult = govIssueFeignClient.votingTrend(issueId);
+        return votingTrendResultDTOResult.getData();
+    }
+
+    /**
+     * @Description  支持议题
+     * @param issueId
+     * @author zxc
+     */
+    @Override
+    public void support(TokenDto tokenDto,IssueIdFormDTO issueId) {
+        VoteFormDTO voteFormDTO = new VoteFormDTO();
+        voteFormDTO.setAttitude("support");
+        voteFormDTO.setCreatedBy(tokenDto.getUserId());
+        voteFormDTO.setIssueId(issueId.getIssueId());
+        govIssueFeignClient.vote(voteFormDTO);
+    }
+
+    /**
+     * @Description  反对议题
+     * @param issueId
+     * @author zxc
+     */
+    @Override
+    public void oppose(TokenDto tokenDto,IssueIdFormDTO issueId) {
+        VoteFormDTO voteFormDTO = new VoteFormDTO();
+        voteFormDTO.setAttitude("opposition");
+        voteFormDTO.setCreatedBy(tokenDto.getUserId());
+        voteFormDTO.setIssueId(issueId.getIssueId());
+        govIssueFeignClient.vote(voteFormDTO);
+    }
+
+    /**
+     * @Description  表决中议题详情——支持、反对数
+     * @param issueId
+     * @author zxc
+     */
+    @Override
+    public VoteResultDTO vote(IssueIdFormDTO issueId) {
+        Result<VoteResultDTO> voteResultDTOResult = govIssueFeignClient.voteCount(issueId);
+        return voteResultDTOResult.getData();
+    }
+
+    /**
+     * @Description  满意度评价初始化
+     * @param tokenDto
+     * @param issueId
+     * @author zxc
+     */
+    @Override
+    public InitEvaluationResultDTO initEvaluation(TokenDto tokenDto, IssueIdFormDTO issueId) {
+        InitEvaluationFormDTO formDTO = new InitEvaluationFormDTO();
+        formDTO.setIssueId(issueId.getIssueId());
+        formDTO.setUserId(tokenDto.getUserId());
+        Result<InitEvaluationResultDTO> initEvaluationResult = govIssueFeignClient.initEvaluation(formDTO);
+        return initEvaluationResult.getData();
+    }
+
+    /**
+     * @Description  提交满意度评价
+     * @param evaluateFormDTO
+     * @author zxc
+     */
+    @Override
+    public void evaluate(TokenDto tokenDto,EvaluateFormDTO evaluateFormDTO) {
+        evaluateFormDTO.setUserId(tokenDto.getUserId());
+        govIssueFeignClient.evaluate(evaluateFormDTO);
+    }
 }

From e7ace76d26b5f64982d6450069794b05585c6584 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 13 May 2020 09:04:54 +0800
Subject: [PATCH 33/45] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=B7=9F=E8=B8=AA-?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=BB=A1=E6=84=8F=E5=BA=A6=E8=AF=84=E4=BB=B7?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/form/EvaluationListFormDTO.java | 31 +++++++++
 .../dto/result/EvaluationListResultDTO.java   | 65 +++++++++++++++++++
 .../gov-project/gov-project-server/pom.xml    |  6 ++
 .../com/epmet/constant/ProjectConstant.java   |  5 ++
 .../controller/ProjectTraceController.java    | 18 ++++-
 .../dao/ProjectSatisfactionDetailDao.java     | 13 +++-
 .../com/epmet/feign/EpmetUserFeignClient.java | 17 ++++-
 .../EpmetUserFeignClientFallBack.java         | 11 ++++
 .../ProjectSatisfactionDetailService.java     | 10 +++
 .../ProjectSatisfactionDetailServiceImpl.java | 48 +++++++++++++-
 .../mapper/ProjectSatisfactionDetailDao.xml   | 14 ++++
 11 files changed, 233 insertions(+), 5 deletions(-)
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EvaluationListFormDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EvaluationListResultDTO.java

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EvaluationListFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EvaluationListFormDTO.java
new file mode 100644
index 0000000000..57f5fbb8ee
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EvaluationListFormDTO.java
@@ -0,0 +1,31 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 项目跟踪-项目满意度评价列表-接口入参
+ * @Author sun
+ */
+@Data
+public class EvaluationListFormDTO implements Serializable {
+    private static final long serialVersionUID = 4859779755214502427L;
+
+    @NotBlank(message = "项目Id不能为空")
+    private String projectId;
+
+    /**
+     * 请求页码
+     * */
+    @Min(1)
+    private int pageNo;
+
+    /**
+     * 每页多少条数据
+     * */
+    private int pageSize = 20;
+}
+
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EvaluationListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EvaluationListResultDTO.java
new file mode 100644
index 0000000000..0a9dd49d82
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EvaluationListResultDTO.java
@@ -0,0 +1,65 @@
+/**
+ * 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.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 项目跟踪-项目满意度评价列表-接口返参
+ *
+ * @author sun
+ */
+@Data
+public class EvaluationListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 评价用户id
+     */
+    private String userId = "";
+
+    /**
+     * 评论人员全称（街道-姓氏先生/女士）
+     */
+    private String userNickName = "";
+
+    /**
+     * 满意程度(不满意:bad、基本满意:good、非常满意:perfect)
+     */
+    private String satisfaction = "";
+
+    /**
+     * 评价时间
+     */
+    private Long evaluateTime;
+
+    /**
+     * 评价内容
+     */
+    private String evaluateContent = "";
+
+    /**
+     * 头像
+     */
+    private String userHeadPhoto = "";
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml
index 7fa15bd39f..ef9a20e890 100644
--- a/epmet-module/gov-project/gov-project-server/pom.xml
+++ b/epmet-module/gov-project/gov-project-server/pom.xml
@@ -66,6 +66,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-user-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>
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 e9b81ef0f9..1c2b314f41 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
@@ -68,4 +68,9 @@ public interface ProjectConstant {
 	 * 是否处理-已处理
 	 */
 	String HANDLE = "handle";
+
+	/**
+	 * 调用epmet-user服务查询数据失败
+	 */
+	String SELECT_USERINFO_EXCEPTION = "获取用户昵称、头像失败";
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTraceController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTraceController.java
index b862ba1085..9f2e75ed7f 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTraceController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTraceController.java
@@ -9,6 +9,7 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.service.ProjectProcessService;
+import com.epmet.service.ProjectSatisfactionDetailService;
 import com.epmet.service.ProjectTraceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -33,6 +34,9 @@ public class ProjectTraceController {
 	@Autowired
 	private ProjectProcessService projectProcessService;
 
+	@Autowired
+	private ProjectSatisfactionDetailService projectSatisfactionDetailService;
+
 	/**
 	 * 待处理项目列表
 	 *
@@ -137,7 +141,6 @@ public class ProjectTraceController {
 		return new Result();
 	}
 
-
     /**
      * @param formDTO
      * @return
@@ -150,5 +153,18 @@ public class ProjectTraceController {
         ValidatorUtils.validateEntity(formDTO);
         return new Result<List<ProcesslistResultDTO>>().ok(projectProcessService.progressList(formDTO));
     }
+
+	/**
+	 * @param formDTO
+	 * @return
+	 * @Author sun
+	 * @Description 项目跟踪-项目满意度评价列表
+	 **/
+	@PostMapping("evaluationlist")
+	@RequirePermission(requirePermission = RequirePermissionEnum.WORK_PROJECT_TRACE_DETAIL)
+	public Result<List<EvaluationListResultDTO>> evaluationList(@LoginUser TokenDto tokenDTO, @RequestBody EvaluationListFormDTO formDTO) {
+		ValidatorUtils.validateEntity(formDTO);
+		return new Result<List<EvaluationListResultDTO>>().ok(projectSatisfactionDetailService.evaluationList(formDTO));
+	}
 }
 
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSatisfactionDetailDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSatisfactionDetailDao.java
index aacb3e4d87..514c7060b1 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSatisfactionDetailDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSatisfactionDetailDao.java
@@ -18,8 +18,12 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.result.EvaluationListResultDTO;
 import com.epmet.entity.ProjectSatisfactionDetailEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 项目满意度调查记录表
@@ -29,5 +33,12 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface ProjectSatisfactionDetailDao extends BaseDao<ProjectSatisfactionDetailEntity> {
-	
+
+    /**
+     * @param projectId
+     * @return
+     * @Author sun
+     * @Description 根据项目Id查询项目评价列表数据
+     **/
+    List<EvaluationListResultDTO> getEvaluationListByProjectId(@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/feign/EpmetUserFeignClient.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
index cc2404269e..11f0f28937 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
@@ -1,8 +1,15 @@
 package com.epmet.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.UserResiInfoListFormDTO;
+import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.feign.fallback.EpmetUserFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
 
 /**
  * @Description 调用epmet-user服务
@@ -11,6 +18,12 @@ import org.springframework.cloud.openfeign.FeignClient;
 @FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class)
 public interface EpmetUserFeignClient {
 
-
-
+    /**
+     * @param userResiInfoListFormDTO
+     * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.UserResiInfoDTO>>
+     * @Author sun
+     * @Description 根据userId集合查询用户信息
+     **/
+    @PostMapping("/epmetuser/userresiinfo/getuserresiinfolist")
+    Result<List<UserResiInfoResultDTO>> getUserResiInfoList(@RequestBody UserResiInfoListFormDTO userResiInfoListFormDTO);
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
index cfb62dcabf..88e9590eaf 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
@@ -1,8 +1,15 @@
 package com.epmet.feign.fallback;
 
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.UserResiInfoListFormDTO;
+import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.feign.EpmetUserFeignClient;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * @Description 调用epmet-user服务
  * @Author sun
@@ -10,4 +17,8 @@ import org.springframework.stereotype.Component;
 @Component
 public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
 
+    @Override
+    public Result<List<UserResiInfoResultDTO>> getUserResiInfoList(UserResiInfoListFormDTO userResiInfoListFormDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserResiInfoList", userResiInfoListFormDTO);
+    }
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSatisfactionDetailService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSatisfactionDetailService.java
index a1fef8ff1c..94decfd804 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSatisfactionDetailService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSatisfactionDetailService.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.ProjectSatisfactionDetailDTO;
+import com.epmet.dto.form.EvaluationListFormDTO;
+import com.epmet.dto.result.EvaluationListResultDTO;
 import com.epmet.entity.ProjectSatisfactionDetailEntity;
 
 import java.util.List;
@@ -92,4 +94,12 @@ public interface ProjectSatisfactionDetailService extends BaseService<ProjectSat
      * @date 2020-05-11
      */
     void delete(String[] ids);
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 项目跟踪-项目满意度评价列表
+     **/
+    List<EvaluationListResultDTO> evaluationList(EvaluationListFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java
index 8a0e4705a8..7ad9452c05 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java
@@ -20,12 +20,20 @@ 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.FieldConstant;
+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.constant.ProjectConstant;
 import com.epmet.dao.ProjectSatisfactionDetailDao;
 import com.epmet.dto.ProjectSatisfactionDetailDTO;
+import com.epmet.dto.form.EvaluationListFormDTO;
+import com.epmet.dto.form.UserResiInfoListFormDTO;
+import com.epmet.dto.result.EvaluationListResultDTO;
+import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.entity.ProjectSatisfactionDetailEntity;
+import com.epmet.feign.EpmetUserFeignClient;
 import com.epmet.redis.ProjectSatisfactionDetailRedis;
 import com.epmet.service.ProjectSatisfactionDetailService;
 import org.apache.commons.lang3.StringUtils;
@@ -33,9 +41,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 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;
+import java.util.stream.Collectors;
 
 /**
  * 项目满意度调查记录表
@@ -48,6 +58,8 @@ public class ProjectSatisfactionDetailServiceImpl extends BaseServiceImpl<Projec
 
     @Autowired
     private ProjectSatisfactionDetailRedis projectSatisfactionDetailRedis;
+    @Autowired
+    private EpmetUserFeignClient epmetUserFeignClient;
 
     @Override
     public PageData<ProjectSatisfactionDetailDTO> page(Map<String, Object> params) {
@@ -101,4 +113,38 @@ public class ProjectSatisfactionDetailServiceImpl extends BaseServiceImpl<Projec
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 项目跟踪-项目满意度评价列表
+     **/
+    @Override
+    public List<EvaluationListResultDTO> evaluationList(EvaluationListFormDTO formDTO) {
+        //1:根据项目Id查询项目评价列表，按时间倒序
+        List<EvaluationListResultDTO> evaluationList = baseDao.getEvaluationListByProjectId(formDTO.getProjectId());
+        if (null == evaluationList || evaluationList.size() < NumConstant.ONE) {
+            return new ArrayList<>();
+        }
+        //2:调用epmet-user服务 获取用户头像 昵称
+        //2.1:遍历获取所有的userId
+        List<String> userIds = evaluationList.stream().map(EvaluationListResultDTO::getUserId).collect(Collectors.toList());
+        //2.2:获取所有用户的头像 昵称
+        UserResiInfoListFormDTO userResiInfoListFormDTO = new UserResiInfoListFormDTO();
+        userResiInfoListFormDTO.setUserIdList(userIds);
+        List<UserResiInfoResultDTO> userResiInfoList = epmetUserFeignClient.getUserResiInfoList(userResiInfoListFormDTO).getData();
+        if (null == userResiInfoList || userResiInfoList.size() < NumConstant.ONE) {
+            throw new RenException(ProjectConstant.SELECT_USERINFO_EXCEPTION);
+        }
+        //3:将每个用户的头像 昵称放到对应实体中返回给前台
+        List<EvaluationListResultDTO> resultList = evaluationList.stream().flatMap(evaluation -> userResiInfoList.stream().filter(user ->
+                evaluation.getUserId().equals(user.getUserId())).map(userInfo -> {
+            EvaluationListResultDTO resultDTO = ConvertUtils.sourceToTarget(evaluation, EvaluationListResultDTO.class);
+            resultDTO.setUserNickName(null == userInfo.getShowName() ? "" : userInfo.getShowName());
+            resultDTO.setUserHeadPhoto(null == userInfo.getHeadPhoto() ? "" : userInfo.getHeadPhoto());
+            return resultDTO;
+        })).collect(Collectors.toList());
+        return resultList;
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSatisfactionDetailDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSatisfactionDetailDao.xml
index a644923a30..e2ddbd3417 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSatisfactionDetailDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSatisfactionDetailDao.xml
@@ -16,5 +16,19 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <select id="getEvaluationListByProjectId" resultType="com.epmet.dto.result.EvaluationListResultDTO">
+        SELECT
+            CREATED_BY AS "userId",
+            SATISFACTION AS "satisfaction",
+            UNIX_TIMESTAMP(CREATED_TIME) AS "evaluateTime",
+            `COMMENT` AS "evaluateContent"
+        FROM
+            project_satisfaction_detail
+        WHERE
+            DEL_FLAG = '0'
+        AND PROJECT_ID = #{projectId}
+        ORDER BY CREATED_TIME DESC
+    </select>
+
 
 </mapper>
\ No newline at end of file

From 66295e450fcb2d9699e3aed60b73c43732e24c09 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 13 May 2020 15:19:42 +0800
Subject: [PATCH 34/45] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E3=80=81=E9=A1=B9=E7=9B=AE=E8=B7=9F=E8=B8=AA-=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E4=BA=BA=E5=91=98=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/IssueManageController.java     |  15 ++
 .../com/epmet/feign/GovOrgFeignClient.java    |  11 ++
 .../fallback/GovOrgFeignClientFallBack.java   |   7 +
 .../java/com/epmet/service/IssueService.java  |   9 ++
 .../epmet/service/impl/IssueServiceImpl.java  |  15 ++
 .../dto/form/DepartmentStaffListFormDTO.java  |  20 +++
 .../result/CustomerStaffListResultDTO.java    |  45 ++++++
 .../result/CustomerStaffRoleResultDTO.java    |  48 ++++++
 .../result/DepartmentStaffListResultDTO.java  |  51 ++++++
 .../epmet/dto/result/DeptListResultDTO.java   |  49 ++++++
 .../epmet/dto/result/GridListResultDTO.java   |  49 ++++++
 .../epmet/dto/result/StaffListResultDTO.java  |  36 +++++
 .../constant/CustomerAgencyConstant.java      |  13 ++
 .../controller/CustomerAgencyController.java  |  12 ++
 .../java/com/epmet/dao/CustomerGridDao.java   |  11 +-
 .../com/epmet/dao/CustomerStaffAgencyDao.java |   7 +
 .../epmet/dao/CustomerStaffDepartmentDao.java |   8 +
 .../com/epmet/dao/CustomerStaffGridDao.java   |   8 +
 .../com/epmet/feign/EpmetUserFeignClient.java |  10 ++
 .../EpmetUserFeignClientFallBack.java         |   5 +
 .../epmet/service/CustomerAgencyService.java  |   9 ++
 .../impl/CustomerAgencyServiceImpl.java       | 149 ++++++++++++++++--
 .../main/resources/mapper/CustomerGridDao.xml |  10 ++
 .../mapper/CustomerStaffAgencyDao.xml         |  10 +-
 .../mapper/CustomerStaffDepartmentDao.xml     |  14 ++
 .../resources/mapper/CustomerStaffGridDao.xml |  14 ++
 .../gov-project/gov-project-server/pom.xml    |   6 +
 .../controller/ProjectTraceController.java    |  17 ++
 .../com/epmet/feign/GovOrgFeignClient.java    |  12 ++
 .../fallback/GovOrgFeignClientFallBack.java   |   8 +
 .../epmet/service/ProjectStaffService.java    |  10 ++
 .../service/impl/ProjectStaffServiceImpl.java |  15 +-
 .../controller/CustomerStaffController.java   |  11 ++
 .../java/com/epmet/dao/CustomerStaffDao.java  |   9 ++
 .../main/java/com/epmet/dao/StaffRoleDao.java |   9 ++
 .../epmet/service/CustomerStaffService.java   |   8 +
 .../impl/CustomerStaffServiceImpl.java        |  21 +++
 .../resources/mapper/CustomerStaffDao.xml     |  16 ++
 .../main/resources/mapper/StaffRoleDao.xml    |  17 ++
 39 files changed, 781 insertions(+), 13 deletions(-)
 create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/DepartmentStaffListFormDTO.java
 create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CustomerStaffListResultDTO.java
 create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CustomerStaffRoleResultDTO.java
 create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DepartmentStaffListResultDTO.java
 create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DeptListResultDTO.java
 create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridListResultDTO.java
 create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffListResultDTO.java

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java
index 6ad967cdca..9738c4272d 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java
@@ -7,6 +7,8 @@ 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.dto.form.CloseIssueFormDTO;
+import com.epmet.dto.form.DepartmentStaffListFormDTO;
+import com.epmet.dto.result.DepartmentStaffListResultDTO;
 import com.epmet.service.IssueService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -39,5 +41,18 @@ public class IssueManageController {
         issueService.closeIssue(formDTO);
         return new Result();
     }
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 议题管理-部门人员选择
+     **/
+    @PostMapping("departmentstafflist")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_SHIFT_PROJECT)
+    public Result<DepartmentStaffListResultDTO> departmentStaffList(@LoginUser TokenDto tokenDTO, @RequestBody DepartmentStaffListFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        return new Result<DepartmentStaffListResultDTO>().ok(issueService.departmentStaffList(formDTO));
+    }
 }
 
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
index 9cd829abe4..448afc2e58 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
@@ -5,8 +5,10 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.form.CustomerGridFormDTO;
 import com.epmet.dto.result.AgencyGridResultDTO;
+import com.epmet.dto.result.DepartmentStaffListResultDTO;
 import com.epmet.feign.fallback.GovOrgFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 
 /**
@@ -24,4 +26,13 @@ public interface GovOrgFeignClient {
      **/
     @PostMapping("/gov/org/customergrid/getcustomergridbygridid")
     Result<AgencyGridResultDTO> getAgencyAndGrid(AgencyGridResultDTO agencyGridResultDTO);
+
+    /**
+     * @param agencyId
+     * @return
+     * @Author sun
+     * @Description 查询组织下人员,组织下部门人员,组织下网格人员列表信息
+     **/
+    @PostMapping(value = "/gov/org/customeragency/departmentstafflist/{agencyId}")
+    Result<DepartmentStaffListResultDTO> departmentStaffList(@PathVariable("agencyId") String agencyId);
 }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
index 8aec17593a..336832326b 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
@@ -4,6 +4,7 @@ import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.result.AgencyGridResultDTO;
+import com.epmet.dto.result.DepartmentStaffListResultDTO;
 import com.epmet.feign.GovOrgFeignClient;
 import org.springframework.stereotype.Component;
 
@@ -13,8 +14,14 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class GovOrgFeignClientFallBack implements GovOrgFeignClient {
+
     @Override
     public Result<AgencyGridResultDTO> getAgencyAndGrid(AgencyGridResultDTO agencyGridResultDTO) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getagencyandgrid", agencyGridResultDTO);
     }
+
+    @Override
+    public Result<DepartmentStaffListResultDTO> departmentStaffList(String agencyId) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "departmentStaffList", agencyId);
+    }
 }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java
index ab38c329c5..a7d58e66e9 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java
@@ -2,7 +2,9 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.dto.form.CloseIssueFormDTO;
+import com.epmet.dto.form.DepartmentStaffListFormDTO;
 import com.epmet.dto.form.IssueDetailFormDTO;
+import com.epmet.dto.result.DepartmentStaffListResultDTO;
 import com.epmet.dto.result.IssueResultDTO;
 import com.epmet.entity.IssueEntity;
 
@@ -28,4 +30,11 @@ public interface IssueService extends BaseService<IssueEntity> {
      **/
     void closeIssue(CloseIssueFormDTO formDTO);
 
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 议题管理-部门人员选择
+     **/
+    DepartmentStaffListResultDTO departmentStaffList(DepartmentStaffListFormDTO formDTO);
 }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
index 536a12307e..64d9759f67 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
@@ -11,9 +11,11 @@ import com.epmet.constant.UserMessageConstant;
 import com.epmet.dao.IssueDao;
 import com.epmet.dao.IssueProcessDao;
 import com.epmet.dto.form.CloseIssueFormDTO;
+import com.epmet.dto.form.DepartmentStaffListFormDTO;
 import com.epmet.dto.form.IssueDetailFormDTO;
 import com.epmet.dto.form.UserMessageFormDTO;
 import com.epmet.dto.result.AgencyGridResultDTO;
+import com.epmet.dto.result.DepartmentStaffListResultDTO;
 import com.epmet.dto.result.IssueResultDTO;
 import com.epmet.entity.IssueEntity;
 import com.epmet.entity.IssueProcessEntity;
@@ -136,4 +138,17 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         msgList.add(msgDTO);
         return messageFeignClient.saveUserMessageList(msgList);
     }
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 议题管理-部门人员选择
+     **/
+    @Override
+    public DepartmentStaffListResultDTO departmentStaffList(DepartmentStaffListFormDTO formDTO) {
+        //1:调用gov-org服务，分别查询组织下人员，组织下部门人员，组织下网格人员列表信息
+        Result<DepartmentStaffListResultDTO> resultDTOResult = govOrgFeignClient.departmentStaffList(formDTO.getAgencyId());
+        return resultDTOResult.getData();
+    }
 }
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/DepartmentStaffListFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/DepartmentStaffListFormDTO.java
new file mode 100644
index 0000000000..4542a587db
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/DepartmentStaffListFormDTO.java
@@ -0,0 +1,20 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 项目跟踪-部门人员选择-接口入参
+ * @Author sun
+ */
+@Data
+public class DepartmentStaffListFormDTO implements Serializable {
+    private static final long serialVersionUID = 4859779755214502427L;
+
+    @NotBlank(message = "机关组织Id不能为空")
+    private String agencyId;
+
+}
+
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CustomerStaffListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CustomerStaffListResultDTO.java
new file mode 100644
index 0000000000..4ca73628f7
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CustomerStaffListResultDTO.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.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * 工作人员信息及角色
+ *
+ * @author sun
+ */
+@Data
+public class CustomerStaffListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 工作人员信息集合
+     */
+    private List<StaffListResultDTO> staffList;
+    /**
+     * 工作人员角色集合
+     */
+    private List<CustomerStaffRoleResultDTO> roleList;
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CustomerStaffRoleResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CustomerStaffRoleResultDTO.java
new file mode 100644
index 0000000000..f54628f303
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CustomerStaffRoleResultDTO.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.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 工作人员角色
+ *
+ * @author sun
+ */
+@Data
+public class CustomerStaffRoleResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 工作人员Id
+     */
+    private String staffId = "";
+    /**
+     * 人员角色Key
+     */
+    private String roleKey = "";
+    /**
+     * 人员角色名称
+     */
+    private String roleName = "";
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DepartmentStaffListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DepartmentStaffListResultDTO.java
new file mode 100644
index 0000000000..6f706566c3
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DepartmentStaffListResultDTO.java
@@ -0,0 +1,51 @@
+/**
+ * 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.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * 项目跟踪-部门人员选择-接口返参
+ *
+ * @author sun
+ */
+@Data
+public class DepartmentStaffListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 组织下工作人员信息
+     */
+    private List<StaffListResultDTO> agencyStaffList;
+
+    /**
+     * 部门人员选择-组织下部门及人员列表
+     */
+    private List<DeptListResultDTO> departmentList;
+
+    /**
+     * 部门人员选择-组织下网格及人员列表
+     */
+    private List<GridListResultDTO> gridList;
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DeptListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DeptListResultDTO.java
new file mode 100644
index 0000000000..480b6ac408
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DeptListResultDTO.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.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * 部门人员选择-组织下部门及人员列表
+ *
+ * @author sun
+ */
+@Data
+public class DeptListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 部门Id
+     */
+    private String departmentId;
+    /**
+     * 部门名称
+     */
+    private String departmentName;
+    /**
+     * 部门下人员集合
+     */
+    private List<StaffListResultDTO> departmentStaffList;
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridListResultDTO.java
new file mode 100644
index 0000000000..49be734771
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridListResultDTO.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.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * 部门人员选择-组织下网格及人员列表
+ *
+ * @author sun
+ */
+@Data
+public class GridListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 网格Id
+     */
+    private String gridId;
+    /**
+     * 网格名称
+     */
+    private String gridName;
+    /**
+     * 网格下工作人员集合
+     */
+    private List<StaffListResultDTO> gridStaffList;
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffListResultDTO.java
new file mode 100644
index 0000000000..27ff1b358b
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffListResultDTO.java
@@ -0,0 +1,36 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @dscription 工作人员信息
+ * @author sun
+ */
+@Data
+public class StaffListResultDTO implements Serializable {
+
+	private static final long serialVersionUID = 5957826616179876849L;
+	/**
+	 * 人员Id
+	 */
+	private String staffId;
+	/**
+	 * 人员名称
+	 */
+	private String staffName;
+	/**
+	 * 人员头像
+	 */
+	private String staffHeadPhoto;
+	/**
+	 * 性别
+	 */
+	private String gender;
+	/**
+	 * 角色名称(机关领导、部门领导、网格长)
+	 */
+	private String roleName;
+
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java
index 330185b612..f30c8c65ce 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java
@@ -38,4 +38,17 @@ public interface CustomerAgencyConstant {
 	 * 组织信息查询失败
 	 */
 	String SELECT_EXCEPTION = "根据组织ID未查询到机构组织信息";
+
+	/**
+	 * 工作人员角色-单位领导
+	 */
+	String AGENCY_LEADER = "agency_leader";
+	/**
+	 * 工作人员角色-部门领导
+	 */
+	String DEPT_LEADER = "dept_leader";
+	/**
+	 * 工作人员角色-网格长
+	 */
+	String GRID_MANAGER = "grid_manager";
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
index ee839de020..50cfe3c5be 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
@@ -28,6 +28,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.form.StaffOrgFormDTO;
 import com.epmet.dto.result.AgencyGridResultDTO;
+import com.epmet.dto.result.DepartmentStaffListResultDTO;
 import com.epmet.dto.result.StaffOrgsResultDTO;
 import com.epmet.excel.CustomerAgencyExcel;
 import com.epmet.service.CustomerAgencyService;
@@ -117,4 +118,15 @@ public class CustomerAgencyController {
         return new Result<AgencyGridResultDTO>().ok(customerAgencyService.getAgencyAndGrid(agencyGridResultDTO));
     }
 
+    /**
+     * @param agencyId
+     * @return
+     * @Author sun
+     * @Description 查询组织下人员,组织下部门人员,组织下网格人员列表信息
+     **/
+    @PostMapping("departmentstafflist/{agencyId}")
+    public Result<DepartmentStaffListResultDTO> departmentStaffList(@PathVariable("agencyId") String agencyId) {
+        return new Result<DepartmentStaffListResultDTO>().ok(customerAgencyService.departmentStaffList(agencyId));
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
index cc9f544cfb..669664481c 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
@@ -18,10 +18,11 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dto.*;
+import com.epmet.dto.CustomerGridDTO;
+import com.epmet.dto.UserIdAndPidDTO;
+import com.epmet.dto.UserIdDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
-import com.epmet.dto.result.CustomerGridForStrangerResultDTO;
 import com.epmet.entity.CustomerGridEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -160,4 +161,10 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
      * @date 2020/5/11 18:50
      */
     BelongGridNameResultDTO getGridNameByGridId(BelongGridNameFormDTO formDTO);
+
+    /**
+     * @Description 根据组织机关Id查询机关下网格列表
+     * @author sun
+     */
+    List<GridListResultDTO> selectGridList(@Param("agencyId") String agencyId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffAgencyDao.java
index 9de920b942..7be691d69f 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffAgencyDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffAgencyDao.java
@@ -20,6 +20,7 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.CustomerStaffAgencyDTO;
 import com.epmet.dto.form.CustomerGridFormDTO;
+import com.epmet.dto.result.StaffListResultDTO;
 import com.epmet.entity.CustomerStaffAgencyEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -68,4 +69,10 @@ public interface CustomerStaffAgencyDao extends BaseDao<CustomerStaffAgencyEntit
 	 * @Date 2020.04.26 16:33
 	 **/
 	List<String> getSelectableStaffsForDept(@Param("departmentId") String departmentId);
+
+	/**
+	 * 查询组织下人员列表
+	 * @Author sun
+	 */
+	List<StaffListResultDTO> selectAgencyStaffList(@Param("agencyId") String agencyId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffDepartmentDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffDepartmentDao.java
index 0c6fc36a4b..88fc246656 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffDepartmentDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffDepartmentDao.java
@@ -19,6 +19,7 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.CustomerStaffDepartmentDTO;
+import com.epmet.dto.result.ParentListResultDTO;
 import com.epmet.entity.CustomerStaffDepartmentEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -58,4 +59,11 @@ public interface CustomerStaffDepartmentDao extends BaseDao<CustomerStaffDepartm
      * @Date 2020.04.27 16:54
      **/
     void updateByDeptIdAndUserId(CustomerStaffDepartmentDTO staffDepartmentDTO);
+
+    /**
+     *
+     * @Author sun
+     * @Description 遍历查询每个部门下人员
+     */
+    List<CustomerStaffDepartmentDTO> selectDeptStaffs(@Param("deptIdList") List<String> deptIdList);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffGridDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffGridDao.java
index 7a01c76048..2a160f8a90 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffGridDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffGridDao.java
@@ -19,6 +19,7 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.CustomerGridDTO;
+import com.epmet.dto.CustomerStaffDepartmentDTO;
 import com.epmet.dto.CustomerStaffGridDTO;
 import com.epmet.dto.form.LatestGridFormDTO;
 import com.epmet.entity.CustomerStaffGridEntity;
@@ -82,4 +83,11 @@ public interface CustomerStaffGridDao extends BaseDao<CustomerStaffGridEntity> {
      * @Author sun
      */
     List<CustomerStaffGridDTO> selectByGridId(@Param("gridId")String gridId);
+
+    /**
+     *
+     * @Author sun
+     * @Description 遍历查询每个部门下人员
+     */
+    List<CustomerStaffGridDTO> selectGridStaffs(@Param("gridIdList") List<String> gridIdList);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
index 2f9fbb99c9..297df14501 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
@@ -22,6 +22,7 @@ import com.epmet.dto.CustomerStaffGridDTO;
 import com.epmet.dto.StaffGridListDTO;
 import com.epmet.feign.fallback.EpmetUserFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
@@ -159,4 +160,13 @@ public interface EpmetUserFeignClient {
      **/
     @PostMapping("/epmetuser/staffrole/getcustomerstaffroles")
 	Result<StaffRolesResultDTO> getCustomerStaffRoles(CommonUserFormDTO commonUserFormDTO);
+
+	/**
+	 * @param staffIdList
+	 * @return
+	 * @Author sun
+	 * @Description 根据staffId集合查询工作人员基础信息
+	 **/
+    @PostMapping(value = "/epmetuser/customerstaff/getcustomerstafflist", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	Result<CustomerStaffListResultDTO> getCustomerStaffList(List<String> staffIdList);
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
index bac3fd9024..f6ac8153ce 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
@@ -101,4 +101,9 @@ public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
     public Result<StaffRolesResultDTO> getCustomerStaffRoles(CommonUserFormDTO commonUserFormDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getCustomerStaffRoles", commonUserFormDTO);
     }
+
+    @Override
+    public Result<CustomerStaffListResultDTO> getCustomerStaffList(List<String> staffIdList) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getCustomerStaffList", staffIdList);
+    }
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
index dceb37c12e..7af4c11691 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
@@ -23,6 +23,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.form.StaffOrgFormDTO;
 import com.epmet.dto.result.AgencyGridResultDTO;
+import com.epmet.dto.result.DepartmentStaffListResultDTO;
 import com.epmet.dto.result.StaffOrgsResultDTO;
 import com.epmet.entity.CustomerAgencyEntity;
 
@@ -113,4 +114,12 @@ public interface CustomerAgencyService extends BaseService<CustomerAgencyEntity>
      * @Description 根据组织Id、网格Id查询组织、网格名称
      **/
     AgencyGridResultDTO getAgencyAndGrid(AgencyGridResultDTO agencyGridResultDTO);
+
+    /**
+     * @param agencyId
+     * @return
+     * @Author sun
+     * @Description 查询组织下人员,组织下部门人员,组织下网格人员列表信息
+     **/
+    DepartmentStaffListResultDTO departmentStaffList(String agencyId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
index 43d442b32e..8a7607b942 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
@@ -27,16 +27,14 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.CustomerAgencyConstant;
 import com.epmet.constant.CustomerGridConstant;
-import com.epmet.dao.CustomerAgencyDao;
-import com.epmet.dao.CustomerGridDao;
-import com.epmet.dto.CustomerAgencyDTO;
-import com.epmet.dto.CustomerDTO;
+import com.epmet.dao.*;
+import com.epmet.dto.*;
 import com.epmet.dto.form.CustomerFormDTO;
 import com.epmet.dto.form.StaffOrgFormDTO;
-import com.epmet.dto.result.AgencyGridResultDTO;
-import com.epmet.dto.result.StaffOrgsResultDTO;
+import com.epmet.dto.result.*;
 import com.epmet.entity.CustomerAgencyEntity;
 import com.epmet.entity.CustomerGridEntity;
+import com.epmet.feign.EpmetUserFeignClient;
 import com.epmet.feign.OperCrmFeignClient;
 import com.epmet.redis.CustomerAgencyRedis;
 import com.epmet.service.CustomerAgencyService;
@@ -47,9 +45,8 @@ 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;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 机关单位信息表
@@ -67,6 +64,17 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
     private OperCrmFeignClient operCrmFeignClient;
     @Autowired
     private CustomerGridDao customerGridDao;
+    @Autowired
+    private CustomerStaffAgencyDao customerStaffAgencyDao;
+    @Autowired
+    private CustomerDepartmentDao customerDepartmentDao;
+    @Autowired
+    private CustomerStaffDepartmentDao customerStaffDepartmentDao;
+    @Autowired
+    private CustomerStaffGridDao customerStaffGridDao;
+    @Autowired
+    private EpmetUserFeignClient epmetUserFeignClient;
+
     @Override
     public PageData<CustomerAgencyDTO> page(Map<String, Object> params) {
         IPage<CustomerAgencyEntity> page = baseDao.selectPage(
@@ -167,4 +175,127 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         return agencyGridResultDTO;
     }
 
+    /**
+     * @param agencyId
+     * @return
+     * @Author sun
+     * @Description 查询组织下人员,组织下部门人员,组织下网格人员列表信息
+     **/
+    @Override
+    public DepartmentStaffListResultDTO departmentStaffList(String agencyId) {
+        //根据组织Id查询该组织的工作人员列表；该组织的部门列表、部门下人员(带部门领导角色)列表；该组织的网格列表、网格下人员(带网格长角色)列表。人员都不做去重处理。
+        DepartmentStaffListResultDTO resultDTO = new DepartmentStaffListResultDTO();
+        //1:根据组织Id查询该组织下工作人员列表
+        List<StaffListResultDTO> agencyStaffList = customerStaffAgencyDao.selectAgencyStaffList(agencyId);
+        //2:根据组织Id查询该组织下部门、人员列表
+        //2.1:查询组织下部门列表
+        List<DepartmentListResultDTO> listDept = customerDepartmentDao.selectDepartmentList(agencyId);
+        List<DeptListResultDTO> departmentList = ConvertUtils.sourceToTarget(listDept, DeptListResultDTO.class);
+        //2.2:查询每一个部门下人员列表
+        List<String> deptIdList = departmentList.stream().map(DeptListResultDTO::getDepartmentId).collect(Collectors.toList());
+        List<CustomerStaffDepartmentDTO> deptStaffs  = customerStaffDepartmentDao.selectDeptStaffs(deptIdList);
+        departmentList.forEach(dept->{
+            List<StaffListResultDTO> departmentStaffList = new ArrayList<>();
+            deptStaffs.forEach(ds->{
+                if(dept.getDepartmentId().equals(ds.getDepartmentId())){
+                    StaffListResultDTO sf = new StaffListResultDTO();
+                    sf.setStaffId(ds.getUserId());
+                    departmentStaffList.add(sf);
+                }
+            });
+            dept.setDepartmentStaffList(departmentStaffList);
+        });
+        //3:根据组织Id查询该组织下网格、人员列表
+        //3.1:查询组织下网格列表
+        List<GridListResultDTO> gridList = customerGridDao.selectGridList(agencyId);
+        //3.2:查询每一个网格下人员列表
+        List<String> gridIdList = gridList.stream().map(GridListResultDTO::getGridId).collect(Collectors.toList());
+        List<CustomerStaffGridDTO> gridStaffs  = customerStaffGridDao.selectGridStaffs(gridIdList);
+        gridList.forEach(grid->{
+            List<StaffListResultDTO> gridStaffList = new ArrayList<>();
+            gridStaffs.forEach(gs->{
+                if(grid.getGridId().equals(gs.getGridId())){
+                    StaffListResultDTO sf = new StaffListResultDTO();
+                    sf.setStaffId(gs.getUserId());
+                    gridStaffList.add(sf);
+                }
+            });
+            grid.setGridStaffList(gridStaffList);
+        });
+        //4:汇总组织下人员、组织下部门下人员、组织下网格下人员Id集合，调用epmet-user服务查询工作人员基本信息
+        List<String> staffIdList1 = agencyStaffList.stream().map(StaffListResultDTO::getStaffId).collect(Collectors.toList());
+        List<String> staffIdList2 = deptStaffs.stream().map(CustomerStaffDepartmentDTO::getUserId).collect(Collectors.toList());
+        List<String> staffIdList3 = gridStaffs.stream().map(CustomerStaffGridDTO::getUserId).collect(Collectors.toList());
+        List<String> staffIdList = new ArrayList<>();
+        staffIdList.addAll(staffIdList1); staffIdList.addAll(staffIdList2); staffIdList.addAll(staffIdList3);
+        staffIdList = new ArrayList<String>(new LinkedHashSet<>(staffIdList));
+        Result<CustomerStaffListResultDTO> userList = epmetUserFeignClient.getCustomerStaffList(staffIdList);
+        //5:循环数据，将人员数据放到对应数据结构下
+        CustomerStaffListResultDTO dto = userList.getData();
+        List<StaffListResultDTO> staffList = dto.getStaffList();
+        List<CustomerStaffRoleResultDTO> roleList = dto.getRoleList();
+        //有时间再优化成jdk8的遍历方式
+        //5.1装载组织下人员数据
+        for(StaffListResultDTO sf : agencyStaffList){
+            //人员信息
+            for(StaffListResultDTO stf : staffList){
+                if(sf.getStaffId().equals(stf.getStaffId())){
+                    sf = ConvertUtils.sourceToTarget(stf, StaffListResultDTO.class);
+                    break;
+                }
+            }
+            //人员角色信息
+            for(CustomerStaffRoleResultDTO role : roleList){
+                if(sf.getStaffId().equals(role.getStaffId())&&CustomerAgencyConstant.AGENCY_LEADER.equals(role.getRoleKey())){
+                    sf.setRoleName(role.getRoleName());
+                    break;
+                }
+            }
+        }
+        //5.2装载组织下部门下人员数据
+        for(DeptListResultDTO dept : departmentList){
+            List<StaffListResultDTO> departmentStaffList = dept.getDepartmentStaffList();
+            for(StaffListResultDTO ds : departmentStaffList){
+                //人员信息
+                for(StaffListResultDTO stf : staffList){
+                    if(ds.getStaffId().equals(stf.getStaffId())){
+                        ds = ConvertUtils.sourceToTarget(stf, StaffListResultDTO.class);
+                        break;
+                    }
+                }
+                //人员角色信息
+                for(CustomerStaffRoleResultDTO role : roleList){
+                    if(ds.getStaffId().equals(role.getStaffId())&&CustomerAgencyConstant.DEPT_LEADER.equals(role.getRoleKey())){
+                        ds.setRoleName(role.getRoleName());
+                        break;
+                    }
+                }
+            }
+        }
+        //5.3装载组织下网格下人员数据
+        for(GridListResultDTO grid : gridList){
+            List<StaffListResultDTO> gridStaffList = grid.getGridStaffList();
+            for(StaffListResultDTO gs : gridStaffList){
+                //人员信息
+                for(StaffListResultDTO stf : staffList){
+                    if(gs.getStaffId().equals(stf.getStaffId())){
+                        gs = ConvertUtils.sourceToTarget(stf, StaffListResultDTO.class);
+                        break;
+                    }
+                }
+                //人员角色信息
+                for(CustomerStaffRoleResultDTO role : roleList){
+                    if(gs.getStaffId().equals(role.getStaffId())&&CustomerAgencyConstant.GRID_MANAGER.equals(role.getRoleKey())){
+                        gs.setRoleName(role.getRoleName());
+                        break;
+                    }
+                }
+            }
+        }
+        resultDTO.setAgencyStaffList(agencyStaffList);
+        resultDTO.setDepartmentList(departmentList);
+        resultDTO.setGridList(gridList);
+        return resultDTO;
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
index 5f40d5c0d8..9723d1e3f0 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
@@ -285,4 +285,14 @@
             AND cg.del_flag = 0
     </select>
 
+    <select id="selectGridList" resultType="com.epmet.dto.result.GridListResultDTO">
+        SELECT
+            id AS "gridId",
+            grid_name AS "gridName"
+        FROM customer_grid
+        WHERE del_flag = '0'
+        AND pid = #{agencyId}
+        ORDER BY created_time DESC
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffAgencyDao.xml
index 9f09e6ab22..0a721b3f77 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffAgencyDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffAgencyDao.xml
@@ -95,6 +95,14 @@
         DEPARTMENT_ID = #{departmentId} )
     </select>
 
-
+    <select id="selectAgencyStaffList" resultType="com.epmet.dto.result.StaffListResultDTO">
+         SELECT
+            user_id AS "staffId"
+        FROM
+            customer_staff_agency
+        WHERE
+            del_flag = '0'
+          AND agency_id =#{agencyId}
+    </select>
 
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffDepartmentDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffDepartmentDao.xml
index 7702cf9aa0..254cbc4ab2 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffDepartmentDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffDepartmentDao.xml
@@ -14,6 +14,20 @@
 
     </select>
 
+    <select id="selectDeptStaffs" resultType="com.epmet.dto.CustomerStaffDepartmentDTO">
+        SELECT
+            department_id,
+            user_id
+        FROM
+            customer_staff_department
+        WHERE
+            del_flag = '0'
+        AND
+        <foreach item="departmentId" collection="deptIdList" open="(" separator="or" close=")">
+            department_id = #{departmentId}
+        </foreach>
+    </select>
+
     <!-- 修改部门人数 -->
     <update id="updateDepartmentStaffCount">
         UPDATE
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml
index 9a4290d11c..1e6501c6bb 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml
@@ -63,6 +63,20 @@
         AND csg.grid_id = #{gridId}
     </select>
 
+    <select id="selectGridStaffs" resultType="com.epmet.dto.CustomerStaffGridDTO">
+        SELECT
+            grid_id,
+            user_id
+        FROM
+            customer_staff_grid
+        WHERE
+            del_flag = '0'
+        AND
+        <foreach item="gridId" collection="gridIdList" open="(" separator="or" close=")">
+            grid_id = #{gridId}
+        </foreach>
+    </select>
+
     <!-- 批量插入网格工作人员 -->
     <insert id="insertBatch" parameterType="java.util.List">
         insert into customer_staff_grid
diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml
index ef9a20e890..1588d4238f 100644
--- a/epmet-module/gov-project/gov-project-server/pom.xml
+++ b/epmet-module/gov-project/gov-project-server/pom.xml
@@ -72,6 +72,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>gov-org-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTraceController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTraceController.java
index 9f2e75ed7f..3f88868a85 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTraceController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTraceController.java
@@ -10,6 +10,7 @@ import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.service.ProjectProcessService;
 import com.epmet.service.ProjectSatisfactionDetailService;
+import com.epmet.service.ProjectStaffService;
 import com.epmet.service.ProjectTraceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -37,6 +38,9 @@ public class ProjectTraceController {
 	@Autowired
 	private ProjectSatisfactionDetailService projectSatisfactionDetailService;
 
+	@Autowired
+	private ProjectStaffService projectStaffService;
+
 	/**
 	 * 待处理项目列表
 	 *
@@ -166,5 +170,18 @@ public class ProjectTraceController {
 		ValidatorUtils.validateEntity(formDTO);
 		return new Result<List<EvaluationListResultDTO>>().ok(projectSatisfactionDetailService.evaluationList(formDTO));
 	}
+
+	/**
+	 * @param formDTO
+	 * @return
+	 * @Author sun
+	 * @Description 项目跟踪-部门人员选择
+	 **/
+	@PostMapping("departmentstafflist")
+	@RequirePermission(requirePermission = RequirePermissionEnum.WORK_PROJECT_TRACE_TRANSFER)
+	public Result<DepartmentStaffListResultDTO> departmentStaffList(@LoginUser TokenDto tokenDTO, @RequestBody DepartmentStaffListFormDTO formDTO) {
+		ValidatorUtils.validateEntity(formDTO);
+		return new Result<DepartmentStaffListResultDTO>().ok(projectStaffService.departmentStaffList(formDTO));
+	}
 }
 
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
index e4ae2ffc95..27a818330e 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
@@ -2,8 +2,12 @@ package com.epmet.feign;
 
 
 import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.result.DepartmentStaffListResultDTO;
 import com.epmet.feign.fallback.GovOrgFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
 
 
 /**
@@ -13,5 +17,13 @@ import org.springframework.cloud.openfeign.FeignClient;
 @FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class)
 public interface GovOrgFeignClient {
 
+    /**
+     * @param agencyId
+     * @return
+     * @Author sun
+     * @Description 查询组织下人员,组织下部门人员,组织下网格人员列表信息
+     **/
+    @PostMapping(value = "/gov/org/customeragency/departmentstafflist/{agencyId}")
+    Result<DepartmentStaffListResultDTO> departmentStaffList(@PathVariable("agencyId") String agencyId);
 
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
index 6eccf9cb4a..b75b3c8b1d 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
@@ -1,5 +1,9 @@
 package com.epmet.feign.fallback;
 
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.result.DepartmentStaffListResultDTO;
 import com.epmet.feign.GovOrgFeignClient;
 import org.springframework.stereotype.Component;
 
@@ -10,4 +14,8 @@ import org.springframework.stereotype.Component;
 @Component
 public class GovOrgFeignClientFallBack implements GovOrgFeignClient {
 
+    @Override
+    public Result<DepartmentStaffListResultDTO> departmentStaffList(String agencyId) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "departmentStaffList", agencyId);
+    }
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectStaffService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectStaffService.java
index 62d3b66965..605cc05f06 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectStaffService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectStaffService.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.ProjectStaffDTO;
+import com.epmet.dto.form.DepartmentStaffListFormDTO;
 import com.epmet.dto.result.DepartmentResultDTO;
+import com.epmet.dto.result.DepartmentStaffListResultDTO;
 import com.epmet.entity.ProjectStaffEntity;
 
 import java.util.List;
@@ -103,4 +105,12 @@ public interface ProjectStaffService extends BaseService<ProjectStaffEntity> {
      * @date 2020/5/12 16:40
      */
     List<DepartmentResultDTO> getDepartmentNameList(ProjectStaffDTO dto);
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 项目跟踪-部门人员选择
+     **/
+    DepartmentStaffListResultDTO departmentStaffList(DepartmentStaffListFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectStaffServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectStaffServiceImpl.java
index bfab5baef5..b6518c8684 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectStaffServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectStaffServiceImpl.java
@@ -20,13 +20,17 @@ 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.FieldConstant;
 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.Result;
 import com.epmet.dao.ProjectStaffDao;
 import com.epmet.dto.ProjectStaffDTO;
+import com.epmet.dto.form.DepartmentStaffListFormDTO;
 import com.epmet.dto.result.DepartmentResultDTO;
+import com.epmet.dto.result.DepartmentStaffListResultDTO;
 import com.epmet.entity.ProjectStaffEntity;
+import com.epmet.feign.GovOrgFeignClient;
 import com.epmet.redis.ProjectStaffRedis;
 import com.epmet.service.ProjectStaffService;
 import org.apache.commons.lang3.StringUtils;
@@ -49,6 +53,8 @@ public class ProjectStaffServiceImpl extends BaseServiceImpl<ProjectStaffDao, Pr
 
     @Autowired
     private ProjectStaffRedis projectStaffRedis;
+    @Autowired
+    private GovOrgFeignClient govOrgFeignClient;
 
     @Override
     public PageData<ProjectStaffDTO> page(Map<String, Object> params) {
@@ -107,4 +113,11 @@ public class ProjectStaffServiceImpl extends BaseServiceImpl<ProjectStaffDao, Pr
         return baseDao.selectDepartmentNameList(dto);
     }
 
+    @Override
+    public DepartmentStaffListResultDTO departmentStaffList(DepartmentStaffListFormDTO formDTO) {
+        //1:调用gov-org服务，分别查询组织下人员，组织下部门人员，组织下网格人员列表信息
+        Result<DepartmentStaffListResultDTO> resultDTOResult = govOrgFeignClient.departmentStaffList(formDTO.getAgencyId());
+        return resultDTOResult.getData();
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java
index ca2bd6d210..375c4abd26 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java
@@ -269,4 +269,15 @@ public class CustomerStaffController {
         ValidatorUtils.validateEntity(userIdList);
         return customerStaffService.getEnableStaffMsgList(userIdList);
     }
+
+    /**
+     * @param staffIdList
+     * @return
+     * @Author sun
+     * @Description 根据staffId集合查询工作人员基础信息
+     **/
+    @PostMapping(value = "getcustomerstafflist")
+    public Result<CustomerStaffListResultDTO> getCustomerStaffList(@RequestBody List<String> staffIdList){
+        return new Result<CustomerStaffListResultDTO>().ok(customerStaffService.getCustomerStaffList(staffIdList));
+    }
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java
index 7b056bfea2..c5dbec183f 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java
@@ -24,6 +24,7 @@ import com.epmet.dto.form.*;
 import com.epmet.dto.result.DepartInStaffListResultDTO;
 import com.epmet.dto.result.StaffInfoResultDTO;
 import com.epmet.dto.result.CommonStaffInfoResultDTO;
+import com.epmet.dto.result.StaffListResultDTO;
 import com.epmet.entity.CustomerStaffEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -123,4 +124,12 @@ public interface CustomerStaffDao extends BaseDao<CustomerStaffEntity> {
      * @Date 2020.04.24 15:34
      **/
     List<CommonStaffInfoResultDTO>  selectEnableStaffMsg(@Param("userIds") List<String> userIds,@Param("customerId")String customerId);
+
+	/**
+	 * @param staffIdList
+	 * @return
+	 * @Author sun
+	 * @Description 根据staffId集合查询工作人员基础信息
+	 **/
+    List<StaffListResultDTO>  selectStaffByIds(@Param("staffIdList") List<String> staffIdList);
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffRoleDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffRoleDao.java
index 8f1f6a9d5b..c7e1be6e9c 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffRoleDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffRoleDao.java
@@ -22,7 +22,9 @@ import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.commons.mybatis.entity.DataScope;
 import com.epmet.dto.StaffRoleDTO;
 import com.epmet.dto.form.CommonUserFormDTO;
+import com.epmet.dto.result.CustomerStaffRoleResultDTO;
 import com.epmet.dto.result.GovStaffRoleResultDTO;
+import com.epmet.dto.result.StaffListResultDTO;
 import com.epmet.dto.result.StaffRolesResultDTO;
 import com.epmet.entity.StaffRoleEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -76,4 +78,11 @@ public interface StaffRoleDao extends BaseDao<StaffRoleEntity> {
     **/
     List<String> selectSpecificRolesStaffs(@Param("roleKeys")List<String> roleKeys,@Param("userIds")List<String> userIds,@Param("customerId")String customerId);
 
+    /**
+     * @param staffIdList
+     * @return
+     * @Author sun
+     * @Description 根据staffId集合查询人员拥有的所有角色信息
+     **/
+    List<CustomerStaffRoleResultDTO>  selectStaffRoleList(@Param("staffIdList") List<String> staffIdList);
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java
index 331cbf7223..cddd2a8c9a 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java
@@ -223,4 +223,12 @@ public interface CustomerStaffService extends BaseService<CustomerStaffEntity> {
 	 * @Date 2020.04.24 15:44
 	 **/
 	Result<List<CommonStaffInfoResultDTO>> getEnableStaffMsgList(CommonUserIdListFormDTO userIdList);
+
+	/**
+	 * @param staffIdList
+	 * @return
+	 * @Author sun
+	 * @Description 根据staffId集合查询工作人员基础信息
+	 **/
+	CustomerStaffListResultDTO getCustomerStaffList(List<String> staffIdList);
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
index e6d681851e..518697e1f6 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
@@ -31,6 +31,7 @@ import com.epmet.constant.CustomerStaffConstant;
 import com.epmet.constant.UserConstant;
 import com.epmet.constant.UserRoleConstant;
 import com.epmet.dao.CustomerStaffDao;
+import com.epmet.dao.StaffRoleDao;
 import com.epmet.dto.*;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
@@ -91,6 +92,8 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 	private UserService userService;
 	@Autowired
 	private StaffRoleService staffRoleService;
+	@Autowired
+	private StaffRoleDao staffRoleDao;
 
 	@Override
 	public PageData<CustomerStaffDTO> page(Map<String, Object> params) {
@@ -419,4 +422,22 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 		return new Result<List<CommonStaffInfoResultDTO>>().ok(baseDao.selectEnableStaffMsg(userIdList.getUserIdList(), userIdList.getCustomerId()));
 	}
 
+	/**
+	 * @param staffIdList
+	 * @return
+	 * @Author sun
+	 * @Description 根据staffId集合查询工作人员基础信息
+	 **/
+	@Override
+	public CustomerStaffListResultDTO getCustomerStaffList(List<String> staffIdList) {
+		//1:批量查询人员基本信息
+		List<StaffListResultDTO> staffList = baseDao.selectStaffByIds(staffIdList);
+		//2:批量查询人员拥有的所有角色信息
+		List<CustomerStaffRoleResultDTO> roleList = staffRoleDao.selectStaffRoleList(staffIdList);
+		CustomerStaffListResultDTO list = new CustomerStaffListResultDTO();
+		list.setStaffList(staffList);
+		list.setRoleList(roleList);
+		return list;
+	}
+
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
index 6fbcd71df4..9b1dbc5c54 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
@@ -179,4 +179,20 @@
                 #{userId}
             </foreach>
     </select>
+
+    <select id="selectStaffByIds" resultType="com.epmet.dto.result.StaffListResultDTO">
+        SELECT
+            user_id AS staffId,
+            IFNULL(real_name,"") AS staffName,
+            IFNULL(head_photo,"") AS staffHeadPhoto ,
+            IFNULL(gender,0) AS gender
+        FROM
+            customer_staff
+        WHERE
+            del_flag = '0'
+        AND
+        <foreach item="userId" collection="staffIdList" separator="or" open="(" close=")" index="">
+            user_id = #{userId}
+        </foreach>
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml
index 518b6ed7d8..e7a2ce2fa9 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml
@@ -102,4 +102,21 @@
             </if>
         </where>
     </select>
+
+    <select id="selectStaffRoleList" resultType="com.epmet.dto.result.CustomerStaffRoleResultDTO">
+        SELECT
+            sr.staff_id AS "staffId",
+            gsr.role_key AS "roleKey",
+            gsr.role_name AS "roleName"
+        FROM
+            staff_role sr
+        INNER JOIN gov_staff_role gsr ON sr.role_id = gsr.id
+        WHERE
+            sr.del_flag = '0'
+        AND gsr.del_flag = '0'
+        AND
+        <foreach item="staffId" collection="staffIdList" separator="or" open="(" close=")" index="">
+            sr.staff_id = #{staffId}
+        </foreach>
+    </select>
 </mapper>
\ No newline at end of file

From bcbcc0d822ca042573fe61ee165afc3f5d431465 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Wed, 13 May 2020 16:10:11 +0800
Subject: [PATCH 35/45] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=A1=88?=
 =?UTF-8?q?=EF=BC=8C=E9=80=80=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/ProjectDTO.java   |   5 +
 .../java/com/epmet/dto/ProjectStaffDTO.java   |   2 +-
 .../epmet/dto/form/ProjectClosedFromDTO.java  |  17 +++
 .../com/epmet/dto/form/ReturnFromDTO.java     |  17 +++
 .../dto/result/CreatedListResultDTO.java      |   8 ++
 .../dto/result/InvolvedListResultDTO.java     |   8 ++
 .../dto/result/ProjectDetailResultDTO.java    |   5 +
 .../java/com/epmet/dao/ProjectProcessDao.java |   2 +
 .../java/com/epmet/dao/ProjectStaffDao.java   |  10 ++
 .../epmet/entity/ProjectProcessEntity.java    |   5 -
 .../com/epmet/entity/ProjectStaffEntity.java  |   2 +-
 .../com/epmet/feign/EpmetUserFeignClient.java |  10 ++
 .../com/epmet/feign/GovOrgFeignClient.java    |   9 ++
 .../EpmetUserFeignClientFallBack.java         |   7 ++
 .../fallback/GovOrgFeignClientFallBack.java   |   8 ++
 .../epmet/service/ProjectProcessService.java  |  11 ++
 .../com/epmet/service/ProjectService.java     |  20 ++++
 .../epmet/service/ProjectStaffService.java    |  10 ++
 .../impl/ProjectProcessServiceImpl.java       |  39 +++++++
 .../service/impl/ProjectServiceImpl.java      | 105 +++++++++++++++++-
 .../service/impl/ProjectStaffServiceImpl.java |   5 +
 .../service/impl/ProjectTraceServiceImpl.java |  14 ++-
 .../src/main/resources/mapper/ProjectDao.xml  |  86 +++++++++-----
 .../resources/mapper/ProjectProcessDao.xml    |  11 +-
 .../main/resources/mapper/ProjectStaffDao.xml |   8 ++
 .../resi-hall-client/resi-hall-client.iml     |   4 +-
 .../resi-hall-server/resi-hall-server.iml     |   4 +-
 epmet-module/resi-hall/resi-hall.iml          |   4 +-
 .../resources/mapper/CustomerStaffDao.xml     |   5 +-
 29 files changed, 384 insertions(+), 57 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectDTO.java
index d2c8daf6ed..356bff7769 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectDTO.java
@@ -63,6 +63,11 @@ public class ProjectDTO implements Serializable {
      */
 	private String status;
 
+	/**
+	 * 结案说明
+	 */
+	private String publicReply;
+
     /**
      * 结案状态：已解决 resolved，未解决 unresolved
      */
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectStaffDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectStaffDTO.java
index ea0ef88350..7e4e7d2dce 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectStaffDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectStaffDTO.java
@@ -84,7 +84,7 @@ public class ProjectStaffDTO implements Serializable {
 	private String departmentName;
 
     /**
-     * 是否处理：未处理unhandle，已处理handle
+     * 是否处理：未处理unhandled，已处理handle
      */
 	private String isHandle;
 
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectClosedFromDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectClosedFromDTO.java
index 29f755243b..4b9e9a5ff6 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectClosedFromDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectClosedFromDTO.java
@@ -1,7 +1,9 @@
 package com.epmet.dto.form;
 
 import lombok.Data;
+import org.hibernate.validator.constraints.Length;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
@@ -13,6 +15,10 @@ import java.io.Serializable;
 public class ProjectClosedFromDTO implements Serializable {
 
 	private static final long serialVersionUID = -7383213527369892832L;
+	/**
+	 * 用户Id
+	 */
+	private String userId;
 	/**
 	 * 项目Id
 	 */
@@ -24,9 +30,20 @@ public class ProjectClosedFromDTO implements Serializable {
 	/**
 	 * 公开答复内容
 	 */
+	@NotBlank(message = "结案说明不能为空")
+	@Length(max = 1000, message = "结案说明不能超过1000个字符")
 	private String publicReply;
 	/**
 	 * 内部备注内容
 	 */
+	@Length(max = 1000, message = "内部备注不能超过1000个字符")
 	private String internalRemark;
+	/**
+	 * 项目人员关联表ID
+	 */
+	private String projectStaffId;
+	/**
+	 * 部门名
+	 */
+	private String departmentName;
 }
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReturnFromDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReturnFromDTO.java
index 12ec7137d1..8b36b5ddcd 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReturnFromDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReturnFromDTO.java
@@ -1,7 +1,9 @@
 package com.epmet.dto.form;
 
 import lombok.Data;
+import org.hibernate.validator.constraints.Length;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
@@ -13,6 +15,10 @@ import java.io.Serializable;
 public class ReturnFromDTO implements Serializable {
 
 	private static final long serialVersionUID = -8747667324909671154L;
+	/**
+	 * 用户Id
+	 */
+	private String userId;
 	/**
 	 * 项目Id
 	 */
@@ -24,9 +30,20 @@ public class ReturnFromDTO implements Serializable {
 	/**
 	 * 公开答复内容
 	 */
+	@Length(max = 1000, message = "公开答复不能超过1000个字符")
 	private String publicReply;
 	/**
 	 * 内部流转意见
 	 */
+	@NotBlank(message = "内部备注不能为空")
+	@Length(max = 1000, message = "内部备注不能超过1000个字符")
 	private String internalRemark;
+	/**
+	 * 项目人员关联表ID
+	 */
+	private String projectStaffId;
+	/**
+	 * 部门名
+	 */
+	private String departmentName;
 }
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/CreatedListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/CreatedListResultDTO.java
index 3481754cba..ed225dc760 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/CreatedListResultDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/CreatedListResultDTO.java
@@ -22,6 +22,14 @@ public class CreatedListResultDTO implements Serializable {
 	 * 项目标题
 	 */
 	private String projectTitle;
+	/**
+	 * 项目状态
+	 */
+	private String projectStatus;
+	/**
+	 * 结案说明
+	 */
+	private String publicReply;
 	/**
 	 * 项目创建时间
 	 */
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/InvolvedListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/InvolvedListResultDTO.java
index 39c552f9e5..1d22d0b0b3 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/InvolvedListResultDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/InvolvedListResultDTO.java
@@ -22,6 +22,14 @@ public class InvolvedListResultDTO implements Serializable {
 	 * 项目标题
 	 */
 	private String projectTitle;
+	/**
+	 * 项目状态
+	 */
+	private String projectStatus;
+	/**
+	 * 结案说明
+	 */
+	private String publicReply;
 	/**
 	 * 创建时间
 	 */
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDetailResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDetailResultDTO.java
index 9c9425d36f..f44973bcea 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDetailResultDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDetailResultDTO.java
@@ -3,6 +3,7 @@ package com.epmet.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @author zhaoqifeng
@@ -45,5 +46,9 @@ public class ProjectDetailResultDTO implements Serializable {
 	 * 处理状态(是否由我处理)
 	 */
 	private Boolean processable;
+	/**
+	 * 当前跟进部门
+	 */
+	private List<String> departmentNameList;
 
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectProcessDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectProcessDao.java
index 825918297a..71f0b72b72 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectProcessDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectProcessDao.java
@@ -41,4 +41,6 @@ public interface ProjectProcessDao extends BaseDao<ProjectProcessEntity> {
      * @Description 根据项目Id查询项目处理进展列表
      **/
     List<ProcesslistResultDTO> getProcessListByProjectId(@Param("projectId") String projectId);
+
+    List<ProjectProcessEntity> selectReturnableList(@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/dao/ProjectStaffDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectStaffDao.java
index b93b670473..27b5165246 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectStaffDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectStaffDao.java
@@ -22,6 +22,7 @@ import com.epmet.dto.ProjectStaffDTO;
 import com.epmet.dto.result.DepartmentResultDTO;
 import com.epmet.entity.ProjectStaffEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -43,5 +44,14 @@ public interface ProjectStaffDao extends BaseDao<ProjectStaffEntity> {
 	 * @date 2020/5/12 16:40
 	 */
 	List<DepartmentResultDTO> selectDepartmentNameList(ProjectStaffDTO dto);
+	
+	/**
+	 * 获取节点处理人信息
+	 * @author zhaoqifeng
+	 * @date 2020/5/13 15:08
+	 * @param processId
+	 * @return com.epmet.dto.ProjectStaffDTO
+	 */
+	ProjectStaffDTO selectProjectStaffInfo(@Param("processId") String processId);
 
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java
index 0890e5dec8..e9ae924698 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java
@@ -43,11 +43,6 @@ public class ProjectProcessEntity extends BaseEpmetEntity {
      */
 	private String projectId;
 
-	/**
-	 * 项目处理进展ID
-	 */
-	private String processId;
-
 	/**
 	 * 部门名
 	 */
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectStaffEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectStaffEntity.java
index dc8e798090..3184a68a34 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectStaffEntity.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectStaffEntity.java
@@ -79,7 +79,7 @@ public class ProjectStaffEntity extends BaseEpmetEntity {
 	private String departmentName;
 
     /**
-     * 是否处理：未处理unhandle，已处理handle
+     * 是否处理：未处理unhandled，已处理handle
      */
 	private String isHandle;
 
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
index 11f0f28937..bf4458e68b 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
@@ -2,7 +2,9 @@ package com.epmet.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.StaffsInAgencyFromDTO;
 import com.epmet.dto.form.UserResiInfoListFormDTO;
+import com.epmet.dto.result.StaffInfoResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.feign.fallback.EpmetUserFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -26,4 +28,12 @@ public interface EpmetUserFeignClient {
      **/
     @PostMapping("/epmetuser/userresiinfo/getuserresiinfolist")
     Result<List<UserResiInfoResultDTO>> getUserResiInfoList(@RequestBody UserResiInfoListFormDTO userResiInfoListFormDTO);
+
+    /**
+     * 工作人员列表
+     * @param fromDTO
+     * @return
+     */
+    @PostMapping("/epmetuser/customerstaff/stafflist")
+    Result<List<StaffInfoResultDTO>> getStaffList(@RequestBody StaffsInAgencyFromDTO fromDTO);
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
index 27a818330e..503ee6d58c 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
@@ -3,6 +3,8 @@ package com.epmet.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.CustomerAgencyDTO;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.result.DepartmentStaffListResultDTO;
 import com.epmet.feign.fallback.GovOrgFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -17,6 +19,13 @@ import org.springframework.web.bind.annotation.PostMapping;
 @FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class)
 public interface GovOrgFeignClient {
 
+	/**
+	 * 根据Id查询agency
+	 * @param agencyId
+	 * @return
+	 */
+	@PostMapping("/gov/org/agency/agencybyid/{agencyId}")
+	Result<CustomerAgencyDTO> getAgencyById(@PathVariable("agencyId") String agencyId);
     /**
      * @param agencyId
      * @return
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
index 88e9590eaf..94a52d75f0 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
@@ -3,7 +3,9 @@ package com.epmet.feign.fallback;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.StaffsInAgencyFromDTO;
 import com.epmet.dto.form.UserResiInfoListFormDTO;
+import com.epmet.dto.result.StaffInfoResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.feign.EpmetUserFeignClient;
 import org.springframework.stereotype.Component;
@@ -21,4 +23,9 @@ public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
     public Result<List<UserResiInfoResultDTO>> getUserResiInfoList(UserResiInfoListFormDTO userResiInfoListFormDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserResiInfoList", userResiInfoListFormDTO);
     }
+
+    @Override
+    public Result<List<StaffInfoResultDTO>> getStaffList(StaffsInAgencyFromDTO fromDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffList", fromDTO);
+    }
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
index b75b3c8b1d..318975d5c9 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
@@ -1,5 +1,9 @@
 package com.epmet.feign.fallback;
 
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -14,6 +18,10 @@ import org.springframework.stereotype.Component;
 @Component
 public class GovOrgFeignClientFallBack implements GovOrgFeignClient {
 
+	@Override
+	public Result<CustomerAgencyDTO> getAgencyById(String agencyId) {
+		return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getAgencyById", agencyId);
+	}
     @Override
     public Result<DepartmentStaffListResultDTO> departmentStaffList(String agencyId) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "departmentStaffList", agencyId);
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectProcessService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectProcessService.java
index ce4889776a..ebfc0e83ca 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectProcessService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectProcessService.java
@@ -21,7 +21,9 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.ProjectProcessDTO;
 import com.epmet.dto.form.ProcessListFormDTO;
+import com.epmet.dto.form.ReturnListFromDTO;
 import com.epmet.dto.result.ProcesslistResultDTO;
+import com.epmet.dto.result.ReturnListResultDTO;
 import com.epmet.entity.ProjectProcessEntity;
 
 import java.util.List;
@@ -102,4 +104,13 @@ public interface ProjectProcessService extends BaseService<ProjectProcessEntity>
      * @Description 项目跟踪-项目处理进展列表
      **/
     List<ProcesslistResultDTO> progressList(ProcessListFormDTO formDTO);
+
+    /**
+     * 可退回节点列表
+     * @author zhaoqifeng
+     * @date 2020/5/13 13:42
+     * @param fromDTO
+     * @return java.util.List<com.epmet.dto.result.ReturnListResultDTO>
+     */
+    List<ReturnListResultDTO> getReturnableList(ReturnListFromDTO fromDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java
index 99e0b34b68..cb39927bf0 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java
@@ -21,8 +21,10 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.ProjectDTO;
+import com.epmet.dto.form.ProjectClosedFromDTO;
 import com.epmet.dto.form.ProjectDetailFromDTO;
 import com.epmet.dto.form.ProjectListFromDTO;
+import com.epmet.dto.form.ReturnFromDTO;
 import com.epmet.dto.result.CreatedListResultDTO;
 import com.epmet.dto.result.InvolvedListResultDTO;
 import com.epmet.dto.result.PendProjectListResultDTO;
@@ -139,4 +141,22 @@ public interface ProjectService extends BaseService<ProjectEntity> {
 	 * @date 2020/5/12 15:13
 	 */
 	ProjectDetailResultDTO getProjectDetail(ProjectDetailFromDTO fromDTO);
+
+	/**
+	 * 项目结案
+	 * @author zhaoqifeng
+	 * @date 2020/5/13 9:54
+	 * @param fromDTO 参数
+	 * @return void
+	 */
+	void closed(ProjectClosedFromDTO fromDTO);
+
+	/**
+	 * 项目退回
+	 * @author zhaoqifeng
+	 * @date 2020/5/13 14:35
+	 * @param fromDTO 参数
+	 * @return void
+	 */
+	void projectReturn(ReturnFromDTO fromDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectStaffService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectStaffService.java
index 605cc05f06..ba73f3a7de 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectStaffService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectStaffService.java
@@ -22,6 +22,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.ProjectStaffDTO;
 import com.epmet.dto.form.DepartmentStaffListFormDTO;
 import com.epmet.dto.result.DepartmentResultDTO;
+import com.epmet.entity.ProjectProcessEntity;
 import com.epmet.dto.result.DepartmentStaffListResultDTO;
 import com.epmet.entity.ProjectStaffEntity;
 
@@ -106,6 +107,15 @@ public interface ProjectStaffService extends BaseService<ProjectStaffEntity> {
      */
     List<DepartmentResultDTO> getDepartmentNameList(ProjectStaffDTO dto);
 
+    /**
+     * 获取节点处理人信息
+     * @author zhaoqifeng
+     * @date 2020/5/13 15:06
+     * @param projectProcessId 项目处理进展ID
+     * @return com.epmet.dto.ProjectStaffDTO
+     */
+    ProjectStaffDTO getProjectStaffInfo(String projectProcessId);
+
     /**
      * @param formDTO
      * @return
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
index 6c45ca75e9..78ea0dc5b0 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
@@ -23,21 +23,31 @@ 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.commons.tools.utils.Result;
 import com.epmet.dao.ProjectProcessDao;
 import com.epmet.dao.ProjectStaffDao;
+import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.ProjectProcessDTO;
 import com.epmet.dto.form.ProcessListFormDTO;
+import com.epmet.dto.form.ReturnListFromDTO;
+import com.epmet.dto.form.StaffsInAgencyFromDTO;
 import com.epmet.dto.result.ProcesslistResultDTO;
+import com.epmet.dto.result.ReturnListResultDTO;
+import com.epmet.dto.result.StaffInfoResultDTO;
+import com.epmet.entity.ProjectEntity;
 import com.epmet.entity.ProjectProcessEntity;
+import com.epmet.feign.EpmetUserFeignClient;
 import com.epmet.feign.GovOrgFeignClient;
 import com.epmet.redis.ProjectProcessRedis;
 import com.epmet.service.ProjectProcessService;
+import com.epmet.service.ProjectService;
 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.*;
+import java.util.stream.Collectors;
 
 /**
  * 项目处理进展表
@@ -54,6 +64,10 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
     private ProjectStaffDao projectStaffDao;
     @Autowired
     private GovOrgFeignClient govOrgFeignClient;
+    @Autowired
+    private EpmetUserFeignClient epmetUserFeignClient;
+    @Autowired
+    private ProjectService projectService;
 
     @Override
     public PageData<ProjectProcessDTO> page(Map<String, Object> params) {
@@ -119,4 +133,29 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
         return  baseDao.getProcessListByProjectId(formDTO.getProjectId());
     }
 
+    @Override
+    public List<ReturnListResultDTO> getReturnableList(ReturnListFromDTO fromDTO) {
+        List<ProjectProcessEntity> list = baseDao.selectReturnableList(fromDTO.getProjectId());
+        //遍历获取所有的userId
+        List<String> userIds = list.stream().map(ProjectProcessEntity::getStaffId).collect(Collectors.toList());
+        //获取项目信息
+        ProjectEntity projectEntity = projectService.selectById(fromDTO.getProjectId());
+        //获取组织信息
+        Result<CustomerAgencyDTO> customerAgency = govOrgFeignClient.getAgencyById(projectEntity.getAgencyId());
+        //获取人员信息
+        StaffsInAgencyFromDTO  staffsInAgencyFromDTO = new StaffsInAgencyFromDTO();
+        staffsInAgencyFromDTO.setCustomerId(customerAgency.getData().getCustomerId());
+        staffsInAgencyFromDTO.setStaffList(userIds);
+        List<StaffInfoResultDTO> staffList = epmetUserFeignClient.getStaffList(staffsInAgencyFromDTO).getData();
+        //合成返回值
+        List<ReturnListResultDTO> resultList =
+                list.stream().flatMap(process -> staffList.stream().filter(staff -> process.getStaffId().equals(staff.getStaffId())).map(userInfo ->{
+                    ReturnListResultDTO resultDTO = new ReturnListResultDTO();
+                    resultDTO.setProjectProcessId(process.getId());
+                    resultDTO.setProcessor(process.getDepartmentName().concat("-").concat(userInfo.getStaffName()));
+                    return resultDTO;
+                })).collect(Collectors.toList());
+        return resultList;
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
index fcb7ee4416..a9aa55a296 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
@@ -20,6 +20,7 @@ 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;
@@ -30,14 +31,15 @@ import com.epmet.dao.ProjectDao;
 import com.epmet.dto.CustomerProjectParameterDTO;
 import com.epmet.dto.ProjectDTO;
 import com.epmet.dto.ProjectStaffDTO;
-import com.epmet.dto.form.ProjectDetailFromDTO;
-import com.epmet.dto.form.ProjectListFromDTO;
-import com.epmet.dto.form.WorkDayFormDTO;
+import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.ProjectEntity;
+import com.epmet.entity.ProjectProcessEntity;
+import com.epmet.entity.ProjectStaffEntity;
 import com.epmet.feign.CommonFeignClient;
 import com.epmet.redis.ProjectRedis;
 import com.epmet.service.CustomerProjectParameterService;
+import com.epmet.service.ProjectProcessService;
 import com.epmet.service.ProjectService;
 import com.epmet.service.ProjectStaffService;
 import org.apache.commons.lang3.StringUtils;
@@ -65,6 +67,8 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	private CommonFeignClient commonFeignClient;
 	@Autowired
 	private ProjectStaffService projectStaffService;
+	@Autowired
+	private ProjectProcessService projectProcessService;
 
 	private final static String ONE_DAY = "<1";
 
@@ -124,6 +128,10 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	public List<PendProjectListResultDTO> getPendProjectList(ProjectListFromDTO fromDTO) {
 		List<PendProjectListResultDTO> list = new ArrayList<>();
 
+		//查询条件
+		int pageIndex = (fromDTO.getPageNo() - NumConstant.ONE) * fromDTO.getPageSize();
+		fromDTO.setPageNo(pageIndex);
+
 		List<ProjectDTO> projectList = baseDao.selectPendList(fromDTO);
 		//获取客户定制的可滞留天数
 		Integer finalDays = getDays(fromDTO);
@@ -149,6 +157,11 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	@Override
 	public List<CreatedListResultDTO> getCreatedList(ProjectListFromDTO fromDTO) {
 		List<CreatedListResultDTO> list = new ArrayList<>();
+
+		//查询条件
+		int pageIndex = (fromDTO.getPageNo() - NumConstant.ONE) * fromDTO.getPageSize();
+		fromDTO.setPageNo(pageIndex);
+
 		List<ProjectDTO> projectList = baseDao.selectCreatedList(fromDTO);
 		//获取客户定制的可滞留天数
 		Integer finalDays = getDays(fromDTO);
@@ -156,6 +169,8 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			CreatedListResultDTO created = new CreatedListResultDTO();
 			created.setProjectId(p.getId());
 			created.setProjectTitle(p.getTitle());
+			created.setProjectStatus(p.getStatus());
+			created.setPublicReply(p.getPublicReply());
 			created.setProjectTime(p.getCreatedTime().getTime());
 			String detentionDays = getDetentionDays(p);
 			if (!ONE_DAY.equals(detentionDays) && Integer.parseInt(detentionDays) > finalDays) {
@@ -181,6 +196,11 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	@Override
 	public List<InvolvedListResultDTO> getInvolvedList(ProjectListFromDTO fromDTO) {
 		List<InvolvedListResultDTO> list = new ArrayList<>();
+
+		//查询条件
+		int pageIndex = (fromDTO.getPageNo() - NumConstant.ONE) * fromDTO.getPageSize();
+		fromDTO.setPageNo(pageIndex);
+
 		List<ProjectDTO> projectList = baseDao.selectCreatedList(fromDTO);
 		//获取客户定制的可滞留天数
 		Integer finalDays = getDays(fromDTO);
@@ -188,6 +208,8 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			InvolvedListResultDTO involved = new InvolvedListResultDTO();
 			involved.setProjectId(p.getId());
 			involved.setProjectTitle(p.getTitle());
+			involved.setProjectStatus(p.getStatus());
+			involved.setPublicReply(p.getPublicReply());
 			involved.setProjectTime(p.getCreatedTime().getTime());
 			String detentionDays = getDetentionDays(p);
 			if (!ONE_DAY.equals(detentionDays) && Integer.parseInt(detentionDays) > finalDays) {
@@ -228,13 +250,84 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			}
 		}
 
+		//获取当前跟进部门
+		List<String> departmentNameList = new ArrayList<>();
+		if (ProjectConstant.CLOSED.equals(resultDTO.getProjectStatus())) {
+			//项目已结案，跟进部门为空
+			resultDTO.setDepartmentNameList(departmentNameList);
+		} else {
+			//项目未结案，找出所有跟进部门
+			ProjectDTO projectDTO = new ProjectDTO();
+			projectDTO.setId(fromDTO.getProjectId());
+			departmentNameList = baseDao.selectDepartmentNameList(projectDTO);
+			resultDTO.setDepartmentNameList(departmentNameList);
+		}
+
 		return resultDTO;
 	}
 
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void closed(ProjectClosedFromDTO fromDTO) {
+		//更新项目表状态
+		ProjectEntity projectEntity = baseDao.selectById(fromDTO.getProjectId());
+		projectEntity.setStatus(ProjectConstant.CLOSED);
+		projectEntity.setClosedStatus(fromDTO.getClosedStatus());
+		baseDao.updateById(projectEntity);
+
+		//更新项目关联表
+		ProjectStaffEntity projectStaffEntity = new ProjectStaffEntity();
+		projectStaffEntity.setId(fromDTO.getProjectStaffId());
+		projectStaffEntity.setIsHandle(ProjectConstant.HANDLE);
+		projectStaffService.updateById(projectStaffEntity);
+
+		//结案记录加入项目进展表
+		ProjectProcessEntity projectProcessEntity = new ProjectProcessEntity();
+		projectProcessEntity.setProjectId(fromDTO.getProjectId());
+		projectProcessEntity.setDepartmentName(fromDTO.getDepartmentName());
+		projectProcessEntity.setEndTime(new Date());
+		projectProcessEntity.setOperation(ProjectConstant.OPERATION_CLOSE);
+		projectProcessEntity.setOperationName(ProjectConstant.OPERATION_CLOSE_NAME);
+		projectProcessEntity.setPublicReply(fromDTO.getPublicReply());
+		projectProcessEntity.setInternalRemark(fromDTO.getInternalRemark());
+		projectProcessEntity.setStaffId(fromDTO.getUserId());
+		projectProcessEntity.setCostWorkdays(getDetentionDays(ConvertUtils.sourceToTarget(projectEntity, ProjectDTO.class)));
+		projectProcessService.insert(projectProcessEntity);
+	}
+
+	@Override
+	public void projectReturn(ReturnFromDTO fromDTO) {
+		//更新项目关联表
+		ProjectStaffEntity projectStaffEntity = new ProjectStaffEntity();
+		projectStaffEntity.setId(fromDTO.getProjectStaffId());
+		projectStaffEntity.setIsHandle(ProjectConstant.HANDLE);
+		projectStaffService.updateById(projectStaffEntity);
+
+		//结案记录加入项目进展表
+		ProjectProcessEntity projectProcessEntity = new ProjectProcessEntity();
+		projectProcessEntity.setProjectId(fromDTO.getProjectId());
+		projectProcessEntity.setDepartmentName(fromDTO.getDepartmentName());
+		projectProcessEntity.setOperation(ProjectConstant.OPERATION_RETURN);
+		projectProcessEntity.setOperationName(ProjectConstant.OPERATION_RETURN_NAME);
+		projectProcessEntity.setPublicReply(fromDTO.getPublicReply());
+		projectProcessEntity.setInternalRemark(fromDTO.getInternalRemark());
+		projectProcessEntity.setStaffId(fromDTO.getUserId());
+		projectProcessService.insert(projectProcessEntity);
+
+		//将人员关系添加到项目关联表
+		ProjectStaffDTO projectStaffDTO = projectStaffService.getProjectStaffInfo(fromDTO.getProjectProcessId());
+		ProjectStaffEntity projectStaff = ConvertUtils.sourceToTarget(projectStaffDTO, ProjectStaffEntity.class);
+		projectStaff.setId(null);
+		projectStaff.setIsHandle(ProjectConstant.UNHANDLED);
+		projectStaffService.insert(projectStaff);
+
+		//TODO 通知
+	}
+
 	/**
 	 * 获取客户定制的可滞留天数
 	 *
-	 * @param fromDTO
+	 * @param fromDTO 参数
 	 * @return java.lang.Integer
 	 * @author zhaoqifeng
 	 * @date 2020/5/12 16:20
@@ -255,7 +348,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	/**
 	 * 工作日计算
 	 *
-	 * @param projectDTO
+	 * @param projectDTO 参数
 	 * @return java.lang.String
 	 * @author zhaoqifeng
 	 * @date 2020/5/12 16:20
@@ -266,7 +359,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		List<WorkDayFormDTO> list = new ArrayList<>();
 		WorkDayFormDTO workDayFormDTO = new WorkDayFormDTO();
 		workDayFormDTO.setId(projectDTO.getId());
-		workDayFormDTO.setStartDate(format.format(projectDTO.getCreatedTime()));
+		workDayFormDTO.setStartDate(format.format(projectDTO.getUpdatedTime()));
 		workDayFormDTO.setEndDate(format.format(new Date()));
 		Result<List<WorkDayResultDTO>> detentionDays = commonFeignClient.detentionDays(list);
 		return detentionDays.getData().get(0).getDetentionDays();
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectStaffServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectStaffServiceImpl.java
index b6518c8684..03b6c60045 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectStaffServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectStaffServiceImpl.java
@@ -113,6 +113,11 @@ public class ProjectStaffServiceImpl extends BaseServiceImpl<ProjectStaffDao, Pr
         return baseDao.selectDepartmentNameList(dto);
     }
 
+    @Override
+    public ProjectStaffDTO getProjectStaffInfo(String projectProcessId) {
+        return baseDao.selectProjectStaffInfo(projectProcessId);
+    }
+
     @Override
     public DepartmentStaffListResultDTO departmentStaffList(DepartmentStaffListFormDTO formDTO) {
         //1:调用gov-org服务，分别查询组织下人员，组织下部门人员，组织下网格人员列表信息
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java
index d7ff474a5d..69448b017a 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java
@@ -3,6 +3,7 @@ package com.epmet.service.impl;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
+import com.epmet.service.ProjectProcessService;
 import com.epmet.service.ProjectService;
 import com.epmet.service.ProjectTraceService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,6 +20,8 @@ import java.util.List;
 public class ProjectTraceServiceImpl implements ProjectTraceService {
 	@Autowired
 	private ProjectService projectService;
+	@Autowired
+	private ProjectProcessService projectProcessService;
 
 	@Override
 	public List<PendProjectListResultDTO> getPendProjectList(TokenDto tokenDto, ProjectListFromDTO fromDTO) {
@@ -40,21 +43,24 @@ public class ProjectTraceServiceImpl implements ProjectTraceService {
 
 	@Override
 	public ProjectDetailResultDTO getProjectDetail(TokenDto tokenDto, ProjectDetailFromDTO fromDTO) {
-		return null;
+		fromDTO.setProjectId(tokenDto.getUserId());
+		return projectService.getProjectDetail(fromDTO);
 	}
 
 	@Override
 	public void closed(TokenDto tokenDto, ProjectClosedFromDTO fromDTO) {
-
+		fromDTO.setUserId(tokenDto.getUserId());
+		projectService.closed(fromDTO);
 	}
 
 	@Override
 	public List<ReturnListResultDTO> getReturnableList(ReturnListFromDTO fromDTO) {
-		return null;
+		return projectProcessService.getReturnableList(fromDTO);
 	}
 
 	@Override
 	public void projectReturn(TokenDto tokenDto, ReturnFromDTO fromDTO) {
-
+		fromDTO.setUserId(tokenDto.getUserId());
+		projectService.projectReturn(fromDTO);
 	}
 }
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 9b8fd485ff..e7cc041e78 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
@@ -23,7 +23,8 @@
         SELECT distinct
             p.ID,
             p.TITLE,
-            psp.CREATED_TIME
+            p.CREATED_TIME,
+            psp.CREATED_TIME AS UPDATED_TIME
         FROM project p
                  INNER JOIN (SELECT
                                  ps.PROJECT_ID,
@@ -37,51 +38,76 @@
                              GROUP BY ps.PROJECT_ID) psp ON p.ID = psp.PROJECT_ID
         WHERE p.DEL_FLAG = '0'
         AND p.status = 'pending'
-        ORDER BY psp.CREATED_TIME ASC
+        ORDER BY p.CREATED_TIME ASC
+        LIMIT #{pageNo}, #{pageSize}
     </select>
     <select id="selectCreatedList" resultType="com.epmet.dto.ProjectDTO" parameterType="com.epmet.dto.form.ProjectListFromDTO">
         SELECT distinct
             p.ID,
             p.TITLE,
             p.STATUS,
-            psp.CREATED_TIME
+            IFNULL(pp.PUBLIC_REPLY, "") AS PUBLIC_REPLY,
+            p.CREATED_TIME,
+            ps.CREATED_TIME AS UPDATED_TIME
         FROM project p
-                 INNER JOIN (SELECT
-                                 ps.PROJECT_ID,
-                                 MAX(ps.CREATED_TIME) AS CREATED_TIME
-                             FROM
-                                 project_staff ps
-                             INNER JOIN  project_process pp ON ps.PROCESS_ID = pp.ID AND pp.DEL_FLAG = '0'
-                                        AND pp.OPERATION = 'created'
-                             WHERE
-                                 ps.DEL_FLAG = '0'
-                               AND ps.IS_HANDLE = 'handle'
-                               AND ps.STAFF_ID = #{userId}
-                             GROUP BY ps.PROJECT_ID) psp ON p.ID = psp.PROJECT_ID
+        INNER JOIN (SELECT DISTINCT
+                     ps.PROJECT_ID
+                 FROM
+                     project_staff ps
+                 INNER JOIN  project_process pp ON ps.PROCESS_ID = pp.ID AND pp.DEL_FLAG = '0'
+                            AND pp.OPERATION = 'created'
+                 WHERE
+                     ps.DEL_FLAG = '0'
+                   AND ps.IS_HANDLE = 'handle'
+                   AND ps.STAFF_ID = #{userId}
+                 GROUP BY ps.PROJECT_ID) psp ON p.ID = psp.PROJECT_ID
+        INNER JOIN (
+            SELECT DISTINCT
+                PROJECT_ID,
+                MIN(CREATED_TIME) AS CREATED_TIME
+            FROM
+                project_staff
+            WHERE DEL_FLAG = '0'
+            AND IS_HANDLE = 'unhandled'
+            GROUP BY PROJECT_ID) ps ON p.ID = ps.PROJECT_ID
+        LEFT JOIN project_process pp ON p.ID = pp.PROJECT_ID AND pp.OPERATION = 'close'
         WHERE p.DEL_FLAG = '0'
-        ORDER BY psp.CREATED_TIME ASC
+        ORDER BY p.CREATED_TIME ASC
+        LIMIT #{pageNo}, #{pageSize}
     </select>
     <select id="selectInvolvedList" resultType="com.epmet.dto.ProjectDTO" parameterType="com.epmet.dto.form.ProjectListFromDTO">
         SELECT distinct
             p.ID,
             p.TITLE,
             p.STATUS,
-            psp.CREATED_TIME
+            IFNULL(pp.PUBLIC_REPLY, "") AS PUBLIC_REPLY,
+            p.CREATED_TIME,
+            ps.CREATED_TIME AS UPDATED_TIME
         FROM project p
-                 INNER JOIN (SELECT
-                                 ps.PROJECT_ID,
-                                 MAX(ps.CREATED_TIME) AS CREATED_TIME
-                             FROM
-                                 project_staff ps
-                                     INNER JOIN  project_process pp ON ps.PROCESS_ID = pp.ID AND pp.DEL_FLAG = '0'
-                                     AND pp.OPERATION != 'created'
-                             WHERE
-                                 ps.DEL_FLAG = '0'
-                               AND ps.IS_HANDLE = 'handle'
-                               AND ps.STAFF_ID = #{userId}
-                             GROUP BY ps.PROJECT_ID) psp ON p.ID = psp.PROJECT_ID
+        INNER JOIN (SELECT
+                     ps.PROJECT_ID
+                 FROM
+                     project_staff ps
+                         INNER JOIN  project_process pp ON ps.PROCESS_ID = pp.ID AND pp.DEL_FLAG = '0'
+                         AND pp.OPERATION != 'created'
+                 WHERE
+                     ps.DEL_FLAG = '0'
+                   AND ps.IS_HANDLE = 'handle'
+                   AND ps.STAFF_ID = #{userId}
+                 GROUP BY ps.PROJECT_ID) psp ON p.ID = psp.PROJECT_ID
+        INNER JOIN (
+            SELECT DISTINCT
+                PROJECT_ID,
+                MIN(CREATED_TIME) AS CREATED_TIME
+            FROM
+                project_staff
+            WHERE DEL_FLAG = '0'
+              AND IS_HANDLE = 'unhandled'
+            GROUP BY PROJECT_ID) ps ON p.ID = ps.PROJECT_ID
+        LEFT JOIN project_process pp ON p.ID = pp.PROJECT_ID AND pp.OPERATION = 'close'
         WHERE p.DEL_FLAG = '0'
-        ORDER BY psp.CREATED_TIME ASC
+        ORDER BY p.CREATED_TIME ASC
+        LIMIT #{pageNo}, #{pageSize}
     </select>
     <select id="selectDepartmentNameList" resultType="java.lang.String" parameterType="com.epmet.dto.ProjectDTO">
         SELECT DISTINCT
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml
index a952540452..d93c09e825 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml
@@ -19,6 +19,15 @@
         AND project_id = #{projectId}
         ORDER BY created_time DESC
     </select>
-
+    <select id="selectReturnableList" resultType="com.epmet.entity.ProjectProcessEntity">
+        SELECT
+            *
+        FROM
+            project_process
+        WHERE
+            DEL_FLAG = '0'
+          AND PROJECT_ID = #{projectId}
+        ORDER BY CREATED_TIME DESC
+    </select>
 
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectStaffDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectStaffDao.xml
index 736a87d3ae..bb19e5068a 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectStaffDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectStaffDao.xml
@@ -32,6 +32,14 @@
             AND IS_HANDLE = 'unhandled'
 
     </select>
+    <select id="selectProjectStaffInfo" resultType="com.epmet.dto.ProjectStaffDTO">
+        SELECT ps.* FROM project_staff ps
+        INNER JOIN project_process pp ON ps.DEPARTMENT_NAME = pp.DEPARTMENT_NAME AND ps.STAFF_ID = pp.STAFF_ID
+        WHERE ps.DEL_FLAG = '0'
+            AND pp.DEL_FLAG = '0'
+            AND pp.ID = #{processId}
+        LIMIT 1
+    </select>
 
 
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-client/resi-hall-client.iml b/epmet-module/resi-hall/resi-hall-client/resi-hall-client.iml
index f1936e17be..6f6a140623 100644
--- a/epmet-module/resi-hall/resi-hall-client/resi-hall-client.iml
+++ b/epmet-module/resi-hall/resi-hall-client/resi-hall-client.iml
@@ -14,6 +14,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="TEST" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
     <orderEntry type="module" module-name="epmet-commons-tools" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.1.11.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.12.RELEASE" level="project" />
@@ -139,7 +141,5 @@
     <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.12.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.1.12.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.6.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/resi-hall-server.iml b/epmet-module/resi-hall/resi-hall-server/resi-hall-server.iml
index 9b122af4a2..4e6ad803c2 100644
--- a/epmet-module/resi-hall/resi-hall-server/resi-hall-server.iml
+++ b/epmet-module/resi-hall/resi-hall-server/resi-hall-server.iml
@@ -20,6 +20,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="TEST" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
     <orderEntry type="module" module-name="resi-hall-client" />
     <orderEntry type="module" module-name="epmet-commons-tools" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.1.11.RELEASE" level="project" />
@@ -190,7 +192,5 @@
     <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.1.12.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.6.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall.iml b/epmet-module/resi-hall/resi-hall.iml
index 0d9345ff78..2837671944 100644
--- a/epmet-module/resi-hall/resi-hall.iml
+++ b/epmet-module/resi-hall/resi-hall.iml
@@ -8,6 +8,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="TEST" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.1.11.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter:2.1.11.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot:2.1.11.RELEASE" level="project" />
@@ -45,7 +47,5 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-jcl:5.1.12.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.1.12.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.6.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
index 9b1dbc5c54..8f762dbe01 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
@@ -118,9 +118,8 @@
         WHERE
         cs.DEL_FLAG = '0'
         AND cs.CUSTOMER_ID = #{customerId}
-        AND cs.USER_ID in
-        <foreach item="userId" collection="staffList" separator="," open="(" close=")" index="">
-            #{userId}
+        <foreach item="userId" collection="staffList" separator="OR" open="AND (" close=")" index="">
+            cs.USER_ID = #{userId}
         </foreach>
         ORDER BY convert(cs.REAL_NAME using gbk) ASC
     </select>

From 6ea12c8224c029946be5a9b8401f435360bb19ad Mon Sep 17 00:00:00 2001
From: zxc <954985706@qq.com>
Date: Wed, 13 May 2020 19:26:53 +0800
Subject: [PATCH 36/45] =?UTF-8?q?=E6=BB=A1=E6=84=8F=E5=BA=A6=E8=AF=84?=
 =?UTF-8?q?=E4=BB=B7=E3=80=81=E5=88=9D=E5=A7=8B=E5=8C=96=E3=80=81=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/form/EvaluationListFormDTO.java |  32 ++++++
 .../dto/form/UserResiInfoListFormDTO.java     |  22 ++++
 .../dto/result/EvaluationListResultDTO.java   |  47 ++++++++
 .../dto/result/UserResiInfoResultDTO.java     |  64 +++++++++++
 .../com/epmet/constant/IssueConstant.java     |   2 +
 .../controller/IssueManageController.java     |  30 ++++-
 .../IssueSatisfactionDetailController.java    |  14 ++-
 .../epmet/dao/IssueSatisfactionDetailDao.java |  11 ++
 .../com/epmet/feign/EpmetUserFeignClient.java |  32 ++++++
 .../EpmetUserFeignClientFallBack.java         |  24 ++++
 .../IssueSatisfactionDetailService.java       |  14 ++-
 .../service/IssueVoteStatisticalService.java  |  10 ++
 .../IssueSatisfactionDetailServiceImpl.java   |  18 ++-
 .../impl/IssueVoteDetailServiceImpl.java      |   2 +-
 .../impl/IssueVoteStatisticalServiceImpl.java |  46 ++++++++
 .../mapper/IssueSatisfactionDetailDao.xml     |  16 +++
 .../dto/form/ProjectEvaluateFormDTO.java      |  37 +++++++
 .../form/ProjectEvaluationListFormDTO.java    |  32 ++++++
 .../form/ProjectInitEvaluationFormDTO.java    |  27 +++++
 .../result/ProjectEvaluateInfoResultDTO.java  |  25 +++++
 .../ProjectEvaluationListResultDTO.java       |  47 ++++++++
 .../ProjectInitEvaluationResultDTO.java       |  28 +++++
 .../ProjectSatisfactionDetailController.java  |  36 ++++++
 .../dao/ProjectSatisfactionDetailDao.java     |  19 ++++
 .../ProjectSatisfactionDetailService.java     |  27 +++++
 .../ProjectSatisfactionDetailServiceImpl.java |  63 ++++++++++-
 .../mapper/ProjectSatisfactionDetailDao.xml   |  28 +++++
 .../epmet/dto/form/EvaluationListFormDTO.java |  32 ++++++
 .../dto/form/ProjectEvaluateFormDTO.java      |  37 +++++++
 .../form/ProjectEvaluationListFormDTO.java    |  32 ++++++
 .../com/epmet/dto/form/ProjectIdFormDTO.java  |  20 ++++
 .../form/ProjectInitEvaluationFormDTO.java    |  27 +++++
 .../dto/form/UserResiInfoListFormDTO.java     |  22 ++++
 .../dto/result/EvaluationListResultDTO.java   |  47 ++++++++
 .../result/ProjectEvaluateInfoResultDTO.java  |  25 +++++
 .../ProjectEvaluationListResultDTO.java       |  47 ++++++++
 .../ProjectInitEvaluationResultDTO.java       |  26 +++++
 .../dto/result/UserResiInfoResultDTO.java     |  64 +++++++++++
 .../java/com/epmet/constat/HallConstat.java   |  14 +++
 .../com/epmet/controller/IssueController.java |  57 ++++++++--
 .../com/epmet/feign/EpmetUserFeignClient.java |  13 +++
 .../com/epmet/feign/GovIssueFeignClient.java  |  19 ++--
 .../epmet/feign/GovProjectFeignClient.java    |  49 +++++++++
 .../EpmetUserFeignClientFallBack.java         |  10 ++
 .../fallback/GovIssueFeignClientFallBack.java |  12 +-
 .../GovProjectFeignClientFallBack.java        |  37 +++++++
 .../java/com/epmet/service/IssueService.java  |  45 ++++++--
 .../epmet/service/impl/IssueServiceImpl.java  | 104 +++++++++++++++++-
 .../dto/result/EvaluationListResultDTO.java   |  47 ++++++++
 .../com/epmet/service/UserWechatService.java  |   6 +-
 .../service/impl/UserWechatServiceImpl.java   |   8 +-
 .../main/resources/mapper/UserResiInfoDao.xml |   2 +-
 52 files changed, 1503 insertions(+), 52 deletions(-)
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/EvaluationListFormDTO.java
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/UserResiInfoListFormDTO.java
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/EvaluationListResultDTO.java
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/UserResiInfoResultDTO.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectEvaluateFormDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectEvaluationListFormDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectInitEvaluationFormDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectEvaluateInfoResultDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectEvaluationListResultDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectInitEvaluationResultDTO.java
 create mode 100644 epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/EvaluationListFormDTO.java
 create mode 100644 epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/ProjectEvaluateFormDTO.java
 create mode 100644 epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/ProjectEvaluationListFormDTO.java
 create mode 100644 epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/ProjectIdFormDTO.java
 create mode 100644 epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/ProjectInitEvaluationFormDTO.java
 create mode 100644 epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/UserResiInfoListFormDTO.java
 create mode 100644 epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/EvaluationListResultDTO.java
 create mode 100644 epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/ProjectEvaluateInfoResultDTO.java
 create mode 100644 epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/ProjectEvaluationListResultDTO.java
 create mode 100644 epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/ProjectInitEvaluationResultDTO.java
 create mode 100644 epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/UserResiInfoResultDTO.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/constat/HallConstat.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovProjectFeignClient.java
 create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovProjectFeignClientFallBack.java
 create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EvaluationListResultDTO.java

diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/EvaluationListFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/EvaluationListFormDTO.java
new file mode 100644
index 0000000000..11c8bc0d5e
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/EvaluationListFormDTO.java
@@ -0,0 +1,32 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 满意度评价列表——已关闭
+ */
+@Data
+public class EvaluationListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 议题Id
+     */
+    private String IssueId;
+
+    /**
+     * 页码
+     */
+    private Integer pageNo;
+
+    /**
+     * 每页数量
+     */
+    private Integer pageSize;
+
+
+}
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/UserResiInfoListFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/UserResiInfoListFormDTO.java
new file mode 100644
index 0000000000..1a5fe5274c
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/UserResiInfoListFormDTO.java
@@ -0,0 +1,22 @@
+package com.epmet.dto.form;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description userId集合
+ * @Author yinzuomei
+ * @Date 2020/4/7 18:20
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class UserResiInfoListFormDTO implements Serializable {
+	private static final long serialVersionUID = -4454561042197166135L;
+
+	private List<String> userIdList;
+}
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/EvaluationListResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/EvaluationListResultDTO.java
new file mode 100644
index 0000000000..0a286112d7
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/EvaluationListResultDTO.java
@@ -0,0 +1,47 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 满意度评价列表——已关闭
+ */
+@Data
+public class EvaluationListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -1L;
+
+    /**
+     * 评价用户Id
+     */
+    private String userId;
+
+    /**
+     * 评价用户（山东路168-尹女士）
+     */
+    private String userNickName;
+
+    /**
+     * 满意度 - 不满意:bad、基本满意:good、非常满意:perfect
+     */
+    private String satisfaction;
+
+    /**
+     * 评价时间
+     */
+    private Long evaluateTime;
+
+    /**
+     * 评价内容
+     */
+    private String evaluateContent;
+
+    /**
+     * 用户头像
+     */
+    private String userHeadPhoto;
+
+
+}
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/UserResiInfoResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/UserResiInfoResultDTO.java
new file mode 100644
index 0000000000..6bdc1f6d2f
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/UserResiInfoResultDTO.java
@@ -0,0 +1,64 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 用户注册信息返参DTO
+ * @Author yinzuomei
+ * @Date 2020/4/7 18:45
+ */
+@Data
+public class UserResiInfoResultDTO implements Serializable {
+
+	/**
+	 * 唯一标识
+	 */
+	private String id;
+
+	/**
+	 * 用户Id(主键) user.id
+	 */
+	private String userId;
+
+	/**
+	 * 手机号(注册手机号)
+	 */
+	private String regMobile;
+
+	/**
+	 * 姓氏
+	 */
+	private String surname;
+
+	/**
+	 * 名称
+	 */
+	private String name;
+
+	/**
+	 * 街道
+	 */
+	private String street;
+
+	/**
+	 * 小区名称
+	 */
+	private String district;
+
+	/**
+	 * 楼栋单元
+	 */
+	private String buildingAddress;
+
+	/**
+	 * 用户显示名称
+	 */
+	private String showName;
+
+	/**
+	 * 用户头像
+	 */
+	private String headPhoto;
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java
index 48ed20352d..c5170b7e79 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java
@@ -52,4 +52,6 @@ public interface IssueConstant {
     String ISSUE_AGENCY = "agency";
     String ISSUE_DEPT = "dept";
     String ISSUE_GRID = "grid";
+
+    String SELECT_USERINFO_EXCEPTION = "获取用户昵称、头像失败";
 }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java
index 9738c4272d..da9fa30482 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java
@@ -6,16 +6,20 @@ import com.epmet.commons.tools.enums.RequirePermissionEnum;
 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.dto.form.CloseIssueFormDTO;
-import com.epmet.dto.form.DepartmentStaffListFormDTO;
+import com.epmet.dto.form.*;
 import com.epmet.dto.result.DepartmentStaffListResultDTO;
+import com.epmet.dto.result.EvaluationListResultDTO;
+import com.epmet.dto.result.VotingTrendResultDTO;
 import com.epmet.service.IssueService;
+import com.epmet.service.IssueVoteStatisticalService;
 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;
+
 /**
  * @Description 政府端-基层治理-议题管理
  * @Author yinzuomei
@@ -27,6 +31,8 @@ public class IssueManageController {
 
     @Autowired
     private IssueService issueService;
+    @Autowired
+    private IssueVoteStatisticalService issueVoteStatisticalService;
 
     /**
      * @param formDTO
@@ -54,5 +60,25 @@ public class IssueManageController {
         ValidatorUtils.validateEntity(formDTO);
         return new Result<DepartmentStaffListResultDTO>().ok(issueService.departmentStaffList(formDTO));
     }
+
+    /**
+     * @Description  详情折线图
+     * @param issueId
+     * @author zxc
+     */
+    @PostMapping("votingtrend")
+    public Result<VotingTrendResultDTO> votingTrend(@RequestBody IssueIdFormDTO issueId){
+        return new Result<VotingTrendResultDTO>().ok(issueVoteStatisticalService.votingTrend(issueId));
+    }
+
+    /**
+     * @Description  满意度评价列表——已关闭
+     * @param formDTO
+     * @author zxc
+     */
+    @PostMapping("evaluationlist")
+    public Result<List<EvaluationListResultDTO>> evaluationList(@RequestBody EvaluationListFormDTO formDTO){
+        return new Result<List<EvaluationListResultDTO>>().ok(issueVoteStatisticalService.evaluationList(formDTO));
+    }
 }
 
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueSatisfactionDetailController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueSatisfactionDetailController.java
index b899a287ca..4eb362bec6 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueSatisfactionDetailController.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueSatisfactionDetailController.java
@@ -27,7 +27,9 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.IssueSatisfactionDetailDTO;
 import com.epmet.dto.form.EvaluateFormDTO;
+import com.epmet.dto.form.EvaluationListFormDTO;
 import com.epmet.dto.form.InitEvaluationFormDTO;
+import com.epmet.dto.result.EvaluationListResultDTO;
 import com.epmet.dto.result.InitEvaluationResultDTO;
 import com.epmet.excel.IssueSatisfactionDetailExcel;
 import com.epmet.service.IssueSatisfactionDetailService;
@@ -105,7 +107,7 @@ public class IssueSatisfactionDetailController {
     }
 
     /**
-     * @Description  提交满意度评价
+     * @Description  提交满意度评价——已关闭
      * @param formDTO
      * @author zxc
      */
@@ -115,4 +117,14 @@ public class IssueSatisfactionDetailController {
         return new Result();
     }
 
+    /**
+     * @Description  满意度评价列表——已关闭
+     * @param formDTO
+     * @author zxc
+     */
+    @PostMapping("evaluationlist")
+    public Result<List<EvaluationListResultDTO>> evaluationList(@RequestBody EvaluationListFormDTO formDTO){
+        return new Result<List<EvaluationListResultDTO>>().ok(issueSatisfactionDetailService.evaluationList(formDTO));
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueSatisfactionDetailDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueSatisfactionDetailDao.java
index 0c29b55ace..b8152ad1d3 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueSatisfactionDetailDao.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueSatisfactionDetailDao.java
@@ -19,10 +19,14 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.EvaluateInfoDTO;
+import com.epmet.dto.form.EvaluationListFormDTO;
 import com.epmet.dto.form.InitEvaluationFormDTO;
+import com.epmet.dto.result.EvaluationListResultDTO;
 import com.epmet.entity.IssueSatisfactionDetailEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 议题满意度调查记录表
  *
@@ -39,4 +43,11 @@ public interface IssueSatisfactionDetailDao extends BaseDao<IssueSatisfactionDet
      */
     EvaluateInfoDTO checkSatisfaction(InitEvaluationFormDTO formDTO);
 
+    /**
+     * @Description  满意度评价列表——已关闭
+     * @param formDTO
+     * @author zxc
+     */
+    List<EvaluationListResultDTO> evaluationList(EvaluationListFormDTO formDTO);
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
new file mode 100644
index 0000000000..dd7dd564dc
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
@@ -0,0 +1,32 @@
+package com.epmet.feign;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.UserResiInfoListFormDTO;
+import com.epmet.dto.result.UserResiInfoResultDTO;
+import com.epmet.feign.fallback.EpmetUserFeignClientFallBack;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * @author zxc
+ * @dscription
+ * @date 2020/5/11 10:32
+ */
+//url = "localhost:8087"
+@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class)
+public interface EpmetUserFeignClient {
+
+	/**
+	 * @Description  查询评价人和评价人头像
+	 * @param formDTO
+	 * @author zxc
+	 */
+	@PostMapping("/epmetuser/userresiinfo/getuserresiinfolist")
+	Result<List<UserResiInfoResultDTO>> getUserResiInfoList(@RequestBody UserResiInfoListFormDTO formDTO);
+
+
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
new file mode 100644
index 0000000000..8dd1e31196
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
@@ -0,0 +1,24 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.UserResiInfoListFormDTO;
+import com.epmet.dto.result.UserResiInfoResultDTO;
+import com.epmet.feign.EpmetUserFeignClient;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @Auther zxc
+ * @Create 2020-05-11 10:33
+ */
+@Component
+public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
+
+    @Override
+    public Result<List<UserResiInfoResultDTO>> getUserResiInfoList(UserResiInfoListFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserResiInfoList", formDTO);
+    }
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueSatisfactionDetailService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueSatisfactionDetailService.java
index 1abbd939af..a8fafa08a0 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueSatisfactionDetailService.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueSatisfactionDetailService.java
@@ -21,9 +21,12 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IssueSatisfactionDetailDTO;
 import com.epmet.dto.form.EvaluateFormDTO;
+import com.epmet.dto.form.EvaluationListFormDTO;
 import com.epmet.dto.form.InitEvaluationFormDTO;
+import com.epmet.dto.result.EvaluationListResultDTO;
 import com.epmet.dto.result.InitEvaluationResultDTO;
 import com.epmet.entity.IssueSatisfactionDetailEntity;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 import java.util.Map;
@@ -97,16 +100,23 @@ public interface IssueSatisfactionDetailService extends BaseService<IssueSatisfa
     void delete(String[] ids);
 
     /**
-     * @Description   满意度评价初始化
+     * @Description   满意度评价初始化——已关闭
      * @param formDTO
      * @author zxc
      */
     InitEvaluationResultDTO initEvaluation(InitEvaluationFormDTO formDTO);
 
     /**
-     * @Description  提交满意度评价
+     * @Description  提交满意度评价——已关闭
      * @param formDTO
      * @author zxc
      */
     void evaluate(EvaluateFormDTO formDTO);
+
+    /**
+     * @Description  满意度评价列表——已关闭
+     * @param formDTO
+     * @author zxc
+     */
+    List<EvaluationListResultDTO> evaluationList(@RequestBody EvaluationListFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java
index 8e1751de09..39e65850e8 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java
@@ -21,10 +21,13 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.IssueVoteStatisticalDTO;
+import com.epmet.dto.form.EvaluationListFormDTO;
 import com.epmet.dto.form.IssueIdFormDTO;
+import com.epmet.dto.result.EvaluationListResultDTO;
 import com.epmet.dto.result.VoteResultDTO;
 import com.epmet.dto.result.VotingTrendResultDTO;
 import com.epmet.entity.IssueVoteStatisticalEntity;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 import java.util.Map;
@@ -111,4 +114,11 @@ public interface IssueVoteStatisticalService extends BaseService<IssueVoteStatis
      * @author zxc
      */
     VotingTrendResultDTO votingTrend(IssueIdFormDTO issueId);
+
+    /**
+     * @Description  满意度评价列表——已关闭
+     * @param formDTO
+     * @author zxc
+     */
+    List<EvaluationListResultDTO> evaluationList(EvaluationListFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java
index 5bd8aff0e6..37fb08814d 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java
@@ -20,6 +20,8 @@ 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.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -28,7 +30,9 @@ import com.epmet.dao.IssueSatisfactionDetailDao;
 import com.epmet.dto.EvaluateInfoDTO;
 import com.epmet.dto.IssueSatisfactionDetailDTO;
 import com.epmet.dto.form.EvaluateFormDTO;
+import com.epmet.dto.form.EvaluationListFormDTO;
 import com.epmet.dto.form.InitEvaluationFormDTO;
+import com.epmet.dto.result.EvaluationListResultDTO;
 import com.epmet.dto.result.InitEvaluationResultDTO;
 import com.epmet.entity.IssueSatisfactionDetailEntity;
 import com.epmet.redis.IssueSatisfactionDetailRedis;
@@ -130,7 +134,7 @@ public class IssueSatisfactionDetailServiceImpl extends BaseServiceImpl<IssueSat
     }
 
     /**
-     * @Description  提交满意度评价
+     * @Description  提交满意度评价——已关闭
      * @param formDTO
      * @author zxc
      */
@@ -143,9 +147,19 @@ public class IssueSatisfactionDetailServiceImpl extends BaseServiceImpl<IssueSat
         BeanUtils.copyProperties(formDTO,initEvaluation);
         EvaluateInfoDTO evaluateInfoDTO = baseDao.checkSatisfaction(initEvaluation);
         if (evaluateInfoDTO!=null){
-            throw new RenException("您已评价！");
+            throw new RenException(EpmetErrorCode.ALREADY_EVALUATE.getMsg());
         }
         baseDao.insert(entity);
     }
 
+    /**
+     * @Description  满意度评价列表——已关闭
+     * @param formDTO
+     * @author zxc
+     */
+    @Override
+    public List<EvaluationListResultDTO> evaluationList(EvaluationListFormDTO formDTO) {
+        return baseDao.evaluationList(formDTO);
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java
index 2f10a43d19..ab2483778d 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java
@@ -119,7 +119,7 @@ public class IssueVoteDetailServiceImpl extends BaseServiceImpl<IssueVoteDetailD
         if (checkoutVoteCount==0){
             baseDao.insert(entity);
         }else {
-            throw new RenException("You've voted, please don't repeat the operation!");
+            throw new RenException(EpmetErrorCode.ALREADY_VOTE.getMsg());
         }
     }
 
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
index 55c0b6f692..5058c84832 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
@@ -20,17 +20,26 @@ 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.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.constant.IssueConstant;
+import com.epmet.dao.IssueSatisfactionDetailDao;
 import com.epmet.dao.IssueVoteStatisticalDao;
 import com.epmet.dto.IssueVoteStatisticalDTO;
 import com.epmet.dto.PolyLineDTO;
+import com.epmet.dto.form.EvaluationListFormDTO;
 import com.epmet.dto.form.IssueIdFormDTO;
+import com.epmet.dto.form.UserResiInfoListFormDTO;
+import com.epmet.dto.result.EvaluationListResultDTO;
+import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.dto.result.VoteResultDTO;
 import com.epmet.dto.result.VotingTrendResultDTO;
 import com.epmet.entity.IssueVoteStatisticalEntity;
+import com.epmet.feign.EpmetUserFeignClient;
 import com.epmet.redis.IssueVoteStatisticalRedis;
 import com.epmet.service.IssueVoteStatisticalService;
 import org.apache.commons.lang3.StringUtils;
@@ -38,9 +47,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 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;
+import java.util.stream.Collectors;
 
 /**
  * 议题表决统计表
@@ -55,6 +66,10 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
     private IssueVoteStatisticalRedis issueVoteStatisticalRedis;
     @Autowired
     private IssueVoteStatisticalDao issueVoteStatisticalDao;
+    @Autowired
+    private IssueSatisfactionDetailDao issueSatisfactionDetailDao;
+    @Autowired
+    private EpmetUserFeignClient userFeignClient;
 
     @Override
     public PageData<IssueVoteStatisticalDTO> page(Map<String, Object> params) {
@@ -145,4 +160,35 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
         return votingTrendResultDTO;
     }
 
+    /**
+     * @Description  满意度评价列表——已关闭
+     * @param formDTO
+     * @author zxc
+     */
+    @Override
+    public List<EvaluationListResultDTO> evaluationList(EvaluationListFormDTO formDTO) {
+        int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
+        formDTO.setPageNo(pageIndex);
+        List<EvaluationListResultDTO> data = issueSatisfactionDetailDao.evaluationList(formDTO);
+        if (data.size()==NumConstant.ZERO||data==null){
+            return new ArrayList<>();
+        }
+        //获取头像和昵称   eg:山东路168号-周先生
+        List<String> userIds = data.stream().map(EvaluationListResultDTO::getUserId).collect(Collectors.toList());
+        UserResiInfoListFormDTO userResiInfo = new UserResiInfoListFormDTO();
+        userResiInfo.setUserIdList(userIds);
+        List<UserResiInfoResultDTO> userResiInfoList = userFeignClient.getUserResiInfoList(userResiInfo).getData();
+        if (null == userResiInfoList || userResiInfoList.size() < NumConstant.ONE) {
+            throw new RenException(IssueConstant.SELECT_USERINFO_EXCEPTION);
+        }
+        List<EvaluationListResultDTO> resultList = data.stream().flatMap(evaluation -> userResiInfoList.stream().filter(user ->
+                evaluation.getUserId().equals(user.getUserId())).map(userInfo -> {
+            EvaluationListResultDTO resultDTO = ConvertUtils.sourceToTarget(evaluation, EvaluationListResultDTO.class);
+            resultDTO.setUserNickName(null == userInfo.getShowName() ? "" : userInfo.getShowName());
+            resultDTO.setUserHeadPhoto(null == userInfo.getHeadPhoto() ? "" : userInfo.getHeadPhoto());
+            return resultDTO;
+        })).collect(Collectors.toList());
+        return resultList;
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueSatisfactionDetailDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueSatisfactionDetailDao.xml
index 576f6b859d..9f3644db84 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueSatisfactionDetailDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueSatisfactionDetailDao.xml
@@ -29,4 +29,20 @@
             AND created_by = #{userId}
     </select>
 
+    <!-- 满意度评价列表——已关闭 -->
+    <select id="evaluationList" parameterType="com.epmet.dto.form.EvaluationListFormDTO" resultType="com.epmet.dto.result.EvaluationListResultDTO">
+        SELECT
+            created_by AS userId,
+            satisfaction AS satisfaction,
+            UNIX_TIMESTAMP( created_time ) AS evaluateTime,
+            COMMENT AS evaluateContent
+        FROM
+            issue_satisfaction_detail
+        WHERE
+            del_flag = 0
+            AND issue_id = #{issueId}
+        ORDER BY created_time DESC
+        LIMIT #{pageNo},#{pageSize}
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectEvaluateFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectEvaluateFormDTO.java
new file mode 100644
index 0000000000..d70fe56a24
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectEvaluateFormDTO.java
@@ -0,0 +1,37 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 提交满意度评价——已转项目
+ */
+@Data
+public class ProjectEvaluateFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 议题Id
+     */
+    private String projectId;
+
+    /**
+     * 满意度 - 不满意:bad、基本满意:good、非常满意:perfect
+     */
+    private String satisfaction;
+
+    /**
+     * 评价内容
+     */
+    private String comment;
+
+    /**
+     * 用户ID
+     */
+    private String userId;
+
+
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectEvaluationListFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectEvaluationListFormDTO.java
new file mode 100644
index 0000000000..6ba8cf9c1d
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectEvaluationListFormDTO.java
@@ -0,0 +1,32 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 满意度评价列表——已转项目
+ */
+@Data
+public class ProjectEvaluationListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 议题Id
+     */
+    private String projectId;
+
+    /**
+     * 页码
+     */
+    private Integer pageNo;
+
+    /**
+     * 每页数量
+     */
+    private Integer pageSize;
+
+
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectInitEvaluationFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectInitEvaluationFormDTO.java
new file mode 100644
index 0000000000..c57d2cc4be
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectInitEvaluationFormDTO.java
@@ -0,0 +1,27 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 满意度评价初始化
+ */
+@Data
+public class ProjectInitEvaluationFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 项目Id
+     */
+    private String projectId;
+
+    /**
+     * 创建人
+     */
+    private String userId;
+
+
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectEvaluateInfoResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectEvaluateInfoResultDTO.java
new file mode 100644
index 0000000000..52950afad5
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectEvaluateInfoResultDTO.java
@@ -0,0 +1,25 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 项目满意度评价信息
+ */
+@Data
+public class ProjectEvaluateInfoResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -3699103790181586654L;
+
+    /**
+     * 评价内容
+     */
+    private String evaluateContent;
+
+    /**
+     * 满意度 - 不满意:bad、基本满意:good、非常满意:perfect
+     */
+    private String satisfaction;
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectEvaluationListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectEvaluationListResultDTO.java
new file mode 100644
index 0000000000..dc40ce5a3c
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectEvaluationListResultDTO.java
@@ -0,0 +1,47 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 满意度评价列表——已关闭
+ */
+@Data
+public class ProjectEvaluationListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -1L;
+
+    /**
+     * 评价用户Id
+     */
+    private String userId;
+
+    /**
+     * 评价用户（山东路168-尹女士）
+     */
+    private String userNickName;
+
+    /**
+     * 满意度 - 不满意:bad、基本满意:good、非常满意:perfect
+     */
+    private String satisfaction;
+
+    /**
+     * 评价时间
+     */
+    private Long evaluateTime;
+
+    /**
+     * 评价内容
+     */
+    private String evaluateContent;
+
+    /**
+     * 用户头像
+     */
+    private String userHeadPhoto;
+
+
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectInitEvaluationResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectInitEvaluationResultDTO.java
new file mode 100644
index 0000000000..33883cd6ab
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectInitEvaluationResultDTO.java
@@ -0,0 +1,28 @@
+package com.epmet.dto.result;
+
+import com.epmet.dto.form.ProjectEvaluateFormDTO;
+import com.epmet.dto.form.ProjectInitEvaluationFormDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 满意度评价初始化
+ */
+@Data
+public class ProjectInitEvaluationResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -1L;
+
+    /**
+     * 评价状态：true已评价，false未评价
+     */
+    private Boolean status;
+
+    /**
+     * 评价信息
+     */
+    private ProjectEvaluateInfoResultDTO evaluateInfo;
+
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectSatisfactionDetailController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectSatisfactionDetailController.java
index 4505cf4ec7..e6cff263f9 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectSatisfactionDetailController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectSatisfactionDetailController.java
@@ -26,6 +26,11 @@ 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.ProjectSatisfactionDetailDTO;
+import com.epmet.dto.form.ProjectEvaluateFormDTO;
+import com.epmet.dto.form.ProjectEvaluationListFormDTO;
+import com.epmet.dto.form.ProjectInitEvaluationFormDTO;
+import com.epmet.dto.result.ProjectEvaluationListResultDTO;
+import com.epmet.dto.result.ProjectInitEvaluationResultDTO;
 import com.epmet.excel.ProjectSatisfactionDetailExcel;
 import com.epmet.service.ProjectSatisfactionDetailService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -91,4 +96,35 @@ public class ProjectSatisfactionDetailController {
         ExcelUtils.exportExcelToTarget(response, null, list, ProjectSatisfactionDetailExcel.class);
     }
 
+    /**
+     * @Description  提交满意度评价初始化——已转项目
+     * @param formDTO
+     * @author zxc
+     */
+    @PostMapping("projectinitevaluation")
+    public Result<ProjectInitEvaluationResultDTO> projectInitEvaluation(@RequestBody ProjectInitEvaluationFormDTO formDTO){
+        return new Result<ProjectInitEvaluationResultDTO>().ok(projectSatisfactionDetailService.projectInitEvaluation(formDTO));
+    }
+
+    /**
+     * @Description  提交满意度评价——已转项目
+     * @param projectEvaluate
+     * @author zxc
+     */
+    @PostMapping("projectevaluate")
+    public Result projectEvaluate(@RequestBody ProjectEvaluateFormDTO projectEvaluate){
+        projectSatisfactionDetailService.projectEvaluate(projectEvaluate);
+        return new Result();
+    }
+
+    /**
+     * @Description  满意度评价列表——已转项目
+     * @param formDTO
+     * @author zxc
+     */
+    @PostMapping("projectevaluationlist")
+    public Result<List<ProjectEvaluationListResultDTO>> projectEvaluationList(@RequestBody ProjectEvaluationListFormDTO formDTO){
+        return new Result<List<ProjectEvaluationListResultDTO>>().ok(projectSatisfactionDetailService.projectEvaluationList(formDTO));
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSatisfactionDetailDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSatisfactionDetailDao.java
index 514c7060b1..83ab6375c0 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSatisfactionDetailDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSatisfactionDetailDao.java
@@ -18,7 +18,11 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.form.ProjectEvaluationListFormDTO;
+import com.epmet.dto.form.ProjectInitEvaluationFormDTO;
+import com.epmet.dto.result.ProjectEvaluateInfoResultDTO;
 import com.epmet.dto.result.EvaluationListResultDTO;
+import com.epmet.dto.result.ProjectEvaluationListResultDTO;
 import com.epmet.entity.ProjectSatisfactionDetailEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -41,4 +45,19 @@ public interface ProjectSatisfactionDetailDao extends BaseDao<ProjectSatisfactio
      * @Description 根据项目Id查询项目评价列表数据
      **/
     List<EvaluationListResultDTO> getEvaluationListByProjectId(@Param("projectId") String projectId);
+
+    /**
+     * @Description  满意度评价初始化——已转项目
+     * @param projectEvaluateFormDTO
+     * @author zxc
+     */
+    ProjectEvaluateInfoResultDTO checkProjectSatisfaction(ProjectInitEvaluationFormDTO projectEvaluateFormDTO);
+
+    /**
+     * @Description  满意度评价列表——已转项目
+     * @param formDTO
+     * @author zxc
+     */
+    List<ProjectEvaluationListResultDTO> projectEvaluationList(ProjectEvaluationListFormDTO formDTO);
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSatisfactionDetailService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSatisfactionDetailService.java
index 94decfd804..245b443e28 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSatisfactionDetailService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSatisfactionDetailService.java
@@ -21,8 +21,14 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.ProjectSatisfactionDetailDTO;
 import com.epmet.dto.form.EvaluationListFormDTO;
+import com.epmet.dto.form.ProjectEvaluationListFormDTO;
 import com.epmet.dto.result.EvaluationListResultDTO;
+import com.epmet.dto.form.ProjectEvaluateFormDTO;
+import com.epmet.dto.form.ProjectInitEvaluationFormDTO;
+import com.epmet.dto.result.ProjectEvaluationListResultDTO;
+import com.epmet.dto.result.ProjectInitEvaluationResultDTO;
 import com.epmet.entity.ProjectSatisfactionDetailEntity;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 import java.util.Map;
@@ -102,4 +108,25 @@ public interface ProjectSatisfactionDetailService extends BaseService<ProjectSat
      * @Description 项目跟踪-项目满意度评价列表
      **/
     List<EvaluationListResultDTO> evaluationList(EvaluationListFormDTO formDTO);
+
+    /**
+     * @Description  满意度评价初始化——已转项目
+     * @param projectInitEvaluation
+     * @author zxc
+     */
+    ProjectInitEvaluationResultDTO projectInitEvaluation(ProjectInitEvaluationFormDTO projectInitEvaluation);
+
+    /**
+     * @Description  提交满意度评价——已转项目
+     * @param projectEvaluate
+     * @author zxc
+     */
+    void projectEvaluate(ProjectEvaluateFormDTO projectEvaluate);
+
+    /**
+     * @Description  满意度评价列表——已转项目
+     * @param formDTO
+     * @author zxc
+     */
+    List<ProjectEvaluationListResultDTO> projectEvaluationList(@RequestBody ProjectEvaluationListFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java
index 7ad9452c05..df8fb0c47b 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java
@@ -20,6 +20,8 @@ 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.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.RenException;
@@ -28,15 +30,14 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.constant.ProjectConstant;
 import com.epmet.dao.ProjectSatisfactionDetailDao;
 import com.epmet.dto.ProjectSatisfactionDetailDTO;
-import com.epmet.dto.form.EvaluationListFormDTO;
-import com.epmet.dto.form.UserResiInfoListFormDTO;
-import com.epmet.dto.result.EvaluationListResultDTO;
-import com.epmet.dto.result.UserResiInfoResultDTO;
+import com.epmet.dto.form.*;
+import com.epmet.dto.result.*;
 import com.epmet.entity.ProjectSatisfactionDetailEntity;
 import com.epmet.feign.EpmetUserFeignClient;
 import com.epmet.redis.ProjectSatisfactionDetailRedis;
 import com.epmet.service.ProjectSatisfactionDetailService;
 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.transaction.annotation.Transactional;
@@ -147,4 +148,58 @@ public class ProjectSatisfactionDetailServiceImpl extends BaseServiceImpl<Projec
         return resultList;
     }
 
+    /**
+     * @Description  满意度评价初始化——已转项目
+     * @param projectInitEvaluation
+     * @author zxc
+     */
+    @Override
+    public ProjectInitEvaluationResultDTO projectInitEvaluation(ProjectInitEvaluationFormDTO projectInitEvaluation) {
+        ProjectInitEvaluationResultDTO resultDTO = new ProjectInitEvaluationResultDTO();
+        ProjectEvaluateInfoResultDTO checkProjectSatisfaction = baseDao.checkProjectSatisfaction(projectInitEvaluation);
+        if (checkProjectSatisfaction!=null){
+            resultDTO.setStatus(true);//已评价
+            resultDTO.setEvaluateInfo(checkProjectSatisfaction);
+        }else {
+            resultDTO.setStatus(false);
+            ProjectEvaluateInfoResultDTO evaluateInfo = new ProjectEvaluateInfoResultDTO();
+            evaluateInfo.setEvaluateContent("");
+            evaluateInfo.setSatisfaction("");
+            resultDTO.setEvaluateInfo(evaluateInfo);
+        }
+        return resultDTO;
+    }
+
+    /**
+     * @Description  提交满意度评价——已转项目
+     * @param formDTO
+     * @author zxc
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void projectEvaluate(ProjectEvaluateFormDTO formDTO) {
+        ProjectSatisfactionDetailEntity entity = new ProjectSatisfactionDetailEntity();
+        BeanUtils.copyProperties(formDTO,entity);
+        //校验是否评价
+        ProjectInitEvaluationFormDTO projectInitEvaluation = new ProjectInitEvaluationFormDTO();
+        BeanUtils.copyProperties(formDTO,projectInitEvaluation);
+        ProjectEvaluateInfoResultDTO resultDTO = baseDao.checkProjectSatisfaction(projectInitEvaluation);
+        if (resultDTO!=null){
+            throw new RenException(EpmetErrorCode.ALREADY_EVALUATE.getMsg());
+        }
+        baseDao.insert(entity);
+    }
+
+    /**
+     * @Description  满意度评价列表——已转项目
+     * @param formDTO
+     * @author zxc
+     */
+    @Override
+    public List<ProjectEvaluationListResultDTO> projectEvaluationList(ProjectEvaluationListFormDTO formDTO) {
+        int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
+        formDTO.setPageNo(pageIndex);
+        return baseDao.projectEvaluationList(formDTO);
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSatisfactionDetailDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSatisfactionDetailDao.xml
index e2ddbd3417..afa26f2ac2 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSatisfactionDetailDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSatisfactionDetailDao.xml
@@ -30,5 +30,33 @@
         ORDER BY CREATED_TIME DESC
     </select>
 
+    <!-- 满意度评价初始化——已转项目 -->
+    <select id="checkProjectSatisfaction" parameterType="com.epmet.dto.form.ProjectInitEvaluationFormDTO" resultType="com.epmet.dto.result.ProjectEvaluateInfoResultDTO">
+        SELECT
+            comment AS evaluateContent,
+            satisfaction AS satisfaction
+        FROM
+            project_satisfaction_detail
+        WHERE
+            del_flag = 0
+            AND project_id = #{projectId}
+            AND created_by = #{userId}
+    </select>
+
+    <!-- 满意度评价列表——已转项目 -->
+    <select id="projectEvaluationList" resultType="com.epmet.dto.result.ProjectEvaluationListResultDTO" parameterType="com.epmet.dto.form.ProjectEvaluationListFormDTO">
+        SELECT
+            created_by AS userId,
+            satisfaction AS satisfaction,
+            UNIX_TIMESTAMP( created_time ) AS evaluateTime,
+            COMMENT AS evaluateContent
+        FROM
+            project_satisfaction_detail
+        WHERE
+            del_flag = 0
+            AND project_id = #{projectId}
+        ORDER BY created_time DESC
+        LIMIT #{pageNo},#{pageSize}
+    </select>
 
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/EvaluationListFormDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/EvaluationListFormDTO.java
new file mode 100644
index 0000000000..11c8bc0d5e
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/EvaluationListFormDTO.java
@@ -0,0 +1,32 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 满意度评价列表——已关闭
+ */
+@Data
+public class EvaluationListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 议题Id
+     */
+    private String IssueId;
+
+    /**
+     * 页码
+     */
+    private Integer pageNo;
+
+    /**
+     * 每页数量
+     */
+    private Integer pageSize;
+
+
+}
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/ProjectEvaluateFormDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/ProjectEvaluateFormDTO.java
new file mode 100644
index 0000000000..d70fe56a24
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/ProjectEvaluateFormDTO.java
@@ -0,0 +1,37 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 提交满意度评价——已转项目
+ */
+@Data
+public class ProjectEvaluateFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 议题Id
+     */
+    private String projectId;
+
+    /**
+     * 满意度 - 不满意:bad、基本满意:good、非常满意:perfect
+     */
+    private String satisfaction;
+
+    /**
+     * 评价内容
+     */
+    private String comment;
+
+    /**
+     * 用户ID
+     */
+    private String userId;
+
+
+}
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/ProjectEvaluationListFormDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/ProjectEvaluationListFormDTO.java
new file mode 100644
index 0000000000..6ba8cf9c1d
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/ProjectEvaluationListFormDTO.java
@@ -0,0 +1,32 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 满意度评价列表——已转项目
+ */
+@Data
+public class ProjectEvaluationListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 议题Id
+     */
+    private String projectId;
+
+    /**
+     * 页码
+     */
+    private Integer pageNo;
+
+    /**
+     * 每页数量
+     */
+    private Integer pageSize;
+
+
+}
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/ProjectIdFormDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/ProjectIdFormDTO.java
new file mode 100644
index 0000000000..318eae5dcf
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/ProjectIdFormDTO.java
@@ -0,0 +1,20 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 项目Id
+ * @Author zxc
+ */
+@Data
+public class ProjectIdFormDTO implements Serializable {
+    private static final long serialVersionUID = 2887479755214503489L;
+
+    @NotBlank(message = "项目id不能为空")
+    private String projectId;
+
+}
+
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/ProjectInitEvaluationFormDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/ProjectInitEvaluationFormDTO.java
new file mode 100644
index 0000000000..c57d2cc4be
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/ProjectInitEvaluationFormDTO.java
@@ -0,0 +1,27 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 满意度评价初始化
+ */
+@Data
+public class ProjectInitEvaluationFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 项目Id
+     */
+    private String projectId;
+
+    /**
+     * 创建人
+     */
+    private String userId;
+
+
+}
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/UserResiInfoListFormDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/UserResiInfoListFormDTO.java
new file mode 100644
index 0000000000..1a5fe5274c
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/UserResiInfoListFormDTO.java
@@ -0,0 +1,22 @@
+package com.epmet.dto.form;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description userId集合
+ * @Author yinzuomei
+ * @Date 2020/4/7 18:20
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class UserResiInfoListFormDTO implements Serializable {
+	private static final long serialVersionUID = -4454561042197166135L;
+
+	private List<String> userIdList;
+}
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/EvaluationListResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/EvaluationListResultDTO.java
new file mode 100644
index 0000000000..0a286112d7
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/EvaluationListResultDTO.java
@@ -0,0 +1,47 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 满意度评价列表——已关闭
+ */
+@Data
+public class EvaluationListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -1L;
+
+    /**
+     * 评价用户Id
+     */
+    private String userId;
+
+    /**
+     * 评价用户（山东路168-尹女士）
+     */
+    private String userNickName;
+
+    /**
+     * 满意度 - 不满意:bad、基本满意:good、非常满意:perfect
+     */
+    private String satisfaction;
+
+    /**
+     * 评价时间
+     */
+    private Long evaluateTime;
+
+    /**
+     * 评价内容
+     */
+    private String evaluateContent;
+
+    /**
+     * 用户头像
+     */
+    private String userHeadPhoto;
+
+
+}
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/ProjectEvaluateInfoResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/ProjectEvaluateInfoResultDTO.java
new file mode 100644
index 0000000000..52950afad5
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/ProjectEvaluateInfoResultDTO.java
@@ -0,0 +1,25 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 项目满意度评价信息
+ */
+@Data
+public class ProjectEvaluateInfoResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -3699103790181586654L;
+
+    /**
+     * 评价内容
+     */
+    private String evaluateContent;
+
+    /**
+     * 满意度 - 不满意:bad、基本满意:good、非常满意:perfect
+     */
+    private String satisfaction;
+}
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/ProjectEvaluationListResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/ProjectEvaluationListResultDTO.java
new file mode 100644
index 0000000000..dc40ce5a3c
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/ProjectEvaluationListResultDTO.java
@@ -0,0 +1,47 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 满意度评价列表——已关闭
+ */
+@Data
+public class ProjectEvaluationListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -1L;
+
+    /**
+     * 评价用户Id
+     */
+    private String userId;
+
+    /**
+     * 评价用户（山东路168-尹女士）
+     */
+    private String userNickName;
+
+    /**
+     * 满意度 - 不满意:bad、基本满意:good、非常满意:perfect
+     */
+    private String satisfaction;
+
+    /**
+     * 评价时间
+     */
+    private Long evaluateTime;
+
+    /**
+     * 评价内容
+     */
+    private String evaluateContent;
+
+    /**
+     * 用户头像
+     */
+    private String userHeadPhoto;
+
+
+}
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/ProjectInitEvaluationResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/ProjectInitEvaluationResultDTO.java
new file mode 100644
index 0000000000..182cdff0fd
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/ProjectInitEvaluationResultDTO.java
@@ -0,0 +1,26 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 满意度评价初始化
+ */
+@Data
+public class ProjectInitEvaluationResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -1L;
+
+    /**
+     * 评价状态：true已评价，false未评价
+     */
+    private Boolean status;
+
+    /**
+     * 评价信息
+     */
+    private ProjectEvaluateInfoResultDTO evaluateInfo;
+
+}
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/UserResiInfoResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/UserResiInfoResultDTO.java
new file mode 100644
index 0000000000..6bdc1f6d2f
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/UserResiInfoResultDTO.java
@@ -0,0 +1,64 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 用户注册信息返参DTO
+ * @Author yinzuomei
+ * @Date 2020/4/7 18:45
+ */
+@Data
+public class UserResiInfoResultDTO implements Serializable {
+
+	/**
+	 * 唯一标识
+	 */
+	private String id;
+
+	/**
+	 * 用户Id(主键) user.id
+	 */
+	private String userId;
+
+	/**
+	 * 手机号(注册手机号)
+	 */
+	private String regMobile;
+
+	/**
+	 * 姓氏
+	 */
+	private String surname;
+
+	/**
+	 * 名称
+	 */
+	private String name;
+
+	/**
+	 * 街道
+	 */
+	private String street;
+
+	/**
+	 * 小区名称
+	 */
+	private String district;
+
+	/**
+	 * 楼栋单元
+	 */
+	private String buildingAddress;
+
+	/**
+	 * 用户显示名称
+	 */
+	private String showName;
+
+	/**
+	 * 用户头像
+	 */
+	private String headPhoto;
+}
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/constat/HallConstat.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/constat/HallConstat.java
new file mode 100644
index 0000000000..19af02540a
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/constat/HallConstat.java
@@ -0,0 +1,14 @@
+package com.epmet.constat;
+
+/**
+ * @Author zxc
+ * @CreateTime 2020/5/13 18:02
+ */
+public interface HallConstat {
+
+    /**
+     * 调用epmet-user服务查询数据失败
+     */
+    String SELECT_USERINFO_EXCEPTION = "获取用户昵称、头像失败";
+
+}
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java
index 508694bfea..cc50d7dcd0 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java
@@ -5,13 +5,8 @@ import com.epmet.commons.tools.annotation.RequirePermission;
 import com.epmet.commons.tools.enums.RequirePermissionEnum;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.form.EvaluateFormDTO;
-import com.epmet.dto.form.IssueDetailFormDTO;
-import com.epmet.dto.form.IssueIdFormDTO;
-import com.epmet.dto.result.InitEvaluationResultDTO;
-import com.epmet.dto.result.IssueDetailResultDTO;
-import com.epmet.dto.result.VoteResultDTO;
-import com.epmet.dto.result.VotingTrendResultDTO;
+import com.epmet.dto.form.*;
+import com.epmet.dto.result.*;
 import com.epmet.service.IssueService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -19,6 +14,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;
+
 /**
  * @Description 居民端党群议事
  * @Author yinzuomei
@@ -86,7 +83,7 @@ public class IssueController {
     }
 
     /**
-     * @Description  满意度评价初始化
+     * @Description  满意度评价初始化——已关闭
      * @param tokenDto
      * @param issueId
      * @author zxc
@@ -97,7 +94,18 @@ public class IssueController {
     }
 
     /**
-     * @Description  提交满意度评价
+     * @Description  满意度评价初始化——已转项目
+     * @param tokenDto
+     * @param projectId
+     * @author zxc
+     */
+    @PostMapping("projectinitevaluation")
+    public Result<ProjectInitEvaluationResultDTO> projectInitEvaluation(@LoginUser TokenDto tokenDto, @RequestBody ProjectIdFormDTO projectId){
+        return new Result<ProjectInitEvaluationResultDTO>().ok(issueService.projectInitEvaluation(tokenDto,projectId));
+    }
+
+    /**
+     * @Description  提交满意度评价——已关闭的议题
      * @param formDTO
      * @author zxc
      */
@@ -107,5 +115,36 @@ public class IssueController {
         return new Result();
     }
 
+    /**
+     * @Description  提交满意度评价——已转项目
+     * @param formDTO
+     * @author zxc
+     */
+    @PostMapping("projectevaluate")
+    public Result projectEvaluate(@LoginUser TokenDto tokenDto,@RequestBody ProjectEvaluateFormDTO formDTO){
+        issueService.projectEvaluate(tokenDto,formDTO);
+        return new Result();
+    }
+
+    /**
+     * @Description  满意度评价列表——已关闭
+     * @param formDTO
+     * @author zxc
+     */
+    @PostMapping("evaluationlist")
+    public Result<List<EvaluationListResultDTO>> evaluationList(@RequestBody EvaluationListFormDTO formDTO){
+        return new Result<List<EvaluationListResultDTO>>().ok(issueService.evaluationList(formDTO));
+    }
+
+    /**
+     * @Description  满意度评价列表——已转项目
+     * @param formDTO
+     * @author zxc
+     */
+    @PostMapping("projectevaluationlist")
+    public Result<List<EvaluationListResultDTO>> projectEvaluationList(@RequestBody ProjectEvaluationListFormDTO formDTO){
+        return new Result<List<EvaluationListResultDTO>>().ok(issueService.projectEvaluationList(formDTO));
+    }
+
 }
 
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
index 6b397e298e..e5721246f5 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
@@ -3,12 +3,16 @@ package com.epmet.feign;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.IssueInitiatorFormDTO;
+import com.epmet.dto.form.UserResiInfoListFormDTO;
 import com.epmet.dto.result.IssueInitiatorResultDTO;
+import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.feign.fallback.EpmetUserFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import java.util.List;
+
 /**
  * @author zxc
  * @dscription
@@ -27,4 +31,13 @@ public interface EpmetUserFeignClient {
 	@PostMapping(value = "/epmetuser/userresiinfo/selectissueinitiator")
 	Result<IssueInitiatorResultDTO> selectIssueInitiator(@RequestBody IssueInitiatorFormDTO formDTO);
 
+	/**
+	 * @Description  查询评价人和评价人头像
+	 * @param formDTO
+	 * @author zxc
+	 */
+	@PostMapping("/epmetuser/userresiinfo/getuserresiinfolist")
+	Result<List<UserResiInfoResultDTO>> getUserResiInfoList(@RequestBody UserResiInfoListFormDTO formDTO);
+
+
 }
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java
index c4103e74dc..992cf49c72 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java
@@ -1,19 +1,16 @@
 package com.epmet.feign;
 
-import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.constant.ServiceConstant;
-import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.InitEvaluationResultDTO;
-import com.epmet.dto.result.IssueResultDTO;
-import com.epmet.dto.result.VoteResultDTO;
-import com.epmet.dto.result.VotingTrendResultDTO;
+import com.epmet.dto.result.*;
 import com.epmet.feign.fallback.GovIssueFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import java.util.List;
+
 
 /**
  * @Description Feign调用gov-issue-server模块
@@ -56,7 +53,7 @@ public interface GovIssueFeignClient {
     Result vote(@RequestBody VoteFormDTO issueId);
 
     /**
-     * @Description  满意度评价初始化
+     * @Description  满意度评价初始化——已关闭
      * @param formDTO
      * @author zxc
      */
@@ -71,4 +68,12 @@ public interface GovIssueFeignClient {
     @PostMapping("/gov/issue/issuesatisfactiondetail/evaluate")
     Result evaluate(@RequestBody EvaluateFormDTO formDTO);
 
+    /**
+     * @Description  满意度评价列表——已关闭
+     * @param formDTO
+     * @author zxc
+     */
+    @PostMapping("/gov/issue/issuesatisfactiondetail/evaluationlist")
+    Result<List<EvaluationListResultDTO>> evaluationList(@RequestBody EvaluationListFormDTO formDTO);
+
 }
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovProjectFeignClient.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovProjectFeignClient.java
new file mode 100644
index 0000000000..1d9f6bcabc
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovProjectFeignClient.java
@@ -0,0 +1,49 @@
+package com.epmet.feign;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.ProjectEvaluateFormDTO;
+import com.epmet.dto.form.ProjectEvaluationListFormDTO;
+import com.epmet.dto.form.ProjectInitEvaluationFormDTO;
+import com.epmet.dto.result.ProjectEvaluationListResultDTO;
+import com.epmet.dto.result.ProjectInitEvaluationResultDTO;
+import com.epmet.feign.fallback.GovProjectFeignClientFallBack;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+
+/**
+ * @Description Feign调用gov-project-server模块
+ * @ClassName GovProjectFeignClient
+ * url = "localhost:8102"
+ */
+@FeignClient(name = ServiceConstant.GOV_PROJECT_SERVER, fallback = GovProjectFeignClientFallBack.class)
+public interface GovProjectFeignClient {
+
+    /**
+     * @Description  提交满意度评价初始化——已转项目
+     * @param formDTO
+     * @author zxc
+     */
+    @PostMapping("/gov/project/projectsatisfactiondetail/projectinitevaluation")
+    Result<ProjectInitEvaluationResultDTO> projectInitEvaluation(@RequestBody ProjectInitEvaluationFormDTO formDTO);
+
+    /**
+     * @Description  提交满意度评价——已转项目
+     * @param projectEvaluate
+     * @author zxc
+     */
+    @PostMapping("/gov/project/projectsatisfactiondetail/projectevaluate")
+    Result projectEvaluate(@RequestBody ProjectEvaluateFormDTO projectEvaluate);
+
+    /**
+     * @Description  满意度评价列表——已转项目
+     * @param formDTO
+     * @author zxc
+     */
+    @PostMapping("/gov/project/projectsatisfactiondetail/projectevaluationlist")
+    Result<List<ProjectEvaluationListResultDTO>> projectEvaluationList(ProjectEvaluationListFormDTO formDTO);
+}
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
index e7003949aa..8cdf3782bb 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
@@ -4,10 +4,15 @@ import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.IssueInitiatorFormDTO;
+import com.epmet.dto.form.UserResiInfoListFormDTO;
+import com.epmet.dto.result.EvaluationListResultDTO;
 import com.epmet.dto.result.IssueInitiatorResultDTO;
+import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.feign.EpmetUserFeignClient;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * @Auther zxc
  * @Create 2020-05-11 10:33
@@ -25,4 +30,9 @@ public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
     public Result<IssueInitiatorResultDTO> selectIssueInitiator(IssueInitiatorFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "selectIssueInitiator", formDTO);
     }
+
+    @Override
+    public Result<List<UserResiInfoResultDTO>> getUserResiInfoList(UserResiInfoListFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserResiInfoList", formDTO);
+    }
 }
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java
index c464a6f5a3..03ba888efa 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java
@@ -5,13 +5,12 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.InitEvaluationResultDTO;
-import com.epmet.dto.result.IssueResultDTO;
-import com.epmet.dto.result.VoteResultDTO;
-import com.epmet.dto.result.VotingTrendResultDTO;
+import com.epmet.dto.result.*;
 import com.epmet.feign.GovIssueFeignClient;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * @Description Feign
  * @ClassName GovIssueFeginFallBack
@@ -48,4 +47,9 @@ public class GovIssueFeignClientFallBack implements GovIssueFeignClient {
     public Result<InitEvaluationResultDTO> evaluate(EvaluateFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "evaluate", formDTO);
     }
+
+    @Override
+    public Result<List<EvaluationListResultDTO>> evaluationList(EvaluationListFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "evaluationList", formDTO);
+    }
 }
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovProjectFeignClientFallBack.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovProjectFeignClientFallBack.java
new file mode 100644
index 0000000000..a68d848f90
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovProjectFeignClientFallBack.java
@@ -0,0 +1,37 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.ProjectEvaluateFormDTO;
+import com.epmet.dto.form.ProjectEvaluationListFormDTO;
+import com.epmet.dto.form.ProjectInitEvaluationFormDTO;
+import com.epmet.dto.result.ProjectEvaluationListResultDTO;
+import com.epmet.dto.result.ProjectInitEvaluationResultDTO;
+import com.epmet.feign.GovProjectFeignClient;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @Description Feign
+ * @ClassName GovProjectFeignClientFallBack
+ */
+@Component
+public class GovProjectFeignClientFallBack implements GovProjectFeignClient {
+
+    @Override
+    public Result<ProjectInitEvaluationResultDTO> projectInitEvaluation(ProjectInitEvaluationFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "projectInitEvaluation", formDTO);
+    }
+
+    @Override
+    public Result projectEvaluate(ProjectEvaluateFormDTO projectEvaluate) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "projectEvaluate", projectEvaluate);
+    }
+
+    @Override
+    public Result<List<ProjectEvaluationListResultDTO>> projectEvaluationList(ProjectEvaluationListFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "projectEvaluationList", formDTO);
+    }
+}
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueService.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueService.java
index 20eace94e3..7127ec9eee 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueService.java
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueService.java
@@ -1,15 +1,13 @@
 package com.epmet.service;
 
+import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.security.dto.TokenDto;
-import com.epmet.dto.form.EvaluateFormDTO;
-import com.epmet.dto.form.IssueDetailFormDTO;
-import com.epmet.dto.form.IssueIdFormDTO;
-import com.epmet.dto.result.InitEvaluationResultDTO;
-import com.epmet.dto.result.IssueDetailResultDTO;
-import com.epmet.dto.result.VoteResultDTO;
-import com.epmet.dto.result.VotingTrendResultDTO;
+import com.epmet.dto.form.*;
+import com.epmet.dto.result.*;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import java.util.List;
+
 /**
  * @Author zxc
  * @CreateTime 2020/5/11 9:44
@@ -54,7 +52,7 @@ public interface IssueService {
     VoteResultDTO vote(IssueIdFormDTO issueId);
 
     /**
-     * @Description  满意度评价初始化
+     * @Description  满意度评价初始化——已关闭
      * @param tokenDto
      * @param issueId
      * @author zxc
@@ -62,10 +60,39 @@ public interface IssueService {
     InitEvaluationResultDTO initEvaluation(TokenDto tokenDto, IssueIdFormDTO issueId);
 
     /**
-     * @Description  提交满意度评价
+     * @Description  满意度评价初始化——已转项目
+     * @param tokenDto
+     * @param projectId
+     * @author zxc
+     */
+    ProjectInitEvaluationResultDTO projectInitEvaluation(TokenDto tokenDto, ProjectIdFormDTO projectId);
+
+    /**
+     * @Description  提交满意度评价——已关闭
      * @param evaluateFormDTO
      * @author zxc
      */
     void evaluate(TokenDto tokenDto,EvaluateFormDTO evaluateFormDTO);
 
+    /**
+     * @Description  提交满意度评价——已转项目
+     * @param projectEvaluateFormDTO
+     * @author zxc
+     */
+    void projectEvaluate(TokenDto tokenDto, ProjectEvaluateFormDTO projectEvaluateFormDTO);
+
+    /**
+     * @Description  满意度评价列表——已关闭
+     * @param formDTO
+     * @author zxc
+     */
+    List<EvaluationListResultDTO> evaluationList(EvaluationListFormDTO formDTO);
+
+    /**
+     * @Description  满意度评价列表——已转项目
+     * @param formDTO
+     * @author zxc
+     */
+    List<EvaluationListResultDTO> projectEvaluationList(ProjectEvaluationListFormDTO formDTO);
+
 }
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
index 2f520351cf..dd197c2d98 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
@@ -1,20 +1,25 @@
 package com.epmet.service.impl;
 
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.constat.HallConstat;
 import com.epmet.dto.TopicInfoDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
-import com.epmet.feign.EpmetUserFeignClient;
-import com.epmet.feign.GovIssueFeignClient;
-import com.epmet.feign.GovOrgFeignClient;
-import com.epmet.feign.ResiGroupFeignClient;
+import com.epmet.feign.*;
 import com.epmet.service.IssueService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * @Author zxc
  * @CreateTime 2020/5/11 9:46
@@ -30,6 +35,8 @@ public class IssueServiceImpl implements IssueService {
     private ResiGroupFeignClient resiGroupFeignClient;
     @Autowired
     private GovIssueFeignClient govIssueFeignClient;
+    @Autowired
+    private GovProjectFeignClient govProjectFeignClient;
 
     /**
      * @Description  议题详情
@@ -123,7 +130,7 @@ public class IssueServiceImpl implements IssueService {
     }
 
     /**
-     * @Description  满意度评价初始化
+     * @Description  满意度评价初始化——已关闭
      * @param tokenDto
      * @param issueId
      * @author zxc
@@ -138,7 +145,22 @@ public class IssueServiceImpl implements IssueService {
     }
 
     /**
-     * @Description  提交满意度评价
+     * @Description  满意度评价初始化——已转项目
+     * @param tokenDto
+     * @param projectId
+     * @author zxc
+     */
+    @Override
+    public ProjectInitEvaluationResultDTO projectInitEvaluation(TokenDto tokenDto, ProjectIdFormDTO projectId) {
+        ProjectInitEvaluationFormDTO formDTO = new ProjectInitEvaluationFormDTO();
+        formDTO.setProjectId(projectId.getProjectId());
+        formDTO.setUserId(tokenDto.getUserId());
+        Result<ProjectInitEvaluationResultDTO> projectInitEvaluationResult = govProjectFeignClient.projectInitEvaluation(formDTO);
+        return projectInitEvaluationResult.getData();
+    }
+
+    /**
+     * @Description  提交满意度评价——已关闭
      * @param evaluateFormDTO
      * @author zxc
      */
@@ -147,4 +169,74 @@ public class IssueServiceImpl implements IssueService {
         evaluateFormDTO.setUserId(tokenDto.getUserId());
         govIssueFeignClient.evaluate(evaluateFormDTO);
     }
+
+    /**
+     * @Description  提交满意度评价——已转项目
+     * @param projectEvaluateFormDTO
+     * @author zxc
+     */
+    @Override
+    public void projectEvaluate(TokenDto tokenDto, ProjectEvaluateFormDTO projectEvaluateFormDTO) {
+        projectEvaluateFormDTO.setUserId(tokenDto.getUserId());
+        govProjectFeignClient.projectEvaluate(projectEvaluateFormDTO);
+    }
+
+    /**
+     * @Description  满意度评价列表——已关闭
+     * @param formDTO
+     * @author zxc
+     */
+    @Override
+    public List<EvaluationListResultDTO> evaluationList(EvaluationListFormDTO formDTO) {
+        Result<List<EvaluationListResultDTO>> listResult = govIssueFeignClient.evaluationList(formDTO);
+        List<EvaluationListResultDTO> data = listResult.getData();
+        if (data.size()==NumConstant.ZERO||data==null){
+            return new ArrayList<>();
+        }
+        //获取头像和昵称   eg:山东路168号-周先生
+        List<String> userIds = data.stream().map(EvaluationListResultDTO::getUserId).collect(Collectors.toList());
+        UserResiInfoListFormDTO userResiInfo = new UserResiInfoListFormDTO();
+        userResiInfo.setUserIdList(userIds);
+        List<UserResiInfoResultDTO> userResiInfoList = userFeignClient.getUserResiInfoList(userResiInfo).getData();
+        if (null == userResiInfoList || userResiInfoList.size() < NumConstant.ONE) {
+            throw new RenException(HallConstat.SELECT_USERINFO_EXCEPTION);
+        }
+        List<EvaluationListResultDTO> resultList = data.stream().flatMap(evaluation -> userResiInfoList.stream().filter(user ->
+                evaluation.getUserId().equals(user.getUserId())).map(userInfo -> {
+            EvaluationListResultDTO resultDTO = ConvertUtils.sourceToTarget(evaluation, EvaluationListResultDTO.class);
+            resultDTO.setUserNickName(null == userInfo.getShowName() ? "" : userInfo.getShowName());
+            resultDTO.setUserHeadPhoto(null == userInfo.getHeadPhoto() ? "" : userInfo.getHeadPhoto());
+            return resultDTO;
+        })).collect(Collectors.toList());
+        return resultList;
+    }
+
+    /**
+     * @Description  满意度评价列表——已转项目
+     * @param formDTO
+     * @author zxc
+     */
+    @Override
+    public List<EvaluationListResultDTO> projectEvaluationList(ProjectEvaluationListFormDTO formDTO) {
+        List<ProjectEvaluationListResultDTO> listResult = govProjectFeignClient.projectEvaluationList(formDTO).getData();
+        if (listResult.size()==NumConstant.ZERO||listResult.equals(null)){
+            return new ArrayList<>();
+        }
+        //获取头像和昵称   eg:山东路168号-周先生
+        List<String> userIds = listResult.stream().map(ProjectEvaluationListResultDTO::getUserId).collect(Collectors.toList());
+        UserResiInfoListFormDTO userResiInfo = new UserResiInfoListFormDTO();
+        userResiInfo.setUserIdList(userIds);
+        List<UserResiInfoResultDTO> userResiInfoList = userFeignClient.getUserResiInfoList(userResiInfo).getData();
+        if (null == userResiInfoList || userResiInfoList.size() < NumConstant.ONE) {
+            throw new RenException(HallConstat.SELECT_USERINFO_EXCEPTION);
+        }
+        List<EvaluationListResultDTO> resultList = listResult.stream().flatMap(evaluation -> userResiInfoList.stream().filter(user ->
+                evaluation.getUserId().equals(user.getUserId())).map(userInfo -> {
+            EvaluationListResultDTO resultDTO = ConvertUtils.sourceToTarget(evaluation, EvaluationListResultDTO.class);
+            resultDTO.setUserNickName(null == userInfo.getShowName() ? "" : userInfo.getShowName());
+            resultDTO.setUserHeadPhoto(null == userInfo.getHeadPhoto() ? "" : userInfo.getHeadPhoto());
+            return resultDTO;
+        })).collect(Collectors.toList());
+        return resultList;
+    }
 }
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EvaluationListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EvaluationListResultDTO.java
new file mode 100644
index 0000000000..0a286112d7
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EvaluationListResultDTO.java
@@ -0,0 +1,47 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 满意度评价列表——已关闭
+ */
+@Data
+public class EvaluationListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -1L;
+
+    /**
+     * 评价用户Id
+     */
+    private String userId;
+
+    /**
+     * 评价用户（山东路168-尹女士）
+     */
+    private String userNickName;
+
+    /**
+     * 满意度 - 不满意:bad、基本满意:good、非常满意:perfect
+     */
+    private String satisfaction;
+
+    /**
+     * 评价时间
+     */
+    private Long evaluateTime;
+
+    /**
+     * 评价内容
+     */
+    private String evaluateContent;
+
+    /**
+     * 用户头像
+     */
+    private String userHeadPhoto;
+
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserWechatService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserWechatService.java
index 8d6f6cbdb0..5dde082f0f 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserWechatService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserWechatService.java
@@ -1,7 +1,6 @@
 package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
-import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.result.CertifiedResultDTO;
 import com.epmet.entity.UserWechatEntity;
 
@@ -15,6 +14,11 @@ import java.util.List;
  */
 public interface UserWechatService extends BaseService<UserWechatEntity> {
 
+    /**
+     * @Description  获取头像
+     * @param certifiedResultDTOS
+     * @author zxc
+     */
     List<CertifiedResultDTO> selectUserHeadPhotoByUserId(List<CertifiedResultDTO> certifiedResultDTOS);
 
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserWechatServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserWechatServiceImpl.java
index 3231224271..2f2f27b7d2 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserWechatServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserWechatServiceImpl.java
@@ -1,6 +1,5 @@
 package com.epmet.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.dao.UserWechatDao;
 import com.epmet.dto.UserHeadPhotoDTO;
@@ -10,8 +9,6 @@ import com.epmet.service.UserWechatService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.io.Serializable;
-import java.util.Collection;
 import java.util.List;
 
 /**
@@ -26,6 +23,11 @@ public class UserWechatServiceImpl extends BaseServiceImpl<UserWechatDao, UserWe
     @Autowired
     private UserWechatDao userWechatDao;
 
+    /**
+     * @Description  获取头像
+     * @param certifiedResultDTOS
+     * @author zxc
+     */
     @Override
     public List<CertifiedResultDTO> selectUserHeadPhotoByUserId(List<CertifiedResultDTO> certifiedResultDTOS) {
         List<UserHeadPhotoDTO> userHeadPhotoDTOS = userWechatDao.selectUserHeadPhotoByUserId(certifiedResultDTOS);
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml
index c889d350da..16b1f13c66 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml
@@ -121,7 +121,7 @@
                     '先生'
                     WHEN uw.sex = '2' THEN
                     '女士'
-                    ELSE '某某'
+                    ELSE '先生/女士'
                 END
                 ) AS issueInitiator
         FROM

From debc462e8c8a96eedbff18e6a44ef5bf72cf9f24 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 14 May 2020 00:08:14 +0800
Subject: [PATCH 37/45] =?UTF-8?q?=E6=94=BF=E5=BA=9C=E7=AB=AF=E5=BE=85?=
 =?UTF-8?q?=E5=8A=9E=E4=BA=8B=E9=A1=B9=EF=BC=88reddot=EF=BC=89=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E3=80=81=E6=9F=A5=E8=AF=A2=E7=BD=91=E6=A0=BC=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91=E5=8F=8A=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=EF=BC=8C=E6=B6=89=E5=8F=8A=E5=90=84=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/commons/tools/redis/RedisKeys.java  |  22 -
 .../epmet/commons/tools/redis/RedisUtils.java |  31 ++
 .../com/epmet/dto/form/RedDotFormDTO.java     |  29 ++
 .../result/GridProcessingCountResultDTO.java  |  24 +
 .../com/epmet/dto/result/RedDotResultDTO.java |  28 +
 .../WorkGrassRootsFunctionConstant.java       |  30 ++
 .../epmet/controller/RemindController.java    |  48 ++
 .../com/epmet/controller/TestFormDTO1.java    |  15 +
 .../com/epmet/controller/TestResultDTO1.java  |  15 +
 .../com/epmet/feign/GovIssueFeignClient.java  |  29 ++
 .../com/epmet/feign/GovOrgFeignClient.java    |  29 ++
 .../com/epmet/feign/ResiGroupFeignClient.java |  24 +-
 .../feign/ResiPartymemberFeignClient.java     |  21 +
 .../fallback/GovIssueFeignClientFallBack.java |  23 +
 .../fallback/GovOrgFeignClientFallBack.java   |  27 +
 .../ResiGroupFeignClientFallBack.java         |  13 +
 .../ResiPartymemberFeignClientFallBack.java   |  11 +
 .../java/com/epmet/service/RemindService.java |  24 +
 .../epmet/service/impl/RemindServiceImpl.java | 174 +++++++
 .../result/GridVotingIssueCountResultDTO.java |  24 +
 .../com/epmet/constant/GovIssueRedisKeys.java |  22 +
 .../com/epmet/controller/IssueController.java |  15 +
 .../java/com/epmet/redis/GovIssueRedis.java   |  33 ++
 .../java/com/epmet/service/IssueService.java  |  11 +
 .../epmet/service/impl/IssueServiceImpl.java  |  18 +
 .../result/GridProcessingCountResultDTO.java  |  24 +
 .../epmet/dto/result/StaffGridResultDTO.java  |  37 ++
 .../controller/StaffAgencyController.java     |   6 +-
 .../com/epmet/feign/GovIssueFeignClient.java  |  29 ++
 .../com/epmet/feign/ResiGroupFeignClient.java |  30 ++
 .../feign/ResiPartymemberFeignClient.java     |  41 ++
 .../fallback/GovIssueFeignClientFallBack.java |  23 +
 .../ResiGroupFeignClientFallBack.java         |  25 +
 .../ResiPartymemberFeignClientFallBack.java   |  29 ++
 .../com/epmet/service/StaffAgencyService.java |   7 +-
 .../service/impl/StaffAgencyServiceImpl.java  | 151 +++++-
 .../group/GroupProcessingCountResultDTO.java  |  25 +
 .../resi-group/resi-group-server/pom.xml      |   4 +-
 .../modules/constant/ResiGroupRedisKeys.java  |  53 ++
 .../group/controller/ResiGroupController.java | 478 +++++++++---------
 .../group/controller/TestFormDTO2.java        |  15 +
 .../group/controller/TestResultDTO2.java      |  15 +
 .../modules/group/redis/ResiGroupRedis.java   |  69 ++-
 .../group/service/ResiGroupService.java       |  30 +-
 .../service/impl/ResiGroupServiceImpl.java    | 104 ++--
 .../member/redis/ResiGroupMemberRedis.java    |   7 +-
 .../service/impl/ResiTopicServiceImpl.java    |   5 +-
 .../resi-hall-server/resi-hall-server.iml     |   5 +
 .../PartyAuthProcessingCountResultDTO.java    |  25 +
 .../result/ResiProcessingCountResultDTO.java  |  25 +
 .../constant/ResiPartyMemberRedisKeys.java    |  35 ++
 .../controller/PartymemberInfoController.java |  14 +
 .../service/PartymemberInfoService.java       |   9 +
 .../impl/PartyMemberConfirmServiceImpl.java   |  11 +-
 .../impl/PartymemberInfoServiceImpl.java      |  18 +-
 .../ResiWarmheartedApplyController.java       |  13 +
 .../service/ResiWarmheartedApplyService.java  |  10 +
 .../impl/ResiWarmheartedApplyServiceImpl.java |  36 +-
 .../com/epmet/redis/ResiPartyMemberRedis.java | 168 ++++++
 59 files changed, 1963 insertions(+), 353 deletions(-)
 create mode 100644 epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/RedDotFormDTO.java
 create mode 100644 epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/GridProcessingCountResultDTO.java
 create mode 100644 epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/RedDotResultDTO.java
 create mode 100644 epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/constant/WorkGrassRootsFunctionConstant.java
 create mode 100644 epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/RemindController.java
 create mode 100644 epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/TestFormDTO1.java
 create mode 100644 epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/TestResultDTO1.java
 create mode 100644 epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java
 create mode 100644 epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
 create mode 100644 epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java
 create mode 100644 epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
 create mode 100644 epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/RemindService.java
 create mode 100644 epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/RemindServiceImpl.java
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/GridVotingIssueCountResultDTO.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/GovIssueRedisKeys.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/GovIssueRedis.java
 create mode 100644 epmet-module/gov-mine/gov-mine-client/src/main/java/com/epmet/dto/result/GridProcessingCountResultDTO.java
 create mode 100644 epmet-module/gov-mine/gov-mine-client/src/main/java/com/epmet/dto/result/StaffGridResultDTO.java
 create mode 100644 epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java
 create mode 100644 epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java
 create mode 100644 epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/ResiPartymemberFeignClient.java
 create mode 100644 epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java
 create mode 100644 epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java
 create mode 100644 epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java
 create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/GroupProcessingCountResultDTO.java
 create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/constant/ResiGroupRedisKeys.java
 create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/TestFormDTO2.java
 create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/TestResultDTO2.java
 create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/PartyAuthProcessingCountResultDTO.java
 create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/result/ResiProcessingCountResultDTO.java
 create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/ResiPartyMemberRedisKeys.java
 create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/redis/ResiPartyMemberRedis.java

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
index d90feff39e..3670e1f9a6 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
@@ -174,28 +174,6 @@ public class RedisKeys {
 		return rootPrefix.concat("resiregister:confirm:").concat(userId).concat("-").concat(mobile).concat("-*");
 	}
 
-	/**
-	 * @Description 小组缓存信息key
-	 * @Param 组Id
-	 * @return epmet:resi:group:groupId
-	 * @Author wangc
-	 * @Date 2020.04.13 11:27
-	 **/
-	public static String getResiGroupInfoKey(String groupId){
-		return rootPrefix.concat("resi:group:").concat(groupId);
-	}
-
-	/**
-	 * @Description 组成员信息缓存key
-	 * @Param 组Id 用户Id
-	 * @return epmet:resi:group:member:groupId:userId
-	 * @Author wangc
-	 * @Date 2020.04.13 13:40
-	 **/
-	public static String getResiGroupMemberInfoKey(String groupId, String userId){
-		return rootPrefix.concat("resi:group:member:").concat(groupId).concat(":").concat(userId);
-	}
-
 	/**
 	 * @param phone   手机号
 	 * @param smsCode 短信验证码
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java
index b68418626a..921a7e5576 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java
@@ -13,6 +13,7 @@ import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactor
 import org.springframework.data.redis.core.HashOperations;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.support.atomic.RedisAtomicLong;
 import org.springframework.stereotype.Component;
 
 import java.util.Collection;
@@ -210,4 +211,34 @@ public class RedisUtils {
         setString(key, value, DEFAULT_EXPIRE);
     }
 
+    /**
+     * @param key
+     * @return java.lang.Long
+     * @Author yinzuomei
+     * @Description 将 key 中储存的数字值+1 ，返回结果
+     * @Date 2020/5/12 18:55
+     **/
+    public Long incrementAndGet(String key) {
+        RedisAtomicLong entityIdCounter = new RedisAtomicLong(key, redisTemplate.getConnectionFactory());
+        //前者，先+1，再返回
+        Long count = entityIdCounter.incrementAndGet();
+        if (count == 0) {
+            System.out.println("返回值=0");
+            count = entityIdCounter.incrementAndGet();
+        }
+        return count;
+    }
+
+    /**
+     * @param key
+     * @return java.lang.Long
+     * @Author yinzuomei
+     * @Description 将key中储存的数字值-1 ，返回结果
+     * @Date 2020/5/13 9:39
+     **/
+    public Long decrementAndGet(String key) {
+        RedisAtomicLong entityIdCounter = new RedisAtomicLong(key, redisTemplate.getConnectionFactory());
+        Long count = entityIdCounter.decrementAndGet();
+        return count;
+    }
 }
diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/RedDotFormDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/RedDotFormDTO.java
new file mode 100644
index 0000000000..52b9d21b44
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/RedDotFormDTO.java
@@ -0,0 +1,29 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 待办提醒（红点）入参
+ * @Author yinzuomei
+ * @Date 2020/5/13 14:22
+ */
+@Data
+public class RedDotFormDTO implements Serializable {
+    private static final long serialVersionUID = -3108932695005624852L;
+
+    /**
+     * token中获取，不能为空
+     */
+    @NotBlank(message = "staffId不能为空(异常:TokenDto中userId为空)")
+    private String staffId;
+
+    /**
+     * 网格ID
+     */
+    @NotBlank(message = "网格id不能为空")
+    private String gridId;
+}
+
diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/GridProcessingCountResultDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/GridProcessingCountResultDTO.java
new file mode 100644
index 0000000000..3d5a599425
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/GridProcessingCountResultDTO.java
@@ -0,0 +1,24 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 政府端基层治理群组管理、议题管理、居民管理、党员认证查询待办数量feign统一返参
+ * @Author yinzuomei
+ * @Date 2020/5/13 21:43
+ */
+@Data
+public class GridProcessingCountResultDTO implements Serializable {
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 待审核的小组总数
+     */
+    private Long count;
+}
+
diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/RedDotResultDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/RedDotResultDTO.java
new file mode 100644
index 0000000000..9255f78771
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/RedDotResultDTO.java
@@ -0,0 +1,28 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 待办提醒（红点）返参
+ * @Author yinzuomei
+ * @Date 2020/5/13 14:23
+ */
+@Data
+public class RedDotResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -7872984015211318329L;
+
+    /**
+     * 其它网格是否有待办事项true,false
+     */
+    private Boolean otherGridRedDot;
+
+    /**
+     * 需要显示的功能key（群组管理：work_grassroots_group，居民管理：work_grassroots_resi，党员认证：work_grassroots_partyauth，议题管理：work_grassroots_issue）
+     */
+    private List<String> functionList;
+}
+
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/constant/WorkGrassRootsFunctionConstant.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/constant/WorkGrassRootsFunctionConstant.java
new file mode 100644
index 0000000000..1e52667fff
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/constant/WorkGrassRootsFunctionConstant.java
@@ -0,0 +1,30 @@
+package com.epmet.constant;
+
+/**
+ * @Description 基层治理菜单key，用于是否显示红点提示 待办提醒（红点）接口反参用
+ * @Author yinzuomei
+ * @Date 2020/5/13 14:47
+ */
+public class WorkGrassRootsFunctionConstant {
+
+    /**
+     * 群组管理
+     */
+    public static final  String WORK_GRASSROOTS_GROUP="work_grassroots_group";
+
+    /**
+     * 居民管理
+     */
+    public static final String WORK_GRASSROOTS_RESI="work_grassroots_resi";
+
+    /**
+     * 党员认证
+     */
+    public static final String WORK_GRASSROOTS_PARTYAUTH="work_grassroots_partyauth";
+
+    /**
+     * 议题管理
+     */
+    public static final String WORK_GRASSROOTS_ISSUE="work_grassroots_issue";
+}
+
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/RemindController.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/RemindController.java
new file mode 100644
index 0000000000..894fa60ab7
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/RemindController.java
@@ -0,0 +1,48 @@
+package com.epmet.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.dto.form.RedDotFormDTO;
+import com.epmet.dto.result.RedDotResultDTO;
+import com.epmet.service.RemindService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @Description 基层治理待办事项提醒
+ * @Author yinzuomei
+ * @Date 2020/5/13 14:17
+ */
+@RestController
+@RequestMapping("remind")
+public class RemindController {
+    @Autowired
+    private RemindService remindService;
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.RedDotResultDTO>
+     * @param formDTO
+     * @Author yinzuomei
+     * @Description 根据网格id，查询基层治理下网格各功能菜单是否显示红点，以及除当前网格外，其他网格是否有待办事项
+     * @Date 2020/5/13 14:28
+     **/
+    @PostMapping("reddot")
+    public Result<RedDotResultDTO> queryGridRedDot(@LoginUser TokenDto tokenDto, @RequestBody RedDotFormDTO formDTO){
+        formDTO.setStaffId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(formDTO);
+        RedDotResultDTO redDotResultDTO=remindService.queryGridRedDot(formDTO);
+        return new Result<RedDotResultDTO>().ok(redDotResultDTO);
+    }
+
+    @GetMapping("test")
+    public Result<TestResultDTO1> test( ){
+        TestFormDTO1 testFormDTO1=new TestFormDTO1();
+        testFormDTO1.setId("111");
+        testFormDTO1.setName("啊啊啊");
+        TestResultDTO1 testResultDTO1=remindService.test(testFormDTO1);
+        return new Result<TestResultDTO1>().ok(testResultDTO1);
+    }
+}
+
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/TestFormDTO1.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/TestFormDTO1.java
new file mode 100644
index 0000000000..564ca8426a
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/TestFormDTO1.java
@@ -0,0 +1,15 @@
+package com.epmet.controller;
+
+import lombok.Data;
+
+/**
+ * @Description 测试feign
+ * @Author yinzuomei
+ * @Date 2020/5/13 18:23
+ */
+@Data
+public class TestFormDTO1 {
+    private String id;
+    private String name;
+}
+
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/TestResultDTO1.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/TestResultDTO1.java
new file mode 100644
index 0000000000..04348391bc
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/TestResultDTO1.java
@@ -0,0 +1,15 @@
+package com.epmet.controller;
+
+import lombok.Data;
+
+/**
+ * @Description 测试feign
+ * @Author yinzuomei
+ * @Date 2020/5/13 18:23
+ */
+@Data
+public class TestResultDTO1 {
+    private String resultId;
+    private String resultName;
+}
+
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java
new file mode 100644
index 0000000000..1b7642c82a
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java
@@ -0,0 +1,29 @@
+package com.epmet.feign;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.feign.fallback.GovIssueFeignClientFallBack;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * @Description 议题管理服务
+ * @Author yinzuomei
+ * @Date 2020/5/13 15:45
+ */
+@FeignClient(name = ServiceConstant.GOV_ISSUE_SERVER, fallback = GovIssueFeignClientFallBack.class)
+public interface GovIssueFeignClient {
+    /**
+     * @param gridIdList
+     * @return com.epmet.commons.tools.utils.Result
+     * @Author yinzuomei
+     * @Description 查询网格下表决中的议题
+     * @Date 2020/5/13 15:47
+     **/
+    @PostMapping(value = "/gov/issue/issue/queryvotingissuecount",consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result queryVotingIssueCount(@RequestBody List<String> gridIdList);
+}
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
new file mode 100644
index 0000000000..97c3ce6b7f
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
@@ -0,0 +1,29 @@
+package com.epmet.feign;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
+import com.epmet.feign.fallback.GovOrgFeignClientFallBack;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+
+import java.util.List;
+
+/**
+ * @Description
+ * @Author sun
+ */
+@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class)
+public interface GovOrgFeignClient {
+
+    /**
+     * @param userId
+     * @return
+     * @Description 根据userId查询该用户涉及的所有网格列表
+     * @Author sun
+     */
+    @GetMapping(value = "/gov/org/customergrid/getmygrids/{userId}")
+    Result<List<CustomerGridByUserIdResultDTO>> getMyGrids(@PathVariable("userId") String userId);
+
+}
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java
index 4449e64962..18815b635a 100644
--- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java
@@ -2,20 +2,22 @@ package com.epmet.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.controller.TestFormDTO1;
+import com.epmet.controller.TestResultDTO1;
+import com.epmet.dto.result.GridProcessingCountResultDTO;
 import com.epmet.feign.fallback.ResiGroupFeignClientFallBack;
 import com.epmet.resi.group.dto.comment.form.ResiQueryCommentFormDTO;
 import com.epmet.resi.group.dto.comment.result.ResiCommentResultDTO;
-import com.epmet.resi.group.dto.group.form.GovGroupSummarizeFromDTO;
-import com.epmet.resi.group.dto.group.form.GroupAuditedFromDTO;
-import com.epmet.resi.group.dto.group.result.*;
 import com.epmet.resi.group.dto.group.form.*;
+import com.epmet.resi.group.dto.group.result.*;
 import com.epmet.resi.group.dto.topic.form.ResiTopicDetailFormDTO;
 import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO;
 import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO;
 import com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
-
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
@@ -137,4 +139,16 @@ public interface ResiGroupFeignClient {
 	@PostMapping("/resi/group/comment/getcommentlistoftopicgov")
 	Result<List<ResiCommentResultDTO>> getCommentListOfTopicGov(ResiQueryCommentFormDTO queryCommentFormDTO);
 
-	}
+	/**
+	 * @param gridIdList
+	 * @return com.epmet.commons.tools.utils.Result
+	 * @Author yinzuomei
+	 * @Description 查询网格下待审核的小组总数
+	 * @Date 2020/5/13 15:49
+	 **/
+	@PostMapping(value = "/resi/group/group/groupprocessingcount",consumes = MediaType.APPLICATION_JSON_VALUE)
+	Result<List<GridProcessingCountResultDTO>> queryGroupProcessingCount(@RequestBody List<String> gridIdList);
+
+	@PostMapping(value = "/resi/group/group/test",consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<TestResultDTO1> test(@RequestBody TestFormDTO1 testFormDTO1);
+}
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiPartymemberFeignClient.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiPartymemberFeignClient.java
index c5be8fc73a..9d4cd796fa 100644
--- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiPartymemberFeignClient.java
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiPartymemberFeignClient.java
@@ -6,6 +6,7 @@ import com.epmet.dto.form.CertifiedDetailFormDTO;
 import com.epmet.dto.form.CertifiedFormDTO;
 import com.epmet.dto.result.CertifiedDetailResultDTO;
 import com.epmet.dto.result.CertifiedResultDTO;
+import com.epmet.dto.result.GridProcessingCountResultDTO;
 import com.epmet.feign.fallback.ResiPartymemberFeignClientFallBack;
 import com.epmet.resi.partymember.dto.partymember.form.*;
 import com.epmet.resi.partymember.dto.partymember.result.*;
@@ -148,4 +149,24 @@ public interface ResiPartymemberFeignClient {
 	@PostMapping("/resi/partymember/confirm/rejecteddetail")
 	Result<RejectedDetailResultDTO> rejectedDetail(@RequestBody RejectedDetailFromDTO fromDTO);
 
+	/**
+	 * @param gridIdList
+	 * @return com.epmet.commons.tools.utils.Result
+	 * @Author yinzuomei
+	 * @Description 查询网格下待审核的热心居民数
+	 * @Date 2020/5/13 15:41
+	 **/
+	@PostMapping(value = "/resi/partymember/resiwarmheartedapply/queryresiprocessingcount",consumes = MediaType.APPLICATION_JSON_VALUE)
+	Result<List<GridProcessingCountResultDTO>> queryResiProcessingCount(@RequestBody List<String> gridIdList);
+
+	/**
+	 * @param gridIdList
+	 * @return com.epmet.commons.tools.utils.Result
+	 * @Author yinzuomei
+	 * @Description 查询网格下待审核的党员数
+	 * @Date 2020/5/13 15:41
+	 **/
+	@PostMapping(value = "/resi/partymember/partymemberbaseinfo/getworkgrassrootspartyauth",consumes = MediaType.APPLICATION_JSON_VALUE)
+	Result<List<GridProcessingCountResultDTO>> queryPartyMemberProcessingCount(@RequestBody List<String> gridIdList);
+
 }
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java
new file mode 100644
index 0000000000..3a1ccf8714
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java
@@ -0,0 +1,23 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.feign.GovIssueFeignClient;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @Description 议题管理服务
+ * @Author yinzuomei
+ * @Date 2020/5/13 15:45
+ */
+@Component
+public class GovIssueFeignClientFallBack implements GovIssueFeignClient {
+    @Override
+    public Result queryVotingIssueCount(List<String> gridIdList) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "queryVotingIssueCount", gridIdList);
+    }
+}
+
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
new file mode 100644
index 0000000000..bfb238d29a
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
@@ -0,0 +1,27 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.CustomerAgencyDTO;
+import com.epmet.dto.form.LatestGridFormDTO;
+import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
+import com.epmet.dto.result.LatestCustomerResultDTO;
+import com.epmet.feign.GovOrgFeignClient;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @Description
+ * @Author sun
+ */
+@Component
+public class GovOrgFeignClientFallBack implements GovOrgFeignClient {
+
+    @Override
+    public Result<List<CustomerGridByUserIdResultDTO>> getMyGrids(String userId) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getMyGrids", userId);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java
index b4fe70ea34..588142a4f0 100644
--- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java
@@ -3,6 +3,9 @@ package com.epmet.feign.fallback;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.controller.TestFormDTO1;
+import com.epmet.controller.TestResultDTO1;
+import com.epmet.dto.result.GridProcessingCountResultDTO;
 import com.epmet.feign.ResiGroupFeignClient;
 import com.epmet.resi.group.dto.comment.form.ResiQueryCommentFormDTO;
 import com.epmet.resi.group.dto.comment.result.ResiCommentResultDTO;
@@ -107,4 +110,14 @@ public class ResiGroupFeignClientFallBack implements ResiGroupFeignClient {
 	public Result<List<ResiCommentResultDTO>> getCommentListOfTopicGov(ResiQueryCommentFormDTO queryCommentFormDTO) {
 		return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "getCommentListOfTopicGov", queryCommentFormDTO);
 	}
+
+	@Override
+	public Result<List<GridProcessingCountResultDTO>> queryGroupProcessingCount(List<String> gridIdList) {
+		return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "queryGroupProcessingCount", gridIdList);
+	}
+
+	@Override
+	public Result<TestResultDTO1> test(TestFormDTO1 testFormDTO1) {
+		return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "test", testFormDTO1);
+	}
 }
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java
index acab85141f..17d8e6f0d6 100644
--- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java
@@ -7,6 +7,7 @@ import com.epmet.dto.form.CertifiedDetailFormDTO;
 import com.epmet.dto.form.CertifiedFormDTO;
 import com.epmet.dto.result.CertifiedDetailResultDTO;
 import com.epmet.dto.result.CertifiedResultDTO;
+import com.epmet.dto.result.GridProcessingCountResultDTO;
 import com.epmet.feign.ResiPartymemberFeignClient;
 import com.epmet.resi.partymember.dto.partymember.form.*;
 import com.epmet.resi.partymember.dto.partymember.result.*;
@@ -89,4 +90,14 @@ public class ResiPartymemberFeignClientFallBack implements ResiPartymemberFeignC
 		return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "rejectedDetail", fromDTO);
 	}
 
+	@Override
+	public Result<List<GridProcessingCountResultDTO>> queryResiProcessingCount(List<String> gridIdList) {
+		return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "queryResiProcessingCount", gridIdList);
+	}
+
+	@Override
+	public Result<List<GridProcessingCountResultDTO>> queryPartyMemberProcessingCount(List<String> gridIdList) {
+		return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "queryPartyMemberProcessingCount", gridIdList);
+	}
+
 }
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/RemindService.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/RemindService.java
new file mode 100644
index 0000000000..95c577b5ca
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/RemindService.java
@@ -0,0 +1,24 @@
+package com.epmet.service;
+
+import com.epmet.controller.TestFormDTO1;
+import com.epmet.controller.TestResultDTO1;
+import com.epmet.dto.form.RedDotFormDTO;
+import com.epmet.dto.result.RedDotResultDTO;
+
+/**
+ * @Description 基层治理待办事项提醒
+ * @Author yinzuomei
+ * @Date 2020/5/13 14:26
+ */
+public interface RemindService {
+    /**
+     * @return com.epmet.dto.result.RedDotResultDTO
+     * @param formDTO
+     * @Author yinzuomei
+     * @Description 根据网格id，查询基层治理下网格各功能菜单是否显示红点，以及除当前网格外，其他网格是否有待办事项
+     * @Date 2020/5/13 14:34
+     **/
+    RedDotResultDTO queryGridRedDot(RedDotFormDTO formDTO);
+
+    TestResultDTO1 test(TestFormDTO1 testFormDTO1);
+}
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/RemindServiceImpl.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/RemindServiceImpl.java
new file mode 100644
index 0000000000..f9dea745a0
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/RemindServiceImpl.java
@@ -0,0 +1,174 @@
+package com.epmet.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.constant.WorkGrassRootsFunctionConstant;
+import com.epmet.controller.TestFormDTO1;
+import com.epmet.controller.TestResultDTO1;
+import com.epmet.dto.form.RedDotFormDTO;
+import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
+import com.epmet.dto.result.GridProcessingCountResultDTO;
+import com.epmet.dto.result.RedDotResultDTO;
+import com.epmet.feign.GovIssueFeignClient;
+import com.epmet.feign.GovOrgFeignClient;
+import com.epmet.feign.ResiGroupFeignClient;
+import com.epmet.feign.ResiPartymemberFeignClient;
+import com.epmet.service.RemindService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description 基层治理待办事项提醒
+ * @Author yinzuomei
+ * @Date 2020/5/13 14:27
+ */
+@Service
+public class RemindServiceImpl implements RemindService {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private ResiGroupFeignClient resiGroupFeignClient;
+
+    @Autowired
+    private ResiPartymemberFeignClient resiPartymemberFeignClient;
+
+    @Autowired
+    private GovOrgFeignClient govOrgFeignClient;
+
+    @Autowired
+    private GovIssueFeignClient govIssueFeignClient;
+
+    @Override
+    public RedDotResultDTO queryGridRedDot(RedDotFormDTO formDTO) {
+        RedDotResultDTO redDotResultDTO = new RedDotResultDTO();
+        redDotResultDTO.setOtherGridRedDot(false);
+        redDotResultDTO.setFunctionList(getRedDotFunctionList(formDTO.getGridId()));
+        Result<List<CustomerGridByUserIdResultDTO>> govOrgResult = govOrgFeignClient.getMyGrids(formDTO.getStaffId());
+        if (!govOrgResult.success()) {
+            logger.error(String.format("调用gov-org-server服务查询工作人员网格列表失败返回结果", govOrgResult.toString()));
+        }
+        List<CustomerGridByUserIdResultDTO> gridList = govOrgResult.getData();
+        for (CustomerGridByUserIdResultDTO gridInfo : gridList) {
+            if(formDTO.getGridId().equals(gridInfo)){
+                //查询非当前网格的
+                break;
+            }
+            //其他网格，只要存在有待办事项的网格，就需要在工作首页网格名称后面显示红点
+            List<String> functionList = this.getRedDotFunctionList(gridInfo.getGridId());
+            if (null != functionList && functionList.size() > 0) {
+                redDotResultDTO.setOtherGridRedDot(true);
+                break;
+            }
+        }
+        return redDotResultDTO;
+
+    }
+
+    public List<String> getRedDotFunctionList(String gridId) {
+        List<String> functionList = new ArrayList<>();
+        List<String> gridIdList = new ArrayList<>();
+        gridIdList.add(gridId);
+        if (this.getWorkGrassRootsGroup(gridIdList)) {
+            functionList.add(WorkGrassRootsFunctionConstant.WORK_GRASSROOTS_GROUP);
+        }
+        if (this.getWorkGrassRootsResi(gridIdList)) {
+            functionList.add(WorkGrassRootsFunctionConstant.WORK_GRASSROOTS_RESI);
+        }
+        if (getWorkGrassRootsPartyAuth(gridIdList)) {
+            functionList.add(WorkGrassRootsFunctionConstant.WORK_GRASSROOTS_PARTYAUTH);
+        }
+        if (getWorkGrassRootsIssue(gridIdList)) {
+            functionList.add(WorkGrassRootsFunctionConstant.WORK_GRASSROOTS_ISSUE);
+        }
+        return functionList;
+    }
+
+
+    //群组管理: work_grassroots_group
+    public Boolean getWorkGrassRootsGroup(List<String> gridIdList) {
+        Result<List<GridProcessingCountResultDTO>> groupProcessingCountResult = resiGroupFeignClient.queryGroupProcessingCount(gridIdList);
+        if (groupProcessingCountResult.success()) {
+            for (String gridId : gridIdList) {
+                for (GridProcessingCountResultDTO GridProcessingCountResultDTO : groupProcessingCountResult.getData()) {
+                    if (gridId.equals(GridProcessingCountResultDTO.getGridId()) && GridProcessingCountResultDTO.getCount() > 0) {
+                        return true;
+                    }
+                }
+            }
+        }
+        logger.error(String.format("调用%s服务,查询网格%s待审核小组数失败code%s,msg:", ServiceConstant.RESI_GROUP_SERVER, gridIdList.get(0), groupProcessingCountResult.getCode(),
+                groupProcessingCountResult.getMsg()));
+        return false;
+    }
+
+    //居民管理：work_grassroots_resi，
+    //查询网格下
+    public Boolean getWorkGrassRootsResi(List<String> gridIdList) {
+        Result<List<GridProcessingCountResultDTO>> resiGroupProcessingCountResult = resiPartymemberFeignClient.queryResiProcessingCount(gridIdList);
+        if (resiGroupProcessingCountResult.success()) {
+            for (String gridId : gridIdList) {
+                for (GridProcessingCountResultDTO GridProcessingCountResultDTO : resiGroupProcessingCountResult.getData()) {
+                    if (gridId.equals(GridProcessingCountResultDTO.getGridId()) && GridProcessingCountResultDTO.getCount() > 0) {
+                        return true;
+                    }
+                }
+            }
+        }
+        logger.error(String.format("调用%s服务,查询网格%s待审核热心居民数失败code%s,msg:", ServiceConstant.RESI_PARTYMEMBER_SERVER, gridIdList.get(0), resiGroupProcessingCountResult.getCode(),
+                resiGroupProcessingCountResult.getMsg()));
+        return false;
+    }
+
+    //党员认证：work_grassroots_partyauth，
+    //查询网格下是否存在待审核的党员
+    public Boolean getWorkGrassRootsPartyAuth(List<String> gridIdList) {
+        Result<List<GridProcessingCountResultDTO>> partyMemberProcessingCountResult = resiPartymemberFeignClient.queryPartyMemberProcessingCount(gridIdList);
+        if (partyMemberProcessingCountResult.success()) {
+            for (String gridId : gridIdList) {
+                for (GridProcessingCountResultDTO GridProcessingCountResultDTO : partyMemberProcessingCountResult.getData()) {
+                    if (gridId.equals(GridProcessingCountResultDTO.getGridId()) && GridProcessingCountResultDTO.getCount() > 0) {
+                        return true;
+                    }
+                }
+            }
+        }
+        logger.error(String.format("调用%s服务,查询网格%s待审核党员数失败code%s,msg:", ServiceConstant.RESI_PARTYMEMBER_SERVER, gridIdList.get(0), partyMemberProcessingCountResult.getCode(),
+                partyMemberProcessingCountResult.getMsg()));
+        return false;
+    }
+
+    //议题管理： work_grassroots_issue
+    //查询网格下是否存在表决中的议题
+    public Boolean getWorkGrassRootsIssue(List<String> gridIdList) {
+        Result<List<GridProcessingCountResultDTO>> issueResult = govIssueFeignClient.queryVotingIssueCount(gridIdList);
+        if (issueResult.success()) {
+            for (String gridId : gridIdList) {
+                for (GridProcessingCountResultDTO GridProcessingCountResultDTO : issueResult.getData()) {
+                    if (gridId.equals(GridProcessingCountResultDTO.getGridId()) && GridProcessingCountResultDTO.getCount() > 0) {
+                        return true;
+                    }
+                }
+            }
+        }
+        logger.error(String.format("调用%s服务,查询网格%s表决中议题总数失败code%s,msg:", ServiceConstant.GOV_ISSUE_SERVER, gridIdList.get(0), issueResult.getCode(),
+                issueResult.getMsg()));
+        return false;
+    }
+
+    @Override
+    public TestResultDTO1 test(TestFormDTO1 testFormDTO1) {
+        Result<TestResultDTO1> resultDTO1Result = resiGroupFeignClient.test(testFormDTO1);
+        if (resultDTO1Result.success()) {
+            logger.info("gov-grid服务,接收返参：" + JSON.toJSONString(resultDTO1Result.getData()));
+            return resultDTO1Result.getData();
+        }
+        return new TestResultDTO1();
+    }
+}
+
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/GridVotingIssueCountResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/GridVotingIssueCountResultDTO.java
new file mode 100644
index 0000000000..61a4aecfbc
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/GridVotingIssueCountResultDTO.java
@@ -0,0 +1,24 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 网格下表决中的议题总数列表
+ * @Author yinzuomei
+ * @Date 2020/5/13 22:49
+ */
+@Data
+public class GridVotingIssueCountResultDTO implements Serializable {
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 表决中的议题总数
+     */
+    private Long count;
+}
+
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/GovIssueRedisKeys.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/GovIssueRedisKeys.java
new file mode 100644
index 0000000000..1da3dc7911
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/GovIssueRedisKeys.java
@@ -0,0 +1,22 @@
+package com.epmet.constant;
+
+/**
+ * @Description gov-issue-server模块redis key
+ * @Author yinzuomei
+ * @Date 2020/5/13 23:00
+ */
+public class GovIssueRedisKeys {
+    /**
+     * 党群e事通redis前缀
+     */
+    private static String rootPrefix = "epmet:";
+
+
+    /**
+     * 政府工作段小程序：基层治理-议题管理(表决中议题总数)红点key
+     */
+    public static String getWorkGrassrootsIssueRedDotKey(String gridId) {
+        return rootPrefix.concat(String.format("gov:wxmp:work:grassroots:issue:%s",gridId));
+    }
+}
+
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java
index 05cdb50892..9e6169f22b 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java
@@ -4,6 +4,7 @@ import com.epmet.commons.tools.annotation.RequirePermission;
 import com.epmet.commons.tools.enums.RequirePermissionEnum;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.IssueDetailFormDTO;
+import com.epmet.dto.result.GridVotingIssueCountResultDTO;
 import com.epmet.dto.result.IssueResultDTO;
 import com.epmet.service.IssueService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,6 +13,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;
+
 /**
  * @Description 居民端党群议事
  * @Author yinzuomei
@@ -36,5 +39,17 @@ public class IssueController {
         return new Result<IssueResultDTO>().ok(issueService.detail(issueDetail));
     }
 
+    /**
+     * @param gridIdList
+     * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.GridVotingIssueCountResultDTO>>
+     * @Author yinzuomei
+     * @Description 传入网格id列表，查询出每个网格下表决中的议题总数
+     * @Date 2020/5/13 22:52
+     **/
+    @PostMapping("queryvotingissuecount")
+    public Result<List<GridVotingIssueCountResultDTO>> queryVotingIssueCount(@RequestBody List<String> gridIdList) {
+        List<GridVotingIssueCountResultDTO> list = issueService.queryVotingIssueCount(gridIdList);
+        return new Result<List<GridVotingIssueCountResultDTO>>().ok(list);
+    }
 }
 
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/GovIssueRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/GovIssueRedis.java
new file mode 100644
index 0000000000..074c8e9597
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/GovIssueRedis.java
@@ -0,0 +1,33 @@
+package com.epmet.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import com.epmet.constant.GovIssueRedisKeys;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description gov-issue-server模块redis
+ * @Author yinzuomei
+ * @Date 2020/5/13 22:57
+ */
+@Component
+public class GovIssueRedis {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public Long queryVotingIssueCount(String gridId) {
+        Long auditingGroupCount = 0L;
+        try {
+            String workGrassrootsGroupRedDotKey = GovIssueRedisKeys.getWorkGrassrootsIssueRedDotKey(gridId);
+            auditingGroupCount = (Long) redisUtils.get(workGrassrootsGroupRedDotKey);
+        } catch (Exception e) {
+            logger.error(String.format("网格id%s,查询网格下表决中议题总数异常%s", gridId, e.getMessage()));
+            e.printStackTrace();
+        }
+        return auditingGroupCount;
+    }
+}
+
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java
index ab38c329c5..51a86afe48 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java
@@ -3,9 +3,12 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.dto.form.CloseIssueFormDTO;
 import com.epmet.dto.form.IssueDetailFormDTO;
+import com.epmet.dto.result.GridVotingIssueCountResultDTO;
 import com.epmet.dto.result.IssueResultDTO;
 import com.epmet.entity.IssueEntity;
 
+import java.util.List;
+
 /**
  * @Author zxc
  * @CreateTime 2020/5/11 9:44
@@ -28,4 +31,12 @@ public interface IssueService extends BaseService<IssueEntity> {
      **/
     void closeIssue(CloseIssueFormDTO formDTO);
 
+    /**
+     * @param gridIdList
+     * @return java.util.List<com.epmet.dto.result.GridVotingIssueCountResultDTO>
+     * @Author yinzuomei
+     * @Description 传入网格id列表，查询出每个网格下表决中的议题总数
+     * @Date 2020/5/13 22:53
+     **/
+    List<GridVotingIssueCountResultDTO> queryVotingIssueCount(List<String> gridIdList);
 }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
index 536a12307e..6483bfa018 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
@@ -14,12 +14,14 @@ import com.epmet.dto.form.CloseIssueFormDTO;
 import com.epmet.dto.form.IssueDetailFormDTO;
 import com.epmet.dto.form.UserMessageFormDTO;
 import com.epmet.dto.result.AgencyGridResultDTO;
+import com.epmet.dto.result.GridVotingIssueCountResultDTO;
 import com.epmet.dto.result.IssueResultDTO;
 import com.epmet.entity.IssueEntity;
 import com.epmet.entity.IssueProcessEntity;
 import com.epmet.feign.GovOrgFeignClient;
 import com.epmet.feign.MessageFeignClient;
 import com.epmet.feign.ResiGroupFeignClient;
+import com.epmet.redis.GovIssueRedis;
 import com.epmet.resi.group.dto.topic.ResiTopicDTO;
 import com.epmet.service.IssueService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -47,6 +49,8 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
     private ResiGroupFeignClient resiGroupFeignClient;
     @Autowired
     private MessageFeignClient messageFeignClient;
+    @Autowired
+    private GovIssueRedis govIssueRedis;
 
     /**
      * @Description  议题详情
@@ -104,6 +108,20 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
             throw new RenException(IssueConstant.SAVE_MSG_EXCEPTION);
         }
     }
+
+    @Override
+    public List<GridVotingIssueCountResultDTO> queryVotingIssueCount(List<String> gridIdList) {
+        List<GridVotingIssueCountResultDTO> list=new ArrayList<>();
+        for(String gridId:gridIdList){
+            GridVotingIssueCountResultDTO gridVotingIssueCountResultDTO=new GridVotingIssueCountResultDTO();
+            gridVotingIssueCountResultDTO.setGridId(gridId);
+            Long auditingCount=govIssueRedis.queryVotingIssueCount(gridId);
+            gridVotingIssueCountResultDTO.setCount(auditingCount);
+            list.add(gridVotingIssueCountResultDTO);
+        }
+        return list;
+    }
+
     /**
      * @Description 关闭议题给话题创建人和议题发起人发送消息
      * @author sun
diff --git a/epmet-module/gov-mine/gov-mine-client/src/main/java/com/epmet/dto/result/GridProcessingCountResultDTO.java b/epmet-module/gov-mine/gov-mine-client/src/main/java/com/epmet/dto/result/GridProcessingCountResultDTO.java
new file mode 100644
index 0000000000..3d5a599425
--- /dev/null
+++ b/epmet-module/gov-mine/gov-mine-client/src/main/java/com/epmet/dto/result/GridProcessingCountResultDTO.java
@@ -0,0 +1,24 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 政府端基层治理群组管理、议题管理、居民管理、党员认证查询待办数量feign统一返参
+ * @Author yinzuomei
+ * @Date 2020/5/13 21:43
+ */
+@Data
+public class GridProcessingCountResultDTO implements Serializable {
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 待审核的小组总数
+     */
+    private Long count;
+}
+
diff --git a/epmet-module/gov-mine/gov-mine-client/src/main/java/com/epmet/dto/result/StaffGridResultDTO.java b/epmet-module/gov-mine/gov-mine-client/src/main/java/com/epmet/dto/result/StaffGridResultDTO.java
new file mode 100644
index 0000000000..06c76761c8
--- /dev/null
+++ b/epmet-module/gov-mine/gov-mine-client/src/main/java/com/epmet/dto/result/StaffGridResultDTO.java
@@ -0,0 +1,37 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 政府端工作人员的所有网格返参
+ * @Author yinzuomei
+ * @Date 2020/5/13 13:45
+ */
+@Data
+public class StaffGridResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 5576720099807706663L;
+    /**
+     * 网格直属组织ID
+     */
+    private String agencyId;
+
+    /**
+     * 网格ID
+     */
+    private String gridId;
+
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+    /**
+     * 待办事项标记：true显示,false不显示
+     */
+    private Boolean redDot;
+
+}
+
diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/controller/StaffAgencyController.java b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/controller/StaffAgencyController.java
index 3c77f93e23..692ac17669 100644
--- a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/controller/StaffAgencyController.java
+++ b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/controller/StaffAgencyController.java
@@ -25,6 +25,7 @@ import com.epmet.dto.form.LatestGridFormDTO;
 import com.epmet.dto.form.SwitchGridFormDTO;
 import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
 import com.epmet.dto.result.LatestCustomerResultDTO;
+import com.epmet.dto.result.StaffGridResultDTO;
 import com.epmet.service.StaffAgencyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -54,8 +55,9 @@ public class StaffAgencyController {
 	 * @Author sun
 	 */
 	@PostMapping("getmygrids")
-	public Result<List<CustomerGridByUserIdResultDTO>> getMyGrids(@LoginUser TokenDto tokenDTO) {
-		return staffAgencyService.getMyGrids(tokenDTO);
+	public Result<List<StaffGridResultDTO>> getMyGrids(@LoginUser TokenDto tokenDTO) {
+		List<StaffGridResultDTO> list=staffAgencyService.getMyGrids(tokenDTO.getUserId());
+		return new Result<List<StaffGridResultDTO>>().ok(list);
 	}
 
 	/**
diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java
new file mode 100644
index 0000000000..1b7642c82a
--- /dev/null
+++ b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java
@@ -0,0 +1,29 @@
+package com.epmet.feign;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.feign.fallback.GovIssueFeignClientFallBack;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * @Description 议题管理服务
+ * @Author yinzuomei
+ * @Date 2020/5/13 15:45
+ */
+@FeignClient(name = ServiceConstant.GOV_ISSUE_SERVER, fallback = GovIssueFeignClientFallBack.class)
+public interface GovIssueFeignClient {
+    /**
+     * @param gridIdList
+     * @return com.epmet.commons.tools.utils.Result
+     * @Author yinzuomei
+     * @Description 查询网格下表决中的议题
+     * @Date 2020/5/13 15:47
+     **/
+    @PostMapping(value = "/gov/issue/issue/queryvotingissuecount",consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result queryVotingIssueCount(@RequestBody List<String> gridIdList);
+}
diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java
new file mode 100644
index 0000000000..43a1ac2ad9
--- /dev/null
+++ b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java
@@ -0,0 +1,30 @@
+package com.epmet.feign;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.result.GridProcessingCountResultDTO;
+import com.epmet.feign.fallback.ResiGroupFeignClientFallBack;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/4/17 15:24
+ */
+@FeignClient(name = ServiceConstant.RESI_GROUP_SERVER, fallback = ResiGroupFeignClientFallBack.class)
+public interface ResiGroupFeignClient {
+	/**
+	 * @param gridIdList
+	 * @return com.epmet.commons.tools.utils.Result
+	 * @Author yinzuomei
+	 * @Description 查询网格下待审核的小组总数
+	 * @Date 2020/5/13 15:49
+	 **/
+	@PostMapping(value = "/resi/group/group/groupprocessingcount",consumes = MediaType.APPLICATION_JSON_VALUE)
+	Result<List<GridProcessingCountResultDTO>> queryGroupProcessingCount(@RequestBody List<String> gridIdList);
+}
diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/ResiPartymemberFeignClient.java b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/ResiPartymemberFeignClient.java
new file mode 100644
index 0000000000..cb7c2eceed
--- /dev/null
+++ b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/ResiPartymemberFeignClient.java
@@ -0,0 +1,41 @@
+package com.epmet.feign;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.result.GridProcessingCountResultDTO;
+import com.epmet.feign.fallback.ResiPartymemberFeignClientFallBack;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * 调用epmet-user服务
+ *
+ * @author 赵奇风
+ */
+@FeignClient(name = ServiceConstant.RESI_PARTYMEMBER_SERVER, fallback = ResiPartymemberFeignClientFallBack.class)
+public interface ResiPartymemberFeignClient {
+	/**
+	 * @param gridIdList
+	 * @return com.epmet.commons.tools.utils.Result
+	 * @Author yinzuomei
+	 * @Description 查询网格下待审核的热心居民数
+	 * @Date 2020/5/13 15:41
+	 **/
+	@PostMapping(value = "/resi/partymember/resiwarmheartedapply/queryresiprocessingcount",consumes = MediaType.APPLICATION_JSON_VALUE)
+	Result<List<GridProcessingCountResultDTO>> queryResiProcessingCount(@RequestBody List<String> gridIdList);
+
+	/**
+	 * @param gridIdList
+	 * @return com.epmet.commons.tools.utils.Result
+	 * @Author yinzuomei
+	 * @Description 查询网格下待审核的党员数
+	 * @Date 2020/5/13 15:41
+	 **/
+	@PostMapping(value = "/resi/partymember/partymemberbaseinfo/getworkgrassrootspartyauth",consumes = MediaType.APPLICATION_JSON_VALUE)
+	Result<List<GridProcessingCountResultDTO>> queryPartyMemberProcessingCount(@RequestBody List<String> gridIdList);
+
+}
diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java
new file mode 100644
index 0000000000..3a1ccf8714
--- /dev/null
+++ b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java
@@ -0,0 +1,23 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.feign.GovIssueFeignClient;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @Description 议题管理服务
+ * @Author yinzuomei
+ * @Date 2020/5/13 15:45
+ */
+@Component
+public class GovIssueFeignClientFallBack implements GovIssueFeignClient {
+    @Override
+    public Result queryVotingIssueCount(List<String> gridIdList) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "queryVotingIssueCount", gridIdList);
+    }
+}
+
diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java
new file mode 100644
index 0000000000..8afd447147
--- /dev/null
+++ b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java
@@ -0,0 +1,25 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.result.GridProcessingCountResultDTO;
+import com.epmet.feign.ResiGroupFeignClient;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/4/17 15:27
+ */
+@Component
+public class ResiGroupFeignClientFallBack implements ResiGroupFeignClient {
+
+	@Override
+	public Result<List<GridProcessingCountResultDTO>> queryGroupProcessingCount(List<String> gridIdList) {
+		return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "queryGroupProcessingCount", gridIdList);
+	}
+
+}
diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java
new file mode 100644
index 0000000000..747c715e96
--- /dev/null
+++ b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java
@@ -0,0 +1,29 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.result.GridProcessingCountResultDTO;
+import com.epmet.feign.ResiPartymemberFeignClient;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/4/16 17:01
+ */
+@Component
+public class ResiPartymemberFeignClientFallBack implements ResiPartymemberFeignClient {
+	@Override
+	public Result<List<GridProcessingCountResultDTO>> queryResiProcessingCount(List<String> gridIdList) {
+		return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "queryResiProcessingCount", gridIdList);
+	}
+
+	@Override
+	public Result<List<GridProcessingCountResultDTO>> queryPartyMemberProcessingCount(List<String> gridIdList) {
+		return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "queryPartyMemberProcessingCount", gridIdList);
+	}
+
+}
diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/StaffAgencyService.java b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/StaffAgencyService.java
index 2530c956a4..da353a9f37 100644
--- a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/StaffAgencyService.java
+++ b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/StaffAgencyService.java
@@ -23,6 +23,7 @@ import com.epmet.dto.form.LatestGridFormDTO;
 import com.epmet.dto.form.SwitchGridFormDTO;
 import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
 import com.epmet.dto.result.LatestCustomerResultDTO;
+import com.epmet.dto.result.StaffGridResultDTO;
 
 import java.util.List;
 
@@ -34,12 +35,12 @@ import java.util.List;
 public interface StaffAgencyService {
 
     /**
-     * @param tokenDTO
+     * @param staffId
      * @return
-     * @Description 根据userId查询该用户涉及的所有网格列表
+     * @Description 根据staffId查询该工作人员的所有网格列表
      * @Author sun
      */
-    Result<List<CustomerGridByUserIdResultDTO>> getMyGrids(TokenDto tokenDTO);
+    List<StaffGridResultDTO> getMyGrids(String staffId);
 
     /**
      * 获取最近一次登录的客户信息
diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/StaffAgencyServiceImpl.java b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/StaffAgencyServiceImpl.java
index adc8807690..2cbda237bb 100644
--- a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/StaffAgencyServiceImpl.java
+++ b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/StaffAgencyServiceImpl.java
@@ -25,10 +25,10 @@ import com.epmet.dto.form.LatestGridFormDTO;
 import com.epmet.dto.form.StaffGridVisitedFormDTO;
 import com.epmet.dto.form.SwitchGridFormDTO;
 import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
+import com.epmet.dto.result.GridProcessingCountResultDTO;
 import com.epmet.dto.result.LatestCustomerResultDTO;
-import com.epmet.feign.EpmetUserFeignClient;
-import com.epmet.feign.GovOrgFeignClient;
-import com.epmet.service.AccessService;
+import com.epmet.dto.result.StaffGridResultDTO;
+import com.epmet.feign.*;
 import com.epmet.service.StaffAgencyService;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -36,6 +36,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -51,27 +52,153 @@ public class StaffAgencyServiceImpl implements StaffAgencyService {
     @Autowired
     private EpmetUserFeignClient epmetUserFeignClient;
     @Autowired
-    private AccessService accessService;
+    private ResiGroupFeignClient resiGroupFeignClient;
+    @Autowired
+    private ResiPartymemberFeignClient resiPartymemberFeignClient;
+    @Autowired
+    private GovIssueFeignClient govIssueFeignClient;
+
     /**
-     * @param tokenDTO
+     * @param staffId
      * @return
      * @Description 根据userId查询该用户涉及的所有网格列表
      * @Author sun
      */
     @Override
-    public Result<List<CustomerGridByUserIdResultDTO>> getMyGrids(TokenDto tokenDTO) {
-        return govOrgFeignClient.getMyGrids(tokenDTO.getUserId());
+    public List<StaffGridResultDTO> getMyGrids(String staffId) {
+        //1、获取拥有的所有网格
+        Result<List<CustomerGridByUserIdResultDTO>> govOrgResult = govOrgFeignClient.getMyGrids(staffId);
+        if (!govOrgResult.success() || (null == govOrgResult.getData() || govOrgResult.getData().size() < 1)) {
+            logger.error(String.format("调用gov-org-server服务查询工作人员网格列表失败返回结果", govOrgResult.toString()));
+            return new ArrayList<>();
+        }
+        List<StaffGridResultDTO> gridList = ConvertUtils.sourceToTarget(govOrgResult.getData(), StaffGridResultDTO.class);
+        if (null == gridList || gridList.isEmpty()) {
+            return gridList;
+        }
+        //2、获取网格id列表
+        List<String> gridIds = new ArrayList<>();
+        for (StaffGridResultDTO staffGridResultDTO : gridList) {
+            //默认不显示红点
+            staffGridResultDTO.setRedDot(false);
+            gridIds.add(staffGridResultDTO.getGridId());
+        }
+        //获取各个网格每个菜单的待办数量
+        List<GridProcessingCountResultDTO> groupProcessingList = this.getGroupCountList(gridIds);
+        List<GridProcessingCountResultDTO> resiProcessingList = this.getResiCountList(gridIds);
+        List<GridProcessingCountResultDTO> partyMemberProcessingList = this.getPartyMemberCountList(gridIds);
+        List<GridProcessingCountResultDTO> issueProcessingList = this.getIssueCountList(gridIds);
+        for (StaffGridResultDTO staffGridInfo : gridList) {
+            if (this.checkGroupProcessing(staffGridInfo.getGridId(), groupProcessingList)) {
+                staffGridInfo.setRedDot(true);
+                break;
+            }
+            if (this.checkResiProcessing(staffGridInfo.getGridId(), resiProcessingList)) {
+                staffGridInfo.setRedDot(true);
+                break;
+            }
+            if (this.checkPartyMemberProcessing(staffGridInfo.getGridId(), partyMemberProcessingList)) {
+                staffGridInfo.setRedDot(true);
+                break;
+            }
+            if (this.checkIssueProcessing(staffGridInfo.getGridId(), issueProcessingList)) {
+                staffGridInfo.setRedDot(true);
+                break;
+            }
+        }
+        return gridList;
+    }
+
+    private boolean checkIssueProcessing(String gridId, List<GridProcessingCountResultDTO> issueProcessingList) {
+        boolean flag = false;
+        for (GridProcessingCountResultDTO gridProcessingCountResultDTO : issueProcessingList) {
+            if (gridId.equals(gridProcessingCountResultDTO.getGridId()) && gridProcessingCountResultDTO.getCount() > 0) {
+                flag = true;
+                break;
+            }
+        }
+        return flag;
+    }
+
+    private boolean checkPartyMemberProcessing(String gridId, List<GridProcessingCountResultDTO> partyMemberProcessingList) {
+        boolean flag = false;
+        for (GridProcessingCountResultDTO gridProcessingCountResultDTO : partyMemberProcessingList) {
+            if (gridId.equals(gridProcessingCountResultDTO.getGridId()) && gridProcessingCountResultDTO.getCount() > 0) {
+                flag = true;
+                break;
+            }
+        }
+        return flag;
+    }
+
+    private boolean checkResiProcessing(String gridId, List<GridProcessingCountResultDTO> resiProcessingList) {
+        boolean flag = false;
+        for (GridProcessingCountResultDTO gridProcessingCountResultDTO : resiProcessingList) {
+            if (gridId.equals(gridProcessingCountResultDTO.getGridId()) && gridProcessingCountResultDTO.getCount() > 0) {
+                flag = true;
+                break;
+            }
+        }
+        return flag;
+    }
+
+    private boolean checkGroupProcessing(String gridId, List<GridProcessingCountResultDTO> groupProcessingList) {
+        boolean flag = false;
+        for (GridProcessingCountResultDTO gridProcessingCountResultDTO : groupProcessingList) {
+            if (gridId.equals(gridProcessingCountResultDTO.getGridId()) && gridProcessingCountResultDTO.getCount() > 0) {
+                flag = true;
+                break;
+            }
+        }
+        return flag;
     }
 
+    private List<GridProcessingCountResultDTO> getIssueCountList(List<String> gridIdList) {
+        List<GridProcessingCountResultDTO> list = new ArrayList<>();
+        Result<List<GridProcessingCountResultDTO>> issueResult = govIssueFeignClient.queryVotingIssueCount(gridIdList);
+        if (issueResult.success() && null != issueResult.getData() && issueResult.getData().size() > 0) {
+            list.addAll(issueResult.getData());
+        }
+        return list;
+    }
+
+    private List<GridProcessingCountResultDTO> getPartyMemberCountList(List<String> gridIdList) {
+        List<GridProcessingCountResultDTO> list = new ArrayList<>();
+        Result<List<GridProcessingCountResultDTO>> partyAuthResult = resiPartymemberFeignClient.queryPartyMemberProcessingCount(gridIdList);
+        if (partyAuthResult.success() && null != partyAuthResult.getData() && partyAuthResult.getData().size() > 0) {
+            list.addAll(partyAuthResult.getData());
+        }
+        return list;
+    }
+
+    private List<GridProcessingCountResultDTO> getResiCountList(List<String> gridIdList) {
+        List<GridProcessingCountResultDTO> list = new ArrayList<>();
+        Result<List<GridProcessingCountResultDTO>> resiCount = resiPartymemberFeignClient.queryResiProcessingCount(gridIdList);
+        if (resiCount.success() && null != resiCount.getData() && resiCount.getData().size() > 0) {
+            list.addAll(resiCount.getData());
+        }
+        return list;
+    }
+
+    private List<GridProcessingCountResultDTO> getGroupCountList(List<String> gridIdList) {
+        List<GridProcessingCountResultDTO> list = new ArrayList<>();
+        Result<List<GridProcessingCountResultDTO>> groupProcessingCountResult = resiGroupFeignClient.queryGroupProcessingCount(gridIdList);
+        if (groupProcessingCountResult.success() && null != groupProcessingCountResult.getData() && groupProcessingCountResult.getData().size() > 0) {
+            list.addAll(groupProcessingCountResult.getData());
+        }
+        return list;
+    }
+
+
     @Override
     public Result<LatestCustomerResultDTO> getLatestCustomer(TokenDto tokenDTO) {
         return govOrgFeignClient.getLatestCustomer(tokenDTO.getUserId());
     }
 
     /**
+     * @return Result<CustomerGridByUserIdResultDTO>
      * @Description 得到工作人员最后一次登录的网格
      * @Param LatestGridFormDTO -> staffId ; customerId
-     * @return Result<CustomerGridByUserIdResultDTO>
      * @Author wangc
      * @Date 2020.04.23 11:14
      **/
@@ -79,12 +206,12 @@ public class StaffAgencyServiceImpl implements StaffAgencyService {
     public Result<CustomerGridByUserIdResultDTO> getLatestGrid(LatestGridFormDTO latestGridFormDTO) {
         Result<CustomerGridByUserIdResultDTO> latestGridResult =
                 epmetUserFeignClient.getStaffLatestGrid(latestGridFormDTO);
-        if(latestGridResult.success() && null != latestGridResult.getData() && StringUtils.isNotBlank(latestGridResult.getData().getGridId())){
+        if (latestGridResult.success() && null != latestGridResult.getData() && StringUtils.isNotBlank(latestGridResult.getData().getGridId())) {
             return latestGridResult;
-        }else{
+        } else {
             Result<CustomerGridByUserIdResultDTO> staffGridResult =
-                govOrgFeignClient.getStaffGrid(latestGridFormDTO);
-            if(staffGridResult.success() && null != staffGridResult.getData() && StringUtils.isNotBlank(staffGridResult.getData().getGridId())){
+                    govOrgFeignClient.getStaffGrid(latestGridFormDTO);
+            if (staffGridResult.success() && null != staffGridResult.getData() && StringUtils.isNotBlank(staffGridResult.getData().getGridId())) {
                 return staffGridResult;
             }
         }
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/GroupProcessingCountResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/GroupProcessingCountResultDTO.java
new file mode 100644
index 0000000000..4ef970e52b
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/GroupProcessingCountResultDTO.java
@@ -0,0 +1,25 @@
+package com.epmet.resi.group.dto.group;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 网格待审核小组数
+ * @Author yinzuomei
+ * @Date 2020/5/13 21:29
+ */
+@Data
+public class GroupProcessingCountResultDTO implements Serializable {
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 待审核的小组总数
+     */
+    private Long count;
+}
+
diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml
index 952ccc1abd..45075ae886 100644
--- a/epmet-module/resi-group/resi-group-server/pom.xml
+++ b/epmet-module/resi-group/resi-group-server/pom.xml
@@ -118,7 +118,7 @@
                 <spring.datasource.druid.username>epmet_resi_group_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
-                <spring.redis.index>0</spring.redis.index>
+                <spring.redis.index>1</spring.redis.index>
                 <spring.redis.host>192.168.1.130</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
@@ -148,7 +148,7 @@
                 <spring.datasource.druid.username>epmet</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
-                <spring.redis.index>0</spring.redis.index>
+                <spring.redis.index>1</spring.redis.index>
                 <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/constant/ResiGroupRedisKeys.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/constant/ResiGroupRedisKeys.java
new file mode 100644
index 0000000000..303d52c75f
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/constant/ResiGroupRedisKeys.java
@@ -0,0 +1,53 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.epmet.modules.constant;
+
+/**
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+public class ResiGroupRedisKeys {
+
+	/**
+	 * 党群e事通redis前缀
+	 */
+	private static String rootPrefix = "epmet:";
+
+
+	/**
+	 * @Description 小组缓存信息key
+	 * @Param 组Id
+	 * @return epmet:resi:group:groupId
+	 * @Author wangc
+	 * @Date 2020.04.13 11:27
+	 **/
+	public static String getResiGroupInfoKey(String groupId){
+		return rootPrefix.concat("resi:group:").concat(groupId);
+	}
+
+	/**
+	 * @Description 组成员信息缓存key
+	 * @Param 组Id 用户Id
+	 * @return epmet:resi:group:member:groupId:userId
+	 * @Author wangc
+	 * @Date 2020.04.13 13:40
+	 **/
+	public static String getResiGroupMemberInfoKey(String groupId, String userId){
+		return rootPrefix.concat("resi:group:member:").concat(groupId).concat(":").concat(userId);
+	}
+
+	/**
+	 * 政府工作段小程序：基层治理-群组管理(待审核待测小组)红点key eg:epmet:gov:wxmp:work:grassroots:group:XX网格id
+	 */
+	public static String getWorkGrassrootsGroupRedDotKey(String gridId) {
+		return rootPrefix.concat(String.format("gov:wxmp:work:grassroots:group:%s",gridId));
+	}
+
+
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java
index fdd74e28a6..98eb905c13 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java
@@ -17,17 +17,16 @@
 
 package com.epmet.modules.group.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.annotation.LoginUser;
-import com.epmet.commons.tools.exception.RenException;
 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.modules.group.redis.ResiGroupRedis;
 import com.epmet.modules.group.service.ResiGroupService;
-import com.epmet.modules.utils.ModuleConstant;
+import com.epmet.resi.group.dto.group.GroupProcessingCountResultDTO;
 import com.epmet.resi.group.dto.group.form.*;
 import com.epmet.resi.group.dto.group.result.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -43,252 +42,273 @@ import java.util.List;
 @RestController
 @RequestMapping("group")
 public class ResiGroupController {
-	private Logger logger = LoggerFactory.getLogger(getClass());
-	@Autowired
-	private ResiGroupService resiGroupService;
+    @Autowired
+    private ResiGroupService resiGroupService;
 
-	/**
-	 * @param tokenDto
-	 * @param myGroupFormDTO
-	 * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.resi.group.dto.group.result.MyGroupResultDTO>>
-	 * @Author yinzuomei
-	 * @Description 我的小组查询（包含我创建的小组+我加入的小组），以各组的最新话题时间有近到远排序）
-	 * @Date 2020/3/28 20:36
-	 **/
-	@PostMapping("getmygroup")
-	public Result<List<MyGroupResultDTO>> getMyGroup(@LoginUser TokenDto tokenDto, @RequestBody MyGroupFormDTO myGroupFormDTO) {
-		myGroupFormDTO.setUserId(tokenDto.getUserId());
-		ValidatorUtils.validateEntity(myGroupFormDTO);
-		return resiGroupService.getMyGroup(myGroupFormDTO);
-	}
+    /**
+     * @param tokenDto
+     * @param myGroupFormDTO
+     * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.resi.group.dto.group.result.MyGroupResultDTO>>
+     * @Author yinzuomei
+     * @Description 我的小组查询（包含我创建的小组+我加入的小组），以各组的最新话题时间有近到远排序）
+     * @Date 2020/3/28 20:36
+     **/
+    @PostMapping("getmygroup")
+    public Result<List<MyGroupResultDTO>> getMyGroup(@LoginUser TokenDto tokenDto, @RequestBody MyGroupFormDTO myGroupFormDTO) {
+        myGroupFormDTO.setUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(myGroupFormDTO);
+        List<MyGroupResultDTO> myGroupList = resiGroupService.getMyGroup(myGroupFormDTO);
+        return new Result<List<MyGroupResultDTO>>().ok(myGroupList);
+    }
 
-	/**
-	 * @param tokenDto
-	 * @param recommendGroupFormDTO
-	 * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.resi.group.dto.group.result.RecommendGroupResultDTO>>
-	 * @Author yinzuomei
-	 * @Description 推荐组列表查询
-	 * @Date 2020/3/28 19:52
-	 **/
-	@PostMapping("getrecommendgroup")
-	public Result<List<RecommendGroupResultDTO>> getRecommendGroup(@LoginUser TokenDto tokenDto,
+    /**
+     * @param tokenDto
+     * @param recommendGroupFormDTO
+     * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.resi.group.dto.group.result.RecommendGroupResultDTO>>
+     * @Author yinzuomei
+     * @Description 推荐组列表查询
+     * @Date 2020/3/28 19:52
+     **/
+    @PostMapping("getrecommendgroup")
+    public Result<List<RecommendGroupResultDTO>> getRecommendGroup(@LoginUser TokenDto tokenDto,
                                                                    @RequestBody RecommendGroupFormDTO recommendGroupFormDTO) {
-		recommendGroupFormDTO.setUserId(tokenDto.getUserId());
-		ValidatorUtils.validateEntity(recommendGroupFormDTO);
-		return resiGroupService.getRecommendGroup(recommendGroupFormDTO);
-	}
+        recommendGroupFormDTO.setUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(recommendGroupFormDTO);
+        List<RecommendGroupResultDTO> recommendGroupList = resiGroupService.getRecommendGroup(recommendGroupFormDTO);
+        return new Result<List<RecommendGroupResultDTO>>().ok(recommendGroupList);
+    }
 
-	/**
-	 * @param tokenDto
-	 * @param createdFormDTO
-	 * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.resi.group.dto.group.result.CreatedResultDTO>>
-	 * @Author yinzuomei
-	 * @Description 我创建的小组
-	 * @Date 2020/3/28 21:59
-	 **/
-	@PostMapping("getcreated")
-	public Result<List<CreatedResultDTO>> getCreated(@LoginUser TokenDto tokenDto,
+    /**
+     * @param tokenDto
+     * @param createdFormDTO
+     * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.resi.group.dto.group.result.CreatedResultDTO>>
+     * @Author yinzuomei
+     * @Description 我创建的小组
+     * @Date 2020/3/28 21:59
+     **/
+    @PostMapping("getcreated")
+    public Result<List<CreatedResultDTO>> getCreated(@LoginUser TokenDto tokenDto,
                                                      @RequestBody CreatedFormDTO createdFormDTO) {
-		createdFormDTO.setUserId(tokenDto.getUserId());
-		ValidatorUtils.validateEntity(createdFormDTO);
-		return resiGroupService.getCreated(createdFormDTO);
-	}
+        createdFormDTO.setUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(createdFormDTO);
+        List<CreatedResultDTO> createdGroupList = resiGroupService.getCreated(createdFormDTO);
+        return new Result<List<CreatedResultDTO>>().ok(createdGroupList);
+    }
 
-	/**
-	 * @param tokenDto
-	 * @param modifyGroupFormDTO
-	 * @return com.epmet.commons.tools.utils.Result
-	 * @Author yinzuomei
-	 * @Description 修改组信息
-	 * @Date 2020/3/28 22:20
-	 **/
-	@PostMapping("modifygroup")
-	public Result modifyGroup(@LoginUser TokenDto tokenDto, @RequestBody ModifyGroupFormDTO modifyGroupFormDTO) {
-		modifyGroupFormDTO.setUserId(tokenDto.getUserId());
-		ValidatorUtils.validateEntity(modifyGroupFormDTO);
-		return resiGroupService.modifyGroup(modifyGroupFormDTO);
-	}
+    /**
+     * @param tokenDto
+     * @param modifyGroupFormDTO
+     * @return com.epmet.commons.tools.utils.Result
+     * @Author yinzuomei
+     * @Description 修改组信息
+     * @Date 2020/3/28 22:20
+     **/
+    @PostMapping("modifygroup")
+    public Result modifyGroup(@LoginUser TokenDto tokenDto, @RequestBody ModifyGroupFormDTO modifyGroupFormDTO) {
+        modifyGroupFormDTO.setUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(modifyGroupFormDTO);
+        resiGroupService.modifyGroup(modifyGroupFormDTO);
+        return new Result();
+    }
 
-	/**
-	 * @param tokenDto
-	 * @param groupSummarizeFormDTO
-	 * @return com.epmet.commons.tools.utils.Result
-	 * @Author yinzuomei
-	 * @Description 查看小组管理界面信息
-	 * @Date 2020/3/29 17:32
-	 **/
-	@PostMapping("getgroupsummarize")
-	public Result<GroupSummarizeResultDTO> getGroupSummarize(@LoginUser TokenDto tokenDto,
+    /**
+     * @param tokenDto
+     * @param groupSummarizeFormDTO
+     * @return com.epmet.commons.tools.utils.Result
+     * @Author yinzuomei
+     * @Description 查看小组管理界面信息
+     * @Date 2020/3/29 17:32
+     **/
+    @PostMapping("getgroupsummarize")
+    public Result<GroupSummarizeResultDTO> getGroupSummarize(@LoginUser TokenDto tokenDto,
                                                              @RequestBody GroupSummarizeFormDTO groupSummarizeFormDTO) {
-		groupSummarizeFormDTO.setUserId(tokenDto.getUserId());
-		ValidatorUtils.validateEntity(groupSummarizeFormDTO);
-		return resiGroupService.getGroupSummarize(groupSummarizeFormDTO);
-	}
+        groupSummarizeFormDTO.setUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(groupSummarizeFormDTO);
+        GroupSummarizeResultDTO groupSummarizeResultDTO = resiGroupService.getGroupSummarize(groupSummarizeFormDTO);
+        return new Result<GroupSummarizeResultDTO>().ok(groupSummarizeResultDTO);
+    }
 
-	/**
-	 * @param tokenDto
-	 * @param applyCreateGroupFormDTO
-	 * @return com.epmet.commons.tools.utils.Result
-	 * @Author yinzuomei
-	 * @Description 创建小组
-	 * @Date 2020/3/29 19:26
-	 **/
-	@PostMapping("applycreategroup")
-	public Result applyCreateGroup(@LoginUser TokenDto tokenDto,
+    /**
+     * @param tokenDto
+     * @param applyCreateGroupFormDTO
+     * @return com.epmet.commons.tools.utils.Result
+     * @Author yinzuomei
+     * @Description 创建小组
+     * @Date 2020/3/29 19:26
+     **/
+    @PostMapping("applycreategroup")
+    public Result applyCreateGroup(@LoginUser TokenDto tokenDto,
                                    @RequestBody ApplyCreateGroupFormDTO applyCreateGroupFormDTO) {
-		applyCreateGroupFormDTO.setUserId(tokenDto.getUserId());
-		applyCreateGroupFormDTO.setApp(tokenDto.getApp());
-		ValidatorUtils.validateEntity(applyCreateGroupFormDTO);
-		return resiGroupService.applyCreateGroup(applyCreateGroupFormDTO);
-	}
+        applyCreateGroupFormDTO.setUserId(tokenDto.getUserId());
+        applyCreateGroupFormDTO.setApp(tokenDto.getApp());
+        ValidatorUtils.validateEntity(applyCreateGroupFormDTO);
+        resiGroupService.applyCreateGroup(applyCreateGroupFormDTO);
+        return new Result();
+    }
 
-	/**
-	 * @param tokenDto
-	 * @return com.epmet.commons.tools.utils.Result
-	 * @Author yinzuomei
-	 * @Description 加入小组界面初始化
-	 * 只有已经注册过的居民才可以加入小组
-	 * @Date 2020/3/30 10:11
-	 **/
-	@PostMapping("initapplygroup")
-	public Result initApplyGroup(@LoginUser TokenDto tokenDto,
+    /**
+     * @param tokenDto
+     * @return com.epmet.commons.tools.utils.Result
+     * @Author yinzuomei
+     * @Description 加入小组界面初始化
+     * 只有已经注册过的居民才可以加入小组
+     * @Date 2020/3/30 10:11
+     **/
+    @PostMapping("initapplygroup")
+    public Result initApplyGroup(@LoginUser TokenDto tokenDto,
                                  @RequestBody InitApplyGroupFormDTO initApplyGroupFormDTO) {
-		if (null == tokenDto) {
-			logger.error(ModuleConstant.USER_NOT_NULL);
-			throw new RenException(ModuleConstant.USER_NOT_NULL);
-		}
-		initApplyGroupFormDTO.setUserId(tokenDto.getUserId());
-		ValidatorUtils.validateEntity(initApplyGroupFormDTO);
-		return resiGroupService.initApplyGroup(initApplyGroupFormDTO);
-	}
+        initApplyGroupFormDTO.setUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(initApplyGroupFormDTO);
+        resiGroupService.initApplyGroup(initApplyGroupFormDTO);
+        return new Result();
+    }
 
-	/**
-	 * @param tokenDto
-	 * @param initApplyCreatedGroupFormDTO
-	 * @return com.epmet.commons.tools.utils.Result
-	 * @Author yinzuomei
-	 * @Description 创建小组界面初始化 只有党员和热心居民才能创建小组
-	 * @Date 2020/3/30 15:44
-	 **/
-	@PostMapping("initapplycreategroup")
-	public Result initApplyCreatedGroup(@LoginUser TokenDto tokenDto,
+    /**
+     * @param tokenDto
+     * @param initApplyCreatedGroupFormDTO
+     * @return com.epmet.commons.tools.utils.Result
+     * @Author yinzuomei
+     * @Description 创建小组界面初始化 只有党员和热心居民才能创建小组
+     * @Date 2020/3/30 15:44
+     **/
+    @PostMapping("initapplycreategroup")
+    public Result initApplyCreatedGroup(@LoginUser TokenDto tokenDto,
                                         @RequestBody InitApplyCreatedGroupFormDTO initApplyCreatedGroupFormDTO) {
-		if (null == tokenDto) {
-			logger.error(ModuleConstant.USER_NOT_NULL);
-			throw new RenException(ModuleConstant.USER_NOT_NULL);
-		}
-		initApplyCreatedGroupFormDTO.setUserId(tokenDto.getUserId());
-		initApplyCreatedGroupFormDTO.setApp(tokenDto.getApp());
-		ValidatorUtils.validateEntity(initApplyCreatedGroupFormDTO);
-		return resiGroupService.initApplyCreatedGroup(initApplyCreatedGroupFormDTO);
-	}
+        initApplyCreatedGroupFormDTO.setUserId(tokenDto.getUserId());
+        initApplyCreatedGroupFormDTO.setApp(tokenDto.getApp());
+        ValidatorUtils.validateEntity(initApplyCreatedGroupFormDTO);
+        resiGroupService.initApplyCreatedGroup(initApplyCreatedGroupFormDTO);
+        return new Result();
+    }
 
-	/**
-	 * @param tokenDto
-	 * @return com.epmet.commons.tools.utils.Result
-	 * @Author yinzuomei
-	 * @Description 审核(同意)群申请-测试用后面会放到政府端
-	 * @Date 2020/3/31 12:31
-	 **/
-	@PostMapping("agreeapplygroup")
-	public Result agreeApplyGroup(@LoginUser TokenDto tokenDto, @RequestBody AgreeApplyGroupFormDTO agreeApplyGroupFormDTO) {
-		agreeApplyGroupFormDTO.setUserId(tokenDto.getUserId());
-		ValidatorUtils.validateEntity(agreeApplyGroupFormDTO);
-		return resiGroupService.agreeApplyGroup(agreeApplyGroupFormDTO);
-	}
+    /**
+     * @param tokenDto
+     * @return com.epmet.commons.tools.utils.Result
+     * @Author yinzuomei
+     * @Description 审核(同意)群申请-测试用后面会放到政府端 已废弃
+     * @Date 2020/3/31 12:31
+     **/
+    @PostMapping("agreeapplygroup")
+    public Result agreeApplyGroup(@LoginUser TokenDto tokenDto, @RequestBody AgreeApplyGroupFormDTO agreeApplyGroupFormDTO) {
+        agreeApplyGroupFormDTO.setUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(agreeApplyGroupFormDTO);
+        return resiGroupService.agreeApplyGroup(agreeApplyGroupFormDTO);
+    }
 
-	/**
-	 * @param tokenDto
-	 * @param disAgreeApplyGroupFormDTO
-	 * @return com.epmet.commons.tools.utils.Result
-	 * @Author yinzuomei
-	 * @Description 审核(拒绝)群申请-测试用后面会放到政府端
-	 * @Date 2020/3/31 13:23
-	 **/
-	@PostMapping("disagreeapplygroup")
-	public Result disagreeApplyGroup(@LoginUser TokenDto tokenDto, @RequestBody DisAgreeApplyGroupFormDTO disAgreeApplyGroupFormDTO) {
-		disAgreeApplyGroupFormDTO.setUserId(tokenDto.getUserId());
-		ValidatorUtils.validateEntity(disAgreeApplyGroupFormDTO);
-		return resiGroupService.disagreeApplyGroup(disAgreeApplyGroupFormDTO);
-	}
+    /**
+     * @param tokenDto
+     * @param disAgreeApplyGroupFormDTO
+     * @return com.epmet.commons.tools.utils.Result
+     * @Author yinzuomei
+     * @Description 审核(拒绝)群申请-测试用后面会放到政府端 已废弃
+     * @Date 2020/3/31 13:23
+     **/
+    @PostMapping("disagreeapplygroup")
+    public Result disagreeApplyGroup(@LoginUser TokenDto tokenDto, @RequestBody DisAgreeApplyGroupFormDTO disAgreeApplyGroupFormDTO) {
+        disAgreeApplyGroupFormDTO.setUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(disAgreeApplyGroupFormDTO);
+        return resiGroupService.disagreeApplyGroup(disAgreeApplyGroupFormDTO);
+    }
 
-	/**
-	 * 小组审核历史列表
-	 *
-	 * @param formDTO 参数
-	 * @return Result<List < GroupAuditedResultDTO>>
-	 */
-	@PostMapping("audited")
-	public Result<List<GroupAuditedResultDTO>> audited(@RequestBody GroupAuditedFromDTO formDTO) {
-		ValidatorUtils.validateEntity(formDTO);
-		return resiGroupService.audited(formDTO);
-	}
+    /**
+     * 小组审核历史列表
+     *
+     * @param formDTO 参数
+     * @return Result<List < GroupAuditedResultDTO>>
+     */
+    @PostMapping("audited")
+    public Result<List<GroupAuditedResultDTO>> audited(@RequestBody GroupAuditedFromDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        return resiGroupService.audited(formDTO);
+    }
 
-	/**
-	 * 本网格小组列表
-	 *
-	 * @param formDTO 参数
-	 * @return Result<List < GroupAuditedResultDTO>>
-	 */
-	@PostMapping("groupsingrid")
-	public Result<List<GroupsInGridResultDTO>> getGroupsInGrid(@RequestBody GroupAuditedFromDTO formDTO) {
-		ValidatorUtils.validateEntity(formDTO);
-		return resiGroupService.getGroupsInGrid(formDTO);
-	}
+    /**
+     * 本网格小组列表
+     *
+     * @param formDTO 参数
+     * @return Result<List < GroupAuditedResultDTO>>
+     */
+    @PostMapping("groupsingrid")
+    public Result<List<GroupsInGridResultDTO>> getGroupsInGrid(@RequestBody GroupAuditedFromDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        return resiGroupService.getGroupsInGrid(formDTO);
+    }
 
-	/**
-	 * 小组管理界面信息
-	 *
-	 * @param formDTO 参数
-	 * @return Result<GovGroupSummarizeResultDTO>
-	 */
-	@PostMapping("getgovgroupsummarize")
-	public Result<GovGroupSummarizeResultDTO> getGovGroupSummarize(@RequestBody GovGroupSummarizeFromDTO formDTO) {
-		return resiGroupService.getGovGroupSummarize(formDTO);
-	}
+    /**
+     * 小组管理界面信息
+     *
+     * @param formDTO 参数
+     * @return Result<GovGroupSummarizeResultDTO>
+     */
+    @PostMapping("getgovgroupsummarize")
+    public Result<GovGroupSummarizeResultDTO> getGovGroupSummarize(@RequestBody GovGroupSummarizeFromDTO formDTO) {
+        return resiGroupService.getGovGroupSummarize(formDTO);
+    }
 
-	/**
-	 * @Description 得到小组待审核列表，用户信息不注入TokenDTO，通过外部服务调用直接传入参数
-	 * @Param ApplyingGroupsFormDTO.class
-	 * @return Result<List<ApplyingGroupResultDTO>>
-	 * @Author wangc
-	 * @Date 2020.04.20 13:59
-	 **/
-	@PostMapping("getapplyinggroups")
-	public Result<List<ApplyingGroupResultDTO>> getApplyingGroups(@RequestBody ApplyingGroupsFormDTO applyingGroupsFormDTO){
-		ValidatorUtils.validateEntity(applyingGroupsFormDTO);
-		return resiGroupService.getApplyingGroups(applyingGroupsFormDTO);
-	}
+    /**
+     * @return Result<List < ApplyingGroupResultDTO>>
+     * @Description 得到小组待审核列表，用户信息不注入TokenDTO，通过外部服务调用直接传入参数
+     * @Param ApplyingGroupsFormDTO.class
+     * @Author wangc
+     * @Date 2020.04.20 13:59
+     **/
+    @PostMapping("getapplyinggroups")
+    public Result<List<ApplyingGroupResultDTO>> getApplyingGroups(@RequestBody ApplyingGroupsFormDTO applyingGroupsFormDTO) {
+        ValidatorUtils.validateEntity(applyingGroupsFormDTO);
+        return resiGroupService.getApplyingGroups(applyingGroupsFormDTO);
+    }
 
-	/**
-	 * @Description 得到待审核/未审核小组信息的详情
-	 * @Param CommonGroupIdFromDTO -> String groupId; String  userId
-	 * @return Result<ApplyingGroupDetailResult2DTO>
-	 * @Author wangc
-	 * @Date 2020.04.20 14:08
-	 **/
-	@PostMapping("getapplyinggroupdetail")
-	public Result<ApplyingGroupDetailResult2DTO> getApplyingGroupDetail(@RequestBody CommonGroupIdFromDTO groupIdFromDTO){
-		ValidatorUtils.validateEntity(groupIdFromDTO);
-		return resiGroupService.getApplyingGroupDetail(groupIdFromDTO);
-	}
+    /**
+     * @return Result<ApplyingGroupDetailResult2DTO>
+     * @Description 得到待审核/未审核小组信息的详情
+     * @Param CommonGroupIdFromDTO -> String groupId; String  userId
+     * @Author wangc
+     * @Date 2020.04.20 14:08
+     **/
+    @PostMapping("getapplyinggroupdetail")
+    public Result<ApplyingGroupDetailResult2DTO> getApplyingGroupDetail(@RequestBody CommonGroupIdFromDTO groupIdFromDTO) {
+        ValidatorUtils.validateEntity(groupIdFromDTO);
+        return resiGroupService.getApplyingGroupDetail(groupIdFromDTO);
+    }
 
-	@PostMapping("agreeapplying")
-	public Result agreeApplying( @RequestBody AgreeApplyGroupFormDTO agreeApplyGroupFormDTO) {
-		ValidatorUtils.validateEntity(agreeApplyGroupFormDTO);
-		return resiGroupService.agreeApplyGroup(agreeApplyGroupFormDTO);
-	}
+    @PostMapping("agreeapplying")
+    public Result agreeApplying(@RequestBody AgreeApplyGroupFormDTO agreeApplyGroupFormDTO) {
+        ValidatorUtils.validateEntity(agreeApplyGroupFormDTO);
+        return resiGroupService.agreeApplyGroup(agreeApplyGroupFormDTO);
+    }
 
-	/**
-	 * @Description 建组申请-审核驳回-供外部服务调用，当前用户Id需要调用时一并传入
-	 * @Param DisAgreeApplyGroupFormDTO
-	 * @return Result
-	 * @Author wangc
-	 * @Date 2020.04.20 14:26
-	 **/
-	@PostMapping("disagreeapplying")
-	public Result disagreeApplying(@RequestBody DisAgreeApplyGroupFormDTO disAgreeApplyGroupFormDTO) {
-		ValidatorUtils.validateEntity(disAgreeApplyGroupFormDTO);
-		return resiGroupService.disagreeApplyGroup(disAgreeApplyGroupFormDTO);
-	}
+    /**
+     * @return Result
+     * @Description 建组申请-审核驳回-供外部服务调用，当前用户Id需要调用时一并传入
+     * @Param DisAgreeApplyGroupFormDTO
+     * @Author wangc
+     * @Date 2020.04.20 14:26
+     **/
+    @PostMapping("disagreeapplying")
+    public Result disagreeApplying(@RequestBody DisAgreeApplyGroupFormDTO disAgreeApplyGroupFormDTO) {
+        ValidatorUtils.validateEntity(disAgreeApplyGroupFormDTO);
+        return resiGroupService.disagreeApplyGroup(disAgreeApplyGroupFormDTO);
+    }
+
+    /**
+     * @param gridIdList
+     * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.resi.group.dto.group.GroupProcessingCountResultDTO>>
+     * @Author yinzuomei
+     * @Description 传入网格id列表，返回每个网格的待审核小组总数
+     * @Date 2020/5/13 21:33
+     **/
+    @PostMapping("groupprocessingcount")
+    public Result<List<GroupProcessingCountResultDTO>> queryGroupProcessingCount(@RequestBody List<String> gridIdList) {
+        List<GroupProcessingCountResultDTO> list = resiGroupService.queryGroupProcessingCount(gridIdList);
+        return new Result<List<GroupProcessingCountResultDTO>>().ok(list);
+    }
+
+    @PostMapping("test")
+    public Result<TestResultDTO2> test(@RequestBody TestFormDTO2 formDTO2) {
+        System.out.println("group接收到入参：" + JSON.toJSONString(formDTO2));
+        TestResultDTO2 resultDTO2 = new TestResultDTO2();
+        resultDTO2.setResultId("group");
+        resultDTO2.setResultName("group返参");
+        return new Result<TestResultDTO2>().ok(resultDTO2);
+    }
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/TestFormDTO2.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/TestFormDTO2.java
new file mode 100644
index 0000000000..8114d03488
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/TestFormDTO2.java
@@ -0,0 +1,15 @@
+package com.epmet.modules.group.controller;
+
+import lombok.Data;
+
+/**
+ * @Description 测试feign
+ * @Author yinzuomei
+ * @Date 2020/5/13 18:30
+ */
+@Data
+public class TestFormDTO2 {
+    private String id;
+    private String name;
+}
+
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/TestResultDTO2.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/TestResultDTO2.java
new file mode 100644
index 0000000000..5da3d98d31
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/TestResultDTO2.java
@@ -0,0 +1,15 @@
+package com.epmet.modules.group.controller;
+
+import lombok.Data;
+
+/**
+ * @Description 测试feign
+ * @Author yinzuomei
+ * @Date 2020/5/13 18:30
+ */
+@Data
+public class TestResultDTO2 {
+    private String resultId;
+    private String resultName;
+}
+
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/ResiGroupRedis.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/ResiGroupRedis.java
index 8971aae9dc..15197a9fd3 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/ResiGroupRedis.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/ResiGroupRedis.java
@@ -19,9 +19,9 @@ package com.epmet.modules.group.redis;
 
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
-import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.modules.constant.ResiGroupRedisKeys;
 import com.epmet.modules.group.service.ResiGroupService;
 import com.epmet.modules.group.service.ResiGroupStatisticalService;
 import com.epmet.resi.group.constant.TopicConstant;
@@ -30,6 +30,8 @@ import com.epmet.resi.group.dto.group.ResiGroupInfoRedisDTO;
 import com.epmet.resi.group.dto.group.ResiGroupStatisticalDTO;
 import com.epmet.resi.group.dto.group.ResiGroupStatisticalInfoRedisDTO;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -43,6 +45,7 @@ import java.util.*;
  */
 @Component
 public class ResiGroupRedis {
+    private Logger logger = LoggerFactory.getLogger(getClass());
     @Autowired
     private RedisUtils redisUtils;
 
@@ -65,7 +68,7 @@ public class ResiGroupRedis {
      **/
     public void set(ResiGroupInfoRedisDTO groupInfoRedis){
         if(null != groupInfoRedis && StringUtils.isNotBlank(groupInfoRedis.getGroupId())){
-            redisUtils.set(RedisKeys.getResiGroupInfoKey(groupInfoRedis.getGroupId()), groupInfoRedis);
+            redisUtils.set(ResiGroupRedisKeys.getResiGroupInfoKey(groupInfoRedis.getGroupId()), groupInfoRedis);
         }
     }
 
@@ -80,7 +83,7 @@ public class ResiGroupRedis {
 
         if(StringUtils.isNotBlank(groupId)){
             ResiGroupInfoRedisDTO groupCache = (ResiGroupInfoRedisDTO)
-            redisUtils.get(RedisKeys.getResiGroupInfoKey(groupId));
+            redisUtils.get(ResiGroupRedisKeys.getResiGroupInfoKey(groupId));
             if(null == groupCache || StringUtils.isBlank(groupCache.getGroupId())){
                 //如果缓存中没有该组信息，从数据库中查询并放入缓存
                 ResiGroupDTO groupMySql = groupService.get(groupId);
@@ -143,4 +146,64 @@ public class ResiGroupRedis {
         return null;
     }
 
+
+    /**
+     * @param gridId
+     * @return java.lang.Long
+     * @Author yinzuomei
+     * @Description 当前网格带审核小组数量key eg:epmet:gov:wxmp:work:grassroots:group:xx网格id
+     * 居民端创建小组，提交成功后，该redis值+1,目的：政府端基层治理-群组管理显示红点，提醒工作人员有待办事项
+     * @Date 2020/5/13 9:50
+     **/
+    public Long addWorkGrassrootsGroupRedDotValue(String gridId) {
+        Long auditingGroupCount = 0L;
+        try {
+            String workGrassrootsGroupRedDotKey = ResiGroupRedisKeys.getWorkGrassrootsGroupRedDotKey(gridId);
+            auditingGroupCount = redisUtils.incrementAndGet(workGrassrootsGroupRedDotKey);
+            logger.info(String.format("居民端创建小组提交,更新redis-reddot值成功,key[%s],Value[%s]", workGrassrootsGroupRedDotKey, auditingGroupCount));
+        } catch (Exception e) {
+            logger.error(String.format("居民端创建小组提交,更新redis-reddot值异常%s",e.getMessage()));
+            e.printStackTrace();
+        }
+        return auditingGroupCount;
+    }
+
+    /**
+     * @param gridId
+     * @return java.lang.Long
+     * @Author yinzuomei 当前网格带审核小组数量key eg:epmet:gov:wxmp:work:grassroots:group:xx网格id
+     * @Description 政府端工作人员审核建组申请之后(同意或驳回)，该redis值-1
+     * @Date 2020/5/13 12:58
+     **/
+    public Long subtractWorkGrassrootsPartyAuthRedDotValue(String gridId) {
+        Long auditingGroupCount = 0L;
+        try {
+            String workGrassrootsGroupRedDotKey = ResiGroupRedisKeys.getWorkGrassrootsGroupRedDotKey(gridId);
+            auditingGroupCount = redisUtils.decrementAndGet(workGrassrootsGroupRedDotKey);
+            logger.info(String.format("政府端(wxmp)同意建组,更新redis-reddot值成功,key[%s],Value[%s]", workGrassrootsGroupRedDotKey, auditingGroupCount));
+        } catch (Exception e) {
+            logger.error(String.format("政府端(wxmp)同意建组,更新redis-reddot值异常%s", e.getMessage()));
+            e.printStackTrace();
+        }
+        return auditingGroupCount;
+    }
+
+    /**
+     * @return java.lang.Long
+     * @param gridId
+     * @Author yinzuomei
+     * @Description 获取某网格下待审核小组总数
+     * @Date 2020/5/13 21:40
+     **/
+    public Long getWorkGrassrootsGroupRedDotValue(String gridId) {
+        Long auditingGroupCount = 0L;
+        try {
+            String workGrassrootsGroupRedDotKey = ResiGroupRedisKeys.getWorkGrassrootsGroupRedDotKey(gridId);
+            auditingGroupCount = (Long) redisUtils.get(workGrassrootsGroupRedDotKey);
+        } catch (Exception e) {
+            logger.error(String.format("网格id%s,查询网格下待审核小组总数异常%s", gridId, e.getMessage()));
+            e.printStackTrace();
+        }
+        return auditingGroupCount;
+    }
 }
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java
index 71a902430a..440b4ebf9d 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java
@@ -23,6 +23,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.modules.group.entity.ResiGroupEntity;
 import com.epmet.resi.group.dto.UserRoleDTO;
+import com.epmet.resi.group.dto.group.GroupProcessingCountResultDTO;
 import com.epmet.resi.group.dto.group.ResiGroupDTO;
 import com.epmet.resi.group.dto.group.form.*;
 import com.epmet.resi.group.dto.group.result.*;
@@ -105,7 +106,7 @@ public interface ResiGroupService extends BaseService<ResiGroupEntity> {
 	 * @Description 我的小组查询（包含我创建的小组+我加入的小组），以各组的最新话题时间有近到远排序）
 	 * @Date 2020/3/28 20:37
 	 **/
-	Result<List<MyGroupResultDTO>> getMyGroup(MyGroupFormDTO myGroupFormDTO);
+	List<MyGroupResultDTO> getMyGroup(MyGroupFormDTO myGroupFormDTO);
 
 	/**
 	 * @param recommendGroupFormDTO
@@ -114,7 +115,7 @@ public interface ResiGroupService extends BaseService<ResiGroupEntity> {
 	 * @Description 推荐组列表查询
 	 * @Date 2020/3/28 19:53
 	 **/
-	Result<List<RecommendGroupResultDTO>> getRecommendGroup(RecommendGroupFormDTO recommendGroupFormDTO);
+	List<RecommendGroupResultDTO> getRecommendGroup(RecommendGroupFormDTO recommendGroupFormDTO);
 
 	/**
 	 * @param createdFormDTO
@@ -123,7 +124,7 @@ public interface ResiGroupService extends BaseService<ResiGroupEntity> {
 	 * @Description 我创建的小组
 	 * @Date 2020/3/28 22:01
 	 **/
-	Result<List<CreatedResultDTO>> getCreated(CreatedFormDTO createdFormDTO);
+	List<CreatedResultDTO> getCreated(CreatedFormDTO createdFormDTO);
 
 	/**
 	 * @param modifyGroupFormDTO
@@ -132,7 +133,7 @@ public interface ResiGroupService extends BaseService<ResiGroupEntity> {
 	 * @Description 修改组信息
 	 * @Date 2020/3/28 22:27
 	 **/
-	Result modifyGroup(ModifyGroupFormDTO modifyGroupFormDTO);
+	void modifyGroup(ModifyGroupFormDTO modifyGroupFormDTO);
 
 	/**
 	 * @param groupSummarizeFormDTO
@@ -141,7 +142,7 @@ public interface ResiGroupService extends BaseService<ResiGroupEntity> {
 	 * @Description 查看小组管理界面信息
 	 * @Date 2020/3/29 17:52
 	 **/
-	Result<GroupSummarizeResultDTO> getGroupSummarize(GroupSummarizeFormDTO groupSummarizeFormDTO);
+	GroupSummarizeResultDTO getGroupSummarize(GroupSummarizeFormDTO groupSummarizeFormDTO);
 
 	/**
 	 * @param applyCreateGroupFormDTO
@@ -150,7 +151,7 @@ public interface ResiGroupService extends BaseService<ResiGroupEntity> {
 	 * @Description 创建小组
 	 * @Date 2020/3/29 19:26
 	 **/
-	Result applyCreateGroup(ApplyCreateGroupFormDTO applyCreateGroupFormDTO);
+	void applyCreateGroup(ApplyCreateGroupFormDTO applyCreateGroupFormDTO);
 
 	/**
 	 * @param initApplyGroupFormDTO
@@ -159,7 +160,7 @@ public interface ResiGroupService extends BaseService<ResiGroupEntity> {
 	 * @Description 加入小组界面初始化
 	 * @Date 2020/3/30 10:17
 	 **/
-	Result initApplyGroup(InitApplyGroupFormDTO initApplyGroupFormDTO);
+	void initApplyGroup(InitApplyGroupFormDTO initApplyGroupFormDTO);
 
 	/**
 	 * @param initApplyCreatedGroupFormDTO
@@ -168,13 +169,13 @@ public interface ResiGroupService extends BaseService<ResiGroupEntity> {
 	 * @Description 校验用户是否是热心居民或者党员
 	 * @Date 2020/3/30 15:50
 	 **/
-	Result initApplyCreatedGroup(InitApplyCreatedGroupFormDTO initApplyCreatedGroupFormDTO);
+	void initApplyCreatedGroup(InitApplyCreatedGroupFormDTO initApplyCreatedGroupFormDTO);
 
 	/**
 	 * @param agreeApplyGroupFormDTO
 	 * @return com.epmet.commons.tools.utils.Result
 	 * @Author yinzuomei
-	 * @Description 审核(同意)群申请-测试用后面会放到政府端
+	 * @Description 审核(同意)群申请
 	 * @Date 2020/3/31 12:44
 	 **/
 	Result agreeApplyGroup(AgreeApplyGroupFormDTO agreeApplyGroupFormDTO);
@@ -183,7 +184,7 @@ public interface ResiGroupService extends BaseService<ResiGroupEntity> {
 	 * @param disAgreeApplyGroupFormDTO
 	 * @return com.epmet.commons.tools.utils.Result
 	 * @Author yinzuomei
-	 * @Description 审核（拒绝）群申请-测试用后面会放到政府端
+	 * @Description 审核（拒绝）群申请
 	 * @Date 2020/3/31 13:22
 	 **/
 	Result disagreeApplyGroup(DisAgreeApplyGroupFormDTO disAgreeApplyGroupFormDTO);
@@ -241,4 +242,13 @@ public interface ResiGroupService extends BaseService<ResiGroupEntity> {
 	 * @Date 2020.04.19 23:32
 	 **/
 	Result<ApplyingGroupDetailResult2DTO> getApplyingGroupDetail(CommonGroupIdFromDTO groupId);
+
+	/**
+	 * @param gridIdList
+	 * @return java.util.List<com.epmet.resi.group.dto.group.GroupProcessingCountResultDTO>
+	 * @Author yinzuomei
+	 * @Description 传入网格id列表，返回每个网格的待审核小组总数
+	 * @Date 2020/5/13 21:37
+	 **/
+	List<GroupProcessingCountResultDTO> queryGroupProcessingCount(List<String> gridIdList);
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
index 9282ee3895..2bc77432e2 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
@@ -118,7 +118,6 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 	@Autowired
 	private EpmetMessageFeignClient epmetMessageFeignClient;
 
-
 	@Override
 	public PageData<ResiGroupDTO> page(Map<String, Object> params) {
 		IPage<ResiGroupEntity> page = baseDao.selectPage(
@@ -179,11 +178,11 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 	 * @Date 2020/3/28 20:37
 	 **/
 	@Override
-	public Result<List<MyGroupResultDTO>> getMyGroup(MyGroupFormDTO myGroupFormDTO) {
+	public List<MyGroupResultDTO> getMyGroup(MyGroupFormDTO myGroupFormDTO) {
 		int pageIndex = (myGroupFormDTO.getPageNo() - NumConstant.ONE) * myGroupFormDTO.getPageSize();
 		myGroupFormDTO.setPageNo(pageIndex);
 		List<MyGroupResultDTO> myGroupList = baseDao.selectListMyGroup(myGroupFormDTO);
-		return new Result<List<MyGroupResultDTO>>().ok(myGroupList);
+		return myGroupList;
 	}
 
 	/**
@@ -194,7 +193,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 	 * @Date 2020/3/28 19:53
 	 **/
 	@Override
-	public Result<List<RecommendGroupResultDTO>> getRecommendGroup(RecommendGroupFormDTO recommendGroupFormDTO) {
+	public List<RecommendGroupResultDTO> getRecommendGroup(RecommendGroupFormDTO recommendGroupFormDTO) {
 		int pageIndex = (recommendGroupFormDTO.getPageNo() - NumConstant.ONE) * recommendGroupFormDTO.getPageSize();
 		recommendGroupFormDTO.setPageNo(pageIndex);
 		//显示当前网格内所有当前用户还未加入的组，以组的人数由高到低排序；如果人数相同，以最新话题的时间有近到远排序
@@ -206,7 +205,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 				recommendGroupResultDTO.setStatus(groupMemeberOperationDTO.getOperateStatus());
 			}
 		}
-		return new Result<List<RecommendGroupResultDTO>>().ok(recommendGroupList);
+		return recommendGroupList;
 	}
 
 	/**
@@ -217,11 +216,11 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 	 * @Date 2020/3/28 22:01
 	 **/
 	@Override
-	public Result<List<CreatedResultDTO>> getCreated(CreatedFormDTO createdFormDTO) {
+	public List<CreatedResultDTO> getCreated(CreatedFormDTO createdFormDTO) {
 		int pageIndex = (createdFormDTO.getPageNo() - NumConstant.ONE) * createdFormDTO.getPageSize();
 		createdFormDTO.setPageNo(pageIndex);
 		List<CreatedResultDTO> createdResultDTOList = baseDao.selectListMyCreated(createdFormDTO);
-		return new Result<List<CreatedResultDTO>>().ok(createdResultDTOList);
+		return createdResultDTOList;
 	}
 
 	/**
@@ -233,24 +232,24 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 	 **/
 	@Transactional(rollbackFor = Exception.class)
 	@Override
-	public Result modifyGroup(ModifyGroupFormDTO modifyGroupFormDTO) {
+	public void modifyGroup(ModifyGroupFormDTO modifyGroupFormDTO) {
 		//校验是否是群主
 		ResiGroupMemberDTO groupMemberDTO = resiGroupMemberService.getResiGroupMember(modifyGroupFormDTO.getGroupId(), modifyGroupFormDTO.getUserId());
 		if (null == groupMemberDTO || ModuleConstant.GROUP_MEMBER.equals(groupMemberDTO.getGroupLeaderFlag())) {
-			logger.error(ModuleConstant.REJECT_MODIFYGROUPINFO);
-			return new Result().error();
+			logger.error(String.format("修改组信息:%s",ModuleConstant.REJECT_MODIFYGROUPINFO));
+			throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
 		}
 		if (StringUtils.isBlank(modifyGroupFormDTO.getGroupHeadPhoto())
 				&& StringUtils.isBlank(modifyGroupFormDTO.getGroupName())
 				&& StringUtils.isBlank(modifyGroupFormDTO.getGroupIntroduction())) {
-			return new Result();
+			logger.info("小组信息未发生变更，无需更改");
+			return;
 		}
 		int updatedRows = baseDao.modifyGroupInfo(modifyGroupFormDTO);
 		if (1 == updatedRows) {
-			return new Result().ok(ModuleConstant.UPDATE_SUCCESS);
+			logger.info(ModuleConstant.UPDATE_FAILED);
 		}
 		logger.error(ModuleConstant.UPDATE_FAILED);
-		throw new RenException(ModuleConstant.UPDATE_FAILED);
 	}
 
 	/**
@@ -261,20 +260,20 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 	 * @Date 2020/3/29 17:52
 	 **/
 	@Override
-	public Result<GroupSummarizeResultDTO> getGroupSummarize(GroupSummarizeFormDTO groupSummarizeFormDTO) {
+	public GroupSummarizeResultDTO getGroupSummarize(GroupSummarizeFormDTO groupSummarizeFormDTO) {
 		GroupSummarizeResultDTO groupSummarizeResultDTO = baseDao.selectGroupSummarize(groupSummarizeFormDTO);
 		if (null == groupSummarizeResultDTO) {
-			logger.error(ModuleConstant.GETGROUPSUMMARIZE_FAILED);
-			return new Result<GroupSummarizeResultDTO>().error();
+			logger.error(String.format("查看小组管理界面信息异常%s",ModuleConstant.GETGROUPSUMMARIZE_FAILED));
+			return new GroupSummarizeResultDTO();
 		}
 		//获取组长信息
 		Result<UserResiInfoResultDTO> groupLeaderUserInfo = this.getGroupLeaderUserInfo(groupSummarizeFormDTO.getGroupId());
 		if (groupLeaderUserInfo.success() && null != groupLeaderUserInfo.getData()) {
 			groupSummarizeResultDTO.setLeaderName(groupLeaderUserInfo.getData().getShowName());
 		} else {
-			logger.info("组长注册信息查询失败" + groupLeaderUserInfo.getMsg());
+			logger.warn("组长注册信息查询失败" + groupLeaderUserInfo.getMsg());
 		}
-		return new Result<GroupSummarizeResultDTO>().ok(groupSummarizeResultDTO);
+		return groupSummarizeResultDTO;
 	}
 
 	/**
@@ -309,11 +308,12 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 	 **/
 	@Transactional(rollbackFor = Exception.class)
 	@Override
-	public Result applyCreateGroup(ApplyCreateGroupFormDTO applyCreateGroupFormDTO) {
+	public void applyCreateGroup(ApplyCreateGroupFormDTO applyCreateGroupFormDTO) {
 		//1、校验是否同名
 		List<ResiGroupEntity> resiGroupEntityList = this.getResiGroupEntityList(applyCreateGroupFormDTO);
 		if (null != resiGroupEntityList && resiGroupEntityList.size() > 0) {
-			return new Result().error(EpmetErrorCode.GROUP_ALREADY_EXISTED.getCode());
+			logger.error(String.format("创建小组异常:%s",EpmetErrorCode.GROUP_ALREADY_EXISTED.getMsg()));
+			throw new RenException(EpmetErrorCode.GROUP_ALREADY_EXISTED.getCode());
 		}
 		//2、插入一条待审核的组信息
 		ResiGroupEntity resiGroupEntity = this.structureResiGroupEntity(applyCreateGroupFormDTO);
@@ -324,7 +324,8 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
                 applyCreateGroupFormDTO.getCustomerId(),
                 applyCreateGroupFormDTO.getGridId());
         if (!NumConstant.ONE_STR.equals(userRoleDTO.getPartymemberFlag()) && !NumConstant.ONE_STR.equals(userRoleDTO.getWarmHeartedFlag())) {
-            return new Result().error(EpmetErrorCode.CANNOT_CREATE_GROUP.getCode());
+			logger.error(String.format("创建小组异常:%s",EpmetErrorCode.CANNOT_CREATE_GROUP.getMsg()));
+			throw new RenException(EpmetErrorCode.CANNOT_CREATE_GROUP.getCode());
         }
         String roleName = "";
         if(NumConstant.ONE_STR.equals(userRoleDTO.getPartymemberFlag())){
@@ -392,7 +393,17 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		resiGroupStatisticalService.save(resiGroupStatisticalDTO);
 		//发送消息：创建小组
 		sendMsgResi2Gov(UserMessageConstant.CREATE_GROUP_APPLYING_MSG_TITLE,msg,applyCreateGroupFormDTO.getGridId(),applyCreateGroupFormDTO.getUserId(),applyCreateGroupFormDTO.getCustomerId());
-		return new Result();
+		//更新政府端:工作-基层治理-群组管理reddot
+		resiGroupRedis.addWorkGrassrootsGroupRedDotValue(applyCreateGroupFormDTO.getGridId());
+	}
+
+
+	private void setWorkGrassrootsGroupRedDot(String gridId) {
+		try{
+
+		}catch(Exception e){
+			e.printStackTrace();
+		}
 	}
 
 	/**
@@ -415,24 +426,15 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 	 * @Date 2020/3/30 10:17
 	 **/
 	@Override
-	public Result initApplyGroup(InitApplyGroupFormDTO initApplyGroupFormDTO) {
-		if (StringUtils.isBlank(initApplyGroupFormDTO.getCustomerId())) {
-			logger.error(ModuleConstant.CUSTOMERID_NOT_NULL);
-			throw new RenException(ModuleConstant.CUSTOMERID_NOT_NULL);
-		}
-		if (StringUtils.isBlank(initApplyGroupFormDTO.getUserId())) {
-			logger.error(ModuleConstant.USER_NOT_NULL);
-			throw new RenException(ModuleConstant.USER_NOT_NULL);
-		}
+	public void initApplyGroup(InitApplyGroupFormDTO initApplyGroupFormDTO) {
 		UserResiInfoFormDTO resiUserInfoFormDTO = new UserResiInfoFormDTO();
 		resiUserInfoFormDTO.setUserId(initApplyGroupFormDTO.getUserId());
 		resiUserInfoFormDTO.setCustomerId(initApplyGroupFormDTO.getCustomerId());
 		Result<UserResiInfoResultDTO> result = epmetUserFeignClient.getUserResiInfoDTO(resiUserInfoFormDTO);
 		if (!result.success() || null == result.getData() || StringUtils.isBlank(result.getData().getRegMobile())) {
-			logger.info("居民注册信息查询失败");
-			return new Result().error(EpmetErrorCode.CANNOT_JOIN_GROUP.getCode());
+			logger.error("加入小组界面初始化，居民注册信息查询失败");
+			throw new RenException(EpmetErrorCode.CANNOT_JOIN_GROUP.getCode());
 		}
-		return new Result();
 	}
 
 	private ResiGroupEntity structureResiGroupEntity(ApplyCreateGroupFormDTO applyCreateGroupFormDTO) {
@@ -455,23 +457,15 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 	 * @Date 2020/3/30 15:50
 	 **/
 	@Override
-	public Result initApplyCreatedGroup(InitApplyCreatedGroupFormDTO initApplyCreatedGroupFormDTO) {
-		if (StringUtils.isBlank(initApplyCreatedGroupFormDTO.getCustomerId())) {
-			logger.error(ModuleConstant.CUSTOMERID_NOT_NULL);
-			throw new RenException(ModuleConstant.CUSTOMERID_NOT_NULL);
-		}
-		if (StringUtils.isBlank(initApplyCreatedGroupFormDTO.getUserId())) {
-			logger.error(ModuleConstant.USER_NOT_NULL);
-			throw new RenException(ModuleConstant.USER_NOT_NULL);
-		}
+	public void initApplyCreatedGroup(InitApplyCreatedGroupFormDTO initApplyCreatedGroupFormDTO) {
 		UserRoleDTO userRoleDTO = this.checkPartyMemberOrWarmHeated(initApplyCreatedGroupFormDTO.getApp(),
 				initApplyCreatedGroupFormDTO.getUserId(),
 				initApplyCreatedGroupFormDTO.getCustomerId(),
 				initApplyCreatedGroupFormDTO.getGridId());
 		if (!NumConstant.ONE_STR.equals(userRoleDTO.getPartymemberFlag()) && !NumConstant.ONE_STR.equals(userRoleDTO.getWarmHeartedFlag())) {
-			return new Result().error(EpmetErrorCode.CANNOT_CREATE_GROUP.getCode());
+			logger.error(String.format("创建小组界面初始化,用户非党员、非热心居民，请求参数%S",initApplyCreatedGroupFormDTO.toString()));
+			throw new RenException(EpmetErrorCode.CANNOT_CREATE_GROUP.getCode());
 		}
-		return new Result();
 	}
 
 	/**
@@ -554,7 +548,8 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		if(!epmetMessageFeignClient.saveUserMessage(userMessageFormDTO).success()){
 			logger.warn(String.format(ModuleConstant.FAILED_SEND_MESSAGE,String.format(UserMessageConstant.AGREE_CREATING_GROUP_MSG_TEMPLATE,resiGroupDTO.getGroupName())));
 		}
-
+		//更新政府端:工作-基层治理-党员认证reddot
+		resiGroupRedis.subtractWorkGrassrootsPartyAuthRedDotValue(resiGroupDTO.getGridId());
 		return new Result();
 	}
 
@@ -598,7 +593,8 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		if(!epmetMessageFeignClient.saveUserMessage(userMessageFormDTO).success()){
 			logger.warn(String.format(ModuleConstant.FAILED_SEND_MESSAGE,String.format(UserMessageConstant.DISAGREE_CREATING_GROUP_MSG_TEMPLATE,resiGroupDTO.getGroupName(),disAgreeApplyGroupFormDTO.getRejectReason())));
 		}
-
+		//更新政府端:工作-基层治理-党员认证reddot
+		resiGroupRedis.subtractWorkGrassrootsPartyAuthRedDotValue(resiGroupDTO.getGridId());
 		return new Result();
 	}
 
@@ -786,6 +782,20 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 
 		return new Result<ApplyingGroupDetailResult2DTO>().ok(ConvertUtils.sourceToTarget(detail, ApplyingGroupDetailResult2DTO.class));
 	}
+
+	@Override
+	public List<GroupProcessingCountResultDTO> queryGroupProcessingCount(List<String> gridIdList) {
+		List<GroupProcessingCountResultDTO> list=new ArrayList<>();
+		for(String gridId:gridIdList){
+			GroupProcessingCountResultDTO resultDTO=new GroupProcessingCountResultDTO();
+			resultDTO.setGridId(gridId);
+			Long auditingCount=resiGroupRedis.getWorkGrassrootsGroupRedDotValue(gridId);
+			resultDTO.setCount(auditingCount);
+			list.add(resultDTO);
+		}
+		return list;
+	}
+
 	/**
 	 * @Description 给加入此网格的网格长发送消息
 	 * @param msg
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/redis/ResiGroupMemberRedis.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/redis/ResiGroupMemberRedis.java
index 2fc537cdb2..7f73fc2a23 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/redis/ResiGroupMemberRedis.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/redis/ResiGroupMemberRedis.java
@@ -26,6 +26,7 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.UserResiInfoFormDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
+import com.epmet.modules.constant.ResiGroupRedisKeys;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import com.epmet.modules.group.service.ResiGroupService;
 import com.epmet.modules.member.service.ResiGroupMemberService;
@@ -79,7 +80,7 @@ public class ResiGroupMemberRedis {
         if(null != memberInfoRedis
                 && StringUtils.isNotBlank(memberInfoRedis.getUserId())
                 && StringUtils.isNotBlank(memberInfoRedis.getGroupId())){
-            redisUtils.set(RedisKeys.getResiGroupMemberInfoKey(memberInfoRedis.getGroupId(),memberInfoRedis.getUserId()),memberInfoRedis);
+            redisUtils.set(ResiGroupRedisKeys.getResiGroupMemberInfoKey(memberInfoRedis.getGroupId(),memberInfoRedis.getUserId()),memberInfoRedis);
         }
     }
 
@@ -94,7 +95,7 @@ public class ResiGroupMemberRedis {
     public ResiGroupMemberInfoRedisDTO get(String groupId ,String userId){
 
         ResiGroupMemberInfoRedisDTO memberCache =
-        (ResiGroupMemberInfoRedisDTO) redisUtils.get(RedisKeys.getResiGroupMemberInfoKey(groupId,userId));
+        (ResiGroupMemberInfoRedisDTO) redisUtils.get(ResiGroupRedisKeys.getResiGroupMemberInfoKey(groupId,userId));
         //如果缓存中没有该成员数据
         if(null == memberCache || StringUtils.isNotBlank(memberCache.getUserId())){
             Map<String,Object> param = new HashMap<>();
@@ -152,7 +153,7 @@ public class ResiGroupMemberRedis {
      **/
     public ResiGroupMemberInfoRedisResultDTO getKeys(String groupId){
         Set<String> groupMemberKeys =
-        redisUtils.keys(RedisKeys.getResiGroupMemberInfoKey(groupId,"*"));
+        redisUtils.keys(ResiGroupRedisKeys.getResiGroupMemberInfoKey(groupId,"*"));
         Map<String,ResiGroupMemberInfoRedisDTO> memberMap = new HashMap<>(NumConstant.ONE_HUNDRED);
         for(String key : groupMemberKeys){
             ResiGroupMemberInfoRedisDTO member = (ResiGroupMemberInfoRedisDTO)redisUtils.get(key);
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 f775c004d6..6e1927f82c 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
@@ -34,6 +34,7 @@ import com.epmet.dto.form.UserResiInfoListFormDTO;
 import com.epmet.dto.result.IssueInitiatorResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.modules.constant.GroupMemberConstant;
+import com.epmet.modules.constant.ResiGroupRedisKeys;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import com.epmet.modules.group.dao.ResiGroupDao;
 import com.epmet.modules.group.dao.ResiGroupStatisticalDao;
@@ -741,7 +742,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         //2.读取用户缓存信息
         ResiGroupMemberInfoRedisResultDTO memberRedis = resiGroupMemberRedis.getKeys(groupId);
         if (null != memberRedis && null != memberRedis.getMemberKeys() && null != memberRedis.getMemberMap()) {
-            String keyPrefix = RedisKeys.getResiGroupMemberInfoKey(groupId, "");
+            String keyPrefix = ResiGroupRedisKeys.getResiGroupMemberInfoKey(groupId, "");
             for (ResiTopicInfoResultDTO topic : topics) {
                 //缓存中有该用户的key
                 if (memberRedis.getMemberKeys().contains(keyPrefix.concat(topic.getUserId()))) {
@@ -812,7 +813,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         //2.读取用户缓存信息
         ResiGroupMemberInfoRedisResultDTO memberRedis = resiGroupMemberRedis.getKeys(groupId);
         if (null != memberRedis && null != memberRedis.getMemberKeys() && null != memberRedis.getMemberMap()) {
-            String keyPrefix = RedisKeys.getResiGroupMemberInfoKey(groupId, "");
+            String keyPrefix = ResiGroupRedisKeys.getResiGroupMemberInfoKey(groupId, "");
             for (ResiTopicIncludeIssueInfoResultDTO topic : topics) {
                 //缓存中有该用户的key
                 if (memberRedis.getMemberKeys().contains(keyPrefix.concat(topic.getUserId()))) {
diff --git a/epmet-module/resi-hall/resi-hall-server/resi-hall-server.iml b/epmet-module/resi-hall/resi-hall-server/resi-hall-server.iml
index 9b122af4a2..d1c75d92ba 100644
--- a/epmet-module/resi-hall/resi-hall-server/resi-hall-server.iml
+++ b/epmet-module/resi-hall/resi-hall-server/resi-hall-server.iml
@@ -7,6 +7,10 @@
     <facet type="web" name="Web">
       <configuration>
         <webroots />
+        <sourceRoots>
+          <root url="file://$MODULE_DIR$/src/main/java" />
+          <root url="file://$MODULE_DIR$/src/main/resources" />
+        </sourceRoots>
       </configuration>
     </facet>
   </component>
@@ -16,6 +20,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/PartyAuthProcessingCountResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/PartyAuthProcessingCountResultDTO.java
new file mode 100644
index 0000000000..9ea7fa5f60
--- /dev/null
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/PartyAuthProcessingCountResultDTO.java
@@ -0,0 +1,25 @@
+package com.epmet.resi.partymember.dto.partymember.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 网格待审核党员数
+ * @Author yinzuomei
+ * @Date 2020/5/13 22:15
+ */
+@Data
+public class PartyAuthProcessingCountResultDTO implements Serializable {
+    private static final long serialVersionUID = 1595766019917829995L;
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 待审核党员申请总数
+     */
+    private Long count;
+}
+
diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/result/ResiProcessingCountResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/result/ResiProcessingCountResultDTO.java
new file mode 100644
index 0000000000..8d8135a9b9
--- /dev/null
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/result/ResiProcessingCountResultDTO.java
@@ -0,0 +1,25 @@
+package com.epmet.resi.partymember.dto.warmhearted.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 网格待审核热心居民数
+ * @Author yinzuomei
+ * @Date 2020/5/13 22:16
+ */
+@Data
+public class ResiProcessingCountResultDTO implements Serializable {
+    private static final long serialVersionUID = 4002474433059912113L;
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 待审核党员申请总数
+     */
+    private Long count;
+}
+
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/ResiPartyMemberRedisKeys.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/ResiPartyMemberRedisKeys.java
new file mode 100644
index 0000000000..d3ea121a6e
--- /dev/null
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/ResiPartyMemberRedisKeys.java
@@ -0,0 +1,35 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.epmet.constant;
+
+/**
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+public class ResiPartyMemberRedisKeys {
+
+	/**
+	 * 党群e事通redis前缀
+	 */
+	private static String rootPrefix = "epmet:";
+
+	/**
+	 * 政府工作段小程序：基层治理-居民管理（待审核的热心居民）红点key eg:epmet:gov:wxmp:work:grassroots:resi:XX网格id
+	 */
+	public static String getWorkGrassrootsResiRedDotKey(String gridId) {
+		return rootPrefix.concat(String.format("gov:wxmp:work:grassroots:resi:%s",gridId));
+	}
+
+	/**
+	 * 政府工作段小程序：基层治理-党员认证（待审核的党员）红点key eg:epmet:gov:wxmp:work:grassroots:resi:XX网格id
+	 */
+	public static String getWorkGrassrootsPartyAuthRedDotKey(String gridId) {
+		return rootPrefix.concat(String.format("gov:wxmp:work:grassroots:partyauth:%s",gridId));
+	}
+}
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberInfoController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberInfoController.java
index c98ec3ce99..ab98cf565a 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberInfoController.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberInfoController.java
@@ -32,6 +32,7 @@ import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
 import com.epmet.resi.partymember.dto.partymember.form.CertifiedDetailFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.CertifiedFormDTO;
 import com.epmet.resi.partymember.dto.partymember.result.CertifiedDetailResultDTO;
+import com.epmet.resi.partymember.dto.partymember.result.PartyAuthProcessingCountResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -118,4 +119,17 @@ public class PartymemberInfoController {
         return new Result<CertifiedDetailResultDTO>().ok(partymemberInfoService.certifiedDetail(formDTO));
     }
 
+    /**
+     * @param gridIdList
+     * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.resi.partymember.dto.partymember.result.PartyAuthProcessingCountResultDTO>>
+     * @Author yinzuomei
+     * @Description 传入网格id列表，返回各个网格对应的待审核党员总数
+     * @Date 2020/5/13 22:37
+     **/
+    @PostMapping("getworkgrassrootspartyauth")
+    public Result<List<PartyAuthProcessingCountResultDTO>> queryPartyMemberProcessingCount(@RequestBody List<String> gridIdList) {
+        List<PartyAuthProcessingCountResultDTO> list = partymemberInfoService.queryPartyMemberProcessingCount(gridIdList);
+        return new Result<List<PartyAuthProcessingCountResultDTO>>().ok(list);
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberInfoService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberInfoService.java
index d2e6779edc..0fe2142c08 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberInfoService.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberInfoService.java
@@ -26,6 +26,7 @@ import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
 import com.epmet.resi.partymember.dto.partymember.form.CertifiedDetailFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.CertifiedFormDTO;
 import com.epmet.resi.partymember.dto.partymember.result.CertifiedDetailResultDTO;
+import com.epmet.resi.partymember.dto.partymember.result.PartyAuthProcessingCountResultDTO;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
@@ -137,4 +138,12 @@ public interface PartymemberInfoService extends BaseService<PartymemberInfoEntit
      */
     CertifiedDetailResultDTO certifiedDetail(CertifiedDetailFormDTO formDTO);
 
+    /**
+     * @param gridIdList
+     * @return java.util.List<com.epmet.resi.partymember.dto.partymember.result.PartyAuthProcessingCountResultDTO>
+     * @Author yinzuomei
+     * @Description 传入网格id列表，返回各个网格对应的待审核党员总数
+     * @Date 2020/5/13 22:37
+     **/
+    List<PartyAuthProcessingCountResultDTO> queryPartyMemberProcessingCount(List<String> gridIdList);
 }
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
index dc9f3200d9..13dc1d53dd 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
@@ -22,8 +22,7 @@ import com.epmet.modules.feign.GovOrgFeignClient;
 import com.epmet.modules.partymember.entity.*;
 import com.epmet.modules.partymember.redis.PartymemberInfoRedis;
 import com.epmet.modules.partymember.service.*;
-import com.epmet.modules.warmhearted.constant.ResiWarmUserMessageConstant;
-import com.epmet.modules.warmhearted.entity.ResiWarmheartedApplyEntity;
+import com.epmet.redis.ResiPartyMemberRedis;
 import com.epmet.resi.mine.dto.from.PartyMemberInitFromDTO;
 import com.epmet.resi.mine.dto.from.VerificationCodeFromDTO;
 import com.epmet.resi.mine.dto.result.PartyMemberInitResultDTO;
@@ -78,7 +77,8 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 	private EpmetMessageFeignClient messageFeignClient;
 	@Autowired
 	private GovOrgFeignClient govOrgFeignClient;
-
+	@Autowired
+	private ResiPartyMemberRedis resiPartyMemberRedis;
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public Result<PartyMemberInitResultDTO> init(PartyMemberInitFromDTO fromDto) {
@@ -269,6 +269,8 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 		}
 
 		auditMessage(ConvertUtils.sourceToTarget(partyMemberInfo, PartymemberInfoEntity.class), PartyMemberMessageConstant.MEMBER_APPLY_MSG);
+		//更新政府端:工作-基层治理-党员认证reddot
+		resiPartyMemberRedis.addWorkGrassrootsPartyAuthRedDotValue(infoDTO.getGridId());
 		return new Result();
 	}
 
@@ -302,7 +304,8 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 		} else {
 			auditMessage(partyMemberInfoEntity, PartyMemberMessageConstant.AUDIT_REJECT_MSG);
 		}
-
+		//更新政府端:工作-基层治理-党员认证reddot
+		resiPartyMemberRedis.subtractWorkGrassrootsPartyAuthRedDotValue(manualEntity.getGridId());
 		return new Result();
 	}
 
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java
index 680a3ba35a..732bcf1d83 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java
@@ -36,10 +36,12 @@ import com.epmet.modules.partymember.dao.PartymemberInfoDao;
 import com.epmet.modules.partymember.entity.PartymemberInfoEntity;
 import com.epmet.modules.partymember.redis.PartymemberInfoRedis;
 import com.epmet.modules.partymember.service.PartymemberInfoService;
+import com.epmet.redis.ResiPartyMemberRedis;
 import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
 import com.epmet.resi.partymember.dto.partymember.form.CertifiedDetailFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.CertifiedFormDTO;
 import com.epmet.resi.partymember.dto.partymember.result.CertifiedDetailResultDTO;
+import com.epmet.resi.partymember.dto.partymember.result.PartyAuthProcessingCountResultDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -69,7 +71,8 @@ public class PartymemberInfoServiceImpl extends BaseServiceImpl<PartymemberInfoD
 
 	@Autowired
 	private GovOrgFeignClient govOrgFeignClient;
-
+	@Autowired
+	private ResiPartyMemberRedis resiPartyMemberRedis;
 	@Override
 	public PageData<PartymemberInfoDTO> page(Map<String, Object> params) {
 		IPage<PartymemberInfoEntity> page = baseDao.selectPage(
@@ -199,5 +202,18 @@ public class PartymemberInfoServiceImpl extends BaseServiceImpl<PartymemberInfoD
 		return certifiedDetail;
 	}
 
+	@Override
+	public List<PartyAuthProcessingCountResultDTO> queryPartyMemberProcessingCount(List<String> gridIdList) {
+		List<PartyAuthProcessingCountResultDTO> list = new ArrayList<>();
+		for (String gridId : gridIdList) {
+			PartyAuthProcessingCountResultDTO partyAuthProcessingCountResultDTO = new PartyAuthProcessingCountResultDTO();
+			partyAuthProcessingCountResultDTO.setGridId(gridId);
+			Long auditingPartyMember = resiPartyMemberRedis.queryPartyAuthProcessingCount(gridId);
+			partyAuthProcessingCountResultDTO.setCount(auditingPartyMember);
+			list.add(partyAuthProcessingCountResultDTO);
+		}
+		return list;
+	}
+
 
 }
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedApplyController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedApplyController.java
index 5444e4ccca..e2da03019c 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedApplyController.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedApplyController.java
@@ -31,6 +31,7 @@ import com.epmet.modules.warmhearted.excel.ResiWarmheartedApplyExcel;
 import com.epmet.modules.warmhearted.service.ResiWarmheartedApplyService;
 import com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedApplyDTO;
 import com.epmet.resi.partymember.dto.warmhearted.form.*;
+import com.epmet.resi.partymember.dto.warmhearted.result.ResiProcessingCountResultDTO;
 import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmAuditResultDTO;
 import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedAuditedResultDTO;
 import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
@@ -162,4 +163,16 @@ public class ResiWarmheartedApplyController {
 		return resiWarmheartedApplyService.getDetail(formDTO);
 	}
 
+	/**
+	 * @param gridIdList
+	 * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.resi.partymember.dto.warmhearted.result.ResiProcessingCountResultDTO>>
+	 * @Author yinzuomei
+	 * @Description 传入网格id列表，返回每个列表下对应的待审核居民总数
+	 * @Date 2020/5/13 22:25
+	 **/
+	@PostMapping("queryresiprocessingcount")
+	public Result<List<ResiProcessingCountResultDTO>> queryResiProcessingCount(@RequestBody List<String> gridIdList) {
+		List<ResiProcessingCountResultDTO> list = resiWarmheartedApplyService.queryResiProcessingCount(gridIdList);
+		return new Result<List<ResiProcessingCountResultDTO>>().ok(list);
+	}
 }
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/ResiWarmheartedApplyService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/ResiWarmheartedApplyService.java
index 0fba6e16ff..7bd90437b1 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/ResiWarmheartedApplyService.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/ResiWarmheartedApplyService.java
@@ -23,6 +23,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.modules.warmhearted.entity.ResiWarmheartedApplyEntity;
 import com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedApplyDTO;
 import com.epmet.resi.partymember.dto.warmhearted.form.*;
+import com.epmet.resi.partymember.dto.warmhearted.result.ResiProcessingCountResultDTO;
 import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmAuditResultDTO;
 import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedAuditedResultDTO;
 import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
@@ -158,4 +159,13 @@ public interface ResiWarmheartedApplyService extends BaseService<ResiWarmhearted
      * @author sun
      */
     Result<ResiWarmAuditResultDTO> getDetail(ResiWarmGetDetailFormDTO formDTO);
+
+    /**
+     * @param gridIdList
+     * @return java.util.List<com.epmet.resi.partymember.dto.warmhearted.result.ResiProcessingCountResultDTO>
+     * @Author yinzuomei
+     * @Description 传入网格id列表，返回每个列表下对应的待审核居民总数
+     * @Date 2020/5/13 22:25
+     **/
+    List<ResiProcessingCountResultDTO> queryResiProcessingCount(List<String> gridIdList);
 }
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java
index 6da9ab7c94..8ddb224bf0 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java
@@ -46,11 +46,12 @@ import com.epmet.modules.warmhearted.constant.ResiWarmheartedConstant;
 import com.epmet.modules.warmhearted.constant.ResiWarmheartedVisitConstant;
 import com.epmet.modules.warmhearted.dao.ResiWarmheartedApplyDao;
 import com.epmet.modules.warmhearted.entity.ResiWarmheartedApplyEntity;
-import com.epmet.modules.warmhearted.redis.ResiWarmheartedApplyRedis;
 import com.epmet.modules.warmhearted.service.ResiWarmheartedApplyService;
 import com.epmet.modules.warmhearted.service.ResiWarmheartedVisitService;
+import com.epmet.redis.ResiPartyMemberRedis;
 import com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedApplyDTO;
 import com.epmet.resi.partymember.dto.warmhearted.form.*;
+import com.epmet.resi.partymember.dto.warmhearted.result.ResiProcessingCountResultDTO;
 import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmAuditResultDTO;
 import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedAuditedResultDTO;
 import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
@@ -78,8 +79,6 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
 
 	private static final Logger logger = LoggerFactory.getLogger(ResiWarmheartedApplyServiceImpl.class);
 	@Autowired
-	private ResiWarmheartedApplyRedis resiWarmheartedApplyRedis;
-	@Autowired
 	private ResiWarmheartedVisitService resiWarmheartedVisitService;
 	@Autowired
 	private ResiWarmheartedApplyDao resiWarmheartedApplyDao;
@@ -89,6 +88,8 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
 	private EpmetMessageFeignClient epmetMessageFeignClient;
 	@Autowired
 	private GovOrgFeignClient govOrgFeignClient;
+	@Autowired
+	private ResiPartyMemberRedis resiPartyMemberRedis;
 
 	@Override
 	public PageData<ResiWarmheartedApplyDTO> page(Map<String, Object> params) {
@@ -210,6 +211,8 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
 			}
 			result.setCode(NumConstant.ZERO);
 			result.setMsg(ResiWarmheartedVisitConstant.RESI_WARM_SUBMIT);
+			//更新政府端:工作-基层治理-居民管理reddot
+			resiPartyMemberRedis.addWorkGrassrootsResiRedDotValue(formDTO.getGridId());
 		}
 		return result;
 	}
@@ -371,8 +374,8 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
 		//0:先校验数据是否是未审核状态，防止接口测试调用多次
 		ResiWarmheartedApplyEntity entity = baseDao.selectById(formDTO.getApplyId());
 		if (null == entity || !ResiWarmheartedVisitConstant.UNDER_AUDITTING.equals(entity.getAuditStatus())) {
-			result.error(ResiWarmheartedVisitConstant.AUDIT_EXCEPTION);
-			return result;
+			logger.error(String.format("政府端-热心居民申请-审核通过错误,applyId=%s,错误提示:%s",ResiWarmheartedVisitConstant.AUDIT_EXCEPTION));
+			throw new RenException(ResiWarmheartedVisitConstant.AUDIT_EXCEPTION);
 		}
 		//1:更新热心居民申请表数据
 		//审核状态-通过
@@ -380,15 +383,15 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
 		int num = baseDao.updateById(entity);
 		//2:审核通过的添加热心居民的角色
 		if (num < NumConstant.ONE) {
-			result.error(ResiWarmheartedVisitConstant.UPDATE_EXCEPTION);
-			return result;
+			logger.error(String.format("政府端-热心居民申请-审核通过错误,applyId=%s,错误提示:%s",ResiWarmheartedVisitConstant.UPDATE_EXCEPTION));
+			throw new RenException(ResiWarmheartedVisitConstant.UPDATE_EXCEPTION);
 		}
 		//查询需要添加热心居民角色的userId
 		UserRoleDTO dto = new UserRoleDTO();
 		dto.setCustomerId(entity.getCustomerId());
 		dto.setUserId(entity.getUserId());
-		//所属端-居民端
 		dto.setApp(AppClientConstant.APP_RESI);
+		//所属端-居民端
 		//角色-热心居民
 		dto.setRoleKey(EpmetRoleKeyConstant.WARMHEARTED);
 		//角色表新增网格Id
@@ -396,6 +399,8 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
 		result = epmetUserFeignClient.saveUserRole(dto);
 		//3:为申请人发送审核通过消息提示
 		result = auditMessage(entity, ResiWarmUserMessageConstant.AUDIT_APPROVE_MSG);
+		//4:更新政府端:工作-基层治理-居民管理reddot
+		resiPartyMemberRedis.subtractWorkGrassrootsResiRedDotValue(entity.getGridId());
 		return result;
 	}
 	/**
@@ -450,6 +455,8 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
 		//2:为申请人发送审核驳回消息提示
 		//查询申请信息
 		auditMessage(entity, ResiWarmUserMessageConstant.AUDIT_REJECT_MSG);
+		//3:更新政府端:工作-基层治理-居民管理reddot
+		resiPartyMemberRedis.subtractWorkGrassrootsResiRedDotValue(entity.getGridId());
 		return result;
 	}
 
@@ -491,4 +498,17 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
 		resultDTO.setStreet(userInfo.getStreet());
 		return result.ok(resultDTO);
 	}
+
+	@Override
+	public List<ResiProcessingCountResultDTO> queryResiProcessingCount(List<String> gridIdList) {
+		List<ResiProcessingCountResultDTO> list = new ArrayList<>();
+		for (String gridId : gridIdList) {
+			ResiProcessingCountResultDTO resiProcessingCountResultDTO = new ResiProcessingCountResultDTO();
+			resiProcessingCountResultDTO.setGridId(gridId);
+			Long auditingResi = resiPartyMemberRedis.queryResiProcessingCount(gridId);
+			resiProcessingCountResultDTO.setCount(auditingResi);
+			list.add(resiProcessingCountResultDTO);
+		}
+		return list;
+	}
 }
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/redis/ResiPartyMemberRedis.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/redis/ResiPartyMemberRedis.java
new file mode 100644
index 0000000000..10dce072dd
--- /dev/null
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/redis/ResiPartyMemberRedis.java
@@ -0,0 +1,168 @@
+/**
+ * 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.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import com.epmet.constant.ResiPartyMemberRedisKeys;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 本模块redis所有操作放这
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-03-30
+ */
+@Component
+public class ResiPartyMemberRedis {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set() {
+
+    }
+
+    public String get(String id) {
+        return null;
+    }
+
+    /**
+     * @param gridId
+     * @return java.lang.Long
+     * @Author yinzuomei
+     * @Description 居民端热心居民申请成功，该redis值+1,目的：政府端基层治理-居民管理显示红点提醒工作人员有待办事项
+     * @Date 2020/5/13 10:55
+     **/
+    public Long addWorkGrassrootsResiRedDotValue(String gridId) {
+        Long auditingResiWarmHeartedCount = 0L;
+        try {
+            String workGrassrootsResiRedDotKey = ResiPartyMemberRedisKeys.getWorkGrassrootsResiRedDotKey(gridId);
+            auditingResiWarmHeartedCount = redisUtils.incrementAndGet(workGrassrootsResiRedDotKey);
+            logger.info(String.format("居民端热心居民申请提交,更新redis-reddot值成功,key[%s],Value[%s]", workGrassrootsResiRedDotKey, auditingResiWarmHeartedCount));
+        } catch (Exception e) {
+            logger.error(String.format("居民端热心居民申请提交,更新redis-reddot值异常%s", e.getMessage()));
+            e.printStackTrace();
+        }
+        return auditingResiWarmHeartedCount;
+    }
+
+    /**
+     * @param gridId
+     * @return java.lang.Long
+     * @Author yinzuomei keyeg: epmet:gov:wxmp:work:grassroots:partyauth:XX网格id
+     * @Description 政府端小程序审核热心居民申请（同意或拒绝），更新该redis值-1
+     * @Date 2020/5/13 13:11
+     **/
+    public Long subtractWorkGrassrootsResiRedDotValue(String gridId) {
+        Long auditingPartyMemberCount = 0L;
+        try {
+            String workGrassrootsPartyAuthRedDotKey = ResiPartyMemberRedisKeys.getWorkGrassrootsResiRedDotKey(gridId);
+            auditingPartyMemberCount = redisUtils.incrementAndGet(workGrassrootsPartyAuthRedDotKey);
+            logger.info(String.format("政府端(wxmp)审核热心居民申请,更新redis-reddot值成功,key[%s],Value[%s]", workGrassrootsPartyAuthRedDotKey, auditingPartyMemberCount));
+        } catch (Exception e) {
+            logger.error(String.format("政府端(wxmp)审核热心居民申请,更新redis-reddot值异常%s", e.getMessage()));
+            e.printStackTrace();
+        }
+        return auditingPartyMemberCount;
+    }
+
+    /**
+     * @param gridId
+     * @return java.lang.Long
+     * @Author yinzuomei keyeg: epmet:gov:wxmp:work:grassroots:partyauth:XX网格id
+     * @Description 居民端党员自动认证失败，且填写了补充信息，提交成功后，该redis值+1,目的：政府端基层治理-党员认证显示红点，提醒工作人员有待办事项
+     * @Date 2020/5/13 10:56
+     **/
+    public Long addWorkGrassrootsPartyAuthRedDotValue(String gridId) {
+        Long auditingPartyMemberCount = 0L;
+        try {
+            String workGrassrootsPartyAuthRedDotKey = ResiPartyMemberRedisKeys.getWorkGrassrootsPartyAuthRedDotKey(gridId);
+            auditingPartyMemberCount = redisUtils.incrementAndGet(workGrassrootsPartyAuthRedDotKey);
+            logger.info(String.format("居民端党员认证补充信息提交,更新redis-reddot值成功,key[%s],Value[%s]", workGrassrootsPartyAuthRedDotKey, auditingPartyMemberCount));
+        } catch (Exception e) {
+            logger.error(String.format("居民端党员认证补充信息提交,更新redis-reddot值异常%s", e.getMessage()));
+            e.printStackTrace();
+        }
+        return auditingPartyMemberCount;
+    }
+
+    /**
+     * @param gridId
+     * @return java.lang.Long
+     * @Author yinzuomei keyeg: epmet:gov:wxmp:work:grassroots:partyauth:XX网格id
+     * @Description 政府端审批党员认证申请成功后，更新该redis值-1
+     * @Date 2020/5/13 10:56
+     **/
+    public Long subtractWorkGrassrootsPartyAuthRedDotValue(String gridId) {
+        Long auditingPartyMemberCount = 0L;
+        try {
+            String workGrassrootsPartyAuthRedDotKey = ResiPartyMemberRedisKeys.getWorkGrassrootsPartyAuthRedDotKey(gridId);
+            auditingPartyMemberCount = redisUtils.incrementAndGet(workGrassrootsPartyAuthRedDotKey);
+            logger.info(String.format("居民端党员认证补充信息提交,更新redis-reddot值成功,key[%s],Value[%s]", workGrassrootsPartyAuthRedDotKey, auditingPartyMemberCount));
+        } catch (Exception e) {
+            logger.error(String.format("居民端党员认证补充信息提交,更新redis-reddot值异常%s", e.getMessage()));
+            e.printStackTrace();
+        }
+        return auditingPartyMemberCount;
+    }
+
+    /**
+     * @param gridId
+     * @return java.lang.Long
+     * @Author yinzuomei
+     * @Description 查询网格下待审核热心居民总数
+     * @Date 2020/5/13 22:44
+     **/
+    public Long queryResiProcessingCount(String gridId) {
+        Long auditingResiWarmHeartedCount = 0L;
+        try {
+            String workGrassrootsResiRedDotKey = ResiPartyMemberRedisKeys.getWorkGrassrootsResiRedDotKey(gridId);
+            auditingResiWarmHeartedCount = (Long) redisUtils.get(workGrassrootsResiRedDotKey);
+        } catch (Exception e) {
+            logger.error(String.format("网格id%s,查询网格下待审核热心居民总数异常%s", gridId, e.getMessage()));
+            e.printStackTrace();
+        }
+        return auditingResiWarmHeartedCount;
+    }
+
+    /**
+     * @param gridId
+     * @return java.lang.Long
+     * @Author yinzuomei
+     * @Description 查询网格下待审核党员总数
+     * @Date 2020/5/13 22:44
+     **/
+    public Long queryPartyAuthProcessingCount(String gridId) {
+        Long auditingParyMember = 0L;
+        try {
+            String workGrassrootsResiRedDotKey = ResiPartyMemberRedisKeys.getWorkGrassrootsPartyAuthRedDotKey(gridId);
+            auditingParyMember = (Long) redisUtils.get(workGrassrootsResiRedDotKey);
+        } catch (Exception e) {
+            logger.error(String.format("网格id%s,查询网格下待审核党员总数异常%s", gridId, e.getMessage()));
+            e.printStackTrace();
+        }
+        return auditingParyMember;
+    }
+}
\ No newline at end of file

From e9c2add5ced364cc7beb45feeee1b28901e4de05 Mon Sep 17 00:00:00 2001
From: zxc <954985706@qq.com>
Date: Thu, 14 May 2020 09:25:54 +0800
Subject: [PATCH 38/45] =?UTF-8?q?EpmetErrorCode=20=E8=A1=A5=E6=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/commons/tools/exception/EpmetErrorCode.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 8aa19240ca..78f66e9330 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
@@ -40,7 +40,10 @@ public enum EpmetErrorCode {
 	MOBILE_USED(8402,"该手机号已注册"),
 	STAFF_ADD_FAILED(8403,"人员添加失败"),
 	STAFF_EDIT_FAILED(8404,"人员编辑失败"),
-	CANNOT_DISABLE_YOURSELF(8405,"您不能禁用自己"),;
+	CANNOT_DISABLE_YOURSELF(8405,"您不能禁用自己"),
+
+	ALREADY_EVALUATE(8501,"您已评价"),
+	ALREADY_VOTE(8502,"您已表态");
 
 	private int code;
 	private String msg;

From 1cb7b0cb6b840fbb14c370ec1a2b671487f3b8b3 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Thu, 14 May 2020 09:27:53 +0800
Subject: [PATCH 39/45] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/entity/ProjectStaffEntity.java   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectStaffEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectStaffEntity.java
index 3184a68a34..0ad284d6a0 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectStaffEntity.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectStaffEntity.java
@@ -43,6 +43,11 @@ public class ProjectStaffEntity extends BaseEpmetEntity {
      */
 	private String projectId;
 
+	/**
+	 * 项目处理进展ID
+	 */
+	private String processId;
+
     /**
      * 客户ID
      */

From 134039c5be235f949eb35627dc257a64240bd608 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 14 May 2020 09:55:45 +0800
Subject: [PATCH 40/45] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=B7=9F=E8=B8=AA-?=
 =?UTF-8?q?=E8=BD=AC=E5=85=B6=E4=BB=96=E9=83=A8=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/form/AgencyDeptGridFormDTO.java | 51 ++++++++++
 .../dto/result/AgencyDeptGridResultDTO.java   | 52 +++++++++++
 .../controller/CustomerAgencyController.java  | 13 +++
 .../java/com/epmet/dao/CustomerAgencyDao.java |  8 ++
 .../com/epmet/dao/CustomerDepartmentDao.java  | 10 ++
 .../java/com/epmet/dao/CustomerGridDao.java   |  9 ++
 .../epmet/service/CustomerAgencyService.java  | 10 ++
 .../impl/CustomerAgencyServiceImpl.java       | 22 +++++
 .../resources/mapper/CustomerAgencyDao.xml    | 11 +++
 .../mapper/CustomerDepartmentDao.xml          | 11 +++
 .../main/resources/mapper/CustomerGridDao.xml | 11 +++
 .../com/epmet/dto/form/TickStaffFormDTO.java  | 35 +++++++
 .../com/epmet/dto/form/TransferFormDTO.java   | 36 +++++++
 .../com/epmet/constant/ProjectConstant.java   | 12 +++
 .../controller/ProjectTraceController.java    | 14 +++
 .../com/epmet/feign/GovOrgFeignClient.java    | 11 +++
 .../fallback/GovOrgFeignClientFallBack.java   |  7 ++
 .../epmet/service/ProjectProcessService.java  |  9 ++
 .../impl/ProjectProcessServiceImpl.java       | 93 ++++++++++++++++++-
 19 files changed, 422 insertions(+), 3 deletions(-)
 create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AgencyDeptGridFormDTO.java
 create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyDeptGridResultDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/TickStaffFormDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/TransferFormDTO.java

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AgencyDeptGridFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AgencyDeptGridFormDTO.java
new file mode 100644
index 0000000000..86bd71498a
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AgencyDeptGridFormDTO.java
@@ -0,0 +1,51 @@
+/**
+ * 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.form;
+
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * 根据组织Id集合、部门Id集合、网格Id集合查询对应详细信息-入参
+ *
+ * @author sun
+ */
+@Data
+public class AgencyDeptGridFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 组织Id集合
+     */
+    private List<String> agencyIdList;
+    /**
+     * 部门Id集合
+     */
+    private List<String> deptIdList;
+    /**
+     * 网格Id集合
+     */
+    private List<String> gridIdList;
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyDeptGridResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyDeptGridResultDTO.java
new file mode 100644
index 0000000000..cec3f682d5
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyDeptGridResultDTO.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.dto.result;
+
+import com.epmet.dto.CustomerAgencyDTO;
+import com.epmet.dto.CustomerDepartmentDTO;
+import com.epmet.dto.CustomerGridDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * 根据组织Id集合、部门Id集合、网格Id集合查询对应详细信息--返参
+ *
+ * @author sun
+ */
+@Data
+public class AgencyDeptGridResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 组织信息集合
+     */
+    private List<CustomerAgencyDTO> agencyList;
+    /**
+     * 部门信息集合
+     */
+    private List<CustomerDepartmentDTO> deptList;
+    /**
+     * 网格信息集合
+     */
+    private List<CustomerGridDTO> gridList;
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
index 50cfe3c5be..6434a318b6 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
@@ -26,7 +26,9 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.CustomerAgencyDTO;
+import com.epmet.dto.form.AgencyDeptGridFormDTO;
 import com.epmet.dto.form.StaffOrgFormDTO;
+import com.epmet.dto.result.AgencyDeptGridResultDTO;
 import com.epmet.dto.result.AgencyGridResultDTO;
 import com.epmet.dto.result.DepartmentStaffListResultDTO;
 import com.epmet.dto.result.StaffOrgsResultDTO;
@@ -129,4 +131,15 @@ public class CustomerAgencyController {
         return new Result<DepartmentStaffListResultDTO>().ok(customerAgencyService.departmentStaffList(agencyId));
     }
 
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 根据组织Id集合、部门Id集合、网格Id集合查询各自对应详细信息
+     **/
+    @PostMapping("getagencydeptgridlist")
+    public Result<AgencyDeptGridResultDTO> getAgencyDeptGridList(AgencyDeptGridFormDTO formDTO) {
+        return new Result<AgencyDeptGridResultDTO>().ok(customerAgencyService.getAgencyDeptGridList(formDTO));
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
index bf68fc2458..a83d872672 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
@@ -87,4 +87,12 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
      * @date 2020/4/28 15:50
      */
     String selectAreaCodeByAgencyId(@Param("agencyId") String agencyId);
+
+    /**
+     * @param agencyIdList
+     * @return
+     * @Author sun
+     * @Description 批量查询组织信息
+     **/
+    List<CustomerAgencyDTO> selectAgencyListByIds(@Param("agencyIdList") List<String> agencyIdList);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerDepartmentDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerDepartmentDao.java
index 300ea8bf8e..13cb1da0ea 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerDepartmentDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerDepartmentDao.java
@@ -18,6 +18,8 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.CustomerAgencyDTO;
+import com.epmet.dto.CustomerDepartmentDTO;
 import com.epmet.dto.CustomerIdDTO;
 import com.epmet.dto.result.DepartmentListResultDTO;
 import com.epmet.dto.result.SubListResultDTO;
@@ -65,4 +67,12 @@ public interface CustomerDepartmentDao extends BaseDao<CustomerDepartmentEntity>
      * @date 2020/4/28 12:26
      */
     CustomerIdDTO selectCustomerIdByDepartmentId(@Param("departmentId") String departmentId);
+
+    /**
+     * @param deptIdList
+     * @return
+     * @Author sun
+     * @Description 批量查询部门信息
+     **/
+    List<CustomerDepartmentDTO> selectDeptListByIds(@Param("deptIdList") List<String> deptIdList);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
index 669664481c..2a066a5e92 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
@@ -18,6 +18,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.UserIdAndPidDTO;
 import com.epmet.dto.UserIdDTO;
@@ -167,4 +168,12 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
      * @author sun
      */
     List<GridListResultDTO> selectGridList(@Param("agencyId") String agencyId);
+
+    /**
+     * @param gridIdList
+     * @return
+     * @Author sun
+     * @Description 批量查询网格信息
+     **/
+    List<CustomerGridDTO> selectGridListByIds(@Param("gridIdList") List<String> gridIdList);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
index 7af4c11691..b79c1c6cfb 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
@@ -21,7 +21,9 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerAgencyDTO;
+import com.epmet.dto.form.AgencyDeptGridFormDTO;
 import com.epmet.dto.form.StaffOrgFormDTO;
+import com.epmet.dto.result.AgencyDeptGridResultDTO;
 import com.epmet.dto.result.AgencyGridResultDTO;
 import com.epmet.dto.result.DepartmentStaffListResultDTO;
 import com.epmet.dto.result.StaffOrgsResultDTO;
@@ -122,4 +124,12 @@ public interface CustomerAgencyService extends BaseService<CustomerAgencyEntity>
      * @Description 查询组织下人员,组织下部门人员,组织下网格人员列表信息
      **/
     DepartmentStaffListResultDTO departmentStaffList(String agencyId);
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 根据组织Id集合、部门Id集合、网格Id集合查询各自对应详细信息
+     **/
+    AgencyDeptGridResultDTO getAgencyDeptGridList(AgencyDeptGridFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
index 8a7607b942..2218c26341 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
@@ -29,6 +29,7 @@ import com.epmet.constant.CustomerAgencyConstant;
 import com.epmet.constant.CustomerGridConstant;
 import com.epmet.dao.*;
 import com.epmet.dto.*;
+import com.epmet.dto.form.AgencyDeptGridFormDTO;
 import com.epmet.dto.form.CustomerFormDTO;
 import com.epmet.dto.form.StaffOrgFormDTO;
 import com.epmet.dto.result.*;
@@ -298,4 +299,25 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         return resultDTO;
     }
 
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 根据组织Id集合、部门Id集合、网格Id集合查询各自对应详细信息
+     **/
+    @Override
+    public AgencyDeptGridResultDTO getAgencyDeptGridList(AgencyDeptGridFormDTO formDTO) {
+        AgencyDeptGridResultDTO agencyDeptGrid = new AgencyDeptGridResultDTO();
+        //1:跟踪组织Id批量查询组织信息
+        List<CustomerAgencyDTO> agencyList = baseDao.selectAgencyListByIds(formDTO.getAgencyIdList());
+        //2:根据部门Id批量查询部门信息
+        List<CustomerDepartmentDTO> deptList = customerDepartmentDao.selectDeptListByIds(formDTO.getDeptIdList());
+        //3:根据网格Id批量查询网格信息
+        List<CustomerGridDTO> gridList = customerGridDao.selectGridListByIds(formDTO.getGridIdList());
+        agencyDeptGrid.setAgencyList(agencyList);
+        agencyDeptGrid.setDeptList(deptList);
+        agencyDeptGrid.setGridList(gridList);
+        return agencyDeptGrid;
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
index f690d08e53..41cce6fb8e 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
@@ -108,4 +108,15 @@
                INNER JOIN customer_agency ca ON (csa.AGENCY_ID = ca.ID)
         WHERE csa.USER_ID = #{staffId}
     </select>
+
+    <select id="selectAgencyListByIds" resultType="com.epmet.dto.CustomerAgencyDTO">
+        SELECT
+        <include refid="sql"></include>
+        FROM customer_agency ca
+        WHERE ca.del_flag = '0'
+        AND
+        <foreach item="agencyId" collection="agencyIdList" open="(" separator="or" close=")" index="">
+            ca.id = #{agencyId}
+        </foreach>
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml
index aab4ce8f67..54a12139ad 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml
@@ -44,4 +44,15 @@
             id = #{departmentId}
             AND del_flag = 0
     </select>
+
+    <select id="selectDeptListByIds" resultType="com.epmet.dto.CustomerDepartmentDTO">
+        SELECT
+            *
+        FROM customer_department
+        WHERE del_flag = '0'
+        AND
+        <foreach item="departmentId" collection="deptIdList" open="(" separator="or" close=")" index="">
+            id = #{departmentId}
+        </foreach>
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
index 9723d1e3f0..74f651fd7e 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
@@ -295,4 +295,15 @@
         ORDER BY created_time DESC
     </select>
 
+    <select id="selectGridListByIds" resultType="com.epmet.dto.CustomerGridDTO">
+        SELECT
+            *
+        FROM customer_grid
+        WHERE del_flag = '0'
+        AND
+        <foreach item="gridId" collection="gridIdList" open="(" separator="or" close=")" index="">
+            id = #{gridId}
+        </foreach>
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/TickStaffFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/TickStaffFormDTO.java
new file mode 100644
index 0000000000..c481b89492
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/TickStaffFormDTO.java
@@ -0,0 +1,35 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 项目跟踪-转其他部门-勾选的人员信息-接口入参
+ * @Author sun
+ */
+@Data
+public class TickStaffFormDTO implements Serializable {
+    private static final long serialVersionUID = 4859779755214502427L;
+
+    @NotBlank(message = "机关Id不能为空")
+    private String agencyId;
+
+    /**
+     * 部门Id(为空表示勾选的人不是部门下的，可能是组织下的也可能是网格下的)
+     */
+    private String departmentId;
+
+    /**
+     * 网格Id(为空表示勾选的人不是网格下的，可能是组织下的也可能是部门下的)
+     */
+    private String gridId;
+
+    @NotBlank(message = "内部备注不能为空")
+    private String staffId;
+}
+
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/TransferFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/TransferFormDTO.java
new file mode 100644
index 0000000000..9d078a27b5
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/TransferFormDTO.java
@@ -0,0 +1,36 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 项目跟踪-转其他部门-接口入参
+ * @Author sun
+ */
+@Data
+public class TransferFormDTO implements Serializable {
+    private static final long serialVersionUID = 4859779755214502427L;
+
+    @NotBlank(message = "项目Id不能为空")
+    private String projectId;
+
+    @NotBlank(message = "项目人员关联Id不能为空")
+    private String projectStaffId;
+
+    @Length(max=1000,message = "公开答复内容不能超过1000位")
+    private String publicReply;
+
+    @NotBlank(message = "内部备注不能为空")
+    @Length(max=1000,message = "内部备注不能超过1000位")
+    private String internalRemark;
+
+    @Valid
+    private List<TickStaffFormDTO> staffList;
+
+}
+
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 1c2b314f41..78d79402c1 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
@@ -73,4 +73,16 @@ public interface ProjectConstant {
 	 * 调用epmet-user服务查询数据失败
 	 */
 	String SELECT_USERINFO_EXCEPTION = "获取用户昵称、头像失败";
+	/**
+	 * 查询项目人员关联表数据失败
+	 */
+	String SELECT_PROJECTSTAFF_EXCEPTION = "获取项目人员关联表数据失败";
+	/**
+	 * 更新项目人员关联表数据失败
+	 */
+	String UPDATE_PROJECTSTAFF_EXCEPTION = "更新项目人员关联表数据失败";
+	/**
+	 * 更新项目人员关联表数据失败
+	 */
+	String DATe_EXCEPTION = "未勾选流转人员";
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTraceController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTraceController.java
index 3f88868a85..f252c27770 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTraceController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTraceController.java
@@ -183,5 +183,19 @@ public class ProjectTraceController {
 		ValidatorUtils.validateEntity(formDTO);
 		return new Result<DepartmentStaffListResultDTO>().ok(projectStaffService.departmentStaffList(formDTO));
 	}
+
+	/**
+	 * @param formDTO
+	 * @return
+	 * @Author sun
+	 * @Description 项目跟踪-转其他部门
+	 **/
+	@PostMapping("transfer")
+	@RequirePermission(requirePermission = RequirePermissionEnum.WORK_PROJECT_TRACE_TRANSFER)
+	public Result transfer(@LoginUser TokenDto tokenDTO, @RequestBody TransferFormDTO formDTO) {
+		ValidatorUtils.validateEntity(formDTO);
+		projectProcessService.transfer(formDTO);
+		return new Result();
+	}
 }
 
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
index 503ee6d58c..5038fa4206 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
@@ -5,6 +5,8 @@ import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.AgencyDeptGridFormDTO;
+import com.epmet.dto.result.AgencyDeptGridResultDTO;
 import com.epmet.dto.result.DepartmentStaffListResultDTO;
 import com.epmet.feign.fallback.GovOrgFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -35,4 +37,13 @@ public interface GovOrgFeignClient {
     @PostMapping(value = "/gov/org/customeragency/departmentstafflist/{agencyId}")
     Result<DepartmentStaffListResultDTO> departmentStaffList(@PathVariable("agencyId") String agencyId);
 
+	/**
+	 * @param formDTO
+	 * @return
+	 * @Author sun
+	 * @Description 根据组织Id集合、部门Id集合、网格Id集合查询各自对应详细信息
+	 **/
+	@PostMapping(value = "/gov/org/customeragency/getagencydeptgridlist")
+	Result<AgencyDeptGridResultDTO> getAgencyDeptGridList(AgencyDeptGridFormDTO formDTO);
+
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
index 318975d5c9..3588d47287 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
@@ -7,6 +7,8 @@ import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.AgencyDeptGridFormDTO;
+import com.epmet.dto.result.AgencyDeptGridResultDTO;
 import com.epmet.dto.result.DepartmentStaffListResultDTO;
 import com.epmet.feign.GovOrgFeignClient;
 import org.springframework.stereotype.Component;
@@ -26,4 +28,9 @@ public class GovOrgFeignClientFallBack implements GovOrgFeignClient {
     public Result<DepartmentStaffListResultDTO> departmentStaffList(String agencyId) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "departmentStaffList", agencyId);
     }
+
+    @Override
+    public Result<AgencyDeptGridResultDTO> getAgencyDeptGridList(AgencyDeptGridFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getAgencyDeptGridList", formDTO);
+    }
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectProcessService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectProcessService.java
index ebfc0e83ca..aa523854d3 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectProcessService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectProcessService.java
@@ -22,6 +22,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.ProjectProcessDTO;
 import com.epmet.dto.form.ProcessListFormDTO;
 import com.epmet.dto.form.ReturnListFromDTO;
+import com.epmet.dto.form.TransferFormDTO;
 import com.epmet.dto.result.ProcesslistResultDTO;
 import com.epmet.dto.result.ReturnListResultDTO;
 import com.epmet.entity.ProjectProcessEntity;
@@ -113,4 +114,12 @@ public interface ProjectProcessService extends BaseService<ProjectProcessEntity>
      * @return java.util.List<com.epmet.dto.result.ReturnListResultDTO>
      */
     List<ReturnListResultDTO> getReturnableList(ReturnListFromDTO fromDTO);
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 项目跟踪-转其他部门
+     **/
+    void transfer(TransferFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
index 78ea0dc5b0..38a3f8c9dc 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
@@ -21,32 +21,37 @@ 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.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.utils.Result;
+import com.epmet.constant.ProjectConstant;
 import com.epmet.dao.ProjectProcessDao;
 import com.epmet.dao.ProjectStaffDao;
 import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.ProjectProcessDTO;
-import com.epmet.dto.form.ProcessListFormDTO;
-import com.epmet.dto.form.ReturnListFromDTO;
-import com.epmet.dto.form.StaffsInAgencyFromDTO;
+import com.epmet.dto.form.*;
+import com.epmet.dto.result.AgencyDeptGridResultDTO;
 import com.epmet.dto.result.ProcesslistResultDTO;
 import com.epmet.dto.result.ReturnListResultDTO;
 import com.epmet.dto.result.StaffInfoResultDTO;
 import com.epmet.entity.ProjectEntity;
 import com.epmet.entity.ProjectProcessEntity;
+import com.epmet.entity.ProjectStaffEntity;
 import com.epmet.feign.EpmetUserFeignClient;
 import com.epmet.feign.GovOrgFeignClient;
 import com.epmet.redis.ProjectProcessRedis;
 import com.epmet.service.ProjectProcessService;
 import com.epmet.service.ProjectService;
+import com.epmet.service.ProjectStaffService;
 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.*;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
 /**
@@ -68,6 +73,10 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
     private EpmetUserFeignClient epmetUserFeignClient;
     @Autowired
     private ProjectService projectService;
+    @Autowired
+    private ProjectProcessDao projectProcessDao;
+    @Autowired
+    private ProjectStaffService projectStaffService;
 
     @Override
     public PageData<ProjectProcessDTO> page(Map<String, Object> params) {
@@ -158,4 +167,82 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
         return resultList;
     }
 
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 项目跟踪-转其他部门
+     **/
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void transfer(TransferFormDTO formDTO) {
+        //1:更新项目人员关联表数据状态为已处理
+        ProjectStaffEntity staffEntity = projectStaffDao.selectById(formDTO.getProjectStaffId());
+        if (null == staffEntity) {
+            throw new RenException(ProjectConstant.SELECT_PROJECTSTAFF_EXCEPTION);
+        }
+        staffEntity.setId(formDTO.getProjectStaffId());
+        staffEntity.setIsHandle(ProjectConstant.HANDLE);
+        if (projectStaffDao.updateById(staffEntity) < NumConstant.ONE) {
+            throw new RenException(ProjectConstant.UPDATE_PROJECTSTAFF_EXCEPTION);
+        }
+        //2:项目处理进展列表新增数据
+        ProjectProcessEntity processEntity = ConvertUtils.sourceToTarget(formDTO, ProjectProcessEntity.class);
+        processEntity.setDepartmentName(staffEntity.getDepartmentName());
+        processEntity.setStaffId(staffEntity.getStaffId());
+        processEntity.setOperation(ProjectConstant.OPERATION_TRANSFER);
+        processEntity.setOperationName(ProjectConstant.OPERATION_TRANSFER_NAME);
+        projectProcessDao.insert(processEntity);
+        //3:项目人员关联表新增部门流转数据
+        List<TickStaffFormDTO> staffList = formDTO.getStaffList();
+        if (null == staffList || staffList.size() < NumConstant.ONE) {
+            throw new RenException(ProjectConstant.DATe_EXCEPTION);
+        }
+        //3.1:调用gov-org服务，获取所有勾选人员对应的组织信息、部门信息、网格信息用于对处理部门和ORG_ID_PATH字段的赋值
+        List<String> agencyIdList = staffList.stream().map(TickStaffFormDTO::getAgencyId).collect(Collectors.toList());
+        agencyIdList = new ArrayList<String>(new LinkedHashSet<>(agencyIdList));
+        List<String> deptIdList = staffList.stream().map(TickStaffFormDTO::getDepartmentId).collect(Collectors.toList());
+        deptIdList = new ArrayList<String>(new LinkedHashSet<>(deptIdList));
+        List<String> gridIdList = staffList.stream().map(TickStaffFormDTO::getGridId).collect(Collectors.toList());
+        gridIdList = new ArrayList<String>(new LinkedHashSet<>(gridIdList));
+        AgencyDeptGridFormDTO agencyDeptGridFormDTO = new AgencyDeptGridFormDTO();
+        agencyDeptGridFormDTO.setAgencyIdList(agencyIdList);
+        agencyDeptGridFormDTO.setDeptIdList(deptIdList);
+        agencyDeptGridFormDTO.setGridIdList(gridIdList);
+        Result<AgencyDeptGridResultDTO> resultDTO = govOrgFeignClient.getAgencyDeptGridList(agencyDeptGridFormDTO);
+        AgencyDeptGridResultDTO agencyDeptGrid = resultDTO.getData();
+        //3.2:批量新增项目人员关联表数据
+        List<ProjectStaffEntity> entityList = new ArrayList<>();
+        staffList.forEach(ts->{
+            ProjectStaffEntity entity = ConvertUtils.sourceToTarget(ts, ProjectStaffEntity.class);
+            entity.setOrgId(ts.getAgencyId());
+            entity.setProjectId(formDTO.getProjectId());
+            entity.setProcessId(processEntity.getId());
+            entity.setIsHandle(ProjectConstant.UNHANDLED);
+            agencyDeptGrid.getAgencyList().forEach(agency->{
+                if (ts.getAgencyId().equals(agency.getId())) {
+                    entity.setCustomerId(agency.getCustomerId());
+                    entity.setOrgIdPath(agency.getPids()+":"+agency.getId());
+                    entity.setDepartmentName(agency.getOrganizationName());
+                }
+            });
+            if (StringUtils.isNotBlank(ts.getDepartmentId())) {
+                agencyDeptGrid.getDeptList().forEach(dept -> {
+                    if (ts.getDepartmentId().equals(dept.getId())) {
+                        entity.setDepartmentName(entity.getDepartmentName() + "-" + dept.getDepartmentName());
+                    }
+                });
+            }
+            if (StringUtils.isNotBlank(ts.getGridId())) {
+                agencyDeptGrid.getGridList().forEach(grid -> {
+                    if (ts.getGridId().equals(grid.getId())) {
+                        entity.setDepartmentName(entity.getDepartmentName() + "-" + grid.getGridName());
+                    }
+                });
+            }
+            entityList.add(entity);
+        });
+        projectStaffService.insertBatch(entityList);
+    }
+
 }
\ No newline at end of file

From 6bc09369ac5e913a1a7ba4114a36d6c24846b340 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 14 May 2020 10:24:32 +0800
Subject: [PATCH 41/45] =?UTF-8?q?GovIssueRedis=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/redis/GovIssueRedis.java   |  47 ++++
 .../resi-hall-client/resi-hall-client.iml     | 145 -------------
 .../resi-hall-server/resi-hall-server.iml     | 201 ------------------
 epmet-module/resi-hall/resi-hall.iml          |  51 -----
 4 files changed, 47 insertions(+), 397 deletions(-)
 delete mode 100644 epmet-module/resi-hall/resi-hall-client/resi-hall-client.iml
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/resi-hall-server.iml
 delete mode 100644 epmet-module/resi-hall/resi-hall.iml

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/GovIssueRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/GovIssueRedis.java
index 074c8e9597..1dacca6b18 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/GovIssueRedis.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/GovIssueRedis.java
@@ -18,6 +18,53 @@ public class GovIssueRedis {
     @Autowired
     private RedisUtils redisUtils;
 
+    /**
+     * @return java.lang.Long
+     * @param gridId
+     * @Author yinzuomei
+     * @Description 居民端，组长将话题转为议题成功后，调用此方法，该网格下表决中的议题数量+1
+     * @Date 2020/5/14 10:12
+     **/
+    public Long addWorkGrassrootsIssueRedDotValue(String gridId){
+        Long votingIssueCount = 0L;
+        try {
+            String workGrassrootsIssueRedDotKey = GovIssueRedisKeys.getWorkGrassrootsIssueRedDotKey(gridId);
+            votingIssueCount = redisUtils.incrementAndGet(workGrassrootsIssueRedDotKey);
+            logger.info(String.format("居民端话题转议题提交,更新redis-reddot值成功,key[%s],Value[%s]", workGrassrootsIssueRedDotKey, votingIssueCount));
+        } catch (Exception e) {
+            logger.error(String.format("居民端话题转议题提交,更新redis-reddot值异常%s",e.getMessage()));
+            e.printStackTrace();
+        }
+        return votingIssueCount;
+    }
+
+    /**
+     * @return java.lang.Long
+     * @param gridId
+     * @Author yinzuomei
+     * @Description 政府端工作人员关闭议题或者将议题转项目成功后，需要调用此方法，将网格下表决中的议题数量-1
+     * @Date 2020/5/14 10:12
+     **/
+    public Long subtractWorkGrassrootsIssueRedDotValue(String gridId){
+        Long votingIssueCount = 0L;
+        try {
+            String workGrassrootsIssueRedDotKey = GovIssueRedisKeys.getWorkGrassrootsIssueRedDotKey(gridId);
+            votingIssueCount = redisUtils.decrementAndGet(workGrassrootsIssueRedDotKey);
+            logger.info(String.format("政府端(关闭议题、议题转项目)提交,更新redis-reddot值成功,key[%s],Value[%s]", workGrassrootsIssueRedDotKey, votingIssueCount));
+        } catch (Exception e) {
+            logger.error(String.format("政府端(关闭议题、议题转项目)提交,更新redis-reddot值异常%s",e.getMessage()));
+            e.printStackTrace();
+        }
+        return votingIssueCount;
+    }
+
+    /**
+     * @return java.lang.Long
+     * @param gridId
+     * @Author yinzuomei
+     * @Description 获取某网格下表决中的议题总数
+     * @Date 2020/5/14 9:40
+     **/
     public Long queryVotingIssueCount(String gridId) {
         Long auditingGroupCount = 0L;
         try {
diff --git a/epmet-module/resi-hall/resi-hall-client/resi-hall-client.iml b/epmet-module/resi-hall/resi-hall-client/resi-hall-client.iml
deleted file mode 100644
index 6f6a140623..0000000000
--- a/epmet-module/resi-hall/resi-hall-client/resi-hall-client.iml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="TEST" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
-    <orderEntry type="module" module-name="epmet-commons-tools" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.1.11.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.12.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:2.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:2.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:2.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.60" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.60" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:2.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.1.12.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:2.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.1.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:10.4.0" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:10.4.0" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign:feign-hystrix:10.4.0" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-core:0.7.6" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.google.code.findbugs:jsr305:3.0.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: commons-lang:commons-lang:2.6" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.5.18" level="project" />
-    <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.3.8" level="project" />
-    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.9" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.1.11.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.1.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.1.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.1.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.1.12.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.1.12.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.1.12.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.1.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.43.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.43.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.43.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.43.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.43.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.43.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.2.13.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.10.1" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.10" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.10" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.18.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.3.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
-    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" />
-    <orderEntry type="library" name="Maven: commons-io:commons-io:2.6" level="project" />
-    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:4.6.1" level="project" />
-    <orderEntry type="library" name="Maven: cn.afterturn:easypoi-base:4.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.0" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.18" level="project" />
-    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: ognl:ognl:3.2.6" level="project" />
-    <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
-    <orderEntry type="library" name="Maven: cn.afterturn:easypoi-annotation:4.1.0" level="project" />
-    <orderEntry type="library" name="Maven: cn.afterturn:easypoi-web:4.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.1.12.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.12.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: joda-time:joda-time:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.60" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
-    <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.11.3" level="project" />
-    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.10" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.7.0" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.13" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.13" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.7.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.7.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.7.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.7.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.7.0" level="project" />
-    <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.11" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.29" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.12.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.12.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.1.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.7.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.1.11.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.11.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.11.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.11.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.11.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.11.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.11.2" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.29" level="project" />
-    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.1.11.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.1.11.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.11.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:2.23.4" level="project" />
-    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.16" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.16" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.12.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.12.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.1.12.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.6.3" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/resi-hall-server.iml b/epmet-module/resi-hall/resi-hall-server/resi-hall-server.iml
deleted file mode 100644
index 62d773bcc3..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/resi-hall-server.iml
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-    <facet type="web" name="Web">
-      <configuration>
-        <webroots />
-        <sourceRoots>
-          <root url="file://$MODULE_DIR$/src/main/java" />
-          <root url="file://$MODULE_DIR$/src/main/resources" />
-        </sourceRoots>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="TEST" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
-    <orderEntry type="module" module-name="resi-hall-client" />
-    <orderEntry type="module" module-name="epmet-commons-tools" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.1.11.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:2.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:2.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.60" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.60" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:2.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:10.4.0" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign:feign-hystrix:10.4.0" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-core:0.7.6" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.google.code.findbugs:jsr305:3.0.1" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.5.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.1.11.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.1.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.1.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.1.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.1.12.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.1.12.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.1.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.43.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.43.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.43.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.43.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.43.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.43.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.2.13.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.10.1" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.10" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.10" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
-    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" />
-    <orderEntry type="library" name="Maven: commons-io:commons-io:2.6" level="project" />
-    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:4.6.1" level="project" />
-    <orderEntry type="library" name="Maven: cn.afterturn:easypoi-base:4.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.18" level="project" />
-    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: ognl:ognl:3.2.6" level="project" />
-    <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
-    <orderEntry type="library" name="Maven: cn.afterturn:easypoi-annotation:4.1.0" level="project" />
-    <orderEntry type="library" name="Maven: cn.afterturn:easypoi-web:4.1.0" level="project" />
-    <orderEntry type="library" name="Maven: joda-time:joda-time:2.10.5" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.60" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
-    <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.11.3" level="project" />
-    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.10" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.7.0" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.13" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.13" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.7.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.7.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.7.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.7.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.7.0" level="project" />
-    <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.11" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.29" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.1.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.7.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.11.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.11.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.11.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.11.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.11.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.11.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.11.2" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.29" level="project" />
-    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.1.11.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.10" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.10" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.10" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.1.11.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.29" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.29" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.29" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.18.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.3.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.1.12.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.1.12.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.12.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.12.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.1.12.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.12.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.12.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.12.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.12.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.1.11.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.1.11.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:2.1.11.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.micrometer:micrometer-core:1.1.9" level="project" />
-    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.9" level="project" />
-    <orderEntry type="library" name="Maven: org.latencyutils:LatencyUtils:2.0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-alibaba-nacos-discovery:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-client:1.1.1" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-common:1.1.1" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-api:1.1.1" level="project" />
-    <orderEntry type="library" name="Maven: io.prometheus:simpleclient:0.5.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:2.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.1.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:2.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-ribbon:2.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-archaius:2.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon:2.3.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.ribbon:ribbon-transport:2.3.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-contexts:0.4.9" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-servo:0.4.9" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty:0.4.9" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-core:2.3.0" level="project" />
-    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-httpclient:2.3.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-client:1.19.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-core:1.19.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.ws.rs:jsr311-api:1.1.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey.contribs:jersey-apache-client4:1.19.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.servo:servo-core:0.12.21" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-commons-util:0.3.0" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-loadbalancer:2.3.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-statistics:0.1.1" level="project" />
-    <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.3.8" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-config:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-alibaba-nacos-config:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign:feign-httpclient:10.3.0" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:10.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.10" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.12" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.1.11.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.1.11.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.1.11.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.11.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:2.23.4" level="project" />
-    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.16" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.16" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.1.12.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.6.3" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall.iml b/epmet-module/resi-hall/resi-hall.iml
deleted file mode 100644
index 2837671944..0000000000
--- a/epmet-module/resi-hall/resi-hall.iml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="TEST" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.1.11.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter:2.1.11.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot:2.1.11.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-context:5.1.12.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-aop:5.1.12.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-beans:5.1.12.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-expression:5.1.12.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.11.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.11.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.11.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.apache.logging.log4j:log4j-api:2.11.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:jul-to-slf4j:1.7.29" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.1.11.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.1.11.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-api:1.7.29" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.11.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:2.23.4" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.9.16" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.16" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-core:5.1.12.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-jcl:5.1.12.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.1.12.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.6.3" level="project" />
-  </component>
-</module>
\ No newline at end of file

From 53f71e2d45582ba5d991dd27d8bab3c43414cd1c Mon Sep 17 00:00:00 2001
From: zxc <954985706@qq.com>
Date: Thu, 14 May 2020 10:57:49 +0800
Subject: [PATCH 42/45] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/controller/IssueController.java |  4 +-
 .../IssueSatisfactionDetailServiceImpl.java   |  2 +-
 .../impl/IssueVoteDetailServiceImpl.java      |  2 +-
 .../src/main/resources/mapper/IssueDao.xml    |  7 +--
 .../ProjectSatisfactionDetailServiceImpl.java |  2 +-
 .../com/epmet/feign/GovIssueFeignClient.java  |  4 +-
 .../fallback/GovIssueFeignClientFallBack.java |  4 +-
 .../epmet/service/impl/IssueServiceImpl.java  | 26 ++++++++---
 .../src/main/resources/mapper/IssueDao.xml    | 46 -------------------
 9 files changed, 32 insertions(+), 65 deletions(-)
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueDao.xml

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java
index 9e6169f22b..f19e4e43ee 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java
@@ -33,8 +33,8 @@ public class IssueController {
      * @author zxc
      * @date 2020/5/11 9:42
      */
-    @PostMapping(value = "/detail")
-    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
+    @PostMapping(value = "detail")
+//    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
     public Result<IssueResultDTO> detail(@RequestBody IssueDetailFormDTO issueDetail){
         return new Result<IssueResultDTO>().ok(issueService.detail(issueDetail));
     }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java
index 37fb08814d..4b7bc5d837 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java
@@ -147,7 +147,7 @@ public class IssueSatisfactionDetailServiceImpl extends BaseServiceImpl<IssueSat
         BeanUtils.copyProperties(formDTO,initEvaluation);
         EvaluateInfoDTO evaluateInfoDTO = baseDao.checkSatisfaction(initEvaluation);
         if (evaluateInfoDTO!=null){
-            throw new RenException(EpmetErrorCode.ALREADY_EVALUATE.getMsg());
+            throw new RenException(EpmetErrorCode.ALREADY_EVALUATE.getCode());
         }
         baseDao.insert(entity);
     }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java
index ab2483778d..656e8460d7 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java
@@ -119,7 +119,7 @@ public class IssueVoteDetailServiceImpl extends BaseServiceImpl<IssueVoteDetailD
         if (checkoutVoteCount==0){
             baseDao.insert(entity);
         }else {
-            throw new RenException(EpmetErrorCode.ALREADY_VOTE.getMsg());
+            throw new RenException(EpmetErrorCode.ALREADY_VOTE.getCode());
         }
     }
 
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml
index 212d8066dd..e06616107a 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml
@@ -31,15 +31,16 @@
     <!-- 议题详情 -->
     <select id="issueDetail" parameterType="com.epmet.dto.form.IssueDetailFormDTO" resultType="com.epmet.dto.result.IssueResultDTO">
         SELECT
+            source_id AS topicId,
             issue_title AS issueTitle,
             issue_status AS issueStatus,
             suggestion AS issueSuggestion,
-            grid_id AS belongsGridName,
-            created_by AS issueInitiator
+            grid_id AS gridId,
+            created_by AS userId
         FROM
             issue
         WHERE
-            id = #{IssueId}
+            id = #{issueId}
             AND del_flag = 0
     </select>
 
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java
index df8fb0c47b..310d1f6bc0 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java
@@ -185,7 +185,7 @@ public class ProjectSatisfactionDetailServiceImpl extends BaseServiceImpl<Projec
         BeanUtils.copyProperties(formDTO,projectInitEvaluation);
         ProjectEvaluateInfoResultDTO resultDTO = baseDao.checkProjectSatisfaction(projectInitEvaluation);
         if (resultDTO!=null){
-            throw new RenException(EpmetErrorCode.ALREADY_EVALUATE.getMsg());
+            throw new RenException(EpmetErrorCode.ALREADY_EVALUATE.getCode());
         }
         baseDao.insert(entity);
     }
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java
index 992cf49c72..b33601edb8 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java
@@ -25,8 +25,8 @@ public interface GovIssueFeignClient {
      * @param issueDetail
      * @author zxc
      */
-    @PostMapping("/gov/issue/issue/issuedetail")
-    Result<IssueResultDTO> issueDetail(@RequestBody IssueDetailFormDTO issueDetail);
+    @PostMapping("/gov/issue/issue/detail")
+    Result<IssueResultDTO> detail(@RequestBody IssueDetailFormDTO issueDetail);
 
     /**
      * @Description  表决中议题详情——支持、反对数
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java
index 03ba888efa..0a9fb24d06 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java
@@ -19,8 +19,8 @@ import java.util.List;
 public class GovIssueFeignClientFallBack implements GovIssueFeignClient {
 
     @Override
-    public Result<IssueResultDTO> issueDetail(IssueDetailFormDTO issueDetail) {
-        return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "issueDetail", issueDetail);
+    public Result<IssueResultDTO> detail(IssueDetailFormDTO issueDetail) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "detail", issueDetail);
     }
 
     @Override
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
index dd197c2d98..1ab6c5e96e 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
@@ -48,7 +48,7 @@ public class IssueServiceImpl implements IssueService {
     public IssueDetailResultDTO detail(IssueDetailFormDTO issueDetail) {
         IssueDetailResultDTO issueDetailResult = new IssueDetailResultDTO();
         //议题信息
-        Result<IssueResultDTO> issueResultDTOResult = govIssueFeignClient.issueDetail(issueDetail);
+        Result<IssueResultDTO> issueResultDTOResult = govIssueFeignClient.detail(issueDetail);
         IssueResultDTO issueResult = issueResultDTOResult.getData();
         if (issueResult==null){
             return issueDetailResult;
@@ -58,22 +58,34 @@ public class IssueServiceImpl implements IssueService {
         IssueInitiatorFormDTO initiatorFormDTO = new IssueInitiatorFormDTO();
         initiatorFormDTO.setUserId(issueResult.getUserId());
         if (!StringUtils.isBlank(issueResult.getUserId())) {
-            Result<IssueInitiatorResultDTO> initiatorResult = userFeignClient.selectIssueInitiator(initiatorFormDTO);
-            issueDetailResult.setIssueInitiator(initiatorResult.getData().getIssueInitiator());
+            IssueInitiatorResultDTO initiatorResult = userFeignClient.selectIssueInitiator(initiatorFormDTO).getData();
+            if (initiatorResult==null){
+                issueDetailResult.setIssueInitiator("");
+            }else {
+                issueDetailResult.setIssueInitiator(initiatorResult.getIssueInitiator());
+            }
         }
         //网格名称
         BelongGridNameFormDTO belongGridName = new BelongGridNameFormDTO();
         belongGridName.setGridId(issueResult.getGridId());
         if (!StringUtils.isBlank(issueResult.getGridId())) {
-            Result<BelongGridNameResultDTO> belongGridNameResult = govOrgFeignClient.getGridNameByGridId(belongGridName);
-            issueDetailResult.setBelongsGridName(belongGridNameResult.getData().getBelongsGridName());
+            BelongGridNameResultDTO belongGridNameResult = govOrgFeignClient.getGridNameByGridId(belongGridName).getData();
+            if (belongGridNameResult==null){
+                issueDetailResult.setBelongsGridName("");
+            }else {
+                issueDetailResult.setBelongsGridName(belongGridNameResult.getBelongsGridName());
+            }
         }
         //话题信息
         TopicInfoFormDTO topicInfoFormDTO = new TopicInfoFormDTO();
         topicInfoFormDTO.setTopicId(issueResult.getTopicId());
         if (!StringUtils.isBlank(issueResult.getTopicId())) {
-            Result<TopicInfoDTO> topicInfoDTOResult = resiGroupFeignClient.selectDetail(topicInfoFormDTO);
-            issueDetailResult.setTopicInfo(topicInfoDTOResult.getData());
+            TopicInfoDTO topicInfoDTOResult = resiGroupFeignClient.selectDetail(topicInfoFormDTO).getData();
+            if (topicInfoDTOResult==null){
+                issueDetailResult.setTopicInfo(new TopicInfoDTO());
+            }else {
+                issueDetailResult.setTopicInfo(topicInfoDTOResult);
+            }
         }
         return issueDetailResult;
     }
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueDao.xml
deleted file mode 100644
index 5a93dcd218..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueDao.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?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.IssueDao">
-
-    <resultMap type="com.epmet.entity.IssueEntity" id="issueMap">
-        <result property="id" column="ID"/>
-        <result property="issueStatus" column="ISSUE_STATUS"/>
-        <result property="sourceType" column="SOURCE_TYPE"/>
-        <result property="sourceId" column="SOURCE_ID"/>
-        <result property="closeReason" column="CLOSE_REASON"/>
-        <result property="resolveType" column="RESOLVE_TYPE"/>
-        <result property="issueTitle" column="ISSUE_TITLE"/>
-        <result property="suggestion" column="SUGGESTION"/>
-        <result property="customerId" column="CUSTOMER_ID"/>
-        <result property="gridId" column="GRID_ID"/>
-        <result property="orgIdPath" column="ORG_ID_PATH"/>
-        <result property="orgId" column="ORG_ID"/>
-        <result property="votingDeadline" column="VOTING_DEADLINE"/>
-        <result property="decidedTime" column="DECIDED_TIME"/>
-        <result property="shiftedTime" column="SHIFTED_TIME"/>
-        <result property="closedTime" column="CLOSED_TIME"/>
-        <result property="delFlag" column="DEL_FLAG"/>
-        <result property="revision" column="REVISION"/>
-        <result property="createdBy" column="CREATED_BY"/>
-        <result property="createdTime" column="CREATED_TIME"/>
-        <result property="updatedBy" column="UPDATED_BY"/>
-        <result property="updatedTime" column="UPDATED_TIME"/>
-    </resultMap>
-
-    <!-- 议题详情 -->
-    <select id="issueDetail" parameterType="com.epmet.dto.form.IssueDetailFormDTO" resultType="com.epmet.dto.result.IssueDetailResultDTO">
-        SELECT
-            issue_title AS issueTitle,
-            issue_status AS issueStatus,
-            suggestion AS issueSuggestion,
-            grid_id AS belongsGridName,
-            created_by AS issueInitiator
-        FROM
-            issue
-        WHERE
-            id = #{IssueId}
-            AND del_flag = 0
-    </select>
-
-</mapper>
\ No newline at end of file

From 06f4144e134876abbf615c31fca0edfa4cff7f83 Mon Sep 17 00:00:00 2001
From: zxc <954985706@qq.com>
Date: Thu, 14 May 2020 11:24:16 +0800
Subject: [PATCH 43/45] =?UTF-8?q?=E6=9D=83=E9=99=90=E6=B3=A8=E8=A7=A3?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/controller/IssueController.java   |  3 ---
 .../com/epmet/controller/IssueManageController.java  |  2 ++
 .../java/com/epmet/controller/IssueController.java   | 12 +++++++++++-
 .../java/com/epmet/feign/EpmetUserFeignClient.java   |  4 ++--
 .../java/com/epmet/feign/GovIssueFeignClient.java    |  2 +-
 .../main/java/com/epmet/feign/GovOrgFeignClient.java |  2 +-
 .../java/com/epmet/feign/GovProjectFeignClient.java  |  2 +-
 .../java/com/epmet/feign/ResiGroupFeignClient.java   |  2 +-
 8 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java
index f19e4e43ee..506a70ec9d 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java
@@ -1,7 +1,5 @@
 package com.epmet.controller;
 
-import com.epmet.commons.tools.annotation.RequirePermission;
-import com.epmet.commons.tools.enums.RequirePermissionEnum;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.IssueDetailFormDTO;
 import com.epmet.dto.result.GridVotingIssueCountResultDTO;
@@ -34,7 +32,6 @@ public class IssueController {
      * @date 2020/5/11 9:42
      */
     @PostMapping(value = "detail")
-//    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
     public Result<IssueResultDTO> detail(@RequestBody IssueDetailFormDTO issueDetail){
         return new Result<IssueResultDTO>().ok(issueService.detail(issueDetail));
     }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java
index da9fa30482..ce1bfd584f 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java
@@ -67,6 +67,7 @@ public class IssueManageController {
      * @author zxc
      */
     @PostMapping("votingtrend")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
     public Result<VotingTrendResultDTO> votingTrend(@RequestBody IssueIdFormDTO issueId){
         return new Result<VotingTrendResultDTO>().ok(issueVoteStatisticalService.votingTrend(issueId));
     }
@@ -77,6 +78,7 @@ public class IssueManageController {
      * @author zxc
      */
     @PostMapping("evaluationlist")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
     public Result<List<EvaluationListResultDTO>> evaluationList(@RequestBody EvaluationListFormDTO formDTO){
         return new Result<List<EvaluationListResultDTO>>().ok(issueVoteStatisticalService.evaluationList(formDTO));
     }
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java
index cc50d7dcd0..573ca80cbd 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java
@@ -35,7 +35,7 @@ public class IssueController {
      * @date 2020/5/11 9:42
      */
     @PostMapping(value = "/detail")
-//    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
     public Result<IssueDetailResultDTO> detail(@RequestBody IssueDetailFormDTO issueDetail){
         return new Result<IssueDetailResultDTO>().ok(issueService.detail(issueDetail));
     }
@@ -46,6 +46,7 @@ public class IssueController {
      * @author zxc
      */
     @PostMapping(value = "votingtrend")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
     public Result<VotingTrendResultDTO> votingTrend(@RequestBody IssueIdFormDTO formDTO){
         return new Result<VotingTrendResultDTO>().ok(issueService.votingTrend(formDTO));
     }
@@ -56,6 +57,7 @@ public class IssueController {
      * @author zxc
      */
     @PostMapping(value = "support")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
     public Result support(@LoginUser TokenDto tokenDto, @RequestBody IssueIdFormDTO formDTO){
         issueService.support(tokenDto,formDTO);
         return new Result();
@@ -67,6 +69,7 @@ public class IssueController {
      * @author zxc
      */
     @PostMapping(value = "oppose")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
     public Result oppose(@LoginUser TokenDto tokenDto,@RequestBody IssueIdFormDTO formDTO){
         issueService.oppose(tokenDto,formDTO);
         return new Result();
@@ -78,6 +81,7 @@ public class IssueController {
      * @author zxc
      */
     @PostMapping(value = "vote")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
     public Result<VoteResultDTO> vote(@RequestBody IssueIdFormDTO formDTO){
         return new Result<VoteResultDTO>().ok(issueService.vote(formDTO));
     }
@@ -89,6 +93,7 @@ public class IssueController {
      * @author zxc
      */
     @PostMapping("initevaluation")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
     public Result<InitEvaluationResultDTO> initEvaluation(@LoginUser TokenDto tokenDto, @RequestBody IssueIdFormDTO issueId){
         return new Result<InitEvaluationResultDTO>().ok(issueService.initEvaluation(tokenDto,issueId));
     }
@@ -100,6 +105,7 @@ public class IssueController {
      * @author zxc
      */
     @PostMapping("projectinitevaluation")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
     public Result<ProjectInitEvaluationResultDTO> projectInitEvaluation(@LoginUser TokenDto tokenDto, @RequestBody ProjectIdFormDTO projectId){
         return new Result<ProjectInitEvaluationResultDTO>().ok(issueService.projectInitEvaluation(tokenDto,projectId));
     }
@@ -110,6 +116,7 @@ public class IssueController {
      * @author zxc
      */
     @PostMapping("evaluate")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
     public Result evaluate(@LoginUser TokenDto tokenDto,@RequestBody EvaluateFormDTO formDTO){
         issueService.evaluate(tokenDto,formDTO);
         return new Result();
@@ -121,6 +128,7 @@ public class IssueController {
      * @author zxc
      */
     @PostMapping("projectevaluate")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
     public Result projectEvaluate(@LoginUser TokenDto tokenDto,@RequestBody ProjectEvaluateFormDTO formDTO){
         issueService.projectEvaluate(tokenDto,formDTO);
         return new Result();
@@ -132,6 +140,7 @@ public class IssueController {
      * @author zxc
      */
     @PostMapping("evaluationlist")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
     public Result<List<EvaluationListResultDTO>> evaluationList(@RequestBody EvaluationListFormDTO formDTO){
         return new Result<List<EvaluationListResultDTO>>().ok(issueService.evaluationList(formDTO));
     }
@@ -142,6 +151,7 @@ public class IssueController {
      * @author zxc
      */
     @PostMapping("projectevaluationlist")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
     public Result<List<EvaluationListResultDTO>> projectEvaluationList(@RequestBody ProjectEvaluationListFormDTO formDTO){
         return new Result<List<EvaluationListResultDTO>>().ok(issueService.projectEvaluationList(formDTO));
     }
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
index e5721246f5..e65812e3a4 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
@@ -18,8 +18,8 @@ import java.util.List;
  * @dscription
  * @date 2020/5/11 10:32
  */
-//url = "localhost:8087"
-@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class)
+@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class,url = "localhost:8087")
+//@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class)
 public interface EpmetUserFeignClient {
 
 	/**
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java
index b33601edb8..798449e944 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java
@@ -15,8 +15,8 @@ import java.util.List;
 /**
  * @Description Feign调用gov-issue-server模块
  * @ClassName GovIssueFeignFallBack
- * url = "localhost:8101"
  */
+//@FeignClient(name = ServiceConstant.GOV_ISSUE_SERVER, fallback = GovIssueFeignClientFallBack.class,url = "localhost:8101")
 @FeignClient(name = ServiceConstant.GOV_ISSUE_SERVER, fallback = GovIssueFeignClientFallBack.class)
 public interface GovIssueFeignClient {
 
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
index fbb1aeea7e..24090f6675 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
@@ -13,8 +13,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 /**
  * @Description Feign调用gov-org-server模块
  * @ClassName GovOrgFeginFallBack
- * url = "localhost:8092"
  */
+//@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class,url = "localhost:8092")
 @FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class)
 public interface GovOrgFeignClient {
 
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovProjectFeignClient.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovProjectFeignClient.java
index 1d9f6bcabc..066f8c6404 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovProjectFeignClient.java
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovProjectFeignClient.java
@@ -18,8 +18,8 @@ import java.util.List;
 /**
  * @Description Feign调用gov-project-server模块
  * @ClassName GovProjectFeignClient
- * url = "localhost:8102"
  */
+//@FeignClient(name = ServiceConstant.GOV_PROJECT_SERVER, fallback = GovProjectFeignClientFallBack.class,url = "localhost:8102")
 @FeignClient(name = ServiceConstant.GOV_PROJECT_SERVER, fallback = GovProjectFeignClientFallBack.class)
 public interface GovProjectFeignClient {
 
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java
index 661ef0e761..fa2a5cc182 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java
@@ -10,8 +10,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 
 /**
  * @author zxc
- * url = "localhost:8095"
  */
+//@FeignClient(name = ServiceConstant.RESI_GROUP_SERVER, fallback = ResiGroupFeignClientFallBack.class,url = "localhost:8095")
 @FeignClient(name = ServiceConstant.RESI_GROUP_SERVER, fallback = ResiGroupFeignClientFallBack.class)
 public interface ResiGroupFeignClient {
 

From f0350bfea932c1b1bf8c5f134bde952f2a4d4bba Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 14 May 2020 13:08:44 +0800
Subject: [PATCH 44/45] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E6=8A=9B=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/controller/GovLoginController.java  | 15 ++++--
 .../com/epmet/service/GovLoginService.java    | 10 ++--
 .../service/impl/GovLoginServiceImpl.java     | 37 +++++++------
 .../controller/ResiPartyMemberController.java |  8 ++-
 .../epmet/service/ResiPartyMemberService.java |  4 +-
 .../impl/ResiPartyMemberServiceImpl.java      | 25 ++++-----
 .../controller/StaffAgencyController.java     |  3 +-
 .../com/epmet/service/StaffAgencyService.java |  2 +-
 .../service/impl/StaffAgencyServiceImpl.java  |  3 +-
 .../member/form/ApplyingMemberFormDTO.java    |  6 +++
 .../member/form/GroupMemberListFormDTO.java   |  5 ++
 .../controller/GroupInvitationController.java |  9 ++--
 .../service/GroupInvitationService.java       |  6 +--
 .../impl/GroupInvitationServiceImpl.java      | 53 ++++++++-----------
 .../controller/ResiGroupMemberController.java | 19 ++++---
 .../service/ResiGroupMemberService.java       | 12 ++---
 .../impl/ResiGroupMemberServiceImpl.java      | 39 +++++++-------
 .../controller/ResiMineGridController.java    |  3 +-
 .../grid/service/ResiMineGridService.java     |  2 +-
 .../service/impl/ResiMineGridServiceImpl.java | 15 ++++--
 20 files changed, 156 insertions(+), 120 deletions(-)

diff --git a/epmet-auth/src/main/java/com/epmet/controller/GovLoginController.java b/epmet-auth/src/main/java/com/epmet/controller/GovLoginController.java
index fbc883c70f..477195041b 100644
--- a/epmet-auth/src/main/java/com/epmet/controller/GovLoginController.java
+++ b/epmet-auth/src/main/java/com/epmet/controller/GovLoginController.java
@@ -40,7 +40,8 @@ public class GovLoginController {
     @PostMapping(value = "/loginwxmp/loginbywxcode")
     public Result<UserTokenResultDTO> loginByWxCode(@RequestBody GovWxmpFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
-        return govLoginService.loginByWxCode(formDTO);
+        UserTokenResultDTO userTokenResultDTO=govLoginService.loginByWxCode(formDTO);
+        return new Result<UserTokenResultDTO>().ok(userTokenResultDTO);
     }
 
     /**
@@ -53,7 +54,8 @@ public class GovLoginController {
     @PostMapping(value = "/loginwxmp/sendsmscode")
     public Result sendSmsCode(@RequestBody SendSmsCodeFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
-        return govLoginService.sendSmsCode(formDTO);
+        govLoginService.sendSmsCode(formDTO);
+        return new Result();
     }
 
     /**
@@ -66,7 +68,8 @@ public class GovLoginController {
     @PostMapping(value = "/loginwxmp/getmyorg")
     public Result<List<StaffOrgsResultDTO>> getmyorg(@RequestBody StaffOrgsFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
-        return govLoginService.getMyOrg(formDTO);
+        List<StaffOrgsResultDTO> staffOrgs=govLoginService.getMyOrg(formDTO);
+        return new Result<List<StaffOrgsResultDTO>>().ok(staffOrgs);
     }
 
     /**
@@ -79,7 +82,8 @@ public class GovLoginController {
     @PostMapping(value = "/loginwxmp/enterorg")
     public Result<UserTokenResultDTO> enterOrg(@RequestBody GovWxmpEnteOrgFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
-        return govLoginService.enterOrg(formDTO);
+        UserTokenResultDTO userTokenResultDTO=govLoginService.enterOrg(formDTO);
+        return new Result<UserTokenResultDTO>().ok(userTokenResultDTO);
     }
 
     /**
@@ -91,7 +95,8 @@ public class GovLoginController {
      **/
     @PostMapping("/loginwxmp/loginout")
     public Result loginOut(@LoginUser TokenDto tokenDto) {
-        return govLoginService.loginOut(tokenDto);
+        govLoginService.loginOut(tokenDto);
+        return new Result();
     }
 }
 
diff --git a/epmet-auth/src/main/java/com/epmet/service/GovLoginService.java b/epmet-auth/src/main/java/com/epmet/service/GovLoginService.java
index f61e9c8fab..37b78533b5 100644
--- a/epmet-auth/src/main/java/com/epmet/service/GovLoginService.java
+++ b/epmet-auth/src/main/java/com/epmet/service/GovLoginService.java
@@ -24,7 +24,7 @@ public interface GovLoginService {
      * @Description 政府端微信小程序登录-发送验证码
      * @Date 2020/4/18 10:59
      **/
-    Result sendSmsCode(SendSmsCodeFormDTO formDTO);
+    void sendSmsCode(SendSmsCodeFormDTO formDTO);
 
     /**
      * @param formDTO
@@ -33,7 +33,7 @@ public interface GovLoginService {
      * @Description 3、手机验证码获取组织
      * @Date 2020/4/18 21:11
      **/
-    Result<List<StaffOrgsResultDTO>> getMyOrg(StaffOrgsFormDTO formDTO);
+    List<StaffOrgsResultDTO> getMyOrg(StaffOrgsFormDTO formDTO);
 
     /**
      * @param formDTO
@@ -42,7 +42,7 @@ public interface GovLoginService {
      * @Description 政府端小程序根据wxCode获取上一次登录信息，返回token
      * @Date 2020/4/20 11:23
      **/
-    Result<UserTokenResultDTO> loginByWxCode(GovWxmpFormDTO formDTO);
+    UserTokenResultDTO loginByWxCode(GovWxmpFormDTO formDTO);
 
     /**
      * @param formDTO
@@ -51,7 +51,7 @@ public interface GovLoginService {
      * @Description 4、选择组织，进入首页
      * @Date 2020/4/20 13:08
      **/
-    Result<UserTokenResultDTO> enterOrg(GovWxmpEnteOrgFormDTO formDTO);
+    UserTokenResultDTO enterOrg(GovWxmpEnteOrgFormDTO formDTO);
 
     /**
      * @return com.epmet.commons.tools.utils.Result
@@ -60,5 +60,5 @@ public interface GovLoginService {
      * @Description 政府端工作人员退出登录
      * @Date 2020/4/21 22:08
      **/
-    Result loginOut(TokenDto tokenDto);
+    void loginOut(TokenDto tokenDto);
 }
diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java
index 7ad0fae480..b7023b0f37 100644
--- a/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java
+++ b/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java
@@ -2,6 +2,7 @@ package com.epmet.service.impl;
 
 import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import com.epmet.common.token.constant.LoginConstant;
+import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.RenException;
@@ -67,28 +68,27 @@ public class GovLoginServiceImpl implements GovLoginService {
      * @Date 2020/4/18 10:59
      **/
     @Override
-    public Result sendSmsCode(SendSmsCodeFormDTO formDTO) {
+    public void sendSmsCode(SendSmsCodeFormDTO formDTO) {
         //1、校验手机号是否符合规范
         if (!PhoneValidatorUtils.isMobile(formDTO.getMobile())) {
             logger.error(String.format(SEND_SMS_CODE_ERROR, formDTO.getMobile(), EpmetErrorCode.ERROR_PHONE.getCode(), EpmetErrorCode.ERROR_PHONE.getMsg()));
-            return new Result().error(EpmetErrorCode.ERROR_PHONE.getCode());
+            throw new RenException(EpmetErrorCode.ERROR_PHONE.getCode());
         }
         //2、根据手机号校验用户是否存在
         Result<List<CustomerStaffDTO>> customerStaffResult = epmetUserFeignClient.checkCustomerStaff(formDTO.getMobile());
         if (!customerStaffResult.success()) {
             logger.error(String.format(SEND_SMS_CODE_ERROR, formDTO.getMobile(), customerStaffResult.getCode(), customerStaffResult.getMsg()));
-            return new Result().error(customerStaffResult.getCode());
+            throw new RenException(customerStaffResult.getCode());
         }
         //3、发送短信验证码
         Result<Map<String, String>> smsCodeResult = messageFeignClient.sendSmsCaptcha(formDTO.getMobile());
         if (!smsCodeResult.success()) {
             logger.error(String.format(SEND_SMS_CODE_ERROR, formDTO.getMobile(), smsCodeResult.getCode(), smsCodeResult.getMsg()));
-            return new Result().error(smsCodeResult.getCode());
+            throw new RenException(smsCodeResult.getCode());
         }
         //4、保存短信验证码(删除现有短信验证码、将新的短信验证码存入Redis)
         captchaRedis.saveSmsCode(formDTO, smsCodeResult.getData().get("code"));
         logger.info(String.format("发送短信验证码成功,手机号[%s]", formDTO.getMobile()));
-        return new Result();
     }
 
     /**
@@ -99,18 +99,18 @@ public class GovLoginServiceImpl implements GovLoginService {
      * @Date 2020/4/18 21:11
      **/
     @Override
-    public Result<List<StaffOrgsResultDTO>> getMyOrg(StaffOrgsFormDTO formDTO) {
+    public List<StaffOrgsResultDTO> getMyOrg(StaffOrgsFormDTO formDTO) {
         //1、根据手机号查询到用户信息
         Result<List<CustomerStaffDTO>> customerStaffResult = epmetUserFeignClient.checkCustomerStaff(formDTO.getMobile());
         if (!customerStaffResult.success()) {
             logger.error(String.format("手机验证码登录异常,手机号[%s],code[%s],msg[%s]", formDTO.getMobile(), customerStaffResult.getCode(), customerStaffResult.getMsg()));
-            return new Result().error(customerStaffResult.getCode());
+            throw new RenException(customerStaffResult.getCode());
         }
         //2、验证码是否正确
         String rightSmsCode = captchaRedis.getSmsCode(formDTO.getMobile());
         if (!formDTO.getSmsCode().equals(rightSmsCode)) {
             logger.error(String.format("验证码错误code[%s],msg[%s]",EpmetErrorCode.MOBILE_CODE_ERROR.getCode(),EpmetErrorCode.MOBILE_CODE_ERROR.getMsg()));
-            return new Result<List<StaffOrgsResultDTO>>().error(EpmetErrorCode.MOBILE_CODE_ERROR.getCode());
+            throw new RenException(EpmetErrorCode.MOBILE_CODE_ERROR.getCode());
         }
         //3、查询用户所有的组织信息
         List<String> customerIdList = new ArrayList<>();
@@ -120,11 +120,15 @@ public class GovLoginServiceImpl implements GovLoginService {
         StaffOrgFormDTO staffOrgFormDTO = new StaffOrgFormDTO();
         staffOrgFormDTO.setCustomerIdList(customerIdList);
         Result<List<StaffOrgsResultDTO>> result = govOrgFeignClient.getStaffOrgList(staffOrgFormDTO);
-        return result;
+        if(result.success()&&null!=result.getData()){
+           return result.getData();
+        }
+        logger.error(String .format("手机验证码获取组织,调用%s服务失败,入参手机号%s,验证码%s,返回错误码%s,错误提示信息%s", ServiceConstant.GOV_ORG_SERVER,formDTO.getMobile(),formDTO.getSmsCode(),result.getCode(),result.getMsg()));
+        return new ArrayList<>();
     }
 
     @Override
-    public Result<UserTokenResultDTO> loginByWxCode(GovWxmpFormDTO formDTO) {
+    public UserTokenResultDTO loginByWxCode(GovWxmpFormDTO formDTO) {
         //1、解析微信用户
         WxMaJscode2SessionResult wxMaJscode2SessionResult = loginService.getWxMaUser(formDTO.getApp(), formDTO.getWxCode());
         if(null!=wxMaJscode2SessionResult){
@@ -133,7 +137,7 @@ public class GovLoginServiceImpl implements GovLoginService {
         Result<StaffLatestAgencyResultDTO> latestStaffWechat = epmetUserFeignClient.getLatestStaffWechatLoginRecord(wxMaJscode2SessionResult.getOpenid());
         if (!latestStaffWechat.success() || null == latestStaffWechat.getData()) {
             logger.error(String.format("没有获取到用户最近一次登录账户信息,code[%s],msg[%s]", EpmetErrorCode.PLEASE_LOGIN.getCode(), EpmetErrorCode.PLEASE_LOGIN.getMsg()));
-            return new Result<UserTokenResultDTO>().error(EpmetErrorCode.PLEASE_LOGIN.getCode());
+            throw new RenException(EpmetErrorCode.PLEASE_LOGIN.getCode());
         }
         StaffLatestAgencyResultDTO staffLatestAgencyResultDTO = latestStaffWechat.getData();
         //2、记录staff_wechat
@@ -146,7 +150,7 @@ public class GovLoginServiceImpl implements GovLoginService {
         this.saveLatestGovTokenDto(staffLatestAgencyResultDTO, wxMaJscode2SessionResult, token);
         UserTokenResultDTO userTokenResultDTO = new UserTokenResultDTO();
         userTokenResultDTO.setToken(token);
-        return new Result<UserTokenResultDTO>().ok(userTokenResultDTO);
+        return userTokenResultDTO;
     }
 
     //保存tokenDto到redis
@@ -244,7 +248,7 @@ public class GovLoginServiceImpl implements GovLoginService {
     }
 
     @Override
-    public Result<UserTokenResultDTO> enterOrg(GovWxmpEnteOrgFormDTO formDTO) {
+    public UserTokenResultDTO enterOrg(GovWxmpEnteOrgFormDTO formDTO) {
         //1、需要校验要登录的客户，是否被禁用
         CustomerStaffFormDTO customerStaffFormDTO = new CustomerStaffFormDTO();
         customerStaffFormDTO.setCustomerId(formDTO.getCustomerId());
@@ -252,7 +256,7 @@ public class GovLoginServiceImpl implements GovLoginService {
         Result<CustomerStaffDTO> customerStaffDTOResult = epmetUserFeignClient.getCustomerStaffInfo(customerStaffFormDTO);
         if (!customerStaffDTOResult.success() || null == customerStaffDTOResult.getData()) {
             logger.error(String.format("获取工作人员信息失败,手机号[%s],客户id:[%s],code[%s],msg[%s]", formDTO.getMobile(), formDTO.getCustomerId(), customerStaffDTOResult.getCode(), customerStaffDTOResult.getMsg()));
-            return new Result().error(customerStaffDTOResult.getCode());
+            throw new RenException(customerStaffDTOResult.getCode());
         }
         CustomerStaffDTO customerStaff = customerStaffDTOResult.getData();
         //2、解析微信用户
@@ -267,17 +271,16 @@ public class GovLoginServiceImpl implements GovLoginService {
         this.saveGovTokenDto(formDTO.getRootAgencyId(), formDTO.getCustomerId(), customerStaff.getUserId(), wxMaJscode2SessionResult, token);
         UserTokenResultDTO userTokenResultDTO = new UserTokenResultDTO();
         userTokenResultDTO.setToken(token);
-        return new Result<UserTokenResultDTO>().ok(userTokenResultDTO);
+        return userTokenResultDTO;
     }
 
     @Override
-    public Result loginOut(TokenDto tokenDto) {
+    public void loginOut(TokenDto tokenDto) {
         if(null == tokenDto){
             logger.error("token解析失败,直接跳转重新登录即可");
             throw new RenException("当前用户信息获取失败");
         }
         cpUserDetailRedis.logout(tokenDto.getApp() , tokenDto.getClient() , tokenDto.getUserId());
-        return new Result();
     }
 
     //保存登录日志
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java
index 48d96dff8f..5b7fbdf89f 100644
--- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java
@@ -51,7 +51,9 @@ public class ResiPartyMemberController {
     @PostMapping("auditing")
     @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTYAUTH_AUDITINGLIST)
     public Result<List<AuditingPartyMemberResultDTO>> auditing(@RequestBody AuditingPartyMemberFormDTO formDTO) {
-        return resiPartyMemberService.auditing(formDTO);
+        ValidatorUtils.validateEntity(formDTO);
+        List<AuditingPartyMemberResultDTO> list=resiPartyMemberService.auditing(formDTO);
+        return new Result<List<AuditingPartyMemberResultDTO>>().ok(list);
     }
 
     /**
@@ -64,7 +66,9 @@ public class ResiPartyMemberController {
     @PostMapping("audited")
     @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTYAUTH_AUDITHISTORY)
     public Result<List<AuditedPartyMemberResultDTO>> audited(@RequestBody AuditedPartyMemberFormDTO formDTO) {
-        return resiPartyMemberService.audited(formDTO);
+        ValidatorUtils.validateEntity(formDTO);
+        List<AuditedPartyMemberResultDTO> list=resiPartyMemberService.audited(formDTO);
+        return new Result<List<AuditedPartyMemberResultDTO>>().ok(list);
     }
 
     /**
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java
index f0a2bdb58e..3a04d1c64b 100644
--- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java
@@ -37,7 +37,7 @@ public interface ResiPartyMemberService {
      * @Description 待审核列表
      * @Date 2020/4/26 16:04
      **/
-    Result<List<AuditingPartyMemberResultDTO>> auditing(AuditingPartyMemberFormDTO formDTO);
+    List<AuditingPartyMemberResultDTO> auditing(AuditingPartyMemberFormDTO formDTO);
     /**
      * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.AuditedPartyMemberResultDTO>>
      * @param formDTO
@@ -45,7 +45,7 @@ public interface ResiPartyMemberService {
      * @Description  党员认证-审核历史列表（审核历史：只包括自动审核失败和拒绝的审核失败：居民未填写补充信息。）
      * @Date 2020/4/26 23:32
      **/
-    Result<List<AuditedPartyMemberResultDTO>> audited(AuditedPartyMemberFormDTO formDTO);
+    List<AuditedPartyMemberResultDTO> audited(AuditedPartyMemberFormDTO formDTO);
 
     /**
      *
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiPartyMemberServiceImpl.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiPartyMemberServiceImpl.java
index 68482892fb..d2f4ccc899 100644
--- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiPartyMemberServiceImpl.java
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiPartyMemberServiceImpl.java
@@ -1,5 +1,6 @@
 package com.epmet.service.impl;
 
+import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -39,37 +40,37 @@ public class ResiPartyMemberServiceImpl implements ResiPartyMemberService {
     private ResiPartymemberFeignClient resiPartymemberFeignClient;
 
     @Override
-    public Result<List<AuditingPartyMemberResultDTO>> auditing(AuditingPartyMemberFormDTO formDTO) {
-        UnderReviewParyMemberFormDTO underReviewParyMemberFormDTO = ConvertUtils.sourceToTarget(formDTO, UnderReviewParyMemberFormDTO.class);
+    public List<AuditingPartyMemberResultDTO> auditing(AuditingPartyMemberFormDTO formDTO) {
         List<AuditingPartyMemberResultDTO> list = new ArrayList<>();
+        UnderReviewParyMemberFormDTO underReviewParyMemberFormDTO = ConvertUtils.sourceToTarget(formDTO, UnderReviewParyMemberFormDTO.class);
         Result<List<UnderReviewParyMemberResultDTO>> result = resiPartymemberFeignClient.auditingPartyMember(underReviewParyMemberFormDTO);
         if (!result.success()) {
-            logger.error(String.format("调用resi-partymember-server模块失败,错误提示%s", result.getMsg()));
+            logger.error(String.format("调用%s服务查询单元认证-待审核列表失败,入参网格id[%s],错误码%s,错误提示%s", ServiceConstant.RESI_PARTYMEMBER_SERVER, formDTO.getGridId(), result.getCode(), result.getMsg()));
             throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
         }
         if (null == result.getData() || result.getData().isEmpty()) {
-            logger.info(String.format("网格id[%s],待审核党员列表查询为空", formDTO.getGridId()));
-            return new Result<List<AuditingPartyMemberResultDTO>>().ok(list);
+            logger.info(String.format("调用%s服务查询党员认证-待审核列表,入参网格id[%s],待审核党员列表查询为空", ServiceConstant.RESI_PARTYMEMBER_SERVER, formDTO.getGridId()));
+            return list;
         }
         list = ConvertUtils.sourceToTarget(result.getData(), AuditingPartyMemberResultDTO.class);
-        return new Result<List<AuditingPartyMemberResultDTO>>().ok(list);
+        return list;
     }
 
     @Override
-    public Result<List<AuditedPartyMemberResultDTO>> audited(AuditedPartyMemberFormDTO formDTO) {
-        ReviewedParyMemberFormDTO reviewedParyMemberFormDTO = ConvertUtils.sourceToTarget(formDTO, ReviewedParyMemberFormDTO.class);
+    public List<AuditedPartyMemberResultDTO> audited(AuditedPartyMemberFormDTO formDTO) {
         List<AuditedPartyMemberResultDTO> list = new ArrayList<>();
+        ReviewedParyMemberFormDTO reviewedParyMemberFormDTO = ConvertUtils.sourceToTarget(formDTO, ReviewedParyMemberFormDTO.class);
         Result<List<ReviewedParyMemberResultDTO>> result = resiPartymemberFeignClient.auditedPartyMember(reviewedParyMemberFormDTO);
         if (!result.success()) {
-            logger.error(String.format("调用resi-partymember-server模块失败,错误提示%s", result.getMsg()));
+            logger.error(String.format("调用%s服务查询党员认证-审核历史列表失败,入参网格id[%s],错误码%s,错误提示%s", ServiceConstant.RESI_PARTYMEMBER_SERVER, formDTO.getGridId(), result.getCode(), result.getMsg()));
             throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
         }
         if (null == result.getData() || result.getData().isEmpty()) {
-            logger.info(String.format("网格id[%s],待审核党员列表查询为空", formDTO.getGridId()));
-            return new Result<List<AuditedPartyMemberResultDTO>>().ok(list);
+            logger.info(String.format("调用%s服务查询党员认证-审核历史列表为空,入参网格id[%s],待审核党员列表查询为空", ServiceConstant.RESI_PARTYMEMBER_SERVER, formDTO.getGridId()));
+            return list;
         }
         list = ConvertUtils.sourceToTarget(result.getData(), AuditedPartyMemberResultDTO.class);
-        return new Result<List<AuditedPartyMemberResultDTO>>().ok(list);
+        return list;
     }
 
     /**
diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/controller/StaffAgencyController.java b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/controller/StaffAgencyController.java
index 692ac17669..329d12ef4b 100644
--- a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/controller/StaffAgencyController.java
+++ b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/controller/StaffAgencyController.java
@@ -82,7 +82,8 @@ public class StaffAgencyController {
 	public Result switchGrid(@LoginUser TokenDto tokenDto, @RequestBody SwitchGridFormDTO switchGridFormDTO) {
 		switchGridFormDTO.setStaffId(tokenDto.getUserId());
 		ValidatorUtils.validateEntity(switchGridFormDTO);
-		return staffAgencyService.switchGrid(switchGridFormDTO);
+		staffAgencyService.switchGrid(switchGridFormDTO);
+		return new Result();
 	}
 
 	/**
diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/StaffAgencyService.java b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/StaffAgencyService.java
index da353a9f37..d6ee5eeb3c 100644
--- a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/StaffAgencyService.java
+++ b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/StaffAgencyService.java
@@ -57,7 +57,7 @@ public interface StaffAgencyService {
      * @Description 切换网格
      * @Date 2020/4/23 10:49
      **/
-    Result switchGrid(SwitchGridFormDTO switchGridFormDTO);
+    void switchGrid(SwitchGridFormDTO switchGridFormDTO);
 
     /**
      * @Description 得到工作人员最后一次登录的网格
diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/StaffAgencyServiceImpl.java b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/StaffAgencyServiceImpl.java
index 2cbda237bb..c150e6baaa 100644
--- a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/StaffAgencyServiceImpl.java
+++ b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/StaffAgencyServiceImpl.java
@@ -220,7 +220,7 @@ public class StaffAgencyServiceImpl implements StaffAgencyService {
 
 
     @Override
-    public Result switchGrid(SwitchGridFormDTO switchGridFormDTO) {
+    public void switchGrid(SwitchGridFormDTO switchGridFormDTO) {
         //记录网格访问记录
         StaffGridVisitedFormDTO staffGridVisitedFormDTO = ConvertUtils.sourceToTarget(switchGridFormDTO, StaffGridVisitedFormDTO.class);
         Result saveStaffGridVisitedRecord = epmetUserFeignClient.saveStaffGridVisitedRecord(staffGridVisitedFormDTO);
@@ -230,7 +230,6 @@ public class StaffAgencyServiceImpl implements StaffAgencyService {
        /* //查询网格的权限
         Set<String> opeKeys = accessService.listOpeKeysByStaffId(switchGridFormDTO.getStaffId(), null, switchGridFormDTO.getGridId());
         return new Result<Set<String>>().ok(opeKeys);*/
-        return new Result();
     }
 
 
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/ApplyingMemberFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/ApplyingMemberFormDTO.java
index 4ab61b072f..f55ade60b2 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/ApplyingMemberFormDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/ApplyingMemberFormDTO.java
@@ -25,4 +25,10 @@ public class ApplyingMemberFormDTO implements Serializable {
 	private Integer pageNo;
 
 	private Integer pageSize=20;
+
+	/**
+	 * 从token中获取的用户ID
+	 */
+	@NotBlank(message = "用户id不能为空")
+	private String userId;
 }
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/GroupMemberListFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/GroupMemberListFormDTO.java
index e42fdb7c1f..010c24c30d 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/GroupMemberListFormDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/GroupMemberListFormDTO.java
@@ -26,4 +26,9 @@ public class GroupMemberListFormDTO implements Serializable {
 
 	private Integer pageSize=20;
 
+	/**
+	 * 从token中获取的用户ID
+	 */
+	@NotBlank(message = "用户id不能为空")
+	private String userId;
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/GroupInvitationController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/GroupInvitationController.java
index 1364dcbba8..cf50b0b4b3 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/GroupInvitationController.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/GroupInvitationController.java
@@ -60,7 +60,8 @@ public class GroupInvitationController {
                                                                         @RequestBody CreateGroupInvitationFormDTO formDTO) {
 		formDTO.setUserId(tokenDto.getUserId());
 		ValidatorUtils.validateEntity(formDTO);
-		return groupInvitationService.createGroupInvitation(formDTO);
+		CreateGroupInvitationResultDTO createGroupInvitationResultDTO=groupInvitationService.createGroupInvitation(formDTO);
+		return new Result<CreateGroupInvitationResultDTO>().ok(createGroupInvitationResultDTO);
 	}
 
 	/**
@@ -75,7 +76,8 @@ public class GroupInvitationController {
                                                            @RequestBody LinkGroupInfoFormDTO formDTO) {
 		formDTO.setUserId(tokenDto.getUserId());
 		ValidatorUtils.validateEntity(formDTO);
-		return groupInvitationService.getLinkGroupInfo(formDTO);
+		LinkGroupInfoResultDTO linkGroupInfoResultDTO=groupInvitationService.getLinkGroupInfo(formDTO);
+		return new Result<LinkGroupInfoResultDTO>().ok(linkGroupInfoResultDTO);
 	}
 
     /**
@@ -92,6 +94,7 @@ public class GroupInvitationController {
         formDTO.setUserId(tokenDto.getUserId());
         formDTO.setApp(tokenDto.getApp());
         ValidatorUtils.validateEntity(formDTO);
-        return groupInvitationService.accetInvitation(formDTO);
+		groupInvitationService.accetInvitation(formDTO);
+        return new Result();
     }
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/GroupInvitationService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/GroupInvitationService.java
index adc45ff5b2..053c4e036e 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/GroupInvitationService.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/GroupInvitationService.java
@@ -106,7 +106,7 @@ public interface GroupInvitationService extends BaseService<GroupInvitationEntit
      * @Description 生成邀请连接
      * @Date 2020/3/31 22:50
      **/
-	Result<CreateGroupInvitationResultDTO> createGroupInvitation(CreateGroupInvitationFormDTO formDTO);
+	CreateGroupInvitationResultDTO createGroupInvitation(CreateGroupInvitationFormDTO formDTO);
 
 	/**
 	 * @return com.epmet.commons.tools.utils.Result<com.epmet.resi.group.dto.invitation.result.LinkGroupInfoResultDTO>
@@ -115,7 +115,7 @@ public interface GroupInvitationService extends BaseService<GroupInvitationEntit
 	 * @Description 根据群邀请连接查询群基本信息
 	 * @Date 2020/3/31 23:20
 	 **/
-    Result<LinkGroupInfoResultDTO> getLinkGroupInfo(LinkGroupInfoFormDTO formDTO);
+    LinkGroupInfoResultDTO getLinkGroupInfo(LinkGroupInfoFormDTO formDTO);
 
     /**
      * @return com.epmet.commons.tools.utils.Result
@@ -124,5 +124,5 @@ public interface GroupInvitationService extends BaseService<GroupInvitationEntit
      * @Description 同意邀请进组
      * @Date 2020/3/31 23:47
      **/
-	Result accetInvitation(AccetInvitationFormDTO formDTO);
+	void accetInvitation(AccetInvitationFormDTO formDTO);
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java
index c2119db769..92f2ebbd6f 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java
@@ -20,10 +20,7 @@ package com.epmet.modules.invitation.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.AppClientConstant;
-import com.epmet.commons.tools.constant.Constant;
-import com.epmet.commons.tools.constant.FieldConstant;
-import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.*;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
@@ -160,7 +157,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 	 * @Date 2020/3/31 22:50
 	 **/
 	@Override
-	public Result<CreateGroupInvitationResultDTO> createGroupInvitation(CreateGroupInvitationFormDTO formDTO) {
+	public CreateGroupInvitationResultDTO createGroupInvitation(CreateGroupInvitationFormDTO formDTO) {
 		//1、只有群主可以邀请新成员（这块界面限制死了，只有群主才能看到邀请新成员按钮）
 		//2、审核通过（讨论中）的群才可以分享邀请连接
 		ResiGroupDTO resiGroupDTO = resiGroupService.get(formDTO.getGroupId());
@@ -181,7 +178,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		insert(groupInvitationEntity);
 		CreateGroupInvitationResultDTO resultDTO = new CreateGroupInvitationResultDTO();
 		resultDTO.setInvitationId(groupInvitationEntity.getId());
-		return new Result<CreateGroupInvitationResultDTO>().ok(resultDTO);
+		return resultDTO;
 	}
 
 	/**
@@ -192,13 +189,9 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 	 * @Date 2020/3/31 23:20
 	 **/
 	@Override
-	public Result<LinkGroupInfoResultDTO> getLinkGroupInfo(LinkGroupInfoFormDTO formDTO) {
+	public LinkGroupInfoResultDTO getLinkGroupInfo(LinkGroupInfoFormDTO formDTO) {
 		//0、校验是否存在该邀请连接（判断是会否被删除连接、是否失效、群状态）
-		Result<GroupInvitationDTO> validResult = this.checkLinkValid(formDTO.getInvitationId());
-		if (!validResult.success()) {
-			return new Result<LinkGroupInfoResultDTO>().error(validResult.getCode(), validResult.getMsg());
-		}
-		GroupInvitationDTO groupInvitationDTO=validResult.getData();
+		GroupInvitationDTO groupInvitationDTO=this.checkLinkValid(formDTO.getInvitationId());
 		LinkGroupInfoResultDTO linkGroupInfoResultDTO = new LinkGroupInfoResultDTO();
 		//1、查询是否在群内
 		ResiGroupMemberDTO resiGroupMemberDTO = resiGroupMemberDao.selectGroupMemberInfo(groupInvitationDTO.getResiGroupId(), formDTO.getUserId());
@@ -214,12 +207,12 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		if (groupLeaderUserInfo.success() && null != groupLeaderUserInfo.getData()) {
 			groupInfo.setLeaderName(groupLeaderUserInfo.getData().getShowName());
 		} else {
-			logger.info("组长注册信息查询失败" + groupLeaderUserInfo.getMsg());
+			logger.error(String.format("居民端用户【%s】根据链接【%s】查看群邀请信息调用%s服务,获取组长信息异常,错误码:%s,错误提示:%s",formDTO.getUserId(),formDTO.getInvitationId(), ServiceConstant.EPMET_USER_SERVER,groupLeaderUserInfo.getCode(), groupLeaderUserInfo.getMsg()));
 		}
 		linkGroupInfoResultDTO.setGroupInfo(groupInfo);
 		//4、记录用户邀请关系
 		this.saveUserInvitation(groupInvitationDTO,formDTO);
-		return new Result<LinkGroupInfoResultDTO>().ok(linkGroupInfoResultDTO);
+		return linkGroupInfoResultDTO;
 	}
 
 	/**
@@ -240,9 +233,9 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		userInvitationFormDTO.setInviteSourceId(formDTO.getInvitationId());
 		Result result = epmetUserFeignClient.saveUserInvitation(userInvitationFormDTO);
 		if (!result.success()) {
-			logger.info("人员邀请关系记录失败" + result.getMsg());
+			logger.error("人员邀请关系记录失败" + result.getMsg());
 		} else {
-			logger.info("人员邀请关系记录成功");
+			logger.error("人员邀请关系记录成功");
 		}
 		return result;
 	}
@@ -270,17 +263,19 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		return epmetUserFeignClient.getUserResiInfoDTO(resiUserInfoFormDTO);
 	}
 
-	private Result<GroupInvitationDTO> checkLinkValid(String invitationId) {
+	private GroupInvitationDTO checkLinkValid(String invitationId) {
 		//校验是否存在该邀请连接
 		GroupInvitationDTO groupInvitationDTO = this.get(invitationId);
 		//Date1.after(Date2),当Date1大于Date2时，返回TRUE，当小于等于时，返回false；
 		if (null == groupInvitationDTO) {
-			return new Result<GroupInvitationDTO>().error(EpmetErrorCode.LOSE_EFFICACY.getCode(), EpmetErrorCode.LOSE_EFFICACY.getMsg());
+			logger.error(String.format("根据链接【%s】查看群邀请信息异常,错误码:%s,错误提示:%s",invitationId,EpmetErrorCode.LOSE_EFFICACY.getCode(), EpmetErrorCode.LOSE_EFFICACY.getMsg()));
+			throw new RenException(EpmetErrorCode.LOSE_EFFICACY.getCode());
 		}
 		if (null != groupInvitationDTO && !groupInvitationDTO.getValidEndTime().after(new Date())) {
-			return new Result<GroupInvitationDTO>().error(EpmetErrorCode.LOSE_EFFICACY.getCode(), EpmetErrorCode.LOSE_EFFICACY.getMsg());
+			logger.error(String.format("根据链接【%s】查看群邀请信息异常,错误码:%s,错误提示:%s",invitationId,EpmetErrorCode.LOSE_EFFICACY.getCode(), EpmetErrorCode.LOSE_EFFICACY.getMsg()));
+			throw new RenException(EpmetErrorCode.LOSE_EFFICACY.getCode());
 		}
-		ResiGroupEntity resiGroupEntity = resiGroupDao.selectById(groupInvitationDTO.getResiGroupId());
+		/*ResiGroupEntity resiGroupEntity = resiGroupDao.selectById(groupInvitationDTO.getResiGroupId());
 		if (null == resiGroupEntity) {
 			logger.info("组不存在");
 			//TODO
@@ -290,8 +285,8 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		} else if (null != resiGroupEntity && GroupStateConstant.GROUP_HIDDEN.equals(resiGroupEntity.getState())) {
 			logger.info("组已屏蔽");
 			//TODO
-		}
-		return new Result<GroupInvitationDTO>().ok(groupInvitationDTO);
+		}*/
+		return groupInvitationDTO;
 	}
 
 	/**
@@ -302,13 +297,9 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 	 * @Date 2020/3/31 23:47
 	 **/
 	@Override
-	public Result accetInvitation(AccetInvitationFormDTO formDTO) {
+	public void accetInvitation(AccetInvitationFormDTO formDTO) {
 		//1、申请是否有效
-		Result<GroupInvitationDTO> validResult = this.checkLinkValid(formDTO.getInvitationId());
-		if (!validResult.success()) {
-			return new Result<LinkGroupInfoResultDTO>().error(validResult.getCode(), validResult.getMsg());
-		}
-		GroupInvitationDTO groupInvitationDTO=validResult.getData();
+		GroupInvitationDTO groupInvitationDTO=this.checkLinkValid(formDTO.getInvitationId());
 		//2、校验是否已经注册居民
 		ResiGroupDTO resiGroupDTO = resiGroupService.get(groupInvitationDTO.getResiGroupId());
 		UserRoleDTO userRoleDTO=new UserRoleDTO();
@@ -319,7 +310,8 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 					resiGroupDTO.getCustomerId(),
 					resiGroupDTO.getGridId());
 			if (NumConstant.ZERO_STR.equals(userRoleDTO.getRegisteredResiFlag())) {
-				return new Result().error(EpmetErrorCode.CANNOT_JOIN_GROUP.getCode());
+				logger.error(String.format("居民端用户【%s】同意邀请进组失败,错误码:%s,错误提示:%s",formDTO.getUserId(),EpmetErrorCode.CANNOT_JOIN_GROUP.getCode(),EpmetErrorCode.CANNOT_JOIN_GROUP.getMsg()));
+				throw new RenException(EpmetErrorCode.CANNOT_JOIN_GROUP.getCode());
 			}
 		}
 		//3、新增一条邀请入群、直接审核通过的入群记录
@@ -348,7 +340,6 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		resiGroupMemberDao.updateResiGroupStatistical(groupMemeberOperation.getGroupId(), userRoleDTO);
 		//6、发送消息
 		this.sendMessageToLeader(formDTO, resiGroupDTO,groupInvitationDTO);
-		return new Result();
 	}
 
 	/**
@@ -384,7 +375,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		if (result.success()) {
 			logger.info("通知群主有新成员入群成功");
 		} else {
-			logger.info("通知群主有新成员入群失败" + result.getMsg());
+			logger.error("通知群主有新成员入群失败" + result.getMsg());
 		}
 		return result;
 	}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java
index 75489585f9..dd324b39a8 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java
@@ -60,7 +60,8 @@ public class ResiGroupMemberController {
 		applyJoinGroupFormDTO.setUserId(tokenDto.getUserId());
 		applyJoinGroupFormDTO.setApp(tokenDto.getApp());
 		ValidatorUtils.validateEntity(applyJoinGroupFormDTO);
-		return resiGroupMemberService.applyJoinGroup(applyJoinGroupFormDTO);
+		resiGroupMemberService.applyJoinGroup(applyJoinGroupFormDTO);
+		return new Result();
 	}
 
 	/**
@@ -74,8 +75,10 @@ public class ResiGroupMemberController {
 	@PostMapping("getgroupmember")
 	public Result<List<GroupMemberListResultDTO>> getGroupMemberList(@LoginUser TokenDto tokenDto,
                                                                      @RequestBody GroupMemberListFormDTO groupMemberListFormDTO) {
+		groupMemberListFormDTO.setUserId(tokenDto.getUserId());
 		ValidatorUtils.validateEntity(groupMemberListFormDTO);
-		return resiGroupMemberService.getGroupMemberList(groupMemberListFormDTO);
+		List<GroupMemberListResultDTO> list=resiGroupMemberService.getGroupMemberList(groupMemberListFormDTO);
+		return new Result<List<GroupMemberListResultDTO>>().ok(list);
 	}
 
 	/**
@@ -88,9 +91,11 @@ public class ResiGroupMemberController {
 	 **/
 	@PostMapping("getapplyingmember")
 	public Result<List<ApplyingMemberResultDTO>> getApplyingMember(@LoginUser TokenDto tokenDto,
-                                                                   @RequestBody ApplyingMemberFormDTO applyingMemberFormDTO) {
+																   @RequestBody ApplyingMemberFormDTO applyingMemberFormDTO) {
+		applyingMemberFormDTO.setUserId(tokenDto.getUserId());
 		ValidatorUtils.validateEntity(applyingMemberFormDTO);
-		return resiGroupMemberService.getApplyingMember(applyingMemberFormDTO);
+		List<ApplyingMemberResultDTO> list = resiGroupMemberService.getApplyingMember(applyingMemberFormDTO);
+		return new Result<List<ApplyingMemberResultDTO>>().ok(list);
 	}
 
 	/**
@@ -107,7 +112,8 @@ public class ResiGroupMemberController {
 		agreeApplyFormDTO.setUserId(tokenDto.getUserId());
 		agreeApplyFormDTO.setApp(tokenDto.getApp());
 		ValidatorUtils.validateEntity(agreeApplyFormDTO);
-		return resiGroupMemberService.agreeApply(agreeApplyFormDTO);
+		resiGroupMemberService.agreeApply(agreeApplyFormDTO);
+		return new Result();
 	}
 
 	/**
@@ -123,7 +129,8 @@ public class ResiGroupMemberController {
                                 @RequestBody DisagreeApplyFormDTO disagreeApplyFormDTO) {
 		disagreeApplyFormDTO.setUserId(tokenDto.getUserId());
 		ValidatorUtils.validateEntity(disagreeApplyFormDTO);
-		return resiGroupMemberService.disAgreeApply(disagreeApplyFormDTO);
+		resiGroupMemberService.disAgreeApply(disagreeApplyFormDTO);
+		return new Result();
 	}
 
     /**
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/ResiGroupMemberService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/ResiGroupMemberService.java
index a9cdb93a94..1e57b0c4e2 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/ResiGroupMemberService.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/ResiGroupMemberService.java
@@ -114,16 +114,16 @@ public interface ResiGroupMemberService extends BaseService<ResiGroupMemberEntit
      * @Description 申请加入小组
      * @Date 2020/3/29 20:01
      **/
-    Result applyJoinGroup(ApplyJoinGroupFormDTO applyJoinGroupFormDTO);
+     void applyJoinGroup(ApplyJoinGroupFormDTO applyJoinGroupFormDTO);
 
     /**
      * @return com.epmet.commons.tools.utils.Result
      * @param groupMemberListFormDTO
      * @Author yinzuomei
-     * @Description
+     * @Description 群成员列表
      * @Date 2020/3/30 21:15
      **/
-    Result<List<GroupMemberListResultDTO>> getGroupMemberList(GroupMemberListFormDTO groupMemberListFormDTO);
+    List<GroupMemberListResultDTO> getGroupMemberList(GroupMemberListFormDTO groupMemberListFormDTO);
 
     /**
      * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.resi.group.dto.member.result.ApplyingMemberResultDTO>>
@@ -132,7 +132,7 @@ public interface ResiGroupMemberService extends BaseService<ResiGroupMemberEntit
      * @Description 查看入群待审核列表
      * @Date 2020/3/30 21:38
      **/
-	Result<List<ApplyingMemberResultDTO>> getApplyingMember(ApplyingMemberFormDTO applyingMemberFormDTO);
+	List<ApplyingMemberResultDTO> getApplyingMember(ApplyingMemberFormDTO applyingMemberFormDTO);
 
     /**
      * @param agreeApplyFormDTO
@@ -141,7 +141,7 @@ public interface ResiGroupMemberService extends BaseService<ResiGroupMemberEntit
      * @Description 组长同意入群
      * @Date 2020/3/30 22:07
      **/
-    Result agreeApply(AgreeApplyFormDTO agreeApplyFormDTO);
+    void agreeApply(AgreeApplyFormDTO agreeApplyFormDTO);
 
     /**
      * @param disagreeApplyFormDTO
@@ -150,7 +150,7 @@ public interface ResiGroupMemberService extends BaseService<ResiGroupMemberEntit
      * @Description 组长拒绝入群
      * @Date 2020/3/30 22:07
      **/
-    Result disAgreeApply(DisagreeApplyFormDTO disagreeApplyFormDTO);
+    void disAgreeApply(DisagreeApplyFormDTO disagreeApplyFormDTO);
 
     /**
      * @param resiGroupMemberDTO
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
index 33da2273dd..5a8b96af8b 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
@@ -23,6 +23,7 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
@@ -192,7 +193,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 	 * @Date 2020/3/29 20:01
 	 **/
 	@Override
-	public Result applyJoinGroup(ApplyJoinGroupFormDTO applyJoinGroupFormDTO) {
+	public void applyJoinGroup(ApplyJoinGroupFormDTO applyJoinGroupFormDTO) {
 		//校验是否已经注册居民
 		ResiGroupDTO resiGroupDTO = resiGroupService.get(applyJoinGroupFormDTO.getGroupId());
 		if (null != resiGroupDTO) {
@@ -201,17 +202,18 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 					resiGroupDTO.getCustomerId(),
 					resiGroupDTO.getGridId());
 			if (NumConstant.ZERO_STR.equals(userRoleDTO.getRegisteredResiFlag())) {
-				return new Result().error(EpmetErrorCode.CANNOT_JOIN_GROUP.getCode());
+				logger.error(String.format("居民端用户【%s】申请加入小组【%s】失败,%s", applyJoinGroupFormDTO.getUserId(), applyJoinGroupFormDTO.getGroupId(), EpmetErrorCode.CANNOT_JOIN_GROUP.getMsg()));
+				throw new RenException(EpmetErrorCode.CANNOT_JOIN_GROUP.getCode());
 			}
 		}
 		//查看用户最新一条成员处理记录，避免重复申请
 		GroupMemeberOperationDTO groupMember = baseDao.selectGroupMemberOperationLatest(applyJoinGroupFormDTO.getUserId(),applyJoinGroupFormDTO.getGroupId());
 		if(null!=groupMember&&MemberStateConstant.UNDER_AUDITTING.equals(groupMember.getOperateStatus())){
-			logger.error(ModuleConstant.ALREADY_APPLIED_GROUP);
+			logger.error(String.format("居民端用户【%s】申请加入小组【%s】失败,错误提示:%s",applyJoinGroupFormDTO.getUserId(),applyJoinGroupFormDTO.getGroupId(),ModuleConstant.ALREADY_APPLIED_GROUP));
 			throw new RenException(ModuleConstant.ALREADY_APPLIED_GROUP);
 		}
 		if(null!=groupMember&&MemberStateConstant.APPROVED.equals(groupMember.getOperateStatus())){
-			logger.error(ModuleConstant.ALREADY_IN_GROUP);
+			logger.error(String.format("居民端用户【%s】申请加入小组【%s】失败,错误提示:%s",applyJoinGroupFormDTO.getUserId(),applyJoinGroupFormDTO.getGroupId(),ModuleConstant.ALREADY_IN_GROUP));
 			throw new RenException(ModuleConstant.ALREADY_IN_GROUP);
 		}
 		//插入一条待审核的记录
@@ -225,18 +227,17 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		groupMemeberOperation.setCreatedBy(applyJoinGroupFormDTO.getUserId());
 		groupMemeberOperation.setOperateUserId(applyJoinGroupFormDTO.getUserId());
 		groupMemeberOperationService.save(groupMemeberOperation);
-		return new Result();
 	}
 
 	/**
 	 * @param groupMemberListFormDTO
 	 * @return com.epmet.commons.tools.utils.Result
 	 * @Author yinzuomei
-	 * @Description
+	 * @Description 群成员列表
 	 * @Date 2020/3/30 21:15
 	 **/
 	@Override
-	public Result<List<GroupMemberListResultDTO>> getGroupMemberList(GroupMemberListFormDTO groupMemberListFormDTO) {
+	public List<GroupMemberListResultDTO> getGroupMemberList(GroupMemberListFormDTO groupMemberListFormDTO) {
 		int pageIndex = (groupMemberListFormDTO.getPageNo() - NumConstant.ONE) * groupMemberListFormDTO.getPageSize();
 		groupMemberListFormDTO.setPageNo(pageIndex);
 		List<GroupMemberListResultDTO> list = baseDao.selectListGroupMember(groupMemberListFormDTO);
@@ -258,9 +259,11 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 						}
 					}
 				}
+			}else{
+				logger.error(String.format("居民端用户【%s】查看群成员列表调用%s服务,获取用户头像显示昵称失败,错误码%s,错误提示%s", groupMemberListFormDTO.getUserId(), ServiceConstant.EPMET_USER_SERVER, userResiInfoDTOListResult.getCode(), userResiInfoDTOListResult.getMsg()));
 			}
 		}
-		return new Result<List<GroupMemberListResultDTO>>().ok(list);
+		return list;
 	}
 
 	/**
@@ -271,7 +274,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 	 * @Date 2020/3/30 21:38
 	 **/
 	@Override
-	public Result<List<ApplyingMemberResultDTO>> getApplyingMember(ApplyingMemberFormDTO applyingMemberFormDTO) {
+	public List<ApplyingMemberResultDTO> getApplyingMember(ApplyingMemberFormDTO applyingMemberFormDTO) {
 		int pageIndex = (applyingMemberFormDTO.getPageNo() - NumConstant.ONE) * applyingMemberFormDTO.getPageSize();
 		applyingMemberFormDTO.setPageNo(pageIndex);
 		List<ApplyingMemberResultDTO> list = baseDao.selectListApplyingMember(applyingMemberFormDTO);
@@ -293,10 +296,12 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 						}
 					}
 				}
+			}else{
+				logger.error(String.format("居民端组长【%s】查看入群待审核列表调用%s服务,获取用户头像显示昵称失败,错误码%s,错误提示%s",applyingMemberFormDTO.getUserId(), ServiceConstant.EPMET_USER_SERVER, userResiInfoDTOListResult.getCode(), userResiInfoDTOListResult.getMsg()));
 			}
 
 		}
-		return new Result<List<ApplyingMemberResultDTO>>().ok(list);
+		return list;
 	}
 
 	/**
@@ -307,17 +312,17 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 	 * @Date 2020/3/30 22:07
 	 **/
 	@Override
-	public Result agreeApply(AgreeApplyFormDTO agreeApplyFormDTO) {
+	public void agreeApply(AgreeApplyFormDTO agreeApplyFormDTO) {
 		GroupMemeberOperationDTO groupMemeberOperationDTO = groupMemeberOperationService.get(agreeApplyFormDTO.getApplyId());
 		//1、当前申请单是否是待审核
 		if (null == groupMemeberOperationDTO || !MemberStateConstant.UNDER_AUDITTING.equals(groupMemeberOperationDTO.getOperateStatus())) {
-			logger.error(ModuleConstant.APPLY_NOEXISTS);
+			logger.error(String.format("居民端组长【%s】同意用户入群申请applyId【%s】失败,错误提示:%s",agreeApplyFormDTO.getUserId(),agreeApplyFormDTO.getApplyId(),ModuleConstant.APPLY_NOEXISTS));
 			throw new RenException(ModuleConstant.APPLY_NOEXISTS);
 		}
 		//2、只有群主才可以审批入群申请
 		ResiGroupMemberDTO leaderMember = baseDao.selectGroupMemberInfo(groupMemeberOperationDTO.getGroupId(), agreeApplyFormDTO.getUserId());
 		if (!LeaderFlagConstant.GROUP_LEADER.equals(leaderMember.getGroupLeaderFlag())) {
-			logger.error(ModuleConstant.CANNOT_AUDIT_APPLY);
+			logger.error(String.format("居民端组长【%s】同意用户入群申请applyId【%s】失败,错误提示:%s",agreeApplyFormDTO.getUserId(),agreeApplyFormDTO.getApplyId(),ModuleConstant.CANNOT_AUDIT_APPLY));
 			throw new RenException(ModuleConstant.CANNOT_AUDIT_APPLY);
 		}
 		//3、修改操作状态
@@ -371,7 +376,6 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 			}
 			resiGroupRedis.set(groupCache);
 		}
-		return new Result();
 	}
 
 	/**
@@ -405,17 +409,17 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 	 * @Date 2020/3/30 22:07
 	 **/
 	@Override
-	public Result disAgreeApply(DisagreeApplyFormDTO disagreeApplyFormDTO) {
+	public void disAgreeApply(DisagreeApplyFormDTO disagreeApplyFormDTO) {
 		GroupMemeberOperationDTO groupMemeberOperationDTO = groupMemeberOperationService.get(disagreeApplyFormDTO.getApplyId());
 		//1、当前申请单是否是待审核
 		if (null == groupMemeberOperationDTO || !MemberStateConstant.UNDER_AUDITTING.equals(groupMemeberOperationDTO.getOperateStatus())) {
-			logger.error(ModuleConstant.APPLY_NOEXISTS);
+			logger.error(String.format("居民端组长【%s】拒绝用户入群申请applyId【%s】失败,错误提示:%s",disagreeApplyFormDTO.getUserId(),disagreeApplyFormDTO.getApplyId(),ModuleConstant.APPLY_NOEXISTS));
 			throw new RenException(ModuleConstant.APPLY_NOEXISTS);
 		}
 		//2、只有群主才可以审批入群申请
 		ResiGroupMemberDTO leaderMember = baseDao.selectGroupMemberInfo(groupMemeberOperationDTO.getGroupId(), disagreeApplyFormDTO.getUserId());
 		if (!LeaderFlagConstant.GROUP_LEADER.equals(leaderMember.getGroupLeaderFlag())) {
-			logger.error(ModuleConstant.CANNOT_AUDIT_APPLY);
+			logger.error(String.format("居民端组长【%s】拒绝用户入群申请applyId【%s】失败,错误提示:%s",disagreeApplyFormDTO.getUserId(),disagreeApplyFormDTO.getApplyId(),ModuleConstant.CANNOT_AUDIT_APPLY));
 			throw new RenException(ModuleConstant.CANNOT_AUDIT_APPLY);
 		}
 		//3、修改操作状态
@@ -426,7 +430,6 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		groupMemeberOperationService.update(groupMemeberOperationDTO);
 		//4、给用户发送消息
 		this.sendUserRejectedMessage(groupMemeberOperationDTO,disagreeApplyFormDTO);
-		return new Result();
 	}
 
 	@Override
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java
index 9a1d262509..bb6bcc34ae 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java
@@ -34,7 +34,8 @@ public class ResiMineGridController {
 	 **/
 	@GetMapping("getlatestgridinfo")
 	public Result<LatestGridInfoResultDTO> getLatestGridInfo(@LoginUser TokenDto tokenDto){
-		return resiMineGridService.getLatestGridInfo(tokenDto);
+		LatestGridInfoResultDTO latestGridInfoResultDTO=resiMineGridService.getLatestGridInfo(tokenDto);
+		return new Result<LatestGridInfoResultDTO>().ok(latestGridInfoResultDTO);
 	}
 
 	/**
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/ResiMineGridService.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/ResiMineGridService.java
index 73a98ad7a4..f4f398306c 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/ResiMineGridService.java
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/ResiMineGridService.java
@@ -20,7 +20,7 @@ public interface ResiMineGridService {
 	 * @param tokenDto
 	 * @return com.epmet.commons.tools.utils.Result<com.epmet.resi.mine.dto.result.LatestGridInfoResultDTO>
 	 */
-	Result<LatestGridInfoResultDTO> getLatestGridInfo(TokenDto tokenDto);
+	LatestGridInfoResultDTO getLatestGridInfo(TokenDto tokenDto);
 
 	/**
 	 * @return
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java
index 2207f5c491..d473119124 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java
@@ -2,6 +2,7 @@ package com.epmet.modules.grid.service.impl;
 
 import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
@@ -41,16 +42,22 @@ public class ResiMineGridServiceImpl implements ResiMineGridService {
 	 * @Date 2020/3/24 11:11
 	 **/
 	@Override
-	public Result<LatestGridInfoResultDTO> getLatestGridInfo(TokenDto tokenDto) {
+	public LatestGridInfoResultDTO getLatestGridInfo(TokenDto tokenDto) {
+		LatestGridInfoResultDTO latestGridInfoResultDTO=new LatestGridInfoResultDTO();
 		if (null == tokenDto || StringUtils.isBlank(tokenDto.getUserId())) {
-			logger.error(ModuleConstant.USER_NOT_NULL);
+			logger.error(String.format("居民端【%s】获取用户最近访问的网格失败:错误提示:%s",tokenDto.getUserId(),ModuleConstant.USER_NOT_NULL));
 			throw new RenException(ModuleConstant.USER_NOT_NULL);
 		}
 		if(!AppClientConstant.APP_RESI.equals(tokenDto.getApp())){
-			logger.error(ModuleConstant.FOR_RESI_CALL);
+			logger.error(String.format("居民端【%s】获取用户最近访问的网格失败,错误提示:%s",tokenDto.getUserId(),ModuleConstant.FOR_RESI_CALL));
 			throw new RenException(ModuleConstant.FOR_RESI_CALL);
 		}
-		return epmetUserFeignClient.getLatestGridInfoByUserId(tokenDto.getUserId());
+		Result<LatestGridInfoResultDTO> userResult=epmetUserFeignClient.getLatestGridInfoByUserId(tokenDto.getUserId());
+		if(userResult.success()&&null!=userResult.getData()){
+			return userResult.getData();
+		}
+		logger.error(String.format("居民端用户【%s】获取用户最近访问网格失败,调用%s服务入参userId:%s,错误码:%s,错误提示:%s", tokenDto.getUserId(),ServiceConstant.EPMET_USER_SERVER,tokenDto.getUserId(),userResult.getCode(),userResult.getMsg()));
+		return latestGridInfoResultDTO;
 	}
 
 	/**

From 26c0138af8ca6408b1f109f033653e4d1ac8bc0c Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 14 May 2020 13:21:46 +0800
Subject: [PATCH 45/45] =?UTF-8?q?url=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
index e65812e3a4..2c7a8cb9b4 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
@@ -18,8 +18,8 @@ import java.util.List;
  * @dscription
  * @date 2020/5/11 10:32
  */
-@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class,url = "localhost:8087")
-//@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class)
+//@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class,url = "localhost:8087")
+@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class)
 public interface EpmetUserFeignClient {
 
 	/**