From 4df79724ef94f193e5360d57ab6c7d8fd2e57ac8 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 25 Nov 2020 19:06:41 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E5=AE=89=E5=85=A8=20?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=89=8B=E6=9C=BA=E5=8F=B7=E4=B8=8D=E8=BF=94?= =?UTF-8?q?=E5=9B=9Enull?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/UserBaseInfoDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBaseInfoDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBaseInfoDao.xml index 276e11a1ac..260fe0db93 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBaseInfoDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBaseInfoDao.xml @@ -78,7 +78,7 @@ REAL_NAME realName, ID_NUM idNum, GENDER gender, - MOBILE mobile, + IFNULL(MOBILE,'') mobile, STREET street, DISTRICT district, BUILDING_ADDRESS buildingAddress, From 0c0f18b533fc41c9ae08595d987604784446dfcc Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 26 Nov 2020 10:23:27 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=88=91=E5=8F=82=E4=B8=8E=E7=9A=84?= =?UTF-8?q?=E8=AE=AE=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(); } + Set set = new HashSet<>(myPartIssuesResult); + myPartIssuesResult = new ArrayList<>(set); List collect = myPartIssuesResult.stream().sorted(Comparator.comparing(MyPartIssuesResultDTO::getShiftIssueTime).reversed()).distinct().collect(Collectors.toList()); - List orgIds = collect.stream().map(m -> m.getGridId()).collect(Collectors.toList()); + List orgIds = collect.stream().map(MyPartIssuesResultDTO::getGridId).collect(Collectors.toList()); Result> 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 vd.ISSUE_ID, i.SUGGESTION, @@ -85,6 +85,9 @@ WHERE i.DEL_FLAG = '0' AND vd.DEL_FLAG = '0' AND vd.CREATED_BY = #{userId} + + i.SOURCE_ID != #{topicId} + ORDER BY i.CREATED_TIME DESC @@ -97,8 +100,7 @@ UNIX_TIMESTAMP(i.CREATED_TIME) AS shiftIssueTime FROM issue i WHERE i.DEL_FLAG = '0' - AND - + i.SOURCE_ID = #{topicId} ORDER BY i.CREATED_TIME DESC From 890a7ebbb6f77c0b50311e230f487ae738a01192 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 26 Nov 2020 10:44:01 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=88=91=E5=8F=82=E4=B8=8E=E7=9A=84?= =?UTF-8?q?=E8=AE=AE=E9=A2=98-=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dao/IssueVoteDetailDao.java | 2 +- .../service/impl/IssueVoteStatisticalServiceImpl.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java index e1779a1720..50b8ebda99 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java @@ -81,7 +81,7 @@ public interface IssueVoteDetailDao extends BaseDao { * @author zxc * @date 2020/11/10 10:01 上午 */ - List myPartIssues(@Param("userId")String userId); + List myPartIssues(@Param("userId")String userId, @Param("topicIds")List topicIds); List myPartIssuesByTopicId(@Param("topicIds")List topicIds); } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java index 02940a5168..1bd165b71b 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 @@ -549,16 +549,17 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl myPartIssues(MyPartIssuesFormDTO myPartIssuesFormDTO) { - List myPartIssuesResult = issueVoteDetailDao.myPartIssues(myPartIssuesFormDTO.getUserId()); + List myPartIssuesResult = new ArrayList<>(); MyPartIssueFormDTO formDTO = new MyPartIssueFormDTO(); formDTO.setUserId(myPartIssuesFormDTO.getUserId()); Result myPartIssueResult = resiGroupOpenFeignClient.selectMyPartTopic(formDTO); if (!myPartIssueResult.success()){ throw new RenException("查询我评论过的话题失败......"); } + myPartIssuesResult = issueVoteDetailDao.myPartIssues(myPartIssuesFormDTO.getUserId(), myPartIssueResult.getData().getTopicIds()); if (!CollectionUtils.isEmpty(myPartIssueResult.getData().getTopicIds())){ - List myPartIssuesResultDTOS = issueVoteDetailDao.myPartIssuesByTopicId(myPartIssueResult.getData().getTopicIds()); - myPartIssuesResult.addAll(myPartIssuesResultDTOS); + List myPartIssues = issueVoteDetailDao.myPartIssuesByTopicId(myPartIssueResult.getData().getTopicIds()); + myPartIssuesResult.addAll(myPartIssues); } if (CollectionUtils.isEmpty(myPartIssuesResult)){ return new ArrayList<>(); From ad62ec98c75a5e9a285190a6e43a1941dad100eb Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 26 Nov 2020 10:53:02 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=88=91=E5=8F=82=E4=B8=8E=E7=9A=84?= =?UTF-8?q?=E8=AE=AE=E9=A2=98-=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1bd165b71b..ca9959395d 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 @@ -556,8 +556,8 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl myPartIssues = issueVoteDetailDao.myPartIssuesByTopicId(myPartIssueResult.getData().getTopicIds()); myPartIssuesResult.addAll(myPartIssues); } From c0eca257d73998bfc1c983fcc4a5324f258e323e Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 26 Nov 2020 10:56:19 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=88=91=E5=8F=82=E4=B8=8E=E7=9A=84?= =?UTF-8?q?=E8=AE=AE=E9=A2=98-=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IssueVoteStatisticalServiceImpl.java | 2 +- .../src/main/resources/mapper/IssueVoteDetailDao.xml | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) 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 ca9959395d..1bd165b71b 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 @@ -556,8 +556,8 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl myPartIssues = issueVoteDetailDao.myPartIssuesByTopicId(myPartIssueResult.getData().getTopicIds()); myPartIssuesResult.addAll(myPartIssues); } 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 2368211d6f..f0d4ec2069 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 @@ -85,9 +85,11 @@ WHERE i.DEL_FLAG = '0' AND vd.DEL_FLAG = '0' AND vd.CREATED_BY = #{userId} - - i.SOURCE_ID != #{topicId} - + + + i.SOURCE_ID != #{topicId} + + ORDER BY i.CREATED_TIME DESC From 0aef44d2d9a70c985976db9eff15e5fd6bc39ba3 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 26 Nov 2020 13:52:54 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=88=91=E5=8F=82=E4=B8=8E=E7=9A=84?= =?UTF-8?q?=E8=AE=AE=E9=A2=98-=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/result/MyPartIssuesResultDTO.java | 2 -- 1 file changed, 2 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 a4ac9b1b9e..7e04a6a07c 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,7 +1,6 @@ package com.epmet.dto.result; import com.fasterxml.jackson.annotation.JsonIgnore; -import lombok.AllArgsConstructor; import lombok.Data; import java.io.Serializable; @@ -11,7 +10,6 @@ import java.io.Serializable; * @DateTime 2020/11/10 9:50 上午 */ @Data -@AllArgsConstructor public class MyPartIssuesResultDTO implements Serializable { private static final long serialVersionUID = 2081387920547808112L; From 851c9687b9e9d6e6b11255407acb538189ed4a12 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 26 Nov 2020 14:28:13 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E6=88=91=E5=8F=82=E4=B8=8E=E7=9A=84?= =?UTF-8?q?=E8=AE=AE=E9=A2=98-=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IssueVoteStatisticalServiceImpl.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) 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 1bd165b71b..fc8a5138de 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 @@ -45,6 +45,7 @@ import com.epmet.feign.ResiGroupFeignClient; import com.epmet.redis.IssueVoteDetailRedis; import com.epmet.redis.IssueVoteStatisticalRedis; import com.epmet.resi.group.dto.topic.form.MyPartIssueFormDTO; +import com.epmet.resi.group.dto.topic.form.TopicIdListFormDTO; import com.epmet.resi.group.dto.topic.result.MyPartIssueResultDTO; import com.epmet.resi.group.feign.ResiGroupOpenFeignClient; import com.epmet.service.IssueVoteDetailService; @@ -550,13 +551,23 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl myPartIssues(MyPartIssuesFormDTO myPartIssuesFormDTO) { List myPartIssuesResult = new ArrayList<>(); + //我创建的话题 + TopicIdListFormDTO topicIdListFormDTO = new TopicIdListFormDTO(); + topicIdListFormDTO.setUserId(myPartIssuesFormDTO.getUserId()); + Result> myCreateIssueResult = resiGroupOpenFeignClient.selectMyCreateTopic(topicIdListFormDTO); + if (!myCreateIssueResult.success()){ + throw new RenException("查询我创建的话题失败......"); + } + //我参与的议题 + myPartIssuesResult = issueVoteDetailDao.myPartIssues(myPartIssuesFormDTO.getUserId(), myCreateIssueResult.getData()); + //我参与的话题 MyPartIssueFormDTO formDTO = new MyPartIssueFormDTO(); formDTO.setUserId(myPartIssuesFormDTO.getUserId()); Result myPartIssueResult = resiGroupOpenFeignClient.selectMyPartTopic(formDTO); if (!myPartIssueResult.success()){ throw new RenException("查询我评论过的话题失败......"); } - myPartIssuesResult = issueVoteDetailDao.myPartIssues(myPartIssuesFormDTO.getUserId(), myPartIssueResult.getData().getTopicIds()); + //我参与的话题转了议题的 if (!CollectionUtils.isEmpty(myPartIssueResult.getData().getTopicIds())){ List myPartIssues = issueVoteDetailDao.myPartIssuesByTopicId(myPartIssueResult.getData().getTopicIds()); myPartIssuesResult.addAll(myPartIssues);