From 862970e81190fd65a9df71ee91b5ff3a7e047db0 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 28 Dec 2021 13:44:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E5=86=B3=E4=B8=AD=E8=AE=AE=E9=A2=98?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E2=80=94=E2=80=94=E6=94=AF=E6=8C=81=E3=80=81?=
 =?UTF-8?q?=E5=8F=8D=E5=AF=B9=E6=95=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/result/VoteResultDTO.java    |  9 +++++++--
 .../impl/IssueVoteStatisticalServiceImpl.java  | 18 +++++++++++++++++-
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/VoteResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/VoteResultDTO.java
index 99f4e6d1cd..50a77215bf 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/VoteResultDTO.java
+++ b/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 = "";
+    }
 }
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 449f52eb50..4c90eb6981 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
@@ -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;
     }