Merge remote-tracking branch 'origin/dev_issue_project' into dev_issue_project

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueCustomerParameterDTO.java

@@ -0,0 +1,96 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 议题客户参数定制表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-12
+ */
+@Data
+public class IssueCustomerParameterDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 参数键 eg:voting_time_limit
+     */
+	private String parameterKey;
+
+    /**
+     * 参数名 eg:表决期限
+     */
+	private String parameterName;
+
+    /**
+     * 参数值 eg:10（天）
+     */
+	private String parameterValue;
+
+    /**
+     * 参数说明 eg:这个客户下所有的网格议题表决期限都是10天
+     */
+	private String description;
+
+    /**
+     * 删除标志 0：未删除，1：已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueDTO.java

@@ -0,0 +1,146 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 议题详情表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-12
+ */
+@Data
+public class IssueDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 议题ID
+     */
+	private String id;
+
+    /**
+     * 议题状态 表决中：voting 已转项目：shift_project 已关闭：closed
+     */
+	private String issueStatus;
+
+    /**
+     * 来源类型 eg:resi_topic
+     */
+	private String sourceType;
+
+    /**
+     * 来源ID eg:2223232(当SOURCE_TYPE为"resi_topic"时，这里指话题的ID)
+     */
+	private String sourceId;
+
+    /**
+     * 关闭理由 【未关闭时可以为空】关闭议题时必填的理由，转项目后而且已经结案，这个字段不回写
+     */
+	private String closeReason;
+
+    /**
+     * 解决类型 【未关闭时可以为空】已解决resloved、未解决unresloved，对应在关闭议题时所选的checkbox，转项目后而且已经结案，这个字段不回写
+     */
+	private String resolveType;
+
+    /**
+     * 议题名称 最多20字
+     */
+	private String issueTitle;
+
+    /**
+     * 建议 最多1000字
+     */
+	private String suggestion;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 网格ID 居民端议题对应一个网格Id
+     */
+	private String gridId;
+
+    /**
+     * 所属机关 【数据权限-非必填】11:22:33(agencyId)数据权限控制
+     */
+	private String orgIdPath;
+
+    /**
+     * 组织ID 【数据权限-非必填】agencyId
+     */
+	private String orgId;
+
+    /**
+     * 表决截止日期
+     */
+	private Date votingDeadline;
+
+    /**
+     * 表决发起日期（转议题日期）
+     */
+	private Date decidedTime;
+
+    /**
+     * 转项目日期 （服务间调用日期一致性）
+     */
+	private Date shiftedTime;
+
+    /**
+     * 关闭日期
+     */
+	private Date closedTime;
+
+    /**
+     * 删除标识 0未删除、1已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProcessDTO.java

@@ -0,0 +1,101 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 议题进展记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-12
+ */
+@Data
+public class IssueProcessDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+	private String id;
+
+    /**
+     * 议题ID
+     */
+	private String issueId;
+
+    /**
+     * 操作状态 - 表决中：voting 已转项目：shift_project 已关闭：closed
+     */
+	private String issueStatus;
+
+    /**
+     * 组织类型 操作人所属机构类型（机构：agency | 部门：dept | 网格：grid）操作人可能来源于居民端和政府段，但是只有在“转议题”的时候才是居民端拥有组长权限的人操作，所以当这条记录是转议题时，该记录为grid，ORD_ID相应的也为GRID_ID
+     */
+	private String orgType;
+
+    /**
+     * 组织ID 操作人所属机构ID（对应的有网格ID、部门ID、机构ID）
+     */
+	private String orgId;
+
+    /**
+     * 操作说明 (节点的说明文案，包含三个节点的文案说明【转议题】、【已关闭】、【转项目】)
+     */
+	private String operationExplain;
+
+	/**
+     * 组织名称
+     * */
+	private String orgName;
+
+    /**
+     * 删除标识 0未删除、1已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProjectRelationDTO.java

@@ -0,0 +1,81 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 议题项目关系表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-12
+ */
+@Data
+public class IssueProjectRelationDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID 主键ID
+     */
+	private String id;
+
+    /**
+     * 议题ID 议题ID
+     */
+	private String issueId;
+
+    /**
+     * 项目ID 项目ID
+     */
+	private String projectId;
+
+    /**
+     * 删除标识 0：未删除1：已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间 议题转项目时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueSatisfactionDetailDTO.java

@@ -0,0 +1,86 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 议题满意度调查记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-12
+ */
+@Data
+public class IssueSatisfactionDetailDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+	private String id;
+
+    /**
+     * 议题ID
+     */
+	private String issueId;
+
+    /**
+     * 评论 - 最多300字
+     */
+	private String comment;
+
+    /**
+     * 满意度 满意度 - 不满意:bad、基本满意:good、非常满意:perfect
+     */
+	private String satisfaction;
+
+    /**
+     * 删除标识 0未删除、1已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueSatisfactionStatisticalDTO.java

@@ -0,0 +1,91 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 议题满意度调查统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-12
+ */
+@Data
+public class IssueSatisfactionStatisticalDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+	private String id;
+
+    /**
+     * 议题ID
+     */
+	private String issueId;
+
+    /**
+     * 一般满意数
+     */
+	private Integer goodCount;
+
+    /**
+     * 非常满意数
+     */
+	private Integer perfectCount;
+
+    /**
+     * 不满意数
+     */
+	private Integer badCount;
+
+    /**
+     * 删除标识 0未删除、1已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueVoteDetailDTO.java

@@ -0,0 +1,81 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 议题表决记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-12
+ */
+@Data
+public class IssueVoteDetailDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+	private String id;
+
+    /**
+     * 议题ID
+     */
+	private String issueId;
+
+    /**
+     * 态度 - opposition（反对）support（赞成）
+     */
+	private String attitude;
+
+    /**
+     * 删除标识 0未删除、1已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueVoteStatisticalDTO.java

@@ -0,0 +1,91 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 议题表决统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-12
+ */
+@Data
+public class IssueVoteStatisticalDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+	private String id;
+
+    /**
+     * 议题ID
+     */
+	private String issueId;
+
+    /**
+     * 支持数
+     */
+	private Integer supportCount;
+
+    /**
+     * 反对数
+     */
+	private Integer oppositionCount;
+
+    /**
+     * 应表决数
+     */
+	private Integer votableCount;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 删除标识 0未删除、1已删除
+     */
+	private String delFlag;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueVoteStatisticalDailyDTO.java

@@ -0,0 +1,116 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 议题表决按天统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-12
+ */
+@Data
+public class IssueVoteStatisticalDailyDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+	private String id;
+
+    /**
+     * 议题ID
+     */
+	private String issueId;
+
+    /**
+     * 统计日期 yyyy-MM-dd
+     */
+	private Date statisticalDate;
+
+    /**
+     * 到该日的总赞成数
+     */
+	private Integer supportCount;
+
+    /**
+     * 到该日的总反对数
+     */
+	private Integer oppositionCount;
+
+    /**
+     * 到该日的总票数
+     */
+	private Integer totalCount;
+
+    /**
+     * 该日增量
+     */
+	private Integer todayIncrement;
+
+    /**
+     * 该日赞成增量
+     */
+	private Integer supportIncrement;
+
+    /**
+     * 该日反对增量
+     */
+	private Integer oppositionIncrement;
+
+    /**
+     * 到该日的应表决数
+     */
+	private Integer votableCount;
+
+    /**
+     * 删除标识 0未删除、1已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/TopicInfoDTO.java

@@ -0,0 +1,43 @@
+package com.epmet.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * 话题详情(议题详情中的)
+ * @CreateTime 2020/5/11 9:36
+ */
+@Data
+public class TopicInfoDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 话题id
+     */
+    private String topicId;
+
+    /**
+     * 话题内容
+     */
+    private String topicContent;
+
+    /**
+     * 图片列表
+     */
+    private List<String> topicImgs;
+
+    /**
+     * 话题发表人（山东路168-尹女士）
+     */
+    private String publishedUser;
+
+    /**
+     * 话题发表时间 (时间戳 毫秒级)
+     */
+    private Long publishedTime;
+
+}

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueDetailFormDTO.java

@@ -0,0 +1,21 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 议题详情入参
+ * @Author zxc
+ * @Date 2020/5/11 9:30
+ */
+@Data
+public class IssueDetailFormDTO implements Serializable {
+    private static final long serialVersionUID = 4859779755214503489L;
+
+    @NotBlank(message = "议题id不能为空")
+    private String issueId;
+
+}
+

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java

@@ -0,0 +1,49 @@
+package com.epmet.dto.result;
+
+import com.epmet.dto.TopicInfoDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 议题详情回参
+ * @CreateTime 2020/5/11 9:31
+ */
+@Data
+public class IssueDetailResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -1L;
+
+    /**
+     * 议题标题
+     */
+    private String issueTitle;
+
+    /**
+     * 议题状态(voting 已转项目：shift_project 已关闭：closed)
+     */
+    private String issueStatus;
+
+    /**
+     * 话题信息
+     */
+    private TopicInfoDTO topicInfo;
+
+    /**
+     * 议题建议
+     */
+    private String issueSuggestion;
+
+    /**
+     * 所属网格(网格所属机关单位名称-网格名称)
+     */
+    private String belongsGridName;
+
+    /**
+     * 议题发起人（山东路168-尹女士）
+     */
+    private String issueInitiator;
+
+
+}

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java

@@ -0,0 +1,48 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 议题详情回参
+ * @CreateTime 2020/5/11 9:31
+ */
+@Data
+public class IssueResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -1L;
+
+    /**
+     * 议题标题
+     */
+    private String issueTitle;
+
+    /**
+     * 议题状态(voting 已转项目：shift_project 已关闭：closed)
+     */
+    private String issueStatus;
+
+    /**
+     * 议题建议
+     */
+    private String issueSuggestion;
+
+    /**
+     * 网格Id
+     */
+    private String gridId;
+
+    /**
+     * 用户id
+     */
+    private String userId;
+
+    /**
+     * 话题Id
+     */
+    private String topicId;
+
+
+}

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java

@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.epmet.constant;
+
+/**
+ * 常量
+ * @author sun
+ * @since 1.0.0
+ */
+public interface IssueConstant {
+}

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/GovIssueDemoController.java

@@ -17,11 +17,11 @@ import org.springframework.web.bind.annotation.*;
 public class GovIssueDemoController {
     private static final Logger logger = LoggerFactory.getLogger(GovIssueDemoController.class);
 
-    @PostMapping("test")
+ /*   @PostMapping("test")
     public Result test(@RequestBody DemoTestFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
         logger.info(String.format("请求成功客户id[%s],网格id[%s]",formDTO.getCustomerId(),formDTO.getGridId()));
         return new Result().ok("gov-issue-server请求成功");
-    }
+    }*/
 }
 

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java

@@ -0,0 +1,40 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.annotation.RequirePermission;
+import com.epmet.commons.tools.enums.RequirePermissionEnum;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.IssueDetailFormDTO;
+import com.epmet.dto.result.IssueResultDTO;
+import com.epmet.service.IssueService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description 居民端党群议事
+ * @Author yinzuomei
+ * @Date 2020/5/11 9:04
+ */
+@RestController
+@RequestMapping("issue")
+public class IssueController {
+
+    @Autowired
+    private IssueService issueService;
+
+    /**
+     * @Description  议题详情
+     * @param issueDetail
+     * @author zxc
+     * @date 2020/5/11 9:42
+     */
+    @PostMapping(value = "/detail")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
+    public Result<IssueResultDTO> detail(@RequestBody IssueDetailFormDTO issueDetail){
+        return new Result<IssueResultDTO>().ok(issueService.detail(issueDetail));
+    }
+
+}
+

epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/ResiHallDemoController.java → epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/ResiHallDemoController.java

@@ -17,11 +17,11 @@ import org.springframework.web.bind.annotation.*;
 public class ResiHallDemoController {
     private static final Logger logger = LoggerFactory.getLogger(ResiHallDemoController.class);
 
-    @PostMapping("test")
+   /* @PostMapping("test")
     public Result test(@RequestBody DemoTestFormDTO formDTO) {
         logger.info(String.format("请求成功客户id[%s],网格id[%s]",formDTO.getCustomerId(),formDTO.getGridId()));
         ValidatorUtils.validateEntity(formDTO);
         return new Result().ok("resi-hall-server请求成功");
-    }
+    }*/
 }
 

epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueDao.java → epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java

@@ -19,7 +19,7 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.form.IssueDetailFormDTO;
-import com.epmet.dto.result.IssueDetailResultDTO;
+import com.epmet.dto.result.IssueResultDTO;
 import com.epmet.entity.IssueEntity;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -38,6 +38,6 @@ public interface IssueDao extends BaseDao<IssueEntity> {
      * @author zxc
      * @date 2020/5/11 10:11
      */
-    IssueDetailResultDTO issueDetail(IssueDetailFormDTO formDTO);
+    IssueResultDTO issueDetail(IssueDetailFormDTO formDTO);
 
 }

epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueProcessEntity.java → epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProcessEntity.java

@@ -63,4 +63,9 @@ public class IssueProcessEntity extends BaseEpmetEntity {
      */
 	private String operationExplain;
 
+	/**
+	 * 组织名称
+	 * */
+	private String orgName;
+
 }

epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueExcel.java → epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueExcel.java

@@ -40,7 +40,7 @@ public class IssueExcel {
     @Excel(name = "来源类型 eg:resi_topic")
     private String sourceType;
 
-    @Excel(name = "来源ID eg:2223232(当SOURCE_TYPE为"resi_topic"时，这里指话题的ID)")
+    @Excel(name = "来源ID eg:2223232(当SOURCE_TYPE为 resi_topic 时，这里指话题的ID)")
     private String sourceId;
 
     @Excel(name = "关闭理由 【未关闭时可以为空】关闭议题时必填的理由，转项目后而且已经结案，这个字段不回写")

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueProcessExcel.java

@@ -0,0 +1,74 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 议题进展记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Data
+public class IssueProcessExcel {
+
+    @Excel(name = "主键ID")
+    private String id;
+
+    @Excel(name = "议题ID")
+    private String issueId;
+
+    @Excel(name = "操作状态")
+    private String issueStatus;
+
+    @Excel(name = "组织类型 ")
+    private String orgType;
+
+    @Excel(name = "组织ID 操作人所属机构ID（对应的有网格ID、部门ID、机构ID）")
+    private String orgId;
+
+    @Excel(name = "部门名称")
+    private String orgName;
+
+    @Excel(name = "操作说明 ")
+    private String operationExplain;
+
+    @Excel(name = "删除标识")
+    private String delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java

@@ -0,0 +1,14 @@
+package com.epmet.feign;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.feign.fallback.GovOrgFeignClientFallBack;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * @Description 调用gov-org服务
+ * @Author sun
+ * , url = "localhost:8092"
+ */
+@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class)
+public interface GovOrgFeignClient {
+}

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/MessageFeignClient.java

@@ -0,0 +1,14 @@
+package com.epmet.feign;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.feign.fallback.MessageFeignClientFallback;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * @Description 调用epmet-message服务
+ * @Author sun
+ * , url = "localhost:8085"
+ */
+@FeignClient(name = ServiceConstant.EPMET_MESSAGE_SERVER, fallback = MessageFeignClientFallback.class)
+public interface MessageFeignClient {
+}

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java

@@ -0,0 +1,14 @@
+package com.epmet.feign;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.feign.fallback.ResiGroupFeignClientFallBack;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * @Description 调用resi-group服务
+ * @Author sun
+ * , url = "localhost:8095"
+ */
+@FeignClient(name = ServiceConstant.RESI_GROUP_SERVER, fallback = ResiGroupFeignClientFallBack.class)
+public interface ResiGroupFeignClient {
+}

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java

@@ -0,0 +1,12 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.feign.GovOrgFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description 调用gov-org服务
+ * @Author sun
+ */
+@Component
+public class GovOrgFeignClientFallBack implements GovOrgFeignClient {
+}

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/MessageFeignClientFallback.java

@@ -0,0 +1,15 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.feign.MessageFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description 调用epmet-message服务
+ * @Author sun
+ */
+@Component
+public class MessageFeignClientFallback implements MessageFeignClient {
+}

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java

@@ -0,0 +1,12 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.feign.ResiGroupFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description 调用resi-group服务
+ * @Author sun
+ */
+@Component
+public class ResiGroupFeignClientFallBack implements ResiGroupFeignClient {
+}

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java

@@ -0,0 +1,22 @@
+package com.epmet.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.dto.form.IssueDetailFormDTO;
+import com.epmet.dto.result.IssueResultDTO;
+import com.epmet.entity.IssueEntity;
+
+/**
+ * @Author zxc
+ * @CreateTime 2020/5/11 9:44
+ */
+public interface IssueService extends BaseService<IssueEntity> {
+
+    /**
+     * @Description  议题详情
+     * @param issueDetail
+     * @author zxc
+     * @date 2020/5/11 10:04
+     */
+    IssueResultDTO detail(IssueDetailFormDTO issueDetail);
+
+}

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@@ -0,0 +1,34 @@
+package com.epmet.service.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.dao.IssueDao;
+import com.epmet.dto.form.IssueDetailFormDTO;
+import com.epmet.dto.result.IssueResultDTO;
+import com.epmet.entity.IssueEntity;
+import com.epmet.service.IssueService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author zxc
+ * @CreateTime 2020/5/11 9:46
+ */
+@Service
+public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> implements IssueService {
+
+    @Autowired
+    private IssueDao issueDao;
+
+    /**
+     * @Description  议题详情
+     * @param issueDetail
+     * @author zxc
+     * @date 2020/5/11 10:04
+     */
+    @Override
+    public IssueResultDTO detail(IssueDetailFormDTO issueDetail) {
+        //议题信息
+        IssueResultDTO issueResult = issueDao.issueDetail(issueDetail);
+        return issueResult;
+    }
+}

epmet-module/gov-issue/gov-issue-server/src/main/resources/db.migration/epmet_gov_issue.sql

@@ -206,4 +206,11 @@ CREATE TABLE `issue_vote_statistical_daily`  (
 
 SET FOREIGN_KEY_CHECKS = 1;
 
+-- @Date        2020-05-12 10:00
+-- @Author      wangc
+-- @Description 数据库epmet_gov_issue中的ISSUE_PROCESS(议题进展表)表新增一个字段，db语句：
+ALTER TABLE ISSUE_PROCESS ADD (
+  ORG_NAME varchar(128) NOT NULL COMMENT '议题当前处理进度所在的部门名称，因为有存储Id，无需担心部门之后有修改名称的可能'
+  );
+
 

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.IssueDao">
+
+    <resultMap type="com.epmet.entity.IssueEntity" id="issueMap">
+        <result property="id" column="ID"/>
+        <result property="issueStatus" column="ISSUE_STATUS"/>
+        <result property="sourceType" column="SOURCE_TYPE"/>
+        <result property="sourceId" column="SOURCE_ID"/>
+        <result property="closeReason" column="CLOSE_REASON"/>
+        <result property="resolveType" column="RESOLVE_TYPE"/>
+        <result property="issueTitle" column="ISSUE_TITLE"/>
+        <result property="suggestion" column="SUGGESTION"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="gridId" column="GRID_ID"/>
+        <result property="orgIdPath" column="ORG_ID_PATH"/>
+        <result property="orgId" column="ORG_ID"/>
+        <result property="votingDeadline" column="VOTING_DEADLINE"/>
+        <result property="decidedTime" column="DECIDED_TIME"/>
+        <result property="shiftedTime" column="SHIFTED_TIME"/>
+        <result property="closedTime" column="CLOSED_TIME"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+    <!-- 议题详情 -->
+    <select id="issueDetail" parameterType="com.epmet.dto.form.IssueDetailFormDTO" resultType="com.epmet.dto.result.IssueResultDTO">
+        SELECT
+            issue_title AS issueTitle,
+            issue_status AS issueStatus,
+            suggestion AS issueSuggestion,
+            grid_id AS belongsGridName,
+            created_by AS issueInitiator
+        FROM
+            issue
+        WHERE
+            id = #{IssueId}
+            AND del_flag = 0
+    </select>
+
+</mapper>

epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueProcessDao.xml → epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProcessDao.xml

@@ -9,6 +9,7 @@
         <result property="issueStatus" column="ISSUE_STATUS"/>
         <result property="orgType" column="ORG_TYPE"/>
         <result property="orgId" column="ORG_ID"/>
+        <result property="orgName" column="ORG_NAME"/>
         <result property="operationExplain" column="OPERATION_EXPLAIN"/>
         <result property="delFlag" column="DEL_FLAG"/>
         <result property="revision" column="REVISION"/>

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/BelongGridNameFormDTO.java

@@ -0,0 +1,23 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 查询所属网格
+ * @CreateTime 2020/5/11 9:36
+ */
+@Data
+public class BelongGridNameFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BelongGridNameResultDTO.java

@@ -0,0 +1,21 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @CreateTime 2020/5/11 18:30
+ */
+@Data
+public class BelongGridNameResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -5513674274570554563L;
+
+    /**
+     * 所属网格(网格所属机关单位名称-网格名称)
+     */
+    private String BelongsGridName;
+
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java

@@ -26,6 +26,7 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.CustomerGridDTO;
+import com.epmet.dto.form.BelongGridNameFormDTO;
 import com.epmet.dto.form.SelectGridNameByGridIdFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.dto.form.CustomerGridFormDTO;
@@ -182,4 +183,15 @@ public class CustomerGridController {
         return customerGridService.getGridListByGridIds(gridIdList);
     }
 
+    /**
+     * @Description  获取所属网格
+     * @param formDTO
+     * @author zxc
+     * @date 2020/5/11 18:37
+     */
+    @PostMapping("getgridnamebygridid")
+    public Result<BelongGridNameResultDTO> getGridNameByGridId(@RequestBody BelongGridNameFormDTO formDTO){
+        return new Result<BelongGridNameResultDTO>().ok(customerGridService.getGridNameByGridId(formDTO));
+    }
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java

@@ -19,11 +19,8 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.*;
-import com.epmet.dto.form.ListCustomerGridFormDTO;
+import com.epmet.dto.form.*;
-import com.epmet.dto.form.SelectGridNameByGridIdFormDTO;
 import com.epmet.dto.result.*;
-import com.epmet.dto.form.CustomerGridFormDTO;
-import com.epmet.dto.form.DeleteGridFormDTO;
 import com.epmet.dto.result.CustomerGridForStrangerResultDTO;
 import com.epmet.entity.CustomerGridEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -155,4 +152,12 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
      * @Author sun
      */
     List<AllGridsByUserIdResultDTO> selectGridByIds(@Param("gridIdList") List<String> gridIdList);
+
+    /**
+     * @Description  获取所属网格
+     * @param formDTO
+     * @author zxc
+     * @date 2020/5/11 18:50
+     */
+    BelongGridNameResultDTO getGridNameByGridId(BelongGridNameFormDTO formDTO);
 }