From c0924b34d0914b126dbac36cdd1abb5de18be122 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Thu, 28 May 2020 19:04:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6job=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/IssueVoteStatisticalServiceImpl.java | 27 ++++++++++++++++---
 .../mapper/IssueVoteStatisticalDao.xml        |  4 +--
 2 files changed, 26 insertions(+), 5 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 bb94a9a620..ffbffc1b89 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
@@ -43,6 +43,7 @@ import com.epmet.feign.EpmetUserFeignClient;
 import com.epmet.feign.ResiGroupFeignClient;
 import com.epmet.redis.IssueVoteDetailRedis;
 import com.epmet.redis.IssueVoteStatisticalRedis;
+import com.epmet.service.IssueVoteDetailService;
 import com.epmet.service.IssueVoteStatisticalService;
 import com.epmet.utils.ModuleConstants;
 import org.apache.commons.lang3.StringUtils;
@@ -83,6 +84,8 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
     private IssueVoteDetailDao issueVoteDetailDao;
     @Autowired
     private ResiGroupFeignClient resiGroupFeignClient;
+    @Autowired
+    private IssueVoteDetailService issueVoteDetailService;
 
     @Override
     public PageData<IssueVoteStatisticalDTO> page(Map<String, Object> params) {
@@ -477,9 +480,14 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
             String k = entry.getKey();
             List<IssueDTO> v = entry.getValue();
             for(IssueDTO issue : v){
+                //TODO 待删除
+                Integer a = issueVoteDetailService.getVotingCount(issue.getId(),IssueConstant.SUPPORT);
+                //TODO 待删除
+                Integer b = issueVoteDetailService.getVotingCount(issue.getId(),IssueConstant.OPPOSE);
+
                 IssueVoteStatisticalDTO vote = new IssueVoteStatisticalDTO();
                 vote.setIssueId(issue.getId());
-                VoteRedisFormDTO cache = issueVoteDetailRedis.get(issue.getId());
+                VoteRedisFormDTO cache = issueVoteDetailRedis.getVoteStatistical(issue.getId());
                 if(null == cache)
                     continue;
                 if(StringUtils.isBlank(cache.getIssueId())) cache.setIssueId(issue.getId());
@@ -491,10 +499,23 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
                         NumConstant.ZERO :
                         null == votableCountMap.get(k) ? NumConstant.ZERO : votableCountMap.get(k)
                 );
+                //TODO 待删除
+                vote.setSupportCount(a);
+                //TODO 待删除
+                vote.setOppositionCount(b);
                 list.add(vote);
-                if(cache.getShouldVoteCount() != vote.getVotableCount()){
+
+                //TODO 待删除
+                cache.setOppositionAmount(vote.getOppositionCount());
+                //TODO 待删除
+                cache.setSupportAmount(vote.getSupportCount());
+                //TODO 待恢复
+                //if(cache.getShouldVoteCount() != vote.getVotableCount()){
+                cache.setShouldVoteCount(vote.getVotableCount());
+                cache.setIssueId(issue.getId());
                     issueVoteDetailRedis.set(cache);
-                }
+                //TODO 待恢复
+                //}
             }
         }
 
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml
index ac039d7cd0..425d58695b 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml
@@ -194,7 +194,7 @@
             <trim prefix="votable_count =(case" suffix="end),">
                 <foreach collection="list" item="item">
                     <if test='null != item.votableCount'>
-                        when id = #{item.id} then #{item.votableCount}
+                        when issue_id = #{item.issueId} then #{item.votableCount}
                     </if>
                 </foreach>
             </trim>
@@ -202,7 +202,7 @@
             <trim prefix="del_flag =(case" suffix="end),">
                 <foreach collection="list" item="item">
                     <if test='null != item.delFlag'>
-                        when id = #{item.id} then #{item.delFlag}
+                        when issue_id = #{item.issueId} then #{item.delFlag}
                     </if>
                 </foreach>
             </trim>