表决中议题详情——支持、反对数修改

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/VoteResultDTO.java

@@ -1,5 +1,6 @@
 package com.epmet.dto.result;
 
+import com.epmet.commons.tools.constant.NumConstant;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -31,7 +32,11 @@ public class VoteResultDTO implements Serializable {
     /**
      *  支持：support    反对：oppose
      */
-    private String voteType = "";
+    private String voteType;
-
 
+    public VoteResultDTO() {
+        this.supportCount = NumConstant.ZERO;
+        this.oppositionCount = NumConstant.ZERO;
+        this.voteType = "";
+    }
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java

@@ -155,7 +155,7 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
      * @Description 表决中议题详情——支持、反对数
      * @author zxc
      */
-    @Override
+    /*@Override
     public VoteResultDTO voteCount(TokenDto tokenDto, IssueIdFormDTO issueId) {
         VoteResultDTO voteResultDTO = issueVoteStatisticalDao.voteCount(issueId);
         //校验是否已经投票
@@ -172,6 +172,22 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
             }
         }
         return voteResultDTO;
+    }*/
+    @Override
+    public VoteResultDTO voteCount(TokenDto tokenDto, IssueIdFormDTO issueId) {
+        VoteResultDTO result = new VoteResultDTO();
+        //校验是否已经投票
+        String voteStatus = issueVoteStatisticalDao.checkVote(issueId.getIssueId(), tokenDto.getUserId());
+        VoteRedisFormDTO redisData = issueVoteDetailRedis.getVoteStatistical(issueId.getIssueId());
+        if (StringUtils.isBlank(voteStatus)) {
+            result.setVoteFlag(false);
+        } else {
+            result.setVoteFlag(true);
+            result.setVoteType(voteStatus);
+            result.setSupportCount(redisData.getSupportAmount());
+            result.setOppositionCount(redisData.getOppositionAmount());
+        }
+        return result;
     }