From e23fc068d8c4f15be36c880432516885e5e3441f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 19 Nov 2020 11:04:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9resi/hall/issue/detail?= =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=8C=E6=96=B0=E5=A2=9E=E8=BF=94=E5=8F=82?= =?UTF-8?q?attitude?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/JoinVoteResultDTO.java | 4 ++++ .../impl/IssueVoteDetailServiceImpl.java | 19 ++++++++++++++++--- .../dto/result/IssueDetailResultDTO.java | 5 +++++ .../epmet/dto/result/JoinVoteResultDTO.java | 4 ++++ .../epmet/service/impl/IssueServiceImpl.java | 10 ++++++++-- 5 files changed, 37 insertions(+), 5 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/JoinVoteResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/JoinVoteResultDTO.java index 86ceda5aef..42ee2ecd47 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/JoinVoteResultDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/JoinVoteResultDTO.java @@ -17,4 +17,8 @@ public class JoinVoteResultDTO implements Serializable { */ private Boolean joinVote; + /** + * 态度 - opposition（反对）support（赞成） 如果已投票，此列有值 + */ + private String attitude; } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java index 56d3e30f3a..386f5521ef 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java @@ -17,16 +17,16 @@ package com.epmet.service.impl; -import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.constant.IssueConstant; import com.epmet.dao.IssueDao; import com.epmet.dao.IssueVoteDetailDao; @@ -179,11 +179,24 @@ public class IssueVoteDetailServiceImpl extends BaseServiceImpl NumConstant.ZERO || issuePublisher > NumConstant.ZERO || publisherResult.getCheckTopicPublisher() > NumConstant.ZERO){ resultDTO.setJoinVote(true); }else { resultDTO.setJoinVote(false); + }*/ + IssueVoteDetailDTO issueVoteDetailDTO=baseDao.selectUserIssueDet(checkVoteFormDTO.getUserId(),checkVoteFormDTO.getIssueId()); + if(null!=issueVoteDetailDTO){ + resultDTO.setJoinVote(true); + resultDTO.setAttitude(issueVoteDetailDTO.getAttitude()); + return resultDTO; + } + if (issuePublisher > NumConstant.ZERO || publisherResult.getCheckTopicPublisher() > NumConstant.ZERO){ + resultDTO.setJoinVote(true); + resultDTO.setAttitude(StrConstant.EPMETY_STR); + }else { + resultDTO.setJoinVote(false); + resultDTO.setAttitude(StrConstant.EPMETY_STR); } return resultDTO; } diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java index f1c2ee1f83..295522ae79 100644 --- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java +++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java @@ -69,4 +69,9 @@ public class IssueDetailResultDTO implements Serializable { * true已发表过想法，false未发表想法 */ private Boolean publishIdeaFlag; + + /** + * 态度 - opposition（反对）support（赞成） + */ + private String attitude; } diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/JoinVoteResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/JoinVoteResultDTO.java index 86ceda5aef..42ee2ecd47 100644 --- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/JoinVoteResultDTO.java +++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/JoinVoteResultDTO.java @@ -17,4 +17,8 @@ public class JoinVoteResultDTO implements Serializable { */ private Boolean joinVote; + /** + * 态度 - opposition（反对）support（赞成） 如果已投票，此列有值 + */ + private String attitude; } diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 09275542f6..64e1268adc 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -87,8 +87,14 @@ public class IssueServiceImpl implements IssueService { CheckVoteFormDTO formDTO = new CheckVoteFormDTO(); formDTO.setIssueId(issueDetail.getIssueId()); formDTO.setUserId(tokenDto.getUserId()); - JoinVoteResultDTO data = govIssueFeignClient.joinVote(formDTO).getData(); - issueDetailResult.setJoinVote(data.getJoinVote()); + Result joinVoteResultDTOResult=govIssueFeignClient.joinVote(formDTO); + if(joinVoteResultDTOResult.success()&&null!=joinVoteResultDTOResult.getData()){ + issueDetailResult.setJoinVote(joinVoteResultDTOResult.getData().getJoinVote()); + issueDetailResult.setAttitude(joinVoteResultDTOResult.getData().getAttitude()); + }else{ + issueDetailResult.setJoinVote(false); + issueDetailResult.setAttitude(StrConstant.EPMETY_STR); + } if (issueDetailResult.getIssueStatus().equals(HallConstat.SHIFT_PROJECT)){ //校验项目是否结案 IssueIdFormDTO issueId = new IssueIdFormDTO();