居民热议-已转项目列表

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/EvaluateInfoDTO.java

@@ -0,0 +1,26 @@
+package com.epmet.dataaggre.dto.govissue;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 评价信息
+ */
+@Data
+public class EvaluateInfoDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 评价内容
+     */
+    private String evaluateContent;
+
+    /**
+     * 满意度 - 不满意:bad、基本满意:good、非常满意:perfect
+     */
+    private String satisfaction;
+
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/IssueApplicationDTO.java

@@ -0,0 +1,133 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.dto.govissue;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 话题转议题申请表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-11-17
+ */
+@Data
+public class IssueApplicationDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 议题名称 
+     */
+	private String issueTitle;
+
+    /**
+     * 建议
+     */
+	private String suggestion;
+
+    /**
+     * 审核状态：under_auditing:待审核；approved:通过；rejected:驳回;自动通过：auto_passed
+     */
+	private String applyStatus;
+
+    /**
+     * 话题id
+     */
+	private String topicId;
+
+    /**
+     * 小组id
+     */
+	private String groupId;
+
+    /**
+     * 网格ID 居民端议题对应一个网格Id
+     */
+	private String gridId;
+
+    /**
+     * 审核通过后对应的 议题id
+     */
+	private String issueId;
+
+    /**
+     * 审核通过时填写的理由
+     */
+	private String passedReason;
+
+    /**
+     * 审批通过时工作人员id,自动通过此列不存储
+     */
+    private String approveStaffId;
+
+    /**
+     * 删除标识 0未删除、1已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间：第一次提交审核的时间，注意和历史表的第一条记录时间一致
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+	//拓展属性
+    /**
+     * 申请id
+     */
+    private String issueApplicationId;
+
+    /**
+     * 对应issue_application.UPDATED_TIME 对应的秒级时间戳
+     */
+    private Long latestTime;
+
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/IssueApplicationHistoryDTO.java

@@ -0,0 +1,110 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.dto.govissue;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 话题转议题审核历史表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-11-17
+ */
+@Data
+public class IssueApplicationHistoryDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 话题转议题申请表 issue_application.id
+     */
+	private String issueApplicationId;
+
+    /**
+     * under_auditing:待审核；
+     * approved:审核通过；
+     * rejected:驳回；
+     * auto_passed:自动通过
+     */
+	private String actionType;
+
+    /**
+     * 审核时的说明
+     */
+	private String reason;
+
+    /**
+     * 工作端人员姓名
+     */
+	private String staffName;
+
+    /**
+     * 删除标识：0 未删除 1已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人 提交人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 修改人ID
+     */
+	private String updatedBy;
+
+    /**
+     * 修改时间
+     */
+	private Date updatedTime;
+
+	//扩展属性
+    /**
+     * =id
+     */
+    private String historyId;
+
+    /**
+     * createdTime 对应时间戳
+     */
+    private Long operateTime;
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/IssueCustomerParameterDTO.java

@@ -0,0 +1,97 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.dto.govissue;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 议题客户参数定制表
+ *
+ * @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/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/IssueDTO.java

@@ -0,0 +1,163 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.dto.govissue;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 议题详情表
+ *
+ * @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;
+
+    /**
+     * 解决类型 【未关闭时可以为空】已解决resolved、未解决unresolved，对应在关闭议题时所选的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;
+
+    /**
+     * 转项目日期 （服务间调用日期一致性） 戳
+     */
+    private Long shiftedTimeStamp;
+
+    /**
+     * 关闭日期 戳
+     */
+    private Long closedTimeStamp;
+
+    /**
+     * 议题转项目后-对应的项目id
+     */
+    private String projectId;
+
+    private String issueId;
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/IssueProcessDTO.java

@@ -0,0 +1,102 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.dto.govissue;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 议题进展记录表
+ *
+ * @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/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/IssueProjectRelationDTO.java

@@ -0,0 +1,82 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.dto.govissue;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 议题项目关系表
+ *
+ * @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/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/IssueSatisfactionDetailDTO.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.dataaggre.dto.govissue;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 议题满意度调查记录表
+ *
+ * @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/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/IssueSatisfactionStatisticalDTO.java

@@ -0,0 +1,92 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.dto.govissue;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 议题满意度调查统计表
+ *
+ * @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/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/IssueSuggestionDTO.java

@@ -0,0 +1,97 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.dto.govissue;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 居民端用户对议题建议或意见表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-11-18
+ */
+@Data
+public class IssueSuggestionDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户Id customer.id
+     */
+	private String customerId;
+
+    /**
+     * 议题id
+     */
+	private String issueId;
+
+    /**
+     * 议题所属网格id
+     */
+	private String gridId;
+
+    /**
+     * 对议题的想法
+     */
+	private String suggestion;
+
+    /**
+     * 1公开;   0匿名
+     */
+	private Integer publicFlag;
+
+    /**
+     * 删除标识：0 未删除 1已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 提建议的人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 修改人ID
+     */
+	private String updatedBy;
+
+    /**
+     * 修改时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/IssueVoteDetailDTO.java

@@ -0,0 +1,82 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.dto.govissue;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 议题表决记录表
+ *
+ * @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/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/IssueVoteStatisticalDTO.java

@@ -0,0 +1,92 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.dto.govissue;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 议题表决统计表
+ *
+ * @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/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/IssueVoteStatisticalDailyDTO.java

@@ -0,0 +1,117 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.dto.govissue;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 议题表决按天统计表
+ *
+ * @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/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/PolyLineDTO.java

@@ -0,0 +1,32 @@
+package com.epmet.dataaggre.dto.govissue;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 投票折线数据
+ * @CreateTime 2020/5/11 9:36
+ */
+@Data
+public class PolyLineDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 投票日期
+     */
+    private Long voteDate;
+
+    /**
+     * 当日赞成票数量
+     */
+    private Integer supportIncrement;
+
+    /**
+     * 当日反对票数量
+     */
+    private Integer oppositionIncrement;
+
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/TopicInfoDTO.java

@@ -0,0 +1,43 @@
+package com.epmet.dataaggre.dto.govissue;
+
+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/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/form/ShiftProjectIssueListFormDTO.java

@@ -0,0 +1,37 @@
+package com.epmet.dataaggre.dto.govissue.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 议题-已转项目列表-接口入参
+ * @Auth sun
+ */
+@Data
+public class ShiftProjectIssueListFormDTO implements Serializable {
+    private static final long serialVersionUID = -436147374473316845L;
+    /**
+     * 机关组织Id
+     * */
+    @NotBlank(message = "组织Id不能为空", groups = {ShiftProjectIssueListFormDTO.VotingForm.class})
+    private String agencyId;
+    /**
+     * 页码
+     * */
+    @Min(1)
+    private Integer pageNo;
+    /**
+     * 每页多少条
+     * */
+    private Integer pageSize = 20;
+    /**
+     * 组织下网格Id集合
+     * */
+    private List<String> gridIdList;
+
+    public interface VotingForm{}
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/form/VotingIssueListFormDTO.java

@@ -8,7 +8,7 @@ import java.io.Serializable;
 import java.util.List;
 
 /**
- * @Description 议题-表决中列表-接口如此那
+ * @Description 议题-表决中列表-接口入参
  * @Auth sun
  */
 @Data

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/result/IssueShiftProjectResultDTO.java

@@ -0,0 +1,28 @@
+package com.epmet.dataaggre.dto.govissue.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 议题-已转项目列表-接口返参
+ * @Auth sun
+ */
+@Data
+public class IssueShiftProjectResultDTO implements Serializable {
+    private static final long serialVersionUID = -7134055957167447949L;
+
+    /**
+     * 议题Id
+     * */
+    private String issueId;
+    /**
+     * 议题标题
+     * */
+    private String issueTitle;
+    /**
+     * 实际总表决数
+     * */
+    private Integer count;
+
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/result/ShiftProjectIssueListResultDTO.java

@@ -0,0 +1,45 @@
+package com.epmet.dataaggre.dto.govissue.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 议题-已转项目列表-接口入参
+ * @Auth sun
+ */
+@Data
+public class ShiftProjectIssueListResultDTO implements Serializable {
+	private static final long serialVersionUID = -8616067919204282328L;
+	/**
+	 * 议题Id
+	 */
+	private String issueId;
+	/**
+	 * 议题标题
+	 */
+	private String issueTitle;
+	/**
+	 * 当前处理部门
+	 */
+	private List<String> departmentNameList;
+	/**
+	 * 转成项目时间
+	 */
+	private Long shiftedTime;
+	/**
+	 * 项目状态
+	 */
+	private String status;
+	/**
+	 * 结案说明
+	 */
+	private String closedReason;
+	/**
+	 * 实际总表决数
+	 */
+	private Integer count;
+
+
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectDTO.java

@@ -17,16 +17,18 @@
 
 package com.epmet.dataaggre.dto.govproject;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
+import java.util.List;
 
 
 /**
  * 项目表
  *
  * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-12-25
+ * @since v1.0.0 2020-05-11
  */
 @Data
 public class ProjectDTO implements Serializable {
@@ -68,6 +70,11 @@ public class ProjectDTO implements Serializable {
      */
 	private String status;
 
+	/**
+	 * 结案说明
+	 */
+	private String publicReply;
+
     /**
      * 结案状态：已解决 resolved，未解决 unresolved
      */
@@ -108,4 +115,8 @@ public class ProjectDTO implements Serializable {
      */
 	private Date updatedTime;
 
+	/**
+	 * 当前处理部门名称列表
+	 */
+	private List<String> currentDepartmentNameList;
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ShiftProjectResultDTO.java

@@ -0,0 +1,53 @@
+package com.epmet.dataaggre.dto.govproject.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/5/14 13:45
+ */
+@Data
+public class ShiftProjectResultDTO implements Serializable {
+
+	private static final long serialVersionUID = 4807330131467747264L;
+	/**
+	 * 唯一标识
+	 */
+	private String id;
+
+	/**
+	 * 来源ID
+	 */
+	private String originId;
+
+	/**
+	 * 项目标题
+	 */
+	private String title;
+
+	/**
+	 * 状态:待处理 pending，结案closed
+	 */
+	private String status;
+
+	/**
+	 * 结案说明
+	 */
+	private String publicReply;
+
+	/**
+	 * 创建时间
+	 */
+	private Date createdTime;
+
+	/**
+	 * 当前处理部门
+	 */
+	private List<String> departmentNameList;
+
+}

epmet-module/data-aggregator/data-aggregator-server/pom.xml

@@ -59,6 +59,12 @@
             <artifactId>epmet-commons-dynamic-datasource</artifactId>
             <version>2.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>gov-project-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovIssueController.java

@@ -5,8 +5,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.govissue.form.AllIssueFormDTO;
+import com.epmet.dataaggre.dto.govissue.form.ShiftProjectIssueListFormDTO;
 import com.epmet.dataaggre.dto.govissue.form.VotingIssueListFormDTO;
 import com.epmet.dataaggre.dto.govissue.result.AllIssueResultDTO;
+import com.epmet.dataaggre.dto.govissue.result.ShiftProjectIssueListResultDTO;
 import com.epmet.dataaggre.dto.govissue.result.VotingIssueListResultDTO;
 import com.epmet.dataaggre.service.govissue.GovIssueService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -53,4 +55,15 @@ public class GovIssueController {
         return new Result<List<VotingIssueListResultDTO>>().ok(govIssueService.votingIssueList(formDTO));
     }
 
+    /**
+     * @param fromDTO
+     * @Description 居民热议-已转项目列表
+     * @author sun
+     **/
+    @PostMapping("shiftprojectissuelist")
+    public Result<List<ShiftProjectIssueListResultDTO>> shiftProjectIssueList(@RequestBody ShiftProjectIssueListFormDTO fromDTO) {
+        ValidatorUtils.validateEntity(fromDTO, VotingIssueListFormDTO.VotingForm.class);
+        return new Result<List<ShiftProjectIssueListResultDTO>>().ok(govIssueService.shiftProjectIssueList(fromDTO));
+    }
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govissue/IssueDao.java

@@ -18,8 +18,10 @@
 package com.epmet.dataaggre.dao.govissue;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.dto.govissue.form.ShiftProjectIssueListFormDTO;
 import com.epmet.dataaggre.dto.govissue.form.VotingIssueListFormDTO;
 import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO;
+import com.epmet.dataaggre.dto.govissue.result.IssueShiftProjectResultDTO;
 import com.epmet.dataaggre.dto.govissue.result.VotingIssueListResultDTO;
 import com.epmet.dataaggre.entity.govissue.IssueEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -57,4 +59,11 @@ public interface IssueDao extends BaseDao<IssueEntity> {
      * @author sun
      **/
     List<VotingIssueListResultDTO> selectVotingList(VotingIssueListFormDTO formDTO);
+
+    /**
+     * @Description 根据组织ID查询议题Id集合
+     * @author sun
+     **/
+    List<IssueShiftProjectResultDTO> selectIssueListByGridIds(ShiftProjectIssueListFormDTO fromDTO);
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java

@@ -19,6 +19,7 @@ package com.epmet.dataaggre.dao.govproject;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO;
+import com.epmet.dataaggre.dto.govproject.ProjectDTO;
 import com.epmet.dataaggre.entity.govproject.ProjectEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -50,4 +51,16 @@ public interface ProjectDao extends BaseDao<ProjectEntity> {
      */
     List<IssueListResultDTO> selectProjectInfoPending(@Param("issueIds") List<String> issueIds);
 
+    /**
+     * @Description 根据议题Id集合查询项目数据
+     * @author sun
+     **/
+    List<ProjectDTO> selectShiftProjectList(@Param("issueIdList") List<String> issueIdList);
+
+    /**
+     * @Description 查询项目当前处理部门
+     * @author sun
+     **/
+    List<String> selectDepartmentNameList(ProjectDTO project);
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/GovIssueService.java

@@ -2,8 +2,10 @@ package com.epmet.dataaggre.service.govissue;
 
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dataaggre.dto.govissue.form.AllIssueFormDTO;
+import com.epmet.dataaggre.dto.govissue.form.ShiftProjectIssueListFormDTO;
 import com.epmet.dataaggre.dto.govissue.form.VotingIssueListFormDTO;
 import com.epmet.dataaggre.dto.govissue.result.AllIssueResultDTO;
+import com.epmet.dataaggre.dto.govissue.result.ShiftProjectIssueListResultDTO;
 import com.epmet.dataaggre.dto.govissue.result.VotingIssueListResultDTO;
 
 import java.util.List;
@@ -28,4 +30,11 @@ public interface GovIssueService {
      * @author sun
      **/
     List<VotingIssueListResultDTO> votingIssueList(VotingIssueListFormDTO formDTO);
+
+    /**
+     * @param fromDTO
+     * @Description 居民热议-已转项目列表
+     * @author sun
+     **/
+    List<ShiftProjectIssueListResultDTO> shiftProjectIssueList(ShiftProjectIssueListFormDTO fromDTO);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java

@@ -9,12 +9,12 @@ import com.epmet.dataaggre.constant.IssueConstant;
 import com.epmet.dataaggre.dao.govissue.IssueApplicationDao;
 import com.epmet.dataaggre.dao.govissue.IssueDao;
 import com.epmet.dataaggre.dto.govissue.form.AllIssueFormDTO;
+import com.epmet.dataaggre.dto.govissue.form.ShiftProjectIssueListFormDTO;
 import com.epmet.dataaggre.dto.govissue.form.VotingIssueListFormDTO;
-import com.epmet.dataaggre.dto.govissue.result.AllIssueResultDTO;
+import com.epmet.dataaggre.dto.govissue.result.*;
-import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO;
-import com.epmet.dataaggre.dto.govissue.result.VotingIssueListResultDTO;
 import com.epmet.dataaggre.dto.govorg.result.GridInfoResultDTO;
 import com.epmet.dataaggre.dto.govorg.result.GridsInfoListResultDTO;
+import com.epmet.dataaggre.dto.govproject.result.ShiftProjectResultDTO;
 import com.epmet.dataaggre.service.govissue.GovIssueService;
 import com.epmet.dataaggre.service.govorg.GovOrgService;
 import com.epmet.dataaggre.service.govproject.GovProjectService;
@@ -199,7 +199,7 @@ public class GovIssueServiceImpl implements GovIssueService {
 
         //2.查询网格列表下表决中的议题列表
         resultList = issueDao.selectVotingList(formDTO);
-        if(resultList.size()<NumConstant.ONE){
+        if (null == resultList || resultList.size() < NumConstant.ONE) {
             return new ArrayList<>();
         }
 
@@ -214,4 +214,40 @@ public class GovIssueServiceImpl implements GovIssueService {
         return resultList;
     }
 
+    /**
+     * @param fromDTO
+     * @Description 居民热议-已转项目列表
+     * @author sun
+     **/
+    @Override
+    public List<ShiftProjectIssueListResultDTO> shiftProjectIssueList(ShiftProjectIssueListFormDTO fromDTO) {
+        List<ShiftProjectIssueListResultDTO> resultList = new ArrayList<>();
+        int pageIndex = (fromDTO.getPageNo() - NumConstant.ONE) * fromDTO.getPageSize();
+        fromDTO.setPageNo(pageIndex);
+        //1.查询组织下议题列表数据
+        List<IssueShiftProjectResultDTO> issueList = issueDao.selectIssueListByGridIds(fromDTO);
+        if (null == issueList || issueList.size() < NumConstant.ONE) {
+            return resultList;
+        }
+
+        //2.查询议题对应项目数据
+        List<String> issueIds = issueList.stream().map(IssueShiftProjectResultDTO::getIssueId).collect(Collectors.toList());
+        List<ShiftProjectResultDTO> projectList = govProjectService.getProjectByIssue(issueIds);
+
+        //3.遍历封装数据并返回
+        resultList = issueList.stream().flatMap(issue -> projectList.stream().filter(p -> issue.getIssueId().equals(p.getOriginId())).map(project -> {
+            ShiftProjectIssueListResultDTO shiftProject = new ShiftProjectIssueListResultDTO();
+            shiftProject.setIssueId(issue.getIssueId());
+            shiftProject.setIssueTitle(issue.getIssueTitle());
+            shiftProject.setCount(issue.getCount());
+            shiftProject.setDepartmentNameList(project.getDepartmentNameList());
+            shiftProject.setClosedReason(project.getPublicReply());
+            shiftProject.setShiftedTime(project.getCreatedTime().getTime() / NumConstant.ONE_THOUSAND);
+            shiftProject.setStatus(project.getStatus());
+            return shiftProject;
+        })).collect(Collectors.toList());
+
+        return resultList;
+    }
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java

@@ -1,6 +1,7 @@
 package com.epmet.dataaggre.service.govproject;
 
 import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO;
+import com.epmet.dataaggre.dto.govproject.result.ShiftProjectResultDTO;
 
 import java.util.List;
 
@@ -18,4 +19,11 @@ public interface GovProjectService {
      */
     List<IssueListResultDTO> selectProjectInfo(List<String> issueIds);
 
+    /**
+     * @Description 根据议题Id集合查询项目数据
+     * @author sun
+     **/
+    List<ShiftProjectResultDTO> getProjectByIssue(List<String> issueIdList);
+
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java

@@ -1,9 +1,12 @@
 package com.epmet.dataaggre.service.govproject.impl;
 
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.govproject.ProjectDao;
 import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO;
+import com.epmet.dataaggre.dto.govproject.ProjectDTO;
+import com.epmet.dataaggre.dto.govproject.result.ShiftProjectResultDTO;
 import com.epmet.dataaggre.service.govproject.GovProjectService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -47,4 +50,22 @@ public class GovProjectServiceImpl implements GovProjectService {
         closedResult.addAll(pendingResult);
         return closedResult;
     }
+
+    /**
+     * @Description 根据议题Id集合查询项目数据
+     * @author sun
+     **/
+    @Override
+    public List<ShiftProjectResultDTO> getProjectByIssue(List<String> issueIdList) {
+        List<ShiftProjectResultDTO> resultList = new ArrayList<>();
+        List<ProjectDTO> projectList = projectDao.selectShiftProjectList(issueIdList);
+        projectList.forEach(project -> {
+            ShiftProjectResultDTO shiftProject = ConvertUtils.sourceToTarget(project, ShiftProjectResultDTO.class);
+            List<String> departmentNameList = projectDao.selectDepartmentNameList(project);
+            shiftProject.setDepartmentNameList(departmentNameList);
+            resultList.add(shiftProject);
+        });
+        return resultList;
+    }
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml

@@ -58,4 +58,19 @@
             #{pageNo}, #{pageSize}
     </select>
 
+    <select id="selectIssueListByGridIds" resultType="com.epmet.dataaggre.dto.govissue.result.IssueShiftProjectResultDTO">
+        SELECT
+            i.id AS "issueId",,
+            i.issue_title AS "issueTitle",
+            ( SELECT count(id) FROM issue_vote_detail WHERE del_flag = '0' AND issue_id = i.id ) AS "count"
+        FROM
+            issue i
+        WHERE
+            i.del_flag = '0'
+        AND i.issue_status = 'shift_project'
+        ORDER BY
+            count DESC
+        LIMIT #{pageNo}, #{pageSize}
+    </select>
+
 </mapper>

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml

@@ -47,4 +47,44 @@
                 p.ORIGIN_ID = #{issueId}
             </foreach>
     </select>
+
+    <select id="selectShiftProjectList" resultType="com.epmet.dataaggre.dto.govproject.ProjectDTO">
+        SELECT
+        p.*,
+        IFNULL(pp.public_reply, "") AS publicReply
+        FROM
+        project p
+        LEFT JOIN
+        (SELECT
+        project_id,
+        public_reply
+        FROM
+        project_process
+        WHERE
+        del_flag = '0'
+        AND operation = 'close'
+        ) pp ON p.id = pp.project_id
+        WHERE
+        p.del_flag = '0'
+        AND p.origin = 'issue'
+        <foreach item="issueId" collection="issueIdList" separator="OR" open="AND (" close=")" index="">
+            p.origin_id = #{issueId}
+        </foreach>
+        ORDER BY
+        created_time ASC
+    </select>
+
+    <select id="selectDepartmentNameList" resultType="java.lang.String">
+        SELECT DISTINCT
+            department_name
+        FROM
+            project p
+        INNER JOIN project_staff ps ON p.id = ps.project_id
+        WHERE
+            p.del_flag = '0'
+        AND ps.del_flag = '0'
+        AND ps.is_handle = 'unhandled'
+        AND p.id = #{id}
+    </select>
+
 </mapper>