|
|
@ -129,6 +129,9 @@ public class IssueServiceImpl implements IssueService { |
|
|
|
@Override |
|
|
|
public VotingTrendResultDTO votingTrend(IssueIdFormDTO issueId) { |
|
|
|
Result<VotingTrendResultDTO> votingTrendResultDTOResult = govIssueFeignClient.votingTrend(issueId); |
|
|
|
if (!votingTrendResultDTOResult.success()){ |
|
|
|
throw new RenException("查询议题表决折线图失败"); |
|
|
|
} |
|
|
|
return votingTrendResultDTOResult.getData(); |
|
|
|
} |
|
|
|
|
|
|
@ -172,7 +175,11 @@ public class IssueServiceImpl implements IssueService { |
|
|
|
GridIdFormDTO gridIdFormDTO = new GridIdFormDTO(); |
|
|
|
gridIdFormDTO.setGridId(gridId.getGridId()); |
|
|
|
gridIdFormDTO.setUserId(tokenDto.getUserId()); |
|
|
|
CheckJoinTeamResultDTO check = resiGroupFeignClient.checkjointeam(gridIdFormDTO).getData(); |
|
|
|
Result<CheckJoinTeamResultDTO> checkJoinTeam = resiGroupFeignClient.checkjointeam(gridIdFormDTO); |
|
|
|
if (!checkJoinTeam.success()){ |
|
|
|
throw new RenException("查询校验用户是否加入小组失败"); |
|
|
|
} |
|
|
|
CheckJoinTeamResultDTO check = checkJoinTeam.getData(); |
|
|
|
//未加入小组
|
|
|
|
if (check.getVoteAuthorization()==false){ |
|
|
|
voteResultDTOResult.setVoteFlag(false); |
|
|
@ -180,7 +187,11 @@ public class IssueServiceImpl implements IssueService { |
|
|
|
voteResultDTOResult.setOppositionCount(NumConstant.ZERO); |
|
|
|
voteResultDTOResult.setSupportCount(NumConstant.ZERO); |
|
|
|
}else { |
|
|
|
voteResultDTOResult = govIssueFeignClient.voteCount(issueId).getData(); |
|
|
|
Result<VoteResultDTO> voteResult = govIssueFeignClient.voteCount(issueId); |
|
|
|
if (!voteResult.success()){ |
|
|
|
throw new RenException("查询表决中议题详情——支持、反对数失败"); |
|
|
|
} |
|
|
|
voteResultDTOResult = voteResult.getData(); |
|
|
|
voteResultDTOResult.setVoteAuthorization(check.getVoteAuthorization()); |
|
|
|
} |
|
|
|
return voteResultDTOResult; |
|
|
|