From 4d6f51294c63be0744cd22966e2a9f4b92d71068 Mon Sep 17 00:00:00 2001
From: zxc <954985706@qq.com>
Date: Thu, 28 May 2020 16:53:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=98=E7=BA=BF=E5=9B=BE=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/IssueVoteStatisticalServiceImpl.java | 20 ++++---------------
 .../mapper/IssueVoteStatisticalDao.xml        |  4 ++--
 2 files changed, 6 insertions(+), 18 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..8878391a99 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
@@ -187,27 +187,15 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
         } else {
             //折线数据=DB+Redis，今天之前转成的议题，今天 “已转项目”或“已结案”
             if (date.equals(LocalDate.now().toString())) {
-                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);
+                polyLineDTO.setSupportIncrement(voteRedisFormDTO.getSupportAmount());
+                polyLineDTO.setOppositionIncrement(voteRedisFormDTO.getOppositionAmount());
                 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);
+                polyLineDTO.setSupportIncrement(voteRedisFormDTO.getSupportAmount());
+                polyLineDTO.setOppositionIncrement(voteRedisFormDTO.getOppositionAmount());
                 polyLineDTOS.add(polyLineDTO);
             }
         }
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..1618af7e6c 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
@@ -59,8 +59,8 @@
     <select id="polyLineData" parameterType="com.epmet.dto.form.IssueIdFormDTO" resultType="com.epmet.dto.PolyLineDTO">
         SELECT
             UNIX_TIMESTAMP(statistical_date) AS voteDate,
-            support_increment AS supportIncrement,
-            opposition_increment AS oppositionIncrement
+            support_count AS supportIncrement,
+            opposition_count AS oppositionIncrement
         FROM
             issue_vote_statistical_daily
         WHERE