From 973948cd41b86a9c1ffee96ad9b57232f48f48e1 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Mon, 2 Aug 2021 10:03:43 +0800
Subject: [PATCH 01/84] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8A=A5=E4=BA=8B?=
 =?UTF-8?q?=E7=9A=84controller,service?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/controller/ResiEventController.java   | 17 +++++++++++++++++
 .../com/epmet/service/ResiEventService.java     |  9 +++++++++
 .../service/impl/ResiEventServiceImpl.java      | 13 +++++++++++++
 3 files changed, 39 insertions(+)
 create mode 100644 epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java
 create mode 100644 epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java
 create mode 100644 epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java

diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java
new file mode 100644
index 0000000000..c0a20d039a
--- /dev/null
+++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java
@@ -0,0 +1,17 @@
+package com.epmet.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description 群众直报/报事controller
+ * @author wxz
+ * @date 2021.08.02 09:58:40
+*/
+@RestController
+@RequestMapping("resi-event")
+public class ResiEventController {
+
+
+
+}
diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java
new file mode 100644
index 0000000000..3a426d3326
--- /dev/null
+++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java
@@ -0,0 +1,9 @@
+package com.epmet.service;
+
+/**
+ * @Description 报事service
+ * @author wxz
+ * @date 2021.08.02 09:59:16
+*/
+public interface ResiEventService {
+}
diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
new file mode 100644
index 0000000000..2d8be957f7
--- /dev/null
+++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -0,0 +1,13 @@
+package com.epmet.service.impl;
+
+import com.epmet.service.ResiEventService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description 报事service
+ * @author wxz
+ * @date 2021.08.02 09:59:36
+*/
+@Service
+public class ResiEventServiceImpl implements ResiEventService {
+}

From d154c172b229aac8300687f3d5b0b6be67641917 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 3 Aug 2021 09:10:46 +0800
Subject: [PATCH 02/84] =?UTF-8?q?=E6=96=B0=E5=A2=9Eresi=5Fevent=5FXXX?=
 =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E5=BB=BA=E8=A1=A8=E8=AF=AD=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../V0.0.16__create_resievent_tables.sql      | 126 ++++++++++++++++++
 1 file changed, 126 insertions(+)
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql

diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql
new file mode 100644
index 0000000000..f753c01e22
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql
@@ -0,0 +1,126 @@
+CREATE TABLE `resi_event` (
+  `ID` varchar(64) NOT NULL COMMENT '主键，事件id',
+  `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',
+  `GRID_ID` varchar(64) NOT NULL COMMENT '居民端用户所在网格id',
+  `AGENCY_ID` varchar(64) NOT NULL COMMENT '居民端用户所在网格的所属组织',
+  `PIDS` varchar(64) NOT NULL COMMENT '居民端用户所在网格的所有上级组织，包含AGENCY_ID',
+  `REPORT_USER_ID` varchar(64) NOT NULL COMMENT '报事的人',
+  `IS_PARTY` varchar(1) NOT NULL DEFAULT '0' COMMENT '1：党员；0：不是党员；默认0',
+  `EVENT_CONTENT` varchar(1024) NOT NULL COMMENT '事件内容',
+  `LATITUDE` varchar(32) DEFAULT NULL COMMENT '纬度',
+  `LONGITUDE` varchar(32) DEFAULT NULL COMMENT '经度',
+  `ADDRESS` varchar(255) NOT NULL COMMENT '地址',
+  `STATUS` varchar(32) NOT NULL COMMENT '处理中：processing；已办结：closed_case',
+  `SHIFT_PROJECT` tinyint(1) NOT NULL DEFAULT '0' COMMENT '1：已转项目；0：未转项目；默认0',
+  `PROJECT_ID` varchar(64) DEFAULT NULL COMMENT '项目id;shift_project=1时，此列有值',
+  `RECALL_FLAG` tinyint(1) NOT NULL DEFAULT '0' COMMENT '1:已撤回；0：未撤回正常展示；默认0',
+  `RECALL_TIME` datetime DEFAULT NULL COMMENT '撤回时间',
+  `READ_FLAG` tinyint(1) NOT NULL DEFAULT '0' COMMENT '事件是否被阅读过;1已读；针对报事人待处理列表',
+  `RED_DOT` tinyint(1) NOT NULL DEFAULT '0' COMMENT '报事人的红点:展示1；不展示：0；人大代表回复，工作人员回复/立项/办结更新为1; ',
+  `LATEST_OPERATED_TIME` datetime NOT NULL COMMENT '最近一次操作时间（回复、立项、办结更新此列）',
+  `RESOLVE_STATUS` varchar(32) DEFAULT NULL COMMENT '是否解决：已解决 resolved，未解决 un_solved',
+  `CLOSE_REMARK` varchar(255) DEFAULT NULL COMMENT '结案说明可放这。',
+  `DEL_FLAG` char(1) NOT NULL COMMENT '删除标识:0.未删除 1.已删除',
+  `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime NOT NULL COMMENT '展示红点：visible；隐藏：invisible；人大回复、工作人员回复/立项更新为visible; 插入数据默认不展示',
+  `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='居民报事表';
+
+CREATE TABLE `resi_event_attachment` (
+  `ID` varchar(64) NOT NULL COMMENT '主键',
+  `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',
+  `RESI_EVENT_ID` varchar(64) NOT NULL COMMENT '事件Id，关联resi_event的id',
+  `ATTACHMENT_NAME` varchar(64) NOT NULL COMMENT '附件名',
+  `ATTACHMENT_FORMAT` varchar(64) NOT NULL COMMENT '文件格式（JPG、PNG、PDF、JPEG、BMP、MP4、WMA、M4A、MP3、DOC、DOCX、XLS）',
+  `ATTACHMENT_TYPE` varchar(64) NOT NULL COMMENT '附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））',
+  `ATTACHMENT_URL` varchar(255) NOT NULL COMMENT '附件地址',
+  `SORT` int(1) NOT NULL COMMENT '排序字段',
+  `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标记 0：未删除，1：已删除',
+  `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='事件附件表';
+
+
+CREATE TABLE `resi_event_mention` (
+  `ID` varchar(64) NOT NULL COMMENT '主键',
+  `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id',
+  `RESI_EVENT_ID` varchar(64) NOT NULL COMMENT '事件id',
+  `USER_TYPE` varchar(32) NOT NULL COMMENT '人大代表:npc_user',
+  `USER_ID` varchar(64) NOT NULL COMMENT '居民端用户id',
+  `GRID_ID` varchar(64) NOT NULL COMMENT '居民注册网格ID',
+  `AGENCY_ID` varchar(64) NOT NULL COMMENT '居民所属社区，就是grid_id的所属组织',
+  `PIDS` varchar(255) NOT NULL COMMENT '居民注册网格的所有上级',
+  `READ_FLAG` varchar(10) NOT NULL DEFAULT 'un_read' COMMENT '含义：已读read，未读：un_read；人大代表从未读=>已读，点击查看详情前更新为已读；',
+  `RED_DOT` tinyint(1) NOT NULL DEFAULT '1' COMMENT '(1)含义：1:展示红点；0：不展示；(2)注意：发布事件插入数据时为1，(3)何时更新？：报事人回复or工作人员回复、立项、办结更新为1；',
+  `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标识 1删除；0未删除',
+  `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='事件被@人表';
+
+
+CREATE TABLE `resi_event_report_org` (
+  `ID` varchar(64) NOT NULL COMMENT '主键',
+  `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',
+  `RESI_EVENT_ID` varchar(64) NOT NULL COMMENT '事件id',
+  `ORG_TYPE` varchar(32) NOT NULL COMMENT '报给？：\r\n网格：grid；\r\n社区：community；\r\n乡（镇、街道）级:street；\r\n区县级: district；\r\n市级: city；\r\n省级:province。',
+  `ORG_ID` varchar(64) NOT NULL COMMENT '报给的组织或者网格id',
+  `ORG_PID` varchar(64) NOT NULL COMMENT 'org_id的上级组织id，org_id是跟组织，此列为0',
+  `ORG_PIDS` varchar(255) NOT NULL COMMENT 'org_id的所有上级组织id，org_id是跟组织，此列为0',
+  `ORG_READ` varchar(10) NOT NULL DEFAULT 'un_read' COMMENT '含义：已读read，未读：un_read；组织下的工作人员从待处理=>处理中，点击查看详情前更新为已读；',
+  `RED_DOT` tinyint(1) NOT NULL DEFAULT '1' COMMENT '(1)含义：1:展示红点；0：不展示；(2)注意：发布事件插入数据时为1，(3)何时更新？：人大代表回复or报事人回复or工作人员回复、立项、办结更新为1；',
+  `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标识 1删除；0未删除',
+  `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='事件相关组织表';
+
+
+
+CREATE TABLE `resi_event_reply` (
+  `ID` varchar(64) NOT NULL COMMENT '主键',
+  `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',
+  `RESI_EVENT_ID` varchar(64) NOT NULL COMMENT '事件Id，关联resi_event的id',
+  `FROM_USER_ID` varchar(64) NOT NULL COMMENT '回复人用户Id',
+  `CONTENT` varchar(255) NOT NULL COMMENT '内容',
+  `USER_SHOW_NAME` varchar(64) NOT NULL COMMENT '报事人：xxx路尹女士；人大：人大代表-张三；组织：组织名：阜新路社区',
+  `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标记 0：未删除，1：已删除',
+  `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='事件回复表';
+
+
+CREATE TABLE `resi_event_operation_log` (
+  `ID` varchar(64) NOT NULL COMMENT '主键',
+  `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id',
+  `RESI_EVENT_ID` varchar(64) NOT NULL COMMENT '事件id',
+  `USER_ID` varchar(64) NOT NULL COMMENT '用户id',
+  `USER_IDENTITY` varchar(32) NOT NULL COMMENT '居民端用户:resi_user；工作人员:staff；报事人:report_user',
+  `ACTION_CODE` varchar(32) NOT NULL COMMENT '1、发布事件：publish；\r\n2、撤回事件：recall；\r\n3、复：reply；\r\n4、立项：shift_project；\r\n5、办结：close_case;\r\n6、选择是否已解决：choose_resolve;\r\n7、查看阅读事件：read：人大代表未读=>已读；工作人员待处理=>处理中；\r\n',
+  `ACTION_DESC` varchar(32) NOT NULL COMMENT '1、发布事件：publish；\r\n2、撤回事件：recall；\r\n3、复：reply；\r\n4、立项：shift_project；\r\n5、办结：close_case;\r\n6、选择是否已解决：choose_resolve;\r\n7、查看阅读事件：read：人大代表未读=>已读；工作人员待处理=>处理中；',
+  `OPERATE_TIME` datetime NOT NULL COMMENT '操作时间',
+  `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标识 1删除；0未删除',
+  `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='事件操作日志表';
\ No newline at end of file

From 16345ea5ae91e605e78d9d2c254d6baaa0dfe5ee Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 3 Aug 2021 09:25:10 +0800
Subject: [PATCH 03/84] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=8C=E5=8F=AA=E6=94=BE=E4=BA=86=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6=E5=92=8C=E5=9B=9E=E5=A4=8D=E4=B8=A4=E4=B8=AA=E4=B8=BB?=
 =?UTF-8?q?=E8=A1=A8=E7=9A=84controller?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/controller/ResiEventController.java |  40 +++++
 .../com/epmet/dao/ResiEventAttachmentDao.java |  33 ++++
 .../main/java/com/epmet/dao/ResiEventDao.java |  33 ++++
 .../com/epmet/dao/ResiEventMentionDao.java    |  33 ++++
 .../epmet/dao/ResiEventOperationLogDao.java   |  33 ++++
 .../java/com/epmet/dao/ResiEventReplyDao.java |  33 ++++
 .../com/epmet/dao/ResiEventReportOrgDao.java  |  33 ++++
 .../entity/ResiEventAttachmentEntity.java     |  76 ++++++++++
 .../com/epmet/entity/ResiEventEntity.java     | 141 ++++++++++++++++++
 .../epmet/entity/ResiEventMentionEntity.java  |  86 +++++++++++
 .../entity/ResiEventOperationLogEntity.java   |  89 +++++++++++
 .../epmet/entity/ResiEventReplyEntity.java    |  66 ++++++++
 .../entity/ResiEventReportOrgEntity.java      |  87 +++++++++++
 .../epmet/service/ResiEventReplyService.java  |  31 ++++
 .../com/epmet/service/ResiEventService.java   |  30 ++++
 .../impl/ResiEventReplyServiceImpl.java       |  36 +++++
 .../service/impl/ResiEventServiceImpl.java    |  36 +++++
 .../mapper/ResiEventAttachmentDao.xml         |   8 +
 .../main/resources/mapper/ResiEventDao.xml    |   8 +
 .../resources/mapper/ResiEventMentionDao.xml  |   8 +
 .../mapper/ResiEventOperationLogDao.xml       |   8 +
 .../resources/mapper/ResiEventReplyDao.xml    |   8 +
 .../mapper/ResiEventReportOrgDao.xml          |   8 +
 23 files changed, 964 insertions(+)
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventAttachmentDao.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventOperationLogDao.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventReplyDao.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventReportOrgDao.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventAttachmentEntity.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventEntity.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventMentionEntity.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventOperationLogEntity.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventReplyEntity.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventReportOrgEntity.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventReplyService.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventAttachmentDao.xml
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventOperationLogDao.xml
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReplyDao.xml
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReportOrgDao.xml

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
new file mode 100644
index 0000000000..9352700c88
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
@@ -0,0 +1,40 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have 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.service.ResiEventService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * 居民报事表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-08-03
+ */
+@RestController
+@RequestMapping("resievent")
+public class ResiEventController {
+    
+    @Autowired
+    private ResiEventService resiEventService;
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventAttachmentDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventAttachmentDao.java
new file mode 100644
index 0000000000..1202c3dc22
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventAttachmentDao.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.ResiEventAttachmentEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 事件附件表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-08-03
+ */
+@Mapper
+public interface ResiEventAttachmentDao extends BaseDao<ResiEventAttachmentEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java
new file mode 100644
index 0000000000..c1312cb0d9
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.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.ResiEventEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 居民报事表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-08-03
+ */
+@Mapper
+public interface ResiEventDao extends BaseDao<ResiEventEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java
new file mode 100644
index 0000000000..270500ae05
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.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.ResiEventMentionEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 事件被@人表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-08-03
+ */
+@Mapper
+public interface ResiEventMentionDao extends BaseDao<ResiEventMentionEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventOperationLogDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventOperationLogDao.java
new file mode 100644
index 0000000000..6432b2dbb6
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventOperationLogDao.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.ResiEventOperationLogEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 事件操作日志表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-08-03
+ */
+@Mapper
+public interface ResiEventOperationLogDao extends BaseDao<ResiEventOperationLogEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventReplyDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventReplyDao.java
new file mode 100644
index 0000000000..38cbf1467d
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventReplyDao.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.ResiEventReplyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 事件回复表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-08-03
+ */
+@Mapper
+public interface ResiEventReplyDao extends BaseDao<ResiEventReplyEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventReportOrgDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventReportOrgDao.java
new file mode 100644
index 0000000000..b8d9776cab
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventReportOrgDao.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.ResiEventReportOrgEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 事件相关组织表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-08-03
+ */
+@Mapper
+public interface ResiEventReportOrgDao extends BaseDao<ResiEventReportOrgEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventAttachmentEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventAttachmentEntity.java
new file mode 100644
index 0000000000..255c7c465c
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventAttachmentEntity.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 2021-08-03
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("resi_event_attachment")
+public class ResiEventAttachmentEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 事件Id，关联resi_event的id
+     */
+	private String resiEventId;
+
+    /**
+     * 附件名
+     */
+	private String attachmentName;
+
+    /**
+     * 文件格式（JPG、PNG、PDF、JPEG、BMP、MP4、WMA、M4A、MP3、DOC、DOCX、XLS）
+     */
+	private String attachmentFormat;
+
+    /**
+     * 附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））
+     */
+	private String attachmentType;
+
+    /**
+     * 附件地址
+     */
+	private String attachmentUrl;
+
+    /**
+     * 排序字段
+     */
+	private Integer sort;
+
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventEntity.java
new file mode 100644
index 0000000000..9453ab7447
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventEntity.java
@@ -0,0 +1,141 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have 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 2021-08-03
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("resi_event")
+public class ResiEventEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 居民端用户所在网格id
+     */
+	private String gridId;
+
+    /**
+     * 居民端用户所在网格的所属组织
+     */
+	private String agencyId;
+
+    /**
+     * 居民端用户所在网格的所有上级组织，包含AGENCY_ID
+     */
+	private String pids;
+
+    /**
+     * 报事的人
+     */
+	private String reportUserId;
+
+    /**
+     * 1：党员；0：不是党员；默认0
+     */
+	private String isParty;
+
+    /**
+     * 事件内容
+     */
+	private String eventContent;
+
+    /**
+     * 纬度
+     */
+	private String latitude;
+
+    /**
+     * 经度
+     */
+	private String longitude;
+
+    /**
+     * 地址
+     */
+	private String address;
+
+    /**
+     * 处理中：processing；已办结：closed_case
+     */
+	private String status;
+
+    /**
+     * 1：已转项目；0：未转项目；默认0
+     */
+	private Integer shiftProject;
+
+    /**
+     * 项目id;shift_project=1时，此列有值
+     */
+	private String projectId;
+
+    /**
+     * 1:已撤回；0：未撤回正常展示；默认0
+     */
+	private Integer recallFlag;
+
+    /**
+     * 撤回时间
+     */
+	private Date recallTime;
+
+    /**
+     * 事件是否被阅读过;1已读；针对报事人待处理列表
+     */
+	private Integer readFlag;
+
+    /**
+     * 报事人的红点:展示1；不展示：0；人大代表回复，工作人员回复/立项/办结更新为1; 
+     */
+	private Integer redDot;
+
+    /**
+     * 最近一次操作时间（回复、立项、办结更新此列）
+     */
+	private Date latestOperatedTime;
+
+    /**
+     * 是否解决：已解决 resolved，未解决 un_solved
+     */
+	private String resolveStatus;
+
+    /**
+     * 结案说明可放这。
+     */
+	private String closeRemark;
+
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventMentionEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventMentionEntity.java
new file mode 100644
index 0000000000..882f282a04
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventMentionEntity.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 2021-08-03
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("resi_event_mention")
+public class ResiEventMentionEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 事件id
+     */
+	private String resiEventId;
+
+    /**
+     * 人大代表:npc_user
+     */
+	private String userType;
+
+    /**
+     * 居民端用户id
+     */
+	private String userId;
+
+    /**
+     * 居民注册网格ID
+     */
+	private String gridId;
+
+    /**
+     * 居民所属社区，就是grid_id的所属组织
+     */
+	private String agencyId;
+
+    /**
+     * 居民注册网格的所有上级
+     */
+	private String pids;
+
+    /**
+     * 含义：已读read，未读：un_read；人大代表从未读=>已读，点击查看详情前更新为已读；
+     */
+	private String readFlag;
+
+    /**
+     * (1)含义：1:展示红点；0：不展示；(2)注意：发布事件插入数据时为1，(3)何时更新？：报事人回复or工作人员回复、立项、办结更新为1；
+     */
+	private Integer redDot;
+
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventOperationLogEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventOperationLogEntity.java
new file mode 100644
index 0000000000..e2c34cc30e
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventOperationLogEntity.java
@@ -0,0 +1,89 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have 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 2021-08-03
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("resi_event_operation_log")
+public class ResiEventOperationLogEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 事件id
+     */
+	private String resiEventId;
+
+    /**
+     * 用户id
+     */
+	private String userId;
+
+    /**
+     * 居民端用户:resi_user；工作人员:staff；报事人:report_user
+     */
+	private String userIdentity;
+
+    /**
+     * 1、发布事件：publish；
+2、撤回事件：recall；
+3、复：reply；
+4、立项：shift_project；
+5、办结：close_case;
+6、选择是否已解决：choose_resolve;
+7、查看阅读事件：read：人大代表未读=>已读；工作人员待处理=>处理中；
+
+     */
+	private String actionCode;
+
+    /**
+     * 1、发布事件：publish；
+2、撤回事件：recall；
+3、复：reply；
+4、立项：shift_project；
+5、办结：close_case;
+6、选择是否已解决：choose_resolve;
+7、查看阅读事件：read：人大代表未读=>已读；工作人员待处理=>处理中；
+     */
+	private String actionDesc;
+
+    /**
+     * 操作时间
+     */
+	private Date operateTime;
+
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventReplyEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventReplyEntity.java
new file mode 100644
index 0000000000..2d597fd6e3
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventReplyEntity.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 2021-08-03
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("resi_event_reply")
+public class ResiEventReplyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 事件Id，关联resi_event的id
+     */
+	private String resiEventId;
+
+    /**
+     * 回复人用户Id
+     */
+	private String fromUserId;
+
+    /**
+     * 内容
+     */
+	private String content;
+
+    /**
+     * 报事人：xxx路尹女士；人大：人大代表-张三；组织：组织名：阜新路社区
+     */
+	private String userShowName;
+
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventReportOrgEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventReportOrgEntity.java
new file mode 100644
index 0000000000..dfdeb11c5d
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventReportOrgEntity.java
@@ -0,0 +1,87 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have 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 2021-08-03
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("resi_event_report_org")
+public class ResiEventReportOrgEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 事件id
+     */
+	private String resiEventId;
+
+    /**
+     * 报给？：
+网格：grid；
+社区：community；
+乡（镇、街道）级:street；
+区县级: district；
+市级: city；
+省级:province。
+     */
+	private String orgType;
+
+    /**
+     * 报给的组织或者网格id
+     */
+	private String orgId;
+
+    /**
+     * org_id的上级组织id，org_id是跟组织，此列为0
+     */
+	private String orgPid;
+
+    /**
+     * org_id的所有上级组织id，org_id是跟组织，此列为0
+     */
+	private String orgPids;
+
+    /**
+     * 含义：已读read，未读：un_read；组织下的工作人员从待处理=>处理中，点击查看详情前更新为已读；
+     */
+	private String orgRead;
+
+    /**
+     * (1)含义：1:展示红点；0：不展示；(2)注意：发布事件插入数据时为1，(3)何时更新？：人大代表回复or报事人回复or工作人员回复、立项、办结更新为1；
+     */
+	private Integer redDot;
+
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventReplyService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventReplyService.java
new file mode 100644
index 0000000000..49137c1053
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventReplyService.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.entity.ResiEventReplyEntity;
+
+/**
+ * 事件回复表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-08-03
+ */
+public interface ResiEventReplyService extends BaseService<ResiEventReplyEntity> {
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java
new file mode 100644
index 0000000000..bdcfedaab3
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java
@@ -0,0 +1,30 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have 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.entity.ResiEventEntity;
+
+/**
+ * 居民报事表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-08-03
+ */
+public interface ResiEventService extends BaseService<ResiEventEntity> {
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java
new file mode 100644
index 0000000000..e042cd3acc
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java
@@ -0,0 +1,36 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.dao.ResiEventReplyDao;
+import com.epmet.entity.ResiEventReplyEntity;
+import com.epmet.service.ResiEventReplyService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 事件回复表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-08-03
+ */
+@Service
+public class ResiEventReplyServiceImpl extends BaseServiceImpl<ResiEventReplyDao, ResiEventReplyEntity> implements ResiEventReplyService {
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
new file mode 100644
index 0000000000..0b0814189a
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -0,0 +1,36 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.dao.ResiEventDao;
+import com.epmet.entity.ResiEventEntity;
+import com.epmet.service.ResiEventService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 居民报事表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-08-03
+ */
+@Service
+public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEventEntity> implements ResiEventService {
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventAttachmentDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventAttachmentDao.xml
new file mode 100644
index 0000000000..6bb3be938d
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventAttachmentDao.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.ResiEventAttachmentDao">
+
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
new file mode 100644
index 0000000000..21c7a902d7
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.ResiEventDao">
+
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml
new file mode 100644
index 0000000000..98064a416f
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.ResiEventMentionDao">
+
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventOperationLogDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventOperationLogDao.xml
new file mode 100644
index 0000000000..12d1f0ce48
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventOperationLogDao.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.ResiEventOperationLogDao">
+
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReplyDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReplyDao.xml
new file mode 100644
index 0000000000..5e01548862
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReplyDao.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.ResiEventReplyDao">
+
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReportOrgDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReportOrgDao.xml
new file mode 100644
index 0000000000..7c8b96db9e
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReportOrgDao.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.ResiEventReportOrgDao">
+
+
+
+</mapper>
\ No newline at end of file

From ad21a4eea5deb02bb92846080fa4de36c2ff3ca4 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 3 Aug 2021 09:46:13 +0800
Subject: [PATCH 04/84] tinyint(1)=>Boolean

---
 .../src/main/java/com/epmet/entity/ResiEventEntity.java   | 8 ++++----
 .../java/com/epmet/entity/ResiEventMentionEntity.java     | 5 +----
 .../java/com/epmet/entity/ResiEventReportOrgEntity.java   | 5 +----
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventEntity.java
index 9453ab7447..34ae10cd86 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventEntity.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventEntity.java
@@ -96,7 +96,7 @@ public class ResiEventEntity extends BaseEpmetEntity {
     /**
      * 1：已转项目；0：未转项目；默认0
      */
-	private Integer shiftProject;
+	private Boolean shiftProject;
 
     /**
      * 项目id;shift_project=1时，此列有值
@@ -106,7 +106,7 @@ public class ResiEventEntity extends BaseEpmetEntity {
     /**
      * 1:已撤回；0：未撤回正常展示；默认0
      */
-	private Integer recallFlag;
+	private Boolean recallFlag;
 
     /**
      * 撤回时间
@@ -116,12 +116,12 @@ public class ResiEventEntity extends BaseEpmetEntity {
     /**
      * 事件是否被阅读过;1已读；针对报事人待处理列表
      */
-	private Integer readFlag;
+	private Boolean readFlag;
 
     /**
      * 报事人的红点:展示1；不展示：0；人大代表回复，工作人员回复/立项/办结更新为1; 
      */
-	private Integer redDot;
+	private Boolean redDot;
 
     /**
      * 最近一次操作时间（回复、立项、办结更新此列）
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventMentionEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventMentionEntity.java
index 882f282a04..2a6a2abe05 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventMentionEntity.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventMentionEntity.java
@@ -18,13 +18,10 @@
 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;
-
 /**
  * 事件被@人表
  *
@@ -81,6 +78,6 @@ public class ResiEventMentionEntity extends BaseEpmetEntity {
     /**
      * (1)含义：1:展示红点；0：不展示；(2)注意：发布事件插入数据时为1，(3)何时更新？：报事人回复or工作人员回复、立项、办结更新为1；
      */
-	private Integer redDot;
+	private Boolean redDot;
 
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventReportOrgEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventReportOrgEntity.java
index dfdeb11c5d..20f4bfad3f 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventReportOrgEntity.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventReportOrgEntity.java
@@ -18,13 +18,10 @@
 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;
-
 /**
  * 事件相关组织表
  *
@@ -82,6 +79,6 @@ public class ResiEventReportOrgEntity extends BaseEpmetEntity {
     /**
      * (1)含义：1:展示红点；0：不展示；(2)注意：发布事件插入数据时为1，(3)何时更新？：人大代表回复or报事人回复or工作人员回复、立项、办结更新为1；
      */
-	private Integer redDot;
+	private Boolean redDot;
 
 }

From 63641531e8f6eba6a71d888ce0e93789db68a355 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 3 Aug 2021 10:01:39 +0800
Subject: [PATCH 05/84] resieventreply

---
 .../controller/ResiEventReplyController.java  | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java
new file mode 100644
index 0000000000..a8d2fba48f
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java
@@ -0,0 +1,40 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have 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.service.ResiEventReplyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * 事件回复表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-08-03
+ */
+@RestController
+@RequestMapping("resieventreply")
+public class ResiEventReplyController {
+    
+    @Autowired
+    private ResiEventReplyService resiEventReplyService;
+
+
+}
\ No newline at end of file

From 0f003b38adee8be61916046f62e485e71bf843e3 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Tue, 3 Aug 2021 10:59:37 +0800
Subject: [PATCH 06/84] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=88=91?=
 =?UTF-8?q?=E8=A6=81=E6=8A=A5=E4=BA=8B-=E6=9F=A5=E8=AF=A2=E4=BA=BA?=
 =?UTF-8?q?=E5=A4=A7=E4=BB=A3=E8=A1=A8=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/feign/ResultDataResolver.java       |  5 +-
 .../dto/form/ResiEventNpcListFormDTO.java     | 13 +++++
 .../dto/result/ResiEventNpcResultDTO.java     | 28 +++++++++++
 .../resi-home/resi-home-server/pom.xml        | 10 ++++
 .../epmet/controller/ResiEventController.java | 25 ++++++++++
 .../com/epmet/service/ResiEventService.java   | 11 +++++
 .../service/impl/ResiEventServiceImpl.java    | 47 +++++++++++++++++--
 .../com/epmet/constant/BadgeConstant.java     |  3 ++
 .../dto/form/ListUserByBadgeFormDTO.java      | 20 ++++++++
 .../dto/result/ListUserByBadgeResultDTO.java  | 20 ++++++++
 .../epmet/feign/EpmetUserOpenFeignClient.java |  9 ++++
 .../EpmetUserOpenFeignClientFallback.java     | 10 ++++
 .../com/epmet/controller/BadgeController.java | 23 +++++++--
 .../src/main/java/com/epmet/dao/BadgeDao.java |  8 ++++
 .../java/com/epmet/service/BadgeService.java  |  8 ++++
 .../epmet/service/impl/BadgeServiceImpl.java  |  4 ++
 .../src/main/resources/mapper/BadgeDao.xml    | 20 ++++++++
 17 files changed, 256 insertions(+), 8 deletions(-)
 create mode 100644 epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/form/ResiEventNpcListFormDTO.java
 create mode 100644 epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/result/ResiEventNpcResultDTO.java
 create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ListUserByBadgeFormDTO.java
 create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ListUserByBadgeResultDTO.java

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/ResultDataResolver.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/ResultDataResolver.java
index 1e44b924c2..5b56e64b1a 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/ResultDataResolver.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/ResultDataResolver.java
@@ -30,8 +30,11 @@ public interface ResultDataResolver {
     //}
 
     /**
-     * @Description 获取Result种的data，如果失败(返回result为null或者result.success为false)，那么抛出异常
+     * @Description
      * @return
+     * @param targetServiceName 目标service名称
+     * @param errorCode 错误码，可以为空，为空则使用上游服务抛出的错误码
+     * @param errorInternalMsg 错误信息，可以为空，为空则使用上游服务抛出的异常信息
      * @author wxz
      * @date 2021.06.07 22:45
      */
diff --git a/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/form/ResiEventNpcListFormDTO.java b/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/form/ResiEventNpcListFormDTO.java
new file mode 100644
index 0000000000..97b856a8e6
--- /dev/null
+++ b/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/form/ResiEventNpcListFormDTO.java
@@ -0,0 +1,13 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+/**
+ * @Description 我要报事人大代表列表
+ * @author wxz
+ * @date 2021.08.03 09:16:59
+*/
+@Data
+public class ResiEventNpcListFormDTO {
+    private String gridId;
+}
diff --git a/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/result/ResiEventNpcResultDTO.java b/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/result/ResiEventNpcResultDTO.java
new file mode 100644
index 0000000000..6f285807ce
--- /dev/null
+++ b/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/result/ResiEventNpcResultDTO.java
@@ -0,0 +1,28 @@
+package com.epmet.dto.result;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Description 我要报事-人大代表列表
+ * @author wxz
+ * @date 2021.08.03 09:12:57
+*/
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ResiEventNpcResultDTO {
+
+    private String userId;
+
+    private String gridId;
+
+    private String displayName;
+
+    private String headImgUrl;
+
+    private String agencyId;
+}
diff --git a/epmet-module/resi-home/resi-home-server/pom.xml b/epmet-module/resi-home/resi-home-server/pom.xml
index 5bfd93548c..041357ea74 100644
--- a/epmet-module/resi-home/resi-home-server/pom.xml
+++ b/epmet-module/resi-home/resi-home-server/pom.xml
@@ -68,6 +68,16 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>gov-org-client</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-user-client</artifactId>
+            <version>2.0.0</version>
+        </dependency>
 
     </dependencies>
 
diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java
index c0a20d039a..fd316f0475 100644
--- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java
+++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java
@@ -1,8 +1,18 @@
 package com.epmet.controller;
 
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.form.ResiEventNpcListFormDTO;
+import com.epmet.dto.result.ResiEventNpcResultDTO;
+import com.epmet.service.ResiEventService;
+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 群众直报/报事controller
  * @author wxz
@@ -12,6 +22,21 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("resi-event")
 public class ResiEventController {
 
+    @Autowired
+    private ResiEventService resiEventService;
 
+    /**
+     * @Description 查询人大代表列表
+     * @return
+     * @author wxz
+     * @date 2021.08.03 09:17
+    */
+    @PostMapping("/npc-list-ingrid")
+    public Result<List<ResiEventNpcResultDTO>> listNpc(@RequestBody ResiEventNpcListFormDTO input) {
+        ValidatorUtils.validateEntity(input);
+        String gridId = input.getGridId();
+        List<ResiEventNpcResultDTO> npcs = resiEventService.listNpcByGrid(gridId);
+        return new Result<List<ResiEventNpcResultDTO>>().ok(npcs);
+    }
 
 }
diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java
index 3a426d3326..ec30ef44e8 100644
--- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java
+++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java
@@ -1,9 +1,20 @@
 package com.epmet.service;
 
+import com.epmet.dto.result.ResiEventNpcResultDTO;
+
+import java.util.List;
+
 /**
  * @Description 报事service
  * @author wxz
  * @date 2021.08.02 09:59:16
 */
 public interface ResiEventService {
+    /**
+     * @Description 查询网格的人大代表列表
+     * @return    
+     * @author wxz
+     * @date 2021.08.03 09:29
+    */
+    List<ResiEventNpcResultDTO> listNpcByGrid(String gridId);
 }
diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index 2d8be957f7..b1871afb51 100644
--- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -1,13 +1,54 @@
 package com.epmet.service.impl;
 
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.feign.ResultDataResolver;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.constant.BadgeConstant;
+import com.epmet.dto.form.ListUserByBadgeFormDTO;
+import com.epmet.dto.result.GridInfoResultDTO;
+import com.epmet.dto.result.ListUserByBadgeResultDTO;
+import com.epmet.dto.result.ResiEventNpcResultDTO;
+import com.epmet.feign.EpmetUserOpenFeignClient;
+import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.service.ResiEventService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
- * @Description 报事service
  * @author wxz
+ * @Description 报事service
  * @date 2021.08.02 09:59:36
-*/
+ */
 @Service
-public class ResiEventServiceImpl implements ResiEventService {
+public class ResiEventServiceImpl implements ResiEventService, ResultDataResolver {
+
+    @Autowired
+    GovOrgOpenFeignClient govOrgOpenFeignClient;
+
+    @Autowired
+    private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
+
+    @Override
+    public List<ResiEventNpcResultDTO> listNpcByGrid(String gridId) {
+
+        // 查询网格所属的组织信息
+        Result<GridInfoResultDTO> gridInfoResult = govOrgOpenFeignClient.queryGridInfo(gridId);
+        GridInfoResultDTO gridInfoData = getResultDataOrThrowsException(gridInfoResult, ServiceConstant.GOV_ORG_SERVER, null, null);
+        String parentAgencyId = gridInfoData.getParentAgencyId();
+
+        //查询人大代表列表
+        ListUserByBadgeFormDTO npcForm = new ListUserByBadgeFormDTO(gridId, BadgeConstant.BADGE_KEY_NPC);
+        Result<List<ListUserByBadgeResultDTO>> npcResult = epmetUserOpenFeignClient.listUsersByBadge(npcForm);
+        List<ListUserByBadgeResultDTO> npcData = getResultDataOrThrowsException(npcResult, ServiceConstant.EPMET_USER_SERVER, null, null);
+
+        List<ResiEventNpcResultDTO> npcResultList = npcData.stream()
+                .map(npc -> new ResiEventNpcResultDTO(npc.getUserId(), gridId, "人大代表-".concat(npc.getRealName()), npc.getHeadImgUrl(), parentAgencyId))
+                .collect(Collectors.toList());
+
+        return npcResultList;
+    }
 }
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/BadgeConstant.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/BadgeConstant.java
index 3be3ce02c3..c8b52524f2 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/BadgeConstant.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/BadgeConstant.java
@@ -42,4 +42,7 @@ public interface BadgeConstant {
 
     String DEFAULT = "default";
 
+    // 人大代表徽章KEY
+    String BADGE_KEY_NPC = "NPC";
+
 }
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ListUserByBadgeFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ListUserByBadgeFormDTO.java
new file mode 100644
index 0000000000..8d616bacf3
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ListUserByBadgeFormDTO.java
@@ -0,0 +1,20 @@
+package com.epmet.dto.form;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ListUserByBadgeFormDTO {
+
+    @NotBlank(message = "网格ID不能为空")
+    private String gridId;
+
+    @NotBlank(message = "徽章key不能为空")
+    private String badgeKey;
+
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ListUserByBadgeResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ListUserByBadgeResultDTO.java
new file mode 100644
index 0000000000..24139d4161
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ListUserByBadgeResultDTO.java
@@ -0,0 +1,20 @@
+package com.epmet.dto.result;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author wxz
+ * @Description 根据徽章查询用户结果集
+ * @date 2021.08.02 10:23:37
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ListUserByBadgeResultDTO {
+    private String userId;
+    private String gridId;
+    private String realName;
+    private String headImgUrl;
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
index e111a8fb6c..059ced9e35 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
@@ -605,4 +605,13 @@ public interface EpmetUserOpenFeignClient {
      */
     @PostMapping("/epmetuser/staffpatrol/endpatrolJob")
     Result endPatrolJob(@RequestBody StartPatrolFormDTO formDTO);
+
+    /**
+     * @Description 根据徽章查询用户列表
+     * @return
+     * @author wxz
+     * @date 2021.08.02 10:27
+     */
+    @PostMapping("/epmetuser/badge/list-users-by-badge")
+    Result<List<ListUserByBadgeResultDTO>> listUsersByBadge(ListUserByBadgeFormDTO input);
 }
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
index 7398ecb56c..31c82beb05 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
@@ -422,4 +422,14 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "endPatrolJob", formDTO);
     }
 
+    /**
+     * @Description 根据徽章查询用户列表
+     * @return
+     * @author wxz
+     * @date 2021.08.03 09:03
+    */
+    @Override
+    public Result<List<ListUserByBadgeResultDTO>> listUsersByBadge(ListUserByBadgeFormDTO input) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "listUsersByBadge", input);
+    }
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java
index a5d13c581f..192fc3c5d3 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java
@@ -10,11 +10,9 @@ import com.epmet.dto.result.*;
 import com.epmet.redis.UserBadgeRedis;
 import com.epmet.service.BadgeService;
 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 javax.validation.constraints.NotBlank;
 import java.util.List;
 import java.util.Map;
 
@@ -190,4 +188,21 @@ public class BadgeController {
 	public Result<List<UserBadgesResultDTO>> userBadges(@RequestBody UserBadgesFormDTO formDTO){
 		return new Result<List<UserBadgesResultDTO>>().ok(badgeService.userBadges(formDTO));
 	}
+
+	/**
+	 * @Description
+	 * @return    
+	 * @author wxz
+	 * @date 2021.08.02 10:27
+	*/
+	@PostMapping("list-users-by-badge")
+	public Result<List<ListUserByBadgeResultDTO>> listUsersByBadge(@RequestBody ListUserByBadgeFormDTO input) {
+		ValidatorUtils.validateEntity(input);
+
+		String gridId = input.getGridId();
+		String badgeKey = input.getBadgeKey();
+
+		List<ListUserByBadgeResultDTO> users = badgeService.listUsersByBadge(gridId, badgeKey);
+		return new Result<List<ListUserByBadgeResultDTO>>().ok(users);
+	}
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java
index a9dc7ee49a..5c4aab8dcb 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java
@@ -196,4 +196,12 @@ public interface BadgeDao extends BaseDao<BadgeEntity> {
 	 * @date 2020/11/19 10:18 上午
 	 */
 	int selectNextSort(@Param("customerId") String customerId);
+
+	/**
+	 * @Description 根据徽章查询人列表
+	 * @return
+	 * @author wxz
+	 * @date 2021.08.02 10:40
+	*/
+    List<ListUserByBadgeResultDTO> listUsersByBadge(@Param("gridId") String gridId, @Param("badgeKey") String badgeKey);
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java
index f89f180458..fad619e87b 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java
@@ -192,4 +192,12 @@ public interface BadgeService extends BaseService<BadgeEntity> {
      * @date 2021/4/22 下午4:17
      */
     List<UserBadgesResultDTO> userBadges(UserBadgesFormDTO formDTO);
+
+    /**
+     * @Description 根据徽章查询用户列表
+     * @return
+     * @author wxz
+     * @date 2021.08.02 10:39
+    */
+    List<ListUserByBadgeResultDTO> listUsersByBadge(String gridId, String badgeKey);
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java
index dcdd39d4f1..985dd00c46 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java
@@ -480,4 +480,8 @@ public class BadgeServiceImpl extends BaseServiceImpl<BadgeDao, BadgeEntity> imp
         return result;
     }
 
+    @Override
+    public List<ListUserByBadgeResultDTO> listUsersByBadge(String gridId, String badgeKey) {
+        return baseDao.listUsersByBadge(gridId, badgeKey);
+    }
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml
index c9be676412..560867c932 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml
@@ -310,4 +310,24 @@
         ORDER BY CREATED_TIME DESC
         LIMIT 1
     </select>
+
+    <!--根据徽章查询居民列表-->
+    <select id="listUsersByBadge" resultType="com.epmet.dto.result.ListUserByBadgeResultDTO">
+        select
+            resi_user_badge.USER_ID,
+            resi_user_badge.GRID_ID,
+            user_base_info.REAL_NAME,
+            user_base_info.HEAD_IMG_URL
+        from resi_user_badge
+                 inner join badge on (badge.BADGE_KEY = #{badgeKey}
+                                    and resi_user_badge.GRID_ID = #{gridId}
+                                    and resi_user_badge.CERTIFICATION_AUTID_STATUS = 'approved'
+                                    and resi_user_badge.DEL_FLAG = 0
+                                    and resi_user_badge.BADGE_ID = badge.ID
+                                    and badge.DEL_FLAG = 0)
+                 inner join user_base_info
+                            on (user_base_info.USER_ID = resi_user_badge.USER_ID
+                            and user_base_info.DEL_FLAG = 0)
+
+    </select>
 </mapper>
\ No newline at end of file

From 33bc6098ab7a69f5fbd990e9e5e33e858050ffdd Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 3 Aug 2021 11:04:30 +0800
Subject: [PATCH 07/84] =?UTF-8?q?emm=20=E8=B5=B6=E7=B4=A7=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=20=E7=9C=81=E7=9D=80=E5=92=8C=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/form/EventListFormDTO.java  | 29 ++++++++++
 .../epmet/dto/form/UpdateViewTimeFormDTO.java | 29 ++++++++++
 .../epmet/dto/result/EventListResultDTO.java  | 48 +++++++++++++++++
 .../com/epmet/controller/EventController.java | 53 +++++++++++++++++++
 .../com/epmet/service/ResiEventService.java   | 40 ++++++++------
 .../service/impl/ResiEventServiceImpl.java    | 25 +++++++++
 6 files changed, 207 insertions(+), 17 deletions(-)
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventListFormDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/UpdateViewTimeFormDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventListResultDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/EventController.java

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventListFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventListFormDTO.java
new file mode 100644
index 0000000000..eff8d5e66b
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventListFormDTO.java
@@ -0,0 +1,29 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/8/3 10:43 上午
+ * @DESC
+ */
+@Data
+public class EventListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 5882062169112022561L;
+
+    public interface EventListForm extends CustomerClientShowGroup{}
+
+    /**
+     * 报事列表类型【已处理：processed 	未处理：undisposed 	已办结：transferred】
+     */
+    @NotBlank(message = "报事列表类型不能为空",groups = EventListForm.class)
+    private String eventType;
+
+    @NotBlank(message = "",groups = EventListForm.class)
+    private String orgId;
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/UpdateViewTimeFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/UpdateViewTimeFormDTO.java
new file mode 100644
index 0000000000..30e891cd78
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/UpdateViewTimeFormDTO.java
@@ -0,0 +1,29 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/8/3 10:55 上午
+ * @DESC
+ */
+@Data
+public class UpdateViewTimeFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 7104400078458366322L;
+
+    public interface UpdateViewTimeForm extends CustomerClientShowGroup{}
+
+    /**
+     * 居民端用户:resi_user；工作人员:staff
+     */
+    @NotBlank(message = "viewType不能为空",groups = UpdateViewTimeForm.class)
+    private String viewType;
+
+    @NotBlank(message = "事件ID不能为空",groups = UpdateViewTimeForm.class)
+    private String eventId;
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventListResultDTO.java
new file mode 100644
index 0000000000..94853b80d1
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventListResultDTO.java
@@ -0,0 +1,48 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/8/3 10:41 上午
+ * @DESC
+ */
+@Data
+public class EventListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -8550265282744924930L;
+
+    /**
+     * 报事标题
+     */
+    private String eventTitle;
+
+    /**
+     * 报事时间
+     */
+    private String eventTime;
+
+    /**
+     * 报事ID
+     */
+    private String eventId;
+
+    /**
+     * 是否立项【true：是，false：否】
+     */
+    private Boolean isProject;
+
+    /**
+     * 红点显示【true：显示，false：不显示】
+     */
+    private Boolean redDot;
+
+    /**
+     * 报事图片
+     */
+    private List<String> eventImgs;
+
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/EventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/EventController.java
new file mode 100644
index 0000000000..062740b5d7
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/EventController.java
@@ -0,0 +1,53 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.form.EventListFormDTO;
+import com.epmet.dto.form.UpdateViewTimeFormDTO;
+import com.epmet.dto.result.EventListResultDTO;
+import com.epmet.service.ResiEventService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+
+/**
+ * 居民报事表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-08-03
+ */
+@RestController
+@RequestMapping("event")
+public class EventController {
+    
+    @Autowired
+    private ResiEventService resiEventService;
+
+    /**
+     * @Description  群众直报（待处理、处理中、已办结）列表
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/8/3 10:53 上午
+     */
+    @PostMapping("eventlist")
+    public Result<List<EventListResultDTO>> eventList(@RequestBody EventListFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, EventListFormDTO.EventListForm.class);
+        return new Result<List<EventListResultDTO>>().ok(resiEventService.eventList(formDTO));
+    }
+
+    /**
+     * @Description  查看报事时,更新时间操作
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/8/3 11:01 上午
+     */
+    @PostMapping("updateviewtime")
+    public Result updateViewTime(@RequestBody UpdateViewTimeFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, UpdateViewTimeFormDTO.UpdateViewTimeForm.class);
+        resiEventService.updateViewTime(formDTO);
+        return new Result();
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java
index bdcfedaab3..fec1527d3c 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java
@@ -1,24 +1,13 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- * <p>
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * <p>
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * <p>
- * You should have 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.dto.form.EventListFormDTO;
+import com.epmet.dto.form.UpdateViewTimeFormDTO;
+import com.epmet.dto.result.EventListResultDTO;
 import com.epmet.entity.ResiEventEntity;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
 
 /**
  * 居民报事表
@@ -27,4 +16,21 @@ import com.epmet.entity.ResiEventEntity;
  * @since v1.0.0 2021-08-03
  */
 public interface ResiEventService extends BaseService<ResiEventEntity> {
+
+    /**
+     * @Description  群众直报（待处理、处理中、已办结）列表
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/8/3 10:53 上午
+     */
+    List<EventListResultDTO> eventList(EventListFormDTO formDTO);
+
+    /**
+     * @Description  查看报事时,更新时间操作
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/8/3 11:01 上午
+     */
+    void updateViewTime(UpdateViewTimeFormDTO formDTO);
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index 0b0814189a..a3b5e3cd81 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -19,10 +19,15 @@ package com.epmet.service.impl;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.dao.ResiEventDao;
+import com.epmet.dto.form.EventListFormDTO;
+import com.epmet.dto.form.UpdateViewTimeFormDTO;
+import com.epmet.dto.result.EventListResultDTO;
 import com.epmet.entity.ResiEventEntity;
 import com.epmet.service.ResiEventService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 居民报事表
  *
@@ -32,5 +37,25 @@ import org.springframework.stereotype.Service;
 @Service
 public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEventEntity> implements ResiEventService {
 
+    /**
+     * @Description  群众直报（待处理、处理中、已办结）列表
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/8/3 10:53 上午
+     */
+    @Override
+    public List<EventListResultDTO> eventList(EventListFormDTO formDTO) {
+        return null;
+    }
+
+    /**
+     * @Description  查看报事时,更新时间操作
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/8/3 11:01 上午
+     */
+    @Override
+    public void updateViewTime(UpdateViewTimeFormDTO formDTO) {
 
+    }
 }
\ No newline at end of file

From da4c6b7429b92e4a33feb685fd1c81a467e363f5 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 3 Aug 2021 11:12:52 +0800
Subject: [PATCH 08/84] =?UTF-8?q?=E6=8A=93=E7=B4=A7=E6=8F=90=E4=BA=A4=20?=
 =?UTF-8?q?=E4=B8=8D=E5=90=88=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/form/EventListFormDTO.java  |  2 +-
 .../com/epmet/dto/form/ReplyListFormDTO.java  | 23 +++++++++++++++++++
 .../epmet/dto/form/UpdateViewTimeFormDTO.java |  2 +-
 .../epmet/dto/result/ReplyListResultDTO.java  | 18 +++++++++++++++
 .../controller/ResiEventReplyController.java  | 19 +++++++++++++++
 .../epmet/service/ResiEventReplyService.java  | 13 +++++++++++
 .../impl/ResiEventReplyServiceImpl.java       | 15 +++++++++++-
 7 files changed, 89 insertions(+), 3 deletions(-)
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReplyListFormDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ReplyListResultDTO.java

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventListFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventListFormDTO.java
index eff8d5e66b..1815ecd434 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventListFormDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventListFormDTO.java
@@ -16,7 +16,7 @@ public class EventListFormDTO implements Serializable {
 
     private static final long serialVersionUID = 5882062169112022561L;
 
-    public interface EventListForm extends CustomerClientShowGroup{}
+    public interface EventListForm{}
 
     /**
      * 报事列表类型【已处理：processed 	未处理：undisposed 	已办结：transferred】
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReplyListFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReplyListFormDTO.java
new file mode 100644
index 0000000000..20575626fd
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReplyListFormDTO.java
@@ -0,0 +1,23 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/8/3 11:07 上午
+ * @DESC
+ */
+@Data
+public class ReplyListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 3875624725235229558L;
+
+    public interface ReplyListForm{}
+
+    @NotBlank(message = "报事ID不能为空",groups = ReplyListForm.class)
+    private String resiEventId;
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/UpdateViewTimeFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/UpdateViewTimeFormDTO.java
index 30e891cd78..c2ca21208e 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/UpdateViewTimeFormDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/UpdateViewTimeFormDTO.java
@@ -16,7 +16,7 @@ public class UpdateViewTimeFormDTO implements Serializable {
 
     private static final long serialVersionUID = 7104400078458366322L;
 
-    public interface UpdateViewTimeForm extends CustomerClientShowGroup{}
+    public interface UpdateViewTimeForm{}
 
     /**
      * 居民端用户:resi_user；工作人员:staff
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ReplyListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ReplyListResultDTO.java
new file mode 100644
index 0000000000..f5b744289e
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ReplyListResultDTO.java
@@ -0,0 +1,18 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/8/3 11:07 上午
+ * @DESC
+ */
+@Data
+public class ReplyListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 4875335642497226847L;
+
+
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java
index a8d2fba48f..6a1eac37ef 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java
@@ -17,11 +17,19 @@
 
 package com.epmet.controller;
 
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.form.ReplyListFormDTO;
+import com.epmet.dto.result.ReplyListResultDTO;
 import com.epmet.service.ResiEventReplyService;
 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;
+
 
 /**
  * 事件回复表
@@ -36,5 +44,16 @@ public class ResiEventReplyController {
     @Autowired
     private ResiEventReplyService resiEventReplyService;
 
+    /**
+     * @Description  报事详情-回复列表-两端通用
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/8/3 11:11 上午
+     */
+    @PostMapping("list")
+    public Result<List<ReplyListResultDTO>> replyList(@RequestBody ReplyListFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, ReplyListFormDTO.ReplyListForm.class);
+        return new Result<List<ReplyListResultDTO>>().ok(resiEventReplyService.replyList(formDTO));
+    }
 
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventReplyService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventReplyService.java
index 49137c1053..5065a9eb79 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventReplyService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventReplyService.java
@@ -18,7 +18,12 @@
 package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.dto.form.ReplyListFormDTO;
+import com.epmet.dto.result.ReplyListResultDTO;
 import com.epmet.entity.ResiEventReplyEntity;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
 
 /**
  * 事件回复表
@@ -28,4 +33,12 @@ import com.epmet.entity.ResiEventReplyEntity;
  */
 public interface ResiEventReplyService extends BaseService<ResiEventReplyEntity> {
 
+    /**
+     * @Description  报事详情-回复列表-两端通用
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/8/3 11:11 上午
+     */
+    List<ReplyListResultDTO> replyList(ReplyListFormDTO formDTO);
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java
index e042cd3acc..4b003cf048 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java
@@ -19,10 +19,14 @@ package com.epmet.service.impl;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.dao.ResiEventReplyDao;
+import com.epmet.dto.form.ReplyListFormDTO;
+import com.epmet.dto.result.ReplyListResultDTO;
 import com.epmet.entity.ResiEventReplyEntity;
 import com.epmet.service.ResiEventReplyService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 事件回复表
  *
@@ -32,5 +36,14 @@ import org.springframework.stereotype.Service;
 @Service
 public class ResiEventReplyServiceImpl extends BaseServiceImpl<ResiEventReplyDao, ResiEventReplyEntity> implements ResiEventReplyService {
 
-
+    /**
+     * @Description  报事详情-回复列表-两端通用
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/8/3 11:11 上午
+     */
+    @Override
+    public List<ReplyListResultDTO> replyList(ReplyListFormDTO formDTO) {
+        return null;
+    }
 }
\ No newline at end of file

From cc7b6d4a2d15785c9a7d6be5525d8e6ae5728692 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 3 Aug 2021 13:48:31 +0800
Subject: [PATCH 09/84] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/EventProjectInfoDTO.java    | 43 ++++++++++
 .../epmet/dto/form/EventDetailFormDTO.java    | 22 +++++
 .../dto/result/EventDetailResultDTO.java      | 82 +++++++++++++++++++
 .../epmet/controller/ResiEventController.java | 17 ++++
 .../com/epmet/service/ResiEventService.java   | 11 ++-
 .../service/impl/ResiEventServiceImpl.java    | 13 +++
 6 files changed, 187 insertions(+), 1 deletion(-)
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/EventProjectInfoDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventDetailFormDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/EventProjectInfoDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/EventProjectInfoDTO.java
new file mode 100644
index 0000000000..b8de802fe0
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/EventProjectInfoDTO.java
@@ -0,0 +1,43 @@
+package com.epmet.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/8/3 1:38 下午
+ * @DESC
+ */
+@Data
+public class EventProjectInfoDTO implements Serializable {
+
+    private static final long serialVersionUID = 5622220354099001615L;
+
+    /**
+     * 项目ID
+     */
+    private String projectId;
+
+    /**
+     * 操作人【xxx社区-张三】
+     */
+    private String operationName;
+
+    /**
+     * 操作时间
+     */
+    private String operationTime;
+
+    /**
+     * 报事说明
+     */
+    private String projectDeclare;
+
+    public EventProjectInfoDTO() {
+        this.projectId = "";
+        this.operationName = "";
+        this.operationTime = "";
+        this.projectDeclare = "";
+    }
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventDetailFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventDetailFormDTO.java
new file mode 100644
index 0000000000..1d2972d0c3
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventDetailFormDTO.java
@@ -0,0 +1,22 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/8/3 1:27 下午
+ * @DESC
+ */
+@Data
+public class EventDetailFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -297495947153154171L;
+
+    public interface EventDetailForm{}
+
+    @NotBlank(message = "报事ID不能为空",groups = EventDetailForm.class)
+    private String eventId;
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java
new file mode 100644
index 0000000000..85e0a0a9b2
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java
@@ -0,0 +1,82 @@
+package com.epmet.dto.result;
+
+import com.epmet.dto.EventProjectInfoDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/8/3 1:30 下午
+ * @DESC
+ */
+@Data
+public class EventDetailResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 3905105043326445613L;
+
+    /**
+     * 报事时间
+     */
+    private String eventTime;
+
+    /**
+     * 报事内容
+     */
+    private String eventContent;
+
+    /**
+     * 报事地址
+     */
+    private String eventAddress;
+
+    /**
+     * 所属网格【xx社区-xx网格】
+     */
+    private String gridName;
+
+    /**
+     * 是否办结【是：true，否：false】
+     */
+    private Boolean isClosed;
+
+    /**
+     * 是否解决【是：true，否：false】
+     */
+    private Boolean isResolve;
+
+    /**
+     * 是否可以撤回【true：是，false：否】
+     */
+    private Boolean isRollback;
+
+    /**
+     * 报事图片
+     */
+    private List<String> eventImgs;
+
+    /**
+     * 报事提到的人
+     */
+    private List<String> eventPerson;
+
+    /**
+     * 项目信息
+     */
+    private EventProjectInfoDTO projectInfo;
+
+    public EventDetailResultDTO() {
+        this.eventTime = "";
+        this.eventContent = "";
+        this.eventAddress = "";
+        this.gridName = "";
+        this.isClosed = false;
+        this.isResolve = false;
+        this.isRollback = false;
+        this.eventImgs = new ArrayList<>();
+        this.eventPerson = new ArrayList<>();
+        this.projectInfo = new EventProjectInfoDTO();
+    }
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
index 9352700c88..e97ee03e78 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
@@ -17,8 +17,14 @@
 
 package com.epmet.controller;
 
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.form.EventDetailFormDTO;
+import com.epmet.dto.result.EventDetailResultDTO;
 import com.epmet.service.ResiEventService;
 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;
 
@@ -36,5 +42,16 @@ public class ResiEventController {
     @Autowired
     private ResiEventService resiEventService;
 
+    /**
+     * @Description  报事详情-两端通用
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/8/3 1:47 下午
+     */
+    @PostMapping("eventdetail")
+    public Result<EventDetailResultDTO> eventDetail(@RequestBody EventDetailFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO);
+        return new Result<EventDetailResultDTO>().ok(resiEventService.eventDetail(formDTO));
+    }
 
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java
index fec1527d3c..8606c1c59f 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java
@@ -1,11 +1,12 @@
 package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.dto.form.EventDetailFormDTO;
 import com.epmet.dto.form.EventListFormDTO;
 import com.epmet.dto.form.UpdateViewTimeFormDTO;
+import com.epmet.dto.result.EventDetailResultDTO;
 import com.epmet.dto.result.EventListResultDTO;
 import com.epmet.entity.ResiEventEntity;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
@@ -33,4 +34,12 @@ public interface ResiEventService extends BaseService<ResiEventEntity> {
      */
     void updateViewTime(UpdateViewTimeFormDTO formDTO);
 
+    /**
+     * @Description  报事详情-两端通用
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/8/3 1:47 下午
+     */
+    EventDetailResultDTO eventDetail(EventDetailFormDTO formDTO);
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index a3b5e3cd81..1697e07a84 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -19,8 +19,10 @@ package com.epmet.service.impl;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.dao.ResiEventDao;
+import com.epmet.dto.form.EventDetailFormDTO;
 import com.epmet.dto.form.EventListFormDTO;
 import com.epmet.dto.form.UpdateViewTimeFormDTO;
+import com.epmet.dto.result.EventDetailResultDTO;
 import com.epmet.dto.result.EventListResultDTO;
 import com.epmet.entity.ResiEventEntity;
 import com.epmet.service.ResiEventService;
@@ -58,4 +60,15 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
     public void updateViewTime(UpdateViewTimeFormDTO formDTO) {
 
     }
+
+    /**
+     * @Description  报事详情-两端通用
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/8/3 1:47 下午
+     */
+    @Override
+    public EventDetailResultDTO eventDetail(EventDetailFormDTO formDTO) {
+        return null;
+    }
 }
\ No newline at end of file

From 7693814bf05db7f24b0b5e57a1756a6e6ead838e Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 3 Aug 2021 14:33:13 +0800
Subject: [PATCH 10/84] =?UTF-8?q?=E6=9A=82=E5=AD=98=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/form/ChooseResolveFormDTO.java  | 42 ++++++++++
 .../com/epmet/dto/form/MyReportedFormDTO.java | 42 ++++++++++
 .../epmet/dto/form/ReCallEventFormDTO.java    | 34 ++++++++
 .../com/epmet/dto/form/ResiEventFormDTO.java  | 34 ++++++++
 .../epmet/dto/result/MyReportedResultDTO.java | 55 +++++++++++++
 .../com/epmet/dto/result/ResiEventIdDTO.java  | 24 ++++++
 .../epmet/controller/ResiEventController.java | 81 +++++++++++++++++++
 .../com/epmet/service/ResiEventService.java   | 47 +++++++++++
 .../service/impl/ResiEventServiceImpl.java    | 79 ++++++++++++++++++
 9 files changed, 438 insertions(+)
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ChooseResolveFormDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MyReportedFormDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReCallEventFormDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventFormDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MyReportedResultDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ResiEventIdDTO.java

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ChooseResolveFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ChooseResolveFormDTO.java
new file mode 100644
index 0000000000..f52f9622fe
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ChooseResolveFormDTO.java
@@ -0,0 +1,42 @@
+package com.epmet.dto.form;
+
+import com.epmet.dto.result.ResiEventIdDTO;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 选择已解决，未解决？？
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/8/3 13:53
+ */
+@Data
+public class ChooseResolveFormDTO extends ResiEventIdDTO implements Serializable {
+    private static final long serialVersionUID = 7888566055415227282L;
+
+
+    public interface AddUserInternalGroup {
+    }
+
+    /**
+     * 是否解决：已解决 resolved，未解决 un_solved
+     */
+    @NotBlank(message = "resolveStatus不能为空",groups = AddUserInternalGroup.class)
+    private String resolveStatus;
+
+
+    //以下参数从token中获取
+    /**
+     * 当前用户id
+     */
+    @NotBlank(message = "userId不能为空",groups = AddUserInternalGroup.class)
+    private String userId;
+
+    /**
+     * 当前客户id
+     */
+    @NotBlank(message = "customerId不能为空",groups = AddUserInternalGroup.class)
+    private String customerId;
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MyReportedFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MyReportedFormDTO.java
new file mode 100644
index 0000000000..a1cdd9d389
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MyReportedFormDTO.java
@@ -0,0 +1,42 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 我的报事列表查询
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/8/3 14:07
+ */
+@Data
+public class MyReportedFormDTO implements Serializable {
+    private static final long serialVersionUID = 8426911903236849796L;
+
+    public interface AddUserInternalGroup {
+    }
+
+    /**
+     * 未处理:un_read；处理中：processing；已办结：closed_case
+     */
+    @NotBlank(message = "statusCondition不能为空",groups = AddUserInternalGroup.class)
+    private String statusCondition;
+
+    private Integer pageNo;
+    private Integer pageSize;
+
+    //以下参数从token中获取
+    /**
+     * 当前用户id
+     */
+    @NotBlank(message = "userId不能为空",groups = AddUserInternalGroup.class)
+    private String userId;
+
+    /**
+     * 当前客户id
+     */
+    @NotBlank(message = "customerId不能为空",groups = AddUserInternalGroup.class)
+    private String customerId;
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReCallEventFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReCallEventFormDTO.java
new file mode 100644
index 0000000000..a52f89d02a
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReCallEventFormDTO.java
@@ -0,0 +1,34 @@
+package com.epmet.dto.form;
+
+import com.epmet.dto.result.ResiEventIdDTO;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 撤回事件入参
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/8/3 11:28
+ */
+@Data
+public class ReCallEventFormDTO extends ResiEventIdDTO implements Serializable {
+    private static final long serialVersionUID = 2127663703852717437L;
+
+    public interface AddUserInternalGroup {
+    }
+
+    //以下参数从token中获取
+    /**
+     * 当前用户id
+     */
+    @NotBlank(message = "userId不能为空",groups = AddUserInternalGroup.class)
+    private String userId;
+
+    /**
+     * 当前客户id
+     */
+    @NotBlank(message = "customerId不能为空",groups = AddUserInternalGroup.class)
+    private String customerId;
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventFormDTO.java
new file mode 100644
index 0000000000..83d96502ae
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventFormDTO.java
@@ -0,0 +1,34 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 我要报事-提交（尹）
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/8/3 10:46
+ */
+@Data
+public class ResiEventFormDTO implements Serializable {
+    private static final long serialVersionUID = -778643059131036832L;
+
+    public interface AddUserInternalGroup {
+    }
+
+
+    //以下参数从token中获取
+    /**
+     * 当前用户id
+     */
+    @NotBlank(message = "userId不能为空",groups =AddUserInternalGroup.class)
+    private String userId;
+
+    /**
+     * 当前客户id
+     */
+    @NotBlank(message = "customerId不能为空",groups = AddUserInternalGroup.class)
+    private String customerId;
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MyReportedResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MyReportedResultDTO.java
new file mode 100644
index 0000000000..32209d0249
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MyReportedResultDTO.java
@@ -0,0 +1,55 @@
+package com.epmet.dto.result;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 报事列表
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/8/3 14:11
+ */
+@Data
+public class MyReportedResultDTO implements Serializable {
+    private static final long serialVersionUID = -7372245830000262134L;
+
+    /**
+     * 事件id
+     */
+    private String resiEventId;
+
+    /**
+     * 事件内容
+     */
+    private String eventContent;
+
+    /**
+     * 图片列表，可为空
+     */
+    private List<String> imgList;
+
+    /**
+     * true展示；false不展示
+     */
+    private Boolean redDot;
+
+    /**
+     * 处理中：processing；已办结：closed_case
+     */
+    private String status;
+
+    /**
+     * true:已转项目；false：未立项
+     */
+    private Boolean shiftProject;
+
+    /**
+     * 列表显示时间用此列：yyyy-MM-dd HH:mm:ss；处理中：上报事件时间，处理中：最新一次处理事件；已办结：办结时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date showTime;
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ResiEventIdDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ResiEventIdDTO.java
new file mode 100644
index 0000000000..22282ce4ca
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ResiEventIdDTO.java
@@ -0,0 +1,24 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 事件id
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/8/3 10:48
+ */
+@Data
+public class ResiEventIdDTO implements Serializable {
+    private static final long serialVersionUID = 1553798655658549134L;
+    public interface ResiEventIdGroup {
+    }
+    /**
+     * 居民端报的事件id
+     */
+    @NotBlank(message = "事件id不能为空",groups = ResiEventIdGroup.class)
+    private String resiEventId;
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
index 9352700c88..611a1c2af6 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
@@ -17,11 +17,25 @@
 
 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.ChooseResolveFormDTO;
+import com.epmet.dto.form.MyReportedFormDTO;
+import com.epmet.dto.form.ReCallEventFormDTO;
+import com.epmet.dto.form.ResiEventFormDTO;
+import com.epmet.dto.result.MyReportedResultDTO;
+import com.epmet.dto.result.ResiEventIdDTO;
 import com.epmet.service.ResiEventService;
 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;
+
 
 /**
  * 居民报事表
@@ -36,5 +50,72 @@ public class ResiEventController {
     @Autowired
     private ResiEventService resiEventService;
 
+    /**
+     * 我要报事-提交（尹）
+     *
+     * @param formDTO
+     * @return  com.epmet.commons.tools.utils.Result
+     * @author yinzuomei
+     * @date 2021/8/3 10:46
+     */
+    public Result<ResiEventIdDTO> report(@LoginUser TokenDto tokenDto, @RequestBody ResiEventFormDTO formDTO){
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setUserId(tokenDto.getUserId());
+        //校验参数
+        //todo
+        return new Result<ResiEventIdDTO>().ok(resiEventService.report(formDTO));
+    }
+
+    /**
+     * 我要报事-撤回（尹）
+     * 
+     * @param formDTO 
+     * @return  com.epmet.commons.tools.utils.Result 
+     * @author yinzuomei 
+     * @date 2021/8/3 10:54
+     */
+    @PostMapping("recall")
+    public Result recall(@LoginUser TokenDto tokenDto,@RequestBody ReCallEventFormDTO formDTO){
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(formDTO,ResiEventIdDTO.ResiEventIdGroup.class,ReCallEventFormDTO.AddUserInternalGroup.class);
+        resiEventService.reCall(formDTO);
+        return new Result();
+    }
+
+    /**
+     * 选择已解决，未解决
+     *
+     * @param tokenDto
+     * @param formDTO
+     * @return  com.epmet.commons.tools.utils.Result
+     * @author yinzuomei
+     * @date 2021/8/3 13:57
+     */
+    @PostMapping("chooseresolve")
+    public Result chooseResolve(@LoginUser TokenDto tokenDto,@RequestBody ChooseResolveFormDTO formDTO){
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(formDTO,ResiEventIdDTO.ResiEventIdGroup.class,ChooseResolveFormDTO.AddUserInternalGroup.class);
+        resiEventService.chooseResolve(formDTO);
+        return new Result();
+    }
+
 
+    /**
+     * 我的报事列表查询
+     * 
+     * @param tokenDto
+     * @param formDTO 
+     * @return  com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.MyReportedResultDTO>> 
+     * @author yinzuomei 
+     * @date 2021/8/3 14:27
+     */
+    @PostMapping("myreported")
+    public Result<List<MyReportedResultDTO>> queryMyReported(@LoginUser TokenDto tokenDto, @RequestBody MyReportedFormDTO formDTO){
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(formDTO,MyReportedFormDTO.AddUserInternalGroup.class);
+        return new Result<List<MyReportedResultDTO>>().ok(resiEventService.queryMyReported(formDTO));
+    }
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java
index bdcfedaab3..3ab2019443 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java
@@ -18,8 +18,16 @@
 package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.dto.form.ChooseResolveFormDTO;
+import com.epmet.dto.form.MyReportedFormDTO;
+import com.epmet.dto.form.ReCallEventFormDTO;
+import com.epmet.dto.form.ResiEventFormDTO;
+import com.epmet.dto.result.MyReportedResultDTO;
+import com.epmet.dto.result.ResiEventIdDTO;
 import com.epmet.entity.ResiEventEntity;
 
+import java.util.List;
+
 /**
  * 居民报事表
  *
@@ -27,4 +35,43 @@ import com.epmet.entity.ResiEventEntity;
  * @since v1.0.0 2021-08-03
  */
 public interface ResiEventService extends BaseService<ResiEventEntity> {
+    /**
+     * 我要报事-提交（尹）
+     *
+     * @param formDTO
+     * @return  com.epmet.dto.result.ResiEventResultDTO
+     * @author yinzuomei
+     * @date 2021/8/3 10:51
+     */
+    ResiEventIdDTO report(ResiEventFormDTO formDTO);
+
+    /**
+     * 撤回事件
+     *
+     * @param formDTO
+     * @return  void
+     * @author yinzuomei
+     * @date 2021/8/3 13:45
+     */
+    void reCall(ReCallEventFormDTO formDTO);
+
+    /**
+     * 选择已解决，未解决
+     *
+     * @param formDTO
+     * @return  void
+     * @author yinzuomei
+     * @date 2021/8/3 13:58
+     */
+    void chooseResolve(ChooseResolveFormDTO formDTO);
+
+    /**
+     * 我的报事列表查询
+     *
+     * @param formDTO
+     * @return  java.util.List<com.epmet.dto.result.MyReportedResultDTO>
+     * @author yinzuomei
+     * @date 2021/8/3 14:28
+     */
+    List<MyReportedResultDTO> queryMyReported(MyReportedFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index 0b0814189a..98088e7936 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -19,10 +19,18 @@ package com.epmet.service.impl;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.dao.ResiEventDao;
+import com.epmet.dto.form.ChooseResolveFormDTO;
+import com.epmet.dto.form.MyReportedFormDTO;
+import com.epmet.dto.form.ReCallEventFormDTO;
+import com.epmet.dto.form.ResiEventFormDTO;
+import com.epmet.dto.result.MyReportedResultDTO;
+import com.epmet.dto.result.ResiEventIdDTO;
 import com.epmet.entity.ResiEventEntity;
 import com.epmet.service.ResiEventService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 居民报事表
  *
@@ -33,4 +41,75 @@ import org.springframework.stereotype.Service;
 public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEventEntity> implements ResiEventService {
 
 
+    /**
+     * 我要报事-提交（尹）
+     *
+     * @param formDTO
+     * @return com.epmet.dto.result.ResiEventResultDTO
+     * @author yinzuomei
+     * @date 2021/8/3 10:51
+     */
+    @Override
+    public ResiEventIdDTO report(ResiEventFormDTO formDTO) {
+        //todo
+
+
+
+
+
+        return null;
+    }
+
+    /**
+     * 撤回事件
+     *
+     * @param formDTO
+     * @return void
+     * @author yinzuomei
+     * @date 2021/8/3 13:45
+     */
+    @Override
+    public void reCall(ReCallEventFormDTO formDTO) {
+        // todo
+
+
+
+    }
+
+    /**
+     * 选择已解决，未解决
+     *
+     * @param formDTO
+     * @return void
+     * @author yinzuomei
+     * @date 2021/8/3 13:58
+     */
+    @Override
+    public void chooseResolve(ChooseResolveFormDTO formDTO) {
+        // todo
+
+
+
+
+
+
+    }
+
+    /**
+     * 我的报事列表查询
+     *
+     * @param formDTO
+     * @return java.util.List<com.epmet.dto.result.MyReportedResultDTO>
+     * @author yinzuomei
+     * @date 2021/8/3 14:28
+     */
+    @Override
+    public List<MyReportedResultDTO> queryMyReported(MyReportedFormDTO formDTO) {
+        // todo
+
+
+
+
+        return null;
+    }
 }
\ No newline at end of file

From e869adc73fe0818f1dcbbb8330e81f3166d8ee2a Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 3 Aug 2021 14:37:57 +0800
Subject: [PATCH 11/84] emm

---
 .../main/java/com/epmet/service/ResiEventService.java    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java
index 77c2ab0614..82dabf69fc 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java
@@ -1,14 +1,15 @@
 package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.dto.form.*;
+import com.epmet.dto.result.EventDetailResultDTO;
+import com.epmet.dto.result.EventListResultDTO;
 import com.epmet.entity.ResiEventEntity;
-import com.epmet.dto.form.ChooseResolveFormDTO;
-import com.epmet.dto.form.MyReportedFormDTO;
-import com.epmet.dto.form.ReCallEventFormDTO;
-import com.epmet.dto.form.ResiEventFormDTO;
 import com.epmet.dto.result.MyReportedResultDTO;
 import com.epmet.dto.result.ResiEventIdDTO;
 
+import java.util.List;
+
 /**
  * 居民报事表
  *

From 52d917f4b547ec8ea23d271682812f7c604c84f5 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 3 Aug 2021 15:25:54 +0800
Subject: [PATCH 12/84] =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E6=94=B9=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/form/EventListFormDTO.java  |  2 +-
 .../com/epmet/constant/EventConstant.java     | 17 ++++++++++
 .../com/epmet/controller/EventController.java | 23 -------------
 .../epmet/controller/ResiEventController.java | 32 ++++++++++++++++---
 .../service/impl/ResiEventServiceImpl.java    | 17 +++++++++-
 5 files changed, 61 insertions(+), 30 deletions(-)
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/EventConstant.java

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventListFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventListFormDTO.java
index 1815ecd434..699c6ada63 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventListFormDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventListFormDTO.java
@@ -19,7 +19,7 @@ public class EventListFormDTO implements Serializable {
     public interface EventListForm{}
 
     /**
-     * 报事列表类型【已处理：processed 	未处理：undisposed 	已办结：transferred】
+     * 报事列表类型【处理中：processed 	待处理：undisposed 	已办结：transferred】
      */
     @NotBlank(message = "报事列表类型不能为空",groups = EventListForm.class)
     private String eventType;
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/EventConstant.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/EventConstant.java
new file mode 100644
index 0000000000..8a63bba97b
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/EventConstant.java
@@ -0,0 +1,17 @@
+package com.epmet.constant;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/8/3 2:45 下午
+ * @DESC
+ */
+public interface EventConstant {
+
+    /**
+     * 【处理中：processed 	待处理：undisposed 	已办结：transferred】
+     */
+    String EVENT_PROCESSED = "processed";
+    String EVENT_UN_DISPOSED = "undisposed";
+    String EVENT_TRANSFERRED = "transferred";
+
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/EventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/EventController.java
index 062740b5d7..02f58c15ca 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/EventController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/EventController.java
@@ -25,29 +25,6 @@ public class EventController {
     @Autowired
     private ResiEventService resiEventService;
 
-    /**
-     * @Description  群众直报（待处理、处理中、已办结）列表
-     * @Param formDTO
-     * @author zxc
-     * @date 2021/8/3 10:53 上午
-     */
-    @PostMapping("eventlist")
-    public Result<List<EventListResultDTO>> eventList(@RequestBody EventListFormDTO formDTO){
-        ValidatorUtils.validateEntity(formDTO, EventListFormDTO.EventListForm.class);
-        return new Result<List<EventListResultDTO>>().ok(resiEventService.eventList(formDTO));
-    }
 
-    /**
-     * @Description  查看报事时,更新时间操作
-     * @Param formDTO
-     * @author zxc
-     * @date 2021/8/3 11:01 上午
-     */
-    @PostMapping("updateviewtime")
-    public Result updateViewTime(@RequestBody UpdateViewTimeFormDTO formDTO){
-        ValidatorUtils.validateEntity(formDTO, UpdateViewTimeFormDTO.UpdateViewTimeForm.class);
-        resiEventService.updateViewTime(formDTO);
-        return new Result();
-    }
 
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
index c04c99145c..4622d74927 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
@@ -19,16 +19,13 @@ package com.epmet.controller;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.dto.form.EventDetailFormDTO;
+import com.epmet.dto.form.*;
 import com.epmet.dto.result.EventDetailResultDTO;
 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.ChooseResolveFormDTO;
-import com.epmet.dto.form.MyReportedFormDTO;
-import com.epmet.dto.form.ReCallEventFormDTO;
-import com.epmet.dto.form.ResiEventFormDTO;
+import com.epmet.dto.result.EventListResultDTO;
 import com.epmet.dto.result.MyReportedResultDTO;
 import com.epmet.dto.result.ResiEventIdDTO;
 import com.epmet.service.ResiEventService;
@@ -133,4 +130,29 @@ public class ResiEventController {
         ValidatorUtils.validateEntity(formDTO,MyReportedFormDTO.AddUserInternalGroup.class);
         return new Result<List<MyReportedResultDTO>>().ok(resiEventService.queryMyReported(formDTO));
     }
+
+    /**
+     * @Description  群众直报（待处理、处理中、已办结）列表
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/8/3 10:53 上午
+     */
+    @PostMapping("eventlist")
+    public Result<List<EventListResultDTO>> eventList(@RequestBody EventListFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, EventListFormDTO.EventListForm.class);
+        return new Result<List<EventListResultDTO>>().ok(resiEventService.eventList(formDTO));
+    }
+
+    /**
+     * @Description  查看报事时,更新时间操作
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/8/3 11:01 上午
+     */
+    @PostMapping("updateviewtime")
+    public Result updateViewTime(@RequestBody UpdateViewTimeFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, UpdateViewTimeFormDTO.UpdateViewTimeForm.class);
+        resiEventService.updateViewTime(formDTO);
+        return new Result();
+    }
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index 2e55ca8228..321decec81 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -18,6 +18,7 @@
 package com.epmet.service.impl;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.constant.EventConstant;
 import com.epmet.dao.ResiEventDao;
 import com.epmet.dto.form.EventDetailFormDTO;
 import com.epmet.dto.form.EventListFormDTO;
@@ -34,6 +35,7 @@ import com.epmet.entity.ResiEventEntity;
 import com.epmet.service.ResiEventService;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -47,13 +49,26 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
 
     /**
      * @Description  群众直报（待处理、处理中、已办结）列表
+     *   未处理：按照创建时间正序；
+     *   处理中：按照最新操作时间由近到远排序；
+     *   已办结：按照办结时间由近到远排序；
      * @Param formDTO
      * @author zxc
      * @date 2021/8/3 10:53 上午
      */
     @Override
     public List<EventListResultDTO> eventList(EventListFormDTO formDTO) {
-        return null;
+        // 处理中
+        if (formDTO.getEventType().equals(EventConstant.EVENT_PROCESSED)){
+
+        // 待处理
+        }else if (formDTO.getEventType().equals(EventConstant.EVENT_UN_DISPOSED)){
+
+        // 已办结
+        }else if (formDTO.getEventType().equals(EventConstant.EVENT_TRANSFERRED)){
+
+        }
+        return new ArrayList<>();
     }
 
     /**

From ed46482948e0f6b4adc02033f37ac8ce75986d6e Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 3 Aug 2021 15:35:55 +0800
Subject: [PATCH 13/84] =?UTF-8?q?data-agg=EF=BC=9A=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=98=AF=E5=90=A6=E6=98=BE=E7=A4=BA@?=
 =?UTF-8?q?=E6=88=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../result/UserEventLogoResultDTO.java        | 28 +++++++++++++++
 .../data-aggregator-server/pom.xml            |  6 ++++
 .../controller/EpmetUserController.java       | 20 +++++++----
 .../dao/epmetuser/ResiUserBadgeDao.java       |  4 ++-
 .../dataaggre/dao/govproject/ProjectDao.java  |  2 ++
 .../service/epmetuser/EpmetUserService.java   | 10 ++++++
 .../epmetuser/impl/EpmetUserServiceImpl.java  | 36 ++++++++++++++++---
 .../service/govproject/GovProjectService.java | 10 ++++++
 .../impl/GovProjectServiceImpl.java           | 14 ++++++++
 .../mapper/epmetuser/ResiUserBadgeDao.xml     | 13 +++++++
 .../mapper/govproject/ProjectDao.xml          | 11 ++++++
 11 files changed, 142 insertions(+), 12 deletions(-)
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/UserEventLogoResultDTO.java

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/UserEventLogoResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/UserEventLogoResultDTO.java
new file mode 100644
index 0000000000..290845787b
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/UserEventLogoResultDTO.java
@@ -0,0 +1,28 @@
+package com.epmet.dataaggre.dto.epmetuser.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 人大代表个人中心，是否显示@me
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/8/3 15:01
+ */
+@Data
+public class UserEventLogoResultDTO implements Serializable {
+    private static final long serialVersionUID = 3232361347890014097L;
+    /**
+     * true:人大代表；false：不是人大代表；此列用来判断是否显示@我
+     */
+    private Boolean isNpc;
+    /**
+     * 展示红点：true；隐藏：false
+     */
+    private Boolean redDot;
+    public UserEventLogoResultDTO(){
+        this.isNpc=false;
+        this.redDot=false;
+    }
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml
index 6c2a9d38c6..184e00a313 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml
@@ -75,6 +75,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/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java
index 39a634fb76..fb08567037 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java
@@ -8,15 +8,10 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dataaggre.dto.epmetuser.form.OpenStaffDetailFormDTO;
-import com.epmet.dataaggre.dto.epmetuser.form.GridMemberStatsFormDTO;
 import com.epmet.dataaggre.dto.epmetuser.form.PatrolDateListFormDTO;
 import com.epmet.dataaggre.dto.epmetuser.form.PatrolRecordListFormDTO;
 import com.epmet.dataaggre.dto.epmetuser.form.StaffListFormDTO;
-import com.epmet.dataaggre.dto.epmetuser.result.OpenStaffDetailResultDTO;
-import com.epmet.dataaggre.dto.epmetuser.result.PatrolDateListResultDTO;
-import com.epmet.dataaggre.dto.epmetuser.result.PatrolRecordListResultDTO;
-import com.epmet.dataaggre.dto.epmetuser.result.PersonalPatrolListResultDTO;
-import com.epmet.dataaggre.dto.epmetuser.result.StaffListResultDTO;
+import com.epmet.dataaggre.dto.epmetuser.result.*;
 import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO;
 import com.epmet.dataaggre.service.datastats.DataStatsService;
 import com.epmet.dataaggre.service.epmetuser.EpmetUserService;
@@ -200,4 +195,17 @@ public class EpmetUserController {
     }
 
 
+    /**
+     * 我要报事-人大代表个人中心（尹） 是否显示@我，是否显示红点
+     *
+     * @param tokenDto
+     * @return  com.epmet.commons.tools.utils.Result<com.epmet.dataaggre.dto.epmetuser.result.UserEventLogoResultDTO>
+     * @author yinzuomei
+     * @date 2021/8/3 15:07
+     */
+    @PostMapping("mentionme")
+    public Result<UserEventLogoResultDTO> mentionMeEvent(@LoginUser TokenDto tokenDto){
+        return new Result<UserEventLogoResultDTO>().ok(epmetUserService.mentionMeEvent(tokenDto.getUserId()));
+    }
+
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/ResiUserBadgeDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/ResiUserBadgeDao.java
index 7d8765b542..cc12c17271 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/ResiUserBadgeDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/ResiUserBadgeDao.java
@@ -20,6 +20,7 @@ package com.epmet.dataaggre.dao.epmetuser;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dataaggre.entity.epmetuser.ResiUserBadgeEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 用户徽章关系表
@@ -29,5 +30,6 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface ResiUserBadgeDao extends BaseDao<ResiUserBadgeEntity> {
-	
+
+    ResiUserBadgeEntity selectUserByBadge(@Param("userId")String userId, @Param("badgeKey")String badgeKey);
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java
index cc3f3d9e7e..4697a0f267 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java
@@ -68,4 +68,6 @@ public interface ProjectDao extends BaseDao<ProjectEntity> {
     List<String> selectDepartmentNameList(ProjectDTO project);
 
     List<ProjectDistributionResultDTO> selectList(@Param("customerId") String customerId,@Param("list")List<String> issueIds);
+
+    int countRedDot(String userId);
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java
index 10f164c6a9..e1941c1c08 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java
@@ -86,4 +86,14 @@ public interface EpmetUserService {
      * @Author sun
      **/
     List<StaffRoleListResultDTO> getStaffRoleList(String customerId, String userId);
+    
+    /**
+     * 我要报事-人大代表个人中心（尹） 是否显示@我，是否显示红点
+     * 
+     * @param userId 
+     * @return  com.epmet.dataaggre.dto.epmetuser.result.UserEventLogoResultDTO
+     * @author yinzuomei 
+     * @date 2021/8/3 15:09
+     */
+    UserEventLogoResultDTO mentionMeEvent(String userId);
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
index 281f24cc6d..58ea59a3ee 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
@@ -3,11 +3,9 @@ package com.epmet.dataaggre.service.epmetuser.impl;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.DateUtils;
+import com.epmet.constant.BadgeConstant;
 import com.epmet.dataaggre.constant.DataSourceConstant;
-import com.epmet.dataaggre.dao.epmetuser.CustomerStaffDao;
-import com.epmet.dataaggre.dao.epmetuser.StaffPatrolRecordDao;
-import com.epmet.dataaggre.dao.epmetuser.StaffRoleDao;
-import com.epmet.dataaggre.dao.epmetuser.UserBaseInfoDao;
+import com.epmet.dataaggre.dao.epmetuser.*;
 import com.epmet.dataaggre.dto.epmetuser.CustomerStaffDTO;
 import com.epmet.dataaggre.dto.epmetuser.StaffPatrolDetailDTO;
 import com.epmet.dataaggre.dto.epmetuser.StaffPatrolRecordDTO;
@@ -19,17 +17,18 @@ import com.epmet.dataaggre.dto.epmetuser.result.*;
 import com.epmet.dataaggre.dto.govorg.CustomerAgencyDTO;
 import com.epmet.dataaggre.dto.govorg.CustomerGridDTO;
 import com.epmet.dataaggre.dto.govorg.result.GridStaffResultDTO;
+import com.epmet.dataaggre.entity.epmetuser.ResiUserBadgeEntity;
 import com.epmet.dataaggre.service.epmetuser.EpmetUserService;
 import com.epmet.dataaggre.service.epmetuser.StaffPatrolDetailService;
 import com.epmet.dataaggre.service.epmetuser.StaffPatrolRecordService;
 import com.epmet.dataaggre.service.govorg.GovOrgService;
+import com.epmet.dataaggre.service.govproject.GovProjectService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.math.BigDecimal;
 import java.text.NumberFormat;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -57,6 +56,10 @@ public class EpmetUserServiceImpl implements EpmetUserService {
     private StaffRoleDao staffRoleDao;
     @Resource
     private CustomerStaffDao customerStaffDao;
+    @Autowired
+    private ResiUserBadgeDao resiUserBadgeDao;
+    @Autowired
+    private GovProjectService govProjectService;
 
     /**
      * @Description  根据UserIds查询
@@ -374,5 +377,28 @@ public class EpmetUserServiceImpl implements EpmetUserService {
         return staffRoleDao.selectStaffRoleList(customerId, userId);
     }
 
+    /**
+     * 我要报事-人大代表个人中心（尹） 是否显示@我，是否显示红点
+     *
+     * @param userId
+     * @return com.epmet.dataaggre.dto.epmetuser.result.UserEventLogoResultDTO
+     * @author yinzuomei
+     * @date 2021/8/3 15:09
+     */
+    @Override
+    public UserEventLogoResultDTO mentionMeEvent(String userId) {
+        UserEventLogoResultDTO resultDTO = new UserEventLogoResultDTO();
+        ResiUserBadgeEntity resiUserBadgeEntity = resiUserBadgeDao.selectUserByBadge(userId, BadgeConstant.BADGE_KEY_NPC);
+        //是否是人大代表
+        if (null != resiUserBadgeEntity) {
+            resultDTO.setIsNpc(true);
+        }
+        //展示红点：true；隐藏：false
+        if(govProjectService.countRedDot(userId)>0){
+            resultDTO.setRedDot(true);
+        };
+        return resultDTO;
+    }
+
 
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java
index 38192cd035..35b0096790 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java
@@ -41,4 +41,14 @@ public interface GovProjectService {
 
 
     List<ProjectDistributionResultDTO> queryProjectDistribution(ProjectDistributionFormDTO formDTO);
+
+	/**
+	 * 查询resi_event_mention
+	 *
+	 * @param userId
+	 * @return  int
+	 * @author yinzuomei
+	 * @date 2021/8/3 15:27
+	 */
+	int countRedDot(String userId);
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java
index d48c31f2d7..2063b3f83d 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java
@@ -233,4 +233,18 @@ public class GovProjectServiceImpl implements GovProjectService {
 			throw new RenException("计算首次响应时间失败");
 		}
 	}
+
+	/**
+	 * 查询resi_event_mention
+	 *
+	 * @param userId
+	 * @return int
+	 * @author yinzuomei
+	 * @date 2021/8/3 15:27
+	 */
+	@Override
+	public int countRedDot(String userId) {
+		return projectDao.countRedDot(userId);
+	}
+
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/ResiUserBadgeDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/ResiUserBadgeDao.xml
index ba7b99c850..40e651d1e9 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/ResiUserBadgeDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/ResiUserBadgeDao.xml
@@ -3,4 +3,17 @@
 
 <mapper namespace="com.epmet.dataaggre.dao.epmetuser.ResiUserBadgeDao">
 
+    <select id="selectUserByBadge" parameterType="map" resultType="com.epmet.dataaggre.entity.epmetuser.ResiUserBadgeEntity">
+        SELECT
+            rub.*
+        FROM
+            resi_user_badge rub
+            INNER JOIN badge b ON ( rub.BADGE_ID = b.ID )
+        WHERE
+            rub.DEL_FLAG = '0'
+            AND b.DEL_FLAG = '0'
+            AND rub.USER_ID = #{userId}
+            AND b.BADGE_KEY = #{badgeKey}
+            AND rub.CERTIFICATION_AUTID_STATUS = 'approved'
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml
index d376938904..1e144e3420 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml
@@ -144,4 +144,15 @@
             </foreach>
             order by p.CREATED_TIME desc
     </select>
+
+    <select id="countRedDot" parameterType="java.lang.String" resultType="int">
+        SELECT
+            count(1) as total
+        FROM
+            resi_event_mention rem
+        WHERE
+            rem.DEL_FLAG = '0'
+            AND rem.RED_DOT = '1'
+            AND rem.USER_ID = #{userId}
+    </select>
 </mapper>
\ No newline at end of file

From a665b9f1e0f0a5b96e748aa797e5a67a87e469c3 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Tue, 3 Aug 2021 15:56:01 +0800
Subject: [PATCH 14/84] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=8A=A5?=
 =?UTF-8?q?=E4=BA=8B-=E5=8F=AF=E4=B8=8A=E6=8A=A5=E7=9A=84=E7=9B=AE?=
 =?UTF-8?q?=E6=A0=87=E7=BA=A7=E5=88=AB=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/enums/OrgLevelEnums.java   | 66 +++++++++++++++++++
 .../dto/form/ResiEventTargetLevelFormDTO.java | 18 +++++
 .../dto/result/ResiEventNpcResultDTO.java     |  2 +
 .../result/ResiEventTargetLevelResultDTO.java | 31 +++++++++
 .../epmet/controller/ResiEventController.java | 38 +++++++++--
 .../com/epmet/service/ResiEventService.java   | 10 +++
 .../service/impl/ResiEventServiceImpl.java    | 60 +++++++++++++++--
 7 files changed, 213 insertions(+), 12 deletions(-)
 create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/OrgLevelEnums.java
 create mode 100644 epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/form/ResiEventTargetLevelFormDTO.java
 create mode 100644 epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/result/ResiEventTargetLevelResultDTO.java

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/OrgLevelEnums.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/OrgLevelEnums.java
new file mode 100644
index 0000000000..00107ec8f5
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/OrgLevelEnums.java
@@ -0,0 +1,66 @@
+package com.epmet.enums;
+
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.Optional;
+
+/**
+ * @Description 入职级别枚举
+ * @author wxz
+ * @date 2021.08.03 14:29:01
+*/
+@Slf4j
+public enum OrgLevelEnums {
+
+    GRID("grid", "网格"),
+    COMMUNITY("community", "社区"),
+    STREET("street", "街道"),
+    DISTRICT("district", "区"),
+    CITY("city", "市"),
+    PROVINCE("province", "省"),
+
+    DEPARTMENT("department", "部门"),
+    ;
+
+    private String level;
+    private String levelName;
+
+    OrgLevelEnums(String level, String levelName) {
+        this.level = level;
+        this.levelName = levelName;
+    }
+
+    /**
+     * @Description 级别枚举对象
+     * @return
+     * @author wxz
+     * @date 2021.08.03 14:46
+    */
+    public static OrgLevelEnums getLevelObject(String level) {
+        for (OrgLevelEnums l :OrgLevelEnums.values()) {
+            if (l.getLevel().equals(level)) {
+                return l;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * @Description 级别中文名称
+     * @return
+     * @author wxz
+     * @date 2021.08.03 14:47
+    */
+    public static String getLevelName(String level) {
+        OrgLevelEnums levelObject = getLevelObject(level);
+        return levelObject == null ? null : levelObject.getLevelName();
+    }
+
+    public String getLevel() {
+        return level;
+    }
+
+    public String getLevelName() {
+        return levelName;
+    }
+}
diff --git a/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/form/ResiEventTargetLevelFormDTO.java b/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/form/ResiEventTargetLevelFormDTO.java
new file mode 100644
index 0000000000..62dfcf4327
--- /dev/null
+++ b/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/form/ResiEventTargetLevelFormDTO.java
@@ -0,0 +1,18 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Description 群众直报-上报目标级别查询
+ * @author wxz
+ * @date 2021.08.03 13:47:23
+*/
+@Data
+public class ResiEventTargetLevelFormDTO {
+
+    @NotBlank(message = "网格ID不能为空")
+    private String gridId;
+
+}
diff --git a/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/result/ResiEventNpcResultDTO.java b/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/result/ResiEventNpcResultDTO.java
index 6f285807ce..4208f28751 100644
--- a/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/result/ResiEventNpcResultDTO.java
+++ b/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/result/ResiEventNpcResultDTO.java
@@ -25,4 +25,6 @@ public class ResiEventNpcResultDTO {
     private String headImgUrl;
 
     private String agencyId;
+
+    private String pids;
 }
diff --git a/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/result/ResiEventTargetLevelResultDTO.java b/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/result/ResiEventTargetLevelResultDTO.java
new file mode 100644
index 0000000000..7a2b3ce29b
--- /dev/null
+++ b/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/result/ResiEventTargetLevelResultDTO.java
@@ -0,0 +1,31 @@
+package com.epmet.dto.result;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Description 群众直报目标层级Result
+ * @author wxz
+ * @date 2021.08.03 13:43:58
+*/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ResiEventTargetLevelResultDTO implements Comparable {
+
+    private String orgLevel;
+    private String levelName;
+    private String orgId;
+    private String orgPid;
+    private String orgPids;
+
+    //排序索引，用于排序
+    private Integer index;
+
+    @Override
+    public int compareTo(Object o) {
+        ResiEventTargetLevelResultDTO df = (ResiEventTargetLevelResultDTO) o;
+        return this.index.compareTo(df.getIndex());
+    }
+}
diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java
index fd316f0475..b594e42921 100644
--- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java
+++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java
@@ -3,7 +3,9 @@ package com.epmet.controller;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.ResiEventNpcListFormDTO;
+import com.epmet.dto.form.ResiEventTargetLevelFormDTO;
 import com.epmet.dto.result.ResiEventNpcResultDTO;
+import com.epmet.dto.result.ResiEventTargetLevelResultDTO;
 import com.epmet.service.ResiEventService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -11,13 +13,16 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.constraints.NotBlank;
+import java.util.HashMap;
 import java.util.List;
+import java.util.TreeSet;
 
 /**
- * @Description 群众直报/报事controller
  * @author wxz
+ * @Description 群众直报/报事controller
  * @date 2021.08.02 09:58:40
-*/
+ */
 @RestController
 @RequestMapping("resi-event")
 public class ResiEventController {
@@ -26,17 +31,38 @@ public class ResiEventController {
     private ResiEventService resiEventService;
 
     /**
-     * @Description 查询人大代表列表
      * @return
+     * @Description 查询人大代表列表
      * @author wxz
      * @date 2021.08.03 09:17
-    */
+     */
     @PostMapping("/npc-list-ingrid")
-    public Result<List<ResiEventNpcResultDTO>> listNpc(@RequestBody ResiEventNpcListFormDTO input) {
+    public Result<HashMap<String, List<ResiEventNpcResultDTO>>> listNpc(@RequestBody ResiEventNpcListFormDTO input) {
         ValidatorUtils.validateEntity(input);
         String gridId = input.getGridId();
         List<ResiEventNpcResultDTO> npcs = resiEventService.listNpcByGrid(gridId);
-        return new Result<List<ResiEventNpcResultDTO>>().ok(npcs);
+
+        HashMap<String, List<ResiEventNpcResultDTO>> wrapper = new HashMap<>();
+        wrapper.put("reportTargets", npcs);
+        return new Result<HashMap<String, List<ResiEventNpcResultDTO>>>().ok(wrapper);
+    }
+
+    /**
+     * @return
+     * @Description 查询上报目标列表
+     * @author wxz
+     * @date 2021.08.03 13:47
+     */
+    @PostMapping("/report-target-level-list")
+    public Result<HashMap> listReportTargetLevels(@RequestBody ResiEventTargetLevelFormDTO input) {
+        ValidatorUtils.validateEntity(input);
+        String gridId = input.getGridId();
+        TreeSet<ResiEventTargetLevelResultDTO> targetList = resiEventService.listReportTargetLevels(gridId);
+
+        HashMap<String, TreeSet<ResiEventTargetLevelResultDTO>> warpper = new HashMap<>();
+        warpper.put("reportTargets", targetList);
+
+        return new Result<HashMap>().ok(warpper);
     }
 
 }
diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java
index ec30ef44e8..b23d04a476 100644
--- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java
+++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java
@@ -1,8 +1,10 @@
 package com.epmet.service;
 
 import com.epmet.dto.result.ResiEventNpcResultDTO;
+import com.epmet.dto.result.ResiEventTargetLevelResultDTO;
 
 import java.util.List;
+import java.util.TreeSet;
 
 /**
  * @Description 报事service
@@ -17,4 +19,12 @@ public interface ResiEventService {
      * @date 2021.08.03 09:29
     */
     List<ResiEventNpcResultDTO> listNpcByGrid(String gridId);
+
+    /**
+     * @Description 查询上报目标列表
+     * @return
+     * @author wxz
+     * @date 2021.08.03 13:50
+    */
+    TreeSet<ResiEventTargetLevelResultDTO> listReportTargetLevels(String gridId);
 }
diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index b1871afb51..713d821588 100644
--- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -1,22 +1,25 @@
 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.feign.ResultDataResolver;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.BadgeConstant;
+import com.epmet.constant.OrgInfoConstant;
 import com.epmet.dto.form.ListUserByBadgeFormDTO;
-import com.epmet.dto.result.GridInfoResultDTO;
-import com.epmet.dto.result.ListUserByBadgeResultDTO;
-import com.epmet.dto.result.ResiEventNpcResultDTO;
+import com.epmet.dto.form.OrgInfoFormDTO;
+import com.epmet.dto.result.*;
+import com.epmet.enums.OrgLevelEnums;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.service.ResiEventService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * @author wxz
@@ -39,6 +42,7 @@ public class ResiEventServiceImpl implements ResiEventService, ResultDataResolve
         Result<GridInfoResultDTO> gridInfoResult = govOrgOpenFeignClient.queryGridInfo(gridId);
         GridInfoResultDTO gridInfoData = getResultDataOrThrowsException(gridInfoResult, ServiceConstant.GOV_ORG_SERVER, null, null);
         String parentAgencyId = gridInfoData.getParentAgencyId();
+        String pids = gridInfoData.getPids();
 
         //查询人大代表列表
         ListUserByBadgeFormDTO npcForm = new ListUserByBadgeFormDTO(gridId, BadgeConstant.BADGE_KEY_NPC);
@@ -46,9 +50,53 @@ public class ResiEventServiceImpl implements ResiEventService, ResultDataResolve
         List<ListUserByBadgeResultDTO> npcData = getResultDataOrThrowsException(npcResult, ServiceConstant.EPMET_USER_SERVER, null, null);
 
         List<ResiEventNpcResultDTO> npcResultList = npcData.stream()
-                .map(npc -> new ResiEventNpcResultDTO(npc.getUserId(), gridId, "人大代表-".concat(npc.getRealName()), npc.getHeadImgUrl(), parentAgencyId))
+                .map(npc -> new ResiEventNpcResultDTO(npc.getUserId(), gridId, "人大代表-".concat(npc.getRealName()), npc.getHeadImgUrl(), parentAgencyId, pids))
                 .collect(Collectors.toList());
 
         return npcResultList;
     }
+
+    /**
+     * @Description 此处会调用org上游接口批量获取父级组织信息，由于上游接口排序不可控，因此此处需要使用TreeSet做排序
+     * @return
+     * @author wxz
+     * @date 2021.08.03 15:51
+    */
+    @Override
+    public TreeSet<ResiEventTargetLevelResultDTO> listReportTargetLevels(String gridId) {
+        TreeSet<ResiEventTargetLevelResultDTO> targetLevels = new TreeSet<>();
+
+        Result<GridInfoResultDTO> gridInfoResult = govOrgOpenFeignClient.queryGridInfo(gridId);
+        GridInfoResultDTO gridInfoData = getResultDataOrThrowsException(gridInfoResult, ServiceConstant.GOV_ORG_SERVER, null, null);
+        String pidsPath = gridInfoData.getPids();
+        List<String> parentOrgIds = Arrays.asList(pidsPath.split(":"));
+        // 翻转列表
+        Collections.reverse(parentOrgIds);
+
+        // 一.网格信息(只有一条，但是为了适应接口，组装成了列表)
+        List<String> currentGridId = Arrays.asList(gridId);
+        Result<List<OrgInfoResultDTO>> currentGridInfoResult = govOrgOpenFeignClient.selectOrgInfo(new OrgInfoFormDTO(OrgInfoConstant.GRID, currentGridId));
+        List<OrgInfoResultDTO> currentGridInfos = getResultDataOrThrowsException(currentGridInfoResult, ServiceConstant.GOV_ORG_SERVER, null, null);
+        OrgInfoResultDTO currentGridInfo = currentGridInfos.get(0);
+
+        // 因为上游接口的值对应问题，这里只好做一个适配，拼接起来，希望上游代码不要再改了...
+        String pids = currentGridInfo.getPids().concat(":").concat(currentGridInfo.getAgencyId());
+        // 父ID列表的index排序字段是从0开始，网格要排在他们前面，则网格的index为-1
+        targetLevels.add(new ResiEventTargetLevelResultDTO(OrgLevelEnums.GRID.getLevel(), OrgLevelEnums.GRID.getLevelName(), currentGridInfo.getOrgId(), currentGridInfo.getAgencyId(), pids, -1));
+
+        // 二.父级组织信息
+        Result<List<OrgInfoResultDTO>> parentOrgInfoResult = govOrgOpenFeignClient.selectOrgInfo(new OrgInfoFormDTO(OrgInfoConstant.AGENCY, parentOrgIds));
+        List<OrgInfoResultDTO> parentOrgInfos = getResultDataOrThrowsException(parentOrgInfoResult, ServiceConstant.GOV_ORG_SERVER, null, null);
+        parentOrgInfos.forEach(porg -> {
+            String levelName = OrgLevelEnums.getLevelName(porg.getLevel());
+            if (StringUtils.isBlank(levelName)) {
+                throw new RenException(String.format("根据级别%s没有找到对应的组织级别枚举", porg.getLevel()));
+            }
+            //parentOrgIds.indexOf(porg.getOrgId()为当前orgId在pids中的位置，得到之后，赋值给index字段，treeset会利用这个字段进行排序
+            ResiEventTargetLevelResultDTO pLevel = new ResiEventTargetLevelResultDTO(porg.getLevel(), levelName, porg.getOrgId(), porg.getPid(), porg.getPids(), parentOrgIds.indexOf(porg.getOrgId()));
+            targetLevels.add(pLevel);
+        });
+
+        return targetLevels;
+    }
 }

From f9ac0ce789b4cb20bd39034225bc3ff8f8032d21 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Tue, 3 Aug 2021 16:29:16 +0800
Subject: [PATCH 15/84] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E6=8A=A5=E4=BA=8B=E6=96=87=E4=BB=B6=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/controller/OssController.java   | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java
index 4914a71cfc..4fc64984c9 100644
--- a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java
+++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java
@@ -22,6 +22,7 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AliyunGroup;
 import com.epmet.commons.tools.validator.group.QcloudGroup;
 import com.epmet.commons.tools.validator.group.QiniuGroup;
+import com.epmet.constants.PrivacyType;
 import com.epmet.dto.UploadDTO;
 import com.epmet.dto.form.RemoveFileFormDTO;
 import com.epmet.dto.result.UploadImgResultDTO;
@@ -373,4 +374,31 @@ public class OssController {
 		return ossService.uploadImgV2(file, null, customerId);
 	}
 
+	/**
+	 * @Description 上传报事文件(目前只有图片)
+	 * @return
+	 * @author wxz
+	 * @date 2021.08.03 16:23
+	*/
+	@PostMapping("upload-resi-event-file")
+	public Result<UploadImgResultDTO> uploadResiEventFile(@RequestPart(value = "file") MultipartFile file, @RequestParam("customerId") String customerId) {
+
+		// 体积限制
+		int sizeMb = 10;
+		int sizeThreshold = sizeMb * 1024 * 1024; // 大小限制10m
+		if (file.getSize() > sizeThreshold) {
+			throw new RenException(EpmetErrorCode.OPER_UPLOAD_FILE_OVER_SIZE.getCode(),
+					EpmetErrorCode.OPER_UPLOAD_FILE_OVER_SIZE.getMsg().concat("，限制在").concat(String.valueOf(sizeMb)).concat("M以内"));
+		}
+
+		// 格式限制，只允许png和jpeg
+		if (!MediaType.IMAGE_PNG_VALUE.equals(file.getContentType())
+				&& !MediaType.IMAGE_JPEG_VALUE.equals(file.getContentType())) {
+			throw new RenException(EpmetErrorCode.OPER_UPLOAD_FILE_TYPE_ERROR.getCode()
+					, EpmetErrorCode.OPER_UPLOAD_FILE_TYPE_ERROR.getMsg());
+		}
+
+		return ossService.uploadImgV2(file, PrivacyType.EXTERNAL, customerId);
+	}
+
 }

From 379eb16df784e1bc8104ea92b3821cbd0dcde621 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 3 Aug 2021 17:10:29 +0800
Subject: [PATCH 16/84] =?UTF-8?q?=E6=8A=A5=E4=BA=8B=EF=BC=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/form/MentionUserFormDTO.java    |  35 ++++++
 .../com/epmet/dto/form/ReportOrgFormDTO.java  |  34 +++++
 .../com/epmet/dto/form/ResiEventFormDTO.java  |  51 ++++++++
 .../com/epmet/constant/EventConstant.java     |   3 +
 .../com/epmet/constant/ResiEventAction.java   |  61 +++++++++
 .../epmet/controller/ResiEventController.java |  10 +-
 .../service/impl/ResiEventServiceImpl.java    | 117 +++++++++++++++---
 7 files changed, 291 insertions(+), 20 deletions(-)
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MentionUserFormDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReportOrgFormDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ResiEventAction.java

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MentionUserFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MentionUserFormDTO.java
new file mode 100644
index 0000000000..b142456c3d
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MentionUserFormDTO.java
@@ -0,0 +1,35 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 被艾特的人
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/8/3 15:51
+ */
+@Data
+public class MentionUserFormDTO implements Serializable {
+
+    /**
+     * 人大代表用户id
+     */
+    private String npcUserId;
+
+    /**
+     * 人大代表注册网格id
+     */
+    private String gridId;
+
+    /**
+     * 人大代表注册网格所属社区id
+     */
+    private String agencyId;
+
+    /**
+     * 注册网格的所有上级
+     */
+    private String pids;
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReportOrgFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReportOrgFormDTO.java
new file mode 100644
index 0000000000..453ce8d382
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReportOrgFormDTO.java
@@ -0,0 +1,34 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 报给谁？
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/8/3 15:51
+ */
+@Data
+public class ReportOrgFormDTO implements Serializable {
+    /**
+     * 报给？： 网格：grid； 社区：community； 乡（镇、街道）级:street； 区县级: district； 市级: city； 省级:province。
+     */
+    private String orgType;
+
+    /**
+     * 报给的组织或者网格id
+     */
+    private String orgId;
+
+    /**
+     * org_id的上级组织id，org_id是跟组织，此列为0
+     */
+    private String orgPid;
+
+    /**
+     * org_id的所有上级组织id，org_id是跟组织，此列为0
+     */
+    private String orgPids;
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventFormDTO.java
index 83d96502ae..b0d1f4ff99 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventFormDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventFormDTO.java
@@ -1,9 +1,14 @@
 package com.epmet.dto.form;
 
+import com.epmet.commons.tools.dto.form.FileCommonDTO;
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
+import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 我要报事-提交（尹）
@@ -17,6 +22,52 @@ public class ResiEventFormDTO implements Serializable {
 
     public interface AddUserInternalGroup {
     }
+    public interface AddUserShowGroup extends CustomerClientShowGroup {
+    }
+
+    /**
+     * 用户所在网格id
+     */
+    @NotBlank(message = "不能为空",groups = AddUserInternalGroup.class)
+    private String gridId;
+
+    /**
+     * 事件内容，最多1000
+     */
+    @Length(min = 1, max = 1000, message = "请填写内容,最多输入1000字", groups = AddUserShowGroup.class)
+    private String eventContent;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 地址
+     */
+    @NotBlank(message = "地址不能为空",groups = AddUserShowGroup.class)
+    private String address;
+
+    /**
+     * 附件列表
+     */
+    private List<FileCommonDTO>  attachmentList;
+    /**
+     * @的人
+     */
+    private List<MentionUserFormDTO> npcUserList;
+
+    /**
+     * 报给谁？
+     */
+    @NotEmpty(message = "不能为空",groups = AddUserInternalGroup.class)
+    private List<ReportOrgFormDTO> orgList;
+
 
 
     //以下参数从token中获取
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/EventConstant.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/EventConstant.java
index 8a63bba97b..112ad2fa36 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/EventConstant.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/EventConstant.java
@@ -14,4 +14,7 @@ public interface EventConstant {
     String EVENT_UN_DISPOSED = "undisposed";
     String EVENT_TRANSFERRED = "transferred";
 
+    String EVENT_STATUS_PROCESSING="processing";
+    String READ="read";
+    String UN_READ="un_read";
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ResiEventAction.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ResiEventAction.java
new file mode 100644
index 0000000000..f525143772
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ResiEventAction.java
@@ -0,0 +1,61 @@
+package com.epmet.constant;
+
+import com.epmet.commons.tools.constant.StrConstant;
+
+/**
+ * resi_event_operation_log事件操作日志枚举类
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/8/3 16:38
+ */
+public enum ResiEventAction {
+    // 1、发布事件：publish；
+    // 2、撤回事件：recall；
+    // 3、复：reply；
+    // 4、立项：shift_project；
+    // 5、办结：close_case;
+    // 6、选择是否已解决：choose_resolve;
+    // 7、查看阅读事件：read：人大代表未读=>已读；工作人员待处理=>处理中；
+     PUBLISH ( "publish",""),
+     RECALL( "recall",""),
+     REPLY ("reply",""),
+     SHIFIT_PROJECT ( "shift_project",""),
+     CLOSE_CASE ( "close_case",""),
+     CHOOSE_RESOLVE ( "choose_resolve",""),
+     READ( "read","");
+
+
+    private String code;
+    private String desc;
+
+    ResiEventAction(String code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public static String getDesc(String code) {
+        ResiEventAction[] businessModeEnums = values();
+        for (ResiEventAction resiEventAction : businessModeEnums) {
+            if (resiEventAction.getCode()==code) {
+                return resiEventAction.getDesc();
+            }
+        }
+        return StrConstant.EPMETY_STR;
+    }
+
+    public String getCode(){
+        return this.code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getDesc(){
+        return this.desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
index 4622d74927..c1b9818a91 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
@@ -17,14 +17,12 @@
 
 package com.epmet.controller;
 
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.dto.form.*;
-import com.epmet.dto.result.EventDetailResultDTO;
 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.*;
+import com.epmet.dto.result.EventDetailResultDTO;
 import com.epmet.dto.result.EventListResultDTO;
 import com.epmet.dto.result.MyReportedResultDTO;
 import com.epmet.dto.result.ResiEventIdDTO;
@@ -70,11 +68,11 @@ public class ResiEventController {
      * @author yinzuomei
      * @date 2021/8/3 10:46
      */
+    @PostMapping("report")
     public Result<ResiEventIdDTO> report(@LoginUser TokenDto tokenDto, @RequestBody ResiEventFormDTO formDTO){
         formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setUserId(tokenDto.getUserId());
-        //校验参数
-        //todo
+        ValidatorUtils.validateEntity(formDTO,ResiEventFormDTO.AddUserShowGroup.class,ResiEventFormDTO.AddUserInternalGroup.class);
         return new Result<ResiEventIdDTO>().ok(resiEventService.report(formDTO));
     }
 
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index 321decec81..4855a76fa8 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -18,25 +18,36 @@
 package com.epmet.service.impl;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.StrConstant;
+import com.epmet.commons.tools.dto.form.FileCommonDTO;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.scan.param.ImgScanParamDTO;
+import com.epmet.commons.tools.scan.param.ImgTaskDTO;
+import com.epmet.commons.tools.scan.param.TextScanParamDTO;
+import com.epmet.commons.tools.scan.param.TextTaskDTO;
+import com.epmet.commons.tools.scan.result.SyncScanResult;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.utils.ScanContentUtils;
 import com.epmet.constant.EventConstant;
 import com.epmet.dao.ResiEventDao;
-import com.epmet.dto.form.EventDetailFormDTO;
-import com.epmet.dto.form.EventListFormDTO;
-import com.epmet.dto.form.UpdateViewTimeFormDTO;
-import com.epmet.dto.result.EventDetailResultDTO;
-import com.epmet.dto.result.EventListResultDTO;
-import com.epmet.dto.form.ChooseResolveFormDTO;
-import com.epmet.dto.form.MyReportedFormDTO;
-import com.epmet.dto.form.ReCallEventFormDTO;
-import com.epmet.dto.form.ResiEventFormDTO;
-import com.epmet.dto.result.MyReportedResultDTO;
-import com.epmet.dto.result.ResiEventIdDTO;
+import com.epmet.dto.form.*;
+import com.epmet.dto.result.*;
 import com.epmet.entity.ResiEventEntity;
+import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.service.ResiEventService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
+import java.util.UUID;
 
 /**
  * 居民报事表
@@ -44,8 +55,18 @@ import java.util.List;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-08-03
  */
+@Slf4j
 @Service
 public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEventEntity> implements ResiEventService {
+    @Value("${openapi.scan.server.url}")
+    private String scanApiUrl;
+    @Value("${openapi.scan.method.textSyncScan}")
+    private String textSyncScanMethod;
+    @Value("${openapi.scan.method.imgSyncScan}")
+    private String imgSyncScanMethod;
+    @Autowired
+    private GovOrgOpenFeignClient govOrgOpenFeignClient;
+
 
     /**
      * @Description  群众直报（待处理、处理中、已办结）列表
@@ -102,15 +123,83 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
      */
     @Override
     public ResiEventIdDTO report(ResiEventFormDTO formDTO) {
+        //1、事件内容审核
+        //2、图片审核
+        this.scanContent(formDTO.getEventContent(), formDTO.getAttachmentList());
+        //3、查询当前所在网格的信息
+        Result<GridInfoResultDTO> gridInfoRes=govOrgOpenFeignClient.queryGridInfo(formDTO.getGridId());
+        if(!gridInfoRes.success()||null==gridInfoRes.getData()){
+            throw new RenException("网格信息查询异常");
+        }
+        ResiEventEntity resiEventEntity= ConvertUtils.sourceToTarget(formDTO,ResiEventEntity.class);
+        resiEventEntity.setAgencyId(gridInfoRes.getData().getParentAgencyId());
+        resiEventEntity.setPids(gridInfoRes.getData().getPids());
+        resiEventEntity.setReportUserId(formDTO.getUserId());
         //todo
-
-
-
+        resiEventEntity.setIsParty("?????");
+        resiEventEntity.setStatus(EventConstant.EVENT_STATUS_PROCESSING);
+        resiEventEntity.setShiftProject(false);
+        resiEventEntity.setProjectId(StrConstant.EPMETY_STR);
+        resiEventEntity.setRecallFlag(false);
+        resiEventEntity.setReadFlag(false);
+        resiEventEntity.setRedDot(false);
+        resiEventEntity.setLatestOperatedTime(new Date());
+        resiEventEntity.setCreatedTime(resiEventEntity.getLatestOperatedTime());
+        resiEventEntity.setUpdatedTime(resiEventEntity.getLatestOperatedTime());
+        baseDao.insert(resiEventEntity);
+        //4、插入主表resi_event
+        //5、插入附件表
+        //6、插入组织表
+        //7、插入艾特人表
+        //8、插入log日志
 
 
         return null;
     }
 
+    private void scanContent(String eventContent, List<FileCommonDTO> attachmentList) {
+        //事件内容
+        if (StringUtils.isNotBlank(eventContent)) {
+            TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
+            TextTaskDTO taskDTO = new TextTaskDTO();
+            taskDTO.setContent(eventContent);
+            taskDTO.setDataId(UUID.randomUUID().toString().replace("-", ""));
+            textScanParamDTO.getTasks().add(taskDTO);
+            Result<SyncScanResult> textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO);
+            if (!textSyncScanResult.success()) {
+                throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
+            } else {
+                if (!textSyncScanResult.getData().isAllPass()) {
+                    throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode(), EpmetErrorCode.TEXT_SCAN_FAILED.getMsg());
+                }
+            }
+        }
+        List<String> imgList=new ArrayList<>();
+        for(FileCommonDTO fileCommonDTO:attachmentList){
+            if("image".equals(fileCommonDTO.getType())){
+                imgList.add(fileCommonDTO.getUrl());
+            }
+        }
+        //事件图片
+        if (!CollectionUtils.isEmpty(imgList)) {
+            ImgScanParamDTO imgScanParamDTO = new ImgScanParamDTO();
+            imgList.forEach(imgUrl -> {
+                ImgTaskDTO task = new ImgTaskDTO();
+                task.setDataId(UUID.randomUUID().toString().replace("-", ""));
+                task.setUrl(imgUrl);
+                imgScanParamDTO.getTasks().add(task);
+            });
+            Result<SyncScanResult> imgScanResult = ScanContentUtils.imgSyncScan(scanApiUrl.concat(imgSyncScanMethod), imgScanParamDTO);
+            if (!imgScanResult.success()) {
+                throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
+            } else {
+                if (!imgScanResult.getData().isAllPass()) {
+                    throw new RenException(EpmetErrorCode.IMG_SCAN_FAILED.getCode(), EpmetErrorCode.IMG_SCAN_FAILED.getMsg());
+                }
+            }
+        }
+    }
+
     /**
      * 撤回事件
      *

From 5437d7a12feda8d9c3a6a9fec1d5a0cfa0f2579f Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 3 Aug 2021 17:16:15 +0800
Subject: [PATCH 17/84] =?UTF-8?q?resi=5Fevent=E6=96=B0=E5=A2=9Eclose=5Fcas?=
 =?UTF-8?q?e=5Ftime=E5=8A=9E=E7=BB=93=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/entity/ResiEventEntity.java      | 5 +++++
 .../db/migration/V0.0.16__create_resievent_tables.sql        | 1 +
 2 files changed, 6 insertions(+)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventEntity.java
index 34ae10cd86..a142881c1d 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventEntity.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventEntity.java
@@ -93,6 +93,11 @@ public class ResiEventEntity extends BaseEpmetEntity {
      */
 	private String status;
 
+	/**
+	 * 办结时间
+	 */
+	private Date closeCaseTime;
+
     /**
      * 1：已转项目；0：未转项目；默认0
      */
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql
index f753c01e22..67f600d311 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql
@@ -11,6 +11,7 @@ CREATE TABLE `resi_event` (
   `LONGITUDE` varchar(32) DEFAULT NULL COMMENT '经度',
   `ADDRESS` varchar(255) NOT NULL COMMENT '地址',
   `STATUS` varchar(32) NOT NULL COMMENT '处理中：processing；已办结：closed_case',
+  `close_case_time` datetime DEFAULT NULL COMMENT '办结时间',
   `SHIFT_PROJECT` tinyint(1) NOT NULL DEFAULT '0' COMMENT '1：已转项目；0：未转项目；默认0',
   `PROJECT_ID` varchar(64) DEFAULT NULL COMMENT '项目id;shift_project=1时，此列有值',
   `RECALL_FLAG` tinyint(1) NOT NULL DEFAULT '0' COMMENT '1:已撤回；0：未撤回正常展示；默认0',

From 6c040539f9a2bb14c23b99c1a7b6e71ab81746d4 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 3 Aug 2021 17:28:09 +0800
Subject: [PATCH 18/84] =?UTF-8?q?resi=5Fevent=E4=BF=AE=E6=94=B9is=5Fparty?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=BAtinyint(1)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/entity/ResiEventEntity.java  | 2 +-
 .../com/epmet/service/impl/ResiEventServiceImpl.java     | 9 ++++++++-
 .../db/migration/V0.0.16__create_resievent_tables.sql    | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventEntity.java
index a142881c1d..f00dab5a06 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventEntity.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventEntity.java
@@ -66,7 +66,7 @@ public class ResiEventEntity extends BaseEpmetEntity {
     /**
      * 1：党员；0：不是党员；默认0
      */
-	private String isParty;
+	private Boolean isParty;
 
     /**
      * 事件内容
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index 4855a76fa8..ca685464b8 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -35,6 +35,7 @@ import com.epmet.dao.ResiEventDao;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.ResiEventEntity;
+import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.service.ResiEventService;
 import lombok.extern.slf4j.Slf4j;
@@ -66,6 +67,8 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
     private String imgSyncScanMethod;
     @Autowired
     private GovOrgOpenFeignClient govOrgOpenFeignClient;
+    @Autowired
+    private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
 
 
     /**
@@ -136,7 +139,11 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
         resiEventEntity.setPids(gridInfoRes.getData().getPids());
         resiEventEntity.setReportUserId(formDTO.getUserId());
         //todo
-        resiEventEntity.setIsParty("?????");
+        Result<Boolean> partyRes=epmetUserOpenFeignClient.selectIsPartyMemberByUserId(formDTO.getUserId());
+        if(!partyRes.success()||null==partyRes.getData()){
+            throw new RenException("查询用户是否是党员异常");
+        }
+        resiEventEntity.setIsParty(partyRes.getData());
         resiEventEntity.setStatus(EventConstant.EVENT_STATUS_PROCESSING);
         resiEventEntity.setShiftProject(false);
         resiEventEntity.setProjectId(StrConstant.EPMETY_STR);
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql
index 67f600d311..90cc434e75 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql
@@ -5,7 +5,7 @@ CREATE TABLE `resi_event` (
   `AGENCY_ID` varchar(64) NOT NULL COMMENT '居民端用户所在网格的所属组织',
   `PIDS` varchar(64) NOT NULL COMMENT '居民端用户所在网格的所有上级组织，包含AGENCY_ID',
   `REPORT_USER_ID` varchar(64) NOT NULL COMMENT '报事的人',
-  `IS_PARTY` varchar(1) NOT NULL DEFAULT '0' COMMENT '1：党员；0：不是党员；默认0',
+  `IS_PARTY` tinyint(1) NOT NULL DEFAULT '0' COMMENT '1：党员；0：不是党员；默认0',
   `EVENT_CONTENT` varchar(1024) NOT NULL COMMENT '事件内容',
   `LATITUDE` varchar(32) DEFAULT NULL COMMENT '纬度',
   `LONGITUDE` varchar(32) DEFAULT NULL COMMENT '经度',

From e24c661d2acb8c94eb327aa9a72d1b453fd23d55 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 3 Aug 2021 17:38:03 +0800
Subject: [PATCH 19/84] =?UTF-8?q?=E5=92=8C=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/result/EventListResultDTO.java  |  2 +-
 .../main/java/com/epmet/dao/ResiEventDao.java | 13 ++++++
 .../service/impl/ResiEventServiceImpl.java    | 12 ++----
 .../main/resources/mapper/ResiEventDao.xml    | 41 ++++++++++++++++++-
 4 files changed, 56 insertions(+), 12 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventListResultDTO.java
index 94853b80d1..23ecd11982 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventListResultDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventListResultDTO.java
@@ -18,7 +18,7 @@ public class EventListResultDTO implements Serializable {
     /**
      * 报事标题
      */
-    private String eventTitle;
+    private String eventContent;
 
     /**
      * 报事时间
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java
index c1312cb0d9..1f5bc47f00 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java
@@ -18,8 +18,12 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.result.EventListResultDTO;
 import com.epmet.entity.ResiEventEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 居民报事表
@@ -29,5 +33,14 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface ResiEventDao extends BaseDao<ResiEventEntity> {
+
+    /**
+     * @Description  查询报事列表
+     * @Param orgId
+     * @Param eventType
+     * @author zxc
+     * @date 2021/8/3 4:21 下午
+     */
+    List<EventListResultDTO> eventUnDisposedList(@Param("orgId")String orgId,@Param("eventType")String eventType);
 	
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index ca685464b8..6df99a2e62 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -82,15 +82,9 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
      */
     @Override
     public List<EventListResultDTO> eventList(EventListFormDTO formDTO) {
-        // 处理中
-        if (formDTO.getEventType().equals(EventConstant.EVENT_PROCESSED)){
-
-        // 待处理
-        }else if (formDTO.getEventType().equals(EventConstant.EVENT_UN_DISPOSED)){
-
-        // 已办结
-        }else if (formDTO.getEventType().equals(EventConstant.EVENT_TRANSFERRED)){
-
+        List<EventListResultDTO> result = baseDao.eventUnDisposedList(formDTO.getOrgId(), formDTO.getEventType());
+        if (!CollectionUtils.isEmpty(result)){
+            return result;
         }
         return new ArrayList<>();
     }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
index 21c7a902d7..f971e92473 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
@@ -3,6 +3,43 @@
 
 <mapper namespace="com.epmet.dao.ResiEventDao">
 
-
-
+    <!-- 查询报事列表 -->
+    <resultMap id="eventUnDisposedListMap" type="com.epmet.dto.result.EventListResultDTO">
+        <result property="eventContent" column="eventContent"/>
+        <result property="eventId" column="eventId"/>
+        <result property="eventTime" column="eventTime"/>
+        <result property="isProject" column="isProject"/>
+        <result property="redDot" column="redDot"/>
+        <collection property="eventImgs" ofType="java.lang.String">
+            <result column="img"/>
+        </collection>
+    </resultMap>
+    <select id="eventUnDisposedList" resultMap="eventUnDisposedListMap">
+        SELECT IFNULL(rea.ATTACHMENT_URL,'') AS img,t.* FROM
+        (SELECT
+        re.EVENT_CONTENT AS eventContent,
+        IFNULL(DATE_FORMAT(re.CREATED_TIME,'%Y-%m-%d %H:%i:%s'),'') AS eventTime,
+        re.ID AS eventId,
+        (CASE WHEN re.SHIFT_PROJECT = 1 THEN TRUE ELSE FALSE END) AS isProject,
+        (CASE WHEN ro.RED_DOT = 1 THEN TRUE ELSE FALSE END) AS redDot
+        FROM resi_event_report_org ro
+        INNER JOIN resi_event re ON (ro.RESI_EVENT_ID = re.ID AND re.DEL_FLAG = '0')
+        AND ro.DEL_FLAG = '0'
+        <if test='eventType == "undisposed" '>
+            AND ro.ORG_READ = 'un_read'
+            ORDER BY re.CREATED_TIME
+        </if>
+        <if test='eventType == "processed" '>
+            AND ro.ORG_READ = 'read'
+            AND re.`STATUS` = 'processing'
+            ORDER BY re.LATEST_OPERATED_TIME
+        </if>
+        <if test='eventType == "transferred" '>
+            AND ro.ORG_READ = 'read'
+            AND re.`STATUS` = 'closed_case'
+            ORDER BY re.CLOSE_CASE_TIME
+        </if>
+        )t
+        LEFT JOIN resi_event_attachment rea ON (rea.RESI_EVENT_ID = t.eventId AND rea.DEL_FLAG = '0' AND rea.ATTACHMENT_TYPE = 'image' AND (rea.SORT = 0 OR rea.SORT = 1 OR rea.SORT = 2))
+    </select>
 </mapper>
\ No newline at end of file

From e9ba326edeeea25f23d3dac5dd8a3f283ea3ecd2 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 3 Aug 2021 17:39:38 +0800
Subject: [PATCH 20/84] hebing

---
 .../service/impl/ResiEventServiceImpl.java    | 29 +++++++++++++++++--
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index ca685464b8..52a188fdde 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -31,9 +31,11 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.ScanContentUtils;
 import com.epmet.constant.EventConstant;
+import com.epmet.dao.ResiEventAttachmentDao;
 import com.epmet.dao.ResiEventDao;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
+import com.epmet.entity.ResiEventAttachmentEntity;
 import com.epmet.entity.ResiEventEntity;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
@@ -69,7 +71,8 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
     private GovOrgOpenFeignClient govOrgOpenFeignClient;
     @Autowired
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
-
+    @Autowired
+    private ResiEventAttachmentDao resiEventAttachmentDao;
 
     /**
      * @Description  群众直报（待处理、处理中、已办结）列表
@@ -138,7 +141,6 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
         resiEventEntity.setAgencyId(gridInfoRes.getData().getParentAgencyId());
         resiEventEntity.setPids(gridInfoRes.getData().getPids());
         resiEventEntity.setReportUserId(formDTO.getUserId());
-        //todo
         Result<Boolean> partyRes=epmetUserOpenFeignClient.selectIsPartyMemberByUserId(formDTO.getUserId());
         if(!partyRes.success()||null==partyRes.getData()){
             throw new RenException("查询用户是否是党员异常");
@@ -153,9 +155,13 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
         resiEventEntity.setLatestOperatedTime(new Date());
         resiEventEntity.setCreatedTime(resiEventEntity.getLatestOperatedTime());
         resiEventEntity.setUpdatedTime(resiEventEntity.getLatestOperatedTime());
-        baseDao.insert(resiEventEntity);
         //4、插入主表resi_event
+        baseDao.insert(resiEventEntity);
         //5、插入附件表
+        List<ResiEventAttachmentEntity> attachmentEntityList=getAttList(formDTO.getCustomerId(),resiEventEntity.getId(),formDTO.getAttachmentList());
+        attachmentEntityList.forEach(attachmentEntity->{
+            resiEventAttachmentDao.insert(attachmentEntity);
+        });
         //6、插入组织表
         //7、插入艾特人表
         //8、插入log日志
@@ -164,6 +170,23 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
         return null;
     }
 
+    private List<ResiEventAttachmentEntity> getAttList(String customerId,String resiEventId, List<FileCommonDTO> attachmentList) {
+        List<ResiEventAttachmentEntity> list=new ArrayList<>();
+        int sort=1;
+        for(FileCommonDTO img:attachmentList){
+            ResiEventAttachmentEntity entity=new ResiEventAttachmentEntity();
+            entity.setCustomerId(customerId);
+            entity.setResiEventId(resiEventId);
+            entity.setAttachmentName(img.getName());
+            entity.setAttachmentFormat(img.getFormat());
+            entity.setAttachmentType(img.getType());
+            entity.setAttachmentUrl(img.getUrl());
+            entity.setSort(sort);
+            sort++;
+        }
+        return list;
+    }
+
     private void scanContent(String eventContent, List<FileCommonDTO> attachmentList) {
         //事件内容
         if (StringUtils.isNotBlank(eventContent)) {

From 30807755a46a207114e99cb4f95ea3d3efa372ea Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 4 Aug 2021 09:11:53 +0800
Subject: [PATCH 21/84] =?UTF-8?q?=E6=8A=A5=E4=BA=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/exception/EpmetErrorCode.java       |   3 +
 .../com/epmet/constant/EventConstant.java     |  26 ++++
 .../epmet/controller/ResiEventController.java |   3 +
 .../main/java/com/epmet/dao/ResiEventDao.java |  13 +-
 .../service/impl/ResiEventServiceImpl.java    | 146 +++++++++++++++---
 .../main/resources/mapper/ResiEventDao.xml    |  44 ++++++
 6 files changed, 213 insertions(+), 22 deletions(-)

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 3a213b5191..015095cc83 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
@@ -95,6 +95,9 @@ public enum EpmetErrorCode {
 	IMG_SCAN_FAILED(8504,"图片审核失败，请重新上传"),
 	PROJECT_IS_CLOSED(8601,"项目已结案"),
 	VOTE_ISSUE_PLEASE(8602,"请先选择支持或反对，再发表您的想法"),
+	RESI_EVENT_READ(8603,"当前事件正在处理中,不能撤回"),
+	RESI_EVENT_NOT_MY_REPORTED(8604,"当前事件不是您发布的，无权操作"),
+
 	// 爱心互助 居民端
     NOT_IN_THE_SIGN_IN_RANGE(8510, "您还未进入指定的签到范围～"),
 	// 活动报名失败，弹窗：志愿者认证
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/EventConstant.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/EventConstant.java
index 112ad2fa36..2608de1e9f 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/EventConstant.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/EventConstant.java
@@ -14,7 +14,33 @@ public interface EventConstant {
     String EVENT_UN_DISPOSED = "undisposed";
     String EVENT_TRANSFERRED = "transferred";
 
+
+    /**
+     * 事件状态resi_event.status:处理中：processing；已办结：closed_case
+     */
     String EVENT_STATUS_PROCESSING="processing";
+    String EVENT_STATUS_CLOSED_CASE="closed_case";
+
     String READ="read";
     String UN_READ="un_read";
+
+    /**
+     * 事件@人员表，用户身份
+     * resi_event_mention.user_type
+     */
+    String NPC_USER="npc_user";
+
+    /**
+     * 操作日志表用户来源：resi_event_operation_log.userIdentity
+     * 居民端用户:resi_user；工作人员:staff；报事人:report_user
+     */
+    String RESI_USER="resi_user";
+    String STAFF="staff";
+    String REPORT_USER="report_user";
+
+    /**
+     * 事件是否解决：已解决 resolved，未解决 un_solved
+     */
+    String RESOLVED="resolved";
+    String UN_SOLVED="un_solved";
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
index c1b9818a91..d453e6ecd3 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
@@ -153,4 +153,7 @@ public class ResiEventController {
         resiEventService.updateViewTime(formDTO);
         return new Result();
     }
+
+
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java
index 1f5bc47f00..95f95f4959 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java
@@ -19,6 +19,7 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.result.EventListResultDTO;
+import com.epmet.dto.result.MyReportedResultDTO;
 import com.epmet.entity.ResiEventEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -42,5 +43,15 @@ public interface ResiEventDao extends BaseDao<ResiEventEntity> {
      * @date 2021/8/3 4:21 下午
      */
     List<EventListResultDTO> eventUnDisposedList(@Param("orgId")String orgId,@Param("eventType")String eventType);
-	
+
+    /**
+     * 居民端我的报事列表查询
+     * 
+     * @param userId 报事人
+     * @param statusCondition  未处理:un_read；处理中：processing；已办结：closed_case
+     * @return  java.util.List<com.epmet.dto.result.MyReportedResultDTO> 
+     * @author yinzuomei 
+     * @date 2021/8/3 23:21
+     */
+    List<MyReportedResultDTO> queryMyReported(@Param("userId") String userId, @Param("statusCondition")String statusCondition);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index 4c1a68f950..935e56abe6 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -17,7 +17,9 @@
 
 package com.epmet.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.form.FileCommonDTO;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
@@ -31,15 +33,16 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.ScanContentUtils;
 import com.epmet.constant.EventConstant;
-import com.epmet.dao.ResiEventAttachmentDao;
-import com.epmet.dao.ResiEventDao;
+import com.epmet.constant.ResiEventAction;
+import com.epmet.dao.*;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
-import com.epmet.entity.ResiEventAttachmentEntity;
-import com.epmet.entity.ResiEventEntity;
+import com.epmet.entity.*;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.service.ResiEventService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -73,6 +76,12 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
     @Autowired
     private ResiEventAttachmentDao resiEventAttachmentDao;
+    @Autowired
+    private ResiEventReportOrgDao resiEventReportOrgDao;
+    @Autowired
+    private ResiEventMentionDao resiEventMentionDao;
+    @Autowired
+    private ResiEventOperationLogDao resiEventOperationLogDao;
 
     /**
      * @Description  群众直报（待处理、处理中、已办结）列表
@@ -131,6 +140,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
         if(!gridInfoRes.success()||null==gridInfoRes.getData()){
             throw new RenException("网格信息查询异常");
         }
+
         ResiEventEntity resiEventEntity= ConvertUtils.sourceToTarget(formDTO,ResiEventEntity.class);
         resiEventEntity.setAgencyId(gridInfoRes.getData().getParentAgencyId());
         resiEventEntity.setPids(gridInfoRes.getData().getPids());
@@ -157,16 +167,66 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
             resiEventAttachmentDao.insert(attachmentEntity);
         });
         //6、插入组织表
+        List<ResiEventReportOrgEntity> orgEntityList=getOrgList(formDTO.getCustomerId(),resiEventEntity.getId(),formDTO.getOrgList());
+        orgEntityList.forEach(orgEntity->{
+            resiEventReportOrgDao.insert(orgEntity);
+        });
         //7、插入艾特人表
+        List<ResiEventMentionEntity> npcList=getNpcList(formDTO.getCustomerId(),resiEventEntity.getId(),formDTO.getNpcUserList());
+        npcList.forEach(npc->{
+            resiEventMentionDao.insert(npc);
+        });
         //8、插入log日志
+        ResiEventOperationLogEntity publishLog=new ResiEventOperationLogEntity();
+        publishLog.setCustomerId(formDTO.getCustomerId());
+        publishLog.setResiEventId(resiEventEntity.getId());
+        publishLog.setUserId(formDTO.getUserId());
+        publishLog.setUserIdentity(EventConstant.REPORT_USER);
+        publishLog.setActionCode(ResiEventAction.PUBLISH.getCode());
+        publishLog.setActionDesc(ResiEventAction.PUBLISH.getDesc());
+        publishLog.setOperateTime(resiEventEntity.getCreatedTime());
+        resiEventOperationLogDao.insert(publishLog);
+        //9、返回事件id
+        ResiEventIdDTO resiEventIdDTO=new ResiEventIdDTO();
+        resiEventIdDTO.setResiEventId(resiEventEntity.getId());
+        return resiEventIdDTO;
+    }
 
+    private List<ResiEventMentionEntity> getNpcList(String customerId, String resiEventId, List<MentionUserFormDTO> npcUserList) {
+        List<ResiEventMentionEntity> list=new ArrayList<>();
+        npcUserList.forEach(npc->{
+            ResiEventMentionEntity mentionEntity=new ResiEventMentionEntity();
+            mentionEntity.setCustomerId(customerId);
+            mentionEntity.setResiEventId(resiEventId);
+            mentionEntity.setUserType(EventConstant.NPC_USER);
+            mentionEntity.setUserId(npc.getNpcUserId());
+            mentionEntity.setGridId(npc.getGridId());
+            mentionEntity.setAgencyId(npc.getAgencyId());
+            mentionEntity.setPids(npc.getPids());
+            mentionEntity.setReadFlag(EventConstant.UN_READ);
+            mentionEntity.setRedDot(true);
+            list.add(mentionEntity);
+        });
+        return list;
+    }
 
-        return null;
+    private List<ResiEventReportOrgEntity> getOrgList(String customerId, String resiEventId, List<ReportOrgFormDTO> orgList) {
+        List<ResiEventReportOrgEntity> list=new ArrayList<>();
+        orgList.forEach(org->{
+            ResiEventReportOrgEntity entity=ConvertUtils.sourceToTarget(org,ResiEventReportOrgEntity.class);
+            entity.setCustomerId(customerId);
+            entity.setResiEventId(resiEventId);
+            //默认是未读
+            entity.setOrgRead(EventConstant.UN_READ);
+            entity.setRedDot(true);
+            list.add(entity);
+        });
+        return list;
     }
 
     private List<ResiEventAttachmentEntity> getAttList(String customerId,String resiEventId, List<FileCommonDTO> attachmentList) {
         List<ResiEventAttachmentEntity> list=new ArrayList<>();
-        int sort=1;
+        int sort= NumConstant.ONE;
         for(FileCommonDTO img:attachmentList){
             ResiEventAttachmentEntity entity=new ResiEventAttachmentEntity();
             entity.setCustomerId(customerId);
@@ -177,6 +237,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
             entity.setAttachmentUrl(img.getUrl());
             entity.setSort(sort);
             sort++;
+            list.add(entity);
         }
         return list;
     }
@@ -227,6 +288,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
     /**
      * 撤回事件
      *
+     * 需求描述:未处理状态中可撤回上报事件，撤回后不在展示列表内、@的人大代表或组织已读后按钮消失
      * @param formDTO
      * @return void
      * @author yinzuomei
@@ -234,9 +296,34 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
      */
     @Override
     public void reCall(ReCallEventFormDTO formDTO) {
-        // todo
-
-
+        ResiEventEntity resiEventEntity=baseDao.selectById(formDTO.getResiEventId());
+        if(null==resiEventEntity){
+            throw new RenException(String.format("根据事件id没有找到记录",formDTO.getResiEventId()));
+        }
+        // 我自己的发布的才可以删除
+        if(!formDTO.getUserId().equals(resiEventEntity.getReportUserId())){
+            log.warn("撤回事件入参:"+JSON.toJSONString(formDTO));
+            throw new RenException(EpmetErrorCode.RESI_EVENT_NOT_MY_REPORTED.getCode(),EpmetErrorCode.RESI_EVENT_NOT_MY_REPORTED.getMsg());
+        }
+        // 没有人看到过，才可以删除
+        if(resiEventEntity.getReadFlag()){
+            throw new RenException(EpmetErrorCode.RESI_EVENT_READ.getCode(),EpmetErrorCode.RESI_EVENT_READ.getMsg());
+        }
+        resiEventEntity.setLatestOperatedTime(new Date());
+        resiEventEntity.setRecallFlag(true);
+        resiEventEntity.setRecallTime(resiEventEntity.getLatestOperatedTime());
+        //1、更新主表标记已撤回
+        baseDao.updateById(resiEventEntity);
+        //2、插入log日志
+        ResiEventOperationLogEntity reCallLog=new ResiEventOperationLogEntity();
+        reCallLog.setCustomerId(formDTO.getCustomerId());
+        reCallLog.setResiEventId(resiEventEntity.getId());
+        reCallLog.setUserId(formDTO.getUserId());
+        reCallLog.setUserIdentity(EventConstant.REPORT_USER);
+        reCallLog.setActionCode(ResiEventAction.RECALL.getCode());
+        reCallLog.setActionDesc(ResiEventAction.RECALL.getDesc());
+        reCallLog.setOperateTime(resiEventEntity.getLatestOperatedTime());
+        resiEventOperationLogDao.insert(reCallLog);
 
     }
 
@@ -250,13 +337,30 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
      */
     @Override
     public void chooseResolve(ChooseResolveFormDTO formDTO) {
-        // todo
-
-
-
-
-
-
+        ResiEventEntity resiEventEntity=baseDao.selectById(formDTO.getResiEventId());
+        if(null==resiEventEntity){
+            throw new RenException(String.format("根据事件id没有找到记录",formDTO.getResiEventId()));
+        }
+        // 我自己的发布的才可以
+        if(!formDTO.getUserId().equals(resiEventEntity.getReportUserId())){
+            throw new RenException(EpmetErrorCode.RESI_EVENT_NOT_MY_REPORTED.getCode(),EpmetErrorCode.RESI_EVENT_NOT_MY_REPORTED.getMsg());
+        }
+        if(!EventConstant.EVENT_STATUS_CLOSED_CASE.equals(resiEventEntity.getStatus())){
+            throw new RenException("事件办结后，才可以选择是否解决，当前状态为："+resiEventEntity.getStatus());
+        }
+        resiEventEntity.setResolveStatus(formDTO.getResolveStatus());
+        resiEventEntity.setUpdatedTime(new Date());
+        baseDao.updateById(resiEventEntity);
+        //2、插入log日志
+        ResiEventOperationLogEntity reCallLog=new ResiEventOperationLogEntity();
+        reCallLog.setCustomerId(formDTO.getCustomerId());
+        reCallLog.setResiEventId(resiEventEntity.getId());
+        reCallLog.setUserId(formDTO.getUserId());
+        reCallLog.setUserIdentity(EventConstant.REPORT_USER);
+        reCallLog.setActionCode(ResiEventAction.CHOOSE_RESOLVE.getCode());
+        reCallLog.setActionDesc(ResiEventAction.CHOOSE_RESOLVE.getDesc());
+        reCallLog.setOperateTime(resiEventEntity.getUpdatedTime());
+        resiEventOperationLogDao.insert(reCallLog);
     }
 
     /**
@@ -269,11 +373,11 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
      */
     @Override
     public List<MyReportedResultDTO> queryMyReported(MyReportedFormDTO formDTO) {
-        // todo
-
-
+        PageInfo<MyReportedResultDTO> result = PageHelper.startPage(formDTO.getPageNo(),
+                formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.queryMyReported(formDTO.getUserId(),
+                    formDTO.getStatusCondition()));
+        return result.getList();
+    }
 
 
-        return null;
-    }
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
index f971e92473..811dbc08a8 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
@@ -42,4 +42,48 @@
         )t
         LEFT JOIN resi_event_attachment rea ON (rea.RESI_EVENT_ID = t.eventId AND rea.DEL_FLAG = '0' AND rea.ATTACHMENT_TYPE = 'image' AND (rea.SORT = 0 OR rea.SORT = 1 OR rea.SORT = 2))
     </select>
+
+
+    <resultMap id="MyReportedResultDTOMap" type="com.epmet.dto.result.MyReportedResultDTO">
+        <id property="resiEventId" column="id"/>
+        <result property="eventContent" column="EVENT_CONTENT"/>
+        <result property="redDot" column="RED_DOT" />
+        <result property="status" column="STATUS" />
+        <result property="shiftProject" column="SHIFT_PROJECT" />
+        <result property="showTime" column="LATEST_OPERATED_TIME" />
+        <collection property="imgList" ofType="java.lang.String">
+            <constructor>
+                <arg column="img_url"/>
+            </constructor>
+        </collection>
+    </resultMap>
+
+    <select id="queryMyReported" parameterType="map" resultMap="MyReportedResultDTOMap">
+        select
+            re.id,
+            re.EVENT_CONTENT,
+            (
+            case when #{statusCondition} ='un_read' then '0'
+            else re.RED_DOT
+            end
+            )as RED_DOT,
+            re.`STATUS`,
+            re.SHIFT_PROJECT,
+            re.LATEST_OPERATED_TIME,
+            rea.ATTACHMENT_URL as img_url
+        from resi_event re
+        left join resi_event_attachment rea
+             on(re.id=rea.RESI_EVENT_ID
+                and rea.DEL_FLAG='0')
+        where re.DEL_FLAG='0'
+            and re.RECALL_FLAG='0'
+            and re.REPORT_USER_ID=#{userId}
+            <if test='statusCondition == "un_read" '>
+                and re.READ_FLAG='0'
+            </if>
+            <if test='statusCondition != "un_read" '>
+                and re.`STATUS`=#{statusCondition}
+            </if>
+            order by re.LATEST_OPERATED_TIME desc
+    </select>
 </mapper>
\ No newline at end of file

From f1b87860d40569357e2efe5c92d79a650e144318 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 4 Aug 2021 09:55:59 +0800
Subject: [PATCH 22/84] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E6=9C=AA=E8=AF=BB=E3=80=81=E5=B7=B2=E8=AF=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/form/UserMentionFormDTO.java    | 44 +++++++++++++++
 .../dto/result/UserMentionResultDTO.java      | 55 +++++++++++++++++++
 .../epmet/controller/ResiEventController.java | 22 ++++++--
 .../com/epmet/dao/ResiEventMentionDao.java    | 16 +++++-
 .../com/epmet/service/ResiEventService.java   | 15 +++--
 .../service/impl/ResiEventServiceImpl.java    | 16 ++++++
 .../main/resources/mapper/ResiEventDao.xml    |  3 +-
 .../resources/mapper/ResiEventMentionDao.xml  | 49 +++++++++++++++++
 8 files changed, 209 insertions(+), 11 deletions(-)
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/UserMentionFormDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/UserMentionResultDTO.java

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/UserMentionFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/UserMentionFormDTO.java
new file mode 100644
index 0000000000..861abebb95
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/UserMentionFormDTO.java
@@ -0,0 +1,44 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * 我要报事-人大代表未读/已读列表入参
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/8/4 9:34
+ */
+@Data
+public class UserMentionFormDTO implements Serializable {
+    private static final long serialVersionUID = 7548058964554418080L;
+
+    public interface AddUserInternalGroup {
+    }
+
+    /**
+     * 未读：un_read;已读：read；
+     */
+    @NotBlank(message = "readFlag不能为空", groups = AddUserInternalGroup.class)
+    private String readFlag;
+    @NotNull(message = "pageNo不能为空", groups = AddUserInternalGroup.class)
+    private Integer pageNo;
+    @NotNull(message = "pageSize不能为空", groups = AddUserInternalGroup.class)
+    private Integer pageSize;
+
+    //以下参数从token中获取
+    /**
+     * 当前用户id
+     */
+    @NotBlank(message = "userId不能为空", groups = AddUserInternalGroup.class)
+    private String userId;
+
+    /**
+     * 当前客户id
+     */
+    @NotBlank(message = "customerId不能为空", groups = AddUserInternalGroup.class)
+    private String customerId;
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/UserMentionResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/UserMentionResultDTO.java
new file mode 100644
index 0000000000..95ac2e2527
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/UserMentionResultDTO.java
@@ -0,0 +1,55 @@
+package com.epmet.dto.result;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 我要报事-人大代表未读/已读列表返参
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/8/4 9:44
+ */
+@Data
+public class UserMentionResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 8171079006237395425L;
+    /**
+     * 事件id
+     */
+    private String resiEventId;
+
+    /**
+     * 事件内容
+     */
+    private String eventContent;
+
+    /**
+     * 图片列表，可为空
+     */
+    private List<String> imgList;
+
+    /**
+     * true展示；false不展示
+     */
+    private Boolean redDot;
+
+    /**
+     * 处理中：processing；已办结：closed_case
+     */
+    private String status;
+
+    /**
+     * true:已转项目；false：未立项
+     */
+    private Boolean shiftProject;
+
+    /**
+     * 列表显示时间用此列：yyyy-MM-dd HH:mm:ss；处理中：上报事件时间，处理中：最新一次处理事件；已办结：办结时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date showTime;
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
index d453e6ecd3..98bfe74b10 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
@@ -22,10 +22,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.dto.form.*;
-import com.epmet.dto.result.EventDetailResultDTO;
-import com.epmet.dto.result.EventListResultDTO;
-import com.epmet.dto.result.MyReportedResultDTO;
-import com.epmet.dto.result.ResiEventIdDTO;
+import com.epmet.dto.result.*;
 import com.epmet.service.ResiEventService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -154,6 +151,21 @@ public class ResiEventController {
         return new Result();
     }
 
-
+    /**
+     * 我要报事-人大代表未读/已读列表
+     *
+     * @param tokenDto
+     * @param formDTO
+     * @return  com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.MyReportedResultDTO>>
+     * @author yinzuomei
+     * @date 2021/8/4 9:40
+     */
+    @PostMapping("mentionlist")
+    public Result<List<UserMentionResultDTO>> mentionList(@LoginUser TokenDto tokenDto, @RequestBody UserMentionFormDTO formDTO){
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(formDTO,UserMentionFormDTO.AddUserInternalGroup.class);
+        return new Result<List<UserMentionResultDTO>>().ok(resiEventService.mentionList(formDTO));
+    }
 
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java
index 270500ae05..981cee667a 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java
@@ -18,8 +18,12 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.result.UserMentionResultDTO;
 import com.epmet.entity.ResiEventMentionEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 事件被@人表
@@ -29,5 +33,15 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface ResiEventMentionDao extends BaseDao<ResiEventMentionEntity> {
-	
+
+    /**
+     * 人大代表未读、已读列表
+     *
+     * @param userId
+     * @param readFlag
+     * @return  java.util.List<com.epmet.dto.result.UserMentionResultDTO>
+     * @author yinzuomei
+     * @date 2021/8/4 9:54
+     */
+    List<UserMentionResultDTO> selectMentionList(@Param("userId")String userId, @Param("readFlag")String readFlag);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java
index 82dabf69fc..604375b0fb 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java
@@ -2,11 +2,8 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.EventDetailResultDTO;
-import com.epmet.dto.result.EventListResultDTO;
+import com.epmet.dto.result.*;
 import com.epmet.entity.ResiEventEntity;
-import com.epmet.dto.result.MyReportedResultDTO;
-import com.epmet.dto.result.ResiEventIdDTO;
 
 import java.util.List;
 
@@ -81,4 +78,14 @@ public interface ResiEventService extends BaseService<ResiEventEntity> {
      * @date 2021/8/3 14:28
      */
     List<MyReportedResultDTO> queryMyReported(MyReportedFormDTO formDTO);
+
+    /**
+     * 我要报事-人大代表未读/已读列表
+     *
+     * @param formDTO
+     * @return  java.util.List<com.epmet.dto.result.UserMentionResultDTO>
+     * @author yinzuomei
+     * @date 2021/8/4 9:41
+     */
+    List<UserMentionResultDTO> mentionList(UserMentionFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index 935e56abe6..c002ad983a 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -379,5 +379,21 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
         return result.getList();
     }
 
+    /**
+     * 我要报事-人大代表未读/已读列表
+     *
+     * @param formDTO
+     * @return java.util.List<com.epmet.dto.result.UserMentionResultDTO>
+     * @author yinzuomei
+     * @date 2021/8/4 9:41
+     */
+    @Override
+    public List<UserMentionResultDTO> mentionList(UserMentionFormDTO formDTO) {
+        PageInfo<UserMentionResultDTO> result = PageHelper.startPage(formDTO.getPageNo(),
+                formDTO.getPageSize()).doSelectPageInfo(() -> resiEventMentionDao.selectMentionList(formDTO.getUserId(),
+                formDTO.getReadFlag()));
+        return result.getList();
+    }
+
 
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
index 811dbc08a8..b1576f605e 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
@@ -74,7 +74,8 @@
         from resi_event re
         left join resi_event_attachment rea
              on(re.id=rea.RESI_EVENT_ID
-                and rea.DEL_FLAG='0')
+                and rea.DEL_FLAG='0'
+                and rea.ATTACHMENT_TYPE='image')
         where re.DEL_FLAG='0'
             and re.RECALL_FLAG='0'
             and re.REPORT_USER_ID=#{userId}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml
index 98064a416f..7a4f145c75 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml
@@ -3,6 +3,55 @@
 
 <mapper namespace="com.epmet.dao.ResiEventMentionDao">
 
+    <resultMap id="UserMentionResultDTOMap" type="com.epmet.dto.result.UserMentionResultDTO">
+        <id property="resiEventId" column="RESI_EVENT_ID"/>
+        <result property="eventContent" column="EVENT_CONTENT"/>
+        <result property="redDot" column="RED_DOT" />
+        <result property="status" column="STATUS" />
+        <result property="shiftProject" column="SHIFT_PROJECT" />
+        <result property="showTime" column="LATEST_OPERATED_TIME" />
+        <collection property="imgList" ofType="java.lang.String">
+            <constructor>
+                <arg column="img_url"/>
+            </constructor>
+        </collection>
+    </resultMap>
 
+    <select id="selectMentionList" parameterType="map" resultMap="UserMentionResultDTOMap">
+        SELECT
+            rem.RESI_EVENT_ID,
+            re.EVENT_CONTENT,
+            (
+            case when #{readFlag} ='un_read' then '0'
+            else rem.RED_DOT
+            end
+            )as RED_DOT,
+            re.`STATUS`,
+            re.SHIFT_PROJECT,
+            re.LATEST_OPERATED_TIME,
+            rea.ATTACHMENT_URL as img_url
+        FROM
+            resi_event_mention rem
+            LEFT JOIN resi_event re
+            ON ( rem.RESI_EVENT_ID = re.id )
+            LEFT JOIN resi_event_attachment rea
+                ON ( re.id = rea.RESI_EVENT_ID
+                    AND rea.DEL_FLAG = '0'
+                    AND rea.ATTACHMENT_TYPE = 'image')
+        WHERE
+            rem.DEL_FLAG = '0'
+            AND re.DEL_FLAG = '0'
+            AND re.RECALL_FLAG = '0'
+            AND rem.USER_ID = #{userId}
+            AND rem.READ_FLAG =#{readFlag}
+        <if test='readFlag == "un_read" '>
+            ORDER BY
+            re.CREATED_TIME ASC
+        </if>
+        <if test='readFlag == "read" '>
+            ORDER BY
+            re.LATEST_OPERATED_TIME DESC
+        </if>
+    </select>
 
 </mapper>
\ No newline at end of file

From 6e877cda21598cab8cd5260807eac65389bf6018 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 4 Aug 2021 10:34:31 +0800
Subject: [PATCH 23/84] resi_event.pids varchar(255)

---
 .../src/main/java/com/epmet/dto/form/MentionUserFormDTO.java    | 2 +-
 .../main/java/com/epmet/service/impl/ResiEventServiceImpl.java  | 2 +-
 .../resources/db/migration/V0.0.16__create_resievent_tables.sql | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MentionUserFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MentionUserFormDTO.java
index b142456c3d..9df7be7b21 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MentionUserFormDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MentionUserFormDTO.java
@@ -16,7 +16,7 @@ public class MentionUserFormDTO implements Serializable {
     /**
      * 人大代表用户id
      */
-    private String npcUserId;
+    private String userId;
 
     /**
      * 人大代表注册网格id
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index c002ad983a..2f31225c35 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -199,7 +199,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
             mentionEntity.setCustomerId(customerId);
             mentionEntity.setResiEventId(resiEventId);
             mentionEntity.setUserType(EventConstant.NPC_USER);
-            mentionEntity.setUserId(npc.getNpcUserId());
+            mentionEntity.setUserId(npc.getUserId());
             mentionEntity.setGridId(npc.getGridId());
             mentionEntity.setAgencyId(npc.getAgencyId());
             mentionEntity.setPids(npc.getPids());
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql
index 90cc434e75..77ffe6da1d 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql
@@ -3,7 +3,7 @@ CREATE TABLE `resi_event` (
   `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',
   `GRID_ID` varchar(64) NOT NULL COMMENT '居民端用户所在网格id',
   `AGENCY_ID` varchar(64) NOT NULL COMMENT '居民端用户所在网格的所属组织',
-  `PIDS` varchar(64) NOT NULL COMMENT '居民端用户所在网格的所有上级组织，包含AGENCY_ID',
+  `PIDS` varchar(255) NOT NULL COMMENT '居民端用户所在网格的所有上级组织，包含AGENCY_ID',
   `REPORT_USER_ID` varchar(64) NOT NULL COMMENT '报事的人',
   `IS_PARTY` tinyint(1) NOT NULL DEFAULT '0' COMMENT '1：党员；0：不是党员；默认0',
   `EVENT_CONTENT` varchar(1024) NOT NULL COMMENT '事件内容',

From dfc9ebb5c11011f2ba9934649c938b488f29636e Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 4 Aug 2021 10:41:38 +0800
Subject: [PATCH 24/84] orgType=>orgLevel

---
 .../src/main/java/com/epmet/dto/form/ReportOrgFormDTO.java      | 2 +-
 .../main/java/com/epmet/service/impl/ResiEventServiceImpl.java  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReportOrgFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReportOrgFormDTO.java
index 453ce8d382..56b6184fd2 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReportOrgFormDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReportOrgFormDTO.java
@@ -15,7 +15,7 @@ public class ReportOrgFormDTO implements Serializable {
     /**
      * 报给？： 网格：grid； 社区：community； 乡（镇、街道）级:street； 区县级: district； 市级: city； 省级:province。
      */
-    private String orgType;
+    private String orgLevel;
 
     /**
      * 报给的组织或者网格id
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index 2f31225c35..17bfd10d46 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -216,6 +216,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
             ResiEventReportOrgEntity entity=ConvertUtils.sourceToTarget(org,ResiEventReportOrgEntity.class);
             entity.setCustomerId(customerId);
             entity.setResiEventId(resiEventId);
+            entity.setOrgType(org.getOrgLevel());
             //默认是未读
             entity.setOrgRead(EventConstant.UN_READ);
             entity.setRedDot(true);

From ae4475f04d548bdd56c1428e0002d1a846774068 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 4 Aug 2021 10:58:30 +0800
Subject: [PATCH 25/84] actiondesc

---
 .../main/java/com/epmet/service/impl/ResiEventServiceImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index 17bfd10d46..40c0d3d72d 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -183,7 +183,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
         publishLog.setUserId(formDTO.getUserId());
         publishLog.setUserIdentity(EventConstant.REPORT_USER);
         publishLog.setActionCode(ResiEventAction.PUBLISH.getCode());
-        publishLog.setActionDesc(ResiEventAction.PUBLISH.getDesc());
+        publishLog.setActionDesc(ResiEventAction.getDesc(ResiEventAction.PUBLISH.getCode()));
         publishLog.setOperateTime(resiEventEntity.getCreatedTime());
         resiEventOperationLogDao.insert(publishLog);
         //9、返回事件id

From 38f60cf12c81de23089dba75fa06754103317502 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 4 Aug 2021 10:59:49 +0800
Subject: [PATCH 26/84] actiondesc

---
 .../java/com/epmet/constant/ResiEventAction.java   | 14 +++++++-------
 .../epmet/service/impl/ResiEventServiceImpl.java   |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ResiEventAction.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ResiEventAction.java
index f525143772..ff9f721e1e 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ResiEventAction.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ResiEventAction.java
@@ -16,13 +16,13 @@ public enum ResiEventAction {
     // 5、办结：close_case;
     // 6、选择是否已解决：choose_resolve;
     // 7、查看阅读事件：read：人大代表未读=>已读；工作人员待处理=>处理中；
-     PUBLISH ( "publish",""),
-     RECALL( "recall",""),
-     REPLY ("reply",""),
-     SHIFIT_PROJECT ( "shift_project",""),
-     CLOSE_CASE ( "close_case",""),
-     CHOOSE_RESOLVE ( "choose_resolve",""),
-     READ( "read","");
+     PUBLISH ( "publish","发布事件"),
+     RECALL( "recall","撤回事件"),
+     REPLY ("reply","回复"),
+     SHIFIT_PROJECT ( "shift_project","立项"),
+     CLOSE_CASE ( "close_case","办结"),
+     CHOOSE_RESOLVE ( "choose_resolve","选择是否解决"),
+     READ( "read","查看事件");
 
 
     private String code;
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index 40c0d3d72d..17bfd10d46 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -183,7 +183,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
         publishLog.setUserId(formDTO.getUserId());
         publishLog.setUserIdentity(EventConstant.REPORT_USER);
         publishLog.setActionCode(ResiEventAction.PUBLISH.getCode());
-        publishLog.setActionDesc(ResiEventAction.getDesc(ResiEventAction.PUBLISH.getCode()));
+        publishLog.setActionDesc(ResiEventAction.PUBLISH.getDesc());
         publishLog.setOperateTime(resiEventEntity.getCreatedTime());
         resiEventOperationLogDao.insert(publishLog);
         //9、返回事件id

From f57da006160d11939b6dcdb73a34c4126c8cdd1c Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 4 Aug 2021 11:01:38 +0800
Subject: [PATCH 27/84] =?UTF-8?q?time=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/service/impl/ResiEventServiceImpl.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index 17bfd10d46..1907cba24c 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -185,6 +185,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
         publishLog.setActionCode(ResiEventAction.PUBLISH.getCode());
         publishLog.setActionDesc(ResiEventAction.PUBLISH.getDesc());
         publishLog.setOperateTime(resiEventEntity.getCreatedTime());
+        publishLog.setCreatedTime(resiEventEntity.getCreatedTime());
         resiEventOperationLogDao.insert(publishLog);
         //9、返回事件id
         ResiEventIdDTO resiEventIdDTO=new ResiEventIdDTO();
@@ -324,6 +325,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
         reCallLog.setActionCode(ResiEventAction.RECALL.getCode());
         reCallLog.setActionDesc(ResiEventAction.RECALL.getDesc());
         reCallLog.setOperateTime(resiEventEntity.getLatestOperatedTime());
+        reCallLog.setCreatedTime(resiEventEntity.getLatestOperatedTime());
         resiEventOperationLogDao.insert(reCallLog);
 
     }

From 324e1b9945c1b713ce5e5acac01d1284ac896da5 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 4 Aug 2021 12:58:32 +0800
Subject: [PATCH 28/84] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=8A=A5=E4=BA=8B?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/service/impl/ResiEventServiceImpl.java | 3 +++
 .../src/main/resources/mapper/ResiEventDao.xml                 | 1 +
 2 files changed, 4 insertions(+)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index 1907cba24c..9d5a9e0098 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -376,6 +376,9 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
      */
     @Override
     public List<MyReportedResultDTO> queryMyReported(MyReportedFormDTO formDTO) {
+        // 未处理： 发了没有人看过的时间
+        // 处理中: 有人看，正在处理中的
+        // 已办结：有人看，已经办结了的
         PageInfo<MyReportedResultDTO> result = PageHelper.startPage(formDTO.getPageNo(),
                 formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.queryMyReported(formDTO.getUserId(),
                     formDTO.getStatusCondition()));
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
index b1576f605e..c80501a831 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
@@ -83,6 +83,7 @@
                 and re.READ_FLAG='0'
             </if>
             <if test='statusCondition != "un_read" '>
+                and re.READ_FLAG='1'
                 and re.`STATUS`=#{statusCondition}
             </if>
             order by re.LATEST_OPERATED_TIME desc

From b19f0179c57cb529e02f6feb1aa0396ad1a82e5d Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 4 Aug 2021 13:34:42 +0800
Subject: [PATCH 29/84] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/form/ReplyListFormDTO.java   |  3 +++
 .../epmet/dto/result/ReplyListResultDTO.java   | 18 ++++++++++++++++++
 .../controller/ResiEventReplyController.java   |  5 ++++-
 .../java/com/epmet/dao/ResiEventReplyDao.java  | 14 +++++++++++++-
 .../impl/ResiEventReplyServiceImpl.java        |  8 +++++++-
 .../resources/mapper/ResiEventReplyDao.xml     | 15 ++++++++++++++-
 6 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReplyListFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReplyListFormDTO.java
index 20575626fd..ed9bb74e21 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReplyListFormDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReplyListFormDTO.java
@@ -20,4 +20,7 @@ public class ReplyListFormDTO implements Serializable {
 
     @NotBlank(message = "报事ID不能为空",groups = ReplyListForm.class)
     private String resiEventId;
+
+    @NotBlank(message = "当前用户id不能为空",groups = ReplyListForm.class)
+    private String currentUserId;
 }
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ReplyListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ReplyListResultDTO.java
index f5b744289e..87209854a4 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ReplyListResultDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ReplyListResultDTO.java
@@ -1,8 +1,10 @@
 package com.epmet.dto.result;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Author zxc
@@ -14,5 +16,21 @@ public class ReplyListResultDTO implements Serializable {
 
     private static final long serialVersionUID = 4875335642497226847L;
 
+    /**
+     * 回复人的昵称，比如：南宁路社区,人大代表-李四,山东路-尹女士
+     * */
+    private String replyName;
 
+    /**
+     * 回复时间
+     * */
+    private Date replyTime;
+
+    /**
+     * 回复的内容
+     * */
+    private String replyContent;
+
+    @JsonIgnore
+    private String replyUserId;
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java
index 6a1eac37ef..dec9a9a80f 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java
@@ -17,6 +17,8 @@
 
 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.ReplyListFormDTO;
@@ -51,7 +53,8 @@ public class ResiEventReplyController {
      * @date 2021/8/3 11:11 上午
      */
     @PostMapping("list")
-    public Result<List<ReplyListResultDTO>> replyList(@RequestBody ReplyListFormDTO formDTO){
+    public Result<List<ReplyListResultDTO>> replyList(@LoginUser TokenDto tokenDto, @RequestBody ReplyListFormDTO formDTO){
+        formDTO.setCurrentUserId(tokenDto.getUserId());
         ValidatorUtils.validateEntity(formDTO, ReplyListFormDTO.ReplyListForm.class);
         return new Result<List<ReplyListResultDTO>>().ok(resiEventReplyService.replyList(formDTO));
     }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventReplyDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventReplyDao.java
index 38cbf1467d..603c1eefc9 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventReplyDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventReplyDao.java
@@ -18,9 +18,12 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.result.ReplyListResultDTO;
 import com.epmet.entity.ResiEventReplyEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 事件回复表
  *
@@ -29,5 +32,14 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface ResiEventReplyDao extends BaseDao<ResiEventReplyEntity> {
-	
+
+    /**
+     * 查询事件的回复列表
+     *
+     * @param resiEventId
+     * @return  java.util.List<com.epmet.dto.result.ReplyListResultDTO>
+     * @author yinzuomei
+     * @date 2021/8/4 13:22
+     */
+    List<ReplyListResultDTO> selectReplyList(String resiEventId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java
index 4b003cf048..98767e41c8 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java
@@ -44,6 +44,12 @@ public class ResiEventReplyServiceImpl extends BaseServiceImpl<ResiEventReplyDao
      */
     @Override
     public List<ReplyListResultDTO> replyList(ReplyListFormDTO formDTO) {
-        return null;
+        List<ReplyListResultDTO> list=baseDao.selectReplyList(formDTO.getResiEventId());
+        list.forEach(dto->{
+            if(dto.getReplyUserId().equals(formDTO.getCurrentUserId())){
+                dto.setReplyName("我");
+            }
+        });
+        return list;
     }
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReplyDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReplyDao.xml
index 5e01548862..bc763a71f5 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReplyDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReplyDao.xml
@@ -3,6 +3,19 @@
 
 <mapper namespace="com.epmet.dao.ResiEventReplyDao">
 
-
+    <select id="selectReplyList" parameterType="java.lang.String" resultType="com.epmet.dto.result.ReplyListResultDTO">
+        SELECT
+         rer.USER_SHOW_NAME as replyName,
+         rer.CREATED_TIME as replyTime,
+         rer.CONTENT as replyContent,
+         rer.FROM_USER_ID as replyUserId
+        FROM
+            resi_event_reply rer
+        WHERE
+            rer.DEL_FLAG = '0'
+            AND rer.RESI_EVENT_ID = #{resiEventId}
+        ORDER BY
+            rer.CREATED_TIME DESC
+    </select>
 
 </mapper>
\ No newline at end of file

From ebd66fc552329cdb2f04d62ecdf49dc38272a8da Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 4 Aug 2021 14:07:47 +0800
Subject: [PATCH 30/84] =?UTF-8?q?@=E7=9A=84=E4=BA=BA=E5=AD=98=E5=82=A8?=
 =?UTF-8?q?=E5=A7=93=E5=90=8D=E3=80=82=E6=8A=A5=E4=BA=8B=E5=85=A5=E5=8F=82?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0userShowName?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/form/MentionUserFormDTO.java    | 6 ++++++
 .../main/java/com/epmet/entity/ResiEventMentionEntity.java  | 5 +++++
 .../java/com/epmet/service/impl/ResiEventServiceImpl.java   | 1 +
 .../db/migration/V0.0.16__create_resievent_tables.sql       | 1 +
 4 files changed, 13 insertions(+)

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MentionUserFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MentionUserFormDTO.java
index 9df7be7b21..52c37f1563 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MentionUserFormDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MentionUserFormDTO.java
@@ -32,4 +32,10 @@ public class MentionUserFormDTO implements Serializable {
      * 注册网格的所有上级
      */
     private String pids;
+
+    /**
+     * 人大代表姓名
+     */
+    private String userShowName;
+
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventMentionEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventMentionEntity.java
index 2a6a2abe05..a2c5702485 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventMentionEntity.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventMentionEntity.java
@@ -50,6 +50,11 @@ public class ResiEventMentionEntity extends BaseEpmetEntity {
      */
 	private String userType;
 
+	/**
+	 * 人大代表目前显示姓名
+	 */
+	private String userShowName;
+
     /**
      * 居民端用户id
      */
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index 9d5a9e0098..ce21f19a58 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -200,6 +200,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
             mentionEntity.setCustomerId(customerId);
             mentionEntity.setResiEventId(resiEventId);
             mentionEntity.setUserType(EventConstant.NPC_USER);
+            mentionEntity.setUserShowName(npc.getUserShowName());
             mentionEntity.setUserId(npc.getUserId());
             mentionEntity.setGridId(npc.getGridId());
             mentionEntity.setAgencyId(npc.getAgencyId());
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql
index 77ffe6da1d..8aa3fab8d9 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql
@@ -54,6 +54,7 @@ CREATE TABLE `resi_event_mention` (
   `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id',
   `RESI_EVENT_ID` varchar(64) NOT NULL COMMENT '事件id',
   `USER_TYPE` varchar(32) NOT NULL COMMENT '人大代表:npc_user',
+  `USER_SHOW_NAME` varchar(64) NOT NULL COMMENT '人大代表目前显示姓名',
   `USER_ID` varchar(64) NOT NULL COMMENT '居民端用户id',
   `GRID_ID` varchar(64) NOT NULL COMMENT '居民注册网格ID',
   `AGENCY_ID` varchar(64) NOT NULL COMMENT '居民所属社区，就是grid_id的所属组织',

From a7df08871ca4bd6179a2c80aa4aed87cc6409726 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 4 Aug 2021 14:31:51 +0800
Subject: [PATCH 31/84] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/exception/EpmetErrorCode.java       |  1 +
 .../java/com/epmet/dto/form/ReplyFormDTO.java | 34 ++++++++++
 .../controller/ResiEventReplyController.java  | 17 +++++
 .../epmet/service/ResiEventReplyService.java  | 11 +++-
 .../impl/ResiEventReplyServiceImpl.java       | 64 +++++++++++++++++++
 5 files changed, 126 insertions(+), 1 deletion(-)
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReplyFormDTO.java

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 015095cc83..ead3a480f5 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
@@ -97,6 +97,7 @@ public enum EpmetErrorCode {
 	VOTE_ISSUE_PLEASE(8602,"请先选择支持或反对，再发表您的想法"),
 	RESI_EVENT_READ(8603,"当前事件正在处理中,不能撤回"),
 	RESI_EVENT_NOT_MY_REPORTED(8604,"当前事件不是您发布的，无权操作"),
+	CAN_NOT_REPLY_RESI_EVENT(8605,"办结、立项处理后不可回复"),
 
 	// 爱心互助 居民端
     NOT_IN_THE_SIGN_IN_RANGE(8510, "您还未进入指定的签到范围～"),
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReplyFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReplyFormDTO.java
new file mode 100644
index 0000000000..a6729ff46f
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReplyFormDTO.java
@@ -0,0 +1,34 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 回复通用入参
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/8/4 14:16
+ */
+@Data
+public class ReplyFormDTO implements Serializable {
+    private static final long serialVersionUID = 1653042839040178697L;
+    public interface AddUserInternalGroup {
+    }
+    public interface AddUserShowGroup extends CustomerClientShowGroup {
+    }
+    @NotBlank(message = "事件id不能为空",groups = AddUserInternalGroup.class)
+    private String resiEventId;
+    @Length(min = 1, max = 200, message = "请填写回复内容,最多输入200字", groups = AddUserShowGroup.class)
+    private String content;
+
+    //以下参数从token中获取
+    /**
+     * 当前用户id
+     */
+    @NotBlank(message = "userId不能为空",groups = AddUserInternalGroup.class)
+    private String userId;
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java
index dec9a9a80f..f7c57b14c5 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java
@@ -21,6 +21,7 @@ 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.ReplyFormDTO;
 import com.epmet.dto.form.ReplyListFormDTO;
 import com.epmet.dto.result.ReplyListResultDTO;
 import com.epmet.service.ResiEventReplyService;
@@ -59,4 +60,20 @@ public class ResiEventReplyController {
         return new Result<List<ReplyListResultDTO>>().ok(resiEventReplyService.replyList(formDTO));
     }
 
+    /**
+     * 报事-工作人员回复
+     * 
+     * @param tokenDto
+     * @param replyFormDTO 
+     * @return  com.epmet.commons.tools.utils.Result 
+     * @author yinzuomei 
+     * @date 2021/8/4 14:19
+     */
+    @PostMapping("govReply")
+    public Result govReply(@LoginUser TokenDto tokenDto,@RequestBody ReplyFormDTO replyFormDTO){
+        replyFormDTO.setUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(replyFormDTO,ReplyFormDTO.AddUserShowGroup.class,ReplyFormDTO.AddUserInternalGroup.class);
+        resiEventReplyService.govReply(replyFormDTO);
+        return new Result();
+    }
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventReplyService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventReplyService.java
index 5065a9eb79..4311de0805 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventReplyService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventReplyService.java
@@ -18,10 +18,10 @@
 package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.dto.form.ReplyFormDTO;
 import com.epmet.dto.form.ReplyListFormDTO;
 import com.epmet.dto.result.ReplyListResultDTO;
 import com.epmet.entity.ResiEventReplyEntity;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
@@ -41,4 +41,13 @@ public interface ResiEventReplyService extends BaseService<ResiEventReplyEntity>
      */
     List<ReplyListResultDTO> replyList(ReplyListFormDTO formDTO);
 
+    /**
+     * 报事-工作人员回复
+     *
+     * @param replyFormDTO
+     * @return  void
+     * @author yinzuomei
+     * @date 2021/8/4 14:20
+     */
+    void govReply(ReplyFormDTO replyFormDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java
index 98767e41c8..2a284ad914 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java
@@ -18,13 +18,28 @@
 package com.epmet.service.impl;
 
 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.utils.Result;
+import com.epmet.constant.EventConstant;
+import com.epmet.constant.ResiEventAction;
+import com.epmet.dao.ResiEventDao;
+import com.epmet.dao.ResiEventOperationLogDao;
 import com.epmet.dao.ResiEventReplyDao;
+import com.epmet.dto.CustomerAgencyDTO;
+import com.epmet.dto.form.ReplyFormDTO;
 import com.epmet.dto.form.ReplyListFormDTO;
 import com.epmet.dto.result.ReplyListResultDTO;
+import com.epmet.entity.ResiEventEntity;
+import com.epmet.entity.ResiEventOperationLogEntity;
 import com.epmet.entity.ResiEventReplyEntity;
+import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.service.ResiEventReplyService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -35,6 +50,12 @@ import java.util.List;
  */
 @Service
 public class ResiEventReplyServiceImpl extends BaseServiceImpl<ResiEventReplyDao, ResiEventReplyEntity> implements ResiEventReplyService {
+    @Autowired
+    private ResiEventDao resiEventDao;
+    @Autowired
+    private ResiEventOperationLogDao resiEventOperationLogDao;
+    @Autowired
+    private GovOrgOpenFeignClient govOrgOpenFeignClient;
 
     /**
      * @Description  报事详情-回复列表-两端通用
@@ -52,4 +73,47 @@ public class ResiEventReplyServiceImpl extends BaseServiceImpl<ResiEventReplyDao
         });
         return list;
     }
+
+    /**
+     * 报事-工作人员回复:办结、立项处理后不可回复
+     *
+     * @param replyFormDTO
+     * @return void
+     * @author yinzuomei
+     * @date 2021/8/4 14:20
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void govReply(ReplyFormDTO replyFormDTO) {
+        ResiEventEntity eventEntity=resiEventDao.selectById(replyFormDTO.getResiEventId());
+        // 办结、立项处理后不可回复
+        if(EventConstant.EVENT_STATUS_CLOSED_CASE.equals(eventEntity.getStatus())||eventEntity.getShiftProject()){
+            throw new RenException(EpmetErrorCode.CAN_NOT_REPLY_RESI_EVENT.getCode(),EpmetErrorCode.CAN_NOT_REPLY_RESI_EVENT.getMsg());
+        }
+        //查询工作人员所属组织
+        Result<CustomerAgencyDTO> staffResult = govOrgOpenFeignClient.getAgencyByStaff(replyFormDTO.getUserId());
+        if (!staffResult.success() && null == staffResult.getData()) {
+            throw new RenException("查询当前工作人员信息异常");
+        }
+        // 插入回复表
+        ResiEventReplyEntity resiEventReplyEntity=new ResiEventReplyEntity();
+        resiEventReplyEntity.setCustomerId(eventEntity.getCustomerId());
+        resiEventReplyEntity.setResiEventId(replyFormDTO.getResiEventId());
+        resiEventReplyEntity.setFromUserId(replyFormDTO.getUserId());
+        resiEventReplyEntity.setContent(replyFormDTO.getContent());
+        resiEventReplyEntity.setUserShowName(staffResult.getData().getOrganizationName());
+        resiEventReplyEntity.setCreatedTime(new Date());
+        baseDao.insert(resiEventReplyEntity);
+        // 记录操作日志
+        //2、插入log日志
+        ResiEventOperationLogEntity reCallLog=new ResiEventOperationLogEntity();
+        reCallLog.setCustomerId(eventEntity.getCustomerId());
+        reCallLog.setResiEventId(eventEntity.getId());
+        reCallLog.setUserId(replyFormDTO.getUserId());
+        reCallLog.setUserIdentity(EventConstant.STAFF);
+        reCallLog.setActionCode(ResiEventAction.REPLY.getCode());
+        reCallLog.setActionDesc(ResiEventAction.REPLY.getDesc());
+        reCallLog.setOperateTime(resiEventReplyEntity.getCreatedTime());
+        resiEventOperationLogDao.insert(reCallLog);
+    }
 }
\ No newline at end of file

From 634d05f5b6ac8f91b0b9ada4b6ac1cd951b87889 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 4 Aug 2021 14:35:24 +0800
Subject: [PATCH 32/84] =?UTF-8?q?=E5=BF=98=E4=BA=86=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E8=A6=81=E8=B5=B0=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ResiEventReplyServiceImpl.java       | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java
index 2a284ad914..2bfa788811 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java
@@ -20,7 +20,11 @@ package com.epmet.service.impl;
 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.scan.param.TextScanParamDTO;
+import com.epmet.commons.tools.scan.param.TextTaskDTO;
+import com.epmet.commons.tools.scan.result.SyncScanResult;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.utils.ScanContentUtils;
 import com.epmet.constant.EventConstant;
 import com.epmet.constant.ResiEventAction;
 import com.epmet.dao.ResiEventDao;
@@ -35,12 +39,15 @@ import com.epmet.entity.ResiEventOperationLogEntity;
 import com.epmet.entity.ResiEventReplyEntity;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.service.ResiEventReplyService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
 import java.util.List;
+import java.util.UUID;
 
 /**
  * 事件回复表
@@ -56,6 +63,10 @@ public class ResiEventReplyServiceImpl extends BaseServiceImpl<ResiEventReplyDao
     private ResiEventOperationLogDao resiEventOperationLogDao;
     @Autowired
     private GovOrgOpenFeignClient govOrgOpenFeignClient;
+    @Value("${openapi.scan.server.url}")
+    private String scanApiUrl;
+    @Value("${openapi.scan.method.textSyncScan}")
+    private String textSyncScanMethod;
 
     /**
      * @Description  报事详情-回复列表-两端通用
@@ -90,6 +101,8 @@ public class ResiEventReplyServiceImpl extends BaseServiceImpl<ResiEventReplyDao
         if(EventConstant.EVENT_STATUS_CLOSED_CASE.equals(eventEntity.getStatus())||eventEntity.getShiftProject()){
             throw new RenException(EpmetErrorCode.CAN_NOT_REPLY_RESI_EVENT.getCode(),EpmetErrorCode.CAN_NOT_REPLY_RESI_EVENT.getMsg());
         }
+        // 回复内容走审核
+        scanReplyContent(replyFormDTO.getContent());
         //查询工作人员所属组织
         Result<CustomerAgencyDTO> staffResult = govOrgOpenFeignClient.getAgencyByStaff(replyFormDTO.getUserId());
         if (!staffResult.success() && null == staffResult.getData()) {
@@ -116,4 +129,22 @@ public class ResiEventReplyServiceImpl extends BaseServiceImpl<ResiEventReplyDao
         reCallLog.setOperateTime(resiEventReplyEntity.getCreatedTime());
         resiEventOperationLogDao.insert(reCallLog);
     }
+
+    private void scanReplyContent(String content) {
+        if (StringUtils.isNotBlank(content)) {
+            TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
+            TextTaskDTO taskDTO = new TextTaskDTO();
+            taskDTO.setContent(content);
+            taskDTO.setDataId(UUID.randomUUID().toString().replace("-", ""));
+            textScanParamDTO.getTasks().add(taskDTO);
+            Result<SyncScanResult> textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO);
+            if (!textSyncScanResult.success()) {
+                throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
+            } else {
+                if (!textSyncScanResult.getData().isAllPass()) {
+                    throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode(), EpmetErrorCode.TEXT_SCAN_FAILED.getMsg());
+                }
+            }
+        }
+    }
 }
\ No newline at end of file

From 56f9e23c7a677eefb1516e4c02c6ae56ecd6824f Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Wed, 4 Aug 2021 14:45:00 +0800
Subject: [PATCH 33/84] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=BA=BA=E5=A4=A7=E4=BB=A3=E8=A1=A8=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?-=E5=B0=86=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84gridId=E6=94=B9=E4=B8=BAcustomerId=EF=BC=8C=E5=B9=B6?=
 =?UTF-8?q?=E4=B8=94=E8=BF=94=E5=9B=9E=E5=80=BC=E4=B8=AD=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?userShowName=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/form/ResiEventNpcListFormDTO.java     |  2 +-
 .../dto/result/ResiEventNpcResultDTO.java     |  8 +++
 .../epmet/controller/ResiEventController.java |  8 +--
 .../com/epmet/service/ResiEventService.java   |  2 +-
 .../service/impl/ResiEventServiceImpl.java    | 55 +++++++++++++++----
 .../dto/form/ListUserByBadgeFormDTO.java      |  5 +-
 .../com/epmet/controller/BadgeController.java |  4 +-
 .../src/main/java/com/epmet/dao/BadgeDao.java |  2 +-
 .../java/com/epmet/service/BadgeService.java  |  2 +-
 .../epmet/service/impl/BadgeServiceImpl.java  |  4 +-
 .../src/main/resources/mapper/BadgeDao.xml    |  2 +-
 11 files changed, 67 insertions(+), 27 deletions(-)

diff --git a/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/form/ResiEventNpcListFormDTO.java b/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/form/ResiEventNpcListFormDTO.java
index 97b856a8e6..8f5921ea8d 100644
--- a/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/form/ResiEventNpcListFormDTO.java
+++ b/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/form/ResiEventNpcListFormDTO.java
@@ -9,5 +9,5 @@ import lombok.Data;
 */
 @Data
 public class ResiEventNpcListFormDTO {
-    private String gridId;
+    private String customerId;
 }
diff --git a/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/result/ResiEventNpcResultDTO.java b/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/result/ResiEventNpcResultDTO.java
index 4208f28751..f7ea5861d3 100644
--- a/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/result/ResiEventNpcResultDTO.java
+++ b/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/result/ResiEventNpcResultDTO.java
@@ -20,8 +20,16 @@ public class ResiEventNpcResultDTO {
 
     private String gridId;
 
+    /**
+     * 展示名
+     */
     private String displayName;
 
+    /**
+     * 真实姓名
+     */
+    private String userShowName;
+
     private String headImgUrl;
 
     private String agencyId;
diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java
index b594e42921..57d06b8a0b 100644
--- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java
+++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java
@@ -32,15 +32,15 @@ public class ResiEventController {
 
     /**
      * @return
-     * @Description 查询人大代表列表
+     * @Description 查询人大代表列表(客户下的)
      * @author wxz
      * @date 2021.08.03 09:17
      */
-    @PostMapping("/npc-list-ingrid")
+    @PostMapping("/npc-list")
     public Result<HashMap<String, List<ResiEventNpcResultDTO>>> listNpc(@RequestBody ResiEventNpcListFormDTO input) {
         ValidatorUtils.validateEntity(input);
-        String gridId = input.getGridId();
-        List<ResiEventNpcResultDTO> npcs = resiEventService.listNpcByGrid(gridId);
+        String customerId = input.getCustomerId();
+        List<ResiEventNpcResultDTO> npcs = resiEventService.listNpcByGrid(customerId);
 
         HashMap<String, List<ResiEventNpcResultDTO>> wrapper = new HashMap<>();
         wrapper.put("reportTargets", npcs);
diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java
index b23d04a476..85432f2a18 100644
--- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java
+++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java
@@ -18,7 +18,7 @@ public interface ResiEventService {
      * @author wxz
      * @date 2021.08.03 09:29
     */
-    List<ResiEventNpcResultDTO> listNpcByGrid(String gridId);
+    List<ResiEventNpcResultDTO> listNpcByGrid(String customerId);
 
     /**
      * @Description 查询上报目标列表
diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index 713d821588..b81eb0f47e 100644
--- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -36,32 +36,65 @@ public class ResiEventServiceImpl implements ResiEventService, ResultDataResolve
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
 
     @Override
-    public List<ResiEventNpcResultDTO> listNpcByGrid(String gridId) {
+    public List<ResiEventNpcResultDTO> listNpcByGrid(String customerId) {
 
         // 查询网格所属的组织信息
-        Result<GridInfoResultDTO> gridInfoResult = govOrgOpenFeignClient.queryGridInfo(gridId);
-        GridInfoResultDTO gridInfoData = getResultDataOrThrowsException(gridInfoResult, ServiceConstant.GOV_ORG_SERVER, null, null);
-        String parentAgencyId = gridInfoData.getParentAgencyId();
-        String pids = gridInfoData.getPids();
+        //Result<GridInfoResultDTO> gridInfoResult = govOrgOpenFeignClient.queryGridInfo(customerId);
+        //GridInfoResultDTO gridInfoData = getResultDataOrThrowsException(gridInfoResult, ServiceConstant.GOV_ORG_SERVER, null, null);
+        //String parentAgencyId = gridInfoData.getParentAgencyId();
+        //String pids = gridInfoData.getPids();
 
         //查询人大代表列表
-        ListUserByBadgeFormDTO npcForm = new ListUserByBadgeFormDTO(gridId, BadgeConstant.BADGE_KEY_NPC);
+        ListUserByBadgeFormDTO npcForm = new ListUserByBadgeFormDTO(customerId, BadgeConstant.BADGE_KEY_NPC);
         Result<List<ListUserByBadgeResultDTO>> npcResult = epmetUserOpenFeignClient.listUsersByBadge(npcForm);
         List<ListUserByBadgeResultDTO> npcData = getResultDataOrThrowsException(npcResult, ServiceConstant.EPMET_USER_SERVER, null, null);
 
-        List<ResiEventNpcResultDTO> npcResultList = npcData.stream()
-                .map(npc -> new ResiEventNpcResultDTO(npc.getUserId(), gridId, "人大代表-".concat(npc.getRealName()), npc.getHeadImgUrl(), parentAgencyId, pids))
-                .collect(Collectors.toList());
+        //批量查询人大代表所在的网格信息
+        List<String> npcGridIds = npcData.stream().map(d -> d.getGridId()).collect(Collectors.toList());
+        OrgInfoFormDTO form = new OrgInfoFormDTO(OrgInfoConstant.GRID, npcGridIds);
+        Result<List<OrgInfoResultDTO>> npcGridInfoResult = govOrgOpenFeignClient.selectOrgInfo(form);
+        List<OrgInfoResultDTO> npcGridInfos = getResultDataOrThrowsException(npcGridInfoResult, ServiceConstant.GOV_ORG_SERVER, null, null);
+
+        Map<String, OrgInfoResultDTO> npcGridInfoMap = convertNpcGridInfos2Map(npcGridInfos);
+
+        List<ResiEventNpcResultDTO> npcResultList = new ArrayList<>();
+        npcData.stream().forEach(npc -> {
+                    OrgInfoResultDTO gridInfo = npcGridInfoMap.get(npc.getGridId());
+                    ResiEventNpcResultDTO resiEventNpcInfo = new ResiEventNpcResultDTO(
+                            npc.getUserId(),
+                            npc.getGridId(),
+                            "人大代表-".concat(npc.getRealName()),
+                            npc.getRealName(),
+                            npc.getHeadImgUrl(),
+                            gridInfo != null ? gridInfo.getAgencyId() : null,
+                            gridInfo != null ? gridInfo.getPids().concat(":").concat(gridInfo.getAgencyId()) : null);
+                    npcResultList.add(resiEventNpcInfo);
+                }
+        );
 
         return npcResultList;
     }
 
     /**
-     * @Description 此处会调用org上游接口批量获取父级组织信息，由于上游接口排序不可控，因此此处需要使用TreeSet做排序
      * @return
+     * @Description 将网格信息转化为map
+     * @author wxz
+     * @date 2021.08.04 14:25
+     */
+    private Map<String, OrgInfoResultDTO> convertNpcGridInfos2Map(List<OrgInfoResultDTO> npcGridInfos) {
+        HashMap<String, OrgInfoResultDTO> result = new HashMap<>();
+        npcGridInfos.stream().forEach(i -> {
+            result.put(i.getOrgId(), i);
+        });
+        return result;
+    }
+
+    /**
+     * @return
+     * @Description 此处会调用org上游接口批量获取父级组织信息，由于上游接口排序不可控，因此此处需要使用TreeSet做排序
      * @author wxz
      * @date 2021.08.03 15:51
-    */
+     */
     @Override
     public TreeSet<ResiEventTargetLevelResultDTO> listReportTargetLevels(String gridId) {
         TreeSet<ResiEventTargetLevelResultDTO> targetLevels = new TreeSet<>();
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ListUserByBadgeFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ListUserByBadgeFormDTO.java
index 8d616bacf3..0587b7f163 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ListUserByBadgeFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ListUserByBadgeFormDTO.java
@@ -11,10 +11,9 @@ import javax.validation.constraints.NotBlank;
 @NoArgsConstructor
 public class ListUserByBadgeFormDTO {
 
-    @NotBlank(message = "网格ID不能为空")
-    private String gridId;
+    @NotBlank(message = "客户ID不能为空")
+    private String customerId;
 
     @NotBlank(message = "徽章key不能为空")
     private String badgeKey;
-
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java
index 192fc3c5d3..503da1bd31 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java
@@ -199,10 +199,10 @@ public class BadgeController {
 	public Result<List<ListUserByBadgeResultDTO>> listUsersByBadge(@RequestBody ListUserByBadgeFormDTO input) {
 		ValidatorUtils.validateEntity(input);
 
-		String gridId = input.getGridId();
+		String customerId = input.getCustomerId();
 		String badgeKey = input.getBadgeKey();
 
-		List<ListUserByBadgeResultDTO> users = badgeService.listUsersByBadge(gridId, badgeKey);
+		List<ListUserByBadgeResultDTO> users = badgeService.listUsersByBadge(customerId, badgeKey);
 		return new Result<List<ListUserByBadgeResultDTO>>().ok(users);
 	}
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java
index 5c4aab8dcb..d2a10f7026 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java
@@ -203,5 +203,5 @@ public interface BadgeDao extends BaseDao<BadgeEntity> {
 	 * @author wxz
 	 * @date 2021.08.02 10:40
 	*/
-    List<ListUserByBadgeResultDTO> listUsersByBadge(@Param("gridId") String gridId, @Param("badgeKey") String badgeKey);
+    List<ListUserByBadgeResultDTO> listUsersByBadge(@Param("customerId") String customerId, @Param("badgeKey") String badgeKey);
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java
index fad619e87b..fc06714fd9 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java
@@ -199,5 +199,5 @@ public interface BadgeService extends BaseService<BadgeEntity> {
      * @author wxz
      * @date 2021.08.02 10:39
     */
-    List<ListUserByBadgeResultDTO> listUsersByBadge(String gridId, String badgeKey);
+    List<ListUserByBadgeResultDTO> listUsersByBadge(String customerId, String badgeKey);
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java
index 985dd00c46..4734770a3a 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java
@@ -481,7 +481,7 @@ public class BadgeServiceImpl extends BaseServiceImpl<BadgeDao, BadgeEntity> imp
     }
 
     @Override
-    public List<ListUserByBadgeResultDTO> listUsersByBadge(String gridId, String badgeKey) {
-        return baseDao.listUsersByBadge(gridId, badgeKey);
+    public List<ListUserByBadgeResultDTO> listUsersByBadge(String customerId, String badgeKey) {
+        return baseDao.listUsersByBadge(customerId, badgeKey);
     }
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml
index 560867c932..09c84bde81 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml
@@ -320,7 +320,7 @@
             user_base_info.HEAD_IMG_URL
         from resi_user_badge
                  inner join badge on (badge.BADGE_KEY = #{badgeKey}
-                                    and resi_user_badge.GRID_ID = #{gridId}
+                                    and resi_user_badge.CUSTOMER_ID=#{customerId}
                                     and resi_user_badge.CERTIFICATION_AUTID_STATUS = 'approved'
                                     and resi_user_badge.DEL_FLAG = 0
                                     and resi_user_badge.BADGE_ID = badge.ID

From 83b4c555550c1e1cac8e10b5fb7c15b0f2822a61 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 4 Aug 2021 15:04:58 +0800
Subject: [PATCH 34/84] =?UTF-8?q?=E6=8A=A5=E4=BA=8B=E5=BD=93=E4=BA=8B?=
 =?UTF-8?q?=E4=BA=BA=E5=9B=9E=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/exception/EpmetErrorCode.java       |  3 +-
 .../controller/ResiEventReplyController.java  | 17 +++++
 .../epmet/service/ResiEventReplyService.java  | 10 +++
 .../impl/ResiEventReplyServiceImpl.java       | 74 +++++++++++++++++--
 4 files changed, 98 insertions(+), 6 deletions(-)

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 ead3a480f5..1a29d62e54 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
@@ -97,7 +97,8 @@ public enum EpmetErrorCode {
 	VOTE_ISSUE_PLEASE(8602,"请先选择支持或反对，再发表您的想法"),
 	RESI_EVENT_READ(8603,"当前事件正在处理中,不能撤回"),
 	RESI_EVENT_NOT_MY_REPORTED(8604,"当前事件不是您发布的，无权操作"),
-	CAN_NOT_REPLY_RESI_EVENT(8605,"办结、立项处理后不可回复"),
+	CAN_NOT_REPLY_RESI_EVENT_GOV(8605,"办结、立项处理后不可回复"),
+	CAN_NOT_REPLY_RESI_EVENT_SELF(8606,"当前事件待处理,不可回复"),
 
 	// 爱心互助 居民端
     NOT_IN_THE_SIGN_IN_RANGE(8510, "您还未进入指定的签到范围～"),
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java
index f7c57b14c5..2d8063a97c 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java
@@ -76,4 +76,21 @@ public class ResiEventReplyController {
         resiEventReplyService.govReply(replyFormDTO);
         return new Result();
     }
+
+    /**
+     * 报事当事人回复
+     * 
+     * @param tokenDto
+     * @param formDTO 
+     * @return  com.epmet.commons.tools.utils.Result 
+     * @author yinzuomei 
+     * @date 2021/8/4 14:37
+     */
+    @PostMapping("selfReply")
+    public Result selfReply(@LoginUser TokenDto tokenDto,@RequestBody ReplyFormDTO formDTO){
+        formDTO.setUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(formDTO,ReplyFormDTO.AddUserShowGroup.class,ReplyFormDTO.AddUserInternalGroup.class);
+        resiEventReplyService.selfReply(formDTO);
+        return new Result();
+    }
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventReplyService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventReplyService.java
index 4311de0805..a63654bde1 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventReplyService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventReplyService.java
@@ -50,4 +50,14 @@ public interface ResiEventReplyService extends BaseService<ResiEventReplyEntity>
      * @date 2021/8/4 14:20
      */
     void govReply(ReplyFormDTO replyFormDTO);
+
+    /**
+     * 报事当事人回复
+     *
+     * @param formDTO
+     * @return  void
+     * @author yinzuomei
+     * @date 2021/8/4 14:39
+     */
+    void selfReply(ReplyFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java
index 2bfa788811..986c8328bb 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java
@@ -34,9 +34,11 @@ import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.form.ReplyFormDTO;
 import com.epmet.dto.form.ReplyListFormDTO;
 import com.epmet.dto.result.ReplyListResultDTO;
+import com.epmet.dto.result.UserBaseInfoResultDTO;
 import com.epmet.entity.ResiEventEntity;
 import com.epmet.entity.ResiEventOperationLogEntity;
 import com.epmet.entity.ResiEventReplyEntity;
+import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.service.ResiEventReplyService;
 import org.apache.commons.lang3.StringUtils;
@@ -44,7 +46,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
@@ -63,6 +67,9 @@ public class ResiEventReplyServiceImpl extends BaseServiceImpl<ResiEventReplyDao
     private ResiEventOperationLogDao resiEventOperationLogDao;
     @Autowired
     private GovOrgOpenFeignClient govOrgOpenFeignClient;
+    @Autowired
+    private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
+
     @Value("${openapi.scan.server.url}")
     private String scanApiUrl;
     @Value("${openapi.scan.method.textSyncScan}")
@@ -96,11 +103,7 @@ public class ResiEventReplyServiceImpl extends BaseServiceImpl<ResiEventReplyDao
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void govReply(ReplyFormDTO replyFormDTO) {
-        ResiEventEntity eventEntity=resiEventDao.selectById(replyFormDTO.getResiEventId());
-        // 办结、立项处理后不可回复
-        if(EventConstant.EVENT_STATUS_CLOSED_CASE.equals(eventEntity.getStatus())||eventEntity.getShiftProject()){
-            throw new RenException(EpmetErrorCode.CAN_NOT_REPLY_RESI_EVENT.getCode(),EpmetErrorCode.CAN_NOT_REPLY_RESI_EVENT.getMsg());
-        }
+        ResiEventEntity eventEntity=queryResiEntity(replyFormDTO.getResiEventId());
         // 回复内容走审核
         scanReplyContent(replyFormDTO.getContent());
         //查询工作人员所属组织
@@ -130,6 +133,63 @@ public class ResiEventReplyServiceImpl extends BaseServiceImpl<ResiEventReplyDao
         resiEventOperationLogDao.insert(reCallLog);
     }
 
+    private ResiEventEntity queryResiEntity(String resiEventId) {
+        ResiEventEntity eventEntity=resiEventDao.selectById(resiEventId);
+        // 办结、立项处理后不可回复
+        if(EventConstant.EVENT_STATUS_CLOSED_CASE.equals(eventEntity.getStatus())||eventEntity.getShiftProject()){
+            throw new RenException(EpmetErrorCode.CAN_NOT_REPLY_RESI_EVENT_GOV.getCode(),EpmetErrorCode.CAN_NOT_REPLY_RESI_EVENT_GOV.getMsg());
+        }
+        return eventEntity;
+    }
+
+    /**
+     * 报事当事人回复
+     *
+     * @param formDTO
+     * @return void
+     * @author yinzuomei
+     * @date 2021/8/4 14:39
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void selfReply(ReplyFormDTO formDTO) {
+        //查询原事件、已办结、已立项不可回复
+        ResiEventEntity eventEntity=queryResiEntity(formDTO.getResiEventId());
+        // 只有被人读过，才可以回复
+        if (!eventEntity.getReadFlag()) {
+            throw new RenException(EpmetErrorCode.CAN_NOT_REPLY_RESI_EVENT_SELF.getCode(), EpmetErrorCode.CAN_NOT_REPLY_RESI_EVENT_SELF.getMsg());
+        }
+        // 回复内容走审核
+        scanReplyContent(formDTO.getContent());
+        // 查询当前用户的显示昵称
+        List<String> userIdList =new ArrayList<>();
+        userIdList.add(formDTO.getUserId());
+        Result<List<UserBaseInfoResultDTO>> userResult=epmetUserOpenFeignClient.queryUserBaseInfo(userIdList);
+        if(!userResult.success()|| CollectionUtils.isEmpty(userResult.getData())){
+           throw new RenException("查询当前用户信息异常");
+        }
+        // 插入回复表
+        ResiEventReplyEntity resiEventReplyEntity=new ResiEventReplyEntity();
+        resiEventReplyEntity.setCustomerId(eventEntity.getCustomerId());
+        resiEventReplyEntity.setResiEventId(formDTO.getResiEventId());
+        resiEventReplyEntity.setFromUserId(formDTO.getUserId());
+        resiEventReplyEntity.setContent(formDTO.getContent());
+        resiEventReplyEntity.setUserShowName(userResult.getData().get(0).getShowName());
+        resiEventReplyEntity.setCreatedTime(new Date());
+        baseDao.insert(resiEventReplyEntity);
+        // 记录操作日志
+        //2、插入log日志
+        ResiEventOperationLogEntity reCallLog=new ResiEventOperationLogEntity();
+        reCallLog.setCustomerId(eventEntity.getCustomerId());
+        reCallLog.setResiEventId(eventEntity.getId());
+        reCallLog.setUserId(formDTO.getUserId());
+        reCallLog.setUserIdentity(EventConstant.RESI_USER);
+        reCallLog.setActionCode(ResiEventAction.REPLY.getCode());
+        reCallLog.setActionDesc(ResiEventAction.REPLY.getDesc());
+        reCallLog.setOperateTime(resiEventReplyEntity.getCreatedTime());
+        resiEventOperationLogDao.insert(reCallLog);
+    }
+
     private void scanReplyContent(String content) {
         if (StringUtils.isNotBlank(content)) {
             TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
@@ -147,4 +207,8 @@ public class ResiEventReplyServiceImpl extends BaseServiceImpl<ResiEventReplyDao
             }
         }
     }
+
+
+
+
 }
\ No newline at end of file

From 074fdaca211405c14db5645fe261be4d5869fe03 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 4 Aug 2021 15:11:31 +0800
Subject: [PATCH 35/84] =?UTF-8?q?@=E7=9A=84=E4=BA=BA=E5=9B=9E=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ResiEventReplyController.java  | 17 ++++++++
 .../epmet/service/ResiEventReplyService.java  | 10 +++++
 .../impl/ResiEventReplyServiceImpl.java       | 43 ++++++++++++++++++-
 3 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java
index 2d8063a97c..0d7f93a2d8 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java
@@ -93,4 +93,21 @@ public class ResiEventReplyController {
         resiEventReplyService.selfReply(formDTO);
         return new Result();
     }
+
+    /**
+     * 艾特的人回复
+     *
+     * @param tokenDto
+     * @param formDTO
+     * @return  com.epmet.commons.tools.utils.Result
+     * @author yinzuomei
+     * @date 2021/8/4 15:06
+     */
+    @PostMapping("atReply")
+    public Result atReply(@LoginUser TokenDto tokenDto,@RequestBody ReplyFormDTO formDTO){
+        formDTO.setUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(formDTO,ReplyFormDTO.AddUserShowGroup.class,ReplyFormDTO.AddUserInternalGroup.class);
+        resiEventReplyService.atReply(formDTO);
+        return new Result();
+    }
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventReplyService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventReplyService.java
index a63654bde1..4ad83c6e04 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventReplyService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventReplyService.java
@@ -60,4 +60,14 @@ public interface ResiEventReplyService extends BaseService<ResiEventReplyEntity>
      * @date 2021/8/4 14:39
      */
     void selfReply(ReplyFormDTO formDTO);
+
+    /**
+     * 艾特的人回复
+     *
+     * @param formDTO
+     * @return  void
+     * @author yinzuomei
+     * @date 2021/8/4 15:06
+     */
+    void atReply(ReplyFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java
index 986c8328bb..547d17e230 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java
@@ -121,7 +121,6 @@ public class ResiEventReplyServiceImpl extends BaseServiceImpl<ResiEventReplyDao
         resiEventReplyEntity.setCreatedTime(new Date());
         baseDao.insert(resiEventReplyEntity);
         // 记录操作日志
-        //2、插入log日志
         ResiEventOperationLogEntity reCallLog=new ResiEventOperationLogEntity();
         reCallLog.setCustomerId(eventEntity.getCustomerId());
         reCallLog.setResiEventId(eventEntity.getId());
@@ -178,11 +177,51 @@ public class ResiEventReplyServiceImpl extends BaseServiceImpl<ResiEventReplyDao
         resiEventReplyEntity.setCreatedTime(new Date());
         baseDao.insert(resiEventReplyEntity);
         // 记录操作日志
-        //2、插入log日志
         ResiEventOperationLogEntity reCallLog=new ResiEventOperationLogEntity();
         reCallLog.setCustomerId(eventEntity.getCustomerId());
         reCallLog.setResiEventId(eventEntity.getId());
         reCallLog.setUserId(formDTO.getUserId());
+        reCallLog.setUserIdentity(EventConstant.REPORT_USER);
+        reCallLog.setActionCode(ResiEventAction.REPLY.getCode());
+        reCallLog.setActionDesc(ResiEventAction.REPLY.getDesc());
+        reCallLog.setOperateTime(resiEventReplyEntity.getCreatedTime());
+        resiEventOperationLogDao.insert(reCallLog);
+    }
+
+    /**
+     * 艾特的人回复
+     *
+     * @param replyFormDTO
+     * @return void
+     * @author yinzuomei
+     * @date 2021/8/4 15:06
+     */
+    @Override
+    public void atReply(ReplyFormDTO replyFormDTO) {
+        ResiEventEntity eventEntity=queryResiEntity(replyFormDTO.getResiEventId());
+        // 回复内容走审核
+        scanReplyContent(replyFormDTO.getContent());
+        // 查询当前用户的显示昵称
+        List<String> userIdList =new ArrayList<>();
+        userIdList.add(replyFormDTO.getUserId());
+        Result<List<UserBaseInfoResultDTO>> userResult=epmetUserOpenFeignClient.queryUserBaseInfo(userIdList);
+        if(!userResult.success()|| CollectionUtils.isEmpty(userResult.getData())){
+            throw new RenException("查询当前用户信息异常");
+        }
+        // 插入回复表
+        ResiEventReplyEntity resiEventReplyEntity=new ResiEventReplyEntity();
+        resiEventReplyEntity.setCustomerId(eventEntity.getCustomerId());
+        resiEventReplyEntity.setResiEventId(replyFormDTO.getResiEventId());
+        resiEventReplyEntity.setFromUserId(replyFormDTO.getUserId());
+        resiEventReplyEntity.setContent(replyFormDTO.getContent());
+        resiEventReplyEntity.setUserShowName("人大代表-".concat(userResult.getData().get(0).getRealName()));
+        resiEventReplyEntity.setCreatedTime(new Date());
+        baseDao.insert(resiEventReplyEntity);
+        // 记录操作日志
+        ResiEventOperationLogEntity reCallLog=new ResiEventOperationLogEntity();
+        reCallLog.setCustomerId(eventEntity.getCustomerId());
+        reCallLog.setResiEventId(eventEntity.getId());
+        reCallLog.setUserId(replyFormDTO.getUserId());
         reCallLog.setUserIdentity(EventConstant.RESI_USER);
         reCallLog.setActionCode(ResiEventAction.REPLY.getCode());
         reCallLog.setActionDesc(ResiEventAction.REPLY.getDesc());

From 4337d11bb75c7d9fe60859f85c13201ca4ea0a7b Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 4 Aug 2021 16:36:47 +0800
Subject: [PATCH 36/84] org

---
 .../epmet/feign/GovOrgOpenFeignClient.java    | 19 +++++++++++++
 .../GovOrgOpenFeignClientFallback.java        | 10 +++++++
 .../controller/CustomerGridController.java    | 11 ++++++++
 .../com/epmet/controller/StaffController.java | 16 ++++++++---
 .../java/com/epmet/dao/CustomerGridDao.java   |  8 ++++++
 .../com/epmet/dao/CustomerStaffAgencyDao.java |  8 ++++++
 .../epmet/service/CustomerGridService.java    |  8 ++++++
 .../java/com/epmet/service/StaffService.java  |  8 ++++++
 .../service/impl/CustomerGridServiceImpl.java | 11 ++++++++
 .../epmet/service/impl/StaffServiceImpl.java  | 27 +++++++++++++++++++
 .../main/resources/mapper/CustomerGridDao.xml | 10 +++++++
 .../mapper/CustomerStaffAgencyDao.xml         | 10 +++++++
 12 files changed, 142 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
index bf6df86b7b..3564d39a61 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
@@ -370,4 +370,23 @@ public interface GovOrgOpenFeignClient {
      */
     @PostMapping("/gov/org/staff/mine")
     Result<MineResultDTO> queryStaffProfile(@RequestBody StaffInfoFromDTO fromDTO);
+
+    /**
+     * @Description  查询工作人员名字 【xx组织-章三】
+     * @Param userId
+     * @author zxc
+     * @date 2021/8/4 4:23 下午
+     */
+    @PostMapping("/gov/org/staff/staffname")
+    Result<String> staffName(@RequestParam("userId")String userId);
+
+    /**
+     * @Description  查询网格名字
+     * @Param gridName
+     * @author zxc
+     * @date 2021/8/4 4:26 下午
+     */
+    @PostMapping("/gov/org/customergrid/selectgridname")
+    Result<String> gridName(@RequestParam("gridId")String gridId);
+
 }
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
index c384f302aa..97bc8402b7 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
@@ -215,6 +215,16 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "mine", fromDTO);
     }
 
+    @Override
+    public Result<String> staffName(String userId) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "staffName", userId);
+    }
+
+    @Override
+    public Result<String> gridName(String gridId) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "gridName", gridId);
+    }
+
     @Override
     public Result<String> selectPidsByGridId(String gridId) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "selectPidsByGridId", gridId);
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 bb06477812..7fe5c72cbe 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
@@ -252,4 +252,15 @@ public class CustomerGridController {
     public Result<String> selectPidsByGridId(@RequestParam("gridId") String gridId){
         return new Result<String>().ok(customerGridService.selectPidsByGridId(gridId));
     }
+
+    /**
+     * @Description  查询网格名字
+     * @Param gridId
+     * @author zxc
+     * @date 2021/8/4 4:26 下午
+     */
+    @PostMapping("selectgridname")
+    Result<String> gridName(@RequestParam("gridId")String gridId){
+        return new Result<String>().ok(customerGridService.gridName(gridId));
+    }
 }
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 88ee0bd046..834cd56869 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
@@ -12,10 +12,7 @@ import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.service.StaffService;
 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;
 
@@ -157,4 +154,15 @@ public class StaffController {
         ValidatorUtils.validateEntity(fromDTO, StaffBasicInfoFromDTO.AddUserInternalGroup.class);
         return staffService.staffBasicInfo(fromDTO);
     }
+
+	/**
+	 * @Description  查询工作人员名字
+	 * @Param userId
+	 * @author zxc
+	 * @date 2021/8/4 3:38 下午
+	 */
+    @PostMapping("staffname")
+	public Result<String> staffName(@RequestParam("userId")String userId){
+    	return new Result<String>().ok(staffService.staffName(userId));
+	}
 }
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 ec16bf0dcd..314c483a0f 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
@@ -276,4 +276,12 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
      * @date 2021/7/16 9:52 上午
      */
     String selectPidsByGridId(@Param("gridId")String gridId);
+
+    /**
+     * @Description  查询网格名字
+     * @Param gridId
+     * @author zxc
+     * @date 2021/8/4 4:30 下午
+     */
+    String gridName(String gridId);
 }
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 ffc46fa725..864603ee07 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
@@ -108,4 +108,12 @@ public interface CustomerStaffAgencyDao extends BaseDao<CustomerStaffAgencyEntit
 	 * @date 2020/8/17 10:19 上午
 	 */
 	List<String> getAgencyStaffList(@Param("agencyId")String agencyId);
+
+	/**
+	 * @Description  查询工作人员所属组织名字
+	 * @Param staffId
+	 * @author zxc
+	 * @date 2021/8/4 3:54 下午
+	 */
+	String selectStaffBelongAgency(@Param("staffId")String staffId);
 }
\ 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 b892fa84f8..e1cc5f79a7 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
@@ -295,4 +295,12 @@ public interface CustomerGridService extends BaseService<CustomerGridEntity> {
      * @date 2021/7/16 9:52 上午
      */
     String selectPidsByGridId(String gridId);
+
+    /**
+     * @Description  查询网格名字
+     * @Param gridId
+     * @author zxc
+     * @date 2021/8/4 4:26 下午
+     */
+    String gridName(String gridId);
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java
index f23330fa24..5ac3ac549a 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java
@@ -105,4 +105,12 @@ public interface StaffService {
 	 * @author sun
 	 */
     Result<BasicInfoResultDTO> staffBasicInfo(StaffBasicInfoFromDTO fromDTO);
+
+    /**
+     * @Description  查询工作人员名字
+     * @Param userId
+     * @author zxc
+     * @date 2021/8/4 3:38 下午
+     */
+	String staffName(String userId);
 }
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 007aabd4b9..ec5c673374 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
@@ -721,4 +721,15 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
         }
         return "";
     }
+
+    /**
+     * @Description  查询网格名字
+     * @Param gridId
+     * @author zxc
+     * @date 2021/8/4 4:26 下午
+     */
+    @Override
+    public String gridName(String gridId) {
+        return baseDao.gridName(gridId);
+    }
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java
index a77dd1c449..ec8ea004aa 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java
@@ -7,6 +7,7 @@ import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dao.CustomerStaffAgencyDao;
 import com.epmet.dto.*;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
@@ -14,6 +15,7 @@ import com.epmet.entity.CustomerAgencyEntity;
 import com.epmet.entity.CustomerStaffAgencyEntity;
 import com.epmet.feign.*;
 import com.epmet.service.*;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -51,6 +53,8 @@ public class StaffServiceImpl implements StaffService {
 	private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
 	@Autowired
 	private RedisUtils redisUtils;
+	@Autowired
+	private CustomerStaffAgencyDao customerStaffAgencyDao;
 
 	@Override
 	public Result<StaffsInAgencyResultDTO> getStaffInfoForHome(StaffsInAgencyFromDTO fromDTO) {
@@ -274,4 +278,27 @@ public class StaffServiceImpl implements StaffService {
 	public Result<BasicInfoResultDTO> staffBasicInfo(StaffBasicInfoFromDTO fromDTO) {
 		return epmetUserOpenFeignClient.getStaffBasicInfo(fromDTO);
 	}
+
+	/**
+	 * @Description  查询工作人员名字
+	 * @Param userId
+	 * @author zxc
+	 * @date 2021/8/4 3:38 下午
+	 */
+    @Override
+    public String staffName(String userId) {
+    	// 查询所属组织名字
+		String agencyName = customerStaffAgencyDao.selectStaffBelongAgency(userId);
+		if (StringUtils.isEmpty(agencyName)){
+			throw new RenException("查询工作人员所属组织名称为空");
+		}
+		StaffBasicInfoFromDTO formDTO = new StaffBasicInfoFromDTO();
+		formDTO.setStaffId(userId);
+		Result<BasicInfoResultDTO> staffBasicInfo = epmetUserOpenFeignClient.getStaffBasicInfo(formDTO);
+		if (!staffBasicInfo.success()){
+			throw new RenException("查询工作人员姓名失败");
+		}
+		String result = agencyName.concat(staffBasicInfo.getData().getRealName());
+		return result;
+    }
 }
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 6c348a0489..49025a9b9a 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
@@ -584,4 +584,14 @@
     <select id="selectPidsByGridId" resultType="java.lang.String">
         SELECT PIDS FROM customer_grid WHERE DEL_FLAG = '0' AND ID = #{gridId}
     </select>
+
+    <!-- 查询网格名字 -->
+    <select id="gridName" resultType="java.lang.String">
+        SELECT
+            CONCAT(ca.ORGANIZATION_NAME,'-',cg.GRID_NAME) AS gridName
+        FROM customer_grid cg
+        LEFT JOIN customer_agency ca ON (ca.id = cg.PID AND ca.DEL_FLAG = '0')
+        WHERE cg.DEL_FLAG = 0
+          AND cg.ID = #{gridId}
+    </select>
 </mapper>
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 3df433a5b6..b7559668a8 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
@@ -152,4 +152,14 @@
             del_flag = '0'
             AND agency_id = #{agencyId}
     </select>
+
+    <!-- 查询工作人员所属组织名字 -->
+    <select id="selectStaffBelongAgency" resultType="java.lang.String">
+        SELECT
+            CONCAT(ca.ORGANIZATION_NAME,'-') AS agencyName
+        FROM customer_staff_agency sa
+        LEFT JOIN customer_agency ca ON (ca.ID = sa.AGENCY_ID AND ca.DEL_FLAG = '0')
+        WHERE sa.DEL_FLAG = 0
+          AND sa.USER_ID = #{staffId}
+    </select>
 </mapper>
\ No newline at end of file

From de8f78f0d2ad8137360b8145df4b6a83c76939cc Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 4 Aug 2021 16:48:09 +0800
Subject: [PATCH 37/84] =?UTF-8?q?=E6=8A=A5=E4=BA=8B-=E9=A6=96=E6=AC=A1?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E4=BA=8B=E4=BB=B6-=E4=B8=A4=E7=AB=AF?=
 =?UTF-8?q?=E9=80=9A=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/form/UpdateViewTimeFormDTO.java | 28 ++++++++++++++-----
 .../com/epmet/constant/ResiEventAction.java   |  2 +-
 .../epmet/controller/ResiEventController.java | 12 ++++++--
 .../com/epmet/dao/ResiEventMentionDao.java    | 11 ++++++++
 .../epmet/dao/ResiEventOperationLogDao.java   | 16 ++++++++++-
 .../com/epmet/dao/ResiEventReportOrgDao.java  | 13 ++++++++-
 .../com/epmet/service/ResiEventService.java   |  2 +-
 .../service/impl/ResiEventServiceImpl.java    | 28 +++++++++++++++++--
 .../V0.0.16__create_resievent_tables.sql      |  4 +--
 .../resources/mapper/ResiEventMentionDao.xml  | 11 ++++++++
 .../mapper/ResiEventOperationLogDao.xml       |  8 +++++-
 .../mapper/ResiEventReportOrgDao.xml          | 11 +++++++-
 12 files changed, 126 insertions(+), 20 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/UpdateViewTimeFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/UpdateViewTimeFormDTO.java
index c2ca21208e..c397dc8d08 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/UpdateViewTimeFormDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/UpdateViewTimeFormDTO.java
@@ -9,21 +9,35 @@ import java.io.Serializable;
 /**
  * @Author zxc
  * @DateTime 2021/8/3 10:55 上午
- * @DESC
+ * @DESC 报事-首次查看事件-两端通用
  */
 @Data
 public class UpdateViewTimeFormDTO implements Serializable {
 
     private static final long serialVersionUID = 7104400078458366322L;
+    public interface AddUserInternalGroup {
+    }
+    public interface GovInternalGroup {
+    }
 
-    public interface UpdateViewTimeForm{}
+    // 居民端：resi_user；工作端：staff
+    @NotBlank(message = "viewType不能为空", groups = AddUserInternalGroup.class)
+    private String viewType;
+    @NotBlank(message = "eventId不能为空", groups = AddUserInternalGroup.class)
+    private String eventId;
+    @NotBlank(message = "orgId不能为空", groups = GovInternalGroup.class)
+    private String orgId;
 
+    //以下参数从token中获取
     /**
-     * 居民端用户:resi_user；工作人员:staff
+     * 当前用户id
      */
-    @NotBlank(message = "viewType不能为空",groups = UpdateViewTimeForm.class)
-    private String viewType;
+    @NotBlank(message = "userId不能为空", groups = AddUserInternalGroup.class)
+    private String userId;
 
-    @NotBlank(message = "事件ID不能为空",groups = UpdateViewTimeForm.class)
-    private String eventId;
+    /**
+     * 当前客户id
+     */
+    @NotBlank(message = "customerId不能为空", groups = AddUserInternalGroup.class)
+    private String customerId;
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ResiEventAction.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ResiEventAction.java
index ff9f721e1e..b7e1faa0ff 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ResiEventAction.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ResiEventAction.java
@@ -22,7 +22,7 @@ public enum ResiEventAction {
      SHIFIT_PROJECT ( "shift_project","立项"),
      CLOSE_CASE ( "close_case","办结"),
      CHOOSE_RESOLVE ( "choose_resolve","选择是否解决"),
-     READ( "read","查看事件");
+     READ_FIRST( "read_first","首次查看事件");
 
 
     private String code;
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
index 98bfe74b10..e868c85459 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
@@ -21,6 +21,7 @@ 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.constant.EventConstant;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.service.ResiEventService;
@@ -139,14 +140,19 @@ public class ResiEventController {
     }
 
     /**
-     * @Description  查看报事时,更新时间操作
+     * @Description  报事-首次查看事件-两端通用
      * @Param formDTO
      * @author zxc
      * @date 2021/8/3 11:01 上午
      */
     @PostMapping("updateviewtime")
-    public Result updateViewTime(@RequestBody UpdateViewTimeFormDTO formDTO){
-        ValidatorUtils.validateEntity(formDTO, UpdateViewTimeFormDTO.UpdateViewTimeForm.class);
+    public Result updateViewTime(@LoginUser TokenDto tokenDto,@RequestBody UpdateViewTimeFormDTO formDTO){
+        formDTO.setUserId(tokenDto.getUserId());
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        ValidatorUtils.validateEntity(formDTO,UpdateViewTimeFormDTO.AddUserInternalGroup.class);
+        if(EventConstant.STAFF.equals(formDTO.getViewType())){
+            ValidatorUtils.validateEntity(formDTO,UpdateViewTimeFormDTO.GovInternalGroup.class);
+        }
         resiEventService.updateViewTime(formDTO);
         return new Result();
     }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java
index 981cee667a..6580567b78 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java
@@ -44,4 +44,15 @@ public interface ResiEventMentionDao extends BaseDao<ResiEventMentionEntity> {
      * @date 2021/8/4 9:54
      */
     List<UserMentionResultDTO> selectMentionList(@Param("userId")String userId, @Param("readFlag")String readFlag);
+
+    /**
+     * 人大代表从未读-》已读，首次查看事件
+     *
+     * @param eventId
+     * @param userId
+     * @return  int
+     * @author yinzuomei
+     * @date 2021/8/4 16:37
+     */
+    int updateReadFlag(@Param("eventId") String eventId, @Param("userId")String userId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventOperationLogDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventOperationLogDao.java
index 6432b2dbb6..d6e16450a0 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventOperationLogDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventOperationLogDao.java
@@ -20,6 +20,9 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.entity.ResiEventOperationLogEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 事件操作日志表
@@ -29,5 +32,16 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface ResiEventOperationLogDao extends BaseDao<ResiEventOperationLogEntity> {
-	
+
+    /**
+     * 查询事件操作日志
+     *
+     * @param eventId
+     * @param userId
+     * @param actionCode
+     * @return  com.epmet.entity.ResiEventOperationLogEntity
+     * @author yinzuomei
+     * @date 2021/8/4 16:44
+     */
+    List<ResiEventOperationLogEntity> selectByUserAction(@Param("eventId") String eventId, @Param("userId")String userId, @Param("actionCode")String actionCode);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventReportOrgDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventReportOrgDao.java
index b8d9776cab..5d8a5044a5 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventReportOrgDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventReportOrgDao.java
@@ -20,6 +20,7 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.entity.ResiEventReportOrgEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 事件相关组织表
@@ -29,5 +30,15 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface ResiEventReportOrgDao extends BaseDao<ResiEventReportOrgEntity> {
-	
+
+    /**
+     * 工作人员从待处理=》处理中
+     *
+     * @param eventId
+     * @param orgId
+     * @return  int
+     * @author yinzuomei
+     * @date 2021/8/4 16:40
+     */
+    int updateReadFlag(@Param("eventId") String eventId, @Param("orgId") String orgId,@Param("userId") String userId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java
index 604375b0fb..596609d158 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java
@@ -24,7 +24,7 @@ public interface ResiEventService extends BaseService<ResiEventEntity> {
     List<EventListResultDTO> eventList(EventListFormDTO formDTO);
 
     /**
-     * @Description  查看报事时,更新时间操作
+     * @Description  报事-首次查看事件-两端通用
      * @Param formDTO
      * @author zxc
      * @date 2021/8/3 11:01 上午
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index ce21f19a58..1c41b517fb 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -102,14 +102,38 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
     }
 
     /**
-     * @Description  查看报事时,更新时间操作
+     * @Description  报事-首次查看事件-两端通用
      * @Param formDTO
      * @author zxc
      * @date 2021/8/3 11:01 上午
      */
     @Override
     public void updateViewTime(UpdateViewTimeFormDTO formDTO) {
-
+        ResiEventEntity eventEntity=baseDao.selectById(formDTO.getEventId());
+        if(null!=eventEntity){
+            eventEntity.setReadFlag(true);
+            baseDao.updateById(eventEntity);
+        }
+        // 居民端：resi_user；工作端：staff
+        if(EventConstant.RESI_USER.equals(formDTO.getViewType())){
+            resiEventMentionDao.updateReadFlag(formDTO.getEventId(),formDTO.getUserId());
+        }else if(EventConstant.STAFF.equals(formDTO.getViewType())){
+            resiEventReportOrgDao.updateReadFlag(formDTO.getEventId(),formDTO.getOrgId(),formDTO.getUserId());
+        }
+        // 插入查看日志
+        List<ResiEventOperationLogEntity> logEntityList = resiEventOperationLogDao.selectByUserAction(formDTO.getEventId(), formDTO.getUserId(), ResiEventAction.READ_FIRST.getCode());
+        if (CollectionUtils.isEmpty(logEntityList)) {
+            ResiEventOperationLogEntity publishLog=new ResiEventOperationLogEntity();
+            publishLog.setCustomerId(formDTO.getCustomerId());
+            publishLog.setResiEventId(formDTO.getEventId());
+            publishLog.setUserId(formDTO.getUserId());
+            publishLog.setUserIdentity(formDTO.getViewType());
+            publishLog.setActionCode(ResiEventAction.READ_FIRST.getCode());
+            publishLog.setActionDesc(ResiEventAction.READ_FIRST.getDesc());
+            publishLog.setOperateTime(new Date());
+            publishLog.setCreatedTime(publishLog.getOperateTime());
+            resiEventOperationLogDao.insert(publishLog);
+        }
     }
 
     /**
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql
index 8aa3fab8d9..ae83c130fd 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql
@@ -115,8 +115,8 @@ CREATE TABLE `resi_event_operation_log` (
   `RESI_EVENT_ID` varchar(64) NOT NULL COMMENT '事件id',
   `USER_ID` varchar(64) NOT NULL COMMENT '用户id',
   `USER_IDENTITY` varchar(32) NOT NULL COMMENT '居民端用户:resi_user；工作人员:staff；报事人:report_user',
-  `ACTION_CODE` varchar(32) NOT NULL COMMENT '1、发布事件：publish；\r\n2、撤回事件：recall；\r\n3、复：reply；\r\n4、立项：shift_project；\r\n5、办结：close_case;\r\n6、选择是否已解决：choose_resolve;\r\n7、查看阅读事件：read：人大代表未读=>已读；工作人员待处理=>处理中；\r\n',
-  `ACTION_DESC` varchar(32) NOT NULL COMMENT '1、发布事件：publish；\r\n2、撤回事件：recall；\r\n3、复：reply；\r\n4、立项：shift_project；\r\n5、办结：close_case;\r\n6、选择是否已解决：choose_resolve;\r\n7、查看阅读事件：read：人大代表未读=>已读；工作人员待处理=>处理中；',
+  `ACTION_CODE` varchar(32) NOT NULL COMMENT '1、发布事件：publish；\r\n2、撤回事件：recall；\r\n3、复：reply；\r\n4、立项：shift_project；\r\n5、办结：close_case;\r\n6、选择是否已解决：choose_resolve;\r\n7、首次查看阅读事件：read_first：人大代表未读=>已读；工作人员待处理=>处理中；\r\n',
+  `ACTION_DESC` varchar(32) NOT NULL COMMENT '1、发布事件：publish；\r\n2、撤回事件：recall；\r\n3、复：reply；\r\n4、立项：shift_project；\r\n5、办结：close_case;\r\n6、选择是否已解决：choose_resolve;\r\n7、首次查看阅读事件：read_first：人大代表未读=>已读；工作人员待处理=>处理中；',
   `OPERATE_TIME` datetime NOT NULL COMMENT '操作时间',
   `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标识 1删除；0未删除',
   `REVISION` int(11) NOT NULL COMMENT '乐观锁',
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml
index 7a4f145c75..3de3934948 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml
@@ -54,4 +54,15 @@
         </if>
     </select>
 
+    <!--    人大代表从未读-》已读，首次查看事件  -->
+    <update id="updateReadFlag" parameterType="map">
+           UPDATE resi_event_mention
+            SET READ_FLAG = 'read',
+            UPDATED_BY = #{userId},
+            UPDATED_TIME = NOW()
+            WHERE
+                RESI_EVENT_ID = #{eventId}
+                AND USER_ID = #{userId}
+                AND DEL_FLAG = '0'
+    </update>
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventOperationLogDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventOperationLogDao.xml
index 12d1f0ce48..29052bcccb 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventOperationLogDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventOperationLogDao.xml
@@ -2,7 +2,13 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.epmet.dao.ResiEventOperationLogDao">
-
+    <select id="selectByUserAction" parameterType="map" resultType="com.epmet.entity.ResiEventOperationLogEntity">
+        select * from resi_event_operation_log m
+        where m.DEL_FLAG='0'
+        and m.RESI_EVENT_ID=#{eventId}
+        and m.USER_ID=#{userId}
+        and m.ACTION_CODE=#{actionCode}
+    </select>
 
 
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReportOrgDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReportOrgDao.xml
index 7c8b96db9e..9ff79fe891 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReportOrgDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReportOrgDao.xml
@@ -4,5 +4,14 @@
 <mapper namespace="com.epmet.dao.ResiEventReportOrgDao">
 
 
-
+    <update id="updateReadFlag" parameterType="map">
+        UPDATE resi_event_report_org
+        SET READ_FLAG = 'read',
+        UPDATED_BY = #{userId},
+        UPDATED_TIME = NOW()
+        WHERE
+            RESI_EVENT_ID = #{eventId}
+            AND ORG_ID = #{orgId}
+            AND DEL_FLAG = '0'
+    </update>
 </mapper>
\ No newline at end of file

From e49fcf5722a3e2510d683f5a622c78b186c6e7cc Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 4 Aug 2021 16:51:15 +0800
Subject: [PATCH 38/84] =?UTF-8?q?=E5=85=88=E6=8F=90=E4=B8=80=E9=83=A8?=
 =?UTF-8?q?=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/EventProjectInfoDTO.java    |  4 ++
 .../dto/result/EventDetailResultDTO.java      | 18 ++++++++
 .../main/java/com/epmet/dao/ProjectDao.java   |  9 ++++
 .../main/java/com/epmet/dao/ResiEventDao.java |  9 ++++
 .../service/impl/ResiEventServiceImpl.java    | 41 ++++++++++++++++++-
 .../src/main/resources/mapper/ProjectDao.xml  | 13 ++++++
 .../main/resources/mapper/ResiEventDao.xml    | 40 ++++++++++++++++++
 7 files changed, 133 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/EventProjectInfoDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/EventProjectInfoDTO.java
index b8de802fe0..f3866f0a13 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/EventProjectInfoDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/EventProjectInfoDTO.java
@@ -1,5 +1,6 @@
 package com.epmet.dto;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -29,6 +30,9 @@ public class EventProjectInfoDTO implements Serializable {
      */
     private String operationTime;
 
+    @JsonIgnore
+    private String userId;
+
     /**
      * 报事说明
      */
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java
index 85e0a0a9b2..b16e292f44 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java
@@ -1,6 +1,7 @@
 package com.epmet.dto.result;
 
 import com.epmet.dto.EventProjectInfoDTO;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -37,6 +38,9 @@ public class EventDetailResultDTO implements Serializable {
      */
     private String gridName;
 
+    @JsonIgnore
+    private String gridId;
+
     /**
      * 是否办结【是：true，否：false】
      */
@@ -62,11 +66,25 @@ public class EventDetailResultDTO implements Serializable {
      */
     private List<String> eventPerson;
 
+    /**
+     * 报事人名字
+     */
+    private String eventPeopleName;
+
+    @JsonIgnore
+    private String eventUserId;
+
     /**
      * 项目信息
      */
     private EventProjectInfoDTO projectInfo;
 
+    @JsonIgnore
+    private String projectId;
+
+    @JsonIgnore
+    private Boolean isProject;
+
     public EventDetailResultDTO() {
         this.eventTime = "";
         this.eventContent = "";
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 d5c2dbab5d..a4c1b69b36 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,6 +18,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.EventProjectInfoDTO;
 import com.epmet.dto.ProjectDTO;
 import com.epmet.dto.ProjectStaffDTO;
 import com.epmet.dto.form.LatestListFormDTO;
@@ -206,4 +207,12 @@ public interface ProjectDao extends BaseDao<ProjectEntity> {
 	 * @return java.util.List<com.epmet.dto.result.UnResolvedResultDTO>
 	 */
 	List<UnResolvedResultDTO> selectUnResolvedListByGrid(@Param("gridId")String gridId);
+
+	/**
+	 * @Description  查询报事转项目详情
+	 * @Param projectId
+	 * @author zxc
+	 * @date 2021/8/4 2:43 下午
+	 */
+	EventProjectInfoDTO selectEventProjectInfo(@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/ResiEventDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java
index 95f95f4959..87ffeb3d1a 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java
@@ -18,6 +18,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.result.EventDetailResultDTO;
 import com.epmet.dto.result.EventListResultDTO;
 import com.epmet.dto.result.MyReportedResultDTO;
 import com.epmet.entity.ResiEventEntity;
@@ -54,4 +55,12 @@ public interface ResiEventDao extends BaseDao<ResiEventEntity> {
      * @date 2021/8/3 23:21
      */
     List<MyReportedResultDTO> queryMyReported(@Param("userId") String userId, @Param("statusCondition")String statusCondition);
+
+    /**
+     * @Description  查询报事详情
+     * @Param eventId
+     * @author zxc
+     * @date 2021/8/4 2:16 下午
+     */
+    EventDetailResultDTO selectEventDetail(@Param("eventId")String eventId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index 1c41b517fb..2d27b7284e 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -35,11 +35,13 @@ import com.epmet.commons.tools.utils.ScanContentUtils;
 import com.epmet.constant.EventConstant;
 import com.epmet.constant.ResiEventAction;
 import com.epmet.dao.*;
+import com.epmet.dto.EventProjectInfoDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.*;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
+import com.epmet.feign.GovProjectOpenFeignClient;
 import com.epmet.service.ResiEventService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -82,6 +84,8 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
     private ResiEventMentionDao resiEventMentionDao;
     @Autowired
     private ResiEventOperationLogDao resiEventOperationLogDao;
+    @Autowired
+    private ProjectDao projectDao;
 
     /**
      * @Description  群众直报（待处理、处理中、已办结）列表
@@ -144,8 +148,43 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
      */
     @Override
     public EventDetailResultDTO eventDetail(EventDetailFormDTO formDTO) {
-        return null;
+        EventDetailResultDTO dto = baseDao.selectEventDetail(formDTO.getEventId());
+        if (null == dto){
+            return new EventDetailResultDTO();
+        }
+        // 已转项目
+        if (dto.getIsProject()){
+            // 查询项目信息
+            EventProjectInfoDTO eventProjectInfo = projectDao.selectEventProjectInfo(dto.getProjectId());
+            // 查询操作人的名字
+            Result<String> staffName = govOrgOpenFeignClient.staffName(eventProjectInfo.getUserId());
+            if (!staffName.success()){
+                throw new RenException("查询工作人员名字失败");
+            }
+            eventProjectInfo.setOperationName(staffName.getData());
+            dto.setProjectInfo(eventProjectInfo);
+        }
+        // 查询报事人名字
+        List<String> userIdList = new ArrayList<>();
+        userIdList.add(dto.getEventUserId());
+        Result<List<UserBaseInfoResultDTO>> userResult=epmetUserOpenFeignClient.queryUserBaseInfo(userIdList);
+        if(!userResult.success()|| CollectionUtils.isEmpty(userResult.getData())){
+            throw new RenException("查询当前用户信息异常");
+        }
+        userResult.getData().forEach(u -> {
+            if (u.getUserId().equals(dto.getEventUserId())){
+                dto.setEventPeopleName(u.getShowName());
+            }
+        });
+        // 查询所属网格
+        Result<String> gridNameResult = govOrgOpenFeignClient.gridName(dto.getGridId());
+        if (!gridNameResult.success()){
+            throw new RenException("查询所属网格失败");
+        }
+        dto.setGridName(gridNameResult.getData());
+        return dto;
     }
+
     /**
      * 我要报事-提交（尹）
      *
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 5940f47003..7b0dac13a0 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
@@ -379,4 +379,17 @@
         ORDER BY a.UPDATED_TIME DESC
     </select>
 
+    <!-- 查询报事转项目详情 -->
+    <select id="selectEventProjectInfo" resultType="com.epmet.dto.EventProjectInfoDTO">
+        SELECT
+            p.ID AS projectId,
+            IFNULL(DATE_FORMAT(p.CREATED_TIME,'%Y-%m-%d %h-%m-%s'),'') AS operationTime,
+            p.CREATED_BY AS userId,
+            IFNULL(pp.PUBLIC_REPLY,'') AS projectDeclare
+        FROM project p
+        LEFT JOIN project_process pp ON (pp.PROJECT_ID = p.ID AND pp.DEL_FLAG = '0')
+        WHERE p.DEL_FLAG = '0'
+          AND p.ID = #{projectId}
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
index c80501a831..a9461bd9b4 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
@@ -88,4 +88,44 @@
             </if>
             order by re.LATEST_OPERATED_TIME desc
     </select>
+
+    <!-- 报事详情 -->
+    <resultMap id="selectEventDetailMap" type="com.epmet.dto.result.EventDetailResultDTO">
+        <result property="isProject" column="isProject"/>
+        <result property="eventTime" column="eventTime"/>
+        <result property="eventContent" column="eventContent"/>
+        <result property="eventAddress" column="eventAddress"/>
+        <result property="isClosed" column="isClosed"/>
+        <result property="isResolve" column="isResolve"/>
+        <result property="isRollback" column="isRollback"/>
+        <result property="projectId" column="projectId"/>
+        <result property="gridId" column="gridId"/>
+        <result property="eventUserId" column="eventUserId"/>
+        <collection property="eventImgs" ofType="java.lang.String">
+            <result column="eventImg"/>
+        </collection>
+        <collection property="eventPerson" ofType="java.lang.String">
+            <result column="person"/>
+        </collection>
+    </resultMap>
+    <select id="selectEventDetail" resultMap="selectEventDetailMap">
+        SELECT
+            IFNULL(DATE_FORMAT(re.CREATED_TIME,'%Y-%m-%d %H:%i:%s'),'') AS eventTime,
+            IFNULL(re.EVENT_CONTENT,'') AS eventContent,
+            IFNULL(re.ADDRESS,'') AS eventAddress,
+            (CASE WHEN re.`STATUS` = 'processing' THEN FALSE WHEN re.`STATUS` = 'closed_case' THEN TRUE ELSE FALSE END) AS isClosed,
+            (IF(re.`STATUS` = 'processing', FALSE, (CASE WHEN re.RESOLVE_STATUS = 'resolved' THEN TRUE ELSE FALSE END))) AS isResolve,
+            (CASE WHEN re.READ_FLAG = 1 THEN FALSE ELSE TRUE END) AS isRollback,
+            (CASE WHEN re.SHIFT_PROJECT = 1 THEN TRUE ELSE FALSE END) AS isProject,
+            IFNULL(re.project_id,'') AS projectId,
+            IFNULL(ea.ATTACHMENT_URL,'') AS eventImg,
+            concat('人大代表-',IFNULL(em.USER_SHOW_NAME,'')) AS person,
+            re.GRID_ID AS gridId,
+            re.CREATED_BY AS eventUserId
+        FROM resi_event re
+        LEFT JOIN resi_event_attachment ea ON (ea.RESI_EVENT_ID = re.ID AND ea.DEL_FLAG = '0')
+        LEFT JOIN resi_event_mention em ON (em.RESI_EVENT_ID = re.ID AND em.DEL_FLAG = '0')
+        WHERE re.DEL_FLAG = '0'
+            AND re.ID = #{eventId}
+    </select>
 </mapper>
\ No newline at end of file

From e32581e639989f488e04279667b59919759df443 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 4 Aug 2021 17:51:50 +0800
Subject: [PATCH 39/84] =?UTF-8?q?=E6=8A=A5=E4=BA=8B=E4=BA=BA=E5=9B=9E?=
 =?UTF-8?q?=E5=A4=8D=EF=BC=9A@=E7=9A=84=E4=BA=BA=E5=92=8C=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E6=98=BE=E7=A4=BA=E7=BA=A2=E7=82=B9;@=E4=BA=BA?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=8D=EF=BC=9A=E8=A2=AB@=E7=9A=84=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96=E4=BA=BA+=E6=8A=A5=E4=BA=8B=E4=BA=BA+=E6=8A=A5?=
 =?UTF-8?q?=E7=BB=99=E7=9A=84=E7=BB=84=E7=BB=87=E6=98=BE=E7=A4=BA=E7=BA=A2?=
 =?UTF-8?q?=E7=82=B9=EF=BC=9B=E7=BB=84=E7=BB=87=E5=9B=9E=E5=A4=8D=EF=BC=9A?=
 =?UTF-8?q?=E6=8A=A5=E4=BA=8B=E4=BA=BA+@=E7=9A=84=E4=BA=BA+=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96=E7=BB=84=E7=BB=87=E6=98=BE=E7=A4=BA=E7=BA=A2=E7=82=B9?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dao/ResiEventMentionDao.java    | 10 +++++++
 .../com/epmet/dao/ResiEventReportOrgDao.java  | 10 +++++++
 .../impl/ResiEventReplyServiceImpl.java       | 26 ++++++++++++++++---
 .../service/impl/ResiEventServiceImpl.java    |  6 +++--
 .../resources/mapper/ResiEventMentionDao.xml  | 13 ++++++++++
 .../mapper/ResiEventReportOrgDao.xml          |  9 +++++++
 6 files changed, 69 insertions(+), 5 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java
index 6580567b78..15062a1385 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java
@@ -55,4 +55,14 @@ public interface ResiEventMentionDao extends BaseDao<ResiEventMentionEntity> {
      * @date 2021/8/4 16:37
      */
     int updateReadFlag(@Param("eventId") String eventId, @Param("userId")String userId);
+
+    /**
+     * 展示红点
+     *
+     * @param resiEventId
+     * @return  int
+     * @author yinzuomei
+     * @date 2021/8/4 17:41
+     */
+    int updateRedDotShow(@Param("resiEventId") String resiEventId,@Param("excludeUserId")String excludeUserId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventReportOrgDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventReportOrgDao.java
index 5d8a5044a5..216f6dace8 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventReportOrgDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventReportOrgDao.java
@@ -41,4 +41,14 @@ public interface ResiEventReportOrgDao extends BaseDao<ResiEventReportOrgEntity>
      * @date 2021/8/4 16:40
      */
     int updateReadFlag(@Param("eventId") String eventId, @Param("orgId") String orgId,@Param("userId") String userId);
+
+    /**
+     * 展示红点
+     *
+     * @param resiEventId
+     * @return  int
+     * @author yinzuomei
+     * @date 2021/8/4 17:41
+     */
+    int updateRedDotShow(String resiEventId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java
index 547d17e230..5f1d1ddaee 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java
@@ -27,9 +27,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.ScanContentUtils;
 import com.epmet.constant.EventConstant;
 import com.epmet.constant.ResiEventAction;
-import com.epmet.dao.ResiEventDao;
-import com.epmet.dao.ResiEventOperationLogDao;
-import com.epmet.dao.ResiEventReplyDao;
+import com.epmet.dao.*;
 import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.form.ReplyFormDTO;
 import com.epmet.dto.form.ReplyListFormDTO;
@@ -66,6 +64,10 @@ public class ResiEventReplyServiceImpl extends BaseServiceImpl<ResiEventReplyDao
     @Autowired
     private ResiEventOperationLogDao resiEventOperationLogDao;
     @Autowired
+    private ResiEventMentionDao resiEventMentionDao;
+    @Autowired
+    private ResiEventReportOrgDao resiEventReportOrgDao;
+    @Autowired
     private GovOrgOpenFeignClient govOrgOpenFeignClient;
     @Autowired
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
@@ -130,6 +132,12 @@ public class ResiEventReplyServiceImpl extends BaseServiceImpl<ResiEventReplyDao
         reCallLog.setActionDesc(ResiEventAction.REPLY.getDesc());
         reCallLog.setOperateTime(resiEventReplyEntity.getCreatedTime());
         resiEventOperationLogDao.insert(reCallLog);
+        // 1、更新被@的人的红点置为显示
+        resiEventMentionDao.updateRedDotShow(replyFormDTO.getResiEventId(),null);
+        // 2、更新报事人的红点置为显示
+        eventEntity.setRedDot(true);
+        resiEventDao.updateById(eventEntity);
+        // 3、组织改为不显示已经在查看详情中操作了 ,目前只有一个组织，如果后面可以报给多个组织，这里入参要增加orgId
     }
 
     private ResiEventEntity queryResiEntity(String resiEventId) {
@@ -186,6 +194,11 @@ public class ResiEventReplyServiceImpl extends BaseServiceImpl<ResiEventReplyDao
         reCallLog.setActionDesc(ResiEventAction.REPLY.getDesc());
         reCallLog.setOperateTime(resiEventReplyEntity.getCreatedTime());
         resiEventOperationLogDao.insert(reCallLog);
+        // 1、更新被@的人的红点置为显示
+        resiEventMentionDao.updateRedDotShow(formDTO.getResiEventId(),null);
+        // 2、更新报事人的红点置为不显示已经在查看详情中操作了
+        // 3、组织改为显示
+        resiEventReportOrgDao.updateRedDotShow(formDTO.getResiEventId());
     }
 
     /**
@@ -227,6 +240,13 @@ public class ResiEventReplyServiceImpl extends BaseServiceImpl<ResiEventReplyDao
         reCallLog.setActionDesc(ResiEventAction.REPLY.getDesc());
         reCallLog.setOperateTime(resiEventReplyEntity.getCreatedTime());
         resiEventOperationLogDao.insert(reCallLog);
+        // 1、当前被艾特的人红点不展示已经在查看详情接口操作了，其他被@的人的红点置为显示
+        resiEventMentionDao.updateRedDotShow(replyFormDTO.getResiEventId(),replyFormDTO.getUserId());
+        // 2、更新报事人的红点置为显示
+        eventEntity.setRedDot(true);
+        resiEventDao.updateById(eventEntity);
+        // 3、组织改为显示
+        resiEventReportOrgDao.updateRedDotShow(replyFormDTO.getResiEventId());
     }
 
     private void scanReplyContent(String content) {
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index 1c41b517fb..3c3d2e84b9 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -230,7 +230,8 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
             mentionEntity.setAgencyId(npc.getAgencyId());
             mentionEntity.setPids(npc.getPids());
             mentionEntity.setReadFlag(EventConstant.UN_READ);
-            mentionEntity.setRedDot(true);
+            //默认不展示，因为此时在未读列表中
+            mentionEntity.setRedDot(false);
             list.add(mentionEntity);
         });
         return list;
@@ -245,7 +246,8 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
             entity.setOrgType(org.getOrgLevel());
             //默认是未读
             entity.setOrgRead(EventConstant.UN_READ);
-            entity.setRedDot(true);
+            //默认是不展示红点，因为此时在待处理中。
+            entity.setRedDot(false);
             list.add(entity);
         });
         return list;
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml
index 3de3934948..88a62a2f2a 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml
@@ -65,4 +65,17 @@
                 AND USER_ID = #{userId}
                 AND DEL_FLAG = '0'
     </update>
+
+    <!--     除了当前用户，都置为显示红点 -->
+    <update id="updateRedDotShow" parameterType="map">
+         UPDATE resi_event_mention
+            SET RED_DOT = '1',
+            UPDATED_TIME = NOW()
+            WHERE
+                RESI_EVENT_ID = #{resiEventId}
+                <if test="excludeUserId != null and excludeUserId.trim() != ''">
+                    and user_id !=#{excludeUserId}
+                </if>
+                AND DEL_FLAG = '0'
+    </update>
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReportOrgDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReportOrgDao.xml
index 9ff79fe891..98795d7364 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReportOrgDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReportOrgDao.xml
@@ -14,4 +14,13 @@
             AND ORG_ID = #{orgId}
             AND DEL_FLAG = '0'
     </update>
+
+    <update id="updateRedDotShow" parameterType="java.lang.String">
+        UPDATE resi_event_report_org
+         SET RED_DOT = '1',
+        UPDATED_TIME = NOW()
+        WHERE
+            RESI_EVENT_ID = #{resiEventId}
+            AND DEL_FLAG = '0'
+    </update>
 </mapper>
\ No newline at end of file

From ddc632c4ebbbaea0c7ff06a362cc3f09df8428eb Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Wed, 4 Aug 2021 18:02:48 +0800
Subject: [PATCH 40/84] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/project/ResiEventDTO.java   | 85 +++++++++++++++++++
 .../com/epmet/constant/ProjectConstant.java   |  1 +
 .../com/epmet/dao/project/ProjectDao.java     | 12 ++-
 .../FactAgencyGovernDailyServiceImpl.java     | 34 +++++++-
 .../impl/FactGridGovernDailyServiceImpl.java  | 20 ++++-
 .../impl/ProjectExtractServiceImpl.java       | 26 ++++--
 .../service/impl/StatsIssueServiceImpl.java   |  2 +-
 .../epmet/service/project/ProjectService.java |  8 ++
 .../project/impl/ProjectServiceImpl.java      | 15 +++-
 .../extract/FactOriginProjectLogDailyDao.xml  |  3 +-
 .../resources/mapper/project/ProjectDao.xml   | 19 ++++-
 11 files changed, 198 insertions(+), 27 deletions(-)
 create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/project/ResiEventDTO.java

diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/project/ResiEventDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/project/ResiEventDTO.java
new file mode 100644
index 0000000000..d0e2efaf01
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/project/ResiEventDTO.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.dto.project;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 居民报事表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-08-03
+ */
+@Data
+public class ResiEventDTO implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
+
+	/**
+	 * 事件id
+	 */
+	private String resiEventId;
+
+	/**
+	 * 报给？：
+	 网格：grid；
+	 社区：community；
+	 乡（镇、街道）级:street；
+	 区县级: district；
+	 市级: city；
+	 省级:province。
+	 */
+	private String orgType;
+
+	/**
+	 * 报给的组织或者网格id
+	 */
+	private String orgId;
+
+	/**
+	 * org_id的上级组织id，org_id是跟组织，此列为0
+	 */
+	private String orgPid;
+
+	/**
+	 * org_id的所有上级组织id，org_id是跟组织，此列为0
+	 */
+	private String orgPids;
+
+	/**
+	 * 含义：已读read，未读：un_read；组织下的工作人员从待处理=>处理中，点击查看详情前更新为已读；
+	 */
+	private String orgRead;
+
+	/**
+	 * (1)含义：1:展示红点；0：不展示；(2)注意：发布事件插入数据时为1，(3)何时更新？：人大代表回复or报事人回复or工作人员回复、立项、办结更新为1；
+	 */
+	private Boolean redDot;
+
+	private String projectId;
+
+	private String createdBy;
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/ProjectConstant.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/ProjectConstant.java
index b714ce2210..af4ef095f6 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/ProjectConstant.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/ProjectConstant.java
@@ -81,4 +81,5 @@ public interface ProjectConstant {
      * 项目来源于 工作端立项
      */
     String PROJECT_ORIGIN_AGENCY="agency";
+    String PROJECT_ORIGIN_EVENT="resi_event";
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectDao.java
index 704aa3ee26..a0f70a5591 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectDao.java
@@ -19,10 +19,7 @@ package com.epmet.dao.project;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.ProjectDTO;
-import com.epmet.dto.project.ProjectAgencyDTO;
-import com.epmet.dto.project.ProjectCategoryDTO;
-import com.epmet.dto.project.ProjectGridDTO;
-import com.epmet.dto.project.ProjectPointDTO;
+import com.epmet.dto.project.*;
 import com.epmet.dto.project.result.ProjectExceedParamsResultDTO;
 import com.epmet.entity.project.ProjectEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -194,4 +191,11 @@ public interface ProjectDao extends BaseDao<ProjectEntity> {
     List<String> selectClosedProjectIds(@Param("customerId")String customerId,
                                         @Param("origin")String origin,
                                         @Param("projectStatus")String projectStatus);
+
+    /**
+     * 获取已转项目事件事件
+     * @param customerId
+     * @return
+     */
+    List<ResiEventDTO> getEventList(@Param("customerId")String customerId);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java
index 9cae42b818..c2ebfd43e6 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java
@@ -206,24 +206,54 @@ public class FactAgencyGovernDailyServiceImpl extends BaseServiceImpl<FactAgency
 			Map<String, OrgStatisticsResultDTO> projectResolvedTotal = factOriginProjectMainDailyService.getAgencyClosedProjectCount(customerId,
 					dateId,	ProjectConstant.RESOLVED,
 					OrgTypeConstant.AGENCY);
+			Map<String, OrgStatisticsResultDTO> eventProjectResolvedTotal = factOriginProjectMainDailyService.getAgencyClosedProjectCount(customerId,
+					dateId,	ProjectConstant.RESOLVED,
+					ProjectConstant.PROJECT_ORIGIN_EVENT);
 			if (!projectResolvedTotal.isEmpty()) {
 				agencyGovernDailyList.forEach(item -> {
 					OrgStatisticsResultDTO dto = projectResolvedTotal.get(item.getAgencyId());
+					int sum = item.getApprovalProjectResolvedCount();
+					if (null != dto) {
+						sum = sum + dto.getSum();
+					}
+					item.setApprovalProjectResolvedCount(sum);
+				});
+			}
+			if (!eventProjectResolvedTotal.isEmpty()) {
+				agencyGovernDailyList.forEach(item -> {
+					OrgStatisticsResultDTO dto = eventProjectResolvedTotal.get(item.getAgencyId());
+					int sum = item.getApprovalProjectResolvedCount();
 					if (null != dto) {
-						item.setApprovalProjectResolvedCount(dto.getSum());
+						sum = sum + dto.getSum();
 					}
+					item.setApprovalProjectResolvedCount(sum);
 				});
 			}
 			// 当前组织内：来源于议题的项目：结案无需解决数
 			Map<String, OrgStatisticsResultDTO> projectUnResolvedTotal = factOriginProjectMainDailyService.getAgencyClosedProjectCount(customerId,
 					dateId,	ProjectConstant.UNRESOLVED,
 					OrgTypeConstant.AGENCY);
+			Map<String, OrgStatisticsResultDTO> eventProjectUnResolvedTotal = factOriginProjectMainDailyService.getAgencyClosedProjectCount(customerId,
+					dateId,	ProjectConstant.UNRESOLVED,
+					ProjectConstant.PROJECT_ORIGIN_EVENT);
 			if (!projectUnResolvedTotal.isEmpty()) {
 				agencyGovernDailyList.forEach(item -> {
 					OrgStatisticsResultDTO dto = projectUnResolvedTotal.get(item.getAgencyId());
+					int sum = item.getApprovalProjectUnResolvedCount();
+					if (null != dto) {
+						sum = sum + dto.getSum();
+					}
+					item.setApprovalProjectUnResolvedCount(sum);
+				});
+			}
+			if (!eventProjectUnResolvedTotal.isEmpty()) {
+				agencyGovernDailyList.forEach(item -> {
+					OrgStatisticsResultDTO dto = eventProjectUnResolvedTotal.get(item.getAgencyId());
+					int sum = item.getApprovalProjectUnResolvedCount();
 					if (null != dto) {
-						item.setApprovalProjectUnResolvedCount(dto.getSum());
+						sum = sum + dto.getSum();
 					}
+					item.setApprovalProjectUnResolvedCount(sum);
 				});
 			}
 		}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java
index 56346813b5..a5bb954bef 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java
@@ -108,6 +108,8 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
         Map<String,Integer>  issueProjectUnResolvedMap=getGridProjectMap(customerId,null,ProjectConstant.CLOSED,ProjectConstant.PROJECT_ORIGIN_ISSUE,DimObjectStatusConstant.UNRESOLVED);
         Map<String,Integer>  approvalProjectResolvedMap=getGridProjectMap(customerId,null,ProjectConstant.CLOSED,ProjectConstant.PROJECT_ORIGIN_AGENCY,DimObjectStatusConstant.RESOLVED);
         Map<String,Integer>  approvalProjectUnResolvedMap=getGridProjectMap(customerId,null,ProjectConstant.CLOSED,ProjectConstant.PROJECT_ORIGIN_AGENCY,DimObjectStatusConstant.UNRESOLVED);
+        Map<String,Integer>  eventProjectResolvedMap=getGridProjectMap(customerId,null,ProjectConstant.CLOSED,ProjectConstant.PROJECT_ORIGIN_EVENT,DimObjectStatusConstant.RESOLVED);
+        Map<String,Integer>  eventProjectUnResolvedMap=getGridProjectMap(customerId,null,ProjectConstant.CLOSED,ProjectConstant.PROJECT_ORIGIN_EVENT,DimObjectStatusConstant.UNRESOLVED);
         Map<String, Integer> inGroupTopicResolvedMap=getTopicMap(customerId, null,ProjectConstant.CLOSED, DimObjectStatusConstant.RESOLVED,NumConstant.ZERO_STR);
         Map<String, Integer> inGroupTopicUnResolvedMap=getTopicMap(customerId, null,ProjectConstant.CLOSED, DimObjectStatusConstant.UNRESOLVED,NumConstant.ZERO_STR);
         Map<String, GovernGridClosedTotalCommonDTO> dtoMap=getGovernGridClosedTotalCommonDTOMap(customerId,gridIds);
@@ -142,14 +144,24 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
                 insertEntity.setIssueProjectUnResolvedCount(issueProjectUnResolvedMap.get(insertEntity.getGridId()));
             }
             //7、当前网格内：项目立项，结案已解决数；默认为0，
+            int resolveCount = 0;
             if(approvalProjectResolvedMap.containsKey(insertEntity.getGridId())){
-                insertEntity.setApprovalProjectResolvedCount(approvalProjectResolvedMap.get(insertEntity.getGridId()));
+                resolveCount = resolveCount + approvalProjectResolvedMap.get(insertEntity.getGridId());
             }
+            if(eventProjectResolvedMap.containsKey(insertEntity.getGridId())){
+                resolveCount = resolveCount + eventProjectResolvedMap.get(insertEntity.getGridId());
+
+            }
+            insertEntity.setApprovalProjectResolvedCount(resolveCount);
             // 8、当前网格内：项目立项，结案无需解决数；默认为0，
+            int unResolveCount = 0;
             if(approvalProjectUnResolvedMap.containsKey(insertEntity.getGridId())){
-                insertEntity.setApprovalProjectUnResolvedCount(approvalProjectUnResolvedMap.get(insertEntity.getGridId()));
+                unResolveCount = resolveCount + approvalProjectUnResolvedMap.get(insertEntity.getGridId());
             }
-
+            if(eventProjectUnResolvedMap.containsKey(insertEntity.getGridId())){
+                unResolveCount = resolveCount + eventProjectUnResolvedMap.get(insertEntity.getGridId());
+            }
+            insertEntity.setApprovalProjectUnResolvedCount(unResolveCount);
             // 党群自治占比：当前组织下，所有小组内关闭（已解决+无需解决）的话题数与问题解决总数之比（未出小组：未转议题的）
             // 9、当前网格内，未出小组即未转议题的：话题关闭已解决数
             if(inGroupTopicResolvedMap.containsKey(insertEntity.getGridId())){
@@ -318,7 +330,7 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
                             // 12、来源于议题的项目，未出网格（在网格内流转的）结案并且无需解决的项目数
                             fromIssueUnResolvedInGridCount += 1;
                         }
-                    } else if (ProjectConstant.PROJECT_ORIGIN_AGENCY.equals(governProjectInfoDTO.getOrigin())) {
+                    } else if (ProjectConstant.PROJECT_ORIGIN_AGENCY.equals(governProjectInfoDTO.getOrigin()) || ProjectConstant.PROJECT_ORIGIN_EVENT.equals(governProjectInfoDTO.getOrigin())) {
                         if (ProjectConstant.RESOLVED.equals(governProjectInfoDTO.getIsResolved())) {
                             // 13、来源于项目立项的项目，未出网格（在网格内流转的）结案，并且已解决的项目数；因现在网格不能立项，所以此列默认为0
                             fromAgencyResolvedInGridCount += 1;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java
index d5dcfc50ed..f05f6e5f70 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java
@@ -16,6 +16,7 @@ import com.epmet.dto.issue.IssueDTO;
 import com.epmet.dto.party.PartyMemberDTO;
 import com.epmet.dto.project.FinishOrgDTO;
 import com.epmet.dto.project.ProcessInfoDTO;
+import com.epmet.dto.project.ResiEventDTO;
 import com.epmet.dto.project.result.ProjectOrgPeriodResultDTO;
 import com.epmet.dto.result.WorkDayResultDTO;
 import com.epmet.dto.topic.ResiTopicDTO;
@@ -41,10 +42,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -128,6 +126,7 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
 		List<ProjectDTO> projectList = projectService.getProjectInfo(customerId, dateString);
 		factOriginProjectMainDailyService.deleteByDate(customerId, dateString);
 		if (!CollectionUtils.isEmpty(projectList)) {
+			Map<String, ResiEventDTO> projectEventMap = projectService.getEventList(customerId);
 			//提取议题ID
 			List<String> issueIds =
 					projectList.stream().filter(item -> ProjectConstant.ISSUE.equals(item.getOrigin())).map(ProjectDTO::getOriginId).collect(Collectors.toList());
@@ -154,11 +153,6 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
 				entity.setMonthId(dimId.getMonthId());
 				entity.setWeekId(dimId.getWeekId());
 				entity.setDateId(dimId.getDateId());
-				if (ProjectConstant.ISSUE.equals(project.getOrigin())) {
-					entity.setIssueId(project.getOriginId());
-				} else {
-					entity.setIssueId("");
-				}
 				entity.setProjectStatus(project.getStatus());
 				entity.setIsResolved(project.getClosedStatus());
 				entity.setCreatedTime(project.getCreatedTime());
@@ -168,6 +162,20 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
 				entity.setTopicId("");
 				entity.setTopicCreatorId("");
 				entity.setGridId("");
+				if (ProjectConstant.ISSUE.equals(project.getOrigin())) {
+					entity.setIssueId(project.getOriginId());
+				} else if (ProjectConstant.PROJECT_ORIGIN_EVENT.equals(project.getOrigin())){
+					entity.setIssueId("");
+					ResiEventDTO eventDTO = projectEventMap.get(project.getId());
+					if (null != eventDTO) {
+						if (ProjectConstant.PUBLISHER_TYPE_GRID.equals(eventDTO.getOrgType())) {
+							entity.setGridId(eventDTO.getOrgId());
+							entity.setTopicCreatorId(eventDTO.getCreatedBy());
+						}
+					}
+				} else {
+					entity.setIssueId("");
+				}
 				String[] pIds = project.getOrgIdPath().split(StrConstant.COLON);
 				if (pIds.length > 1) {
 					entity.setPid(pIds[pIds.length - 2]);
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsIssueServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsIssueServiceImpl.java
index c359035647..4c587f9694 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsIssueServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsIssueServiceImpl.java
@@ -270,7 +270,7 @@ public class StatsIssueServiceImpl implements StatsIssueService {
 		//已结案项目统计
 		List<ProjectGridDTO> closedProjectTotalList = projectService.getGridClosedProjectTotal(customerId, dateString);
 		//已结案项目增量
-		List<ProjectGridDTO> closedProjectIncList = projectService.getGridClosedProjectTotal(customerId, dateString);
+		List<ProjectGridDTO> closedProjectIncList = projectService.getGridClosedProjectInc(customerId, dateString);
 
 		Map<String, Long> resolveMap= new HashMap<>();
 		Map<String, Long> unResolveMap = new HashMap<>();
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java
index e826c9f9e7..f4283979b0 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java
@@ -22,6 +22,7 @@ import com.epmet.dto.ProjectCategoryDTO;
 import com.epmet.dto.ProjectDTO;
 import com.epmet.dto.project.ProjectAgencyDTO;
 import com.epmet.dto.project.ProjectGridDTO;
+import com.epmet.dto.project.ResiEventDTO;
 import com.epmet.dto.project.result.ProjectExceedParamsResultDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectMainDailyEntity;
 import com.epmet.entity.project.ProjectEntity;
@@ -191,4 +192,11 @@ public interface ProjectService extends BaseService<ProjectEntity> {
      * @return
      */
     List<String> selectClosedProjectIds(String customerId,String origin ,String projectStatus);
+
+    /**
+     * 获取事件信息
+     * @param customerId
+     * @return
+     */
+    Map<String, ResiEventDTO> getEventList(String customerId);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java
index f67bff807c..095a0ec901 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java
@@ -23,10 +23,7 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.project.ProjectDao;
 import com.epmet.dto.ProjectDTO;
-import com.epmet.dto.project.ProjectAgencyDTO;
-import com.epmet.dto.project.ProjectCategoryDTO;
-import com.epmet.dto.project.ProjectGridDTO;
-import com.epmet.dto.project.ProjectPointDTO;
+import com.epmet.dto.project.*;
 import com.epmet.dto.project.result.ProjectExceedParamsResultDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectMainDailyEntity;
 import com.epmet.entity.project.ProjectEntity;
@@ -37,6 +34,7 @@ import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -239,5 +237,14 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		return baseDao.selectClosedProjectIds(customerId,origin,projectStatus);
 	}
 
+    @Override
+    public Map<String, ResiEventDTO> getEventList(String customerId) {
+        List<ResiEventDTO> list = baseDao.getEventList(customerId);
+        if (org.apache.commons.collections4.CollectionUtils.isEmpty(list)) {
+        	return Collections.emptyMap();
+		}
+        return list.stream().collect(Collectors.toMap(ResiEventDTO::getProjectId, Function.identity()));
+    }
+
 
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml
index 280de575cf..92dd3ee38a 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml
@@ -707,7 +707,8 @@
             ) a ON fm.GRID_ID = a.orgId
         WHERE
             PROJECT_STATUS = 'closed'
-          AND ORIGIN = "issue"
+          AND (ORIGIN = 'issue' OR ORIGIN = 'resi_event')
+          AND GRID_ID != ''
           AND CUSTOMER_ID = #{customerId}
          AND DATE_ID &lt;= #{dateId}
         GROUP BY
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml
index 0b60e3efd5..7b217ec4ff 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml
@@ -55,7 +55,7 @@
         FROM project
         WHERE
             DEL_FLAG = '0'
-          AND ORIGIN = 'issue'
+          AND (ORIGIN = 'issue' OR ORIGIN = 'resi_event')
           AND STATUS = 'closed'
           AND CUSTOMER_ID = #{customerId}
           AND DATE_FORMAT(UPDATED_TIME, '%Y-%m-%d') <![CDATA[ <= ]]> #{date}
@@ -69,7 +69,7 @@
         FROM project
         WHERE
             DEL_FLAG = '0'
-          AND ORIGIN = 'issue'
+          AND (ORIGIN = 'issue' OR ORIGIN = 'resi_event')
           AND STATUS = 'closed'
           AND CUSTOMER_ID = #{customerId}
           AND DATE_FORMAT(UPDATED_TIME, '%Y-%m-%d') = #{date}
@@ -220,4 +220,19 @@
                 AND p.ORIGIN =#{origin}
             </if>
     </select>
+
+    <select id="getEventList" resultType="com.epmet.dto.project.ResiEventDTO">
+        select  rero.RESI_EVENT_ID,
+                rero.ORG_TYPE,
+                rero.ORG_ID,
+                rero.ORG_PID,
+                rero.ORG_PIDS,
+                re.PROJECT_ID.CREATED_BY,
+                re.PROJECT_ID
+        from resi_event_report_org rero
+        inner join  resi_event re on rero.RESI_EVENT_ID = re.id and re.SHIFT_PROJECT = 1 and  re.DEL_FLAG = '0'
+        where rero.del_flag = '0'
+        and rero.CUSTOMER_ID = #{customerId}
+
+    </select>
 </mapper>

From 9b9daf9b012aaf97b3c2c195c8b9f166655ad17e Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 4 Aug 2021 18:12:45 +0800
Subject: [PATCH 41/84] =?UTF-8?q?updateviewtime=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ResiEventServiceImpl.java      | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index 3ffb927545..6af1ea3723 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -41,7 +41,6 @@ import com.epmet.dto.result.*;
 import com.epmet.entity.*;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
-import com.epmet.feign.GovProjectOpenFeignClient;
 import com.epmet.service.ResiEventService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -114,17 +113,25 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
     @Override
     public void updateViewTime(UpdateViewTimeFormDTO formDTO) {
         ResiEventEntity eventEntity=baseDao.selectById(formDTO.getEventId());
-        if(null!=eventEntity){
-            eventEntity.setReadFlag(true);
-            baseDao.updateById(eventEntity);
+        if (null == eventEntity) {
+            throw new RenException(String.format("没有找到事件记录,eventId:%s",formDTO.getEventId()));
         }
+        if(formDTO.getUserId().equals(eventEntity.getReportUserId())){
+            log.warn("报事人查看详情不需要调用此接口");
+            return;
+        }
+        // 这个事件已经被查看了
+        eventEntity.setReadFlag(true);
+        baseDao.updateById(eventEntity);
         // 居民端：resi_user；工作端：staff
         if(EventConstant.RESI_USER.equals(formDTO.getViewType())){
+            //被@的人置为已读
             resiEventMentionDao.updateReadFlag(formDTO.getEventId(),formDTO.getUserId());
         }else if(EventConstant.STAFF.equals(formDTO.getViewType())){
+            // 当前组织置为已读
             resiEventReportOrgDao.updateReadFlag(formDTO.getEventId(),formDTO.getOrgId(),formDTO.getUserId());
         }
-        // 插入查看日志
+        // 插入首次查看日志
         List<ResiEventOperationLogEntity> logEntityList = resiEventOperationLogDao.selectByUserAction(formDTO.getEventId(), formDTO.getUserId(), ResiEventAction.READ_FIRST.getCode());
         if (CollectionUtils.isEmpty(logEntityList)) {
             ResiEventOperationLogEntity publishLog=new ResiEventOperationLogEntity();

From 762c2eff502633aae942516673f2c36554a747b5 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 4 Aug 2021 18:31:42 +0800
Subject: [PATCH 42/84] =?UTF-8?q?=E5=85=88=E6=8F=90project?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/result/OrgNameByTypeResultDTO.java    | 22 +++++++++++++++++++
 .../epmet/feign/GovOrgOpenFeignClient.java    |  9 ++++++++
 .../GovOrgOpenFeignClientFallback.java        |  5 +++++
 .../controller/CustomerGridController.java    | 11 ++++++++++
 .../java/com/epmet/dao/CustomerGridDao.java   |  8 +++++++
 .../epmet/service/CustomerGridService.java    |  8 +++++++
 .../service/impl/CustomerGridServiceImpl.java | 11 ++++++++++
 .../main/resources/mapper/CustomerGridDao.xml | 17 ++++++++++++++
 8 files changed, 91 insertions(+)
 create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/OrgNameByTypeResultDTO.java

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/OrgNameByTypeResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/OrgNameByTypeResultDTO.java
new file mode 100644
index 0000000000..dd5aa27458
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/OrgNameByTypeResultDTO.java
@@ -0,0 +1,22 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/8/4 5:48 下午
+ * @DESC
+ */
+@Data
+public class OrgNameByTypeResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -6544341694748437312L;
+
+    private String orgId;
+
+    private String orgType;
+
+    private String orgName;
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
index 3564d39a61..2ac3978628 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
@@ -389,4 +389,13 @@ public interface GovOrgOpenFeignClient {
     @PostMapping("/gov/org/customergrid/selectgridname")
     Result<String> gridName(@RequestParam("gridId")String gridId);
 
+    /**
+     * @Description  根据类型查询组织名称
+     * @Param formList
+     * @author zxc
+     * @date 2021/8/4 6:14 下午
+     */
+    @PostMapping("/gov/org/customergrid/selectorgnamebytype")
+    Result<List<String>> selectOrgNameByType(@RequestBody List<String> formList);
+
 }
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
index 97bc8402b7..84b3cb74c2 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
@@ -225,6 +225,11 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "gridName", gridId);
     }
 
+    @Override
+    public Result<List<String>> selectOrgNameByType(List<String> formList) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "selectOrgNameByType", formList);
+    }
+
     @Override
     public Result<String> selectPidsByGridId(String gridId) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "selectPidsByGridId", gridId);
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 7fe5c72cbe..7dc0f3f385 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
@@ -263,4 +263,15 @@ public class CustomerGridController {
     Result<String> gridName(@RequestParam("gridId")String gridId){
         return new Result<String>().ok(customerGridService.gridName(gridId));
     }
+
+    /**
+     * @Description  根据类型查询组织名称
+     * @Param formList
+     * @author zxc
+     * @date 2021/8/4 6:14 下午
+     */
+    @PostMapping("selectorgnamebytype")
+    public Result<List<String>> selectOrgNameByType(@RequestBody List<String> formList){
+        return new Result<List<String>>().ok(customerGridService.selectOrgNameByType(formList));
+    }
 }
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 314c483a0f..956405698b 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
@@ -284,4 +284,12 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
      * @date 2021/8/4 4:30 下午
      */
     String gridName(String gridId);
+
+    /**
+     * @Description  查询组织名字
+     * @Param orgIds
+     * @author zxc
+     * @date 2021/8/4 6:25 下午
+     */
+    List<String> selectOrgNameByType(@Param("orgIds") List<String> orgIds);
 }
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 e1cc5f79a7..773ebd45e7 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
@@ -303,4 +303,12 @@ public interface CustomerGridService extends BaseService<CustomerGridEntity> {
      * @date 2021/8/4 4:26 下午
      */
     String gridName(String gridId);
+
+    /**
+     * @Description  根据类型查询组织名称
+     * @Param formList
+     * @author zxc
+     * @date 2021/8/4 6:14 下午
+     */
+    List<String> selectOrgNameByType(List<String> formList);
 }
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 ec5c673374..875f2c04dd 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
@@ -732,4 +732,15 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
     public String gridName(String gridId) {
         return baseDao.gridName(gridId);
     }
+
+    /**
+     * @Description  根据类型查询组织名称
+     * @Param formList
+     * @author zxc
+     * @date 2021/8/4 6:14 下午
+     */
+    @Override
+    public List<String> selectOrgNameByType(List<String> formList) {
+        return baseDao.selectOrgNameByType(formList);
+    }
 }
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 49025a9b9a..5c5fae63b3 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
@@ -594,4 +594,21 @@
         WHERE cg.DEL_FLAG = 0
           AND cg.ID = #{gridId}
     </select>
+
+    <!-- 查询组织名字 -->
+    <select id="selectOrgNameByType" resultType="java.lang.String">
+        SELECT GRID_NAME AS orgName FROM customer_grid WHERE DEL_FLAG = '0'
+        AND(
+            <foreach collection="orgIds" item="orgId" separator=" or ">
+                id = #{orgId}
+            </foreach>
+                )
+        UNION ALL
+        SELECT ORGANIZATION_NAME AS orgName FROM customer_agency WHERE DEL_FLAG = '0'
+        AND(
+            <foreach collection="orgIds" item="orgId" separator=" or ">
+                id = #{orgId}
+            </foreach>
+                )
+    </select>
 </mapper>

From 56d8f9b8f114a3086ad181aac4e8733f08213b67 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 4 Aug 2021 18:45:19 +0800
Subject: [PATCH 43/84] =?UTF-8?q?=E6=8A=A5=E4=BA=8B=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/form/EventDetailFormDTO.java    |  2 ++
 .../dto/result/EventDetailResultDTO.java      |  3 +++
 .../dto/result/OrgNameByTypeResultDTO.java    | 22 +++++++++++++++
 .../com/epmet/constant/EventConstant.java     |  6 +++++
 .../epmet/controller/ResiEventController.java |  4 +--
 .../main/java/com/epmet/dao/ResiEventDao.java | 16 +++++++++++
 .../com/epmet/dao/ResiEventReportOrgDao.java  |  9 +++++++
 .../com/epmet/service/ResiEventService.java   |  3 ++-
 .../service/impl/ResiEventServiceImpl.java    | 21 ++++++++++++++-
 .../main/resources/mapper/ResiEventDao.xml    | 27 ++++++++++++++++++-
 .../mapper/ResiEventReportOrgDao.xml          | 10 +++++++
 11 files changed, 118 insertions(+), 5 deletions(-)
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/OrgNameByTypeResultDTO.java

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventDetailFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventDetailFormDTO.java
index 1d2972d0c3..65a4143f9d 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventDetailFormDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventDetailFormDTO.java
@@ -19,4 +19,6 @@ public class EventDetailFormDTO implements Serializable {
 
     @NotBlank(message = "报事ID不能为空",groups = EventDetailForm.class)
     private String eventId;
+
+    private String orgId;
 }
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java
index b16e292f44..e5997ab62f 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java
@@ -79,6 +79,9 @@ public class EventDetailResultDTO implements Serializable {
      */
     private EventProjectInfoDTO projectInfo;
 
+    @JsonIgnore
+    private List<String> orgNameList;
+
     @JsonIgnore
     private String projectId;
 
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/OrgNameByTypeResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/OrgNameByTypeResultDTO.java
new file mode 100644
index 0000000000..dd5aa27458
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/OrgNameByTypeResultDTO.java
@@ -0,0 +1,22 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/8/4 5:48 下午
+ * @DESC
+ */
+@Data
+public class OrgNameByTypeResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -6544341694748437312L;
+
+    private String orgId;
+
+    private String orgType;
+
+    private String orgName;
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/EventConstant.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/EventConstant.java
index 2608de1e9f..7daf809615 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/EventConstant.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/EventConstant.java
@@ -43,4 +43,10 @@ public interface EventConstant {
      */
     String RESOLVED="resolved";
     String UN_SOLVED="un_solved";
+
+    /**
+     * 小程序类型
+     */
+    String TYPE_GOV = "gov";
+    String TYPE_RESI = "resi";
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
index e868c85459..0e090ed1b9 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
@@ -54,9 +54,9 @@ public class ResiEventController {
      * @date 2021/8/3 1:47 下午
      */
     @PostMapping("eventdetail")
-    public Result<EventDetailResultDTO> eventDetail(@RequestBody EventDetailFormDTO formDTO){
+    public Result<EventDetailResultDTO> eventDetail(@LoginUser TokenDto tokenDto ,@RequestBody EventDetailFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO);
-        return new Result<EventDetailResultDTO>().ok(resiEventService.eventDetail(formDTO));
+        return new Result<EventDetailResultDTO>().ok(resiEventService.eventDetail(formDTO,tokenDto));
     }
     /**
      * 我要报事-提交（尹）
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java
index 87ffeb3d1a..cf74df59f1 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java
@@ -63,4 +63,20 @@ public interface ResiEventDao extends BaseDao<ResiEventEntity> {
      * @date 2021/8/4 2:16 下午
      */
     EventDetailResultDTO selectEventDetail(@Param("eventId")String eventId);
+
+    /**
+     * @Description  更新报事人红点状态
+     * @Param userId
+     * @author zxc
+     * @date 2021/8/4 5:30 下午
+     */
+    void updateResiEvent(@Param("userId") String userId,@Param("eventId")String eventId);
+
+    /**
+     * @Description  更新人大代表红点状态
+     * @Param userId
+     * @author zxc
+     * @date 2021/8/4 5:32 下午
+     */
+    void updateEventMention(@Param("userId") String userId,@Param("eventId")String eventId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventReportOrgDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventReportOrgDao.java
index 216f6dace8..6f851d34c3 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventReportOrgDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventReportOrgDao.java
@@ -42,6 +42,15 @@ public interface ResiEventReportOrgDao extends BaseDao<ResiEventReportOrgEntity>
      */
     int updateReadFlag(@Param("eventId") String eventId, @Param("orgId") String orgId,@Param("userId") String userId);
 
+    /**
+     * @Description  更新组织的红点显示状态
+     * @Param eventId
+     * @Param orgId
+     * @author zxc
+     * @date 2021/8/4 5:42 下午
+     */
+    void updateEventOrg(@Param("eventId") String eventId, @Param("orgId") String orgId);
+
     /**
      * 展示红点
      *
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java
index 596609d158..65d13d225f 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java
@@ -1,6 +1,7 @@
 package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.ResiEventEntity;
@@ -37,7 +38,7 @@ public interface ResiEventService extends BaseService<ResiEventEntity> {
      * @author zxc
      * @date 2021/8/3 1:47 下午
      */
-    EventDetailResultDTO eventDetail(EventDetailFormDTO formDTO);
+    EventDetailResultDTO eventDetail(EventDetailFormDTO formDTO, TokenDto tokenDto);
 
     /**
      * 我要报事-提交（尹）
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index 6af1ea3723..776d82467a 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -29,6 +29,7 @@ import com.epmet.commons.tools.scan.param.ImgTaskDTO;
 import com.epmet.commons.tools.scan.param.TextScanParamDTO;
 import com.epmet.commons.tools.scan.param.TextTaskDTO;
 import com.epmet.commons.tools.scan.result.SyncScanResult;
+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.commons.tools.utils.ScanContentUtils;
@@ -49,6 +50,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
@@ -154,7 +156,8 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
      * @date 2021/8/3 1:47 下午
      */
     @Override
-    public EventDetailResultDTO eventDetail(EventDetailFormDTO formDTO) {
+    @Transactional(rollbackFor = Exception.class)
+    public EventDetailResultDTO eventDetail(EventDetailFormDTO formDTO, TokenDto tokenDto) {
         EventDetailResultDTO dto = baseDao.selectEventDetail(formDTO.getEventId());
         if (null == dto){
             return new EventDetailResultDTO();
@@ -189,6 +192,22 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
             throw new RenException("查询所属网格失败");
         }
         dto.setGridName(gridNameResult.getData());
+        // 查询报事的org
+        List<String> orgNameList = dto.getOrgNameList();
+        Result<List<String>> orgResult = govOrgOpenFeignClient.selectOrgNameByType(orgNameList);
+        if (!orgResult.success()){
+            throw new RenException("查询组织名称失败");
+        }
+        List<String> data = orgResult.getData();
+        data.addAll(dto.getEventPerson());
+        dto.setEventPerson(data);
+        // 更改已读状态 报事人的红点：resi_event,艾特人的：resi_event_mention,所代表的组织的：resi_event_report_org
+        if (tokenDto.getApp().equals(EventConstant.TYPE_RESI)){
+            baseDao.updateResiEvent(tokenDto.getUserId(),formDTO.getEventId());
+            baseDao.updateEventMention(tokenDto.getUserId(),formDTO.getEventId());
+        }else if (tokenDto.getApp().equals(EventConstant.TYPE_GOV)){
+            resiEventReportOrgDao.updateEventOrg(formDTO.getEventId(), formDTO.getOrgId());
+        }
         return dto;
     }
 
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
index a9461bd9b4..ca3e51f51e 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
@@ -107,6 +107,9 @@
         <collection property="eventPerson" ofType="java.lang.String">
             <result column="person"/>
         </collection>
+        <collection property="orgNameList" ofType="java.lang.String">
+            <result column="orgId"/>
+        </collection>
     </resultMap>
     <select id="selectEventDetail" resultMap="selectEventDetailMap">
         SELECT
@@ -121,11 +124,33 @@
             IFNULL(ea.ATTACHMENT_URL,'') AS eventImg,
             concat('人大代表-',IFNULL(em.USER_SHOW_NAME,'')) AS person,
             re.GRID_ID AS gridId,
-            re.CREATED_BY AS eventUserId
+            re.CREATED_BY AS eventUserId,
+            ro.ORG_ID AS orgId
         FROM resi_event re
         LEFT JOIN resi_event_attachment ea ON (ea.RESI_EVENT_ID = re.ID AND ea.DEL_FLAG = '0')
         LEFT JOIN resi_event_mention em ON (em.RESI_EVENT_ID = re.ID AND em.DEL_FLAG = '0')
+        LEFT JOIN resi_event_report_org ro ON (ro.RESI_EVENT_ID = re.ID AND ro.DEL_FLAG = '0')
         WHERE re.DEL_FLAG = '0'
             AND re.ID = #{eventId}
     </select>
+
+    <!-- 更新报事人红点状态 -->
+    <update id="updateResiEvent">
+        UPDATE resi_event
+        SET RED_DOT = 0,
+            UPDATED_TIME = NOW()
+        WHERE DEL_FLAG = '0'
+          AND ID = #{eventId}
+          AND REPORT_USER_ID = #{userId}
+    </update>
+
+    <!-- 更新人大代表红点状态 -->
+    <update id="updateEventMention">
+        UPDATE resi_event_mention
+        SET RED_DOT = 0,
+            UPDATED_TIME = NOW()
+        WHERE DEL_FLAG = '0'
+          AND USER_ID = #{userId}
+          AND RESI_EVENT_ID = #{eventId}
+    </update>
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReportOrgDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReportOrgDao.xml
index 98795d7364..7291f346c2 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReportOrgDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReportOrgDao.xml
@@ -23,4 +23,14 @@
             RESI_EVENT_ID = #{resiEventId}
             AND DEL_FLAG = '0'
     </update>
+
+    <!-- 更新组织的红点显示状态 -->
+    <update id="updateEventOrg">
+        UPDATE resi_event_report_org
+        SET RED_DOT = 0,
+            UPDATED_TIME = NOW()
+        WHERE DEL_FLAG = '0'
+          AND ORG_ID = #{orgId}
+          AND RESI_EVENT_ID = #{eventId}
+    </update>
 </mapper>
\ No newline at end of file

From 23c30ae2a8244af896911226dc4e9f7ea520c3cc Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 5 Aug 2021 09:31:28 +0800
Subject: [PATCH 44/84] =?UTF-8?q?=E4=BF=AE=E5=93=8E=E6=98=AF=E5=90=A6=20?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=B7=B2=E8=A7=A3=E5=86=B3=20=E6=9C=AA?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
index ca3e51f51e..4ff17b6e35 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
@@ -117,7 +117,7 @@
             IFNULL(re.EVENT_CONTENT,'') AS eventContent,
             IFNULL(re.ADDRESS,'') AS eventAddress,
             (CASE WHEN re.`STATUS` = 'processing' THEN FALSE WHEN re.`STATUS` = 'closed_case' THEN TRUE ELSE FALSE END) AS isClosed,
-            (IF(re.`STATUS` = 'processing', FALSE, (CASE WHEN re.RESOLVE_STATUS = 'resolved' THEN TRUE ELSE FALSE END))) AS isResolve,
+            (IF('' = re.RESOLVE_STATUS OR NULL = re.RESOLVE_STATUS, TRUE, FALSE)) AS isResolve,
             (CASE WHEN re.READ_FLAG = 1 THEN FALSE ELSE TRUE END) AS isRollback,
             (CASE WHEN re.SHIFT_PROJECT = 1 THEN TRUE ELSE FALSE END) AS isProject,
             IFNULL(re.project_id,'') AS projectId,

From 731fca8630303177fab802c96bc45ce49191ccd9 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 5 Aug 2021 09:52:34 +0800
Subject: [PATCH 45/84] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=AF=EF=BC=8C?=
 =?UTF-8?q?=E7=BE=A4=E4=BC=97=E7=9B=B4=E6=8A=A5=E5=85=A5=E5=8F=A3=EF=BC=8C?=
 =?UTF-8?q?=E6=9D=83=E9=99=90key=EF=BC=8C=E8=AE=B0=E5=BE=97=E5=8F=91?=
 =?UTF-8?q?=E4=B8=80=E4=B8=8Bgov-access?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/commons/tools/enums/RequirePermissionEnum.java  | 8 +++++++-
 1 file changed, 7 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 831913de5e..87a31cc857 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
@@ -187,7 +187,13 @@ public enum RequirePermissionEnum {
     /**
      * 基层治理-巡查
      */
-    WORK_GRASSROOT_GOVERN_PATROL("work_grassroot_govern_patrol","基层治理:巡查","巡查");
+    WORK_GRASSROOT_GOVERN_PATROL("work_grassroot_govern_patrol","基层治理:巡查","巡查"),
+
+
+    /**
+     * 基层治理-群众直报  功能入口
+     */
+    RESI_EVENT_MANAGE("resi_event_manage","群众直报","基层治理-群众直报");
 
     private String key;
     private String name;

From 09cf227a591910e55562a4d095a34130d5640877 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 5 Aug 2021 09:53:39 +0800
Subject: [PATCH 46/84] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=AF=EF=BC=8C?=
 =?UTF-8?q?=E7=BE=A4=E4=BC=97=E7=9B=B4=E6=8A=A5=E5=85=A5=E5=8F=A3=EF=BC=8C?=
 =?UTF-8?q?=E6=9D=83=E9=99=90key=EF=BC=8C=E8=AE=B0=E5=BE=97=E5=8F=91?=
 =?UTF-8?q?=E4=B8=80=E4=B8=8Bgov-access?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/commons/tools/enums/RequirePermissionEnum.java    | 2 +-
 1 file changed, 1 insertion(+), 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 87a31cc857..17b7c21b99 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
@@ -193,7 +193,7 @@ public enum RequirePermissionEnum {
     /**
      * 基层治理-群众直报  功能入口
      */
-    RESI_EVENT_MANAGE("resi_event_manage","群众直报","基层治理-群众直报");
+    RESI_EVENT_MANAGE("resi_event_manage","基层治理:群众直报","基层治理-群众直报");
 
     private String key;
     private String name;

From ddcc808863239096ecd5f6394b6e6ef5551b26f4 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 5 Aug 2021 10:20:55 +0800
Subject: [PATCH 47/84] =?UTF-8?q?=E5=85=88=E6=8F=90=E4=B8=80=E5=8D=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/feign/GovOrgOpenFeignClient.java  |  9 +++++++++
 .../fallback/GovOrgOpenFeignClientFallback.java      |  5 +++++
 .../com/epmet/controller/CustomerGridController.java | 12 ++++++++++++
 .../src/main/java/com/epmet/dao/CustomerGridDao.java |  8 ++++++++
 .../java/com/epmet/service/CustomerGridService.java  |  8 ++++++++
 .../epmet/service/impl/CustomerGridServiceImpl.java  | 11 +++++++++++
 .../src/main/resources/mapper/CustomerGridDao.xml    |  7 +++++++
 7 files changed, 60 insertions(+)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
index 2ac3978628..7237abcc5b 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
@@ -398,4 +398,13 @@ public interface GovOrgOpenFeignClient {
     @PostMapping("/gov/org/customergrid/selectorgnamebytype")
     Result<List<String>> selectOrgNameByType(@RequestBody List<String> formList);
 
+    /**
+     * @Description  根据人查询所在组织
+     * @Param userId
+     * @author zxc
+     * @date 2021/8/5 10:08 上午
+     */
+    @PostMapping("/gov/org/customergrid/selectorgsbyuserid")
+    Result<List<String>> selectOrgsByUserId(@RequestParam("userId")String userId);
+
 }
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
index 84b3cb74c2..91f9052c84 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
@@ -230,6 +230,11 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "selectOrgNameByType", formList);
     }
 
+    @Override
+    public Result<List<String>> selectOrgsByUserId(String userId) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "selectOrgsByUserId", userId);
+    }
+
     @Override
     public Result<String> selectPidsByGridId(String gridId) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "selectPidsByGridId", gridId);
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 7dc0f3f385..c765a58962 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
@@ -274,4 +274,16 @@ public class CustomerGridController {
     public Result<List<String>> selectOrgNameByType(@RequestBody List<String> formList){
         return new Result<List<String>>().ok(customerGridService.selectOrgNameByType(formList));
     }
+
+    /**
+     * @Description  根据人查询所在组织
+     * @Param userId
+     * @author zxc
+     * @date 2021/8/5 10:08 上午
+     */
+    @PostMapping("/selectorgsbyuserid")
+    public Result<List<String>> selectOrgsByUserId(@RequestParam("userId")String userId){
+        return new Result<List<String>>().ok(customerGridService.selectOrgsByUserId(userId));
+    }
+
 }
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 956405698b..fae6640a7d 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
@@ -292,4 +292,12 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
      * @date 2021/8/4 6:25 下午
      */
     List<String> selectOrgNameByType(@Param("orgIds") List<String> orgIds);
+
+    /**
+     * @Description  根据人查询所在组织
+     * @Param userId
+     * @author zxc
+     * @date 2021/8/5 10:08 上午
+     */
+    List<String> selectOrgsByUserId(@Param("userId") String userId);
 }
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 773ebd45e7..78221d8fa8 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
@@ -311,4 +311,12 @@ public interface CustomerGridService extends BaseService<CustomerGridEntity> {
      * @date 2021/8/4 6:14 下午
      */
     List<String> selectOrgNameByType(List<String> formList);
+
+    /**
+     * @Description  根据人查询所在组织
+     * @Param userId
+     * @author zxc
+     * @date 2021/8/5 10:08 上午
+     */
+    List<String> selectOrgsByUserId(String userId);
 }
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 875f2c04dd..23de67608c 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
@@ -743,4 +743,15 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
     public List<String> selectOrgNameByType(List<String> formList) {
         return baseDao.selectOrgNameByType(formList);
     }
+
+    /**
+     * @Description  根据人查询所在组织
+     * @Param userId
+     * @author zxc
+     * @date 2021/8/5 10:08 上午
+     */
+    @Override
+    public List<String> selectOrgsByUserId(String userId) {
+        return baseDao.selectOrgsByUserId(userId);
+    }
 }
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 5c5fae63b3..0667d009c4 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
@@ -611,4 +611,11 @@
             </foreach>
                 )
     </select>
+
+    <!-- 根据人查询所在组织 -->
+    <select id="selectOrgsByUserId" resultType="java.lang.String">
+        SELECT GRID_ID AS orgId FROM customer_staff_grid WHERE del_flag = '0' AND USER_ID = #{userId}
+        union ALL
+        SELECT agency_id AS orgId  FROM customer_staff_agency WHERE del_flag = '0' and USER_ID = #{userId}
+    </select>
 </mapper>

From 886e520b49fb734a21ac9f52e9bea1290cf2cb89 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 5 Aug 2021 10:35:50 +0800
Subject: [PATCH 48/84] =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=EF=BC=8C=E6=97=B6=E9=97=B4=E5=88=B0=E5=88=86=E9=92=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/result/ReplyListResultDTO.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ReplyListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ReplyListResultDTO.java
index 87209854a4..4ffa078aaf 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ReplyListResultDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ReplyListResultDTO.java
@@ -1,5 +1,6 @@
 package com.epmet.dto.result;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
@@ -24,6 +25,7 @@ public class ReplyListResultDTO implements Serializable {
     /**
      * 回复时间
      * */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone="GMT+8")
     private Date replyTime;
 
     /**

From 28043e3b058407f2e5aedd08025dba9740eddaa8 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 5 Aug 2021 11:01:10 +0800
Subject: [PATCH 49/84] =?UTF-8?q?=E6=9C=80=E6=96=B0=E7=9B=B4=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/result/NewEventsResultDTO.java  | 32 +++++++++++++++++++
 .../epmet/controller/ResiEventController.java | 11 +++++++
 .../main/java/com/epmet/dao/ResiEventDao.java |  9 ++++++
 .../com/epmet/service/ResiEventService.java   |  8 +++++
 .../service/impl/ResiEventServiceImpl.java    | 20 ++++++++++++
 .../main/resources/mapper/ResiEventDao.xml    | 29 +++++++++++++++--
 6 files changed, 107 insertions(+), 2 deletions(-)
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/NewEventsResultDTO.java

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/NewEventsResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/NewEventsResultDTO.java
new file mode 100644
index 0000000000..77f4eb4d68
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/NewEventsResultDTO.java
@@ -0,0 +1,32 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/8/5 9:51 上午
+ * @DESC
+ */
+@Data
+public class NewEventsResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 2151884734349908080L;
+
+    /**
+     * 事件内容
+     */
+    private String eventContent;
+
+    /**
+     * 事件时间
+     */
+    private String eventTime;
+
+    /**
+     * 事件图片
+     */
+    private List<String> eventImgs;
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
index 0e090ed1b9..c76a1ea63c 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
@@ -174,4 +174,15 @@ public class ResiEventController {
         return new Result<List<UserMentionResultDTO>>().ok(resiEventService.mentionList(formDTO));
     }
 
+    /**
+     * @Description  最新直报
+     * @Param userId
+     * @author zxc
+     * @date 2021/8/5 9:55 上午
+     */
+    @PostMapping("newevents")
+    public Result<List<NewEventsResultDTO>> newEvents(@LoginUser TokenDto tokenDto){
+        return new Result<List<NewEventsResultDTO>>().ok(resiEventService.newEvents(tokenDto.getUserId()));
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java
index cf74df59f1..6275a0d821 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java
@@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.result.EventDetailResultDTO;
 import com.epmet.dto.result.EventListResultDTO;
 import com.epmet.dto.result.MyReportedResultDTO;
+import com.epmet.dto.result.NewEventsResultDTO;
 import com.epmet.entity.ResiEventEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -79,4 +80,12 @@ public interface ResiEventDao extends BaseDao<ResiEventEntity> {
      * @date 2021/8/4 5:32 下午
      */
     void updateEventMention(@Param("userId") String userId,@Param("eventId")String eventId);
+
+    /**
+     * @Description  最新直报
+     * @Param orgIds
+     * @author zxc
+     * @date 2021/8/5 10:42 上午
+     */
+    List<NewEventsResultDTO> newEvents(@Param("orgIds")List<String> orgIds);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java
index 65d13d225f..236ebe765e 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java
@@ -89,4 +89,12 @@ public interface ResiEventService extends BaseService<ResiEventEntity> {
      * @date 2021/8/4 9:41
      */
     List<UserMentionResultDTO> mentionList(UserMentionFormDTO formDTO);
+
+    /**
+     * @Description  最新直报
+     * @Param userId
+     * @author zxc
+     * @date 2021/8/5 9:55 上午
+     */
+    List<NewEventsResultDTO> newEvents(String userId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index 776d82467a..89f51ed5c5 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -493,5 +493,25 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
         return result.getList();
     }
 
+    /**
+     * @Description  最新直报
+     * @Param userId
+     * @author zxc
+     * @date 2021/8/5 9:55 上午
+     */
+    @Override
+    public List<NewEventsResultDTO> newEvents(String userId) {
+        Result<List<String>> listResult = govOrgOpenFeignClient.selectOrgsByUserId(userId);
+        if (!listResult.success()){
+            throw new RenException("查询userId："+userId+"，所在org失败");
+        }
+        List<String> orgIds = listResult.getData();
+        if (!CollectionUtils.isEmpty(orgIds)){
+            List<NewEventsResultDTO> result = baseDao.newEvents(orgIds);
+            return result;
+        }
+        return new ArrayList<>();
+    }
+
 
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
index 4ff17b6e35..1af9c54926 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
@@ -18,7 +18,7 @@
         SELECT IFNULL(rea.ATTACHMENT_URL,'') AS img,t.* FROM
         (SELECT
         re.EVENT_CONTENT AS eventContent,
-        IFNULL(DATE_FORMAT(re.CREATED_TIME,'%Y-%m-%d %H:%i:%s'),'') AS eventTime,
+        IFNULL(DATE_FORMAT(re.CREATED_TIME,'%Y-%m-%d %H:%i'),'') AS eventTime,
         re.ID AS eventId,
         (CASE WHEN re.SHIFT_PROJECT = 1 THEN TRUE ELSE FALSE END) AS isProject,
         (CASE WHEN ro.RED_DOT = 1 THEN TRUE ELSE FALSE END) AS redDot
@@ -113,7 +113,7 @@
     </resultMap>
     <select id="selectEventDetail" resultMap="selectEventDetailMap">
         SELECT
-            IFNULL(DATE_FORMAT(re.CREATED_TIME,'%Y-%m-%d %H:%i:%s'),'') AS eventTime,
+            IFNULL(DATE_FORMAT(re.CREATED_TIME,'%Y-%m-%d %H:%i'),'') AS eventTime,
             IFNULL(re.EVENT_CONTENT,'') AS eventContent,
             IFNULL(re.ADDRESS,'') AS eventAddress,
             (CASE WHEN re.`STATUS` = 'processing' THEN FALSE WHEN re.`STATUS` = 'closed_case' THEN TRUE ELSE FALSE END) AS isClosed,
@@ -153,4 +153,29 @@
           AND USER_ID = #{userId}
           AND RESI_EVENT_ID = #{eventId}
     </update>
+
+    <resultMap id="newEventsMap" type="com.epmet.dto.result.NewEventsResultDTO">
+        <result property="eventContent" column="eventContent"/>
+        <result property="eventTime" column="eventTime"/>
+        <collection property="eventImgs" ofType="java.lang.String">
+            <result column="img"/>
+        </collection>
+    </resultMap>
+    <select id="newEvents" resultMap="newEventsMap">
+        SELECT
+        IFNULL(re.EVENT_CONTENT,'') AS eventContent,
+        DATE_FORMAT(re.CREATED_TIME,'%Y-%m-%d %H:%i') AS eventTime,
+        IFNULL(ea.ATTACHMENT_URL,'') AS img
+        FROM resi_event_report_org ro
+        LEFT JOIN resi_event re ON (re.ID = ro.RESI_EVENT_ID AND re.DEL_FLAG = '0')
+        LEFT JOIN resi_event_attachment ea ON (ea.RESI_EVENT_ID = ro.RESI_EVENT_ID AND ea.DEL_FLAG = '0' AND
+        ea.ATTACHMENT_TYPE = 'image' AND ea.SORT IN (0,1,2))
+        WHERE ro.DEL_FLAG = '0'
+        AND ro.ORG_READ = 'un_read'
+        AND ro.ORG_ID IN(
+        <foreach collection="orgIds" item="orgId" separator=",">
+            #{orgId}
+        </foreach>)
+        ORDER BY ro.CREATED_TIME DESC
+    </select>
 </mapper>
\ No newline at end of file

From 4c7e2cdd5c2fae103b49970498275121b8f5d445 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 5 Aug 2021 11:09:09 +0800
Subject: [PATCH 50/84] =?UTF-8?q?=E6=8A=A5=E4=BA=8B=E5=8A=9E=E7=BB=93+3?=
 =?UTF-8?q?=E4=B8=AA=E5=9B=9E=E5=A4=8D=E9=9C=80=E8=A6=81=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=9A=84=E6=9C=80=E5=90=8E=E4=B8=80=E6=AC=A1?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/exception/EpmetErrorCode.java       |  1 +
 .../epmet/dto/form/CloseResiEventFormDTO.java | 29 ++++++++++++
 .../epmet/controller/ResiEventController.java | 16 +++++++
 .../com/epmet/service/ResiEventService.java   | 10 +++++
 .../impl/ResiEventReplyServiceImpl.java       |  9 +++-
 .../service/impl/ResiEventServiceImpl.java    | 45 +++++++++++++++++++
 6 files changed, 109 insertions(+), 1 deletion(-)
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/CloseResiEventFormDTO.java

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 1a29d62e54..3966217c18 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
@@ -99,6 +99,7 @@ public enum EpmetErrorCode {
 	RESI_EVENT_NOT_MY_REPORTED(8604,"当前事件不是您发布的，无权操作"),
 	CAN_NOT_REPLY_RESI_EVENT_GOV(8605,"办结、立项处理后不可回复"),
 	CAN_NOT_REPLY_RESI_EVENT_SELF(8606,"当前事件待处理,不可回复"),
+	RESI_EVENT_CAN_NOT_CLOSE_CASE(8607,"事件尚未处理，请处理完成后进行办结"),
 
 	// 爱心互助 居民端
     NOT_IN_THE_SIGN_IN_RANGE(8510, "您还未进入指定的签到范围～"),
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/CloseResiEventFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/CloseResiEventFormDTO.java
new file mode 100644
index 0000000000..bf3cdcc62c
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/CloseResiEventFormDTO.java
@@ -0,0 +1,29 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 报事-办结 入参DTO
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/8/5 10:44
+ */
+@Data
+public class CloseResiEventFormDTO implements Serializable {
+    private static final long serialVersionUID = -3621650590714057648L;
+
+    public interface AddUserInternalGroup {
+    }
+    @NotBlank(message = "eventId不能为空", groups = AddUserInternalGroup.class)
+    private  String eventId;
+
+    //以下参数从token中获取
+    /**
+     * 当前用户id
+     */
+    @NotBlank(message = "userId不能为空", groups = AddUserInternalGroup.class)
+    private String userId;
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
index 0e090ed1b9..79002b9f56 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
@@ -174,4 +174,20 @@ public class ResiEventController {
         return new Result<List<UserMentionResultDTO>>().ok(resiEventService.mentionList(formDTO));
     }
 
+    /**
+     * 报事办结
+     *
+     * @param tokenDto
+     * @param formDTO
+     * @return  com.epmet.commons.tools.utils.Result
+     * @author yinzuomei
+     * @date 2021/8/5 10:47
+     */
+    @PostMapping("close")
+    public Result closeResiEvent(@LoginUser TokenDto tokenDto,@RequestBody CloseResiEventFormDTO formDTO){
+        formDTO.setUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(formDTO,CloseResiEventFormDTO.AddUserInternalGroup.class);
+        resiEventService.closeResiEvent(formDTO);
+        return new Result();
+    }
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java
index 65d13d225f..9529c3e005 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java
@@ -89,4 +89,14 @@ public interface ResiEventService extends BaseService<ResiEventEntity> {
      * @date 2021/8/4 9:41
      */
     List<UserMentionResultDTO> mentionList(UserMentionFormDTO formDTO);
+
+    /**
+     * 报事办结
+     *
+     * @param formDTO
+     * @return  void
+     * @author yinzuomei
+     * @date 2021/8/5 10:48
+     */
+    void closeResiEvent(CloseResiEventFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java
index 5f1d1ddaee..7d1116c60c 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java
@@ -136,8 +136,10 @@ public class ResiEventReplyServiceImpl extends BaseServiceImpl<ResiEventReplyDao
         resiEventMentionDao.updateRedDotShow(replyFormDTO.getResiEventId(),null);
         // 2、更新报事人的红点置为显示
         eventEntity.setRedDot(true);
+        //更新事件最后一次操作时间
+        eventEntity.setLatestOperatedTime(resiEventReplyEntity.getCreatedTime());
         resiEventDao.updateById(eventEntity);
-        // 3、组织改为不显示已经在查看详情中操作了 ,目前只有一个组织，如果后面可以报给多个组织，这里入参要增加orgId
+        // 3、组织改为不显示已经在查看详情中操作了 ,目前只有一个组织，如果后面可以报给多个组织，这里入参要增加orgId todo
     }
 
     private ResiEventEntity queryResiEntity(String resiEventId) {
@@ -184,6 +186,9 @@ public class ResiEventReplyServiceImpl extends BaseServiceImpl<ResiEventReplyDao
         resiEventReplyEntity.setUserShowName(userResult.getData().get(0).getShowName());
         resiEventReplyEntity.setCreatedTime(new Date());
         baseDao.insert(resiEventReplyEntity);
+        //更新事件最后一次操作时间
+        eventEntity.setLatestOperatedTime(resiEventReplyEntity.getCreatedTime());
+        resiEventDao.updateById(eventEntity);
         // 记录操作日志
         ResiEventOperationLogEntity reCallLog=new ResiEventOperationLogEntity();
         reCallLog.setCustomerId(eventEntity.getCustomerId());
@@ -244,6 +249,8 @@ public class ResiEventReplyServiceImpl extends BaseServiceImpl<ResiEventReplyDao
         resiEventMentionDao.updateRedDotShow(replyFormDTO.getResiEventId(),replyFormDTO.getUserId());
         // 2、更新报事人的红点置为显示
         eventEntity.setRedDot(true);
+        //更新事件最后一次操作时间
+        eventEntity.setLatestOperatedTime(resiEventReplyEntity.getCreatedTime());
         resiEventDao.updateById(eventEntity);
         // 3、组织改为显示
         resiEventReportOrgDao.updateRedDotShow(replyFormDTO.getResiEventId());
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index 776d82467a..e211af60d9 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -87,6 +87,8 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
     private ResiEventOperationLogDao resiEventOperationLogDao;
     @Autowired
     private ProjectDao projectDao;
+    @Autowired
+    private ResiEventReplyDao resiEventReplyDao;
 
     /**
      * @Description  群众直报（待处理、处理中、已办结）列表
@@ -493,5 +495,48 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
         return result.getList();
     }
 
+    /**
+     * 报事办结：没有回复或立项不可办结
+     *
+     * @param formDTO
+     * @return void
+     * @author yinzuomei
+     * @date 2021/8/5 10:48
+     */
+    @Override
+    public void closeResiEvent(CloseResiEventFormDTO formDTO) {
+        ResiEventEntity resiEventEntity=baseDao.selectById(formDTO.getEventId());
+        if(null==resiEventEntity){
+            throw new RenException(String.format("根据事件id没有找到记录",formDTO.getEventId()));
+        }
+        List<ReplyListResultDTO> replyList=resiEventReplyDao.selectReplyList(formDTO.getEventId());
+        //如果未转项目，也没有回复，不允许办结
+        if(!resiEventEntity.getShiftProject()&&CollectionUtils.isEmpty(replyList)){
+            throw new RenException(EpmetErrorCode.RESI_EVENT_CAN_NOT_CLOSE_CASE.getCode(),EpmetErrorCode.RESI_EVENT_CAN_NOT_CLOSE_CASE.getMsg());
+        }
+        // 1、修改事件状态
+        resiEventEntity.setRedDot(true);
+        resiEventEntity.setStatus(EventConstant.EVENT_STATUS_CLOSED_CASE);
+        resiEventEntity.setCloseCaseTime(new Date());
+        resiEventEntity.setLatestOperatedTime(resiEventEntity.getCloseCaseTime());
+        baseDao.updateById(resiEventEntity);
+        // 2、记录操作日志
+        ResiEventOperationLogEntity reCallLog=new ResiEventOperationLogEntity();
+        reCallLog.setCustomerId(resiEventEntity.getCustomerId());
+        reCallLog.setResiEventId(resiEventEntity.getId());
+        reCallLog.setUserId(formDTO.getUserId());
+        reCallLog.setUserIdentity(EventConstant.STAFF);
+        reCallLog.setActionCode(ResiEventAction.CLOSE_CASE.getCode());
+        reCallLog.setActionDesc(ResiEventAction.CLOSE_CASE.getDesc());
+        reCallLog.setOperateTime(resiEventEntity.getCloseCaseTime());
+        resiEventOperationLogDao.insert(reCallLog);
+        // 3、红点：
+        // 当前工作人员办结后：
+        // 3.1、报事人在已办结列表中展示红点：上面已经更新
+        // 3.2、人大代表在未读/已读列表中展示红点
+        resiEventMentionDao.updateRedDotShow(formDTO.getEventId(),null);
+        // 3.3、目前Db设计支持报给多个层级（组织或网格），按理说应该更新非当前组织外，其他的组织，显示红点，先不做了吧 todo
+    }
+
 
 }
\ No newline at end of file

From abdaf5aa90a134ee15dcff6a380424a6761d1613 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 5 Aug 2021 11:12:51 +0800
Subject: [PATCH 51/84] =?UTF-8?q?=E5=86=B2=E7=AA=81=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/controller/ResiEventController.java | 69 ++++++++++---------
 .../service/impl/ResiEventServiceImpl.java    |  2 +-
 2 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
index c8eb08e5cd..d984456930 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
@@ -43,34 +43,35 @@ import java.util.List;
 @RestController
 @RequestMapping("resievent")
 public class ResiEventController {
-    
+
     @Autowired
     private ResiEventService resiEventService;
 
     /**
-     * @Description  报事详情-两端通用
+     * @Description 报事详情-两端通用
      * @Param formDTO
      * @author zxc
      * @date 2021/8/3 1:47 下午
      */
     @PostMapping("eventdetail")
-    public Result<EventDetailResultDTO> eventDetail(@LoginUser TokenDto tokenDto ,@RequestBody EventDetailFormDTO formDTO){
+    public Result<EventDetailResultDTO> eventDetail(@LoginUser TokenDto tokenDto, @RequestBody EventDetailFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
-        return new Result<EventDetailResultDTO>().ok(resiEventService.eventDetail(formDTO,tokenDto));
+        return new Result<EventDetailResultDTO>().ok(resiEventService.eventDetail(formDTO, tokenDto));
     }
+
     /**
      * 我要报事-提交（尹）
      *
      * @param formDTO
-     * @return  com.epmet.commons.tools.utils.Result
+     * @return com.epmet.commons.tools.utils.Result
      * @author yinzuomei
      * @date 2021/8/3 10:46
      */
     @PostMapping("report")
-    public Result<ResiEventIdDTO> report(@LoginUser TokenDto tokenDto, @RequestBody ResiEventFormDTO formDTO){
+    public Result<ResiEventIdDTO> report(@LoginUser TokenDto tokenDto, @RequestBody ResiEventFormDTO formDTO) {
         formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setUserId(tokenDto.getUserId());
-        ValidatorUtils.validateEntity(formDTO,ResiEventFormDTO.AddUserShowGroup.class,ResiEventFormDTO.AddUserInternalGroup.class);
+        ValidatorUtils.validateEntity(formDTO, ResiEventFormDTO.AddUserShowGroup.class, ResiEventFormDTO.AddUserInternalGroup.class);
         return new Result<ResiEventIdDTO>().ok(resiEventService.report(formDTO));
     }
 
@@ -78,15 +79,15 @@ public class ResiEventController {
      * 我要报事-撤回（尹）
      *
      * @param formDTO
-     * @return  com.epmet.commons.tools.utils.Result
+     * @return com.epmet.commons.tools.utils.Result
      * @author yinzuomei
      * @date 2021/8/3 10:54
      */
     @PostMapping("recall")
-    public Result recall(@LoginUser TokenDto tokenDto,@RequestBody ReCallEventFormDTO formDTO){
+    public Result recall(@LoginUser TokenDto tokenDto, @RequestBody ReCallEventFormDTO formDTO) {
         formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setUserId(tokenDto.getUserId());
-        ValidatorUtils.validateEntity(formDTO,ResiEventIdDTO.ResiEventIdGroup.class,ReCallEventFormDTO.AddUserInternalGroup.class);
+        ValidatorUtils.validateEntity(formDTO, ResiEventIdDTO.ResiEventIdGroup.class, ReCallEventFormDTO.AddUserInternalGroup.class);
         resiEventService.reCall(formDTO);
         return new Result();
     }
@@ -96,15 +97,15 @@ public class ResiEventController {
      *
      * @param tokenDto
      * @param formDTO
-     * @return  com.epmet.commons.tools.utils.Result
+     * @return com.epmet.commons.tools.utils.Result
      * @author yinzuomei
      * @date 2021/8/3 13:57
      */
     @PostMapping("chooseresolve")
-    public Result chooseResolve(@LoginUser TokenDto tokenDto,@RequestBody ChooseResolveFormDTO formDTO){
+    public Result chooseResolve(@LoginUser TokenDto tokenDto, @RequestBody ChooseResolveFormDTO formDTO) {
         formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setUserId(tokenDto.getUserId());
-        ValidatorUtils.validateEntity(formDTO,ResiEventIdDTO.ResiEventIdGroup.class,ChooseResolveFormDTO.AddUserInternalGroup.class);
+        ValidatorUtils.validateEntity(formDTO, ResiEventIdDTO.ResiEventIdGroup.class, ChooseResolveFormDTO.AddUserInternalGroup.class);
         resiEventService.chooseResolve(formDTO);
         return new Result();
     }
@@ -115,43 +116,43 @@ public class ResiEventController {
      *
      * @param tokenDto
      * @param formDTO
-     * @return  com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.MyReportedResultDTO>>
+     * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.MyReportedResultDTO>>
      * @author yinzuomei
      * @date 2021/8/3 14:27
      */
     @PostMapping("myreported")
-    public Result<List<MyReportedResultDTO>> queryMyReported(@LoginUser TokenDto tokenDto, @RequestBody MyReportedFormDTO formDTO){
+    public Result<List<MyReportedResultDTO>> queryMyReported(@LoginUser TokenDto tokenDto, @RequestBody MyReportedFormDTO formDTO) {
         formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setUserId(tokenDto.getUserId());
-        ValidatorUtils.validateEntity(formDTO,MyReportedFormDTO.AddUserInternalGroup.class);
+        ValidatorUtils.validateEntity(formDTO, MyReportedFormDTO.AddUserInternalGroup.class);
         return new Result<List<MyReportedResultDTO>>().ok(resiEventService.queryMyReported(formDTO));
     }
 
     /**
-     * @Description  群众直报（待处理、处理中、已办结）列表
+     * @Description 群众直报（待处理、处理中、已办结）列表
      * @Param formDTO
      * @author zxc
      * @date 2021/8/3 10:53 上午
      */
     @PostMapping("eventlist")
-    public Result<List<EventListResultDTO>> eventList(@RequestBody EventListFormDTO formDTO){
+    public Result<List<EventListResultDTO>> eventList(@RequestBody EventListFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, EventListFormDTO.EventListForm.class);
         return new Result<List<EventListResultDTO>>().ok(resiEventService.eventList(formDTO));
     }
 
     /**
-     * @Description  报事-首次查看事件-两端通用
+     * @Description 报事-首次查看事件-两端通用
      * @Param formDTO
      * @author zxc
      * @date 2021/8/3 11:01 上午
      */
     @PostMapping("updateviewtime")
-    public Result updateViewTime(@LoginUser TokenDto tokenDto,@RequestBody UpdateViewTimeFormDTO formDTO){
+    public Result updateViewTime(@LoginUser TokenDto tokenDto, @RequestBody UpdateViewTimeFormDTO formDTO) {
         formDTO.setUserId(tokenDto.getUserId());
         formDTO.setCustomerId(tokenDto.getCustomerId());
-        ValidatorUtils.validateEntity(formDTO,UpdateViewTimeFormDTO.AddUserInternalGroup.class);
-        if(EventConstant.STAFF.equals(formDTO.getViewType())){
-            ValidatorUtils.validateEntity(formDTO,UpdateViewTimeFormDTO.GovInternalGroup.class);
+        ValidatorUtils.validateEntity(formDTO, UpdateViewTimeFormDTO.AddUserInternalGroup.class);
+        if (EventConstant.STAFF.equals(formDTO.getViewType())) {
+            ValidatorUtils.validateEntity(formDTO, UpdateViewTimeFormDTO.GovInternalGroup.class);
         }
         resiEventService.updateViewTime(formDTO);
         return new Result();
@@ -162,25 +163,26 @@ public class ResiEventController {
      *
      * @param tokenDto
      * @param formDTO
-     * @return  com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.MyReportedResultDTO>>
+     * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.MyReportedResultDTO>>
      * @author yinzuomei
      * @date 2021/8/4 9:40
      */
     @PostMapping("mentionlist")
-    public Result<List<UserMentionResultDTO>> mentionList(@LoginUser TokenDto tokenDto, @RequestBody UserMentionFormDTO formDTO){
+    public Result<List<UserMentionResultDTO>> mentionList(@LoginUser TokenDto tokenDto, @RequestBody UserMentionFormDTO formDTO) {
         formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setUserId(tokenDto.getUserId());
-        ValidatorUtils.validateEntity(formDTO,UserMentionFormDTO.AddUserInternalGroup.class);
+        ValidatorUtils.validateEntity(formDTO, UserMentionFormDTO.AddUserInternalGroup.class);
         return new Result<List<UserMentionResultDTO>>().ok(resiEventService.mentionList(formDTO));
-    }}
+    }
+
     /**
-     * @Description  最新直报
+     * @Description 最新直报
      * @Param userId
      * @author zxc
      * @date 2021/8/5 9:55 上午
      */
     @PostMapping("newevents")
-    public Result<List<NewEventsResultDTO>> newEvents(@LoginUser TokenDto tokenDto){
+    public Result<List<NewEventsResultDTO>> newEvents(@LoginUser TokenDto tokenDto) {
         return new Result<List<NewEventsResultDTO>>().ok(resiEventService.newEvents(tokenDto.getUserId()));
     }
 
@@ -189,14 +191,15 @@ public class ResiEventController {
      *
      * @param tokenDto
      * @param formDTO
-     * @return  com.epmet.commons.tools.utils.Result
+     * @return com.epmet.commons.tools.utils.Result
      * @author yinzuomei
      * @date 2021/8/5 10:47
      */
     @PostMapping("close")
-    public Result closeResiEvent(@LoginUser TokenDto tokenDto,@RequestBody CloseResiEventFormDTO formDTO){
+    public Result closeResiEvent(@LoginUser TokenDto tokenDto, @RequestBody CloseResiEventFormDTO formDTO) {
         formDTO.setUserId(tokenDto.getUserId());
-        ValidatorUtils.validateEntity(formDTO,CloseResiEventFormDTO.AddUserInternalGroup.class);
+        ValidatorUtils.validateEntity(formDTO, CloseResiEventFormDTO.AddUserInternalGroup.class);
         resiEventService.closeResiEvent(formDTO);
         return new Result();
-    }
\ No newline at end of file
+    }
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index 50b73bc605..4e2452c6c2 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -89,7 +89,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
     private ProjectDao projectDao;
     @Autowired
     private ResiEventReplyDao resiEventReplyDao;
-y
+
     /**
      * @Description  群众直报（待处理、处理中、已办结）列表
      *   未处理：按照创建时间正序；

From a6de8b67d963383e938a6c15f5b74e47485ed52e Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 5 Aug 2021 14:03:45 +0800
Subject: [PATCH 52/84] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=8A=A5=E4=BA=8B?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=BF=94=E5=9B=9E=EF=BC=8C=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=9B=9E=E5=A4=8D=E6=8C=89=E9=92=AE=EF=BC=9A?=
 =?UTF-8?q?=E5=B7=B2=E5=8A=9E=E7=BB=93=E7=9A=84=E4=B8=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=EF=BC=8C=E6=9C=AA=E8=A2=AB=E4=BA=BA=E8=AF=BB=E7=9A=84=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=EF=BC=8C=E5=B7=B2=E8=A2=AB=E8=AF=BB=E7=9A=84?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/result/MyReportedResultDTO.java | 10 ++++++++++
 .../epmet/service/impl/ResiEventServiceImpl.java  | 15 +++++++++++++++
 .../src/main/resources/mapper/ResiEventDao.xml    |  4 +++-
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MyReportedResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MyReportedResultDTO.java
index 32209d0249..d2df7d7a66 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MyReportedResultDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MyReportedResultDTO.java
@@ -52,4 +52,14 @@ public class MyReportedResultDTO implements Serializable {
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date showTime;
+
+    /**
+     * true:显示回复；false：不显示回复按钮
+     */
+    private String replyButtonFlag;
+
+    /**
+     * 事件是否被阅读过;1已读；针对报事人待处理列表
+     */
+    private Boolean readFlag;
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index 4e2452c6c2..83d20152fd 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -476,6 +476,21 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
         PageInfo<MyReportedResultDTO> result = PageHelper.startPage(formDTO.getPageNo(),
                 formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.queryMyReported(formDTO.getUserId(),
                     formDTO.getStatusCondition()));
+        result.getList().forEach(resultDTO->{
+            if(EventConstant.EVENT_STATUS_CLOSED_CASE.equals(resultDTO.getStatus())){
+                // 已办结的不显示回复按钮
+                resultDTO.setReplyButtonFlag("false");
+            }else{
+                // 处理中的事件
+                if(resultDTO.getReadFlag()){
+                    // 被别人看过了就显示回复
+                    resultDTO.setReplyButtonFlag("true");
+                }else{
+                    //别人没看过
+                    resultDTO.setReplyButtonFlag("false");
+                }
+            }
+        });
         return result.getList();
     }
 
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
index 1af9c54926..617d3c795c 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
@@ -51,6 +51,7 @@
         <result property="status" column="STATUS" />
         <result property="shiftProject" column="SHIFT_PROJECT" />
         <result property="showTime" column="LATEST_OPERATED_TIME" />
+        <result property="readFlag" column="READ_FLAG" />
         <collection property="imgList" ofType="java.lang.String">
             <constructor>
                 <arg column="img_url"/>
@@ -70,7 +71,8 @@
             re.`STATUS`,
             re.SHIFT_PROJECT,
             re.LATEST_OPERATED_TIME,
-            rea.ATTACHMENT_URL as img_url
+            rea.ATTACHMENT_URL as img_url,
+            re.READ_FLAG
         from resi_event re
         left join resi_event_attachment rea
              on(re.id=rea.RESI_EVENT_ID

From b759be01560cd63fb0406ba0c8ffd6ce265b1776 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 5 Aug 2021 14:19:38 +0800
Subject: [PATCH 53/84] =?UTF-8?q?=E5=BA=94=E5=89=8D=E7=AB=AF=E8=A6=81?=
 =?UTF-8?q?=E6=B1=82=EF=BC=8C=E5=B0=86=E8=A2=AB=E6=8F=90=E5=88=B0=E7=9A=84?=
 =?UTF-8?q?=E4=BA=BA=E5=88=86=E6=88=90=E4=B8=A4=E4=B8=AA=E9=9B=86=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/result/EventDetailResultDTO.java | 5 +++++
 .../java/com/epmet/service/impl/ResiEventServiceImpl.java    | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java
index e5997ab62f..18295391c5 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java
@@ -66,6 +66,11 @@ public class EventDetailResultDTO implements Serializable {
      */
     private List<String> eventPerson;
 
+    /**
+     * 被提到的组织
+     */
+    private List<String> eventOrg;
+
     /**
      * 报事人名字
      */
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index 83d20152fd..b102b84c85 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -201,8 +201,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
             throw new RenException("查询组织名称失败");
         }
         List<String> data = orgResult.getData();
-        data.addAll(dto.getEventPerson());
-        dto.setEventPerson(data);
+        dto.setEventOrg(data);
         // 更改已读状态 报事人的红点：resi_event,艾特人的：resi_event_mention,所代表的组织的：resi_event_report_org
         if (tokenDto.getApp().equals(EventConstant.TYPE_RESI)){
             baseDao.updateResiEvent(tokenDto.getUserId(),formDTO.getEventId());

From a0ba787b3d6d21e92172b4ecf5ddf2a63b7c2864 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 5 Aug 2021 14:32:53 +0800
Subject: [PATCH 54/84] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=8A=A5=E4=BA=8B?=
 =?UTF-8?q?=E4=BA=BA=E6=98=AF=E4=BA=BA=E5=A4=A7=E4=BB=A3=E8=A1=A8=EF=BC=8C?=
 =?UTF-8?q?=E5=B9=B6=E4=B8=94=E8=87=AA=E5=B7=B1=E8=89=BE=E7=89=B9=E4=BA=86?=
 =?UTF-8?q?=E8=87=AA=E5=B7=B1=EF=BC=8C=E5=9C=A8=E4=B8=AA=E4=BA=BA=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E6=9C=AA=E8=AF=BB=E5=88=97=E8=A1=A8=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E6=9B=B4=E6=94=B9=E4=B8=BA=E5=B7=B2=E8=AF=BB?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dao/ResiEventMentionDao.java   | 2 ++
 .../java/com/epmet/service/impl/ResiEventServiceImpl.java  | 5 +++--
 .../src/main/resources/mapper/ResiEventMentionDao.xml      | 7 +++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java
index 15062a1385..76aaeb9162 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java
@@ -65,4 +65,6 @@ public interface ResiEventMentionDao extends BaseDao<ResiEventMentionEntity> {
      * @date 2021/8/4 17:41
      */
     int updateRedDotShow(@Param("resiEventId") String resiEventId,@Param("excludeUserId")String excludeUserId);
+
+    ResiEventMentionEntity selectUser(@Param("eventId") String eventId, @Param("userId")String userId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index b102b84c85..ebeda707f1 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -120,8 +120,9 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
         if (null == eventEntity) {
             throw new RenException(String.format("没有找到事件记录,eventId:%s",formDTO.getEventId()));
         }
-        if(formDTO.getUserId().equals(eventEntity.getReportUserId())){
-            log.warn("报事人查看详情不需要调用此接口");
+        ResiEventMentionEntity resiEventMentionEntity=resiEventMentionDao.selectUser(formDTO.getEventId(),formDTO.getUserId());
+        if (formDTO.getUserId().equals(eventEntity.getReportUserId()) && null == resiEventMentionEntity) {
+            log.warn("报事人查看详情不需要调用此接口,如果既是报事人又是人大代表，自己艾特了自己，需要更新为已读");
             return;
         }
         // 这个事件已经被查看了
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml
index 88a62a2f2a..28548eaad9 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml
@@ -78,4 +78,11 @@
                 </if>
                 AND DEL_FLAG = '0'
     </update>
+
+    <select id="selectUser" parameterType="map" resultType="com.epmet.entity.ResiEventMentionEntity">
+        select rem.* from resi_event_mention rem
+        where rem.del_flag='0'
+        and rem.RESI_EVENT_ID=#{eventId}
+        and rem.user_id=#{userId}
+    </select>
 </mapper>
\ No newline at end of file

From 232ed3c0e67bb0614e37084764747d828b5d1b3a Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 5 Aug 2021 14:46:14 +0800
Subject: [PATCH 55/84] =?UTF-8?q?=E4=BA=BA=E5=A4=A7=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=EF=BC=8C=E8=BF=94=E5=9B=9E=E6=98=AF=E5=90=A6=E5=8F=AF=E5=9B=9E?=
 =?UTF-8?q?=E5=A4=8D=EF=BC=8C=E5=8F=AA=E8=A6=81=E5=8A=9E=E7=BB=93=E6=88=96?=
 =?UTF-8?q?=E8=80=85=E7=AB=8B=E9=A1=B9=E4=BA=86=EF=BC=8C=E4=B8=8D=E5=8F=AF?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/result/UserMentionResultDTO.java   | 6 ++++++
 .../java/com/epmet/service/impl/ResiEventServiceImpl.java | 8 ++++++++
 2 files changed, 14 insertions(+)

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/UserMentionResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/UserMentionResultDTO.java
index 95ac2e2527..48bb9583ba 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/UserMentionResultDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/UserMentionResultDTO.java
@@ -52,4 +52,10 @@ public class UserMentionResultDTO implements Serializable {
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date showTime;
+
+    /**
+     * true:显示回复；false：不显示回复按钮
+     */
+    private String replyButtonFlag;
+
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index ebeda707f1..285448dec6 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -507,6 +507,14 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
         PageInfo<UserMentionResultDTO> result = PageHelper.startPage(formDTO.getPageNo(),
                 formDTO.getPageSize()).doSelectPageInfo(() -> resiEventMentionDao.selectMentionList(formDTO.getUserId(),
                 formDTO.getReadFlag()));
+        result.getList().forEach(dto->{
+            if(dto.getShiftProject()||dto.getStatus().equals(EventConstant.EVENT_STATUS_CLOSED_CASE)){
+                // 立项和办结了不能回复哈。
+                dto.setReplyButtonFlag("false");
+            }else{
+                dto.setReplyButtonFlag("true");
+            }
+        });
         return result.getList();
     }
 

From 70c6f091ec4e1ed555dc31c0de1154ac8ed4e874 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 5 Aug 2021 14:57:59 +0800
Subject: [PATCH 56/84] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E5=BE=85=E5=A4=84=E7=90=86=E5=88=97=E8=A1=A8=EF=BC=8C=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E8=AF=A6=E6=83=85=EF=BC=8C=E6=9B=B4=E6=96=B0=E5=B7=B2?=
 =?UTF-8?q?=E8=AF=BB=E3=80=82=E6=8A=A5=E4=BA=8B=E6=88=90=E5=8A=9F=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E4=BA=BA=E5=A4=A7=E9=BB=98=E8=AE=A4=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E7=BA=A2=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index 285448dec6..632887c34f 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -297,8 +297,8 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
             mentionEntity.setAgencyId(npc.getAgencyId());
             mentionEntity.setPids(npc.getPids());
             mentionEntity.setReadFlag(EventConstant.UN_READ);
-            //默认不展示，因为此时在未读列表中
-            mentionEntity.setRedDot(false);
+            //默认展示，但是此时在未读列表中，个人中心页面应该展示红点
+            mentionEntity.setRedDot(true);
             list.add(mentionEntity);
         });
         return list;
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReportOrgDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReportOrgDao.xml
index 7291f346c2..e4dd9e7553 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReportOrgDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReportOrgDao.xml
@@ -6,7 +6,7 @@
 
     <update id="updateReadFlag" parameterType="map">
         UPDATE resi_event_report_org
-        SET READ_FLAG = 'read',
+        SET ORG_READ = 'read',
         UPDATED_BY = #{userId},
         UPDATED_TIME = NOW()
         WHERE

From 57b3bd02559c680c223fe4eae0fb7a52e60426c7 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 5 Aug 2021 15:35:14 +0800
Subject: [PATCH 57/84] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/form/EventListFormDTO.java     | 3 +++
 .../main/java/com/epmet/service/impl/ResiEventServiceImpl.java | 1 +
 .../src/main/resources/mapper/ResiEventDao.xml                 | 1 +
 3 files changed, 5 insertions(+)

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventListFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventListFormDTO.java
index 699c6ada63..e4632b7f33 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventListFormDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventListFormDTO.java
@@ -26,4 +26,7 @@ public class EventListFormDTO implements Serializable {
 
     @NotBlank(message = "",groups = EventListForm.class)
     private String orgId;
+
+    private Integer pageNo;
+    private Integer pageSize;
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index 632887c34f..4c6d03c648 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -101,6 +101,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
      */
     @Override
     public List<EventListResultDTO> eventList(EventListFormDTO formDTO) {
+        PageHelper.startPage(formDTO.getPageNo(),formDTO.getPageSize());
         List<EventListResultDTO> result = baseDao.eventUnDisposedList(formDTO.getOrgId(), formDTO.getEventType());
         if (!CollectionUtils.isEmpty(result)){
             return result;
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
index 617d3c795c..fc1ad216cb 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
@@ -25,6 +25,7 @@
         FROM resi_event_report_org ro
         INNER JOIN resi_event re ON (ro.RESI_EVENT_ID = re.ID AND re.DEL_FLAG = '0')
         AND ro.DEL_FLAG = '0'
+        and ro.ORG_ID = #{orgId}
         <if test='eventType == "undisposed" '>
             AND ro.ORG_READ = 'un_read'
             ORDER BY re.CREATED_TIME

From bbfde2813b28d1fbbd51e34dbac3bc54fb103723 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 5 Aug 2021 16:16:32 +0800
Subject: [PATCH 58/84] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8A=A5=E4=BA=8BID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/result/NewEventsResultDTO.java    | 2 ++
 .../src/main/resources/mapper/ResiEventDao.xml                | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/NewEventsResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/NewEventsResultDTO.java
index 77f4eb4d68..8035108f6a 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/NewEventsResultDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/NewEventsResultDTO.java
@@ -29,4 +29,6 @@ public class NewEventsResultDTO implements Serializable {
      * 事件图片
      */
     private List<String> eventImgs;
+
+    private String eventId;
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
index fc1ad216cb..ec756161fa 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
@@ -160,6 +160,7 @@
     <resultMap id="newEventsMap" type="com.epmet.dto.result.NewEventsResultDTO">
         <result property="eventContent" column="eventContent"/>
         <result property="eventTime" column="eventTime"/>
+        <result property="eventId" column="eventId"/>
         <collection property="eventImgs" ofType="java.lang.String">
             <result column="img"/>
         </collection>
@@ -168,7 +169,8 @@
         SELECT
         IFNULL(re.EVENT_CONTENT,'') AS eventContent,
         DATE_FORMAT(re.CREATED_TIME,'%Y-%m-%d %H:%i') AS eventTime,
-        IFNULL(ea.ATTACHMENT_URL,'') AS img
+        IFNULL(ea.ATTACHMENT_URL,'') AS img,
+        re.id as eventId
         FROM resi_event_report_org ro
         LEFT JOIN resi_event re ON (re.ID = ro.RESI_EVENT_ID AND re.DEL_FLAG = '0')
         LEFT JOIN resi_event_attachment ea ON (ea.RESI_EVENT_ID = ro.RESI_EVENT_ID AND ea.DEL_FLAG = '0' AND

From a0169f6eef639458e1e999ec1c96c1acb00a22b9 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 5 Aug 2021 16:29:45 +0800
Subject: [PATCH 59/84] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=AB=8B=E9=A1=B9V1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/exception/EpmetErrorCode.java       |   1 +
 .../epmet/dto/form/EventShiftProjectDTO.java  |  23 ++
 .../epmet/dto/form/EventToProjectFormDTO.java |  96 +++++
 .../dto/result/EventToProjectResultDTO.java   |  17 +
 .../com/epmet/constant/ProjectConstant.java   |   2 +
 .../controller/ProjectTraceController.java    |  18 +
 .../epmet/service/ProjectTraceService.java    |  10 +
 .../com/epmet/service/ResiEventService.java   |  11 +
 .../service/impl/ProjectTraceServiceImpl.java | 352 +++++++++++++++++-
 .../service/impl/ResiEventServiceImpl.java    |  37 ++
 10 files changed, 566 insertions(+), 1 deletion(-)
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventShiftProjectDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventToProjectFormDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventToProjectResultDTO.java

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 3966217c18..96558433fc 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
@@ -100,6 +100,7 @@ public enum EpmetErrorCode {
 	CAN_NOT_REPLY_RESI_EVENT_GOV(8605,"办结、立项处理后不可回复"),
 	CAN_NOT_REPLY_RESI_EVENT_SELF(8606,"当前事件待处理,不可回复"),
 	RESI_EVENT_CAN_NOT_CLOSE_CASE(8607,"事件尚未处理，请处理完成后进行办结"),
+	RESI_EVENT_SHIFT_PROJECT(8608,"事件已立项，请勿重复操作"),
 
 	// 爱心互助 居民端
     NOT_IN_THE_SIGN_IN_RANGE(8510, "您还未进入指定的签到范围～"),
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventShiftProjectDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventShiftProjectDTO.java
new file mode 100644
index 0000000000..b5ef015258
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventShiftProjectDTO.java
@@ -0,0 +1,23 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 事件立项，入参
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/8/5 16:15
+ */
+@Data
+public class EventShiftProjectDTO implements Serializable {
+    private static final long serialVersionUID = 5519721673862754305L;
+    //转项目的人
+    private String userId;
+    private String eventId;
+    private String projectId;
+    private Date shiftProjectTime;
+    private String userAgencyId;
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventToProjectFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventToProjectFormDTO.java
new file mode 100644
index 0000000000..758b7acbbb
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventToProjectFormDTO.java
@@ -0,0 +1,96 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+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;
+
+/**
+ * 事件-里项目
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/8/5 15:19
+ */
+@Data
+public class EventToProjectFormDTO implements Serializable {
+    private static final long serialVersionUID = 3392008990676159012L;
+
+    public interface AddUserInternalGroup {
+    }
+
+    public interface ApprovalCategory extends CustomerClientShowGroup {
+    }
+
+    /**
+     * 事件id
+     */
+    @NotBlank(message = "事件id不能为空", groups = AddUserInternalGroup.class)
+    private String eventId;
+
+    /**
+     * 项目方案 1000
+     */
+    @Length(min = 1, max = 1000, message = "项目方案1000字", groups = {ApprovalCategory.class})
+    private String publicReply;
+    /**
+     * 内部备注 1000
+     */
+    @Length(min = 1, max = 1000, message = "内部备注1000字", groups = {ApprovalCategory.class})
+    private String internalRemark;
+
+    /**
+     * 吹哨勾选的工作人员信息集合,不可为空
+     */
+    @Valid
+    private List<TickStaffFormDTO> staffList;
+    /**
+     * 项目所选分类集合，不可为空
+     */
+    @Valid
+    private List<CategoryOrTagFormDTO> categoryList;
+    /**
+     * 项目所选标签集合
+     */
+    private List<CategoryOrTagFormDTO> tagList;
+
+    @Length(min = 1, max = 20, message = "项目标题不能超过20位", groups = {ApprovalCategory.class})
+    private String title;
+
+    /**
+     * 公开答复对应文件集合
+     */
+    private List<FileDTO> publicFile;
+    /**
+     * 内部备注对应文件集合
+     */
+    private List<FileDTO> internalFile;
+
+    //定位地址[立项项目指的项目发生位置，议题转的项目指的话题发生位置]
+    private String locateAddress;
+    //定位经度
+    private String locateLongitude;
+    //定位纬度
+    private String locateDimension;
+
+
+
+    //以下参数从token中获取
+    /**
+     * 当前用户id
+     */
+    @NotBlank(message = "userId不能为空",groups = AddUserInternalGroup.class)
+    private String userId;
+
+    /**
+     * 当前客户id
+     */
+    @NotBlank(message = "customerId不能为空",groups = AddUserInternalGroup.class)
+    private String customerId;
+
+    private String app;
+    private String client;
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventToProjectResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventToProjectResultDTO.java
new file mode 100644
index 0000000000..f17f2e6f34
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventToProjectResultDTO.java
@@ -0,0 +1,17 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 描述一下
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/8/5 15:36
+ */
+@Data
+public class EventToProjectResultDTO implements Serializable {
+    private static final long serialVersionUID = -7544325891712303124L;
+    private String projectId;
+}
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 43c87b57b5..b5acf5b2e7 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
@@ -14,6 +14,8 @@ public interface ProjectConstant {
 	 * 项目来源-组织(项目立项)
 	 */
 	String AGENCY = "agency";
+
+	String RESI_EVENT="resi_event";
 	/**
 	 * 状态-待处理
 	 */
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 a91cc3513b..b3053bbd93 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
@@ -362,5 +362,23 @@ public class ProjectTraceController {
 		return new Result();
 	}
 
+	/**
+	 * 事件-立项
+	 *
+	 * @param tokenDto
+	 * @param formDTO
+	 * @return  com.epmet.commons.tools.utils.Result<com.epmet.dto.result.EventToProjectResultDTO>
+	 * @author yinzuomei
+	 * @date 2021/8/5 15:37
+	 */
+	@PostMapping("eventToProject")
+	public Result<EventToProjectResultDTO> eventToProject(@LoginUser TokenDto tokenDto,@RequestBody EventToProjectFormDTO formDTO){
+		formDTO.setCustomerId(tokenDto.getCustomerId());
+		formDTO.setUserId(tokenDto.getUserId());
+		formDTO.setApp(tokenDto.getApp());
+		formDTO.setClient(tokenDto.getClient());
+		ValidatorUtils.validateEntity(formDTO,EventToProjectFormDTO.ApprovalCategory.class,EventToProjectFormDTO.AddUserInternalGroup.class);
+		return new Result<EventToProjectResultDTO>().ok(projectTraceService.eventToProject(formDTO));
+	}
 }
 
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
index d3d2cc3f3b..620f9577fc 100644
--- 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
@@ -173,4 +173,14 @@ public interface ProjectTraceService {
 	 * @Description 项目立项
 	 **/
     void projectApproval(ProjectApprovalFormDTO formDTO);
+
+	/**
+	 * 事件立项
+	 *
+	 * @param formDTO
+	 * @return  com.epmet.dto.result.EventToProjectResultDTO
+	 * @author yinzuomei
+	 * @date 2021/8/5 15:38
+	 */
+	EventToProjectResultDTO eventToProject(EventToProjectFormDTO formDTO);
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java
index 64a6c5e6a7..6822dfe4fa 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java
@@ -108,4 +108,15 @@ public interface ResiEventService extends BaseService<ResiEventEntity> {
      */
     void closeResiEvent(CloseResiEventFormDTO formDTO);
 
+    /**
+     * 事件立项：更新立项标志、增加操作日志、更新（报事人、被艾特的人）红点
+     *
+     * @param eventShiftProjectDTO
+     * @return  void
+     * @author yinzuomei
+     * @date 2021/8/5 16:17
+     */
+    void shiftProject(EventShiftProjectDTO eventShiftProjectDTO);
+
+    ResiEventEntity getById(String eventId);
 }
\ 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
index 0d1c537388..676b3bdc56 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
@@ -22,7 +22,6 @@ import com.epmet.constant.UserMessageConstant;
 import com.epmet.dao.ProjectOrgRelationDao;
 import com.epmet.dao.ProjectProcessAttachmentDao;
 import com.epmet.dao.ProjectProcessDao;
-import com.epmet.dto.CustomerStaffDTO;
 import com.epmet.dto.IssueProjectCategoryDictDTO;
 import com.epmet.dto.IssueProjectTagDictDTO;
 import com.epmet.dto.ProjectStaffDTO;
@@ -93,6 +92,8 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
 	private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
 	@Autowired
 	private LoginUserUtil loginUserUtil;
+	@Autowired
+	private ResiEventService resiEventService;
 
 	@Override
 	public List<PendProjectListResultDTO> getPendProjectList(TokenDto tokenDto, ProjectListFromDTO fromDTO) {
@@ -615,5 +616,354 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
 		return epmetMessageOpenFeignClient.sendWxSubscribeMessage(msgList);
 	}
 
+	/**
+	 * 事件立项
+	 *
+	 * @param formDTO
+	 * @return com.epmet.dto.result.EventToProjectResultDTO
+	 * @author yinzuomei
+	 * @date 2021/8/5 15:38
+	 */
+	@Override
+	public EventToProjectResultDTO eventToProject(EventToProjectFormDTO formDTO) {
+		//事件已经立项，不能重复操作
+		ResiEventEntity resiEventEntity=resiEventService.getById(formDTO.getEventId());
+		if(null==resiEventEntity||resiEventEntity.getShiftProject()){
+			throw new RenException(EpmetErrorCode.RESI_EVENT_SHIFT_PROJECT.getCode(),EpmetErrorCode.RESI_EVENT_SHIFT_PROJECT.getMsg());
+		}
+		List<TickStaffFormDTO> staffList = formDTO.getStaffList();
+		//1.文字内容安全校验
+		List<String> list = new ArrayList<>();
+		list.add(formDTO.getTitle());list.add(formDTO.getPublicReply());list.add(formDTO.getPublicReply());list.add(formDTO.getInternalRemark());
+		safetyCheck(list);
+		//2.数据准备
+		//2-1获取当前工作人员基本信息
+		LoginUserDetailsResultDTO loginUser=queryLoginUserInfo(formDTO);
+
+		//2-2.调用gov-org服务，获取所有勾选人员以及议题数据对应的组织信息、部门信息、网格信息用于对处理部门和ORG_ID_PATH字段的赋值使用
+		AgencyDeptGridResultDTO agencyDeptGrid = getAgencyDeptGridRes(formDTO.getStaffList(),loginUser.getAgencyId());
+
+		//2-3.调用issue服务，查询分类、标签数据信息
+		CategoryTagResultDTO categoryTagResultDTO=queryCategoryTagRes(formDTO);
+		List<IssueProjectCategoryDictDTO> categoryList = categoryTagResultDTO.getCategoryList();
+		List<IssueProjectTagDictDTO> tagList = categoryTagResultDTO.getTagList();
+
+		//2-4.批量查询被勾选工作人员基础信息
+		List<StaffListResultDTO> staffInfoList=queryStaffListRes(formDTO.getStaffList(),formDTO.getUserId());
+
+		//3.封装保存业务数据
+		//3-1.项目主表新增数据
+		ProjectEntity projectEntity = new ProjectEntity();
+		projectEntity.setCustomerId(formDTO.getCustomerId());
+		// 立项人的所属组织id
+		projectEntity.setAgencyId(loginUser.getAgencyId());
+		// 项目来源新增：resi_event
+		projectEntity.setOrigin(ProjectConstant.RESI_EVENT);
+		projectEntity.setOriginId(formDTO.getEventId());
+		projectEntity.setTitle(formDTO.getTitle());
+		projectEntity.setBackGround(formDTO.getPublicReply());
+		projectEntity.setStatus(ProjectConstant.PENDING);
+		projectEntity.setOrgIdPath(loginUser.getOrgIdPath());
+		projectEntity.setLocateAddress(null == formDTO.getLocateAddress() ? "" : formDTO.getLocateAddress());
+		projectEntity.setLocateLongitude(null == formDTO.getLocateLongitude() ? "" : formDTO.getLocateLongitude());
+		projectEntity.setLocateDimension(null == formDTO.getLocateDimension() ? "" : formDTO.getLocateDimension());
+		projectService.insert(projectEntity);
+
+		//3-2.项目进展表新增第一个节点数据
+		ProjectProcessEntity processEntity = new ProjectProcessEntity();
+		processEntity.setProjectId(projectEntity.getId());
+		processEntity.setCustomerId(formDTO.getCustomerId());
+		processEntity.setStaffId(formDTO.getUserId());
+		processEntity.setOperation(ProjectConstant.OPERATION_CREATED);
+		processEntity.setOperationName(ProjectConstant.OPERATION_PROJECT_APPROVAL);
+		processEntity.setPublicReply(formDTO.getPublicReply());
+		processEntity.setInternalRemark(formDTO.getInternalRemark());
+		agencyDeptGrid.getAgencyList().forEach(agency -> {
+			if (loginUser.getAgencyId().equals(agency.getId())) {
+				processEntity.setDepartmentName(agency.getOrganizationName());
+				processEntity.setAgencyId(agency.getId());
+				if(org.apache.commons.lang3.StringUtils.isBlank(agency.getPids()) || org.apache.commons.lang3.StringUtils.equals(NumConstant.ZERO_STR,agency.getPids().trim()) || "".equals(agency.getPids().trim())){
+					processEntity.setOrgIdPath(agency.getId());
+				}else{
+					processEntity.setOrgIdPath(agency.getPids().concat(":").concat(agency.getId()));
+				}
+			}
+		});
+		projectProcessService.insert(processEntity);
+
+		//3-3.项目人员表批量新增数据
+		List<ProjectStaffEntity> entityList = new ArrayList<>();
+		staffList.forEach(ts -> {
+			ProjectStaffEntity entity = ConvertUtils.sourceToTarget(ts, ProjectStaffEntity.class);
+			entity.setOrgId(ts.getAgencyId());
+			entity.setProjectId(projectEntity.getId());
+			entity.setProcessId(processEntity.getId());
+			entity.setIsHandle(ProjectConstant.UNHANDLED);
+			agencyDeptGrid.getAgencyList().forEach(agency -> {
+				if (ts.getAgencyId().equals(agency.getId())) {
+					entity.setCustomerId(agency.getCustomerId());
+					entity.setOrgIdPath(("".equals(agency.getPids()) ? "" : agency.getPids() + ":") + agency.getId());
+					entity.setDepartmentName(agency.getOrganizationName());
+				}
+			});
+			if (org.apache.commons.lang3.StringUtils.isNotBlank(ts.getDepartmentId())) {
+				agencyDeptGrid.getDeptList().forEach(dept -> {
+					if (ts.getDepartmentId().equals(dept.getId())) {
+						entity.setDepartmentName(entity.getDepartmentName() + "-" + dept.getDepartmentName());
+					}
+				});
+			}
+			if (org.apache.commons.lang3.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);
+
+		//3-4.项目附件表新增数据
+		if ((null != formDTO.getPublicFile() && formDTO.getPublicFile().size() > NumConstant.ZERO)
+				|| (null != formDTO.getInternalFile() && formDTO.getInternalFile().size() > NumConstant.ZERO)) {
+			projectService.saveFile(formDTO.getPublicFile(), formDTO.getInternalFile(), formDTO.getCustomerId(), projectEntity.getId(), processEntity.getId());
+		}
+
+		//3-5.项目分类表新增数据
+		if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(formDTO.getCategoryList())) {
+			List<ProjectCategoryEntity> categoryEntityList = new ArrayList<>();
+			formDTO.getCategoryList().forEach(item -> {
+				categoryList.forEach(ca->{
+					if(item.getId().equals(ca.getId())){
+						ProjectCategoryEntity entity = new ProjectCategoryEntity();
+						entity.setCustomerId(formDTO.getCustomerId());
+						entity.setProjectId(projectEntity.getId());
+						entity.setCategoryId(item.getId());
+						entity.setCategoryPids(ca.getPids());
+						entity.setCategoryCode(ca.getCategoryCode());
+						categoryEntityList.add(entity);
+					}
+				});
+			});
+			projectCategoryService.insertBatch(categoryEntityList);
+		}
+
+		//3-6.项目标签表新增数据
+		if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(formDTO.getTagList())) {
+			List<ProjectTagsEntity> tagEntityList = new ArrayList<>();
+			formDTO.getTagList().forEach(item -> {
+				tagList.forEach(ta->{
+					if(item.getId().equals(ta.getId())){
+						ProjectTagsEntity entity = new ProjectTagsEntity();
+						entity.setCustomerId(formDTO.getCustomerId());
+						entity.setProjectId(projectEntity.getId());
+						entity.setTagId(item.getId());
+						entity.setTagName(ta.getTagName());
+						tagEntityList.add(entity);
+					}
+				});
+			});
+			projectTagsService.insertBatch(tagEntityList);
+		}
+
+		//3-7:初始化机关-项目时间关联数据
+		Date current = new Date();
+		List<String> projectStaffIds = entityList.stream().map(ProjectStaffEntity::getId).distinct().collect(Collectors.toList());
+		if(!org.apache.commons.collections4.CollectionUtils.isEmpty(projectStaffIds)){
+			List<ProjectOrgRelationEntity> container = new LinkedList<>();
+			projectStaffIds.forEach(o -> {
+				ProjectOrgRelationEntity period = new ProjectOrgRelationEntity();
+				period.setProjectStaffId(o);
+				period.setInformedDate(current);
+				period.setSourceOperation(ProjectConstant.OPERATION_CREATED);
+				period.setCreatedBy(formDTO.getUserId());
+				container.add(period);
+			});
+			relationDao.insertBatch(container);
+		}
+
+		//4.推送站内信、微信、短信消息
+		//4-1.调用epmet-message服务，给工作端勾选的工作人员发送消息
+		if (!shiftProjectMessage(formDTO.getStaffList(),formDTO.getCustomerId(),formDTO.getTitle()).success()) {
+			throw new RenException("事件转为项目，推送站内信失败");
+		}
+
+		//4-2.以及政府端调用epmet-message服务，给工作端工作人员推送微信订阅消息
+		if (!wxmpShiftProjectMessage(formDTO.getStaffList(),formDTO.getCustomerId(),formDTO.getTitle()).success()) {
+			logger.error("事件转为项目，推送微信订阅消息失败！");
+		}
+
+		//4-3.吹哨短信消息
+		List<ProjectSendMsgFormDTO> smsList = new ArrayList<>();
+		staffList.forEach(staff -> {
+			staffInfoList.forEach(st->{
+				if(staff.getStaffId().equals(st.getStaffId())){
+					ProjectSendMsgFormDTO sms = new ProjectSendMsgFormDTO();
+					sms.setCustomerId(st.getCustomerId());
+					sms.setMobile(st.getMobile());
+					sms.setAliyunTemplateCode(SmsTemplateConstant.PROJECT_TRANSFER);
+					sms.setParameterKey("send_msg");
+					smsList.add(sms);
+				}
+			});
+		});
+		Result result = epmetMessageOpenFeignClient.projectSendMsg(smsList);
+		if (!result.success()) {
+			logger.error("项目吹哨，发送手机短信失败" + JSON.toJSONString(result));
+		}
+
+		//项目实时统计消息
+		HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+		String mqMsgBrief = String.format("创建了\"%s\"的项目", formDTO.getTitle());
+		ProjectChangedMQMsg mqMsg = new ProjectChangedMQMsg(projectEntity.getCustomerId(), ProjectConstant.OPERATION_CREATED,
+				projectEntity.getId(),
+				formDTO.getUserId(),
+				new Date(),
+				mqMsgBrief,
+				IpUtils.getIpAddr(request),
+				loginUserUtil.getLoginUserApp(),
+				loginUserUtil.getLoginUserClient());
+		boolean msgResult = SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendProjectChangedMqMsg(mqMsg);
+		if (!msgResult) {
+			log.error("项目实时统计消息发送失败");
+		}
+
+		// 报事人、被艾特的人显示红点
+		EventShiftProjectDTO eventShiftProjectDTO=new EventShiftProjectDTO();
+		eventShiftProjectDTO.setEventId(formDTO.getEventId());
+		eventShiftProjectDTO.setProjectId(projectEntity.getId());
+		eventShiftProjectDTO.setShiftProjectTime(projectEntity.getCreatedTime());
+		eventShiftProjectDTO.setUserId(formDTO.getUserId());
+		eventShiftProjectDTO.setUserAgencyId(projectEntity.getAgencyId());
+		resiEventService.shiftProject(eventShiftProjectDTO);
+		EventToProjectResultDTO resultDTO=new EventToProjectResultDTO();
+		resultDTO.setProjectId(projectEntity.getId());
+		return resultDTO;
+	}
+
+	private List<StaffListResultDTO> queryStaffListRes(List<TickStaffFormDTO> staffList,String currentUserId) {
+		List<String> staffIdList = staffList.stream().map(TickStaffFormDTO::getStaffId).collect(Collectors.toList());
+		staffIdList.add(currentUserId);
+		staffIdList = new ArrayList<String>(new LinkedHashSet<>(staffIdList));
+		Result<CustomerStaffListResultDTO> resultStaff = epmetUserOpenFeignClient.getCustomerStaffList(staffIdList);
+		if (!resultStaff.success() || null == resultStaff.getData()) {
+			throw new RenException("项目立项，调用user服务获取被勾选工作人员基本信息失败");
+		}
+		return resultStaff.getData().getStaffList();
+	}
+
+	private CategoryTagResultDTO queryCategoryTagRes(EventToProjectFormDTO formDTO) {
+		CategoryTagListFormDTO categoryTag = new CategoryTagListFormDTO();
+		List<String> categoryIdList = formDTO.getCategoryList().stream().map(CategoryOrTagFormDTO::getId).collect(Collectors.toList());
+		List<String> tagIdList = formDTO.getTagList().stream().map(CategoryOrTagFormDTO::getId).collect(Collectors.toList());
+		categoryTag.setCustomerId(formDTO.getCustomerId());
+		categoryTag.setCategoryIdList(categoryIdList);
+		categoryTag.setTagIdList(tagIdList);
+		Result<CategoryTagResultDTO> resultDTOResult = govIssueOpenFeignClient.getCategoryTagList(categoryTag);
+		if (!resultDTOResult.success()) {
+			throw new RenException("项目立项，调用issue服务查询分类、标签基础信息失败");
+		}
+		return resultDTOResult.getData();
+	}
+
+	private AgencyDeptGridResultDTO getAgencyDeptGridRes(List<TickStaffFormDTO> staffList, String userAgencyId) {
+		List<String> agencyIdList = staffList.stream().map(TickStaffFormDTO::getAgencyId).collect(Collectors.toList());
+		agencyIdList.add(userAgencyId);
+		agencyIdList = new ArrayList<String>(new LinkedHashSet<>(agencyIdList));
+		agencyIdList.removeAll(Collections.singleton(""));
+		List<String> deptIdList = staffList.stream().map(TickStaffFormDTO::getDepartmentId).collect(Collectors.toList());
+		deptIdList = new ArrayList<String>(new LinkedHashSet<>(deptIdList));
+		deptIdList.removeAll(Collections.singleton(""));
+		List<String> gridIdList = staffList.stream().map(TickStaffFormDTO::getGridId).collect(Collectors.toList());
+		gridIdList = new ArrayList<String>(new LinkedHashSet<>(gridIdList));
+		gridIdList.removeAll(Collections.singleton(""));
+		AgencyDeptGridFormDTO agencyDeptGridFormDTO = new AgencyDeptGridFormDTO();
+		agencyDeptGridFormDTO.setAgencyIdList(agencyIdList);
+		agencyDeptGridFormDTO.setDeptIdList(deptIdList);
+		agencyDeptGridFormDTO.setGridIdList(gridIdList);
+		Result<AgencyDeptGridResultDTO> resultDTO = govOrgFeignClient.getAgencyDeptGridList(agencyDeptGridFormDTO);
+		if (!resultDTO.success() || null == resultDTO.getData()) {
+			throw new RenException(ProjectConstant.SELECT_GOV_ORG_EXCEPTION);
+		}
+		return resultDTO.getData();
+	}
+
+	/**
+	 * 获取当前工作人员的基本信息
+	 *
+	 * @param formDTO
+	 * @return com.epmet.dto.result.LoginUserDetailsResultDTO
+	 * @author yinzuomei
+	 * @date 2021/8/5 15:42
+	 */
+	private LoginUserDetailsResultDTO queryLoginUserInfo(EventToProjectFormDTO formDTO) {
+		//2.数据准备，查询需要用到的数据
+		//2-1.获取token用户所属组织信息
+		LoginUserDetailsFormDTO dto = new LoginUserDetailsFormDTO();
+		dto.setApp(formDTO.getApp());
+		dto.setClient(formDTO.getClient());
+		dto.setUserId(formDTO.getUserId());
+		Result<LoginUserDetailsResultDTO> resultDto = epmetUserOpenFeignClient.getLoginUserDetails(dto);
+		if (!resultDto.success() || StringUtils.isEmpty(resultDto.getData().getAgencyId())) {
+			throw new RenException(String.format("事件立项调用user服务查询用户数据失败，userId->", formDTO.getUserId()));
+		}
+		return resultDto.getData();
+	}
+
+	/**
+	 * @Description 项目立项给勾选的工作人员推送站内信消息
+	 * @author yinzuomei
+	 */
+	private Result shiftProjectMessage(List<TickStaffFormDTO> staffList,String customerId,String title) {
+		List<UserMessageFormDTO> msgList = new ArrayList<>();
+		//1.创建项目工作人员消息对象
+		String projectStaffMessage = String.format(UserMessageConstant.PROJECT_RESOLVED_MSG, title);
+		//所选人员如果即在部门下又在网格下则只发一条消息
+		Map<String,String> map = new HashMap<>();
+		staffList.forEach(staff->{
+			if(!map.containsKey(staff.getStaffId())){
+				UserMessageFormDTO msg = new UserMessageFormDTO();
+				msg.setCustomerId(customerId);
+				msg.setGridId("*");
+				msg.setApp(AppClientConstant.APP_GOV);
+				msg.setTitle(UserMessageConstant.PROJECT_TITLE);
+				msg.setMessageContent(projectStaffMessage);
+				msg.setReadFlag(ReadFlagConstant.UN_READ);
+				msg.setUserId(staff.getStaffId());
+				msgList.add(msg);
+				map.put(staff.getStaffId(),staff.getStaffId());
+			}
+		});
+		return epmetMessageOpenFeignClient.saveUserMessageList(msgList);
+	}
+
 
+	/**
+	 * @Description 项目立项给勾选的工作人员推送微信订阅消息
+	 * @author yinzuomei
+	 */
+	private Result wxmpShiftProjectMessage(List<TickStaffFormDTO> staffList,String customerId,String title) {
+		List<WxSubscribeMessageFormDTO> msgList = new ArrayList<>();
+		//1.创建项目工作人员消息对象
+		String projectStaffMessage = String.format(UserMessageConstant.PROJECT_RESOLVED_MSG, title);
+		//所选人员如果即在部门下又在网格下则只发一条消息
+		Map<String,String> map = new HashMap<>();
+		staffList.forEach(staff->{
+			if(!map.containsKey(staff.getStaffId())){
+				WxSubscribeMessageFormDTO msg = new WxSubscribeMessageFormDTO();
+				msg.setCustomerId(customerId);
+				msg.setClientType(AppClientConstant.APP_GOV);
+				msg.setUserId(staff.getStaffId());
+				msg.setBehaviorType("项目消息");
+				msg.setMessageContent(projectStaffMessage);
+				msg.setMessageTime(new Date());
+				msg.setGridId("*");
+				msgList.add(msg);
+				map.put(staff.getStaffId(),staff.getStaffId());
+			}
+		});
+		logger.info("事件立项，推送微信订阅消息");
+		return epmetMessageOpenFeignClient.sendWxSubscribeMessage(msgList);
+	}
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index 632887c34f..f869c44886 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -581,5 +581,42 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
         // 3.3、目前Db设计支持报给多个层级（组织或网格），按理说应该更新非当前组织外，其他的组织，显示红点，先不做了吧 todo
     }
 
+    /**
+     * 事件立项：更新立项标志、增加操作日志、更新（报事人、被艾特的人）红点
+     *
+     * @param formDTO
+     * @return void
+     * @author yinzuomei
+     * @date 2021/8/5 16:17
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void shiftProject(EventShiftProjectDTO formDTO) {
+        // 1、更新立项标志
+        ResiEventEntity resiEventEntity=getById(formDTO.getEventId());
+        resiEventEntity.setLatestOperatedTime(formDTO.getShiftProjectTime());
+        resiEventEntity.setShiftProject(true);
+        resiEventEntity.setRedDot(true);
+        baseDao.updateById(resiEventEntity);
+        // 2、记录操作日志
+        ResiEventOperationLogEntity reCallLog=new ResiEventOperationLogEntity();
+        reCallLog.setCustomerId(resiEventEntity.getCustomerId());
+        reCallLog.setResiEventId(resiEventEntity.getId());
+        reCallLog.setUserId(formDTO.getUserId());
+        reCallLog.setUserIdentity(EventConstant.STAFF);
+        reCallLog.setActionCode(ResiEventAction.SHIFIT_PROJECT.getCode());
+        reCallLog.setActionDesc(ResiEventAction.SHIFIT_PROJECT.getDesc());
+        reCallLog.setOperateTime(resiEventEntity.getCloseCaseTime());
+        resiEventOperationLogDao.insert(reCallLog);
+        //3、所有被艾特的人应该都通知
+        resiEventMentionDao.updateRedDotShow(formDTO.getEventId(),null);
+        // 4、目前只能报给一个组织，如果后续可以报给多个组织，要去把其他组织的红点改为显示 todo
+    }
+
+    @Override
+    public ResiEventEntity getById(String eventId) {
+        return baseDao.selectById(eventId);
+    }
+
 
 }
\ No newline at end of file

From d5d182e243afa53d438e43d9bac59e34f162ca37 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 5 Aug 2021 16:50:04 +0800
Subject: [PATCH 60/84] =?UTF-8?q?=E7=AB=8B=E9=A1=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/service/impl/ResiEventServiceImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index b588736e20..299c5b1676 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -607,7 +607,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
         reCallLog.setUserIdentity(EventConstant.STAFF);
         reCallLog.setActionCode(ResiEventAction.SHIFIT_PROJECT.getCode());
         reCallLog.setActionDesc(ResiEventAction.SHIFIT_PROJECT.getDesc());
-        reCallLog.setOperateTime(resiEventEntity.getCloseCaseTime());
+        reCallLog.setOperateTime(resiEventEntity.getLatestOperatedTime());
         resiEventOperationLogDao.insert(reCallLog);
         //3、所有被艾特的人应该都通知
         resiEventMentionDao.updateRedDotShow(formDTO.getEventId(),null);

From aae3f8ca68e08f50921249b587f46d756940a798 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Thu, 5 Aug 2021 17:03:23 +0800
Subject: [PATCH 61/84] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../evaluationindex/extract/FactOriginProjectMainDailyDao.xml | 4 ++--
 .../src/main/resources/mapper/project/ProjectDao.xml          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml
index 11ce137aab..fdf90af1f3 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml
@@ -1083,7 +1083,7 @@
         FROM
             fact_origin_project_main_daily
         WHERE
-            ORIGIN = 'agency'
+        (ORIGIN = 'agency' OR ORIGIN = 'resi_event')
           AND CUSTOMER_ID = #{customerId}
         <if test='null != dateId and "" != dateId'>
           AND DATE_ID = #{dateId}
@@ -1101,7 +1101,7 @@
         FROM
         fact_origin_project_main_daily
         WHERE
-        ORIGIN = 'agency'
+        (ORIGIN = 'agency' OR ORIGIN = 'resi_event')
         AND CUSTOMER_ID = #{customerId}
         <if test='null != dateId and "" != dateId'>
             AND DATE_ID &lt;= #{dateId}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml
index 7b217ec4ff..476ae619c8 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml
@@ -227,7 +227,7 @@
                 rero.ORG_ID,
                 rero.ORG_PID,
                 rero.ORG_PIDS,
-                re.PROJECT_ID.CREATED_BY,
+                re.CREATED_BY,
                 re.PROJECT_ID
         from resi_event_report_org rero
         inner join  resi_event re on rero.RESI_EVENT_ID = re.id and re.SHIFT_PROJECT = 1 and  re.DEL_FLAG = '0'

From 732fa1bf1c85d9ba4a7f77a93e50a296331171cf Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 5 Aug 2021 17:05:59 +0800
Subject: [PATCH 62/84] =?UTF-8?q?resi=5Fevent.=E9=A1=B9=E7=9B=AEid.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/service/impl/ResiEventServiceImpl.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index 299c5b1676..c3591fa5fa 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -598,6 +598,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
         resiEventEntity.setLatestOperatedTime(formDTO.getShiftProjectTime());
         resiEventEntity.setShiftProject(true);
         resiEventEntity.setRedDot(true);
+        resiEventEntity.setProjectId(formDTO.getProjectId());
         baseDao.updateById(resiEventEntity);
         // 2、记录操作日志
         ResiEventOperationLogEntity reCallLog=new ResiEventOperationLogEntity();

From 6c1144ef3f5702870b814f16d6ae387f43484bb8 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 5 Aug 2021 17:12:02 +0800
Subject: [PATCH 63/84] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=8A=A5=E4=BA=8B?=
 =?UTF-8?q?=EF=BC=9A=E5=B7=B2=E7=BB=8F=E7=AB=8B=E9=A1=B9=E6=88=96=E8=80=85?=
 =?UTF-8?q?=E5=B7=B2=E5=8A=9E=E7=BB=93=E7=9A=84=E4=B8=8D=E8=83=BD=E5=9B=9E?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/ResiEventServiceImpl.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index c3591fa5fa..bc013eb0fc 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -478,8 +478,8 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
                 formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.queryMyReported(formDTO.getUserId(),
                     formDTO.getStatusCondition()));
         result.getList().forEach(resultDTO->{
-            if(EventConstant.EVENT_STATUS_CLOSED_CASE.equals(resultDTO.getStatus())){
-                // 已办结的不显示回复按钮
+            if(EventConstant.EVENT_STATUS_CLOSED_CASE.equals(resultDTO.getStatus())||resultDTO.getShiftProject()){
+                // 已办结的、立项的不显示回复按钮
                 resultDTO.setReplyButtonFlag("false");
             }else{
                 // 处理中的事件

From bd3414af43011e2118a042946246dcd7af7e9241 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 5 Aug 2021 17:40:49 +0800
Subject: [PATCH 64/84] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20title=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2org?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/result/EventTitleOrgResultDTO.java    | 20 ++++++++++++++++++
 .../CustomerStaffGridController.java          | 14 +++++++++++++
 .../com/epmet/dao/CustomerStaffGridDao.java   |  9 ++++++++
 .../service/CustomerStaffGridService.java     |  9 ++++++++
 .../impl/CustomerStaffGridServiceImpl.java    | 12 +++++++++++
 .../resources/mapper/CustomerStaffGridDao.xml | 21 +++++++++++++++++++
 6 files changed, 85 insertions(+)
 create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EventTitleOrgResultDTO.java

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EventTitleOrgResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EventTitleOrgResultDTO.java
new file mode 100644
index 0000000000..50b05afb6c
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EventTitleOrgResultDTO.java
@@ -0,0 +1,20 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/8/5 5:23 下午
+ * @DESC
+ */
+@Data
+public class EventTitleOrgResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -517506506008916648L;
+
+    private String agencyId;
+    private String gridId;
+    private String gridName;
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java
index 53e6330d06..cba514d051 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.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;
@@ -29,6 +31,7 @@ import com.epmet.dto.CustomerStaffGridDTO;
 import com.epmet.dto.form.CommonGridIdFormDTO;
 import com.epmet.dto.form.LatestGridFormDTO;
 import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
+import com.epmet.dto.result.EventTitleOrgResultDTO;
 import com.epmet.dto.result.GridStaffResultDTO;
 import com.epmet.excel.CustomerStaffGridExcel;
 import com.epmet.service.CustomerStaffGridService;
@@ -131,4 +134,15 @@ public class CustomerStaffGridController {
     public Result<List<GridStaffResultDTO>> selectGridStaffByGridIds(@RequestBody List<String> gridIds){
         return new Result<List<GridStaffResultDTO>>().ok(customerStaffGridService.selectGridStaffByGridIds(gridIds));
     }
+
+    /**
+     * @Description  查询ORG
+     * @Param userId
+     * @author zxc
+     * @date 2021/8/5 5:36 下午
+     */
+    @PostMapping("eventorg")
+    public Result<List<EventTitleOrgResultDTO>> eventOrg(@LoginUser TokenDto tokenDto){
+        return new Result<List<EventTitleOrgResultDTO>>().ok(customerStaffGridService.eventOrg(tokenDto.getUserId()));
+    }
 }
\ 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 d9ce1b0e61..426a0e6b3a 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
@@ -22,6 +22,7 @@ import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.CustomerStaffDepartmentDTO;
 import com.epmet.dto.CustomerStaffGridDTO;
 import com.epmet.dto.form.LatestGridFormDTO;
+import com.epmet.dto.result.EventTitleOrgResultDTO;
 import com.epmet.dto.result.GridStaffResultDTO;
 import com.epmet.entity.CustomerStaffGridEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -106,4 +107,12 @@ public interface CustomerStaffGridDao extends BaseDao<CustomerStaffGridEntity> {
      * @date 2021/6/8 3:36 下午
      */
     List<GridStaffResultDTO> selectGridStaffByGridIds(@Param("gridIds") List<String> gridIds);
+
+    /**
+     * @Description  查询ORG
+     * @Param userId
+     * @author zxc
+     * @date 2021/8/5 5:36 下午
+     */
+    List<EventTitleOrgResultDTO> eventOrg(@Param("userId") String userId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffGridService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffGridService.java
index 0cf4041cce..1e78f3725b 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffGridService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffGridService.java
@@ -26,6 +26,7 @@ import com.epmet.dto.form.CustomerGridFormDTO;
 import com.epmet.dto.form.LatestGridFormDTO;
 import com.epmet.dto.result.CommonStaffInfoResultDTO;
 import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
+import com.epmet.dto.result.EventTitleOrgResultDTO;
 import com.epmet.dto.result.GridStaffResultDTO;
 import com.epmet.entity.CustomerStaffGridEntity;
 
@@ -126,4 +127,12 @@ public interface CustomerStaffGridService extends BaseService<CustomerStaffGridE
      * @date 2021/6/8 3:36 下午
      */
     List<GridStaffResultDTO> selectGridStaffByGridIds(List<String> gridIds);
+
+    /**
+     * @Description  查询ORG
+     * @Param userId
+     * @author zxc
+     * @date 2021/8/5 5:36 下午
+     */
+    List<EventTitleOrgResultDTO> eventOrg(String userId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java
index ac8abc82fc..27d3da6576 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java
@@ -31,6 +31,7 @@ import com.epmet.dto.CustomerStaffGridDTO;
 import com.epmet.dto.form.CommonGridIdFormDTO;
 import com.epmet.dto.form.LatestGridFormDTO;
 import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
+import com.epmet.dto.result.EventTitleOrgResultDTO;
 import com.epmet.dto.result.GridStaffResultDTO;
 import com.epmet.entity.CustomerStaffGridEntity;
 import com.epmet.feign.EpmetUserOpenFeignClient;
@@ -181,4 +182,15 @@ public class CustomerStaffGridServiceImpl extends BaseServiceImpl<CustomerStaffG
         }
         return data;
     }
+
+    /**
+     * @Description  查询ORG
+     * @Param userId
+     * @author zxc
+     * @date 2021/8/5 5:36 下午
+     */
+    @Override
+    public List<EventTitleOrgResultDTO> eventOrg(String userId) {
+        return baseDao.eventOrg(userId);
+    }
 }
\ No newline at end of file
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 5e08a59b97..b1acb714b9 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
@@ -102,6 +102,27 @@
             )
     </select>
 
+    <!-- 查询ORG -->
+    <select id="eventOrg" resultType="com.epmet.dto.result.EventTitleOrgResultDTO">
+        SELECT
+            sa.AGENCY_ID AS agencyId,
+            sa.AGENCY_ID AS gridId,
+            ca.ORGANIZATION_NAME AS gridNamme
+        FROM customer_staff_agency sa
+        LEFT JOIN customer_agency ca ON (ca.ID = sa.AGENCY_ID AND ca.DEL_FLAG = 0)
+        WHERE sa.DEL_FLAG = 0
+          AND sa.USER_ID = #{userId}
+        UNION ALL
+        SELECT
+            sg.GRID_ID AS gridId,
+            cg.PID AS agencyId,
+            cg.GRID_NAME AS gridName
+        FROM customer_staff_grid sg
+        LEFT JOIN customer_grid cg ON (cg.ID = sg.GRID_ID AND cg.DEL_FLAG = 0)
+        WHERE sg.DEL_FLAG = 0
+          AND sg.USER_ID = #{userId}
+    </select>
+
     <!-- 批量插入网格工作人员 -->
     <insert id="insertBatch" parameterType="java.util.List">
         insert into customer_staff_grid

From 87141c70f14f8462dad17d5f22b8bdefe293a5c7 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 5 Aug 2021 17:55:23 +0800
Subject: [PATCH 65/84] =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E7=AB=8B=E9=A1=B9?=
 =?UTF-8?q?=E7=9A=84=E4=B8=8D=E5=85=81=E8=AE=B8=E9=87=8D=E5=A4=8D=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dao/ProjectDao.java              | 2 ++
 .../src/main/java/com/epmet/service/ProjectService.java      | 3 ++-
 .../main/java/com/epmet/service/impl/ProjectServiceImpl.java | 5 +++++
 .../java/com/epmet/service/impl/ProjectTraceServiceImpl.java | 4 ++++
 .../src/main/resources/mapper/ProjectDao.xml                 | 5 +++++
 5 files changed, 18 insertions(+), 1 deletion(-)

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 a4c1b69b36..0040584f81 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
@@ -215,4 +215,6 @@ public interface ProjectDao extends BaseDao<ProjectEntity> {
 	 * @date 2021/8/4 2:43 下午
 	 */
 	EventProjectInfoDTO selectEventProjectInfo(@Param("projectId")String projectId);
+
+    List<ProjectEntity> selectByOriginId(String originId);
 }
\ 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 7a5ac21888..1f0fd17a0d 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,6 @@ 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.*;
 import com.epmet.dto.result.*;
@@ -330,4 +329,6 @@ public interface ProjectService extends BaseService<ProjectEntity> {
 	 * @return java.util.List<com.epmet.dto.result.UnResolvedResultDTO>
 	 */
 	List<UnResolvedResultDTO> getUnResolvedListByGrid(ShiftProjectListFromDTO fromDTO);
+
+    List<ProjectEntity> getByOriginId(String eventId);
 }
\ 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 f15a2a7c24..bc6a2616c7 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
@@ -2753,4 +2753,9 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		return baseDao.selectUnResolvedListByGrid(fromDTO.getGridId());
 	}
 
+	@Override
+	public List<ProjectEntity> getByOriginId(String originId) {
+		return baseDao.selectByOriginId(originId);
+	}
+
 }
\ 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
index 676b3bdc56..1e4a1b64b4 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
@@ -631,6 +631,10 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
 		if(null==resiEventEntity||resiEventEntity.getShiftProject()){
 			throw new RenException(EpmetErrorCode.RESI_EVENT_SHIFT_PROJECT.getCode(),EpmetErrorCode.RESI_EVENT_SHIFT_PROJECT.getMsg());
 		}
+		List<ProjectEntity> projectEntityList = projectService.getByOriginId(formDTO.getEventId());
+		if (!CollectionUtils.isEmpty(projectEntityList)) {
+			throw new RenException(EpmetErrorCode.RESI_EVENT_SHIFT_PROJECT.getCode(), EpmetErrorCode.RESI_EVENT_SHIFT_PROJECT.getMsg());
+		}
 		List<TickStaffFormDTO> staffList = formDTO.getStaffList();
 		//1.文字内容安全校验
 		List<String> list = new ArrayList<>();
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 7b0dac13a0..cb83792490 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
@@ -392,4 +392,9 @@
           AND p.ID = #{projectId}
     </select>
 
+    <select id="selectByOriginId" resultType="com.epmet.entity.ProjectEntity">
+        select p.id from project p
+        where p.DEL_FLAG = '0'
+          AND p.ORIGIN_ID = #{originId}
+    </select>
 </mapper>
\ No newline at end of file

From 5026801d49fcf6d391042f2c846e0b2153211f2d Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 6 Aug 2021 09:06:10 +0800
Subject: [PATCH 66/84] emm

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

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 b1acb714b9..05277137da 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
@@ -107,7 +107,7 @@
         SELECT
             sa.AGENCY_ID AS agencyId,
             sa.AGENCY_ID AS gridId,
-            ca.ORGANIZATION_NAME AS gridNamme
+            ca.ORGANIZATION_NAME AS gridName
         FROM customer_staff_agency sa
         LEFT JOIN customer_agency ca ON (ca.ID = sa.AGENCY_ID AND ca.DEL_FLAG = 0)
         WHERE sa.DEL_FLAG = 0

From d621ced475ecfa819aa0b21da92f1bd39be0ce7e Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 6 Aug 2021 09:49:16 +0800
Subject: [PATCH 67/84] =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=B7=B2=E8=A7=A3=E5=86=B3=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
index ec756161fa..6b0faf49c0 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
@@ -120,7 +120,7 @@
             IFNULL(re.EVENT_CONTENT,'') AS eventContent,
             IFNULL(re.ADDRESS,'') AS eventAddress,
             (CASE WHEN re.`STATUS` = 'processing' THEN FALSE WHEN re.`STATUS` = 'closed_case' THEN TRUE ELSE FALSE END) AS isClosed,
-            (IF('' = re.RESOLVE_STATUS OR NULL = re.RESOLVE_STATUS, TRUE, FALSE)) AS isResolve,
+            (IF(IFNULL(re.RESOLVE_STATUS,TRUE) OR '' = re.RESOLVE_STATUS, TRUE, FALSE)) AS isResolve,
             (CASE WHEN re.READ_FLAG = 1 THEN FALSE ELSE TRUE END) AS isRollback,
             (CASE WHEN re.SHIFT_PROJECT = 1 THEN TRUE ELSE FALSE END) AS isProject,
             IFNULL(re.project_id,'') AS projectId,

From 3386fbe9a188b27138f5b11526b5aad5bad06928 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 6 Aug 2021 10:08:07 +0800
Subject: [PATCH 68/84] emm

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

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 05277137da..1d11a957b2 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
@@ -114,8 +114,8 @@
           AND sa.USER_ID = #{userId}
         UNION ALL
         SELECT
-            sg.GRID_ID AS gridId,
             cg.PID AS agencyId,
+            sg.GRID_ID AS gridId,
             cg.GRID_NAME AS gridName
         FROM customer_staff_grid sg
         LEFT JOIN customer_grid cg ON (cg.ID = sg.GRID_ID AND cg.DEL_FLAG = 0)

From 5f0ee2d366ce44c0326bb1f60e6acc18584ad617 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 6 Aug 2021 10:23:16 +0800
Subject: [PATCH 69/84] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gov-project-server/src/main/resources/mapper/ProjectDao.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 cb83792490..f578035897 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
@@ -383,7 +383,7 @@
     <select id="selectEventProjectInfo" resultType="com.epmet.dto.EventProjectInfoDTO">
         SELECT
             p.ID AS projectId,
-            IFNULL(DATE_FORMAT(p.CREATED_TIME,'%Y-%m-%d %h-%m-%s'),'') AS operationTime,
+            IFNULL(DATE_FORMAT(p.CREATED_TIME,'%Y-%m-%d %h:%i'),'') AS operationTime,
             p.CREATED_BY AS userId,
             IFNULL(pp.PUBLIC_REPLY,'') AS projectDeclare
         FROM project p

From 8b799667b07608dd6862289ae1a027fe1a69ff53 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 6 Aug 2021 10:59:53 +0800
Subject: [PATCH 70/84] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gov-project-server/src/main/resources/mapper/ProjectDao.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 f578035897..ab6c65c8a7 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
@@ -387,7 +387,7 @@
             p.CREATED_BY AS userId,
             IFNULL(pp.PUBLIC_REPLY,'') AS projectDeclare
         FROM project p
-        LEFT JOIN project_process pp ON (pp.PROJECT_ID = p.ID AND pp.DEL_FLAG = '0')
+        LEFT JOIN project_process pp ON (pp.PROJECT_ID = p.ID AND pp.DEL_FLAG = '0' AND pp.OPERATION = 'created')
         WHERE p.DEL_FLAG = '0'
           AND p.ID = #{projectId}
     </select>

From 0453a08e8be0ee199538e64e25ab16b3ff212310 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 6 Aug 2021 13:28:32 +0800
Subject: [PATCH 71/84] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/ResiEventDao.xml     | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
index 6b0faf49c0..0c1808eae9 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
@@ -18,7 +18,15 @@
         SELECT IFNULL(rea.ATTACHMENT_URL,'') AS img,t.* FROM
         (SELECT
         re.EVENT_CONTENT AS eventContent,
-        IFNULL(DATE_FORMAT(re.CREATED_TIME,'%Y-%m-%d %H:%i'),'') AS eventTime,
+        <if test='eventType == "undisposed" '>
+            IFNULL(DATE_FORMAT(re.CREATED_TIME,'%Y-%m-%d %H:%i'),'') AS eventTime,
+        </if>
+        <if test='eventType == "processed" '>
+            IFNULL(DATE_FORMAT(re.LATEST_OPERATED_TIME,'%Y-%m-%d %H:%i'),'') AS eventTime,
+        </if>
+        <if test='eventType == "transferred" '>
+            IFNULL(DATE_FORMAT(re.CLOSE_CASE_TIME,'%Y-%m-%d %H:%i'),'') AS eventTime,
+        </if>
         re.ID AS eventId,
         (CASE WHEN re.SHIFT_PROJECT = 1 THEN TRUE ELSE FALSE END) AS isProject,
         (CASE WHEN ro.RED_DOT = 1 THEN TRUE ELSE FALSE END) AS redDot
@@ -33,12 +41,12 @@
         <if test='eventType == "processed" '>
             AND ro.ORG_READ = 'read'
             AND re.`STATUS` = 'processing'
-            ORDER BY re.LATEST_OPERATED_TIME
+            ORDER BY re.LATEST_OPERATED_TIME DESC
         </if>
         <if test='eventType == "transferred" '>
             AND ro.ORG_READ = 'read'
             AND re.`STATUS` = 'closed_case'
-            ORDER BY re.CLOSE_CASE_TIME
+            ORDER BY re.CLOSE_CASE_TIME DESC
         </if>
         )t
         LEFT JOIN resi_event_attachment rea ON (rea.RESI_EVENT_ID = t.eventId AND rea.DEL_FLAG = '0' AND rea.ATTACHMENT_TYPE = 'image' AND (rea.SORT = 0 OR rea.SORT = 1 OR rea.SORT = 2))

From 107b50dc23f48dc4e1d4b3c14f3cbd1c67cc6eaa Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 6 Aug 2021 14:09:48 +0800
Subject: [PATCH 72/84] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E7=BE=A4?=
 =?UTF-8?q?=E4=BC=97=E7=9B=B4=E6=8A=A5=E7=BA=A2=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/form/RedDotFormDTO.java     |  5 ++++
 .../WorkGrassRootsFunctionConstant.java       |  5 +++-
 .../epmet/service/impl/RemindServiceImpl.java | 20 +++++++++----
 .../dto/result/ResiEventManageRedDotRes.java  | 30 +++++++++++++++++++
 .../feign/GovProjectOpenFeignClient.java      | 12 +++++++-
 .../GovProjectOpenFeignClientFallback.java    | 13 ++++++++
 .../epmet/controller/ResiEventController.java | 19 +++++++++---
 .../com/epmet/dao/ResiEventReportOrgDao.java  |  4 +++
 .../com/epmet/service/ResiEventService.java   | 10 +++++++
 .../service/impl/ResiEventServiceImpl.java    | 17 +++++++++++
 .../mapper/ResiEventReportOrgDao.xml          | 23 ++++++++++++++
 11 files changed, 147 insertions(+), 11 deletions(-)
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ResiEventManageRedDotRes.java

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
index be67ff5a33..aa4906e7ee 100644
--- 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
@@ -25,5 +25,10 @@ public class RedDotFormDTO implements Serializable {
      */
     //@NotBlank(message = "网格id不能为空")
     private String gridId;
+
+    /**
+     * 当前工作人员所属的组织id
+     */
+    private String agencyId;
 }
 
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
index 772990f98d..fb077deb46 100644
--- 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
@@ -32,6 +32,9 @@ public class WorkGrassRootsFunctionConstant {
      */
     public static final String WORK_GRASSROOTS_BADGE="work_grassroots_badge";
 
-
+    /**
+     * 基层治理-群众直报  功能入口
+     */
+    public static final String RESI_EVENT_MANAGE="resi_event_manage";
 }
 
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
index a2916ee01c..bb57c4f241 100644
--- 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
@@ -44,6 +44,8 @@ public class RemindServiceImpl implements RemindService {
 
     @Autowired
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
+    @Autowired
+    private GovProjectOpenFeignClient govProjectOpenFeignClient;
 
     @Override
     public RedDotResultDTO queryGridRedDot(RedDotFormDTO formDTO) {
@@ -217,12 +219,11 @@ public class RemindServiceImpl implements RemindService {
         RedDotResultDTO redDotResultDTO = new RedDotResultDTO();
         redDotResultDTO.setOtherGridRedDot(false);
         redDotResultDTO.setFunctionList(Collections.EMPTY_LIST);
-
+        List<String> functionList = new ArrayList<>();
+        List<RedDotDetialDTO> details = new ArrayList<>();
         Result<List<CustomerGridByUserIdResultDTO>> govOrgResult = govOrgFeignClient.getMyGrids(formDTO.getStaffId());
 
         if (govOrgResult.success() && !CollectionUtils.isEmpty(govOrgResult.getData())) {
-            List<String> functionList = new ArrayList<>();
-            List<RedDotDetialDTO> details = new ArrayList<>();
             List<String> gridIdList = govOrgResult.getData().stream().map(CustomerGridByUserIdResultDTO::getGridId).collect(Collectors.toList());
 
             //1、群组管理（待审核的小组申请、变更小组申请）
@@ -335,11 +336,20 @@ public class RemindServiceImpl implements RemindService {
                     }
                 });
             }
-            redDotResultDTO.setFunctionList(functionList);
-            redDotResultDTO.setDetails(details);
         } else {
             logger.warn(String.format("基层治理红点查询,获取工作人员所属网格失败,当前staffId=%s", formDTO.getStaffId()));
         }
+
+        // 群众直报：当前工作人员所属的组织存在待处理（未读的）、有新的回复的（相当于处理中有红点的)记录就显示红点
+        if(org.apache.commons.lang3.StringUtils.isNotBlank(formDTO.getAgencyId())){
+            Result<ResiEventManageRedDotRes> projectRes=govProjectOpenFeignClient.queryResiEventManageRedDot(formDTO.getAgencyId());
+            if(projectRes.success()&&null !=projectRes.getData()&&projectRes.getData().getTotalCount()>0){
+                functionList.add(WorkGrassRootsFunctionConstant.RESI_EVENT_MANAGE);
+                details.add(new RedDotDetialDTO(WorkGrassRootsFunctionConstant.RESI_EVENT_MANAGE, projectRes.getData().getTotalCount().longValue()));
+            }
+        }
+        redDotResultDTO.setFunctionList(functionList);
+        redDotResultDTO.setDetails(details);
         return redDotResultDTO;
     }
 
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ResiEventManageRedDotRes.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ResiEventManageRedDotRes.java
new file mode 100644
index 0000000000..87af6124be
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ResiEventManageRedDotRes.java
@@ -0,0 +1,30 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 描述一下
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/8/6 13:54
+ */
+@Data
+public class ResiEventManageRedDotRes implements Serializable {
+    /**
+     * 待处理（未读）的事件数
+     * */
+    private Integer unReadCount;
+
+    /**
+     * 已经度过，但是又有新的回复、立项、结案
+     * */
+    private Integer redDotCount;
+
+    /**
+     * 总数
+     * */
+    private Integer totalCount;
+
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java
index 7b0c1a7bd9..7824ba71ee 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java
@@ -6,7 +6,6 @@ import com.epmet.dto.ProjectCategoryDTO;
 import com.epmet.dto.ProjectDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
-import com.epmet.feign.fallback.GovProjectOpenFeignClientFallback;
 import com.epmet.feign.fallback.GovProjectOpenFeignClientFallbackFactory;
 import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -124,4 +123,15 @@ public interface GovProjectOpenFeignClient {
 	 */
 	@PostMapping("gov/project/project/unresolvedlist")
 	Result<List<UnResolvedResultDTO>> getUnResolvedList(@RequestBody ShiftProjectListFromDTO formDTO);
+
+	/**
+	 * 群众直报：当前工作人员所属的组织存在待处理（未读的）、有新的回复的（相当于处理中有红点的)记录就显示红点
+	 *
+	 * @param agencyId
+	 * @return  com.epmet.commons.tools.utils.Result<com.epmet.dto.result.ResiEventManageRedDotRes>
+	 * @author yinzuomei
+	 * @date 2021/8/6 14:07
+	 */
+	@PostMapping("gov/project/resievent/queryResiEventManageRedDot/{agencyId}")
+	Result<ResiEventManageRedDotRes> queryResiEventManageRedDot(@PathVariable("agencyId") String agencyId);
 }
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java
index 44ea0d1e63..41f41664c1 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java
@@ -119,4 +119,17 @@ public class GovProjectOpenFeignClientFallback implements GovProjectOpenFeignCli
 	public Result<List<UnResolvedResultDTO>> getUnResolvedList(ShiftProjectListFromDTO formDTO) {
 		return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "getUnResolvedList", formDTO);
 	}
+
+	/**
+	 * 群众直报：当前工作人员所属的组织存在待处理（未读的）、有新的回复的（相当于处理中有红点的)记录就显示红点
+	 *
+	 * @param agencyId
+	 * @return  com.epmet.commons.tools.utils.Result<com.epmet.dto.result.ResiEventManageRedDotRes>
+	 * @author yinzuomei
+	 * @date 2021/8/6 14:08
+	 */
+	@Override
+	public Result<ResiEventManageRedDotRes> queryResiEventManageRedDot(String agencyId) {
+		return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "queryResiEventManageRedDot", agencyId);
+	}
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
index d984456930..1b69e0b039 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
@@ -26,10 +26,7 @@ import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.service.ResiEventService;
 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;
 
@@ -202,4 +199,18 @@ public class ResiEventController {
         resiEventService.closeResiEvent(formDTO);
         return new Result();
     }
+
+
+    /**
+     * 工作台，最新直报是否显示红点？
+     *
+     * @param agencyId
+     * @return  com.epmet.commons.tools.utils.Result<com.epmet.dto.result.ResiEventManageRedDotRes>
+     * @author yinzuomei
+     * @date 2021/8/6 13:57
+     */
+    @PostMapping("queryResiEventManageRedDot/{agencyId}")
+    Result<ResiEventManageRedDotRes> queryResiEventManageRedDot(@PathVariable("agencyId") String agencyId) {
+        return new Result<ResiEventManageRedDotRes>().ok(resiEventService.queryResiEventManageRedDot(agencyId));
+    }
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventReportOrgDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventReportOrgDao.java
index 6f851d34c3..0668eb78f7 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventReportOrgDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventReportOrgDao.java
@@ -60,4 +60,8 @@ public interface ResiEventReportOrgDao extends BaseDao<ResiEventReportOrgEntity>
      * @date 2021/8/4 17:41
      */
     int updateRedDotShow(String resiEventId);
+
+    Integer selectUnReadCount(String agencyId);
+
+    Integer selectRedCount(String agencyId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java
index 6822dfe4fa..38d4916acc 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java
@@ -119,4 +119,14 @@ public interface ResiEventService extends BaseService<ResiEventEntity> {
     void shiftProject(EventShiftProjectDTO eventShiftProjectDTO);
 
     ResiEventEntity getById(String eventId);
+
+    /**
+     * 工作台，最新直报是否显示红点？
+     *
+     * @param agencyId
+     * @return  com.epmet.dto.result.ResiEventManageRedDotRes
+     * @author yinzuomei
+     * @date 2021/8/6 13:57
+     */
+    ResiEventManageRedDotRes queryResiEventManageRedDot(String agencyId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index bc013eb0fc..e7c1376f40 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -620,5 +620,22 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
         return baseDao.selectById(eventId);
     }
 
+    /**
+     * 工作台，最新直报是否显示红点？
+     *
+     * @param agencyId
+     * @return com.epmet.dto.result.ResiEventManageRedDotRes
+     * @author yinzuomei
+     * @date 2021/8/6 13:57
+     */
+    @Override
+    public ResiEventManageRedDotRes queryResiEventManageRedDot(String agencyId) {
+        ResiEventManageRedDotRes res=new ResiEventManageRedDotRes();
+        res.setUnReadCount(resiEventReportOrgDao.selectUnReadCount(agencyId));
+        res.setRedDotCount(resiEventReportOrgDao.selectRedCount(agencyId));
+        res.setTotalCount(res.getUnReadCount()+res.getRedDotCount());
+        return res;
+    }
+
 
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReportOrgDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReportOrgDao.xml
index e4dd9e7553..1838d12f93 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReportOrgDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReportOrgDao.xml
@@ -33,4 +33,27 @@
           AND ORG_ID = #{orgId}
           AND RESI_EVENT_ID = #{eventId}
     </update>
+
+    <select id="selectUnReadCount" parameterType="java.lang.String" resultType="java.lang.Integer">
+        SELECT
+            COUNT(M.ID)
+        FROM resi_event_report_org M
+        INNER JOIN resi_event RE ON(M.RESI_EVENT_ID=RE.ID)
+        WHERE M.DEL_FLAG='0'
+            AND RE.DEL_FLAG='0'
+            AND M.ORG_ID=#{agencyId}
+            AND M.ORG_READ='un_read'
+    </select>
+
+    <select id="selectRedCount" parameterType="java.lang.String" resultType="java.lang.Integer">
+        SELECT
+            COUNT(M.ID)
+        FROM resi_event_report_org M
+        INNER JOIN resi_event RE ON(M.RESI_EVENT_ID=RE.ID)
+        WHERE M.DEL_FLAG='0'
+            AND RE.DEL_FLAG='0'
+            AND M.ORG_ID=#{agencyId}
+            AND M.ORG_READ='read'
+            and m.RED_DOT='1'
+    </select>
 </mapper>
\ No newline at end of file

From 3ec76df423e1b2607776d015cdae8c740d64225e Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Fri, 6 Aug 2021 16:06:44 +0800
Subject: [PATCH 73/84] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=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/V0.0.23__resi_event.sql | 3 +++
 .../db/migration/V0.0.16__create_resievent_tables.sql       | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.23__resi_event.sql

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.23__resi_event.sql b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.23__resi_event.sql
new file mode 100644
index 0000000000..57f4883dee
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.23__resi_event.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `epmet_data_statistical`.`fact_origin_project_main_daily`
+    MODIFY COLUMN `ORIGIN` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '项目来源 来源：议题issue 组织agency，事件resi_event' AFTER `PIDS`,
+    MODIFY COLUMN `ORIGIN_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '项目来源ID:议题id ;or组织id，事件ID' AFTER `ORIGIN`;
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql
index ae83c130fd..6000c57fd2 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql
@@ -125,4 +125,8 @@ CREATE TABLE `resi_event_operation_log` (
   `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人',
   `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
   PRIMARY KEY (`ID`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='事件操作日志表';
\ No newline at end of file
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='事件操作日志表';
+
+
+ALTER TABLE `project`
+    MODIFY COLUMN `ORIGIN` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '来源：议题issue  项目立项:agency 事件:resi_event' AFTER `AGENCY_ID`;
\ No newline at end of file

From c3c60d039eff5c9d0d80b7a604043b560cfe497c Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Mon, 9 Aug 2021 15:24:28 +0800
Subject: [PATCH 74/84] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E6=8A=A5?=
 =?UTF-8?q?=E4=BA=8B-=E6=9F=A5=E8=AF=A2=E4=BA=BA=E5=A4=A7=E4=BB=A3?=
 =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E8=87=AA=E5=B7=B1=E5=A6=82=E6=9E=9C=E6=98=AF?=
 =?UTF-8?q?=E4=BA=BA=E5=A4=A7=E4=BB=A3=E8=A1=A8=E5=88=99=E4=B8=8D=E5=88=97?=
 =?UTF-8?q?=E5=87=BA=E6=9D=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/controller/ResiEventController.java |  6 ++++-
 .../com/epmet/service/ResiEventService.java   |  2 +-
 .../service/impl/ResiEventServiceImpl.java    | 24 ++++++++++---------
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java
index 57d06b8a0b..3328277513 100644
--- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java
+++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java
@@ -1,5 +1,6 @@
 package com.epmet.controller;
 
+import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.ResiEventNpcListFormDTO;
@@ -30,6 +31,9 @@ public class ResiEventController {
     @Autowired
     private ResiEventService resiEventService;
 
+    @Autowired
+    private LoginUserUtil loginUserUtil;
+
     /**
      * @return
      * @Description 查询人大代表列表(客户下的)
@@ -40,7 +44,7 @@ public class ResiEventController {
     public Result<HashMap<String, List<ResiEventNpcResultDTO>>> listNpc(@RequestBody ResiEventNpcListFormDTO input) {
         ValidatorUtils.validateEntity(input);
         String customerId = input.getCustomerId();
-        List<ResiEventNpcResultDTO> npcs = resiEventService.listNpcByGrid(customerId);
+        List<ResiEventNpcResultDTO> npcs = resiEventService.listNpcByGrid(customerId, loginUserUtil.getLoginUserId());
 
         HashMap<String, List<ResiEventNpcResultDTO>> wrapper = new HashMap<>();
         wrapper.put("reportTargets", npcs);
diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java
index 85432f2a18..7b26a10ad5 100644
--- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java
+++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java
@@ -18,7 +18,7 @@ public interface ResiEventService {
      * @author wxz
      * @date 2021.08.03 09:29
     */
-    List<ResiEventNpcResultDTO> listNpcByGrid(String customerId);
+    List<ResiEventNpcResultDTO> listNpcByGrid(String customerId, String excludeUserId);
 
     /**
      * @Description 查询上报目标列表
diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index b81eb0f47e..bd6a1c4376 100644
--- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -36,7 +36,7 @@ public class ResiEventServiceImpl implements ResiEventService, ResultDataResolve
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
 
     @Override
-    public List<ResiEventNpcResultDTO> listNpcByGrid(String customerId) {
+    public List<ResiEventNpcResultDTO> listNpcByGrid(String customerId, String excludeUserId) {
 
         // 查询网格所属的组织信息
         //Result<GridInfoResultDTO> gridInfoResult = govOrgOpenFeignClient.queryGridInfo(customerId);
@@ -59,16 +59,18 @@ public class ResiEventServiceImpl implements ResiEventService, ResultDataResolve
 
         List<ResiEventNpcResultDTO> npcResultList = new ArrayList<>();
         npcData.stream().forEach(npc -> {
-                    OrgInfoResultDTO gridInfo = npcGridInfoMap.get(npc.getGridId());
-                    ResiEventNpcResultDTO resiEventNpcInfo = new ResiEventNpcResultDTO(
-                            npc.getUserId(),
-                            npc.getGridId(),
-                            "人大代表-".concat(npc.getRealName()),
-                            npc.getRealName(),
-                            npc.getHeadImgUrl(),
-                            gridInfo != null ? gridInfo.getAgencyId() : null,
-                            gridInfo != null ? gridInfo.getPids().concat(":").concat(gridInfo.getAgencyId()) : null);
-                    npcResultList.add(resiEventNpcInfo);
+                    if (StringUtils.isBlank(excludeUserId) || !npc.getUserId().equals(excludeUserId)) {
+                        OrgInfoResultDTO gridInfo = npcGridInfoMap.get(npc.getGridId());
+                        ResiEventNpcResultDTO resiEventNpcInfo = new ResiEventNpcResultDTO(
+                                npc.getUserId(),
+                                npc.getGridId(),
+                                "人大代表-".concat(npc.getRealName()),
+                                npc.getRealName(),
+                                npc.getHeadImgUrl(),
+                                gridInfo != null ? gridInfo.getAgencyId() : null,
+                                gridInfo != null ? gridInfo.getPids().concat(":").concat(gridInfo.getAgencyId()) : null);
+                        npcResultList.add(resiEventNpcInfo);
+                    }
                 }
         );
 

From 346adcef6b7b7bde3f22a77fcf5c2d7f307b8cbe Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 9 Aug 2021 16:20:51 +0800
Subject: [PATCH 75/84] =?UTF-8?q?=E6=8A=A5=E4=BA=8B=E8=BD=AC=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=EF=BC=8C=E5=86=85=E9=83=A8=E5=A4=87=E6=B3=A8=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8D=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/form/EventToProjectFormDTO.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventToProjectFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventToProjectFormDTO.java
index 758b7acbbb..560ebfe2d8 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventToProjectFormDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventToProjectFormDTO.java
@@ -38,8 +38,9 @@ public class EventToProjectFormDTO implements Serializable {
     private String publicReply;
     /**
      * 内部备注 1000
+     * 21.08.09 直接立项的内部备注是必填的，然后议题转项目和我要直报转项目的都是非必填的
      */
-    @Length(min = 1, max = 1000, message = "内部备注1000字", groups = {ApprovalCategory.class})
+    //@Length(min = 1, max = 1000, message = "内部备注1000字", groups = {ApprovalCategory.class})
     private String internalRemark;
 
     /**

From add11558de2172aef8003043a85b886d4b6bcd7a Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 10 Aug 2021 09:44:42 +0800
Subject: [PATCH 76/84] bug

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

diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
index 0c1808eae9..336b0c39ed 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
@@ -181,7 +181,7 @@
         re.id as eventId
         FROM resi_event_report_org ro
         LEFT JOIN resi_event re ON (re.ID = ro.RESI_EVENT_ID AND re.DEL_FLAG = '0')
-        LEFT JOIN resi_event_attachment ea ON (ea.RESI_EVENT_ID = ro.RESI_EVENT_ID AND ea.DEL_FLAG = '0' AND
+        inner JOIN resi_event_attachment ea ON (ea.RESI_EVENT_ID = ro.RESI_EVENT_ID AND ea.DEL_FLAG = '0' AND
         ea.ATTACHMENT_TYPE = 'image' AND ea.SORT IN (0,1,2))
         WHERE ro.DEL_FLAG = '0'
         AND ro.ORG_READ = 'un_read'

From 5e2cc37fe92f222244e943cbf0767978103186b7 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 10 Aug 2021 10:33:25 +0800
Subject: [PATCH 77/84] bug

---
 .../src/main/resources/mapper/ResiEventDao.xml         | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
index 336b0c39ed..c60df2fa6d 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
@@ -49,7 +49,7 @@
             ORDER BY re.CLOSE_CASE_TIME DESC
         </if>
         )t
-        LEFT JOIN resi_event_attachment rea ON (rea.RESI_EVENT_ID = t.eventId AND rea.DEL_FLAG = '0' AND rea.ATTACHMENT_TYPE = 'image' AND (rea.SORT = 0 OR rea.SORT = 1 OR rea.SORT = 2))
+        inner JOIN resi_event_attachment rea ON (rea.RESI_EVENT_ID = t.eventId AND rea.DEL_FLAG = '0' AND rea.ATTACHMENT_TYPE = 'image' AND (rea.SORT = 0 OR rea.SORT = 1 OR rea.SORT = 2))
     </select>
 
 
@@ -132,8 +132,8 @@
             (CASE WHEN re.READ_FLAG = 1 THEN FALSE ELSE TRUE END) AS isRollback,
             (CASE WHEN re.SHIFT_PROJECT = 1 THEN TRUE ELSE FALSE END) AS isProject,
             IFNULL(re.project_id,'') AS projectId,
-            IFNULL(ea.ATTACHMENT_URL,'') AS eventImg,
-            concat('人大代表-',IFNULL(em.USER_SHOW_NAME,'')) AS person,
+            ea.ATTACHMENT_URL AS eventImg,
+            IF(ISNULL(em.USER_SHOW_NAME),NULL,concat('人大代表-',em.USER_SHOW_NAME)) AS person,
             re.GRID_ID AS gridId,
             re.CREATED_BY AS eventUserId,
             ro.ORG_ID AS orgId
@@ -177,11 +177,11 @@
         SELECT
         IFNULL(re.EVENT_CONTENT,'') AS eventContent,
         DATE_FORMAT(re.CREATED_TIME,'%Y-%m-%d %H:%i') AS eventTime,
-        IFNULL(ea.ATTACHMENT_URL,'') AS img,
+        ea.ATTACHMENT_URL AS img,
         re.id as eventId
         FROM resi_event_report_org ro
         LEFT JOIN resi_event re ON (re.ID = ro.RESI_EVENT_ID AND re.DEL_FLAG = '0')
-        inner JOIN resi_event_attachment ea ON (ea.RESI_EVENT_ID = ro.RESI_EVENT_ID AND ea.DEL_FLAG = '0' AND
+        LEFT JOIN resi_event_attachment ea ON (ea.RESI_EVENT_ID = ro.RESI_EVENT_ID AND ea.DEL_FLAG = '0' AND
         ea.ATTACHMENT_TYPE = 'image' AND ea.SORT IN (0,1,2))
         WHERE ro.DEL_FLAG = '0'
         AND ro.ORG_READ = 'un_read'

From b5505c4ecdf225945e8d7403862b803fb842a572 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 10 Aug 2021 10:38:41 +0800
Subject: [PATCH 78/84] =?UTF-8?q?=E6=8A=A5=E4=BA=8B=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9@=E4=BA=BA=E5=A4=A7=E4=BB=A3=E8=A1=A8=E5=8F=AF?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=EF=BC=8C=E6=8A=A5=E4=BA=8B=E4=BA=BA=E5=9B=9E?=
 =?UTF-8?q?=E5=A4=8D=E6=97=B6=EF=BC=8C=E5=9B=9E=E5=A4=8D=E8=A1=A8=E5=AD=98?=
 =?UTF-8?q?=E5=82=A8=E7=9A=84=E6=98=AFXXX=E8=A1=97=E9=81=93-=E5=A7=93?=
 =?UTF-8?q?=E5=A5=B3=E5=A3=AB/=E5=85=88=E7=94=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ResiEventReplyServiceImpl.java  |  4 ++--
 .../epmet/service/impl/ResiEventServiceImpl.java |  4 +++-
 .../epmet/dto/result/UserBaseInfoResultDTO.java  |  5 +++++
 .../service/impl/UserBaseInfoServiceImpl.java    | 16 ++++++++++++++++
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java
index 7d1116c60c..0cc50a69b2 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java
@@ -170,7 +170,7 @@ public class ResiEventReplyServiceImpl extends BaseServiceImpl<ResiEventReplyDao
         }
         // 回复内容走审核
         scanReplyContent(formDTO.getContent());
-        // 查询当前用户的显示昵称
+        // 查询当前用户的显示昵称   应该是xxx街道-姓/女士or先生  如果没有街道和姓，显示的微信昵称
         List<String> userIdList =new ArrayList<>();
         userIdList.add(formDTO.getUserId());
         Result<List<UserBaseInfoResultDTO>> userResult=epmetUserOpenFeignClient.queryUserBaseInfo(userIdList);
@@ -183,7 +183,7 @@ public class ResiEventReplyServiceImpl extends BaseServiceImpl<ResiEventReplyDao
         resiEventReplyEntity.setResiEventId(formDTO.getResiEventId());
         resiEventReplyEntity.setFromUserId(formDTO.getUserId());
         resiEventReplyEntity.setContent(formDTO.getContent());
-        resiEventReplyEntity.setUserShowName(userResult.getData().get(0).getShowName());
+        resiEventReplyEntity.setUserShowName(userResult.getData().get(0).getUserShowName());
         resiEventReplyEntity.setCreatedTime(new Date());
         baseDao.insert(resiEventReplyEntity);
         //更新事件最后一次操作时间
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index e7c1376f40..e2db7cc965 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -266,7 +266,9 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
         //7、插入艾特人表
         List<ResiEventMentionEntity> npcList=getNpcList(formDTO.getCustomerId(),resiEventEntity.getId(),formDTO.getNpcUserList());
         npcList.forEach(npc->{
-            resiEventMentionDao.insert(npc);
+            if (StringUtils.isNotBlank(npc.getUserId()) && StringUtils.isNotBlank(npc.getUserShowName())){
+                resiEventMentionDao.insert(npc);
+            }
         });
         //8、插入log日志
         ResiEventOperationLogEntity publishLog=new ResiEventOperationLogEntity();
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserBaseInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserBaseInfoResultDTO.java
index 2c23abe08b..01741a9275 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserBaseInfoResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserBaseInfoResultDTO.java
@@ -101,4 +101,9 @@ public class UserBaseInfoResultDTO implements Serializable {
      * 微信基本信息
      */
     private UserWechatResultDTO userWechatResultDTO;
+
+    /**
+     * xxx街道-尹女士
+     */
+    private String userShowName;
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java
index c93e6fd99c..1ce80e7e61 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java
@@ -23,6 +23,7 @@ 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.constant.StrConstant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -181,6 +182,21 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
             UserBaseInfoResultDTO baseInfo = userBaseInfoRedis.getUserInfo(id);
             //为了保证传过来的user数量与返回的一致，就算查出的用户信息为空也要添加进集合里
             //if(null != baseInfo && StringUtils.isNotBlank(baseInfo.getId())){
+            if (StringUtils.isNotBlank(baseInfo.getStreet()) && StringUtils.isNotBlank(baseInfo.getSurname())) {
+                if ("1".equals(baseInfo.getGender())) {
+                    //    男
+                    baseInfo.setUserShowName(baseInfo.getStreet().concat(StrConstant.HYPHEN).concat(baseInfo.getSurname().concat("先生")));
+                } else if ("2".equals(baseInfo.getGender())) {
+                    //   女
+                    baseInfo.setUserShowName(baseInfo.getStreet().concat(StrConstant.HYPHEN).concat(baseInfo.getSurname().concat("女士")));
+                } else {
+                    // 0 未知
+                    baseInfo.setUserShowName(baseInfo.getStreet().concat(StrConstant.HYPHEN).concat(baseInfo.getSurname().concat("女士/先生")));
+                }
+            } else {
+                //    社会为微信昵称
+                baseInfo.setUserShowName(baseInfo.getNickname());
+            }
             userBaseInfoList.add(baseInfo);
             //}
         });

From 62bfffeb9c1f826b313ebd16d98a1537ec4e2f76 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 10 Aug 2021 11:18:30 +0800
Subject: [PATCH 79/84] =?UTF-8?q?=E6=94=B9=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
index c60df2fa6d..348195e749 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
@@ -49,7 +49,7 @@
             ORDER BY re.CLOSE_CASE_TIME DESC
         </if>
         )t
-        inner JOIN resi_event_attachment rea ON (rea.RESI_EVENT_ID = t.eventId AND rea.DEL_FLAG = '0' AND rea.ATTACHMENT_TYPE = 'image' AND (rea.SORT = 0 OR rea.SORT = 1 OR rea.SORT = 2))
+        LEFT JOIN resi_event_attachment rea ON (rea.RESI_EVENT_ID = t.eventId AND rea.DEL_FLAG = '0' AND rea.ATTACHMENT_TYPE = 'image' AND (rea.SORT = 0 OR rea.SORT = 1 OR rea.SORT = 2))
     </select>
 
 

From 0fc473f565c752418e64fcaacb8fac7baad24200 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 10 Aug 2021 13:32:56 +0800
Subject: [PATCH 80/84] img

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

diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
index 348195e749..0b6a959987 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
@@ -15,7 +15,7 @@
         </collection>
     </resultMap>
     <select id="eventUnDisposedList" resultMap="eventUnDisposedListMap">
-        SELECT IFNULL(rea.ATTACHMENT_URL,'') AS img,t.* FROM
+        SELECT rea.ATTACHMENT_URL AS img,t.* FROM
         (SELECT
         re.EVENT_CONTENT AS eventContent,
         <if test='eventType == "undisposed" '>

From 3b33bf2fb98735ebac9045eb6548ed356e090643 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 10 Aug 2021 14:29:19 +0800
Subject: [PATCH 81/84] =?UTF-8?q?=E5=B1=95=E7=A4=BAname?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/service/impl/ResiEventServiceImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index e2db7cc965..3adca24761 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -187,7 +187,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
         }
         userResult.getData().forEach(u -> {
             if (u.getUserId().equals(dto.getEventUserId())){
-                dto.setEventPeopleName(u.getShowName());
+                dto.setEventPeopleName(u.getUserShowName());
             }
         });
         // 查询所属网格

From 8c7a9315fd1a89ad23ea816fff6c370717b6c850 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Thu, 12 Aug 2021 16:45:20 +0800
Subject: [PATCH 82/84] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E6=95=88?=
 =?UTF-8?q?=E7=9A=84=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet-openapi-adv-client/pom.xml          |  16 --
 .../epmet-openapi-adv-server/Dockerfile       |  11 -
 .../deploy/docker-compose-dev.yml             |  18 --
 .../deploy/docker-compose-prod.yml            |  18 --
 .../deploy/docker-compose-test.yml            |  18 --
 .../epmet-openapi-adv-server/pom.xml          | 227 ------------------
 .../java/com/epmet/adv/AdvApplication.java    |  15 --
 .../epmet/adv/aspect/RequestLogAspect.java    |  40 ---
 .../epmet/adv/config/ModuleConfigImpl.java    |  26 --
 .../adv/controller/AdvVideoController.java    |  28 ---
 .../java/com/epmet/adv/dao/AdvVedioDao.java   |  33 ---
 .../com/epmet/adv/entity/AdvVedioEntity.java  |  56 -----
 .../epmet/adv/service/AdvVedioService.java    |   7 -
 .../adv/service/impl/AdvVedioServiceImpl.java |  18 --
 .../src/main/resources/bootstrap.yml          | 140 -----------
 .../db/migration/V0.0.1__createAdvVedio.sql   |  18 --
 .../src/main/resources/logback-spring.xml     | 169 -------------
 .../src/main/resources/mapper/AdvVedioDao.xml |  35 ---
 epmet-openapi/epmet-openapi-adv/pom.xml       |  21 --
 epmet-openapi/pom.xml                         |   1 -
 20 files changed, 915 deletions(-)
 delete mode 100644 epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-client/pom.xml
 delete mode 100644 epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/Dockerfile
 delete mode 100644 epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/deploy/docker-compose-dev.yml
 delete mode 100644 epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/deploy/docker-compose-prod.yml
 delete mode 100644 epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/deploy/docker-compose-test.yml
 delete mode 100644 epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/pom.xml
 delete mode 100644 epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/AdvApplication.java
 delete mode 100644 epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/aspect/RequestLogAspect.java
 delete mode 100644 epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/config/ModuleConfigImpl.java
 delete mode 100644 epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/controller/AdvVideoController.java
 delete mode 100644 epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/dao/AdvVedioDao.java
 delete mode 100644 epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/entity/AdvVedioEntity.java
 delete mode 100644 epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/service/AdvVedioService.java
 delete mode 100644 epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/service/impl/AdvVedioServiceImpl.java
 delete mode 100644 epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/resources/bootstrap.yml
 delete mode 100644 epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/resources/db/migration/V0.0.1__createAdvVedio.sql
 delete mode 100644 epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/resources/logback-spring.xml
 delete mode 100644 epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/resources/mapper/AdvVedioDao.xml
 delete mode 100644 epmet-openapi/epmet-openapi-adv/pom.xml

diff --git a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-client/pom.xml b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-client/pom.xml
deleted file mode 100644
index 5c57808384..0000000000
--- a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-client/pom.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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">
-    <parent>
-        <artifactId>epmet-openapi-adv</artifactId>
-        <groupId>com.epmet</groupId>
-        <version>2.0.0</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>epmet-openapi-adv-client</artifactId>
-
-
-</project>
\ No newline at end of file
diff --git a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/Dockerfile b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/Dockerfile
deleted file mode 100644
index d15b865820..0000000000
--- a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-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 ./epmet-openapi-adv.jar
-
-EXPOSE 8115
-
-ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"]
\ No newline at end of file
diff --git a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/deploy/docker-compose-dev.yml b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/deploy/docker-compose-dev.yml
deleted file mode 100644
index 79721a6cb7..0000000000
--- a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/deploy/docker-compose-dev.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-version: "3.7"
-services:
-  epmet-openapi-adv-server:
-    container_name: epmet-openapi-adv-server-dev
-    image: 192.168.1.140:5000/epmet-cloud-dev/epmet-openapi-adv-server:version_placeholder
-    ports:
-      - "8015:8015"
-    network_mode: host # 不会创建新的网络
-    volumes:
-      - "/opt/epmet-cloud-logs/dev:/logs"
-    environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-openapi-adv.jar"
-    restart: "unless-stopped"
-    deploy:
-      resources:
-        limits:
-          cpus: '0.1'
-          memory: 300M
\ No newline at end of file
diff --git a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/deploy/docker-compose-prod.yml b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/deploy/docker-compose-prod.yml
deleted file mode 100644
index b5a13e04e3..0000000000
--- a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/deploy/docker-compose-prod.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-version: "3.7"
-services:
-  epmet-openapi-adv-server:
-    container_name: epmet-openapi-adv-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-openapi-adv-server:0.3.3
-    ports:
-      - "8015:8015"
-    network_mode: host # 不会创建新的网络
-    volumes:
-      - "/opt/epmet-cloud-logs/prod:/logs"
-    environment:
-      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./epmet-openapi-adv.jar"
-    restart: "unless-stopped"
-    deploy:
-      resources:
-        limits:
-          cpus: '0.1'
-          memory: 600M
\ No newline at end of file
diff --git a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/deploy/docker-compose-test.yml b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/deploy/docker-compose-test.yml
deleted file mode 100644
index 45d536cb2f..0000000000
--- a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/deploy/docker-compose-test.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-version: "3.7"
-services:
-  epmet-openapi-adv-server:
-    container_name: epmet-openapi-adv-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-openapi-adv-server:version_placeholder
-    ports:
-      - "8015:8015"
-    network_mode: host # 不会创建新的网络
-    volumes:
-      - "/opt/epmet-cloud-logs/test:/logs"
-    environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-openapi-adv.jar"
-    restart: "unless-stopped"
-    deploy:
-      resources:
-        limits:
-          cpus: '0.1'
-          memory: 300M
\ No newline at end of file
diff --git a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/pom.xml b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/pom.xml
deleted file mode 100644
index 14d5226105..0000000000
--- a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/pom.xml
+++ /dev/null
@@ -1,227 +0,0 @@
-<?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">
-
-    <version>0.3.3</version>
-    <parent>
-        <artifactId>epmet-openapi-adv</artifactId>
-        <groupId>com.epmet</groupId>
-        <version>2.0.0</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>epmet-openapi-adv-server</artifactId>
-
-    <dependencies>
-        <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>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</id>
-            <properties>
-                <server.port>8115</server.port>
-                <spring.profiles.active>dev</spring.profiles.active>
-
-                <!-- 数据库配置-->
-                <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_adv?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
-                </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epmet_adv_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.140</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>123456</spring.redis.password>
-                <!-- nacos -->
-                <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>192.168.1.140:8848</nacos.server-addr>
-                <nacos.discovery.namespace>1fecc730-5e6e-464c-aae9-7567944e7936</nacos.discovery.namespace>
-                <nacos.config.namespace></nacos.config.namespace>
-                <nacos.config.group></nacos.config.group>
-                <nacos.config-enabled>false</nacos.config-enabled>
-                <nacos.ip/>
-
-                <spring.flyway.enabled>false</spring.flyway.enabled>
-                <!--钉钉 机器人地址-->
-                <dingTalk.robot.webHook>
-                    https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
-                </dingTalk.robot.webHook>
-                <dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
-                </dingTalk.robot.secret>
-            </properties>
-        </profile>
-        <profile>
-            <id>local</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-                <server.port>8115</server.port>
-                <spring.profiles.active>local</spring.profiles.active>
-
-                <!-- 数据库配置-->
-                <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://118.190.150.119:47306/epmet_adv?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
-                </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epmet_adv_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>118.190.150.119</spring.redis.host>
-                <spring.redis.port>47379</spring.redis.port>
-                <spring.redis.password>123456</spring.redis.password>
-                <!-- nacos -->
-                <nacos.register-enabled>false</nacos.register-enabled>
-                <nacos.server-addr>192.168.1.140:8848</nacos.server-addr>
-                <nacos.discovery.namespace>1fecc730-5e6e-464c-aae9-7567944e7936</nacos.discovery.namespace>
-                <nacos.config.namespace></nacos.config.namespace>
-                <nacos.config.group></nacos.config.group>
-                <nacos.config-enabled>false</nacos.config-enabled>
-                <nacos.ip/>
-
-                <spring.flyway.enabled>false</spring.flyway.enabled>
-                <!--钉钉 机器人地址-->
-                <dingTalk.robot.webHook>
-                    https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
-                </dingTalk.robot.webHook>
-                <dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
-                </dingTalk.robot.secret>
-                <openapi.scan.server.url>https://epmet-dev.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>
-            </properties>
-        </profile>
-        <profile>
-            <id>test</id>
-            <!--  <activation>
-                  <activeByDefault>true</activeByDefault>
-              </activation>-->
-            <properties>
-                <server.port>8115</server.port>
-                <spring.profiles.active>test</spring.profiles.active>
-
-                <!-- 数据库配置-->
-                <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_adv?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/>
-
-                <spring.flyway.enabled>true</spring.flyway.enabled>
-                <!--测试钉钉 机器人地址-->
-                <dingTalk.robot.webHook>
-                    https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
-                </dingTalk.robot.webHook>
-                <dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
-                </dingTalk.robot.secret>
-            </properties>
-        </profile>
-        <profile>
-            <id>prod</id>
-            <properties>
-                <server.port>8115</server.port>
-                <spring.profiles.active>prod</spring.profiles.active>
-
-                <!-- 数据库配置-->
-                <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_adv?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
-                </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epmet_adv_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>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
-                <!-- nacos -->
-                <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
-                <nacos.config.namespace></nacos.config.namespace>
-                <nacos.config.group></nacos.config.group>
-                <nacos.config-enabled>false</nacos.config-enabled>
-                <nacos.ip/>
-
-                <spring.flyway.enabled>true</spring.flyway.enabled>
-
-                <!--生产钉钉 机器人地址-->
-                <dingTalk.robot.webHook>
-                    https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
-                </dingTalk.robot.webHook>
-                <dingTalk.robot.secret>SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
-                </dingTalk.robot.secret>
-            </properties>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/AdvApplication.java b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/AdvApplication.java
deleted file mode 100644
index 61c5d3b4b8..0000000000
--- a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/AdvApplication.java
+++ /dev/null
@@ -1,15 +0,0 @@
-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;
-
-@SpringBootApplication
-@EnableDiscoveryClient
-@EnableFeignClients
-public class AdvApplication {
-    public static void main(String[] args) {
-        SpringApplication.run(AdvApplication.class, args);
-    }
-}
diff --git a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/aspect/RequestLogAspect.java b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/aspect/RequestLogAspect.java
deleted file mode 100644
index e06fdc2c95..0000000000
--- a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/aspect/RequestLogAspect.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.epmet.adv.aspect;
-
-import com.epmet.commons.tools.aspect.BaseRequestLogAspect;
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.Around;
-import org.aspectj.lang.annotation.Aspect;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Component;
-import org.springframework.web.context.request.RequestAttributes;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * 日志/异常处理切面实现，调用父类方法完成日志记录和异常处理。
- */
-@Aspect
-@Component
-@Order(0)
-public class RequestLogAspect extends BaseRequestLogAspect {
-
-    @Override
-    @Around(value = "execution(* com.epmet.adv.controller.*Controller*.*(..)) ")
-    public Object proceed(ProceedingJoinPoint point) throws Throwable {
-        return super.proceed(point, getRequest());
-    }
-
-    /**
-     * 获取Request对象
-     *
-     * @return
-     */
-    private HttpServletRequest getRequest() {
-        RequestAttributes ra = RequestContextHolder.getRequestAttributes();
-        ServletRequestAttributes sra = (ServletRequestAttributes) ra;
-        return sra.getRequest();
-    }
-
-}
diff --git a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/config/ModuleConfigImpl.java b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/config/ModuleConfigImpl.java
deleted file mode 100644
index 8d88549b66..0000000000
--- a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/config/ModuleConfigImpl.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Copyright (c) 2018 人人开源 All rights reserved.
- *
- * https://www.renren.io
- *
- * 版权所有，侵权必究！
- */
-
-package com.epmet.adv.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 "adv";
-    }
-}
diff --git a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/controller/AdvVideoController.java b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/controller/AdvVideoController.java
deleted file mode 100644
index 5c032ad562..0000000000
--- a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/controller/AdvVideoController.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.epmet.adv.controller;
-
-import com.epmet.adv.entity.AdvVedioEntity;
-import com.epmet.adv.service.AdvVedioService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.io.IOException;
-
-@Controller
-@RequestMapping("video")
-public class AdvVideoController {
-
-    @Autowired
-    private AdvVedioService advVedioService;
-
-    @GetMapping("company-adv")
-    public String toVedio() throws IOException {
-        AdvVedioEntity enableAdvVedioEntity = advVedioService.getEnableAdvVedioEntity();
-        String redirectUrl = enableAdvVedioEntity != null ? enableAdvVedioEntity.getPath() : "404";
-        return String.format("redirect:%s", redirectUrl);
-        //response.sendRedirect("www.baidu.com");
-    }
-
-}
diff --git a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/dao/AdvVedioDao.java b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/dao/AdvVedioDao.java
deleted file mode 100644
index c14da09d52..0000000000
--- a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/dao/AdvVedioDao.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.adv.dao;
-
-import com.epmet.adv.entity.AdvVedioEntity;
-import com.epmet.commons.mybatis.dao.BaseDao;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 宣传视频
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-12-30
- */
-@Mapper
-public interface AdvVedioDao extends BaseDao<AdvVedioEntity> {
-	AdvVedioEntity getEnableAdvVedioEntity();
-}
\ No newline at end of file
diff --git a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/entity/AdvVedioEntity.java b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/entity/AdvVedioEntity.java
deleted file mode 100644
index a25c6ea77e..0000000000
--- a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/entity/AdvVedioEntity.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.adv.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-12-30
- */
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("adv_vedio")
-public class AdvVedioEntity extends BaseEpmetEntity {
-
-	private static final long serialVersionUID = 1L;
-
-    /**
-     * 存储路径
-     */
-	private String path;
-
-    /**
-     * 存储类型。aliyun_oss,local
-     */
-	private String storeType;
-
-    /**
-     * 是否启用
-     */
-	private Integer enable;
-
-}
diff --git a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/service/AdvVedioService.java b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/service/AdvVedioService.java
deleted file mode 100644
index 38091ee496..0000000000
--- a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/service/AdvVedioService.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.epmet.adv.service;
-
-import com.epmet.adv.entity.AdvVedioEntity;
-
-public interface AdvVedioService {
-    AdvVedioEntity getEnableAdvVedioEntity();
-}
diff --git a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/service/impl/AdvVedioServiceImpl.java b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/service/impl/AdvVedioServiceImpl.java
deleted file mode 100644
index cecc710c39..0000000000
--- a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/service/impl/AdvVedioServiceImpl.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.epmet.adv.service.impl;
-
-import com.epmet.adv.dao.AdvVedioDao;
-import com.epmet.adv.entity.AdvVedioEntity;
-import com.epmet.adv.service.AdvVedioService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service
-public class AdvVedioServiceImpl implements AdvVedioService {
-    @Autowired
-    private AdvVedioDao advVedioDao;
-
-    public AdvVedioEntity getEnableAdvVedioEntity() {
-        return advVedioDao.getEnableAdvVedioEntity();
-    }
-
-}
diff --git a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/resources/bootstrap.yml b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/resources/bootstrap.yml
deleted file mode 100644
index 0bd40dcca7..0000000000
--- a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,140 +0,0 @@
-server:
-  port: @server.port@
-  version: @version@
-  servlet:
-    context-path: /adv
-
-spring:
-  main:
-    allow-bean-definition-overriding: true
-  application:
-    name: epmet-openapi-adv-server
-  #环境 dev|test|prod
-  profiles:
-    active:  @spring.profiles.active@
-  messages:
-    encoding: UTF-8
-    basename: 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@
-      initial-size: 10
-      max-active: 100
-      min-idle: 10
-      max-wait: 60000
-      pool-prepared-statements: true
-      max-pool-prepared-statement-per-connection-size: 20
-      time-between-eviction-runs-millis: 60000
-      min-evictable-idle-time-millis: 300000
-      #Oracle需要打开注释
-      #validation-query: SELECT 1 FROM DUAL
-      test-while-idle: true
-      test-on-borrow: false
-      test-on-return: false
-      filter:
-        stat:
-          log-slow-sql: true
-          slow-sql-millis: 1000
-          merge-sql: false
-        wall:
-          config:
-            multi-statement-allow: true
-  # 数据迁移工具flyway
-  flyway:
-    enabled: @spring.flyway.enabled@
-    locations: classpath:db/migration
-    url: @spring.datasource.druid.url@
-    user: @spring.datasource.druid.username@
-    password: @spring.datasource.druid.password@
-    baseline-on-migrate: true
-    baseline-version: 0
-  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
-management:
-  endpoints:
-    web:
-      exposure:
-        include: "*"
-  endpoint:
-    health:
-      show-details: ALWAYS
-
-mybatis-plus:
-  mapper-locations: classpath:/mapper/**/*.xml
-  #实体扫描，多个package用逗号或者分号分隔
-  typeAliasesPackage: com.epmet.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
-  okhttp:
-    enabled: true
-
-
-hystrix:
-  command:
-    default:
-      execution:
-        isolation:
-          thread:
-            timeoutInMilliseconds: 60000 #缺省为1000
-
-ribbon:
-  ReadTimeout: 300000
-  ConnectTimeout: 300000
-
-#pageHelper分页插件
-pagehelper:
-  helper-dialect: mysql
-  reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1
-
-dingTalk:
-  robot:
-    webHook: @dingTalk.robot.webHook@
-    secret: @dingTalk.robot.secret@
diff --git a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/resources/db/migration/V0.0.1__createAdvVedio.sql b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/resources/db/migration/V0.0.1__createAdvVedio.sql
deleted file mode 100644
index 007c12b55f..0000000000
--- a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/resources/db/migration/V0.0.1__createAdvVedio.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- create database epmet_adv default character set utf8mb4;
-
--- CREATE USER epmet_adv_user@'%' IDENTIFIED BY 'EpmEt-db-UsEr';
--- GRANT ALL ON `epmet_adv%`.* TO 'epmet_adv_user'@'%';
--- flush privileges;
-
-CREATE TABLE `adv_vedio` (
-  `ID` varchar(64) NOT NULL COMMENT 'id' primary key ,
-  `PATH` varchar(255) NOT NULL COMMENT '存储路径',
-  `STORE_TYPE` varchar(30) NOT NULL COMMENT '存储类型。aliyun_oss,local',
-  `ENABLE` tinyint(1) NOT NULL COMMENT '是否启用',
-  `REVISION` int(11) DEFAULT NULL COMMENT '乐观锁',
-  `DEL_FLAG` int(11) unsigned DEFAULT NULL COMMENT '删除标识  0：未删除    1：删除',
-  `CREATED_BY` varchar(32) DEFAULT NULL COMMENT '创建者',
-  `CREATED_TIME` datetime DEFAULT NULL COMMENT '创建时间',
-  `UPDATED_BY` varchar(32) DEFAULT NULL COMMENT '更新者',
-  `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间'
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='宣传视频'
\ No newline at end of file
diff --git a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/resources/logback-spring.xml b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/resources/logback-spring.xml
deleted file mode 100644
index 06a21d317c..0000000000
--- a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/resources/logback-spring.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-    <include resource="org/springframework/boot/logging/logback/base.xml"/>
-
-    <property name="log.path" value="logs/adv"/>
-
-    <springProperty scope="context" name="appname" source="spring.application.name"/>
-    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
-    <springProperty scope="context" name="secret" source="dingTalk.robot.secret"/>
-
-    <!-- 日志上下文名称 -->
-    <contextName>${appname}</contextName>
-
-    <!-- 彩色日志格式 -->
-    <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} [%contextName] [%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} [%contextName] [%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} [%contextName] [%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} [%contextName] [%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="com.epmet.commons.tools.filter.LogMsgSendFilter">
-            <level>ERROR</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-            <webHook>${webHook}</webHook>
-            <secret>${secret}</secret>
-            <appName>${appname}</appName>
-        </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="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-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/resources/mapper/AdvVedioDao.xml b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/resources/mapper/AdvVedioDao.xml
deleted file mode 100644
index 92a4993b9f..0000000000
--- a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/resources/mapper/AdvVedioDao.xml
+++ /dev/null
@@ -1,35 +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.adv.dao.AdvVedioDao">
-
-    <resultMap type="com.epmet.adv.entity.AdvVedioEntity" id="entityMap">
-        <result property="id" column="ID"/>
-        <result property="path" column="PATH"/>
-        <result property="storeType" column="STORE_TYPE"/>
-        <result property="enable" column="ENABLE"/>
-        <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>
-
-    <select id="getEnableAdvVedioEntity" resultMap="entityMap">
-        select id,
-               path,
-               store_type,
-               enable,
-               revision,
-               del_flag,
-               created_by,
-               created_time,
-               updated_by,
-               updated_time
-        from adv_vedio
-        where ENABLE = 1
-        limit 1;
-    </select>
-
-</mapper>
\ No newline at end of file
diff --git a/epmet-openapi/epmet-openapi-adv/pom.xml b/epmet-openapi/epmet-openapi-adv/pom.xml
deleted file mode 100644
index 13490687d1..0000000000
--- a/epmet-openapi/epmet-openapi-adv/pom.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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">
-    <parent>
-        <artifactId>epmet-openapi</artifactId>
-        <groupId>com.epmet</groupId>
-        <version>2.0.0</version>
-    </parent>
-    <packaging>pom</packaging>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>epmet-openapi-adv</artifactId>
-
-    <modules>
-        <module>epmet-openapi-adv-client</module>
-        <module>epmet-openapi-adv-server</module>
-    </modules>
-
-
-</project>
\ No newline at end of file
diff --git a/epmet-openapi/pom.xml b/epmet-openapi/pom.xml
index fd15705343..9db62073f3 100644
--- a/epmet-openapi/pom.xml
+++ b/epmet-openapi/pom.xml
@@ -13,7 +13,6 @@
     <artifactId>epmet-openapi</artifactId>
     <modules>
         <module>epmet-openapi-scan</module>
-        <module>epmet-openapi-adv</module>
     </modules>
 
 </project>
\ No newline at end of file

From 71d85910d7d9827d3eab5e85959c9c444bb6a125 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 12 Aug 2021 17:25:21 +0800
Subject: [PATCH 83/84] =?UTF-8?q?=E5=9B=BE=E7=89=87=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
index 0b6a959987..0142b1a3df 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
@@ -49,7 +49,7 @@
             ORDER BY re.CLOSE_CASE_TIME DESC
         </if>
         )t
-        LEFT JOIN resi_event_attachment rea ON (rea.RESI_EVENT_ID = t.eventId AND rea.DEL_FLAG = '0' AND rea.ATTACHMENT_TYPE = 'image' AND (rea.SORT = 0 OR rea.SORT = 1 OR rea.SORT = 2))
+        LEFT JOIN resi_event_attachment rea ON (rea.RESI_EVENT_ID = t.eventId AND rea.DEL_FLAG = '0' AND rea.ATTACHMENT_TYPE = 'image' AND (rea.SORT = 3 OR rea.SORT = 1 OR rea.SORT = 2))
     </select>
 
 
@@ -182,7 +182,7 @@
         FROM resi_event_report_org ro
         LEFT JOIN resi_event re ON (re.ID = ro.RESI_EVENT_ID AND re.DEL_FLAG = '0')
         LEFT JOIN resi_event_attachment ea ON (ea.RESI_EVENT_ID = ro.RESI_EVENT_ID AND ea.DEL_FLAG = '0' AND
-        ea.ATTACHMENT_TYPE = 'image' AND ea.SORT IN (0,1,2))
+        ea.ATTACHMENT_TYPE = 'image' AND ea.SORT IN (3,1,2))
         WHERE ro.DEL_FLAG = '0'
         AND ro.ORG_READ = 'un_read'
         AND ro.ORG_ID IN(

From 5a78896bd818f0fb037f0b725b451647318129c9 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Thu, 12 Aug 2021 17:26:36 +0800
Subject: [PATCH 84/84] =?UTF-8?q?=E5=A4=96=E9=83=A8=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=86=85=E5=A4=96=E9=83=A8=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E8=BF=9B=E8=A1=8C=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/controller/ExternalAppController.java | 2 +-
 .../src/main/java/com/epmet/dao/ExternalAppDao.java           | 2 +-
 .../src/main/java/com/epmet/service/ExternalAppService.java   | 2 +-
 .../java/com/epmet/service/impl/ExternalAppServiceImpl.java   | 4 ++--
 .../src/main/resources/mapper/ExternalAppDao.xml              | 3 +++
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ExternalAppController.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ExternalAppController.java
index baee81af67..c0cacc525d 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ExternalAppController.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ExternalAppController.java
@@ -103,7 +103,7 @@ public class ExternalAppController {
      */
     @PostMapping("/list")
     public Result<PageData<ExternalAppResultDTO>> list(@RequestBody ExternalAppFormDTO formDTO) {
-        PageData<ExternalAppResultDTO> page = externalAppService.listPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getCustomerId());
+        PageData<ExternalAppResultDTO> page = externalAppService.listPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getCustomerId(), formDTO.getCustomerType());
         return new Result<PageData<ExternalAppResultDTO>>().ok(page);
     }
 
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/ExternalAppDao.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/ExternalAppDao.java
index b2f89b9b90..2139245165 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/ExternalAppDao.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/ExternalAppDao.java
@@ -39,7 +39,7 @@ public interface ExternalAppDao extends BaseDao<ExternalAppEntity> {
 
     ExternalAppResultDTO getByNameAndCustomerId(@Param("appName") String appName, @Param("customerId") String customerId);
 
-    List<ExternalAppResultDTO> list(@Param("customerId") String customerId);
+    List<ExternalAppResultDTO> list(@Param("customerId") String customerId, @Param("customerType") String customerType);
 
     List<String> getCustomerIds();
 
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ExternalAppService.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ExternalAppService.java
index 77e4c32f48..b32ef9467e 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ExternalAppService.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ExternalAppService.java
@@ -35,7 +35,7 @@ public interface ExternalAppService {
 
     ExternalAppResultDTO updateById(String appId, String appName, String customerId, String customerType);
 
-    PageData<ExternalAppResultDTO> listPage(Integer pageNo, Integer pageSize, String customerId);
+    PageData<ExternalAppResultDTO> listPage(Integer pageNo, Integer pageSize, String customerId, String customerType);
 
     List<String> getCustomerIds();
 
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ExternalAppServiceImpl.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ExternalAppServiceImpl.java
index 9d7fee1483..12f84f3456 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ExternalAppServiceImpl.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ExternalAppServiceImpl.java
@@ -158,9 +158,9 @@ public class ExternalAppServiceImpl implements ExternalAppService {
     }
 
     @Override
-    public PageData<ExternalAppResultDTO> listPage(Integer pageNo, Integer pageSize, String customerId) {
+    public PageData<ExternalAppResultDTO> listPage(Integer pageNo, Integer pageSize, String customerId, String customerType) {
         PageHelper.startPage(pageNo, pageSize);
-        List<ExternalAppResultDTO> list = externalAppDao.list(customerId);
+        List<ExternalAppResultDTO> list = externalAppDao.list(customerId, customerType);
         for (ExternalAppResultDTO app : list) {
             // 设置客户类型中文
             app.setCustomerTypeName(CustomerTypeEnum.getName(app.getCustomerType()));
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/ExternalAppDao.xml b/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/ExternalAppDao.xml
index 55889d71b1..fbc74db7ff 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/ExternalAppDao.xml
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/ExternalAppDao.xml
@@ -45,6 +45,9 @@
             <if test="customerId != null and customerId != ''">
                 AND ea.CUSTOMER_ID = #{customerId}
             </if>
+            <if test="customerType != null and customerType != ''">
+                AND ea.CUSTOMER_TYPE = #{customerType}
+            </if>
         </where>
     </select>