From 0c0f18b533fc41c9ae08595d987604784446dfcc Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Thu, 26 Nov 2020 10:23:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E5=8F=82=E4=B8=8E=E7=9A=84=E8=AE=AE?=
 =?UTF-8?q?=E9=A2=98-=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/result/MyPartIssuesResultDTO.java     | 20 +++++++++++++++++++
 .../impl/IssueVoteStatisticalServiceImpl.java |  4 +++-
 .../resources/mapper/IssueVoteDetailDao.xml   |  8 +++++---
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/MyPartIssuesResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/MyPartIssuesResultDTO.java
index fdce22e8f2..a4ac9b1b9e 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/MyPartIssuesResultDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/MyPartIssuesResultDTO.java
@@ -1,6 +1,7 @@
 package com.epmet.dto.result;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -10,6 +11,7 @@ import java.io.Serializable;
  * @DateTime 2020/11/10 9:50 上午
  */
 @Data
+@AllArgsConstructor
 public class MyPartIssuesResultDTO implements Serializable {
 
     private static final long serialVersionUID = 2081387920547808112L;
@@ -38,4 +40,22 @@ public class MyPartIssuesResultDTO implements Serializable {
 
     @JsonIgnore
     private String gridId;
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null || getClass() != obj.getClass()) {
+            return false;
+        }
+        MyPartIssuesResultDTO u = (MyPartIssuesResultDTO)obj;
+        return issueId.equals(u.issueId);
+     }
+
+    @Override
+     public int hashCode() {
+        String in = issueId;
+        return in.hashCode();
+     }
 }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
index d995c8166a..02940a5168 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
@@ -563,8 +563,10 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
         if (CollectionUtils.isEmpty(myPartIssuesResult)){
             return new ArrayList<>();
         }
+        Set<MyPartIssuesResultDTO> set = new HashSet<>(myPartIssuesResult);
+        myPartIssuesResult = new ArrayList<>(set);
         List<MyPartIssuesResultDTO> collect = myPartIssuesResult.stream().sorted(Comparator.comparing(MyPartIssuesResultDTO::getShiftIssueTime).reversed()).distinct().collect(Collectors.toList());
-        List<String> orgIds = collect.stream().map(m -> m.getGridId()).collect(Collectors.toList());
+        List<String> orgIds = collect.stream().map(MyPartIssuesResultDTO::getGridId).collect(Collectors.toList());
         Result<List<AllGridsByUserIdResultDTO>> listResult = govOrgOpenFeignClient.getGridListByGridIds(orgIds);
         if (!listResult.success()){
             throw new RenException("查询议题来源网格名称失败......");
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteDetailDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteDetailDao.xml
index d5f4e8bc80..2368211d6f 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteDetailDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteDetailDao.xml
@@ -73,7 +73,7 @@
     </select>
 
     <!-- 个人中心-我参与的议题列表 -->
-    <select id="myPartIssues" resultType="com.epmet.dto.result.MyPartIssuesResultDTO">
+      <select id="myPartIssues" resultType="com.epmet.dto.result.MyPartIssuesResultDTO">
         SELECT
             vd.ISSUE_ID,
             i.SUGGESTION,
@@ -85,6 +85,9 @@
         WHERE i.DEL_FLAG = '0'
               AND vd.DEL_FLAG = '0'
               AND vd.CREATED_BY = #{userId}
+              <foreach collection="topicIds" item="topicId" open="AND  (" separator="AND" close=")">
+                  i.SOURCE_ID != #{topicId}
+              </foreach>
               ORDER BY i.CREATED_TIME DESC
     </select>
 
@@ -97,8 +100,7 @@
             UNIX_TIMESTAMP(i.CREATED_TIME) AS shiftIssueTime
         FROM issue i
         WHERE i.DEL_FLAG = '0'
-              AND
-              <foreach collection="topicIds" item="topicId" separator=" OR ">
+              <foreach collection="topicIds" item="topicId" open="AND  (" separator="OR" close=")">
                   i.SOURCE_ID = #{topicId}
               </foreach>
         ORDER BY i.CREATED_TIME DESC