From 4acdc123444d1871862a28cc89c6f7679faf8a59 Mon Sep 17 00:00:00 2001
From: zxc <954985706@qq.com>
Date: Thu, 28 May 2020 10:23:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E8=AF=A6=E6=83=85=E6=8A=98?=
 =?UTF-8?q?=E7=BA=BF=E5=9B=BE=E6=B7=BB=E5=8A=A0=E4=B8=80=E7=9B=B4=E8=A1=A8?=
 =?UTF-8?q?=E5=86=B3=E4=B8=AD=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/IssueVoteStatisticalServiceImpl.java     | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

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 71cd3fa895..0228410a92 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
@@ -185,7 +185,7 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
             polyLineDTO.setOppositionIncrement(voteRedisFormDTO.getOppositionAmount());
             polyLineDTOS.add(polyLineDTO);
         } else {
-            //折线数据=DB，今天之前转成的议题，今天 “已转项目”或“已结案”
+            //折线数据=DB+Redis，今天之前转成的议题，今天 “已转项目”或“已结案”
             if (date.equals(LocalDate.now().toString())) {
                 Integer yesterdaySupport = NumConstant.ZERO;
                 Integer yesterdayOppose = NumConstant.ZERO;
@@ -197,6 +197,19 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
                 polyLineDTO.setOppositionIncrement(voteRedisFormDTO.getOppositionAmount() == NumConstant.ZERO ? NumConstant.ZERO : voteRedisFormDTO.getOppositionAmount() - yesterdayOppose);
                 polyLineDTOS.add(polyLineDTO);
             }
+            //从古至今一直在表决中
+            IssueEntity issueEntity = issueDao.selectById(issueId.getIssueId());
+            if (issueEntity.getIssueStatus().equals(IssueConstant.ISSUE_VOTING)){
+                Integer yesterdaySupport = NumConstant.ZERO;
+                Integer yesterdayOppose = NumConstant.ZERO;
+                for (PolyLineDTO lineDTO : polyLineDTOS) {
+                    yesterdaySupport += lineDTO.getSupportIncrement();
+                    yesterdayOppose += lineDTO.getOppositionIncrement();
+                }
+                polyLineDTO.setSupportIncrement(voteRedisFormDTO.getSupportAmount() == NumConstant.ZERO ? NumConstant.ZERO : voteRedisFormDTO.getSupportAmount() - yesterdaySupport);
+                polyLineDTO.setOppositionIncrement(voteRedisFormDTO.getOppositionAmount() == NumConstant.ZERO ? NumConstant.ZERO : voteRedisFormDTO.getOppositionAmount() - yesterdayOppose);
+                polyLineDTOS.add(polyLineDTO);
+            }
         }
         //今天之前 “已转项目”或“已关闭”
         votingTrendResultDTO.setPolyLine(polyLineDTOS);