From 75f43781dc4e7ea7296f171b887a436065389ce9 Mon Sep 17 00:00:00 2001
From: zxc <954985706@qq.com>
Date: Wed, 20 May 2020 13:37:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=95=E7=A5=A8=E6=97=A5=E6=9C=9F=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/PolyLineDTO.java                | 2 +-
 .../com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java | 2 +-
 .../src/main/resources/mapper/IssueVoteStatisticalDao.xml       | 2 +-
 .../src/main/java/com/epmet/dto/PolyLineDTO.java                | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/PolyLineDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/PolyLineDTO.java
index 975971e403..6c7960d26b 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/PolyLineDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/PolyLineDTO.java
@@ -17,7 +17,7 @@ public class PolyLineDTO implements Serializable {
     /**
      * 投票日期
      */
-    private Long voteDtae;
+    private Long voteDate;
 
     /**
      * 当日赞成票数量
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 daccc0f384..dffee0edc1 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
@@ -172,7 +172,7 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
         votingTrendResultDTO.setRealityVoteCount(voteRedisFormDTO.getSupportAmount()+voteRedisFormDTO.getOppositionAmount());
         List<PolyLineDTO> polyLineDTOS = issueVoteStatisticalDao.polyLineData(issueId);
         PolyLineDTO polyLineDTO = new PolyLineDTO();
-        polyLineDTO.setVoteDtae(LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8")));
+        polyLineDTO.setVoteDate(LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8")));
         //今天刚转项目或刚刚关闭，当天数据DB没有，直接从缓存拿
         if (polyLineDTOS.size()==NumConstant.ZERO){
             polyLineDTO.setSupportIncrement(voteRedisFormDTO.getSupportAmount());
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 3d35fea463..c12c1ab45b 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
@@ -58,7 +58,7 @@
     <!-- 获取折线每天的支持、反对数量 (按时间正序) -->
     <select id="polyLineData" parameterType="com.epmet.dto.form.IssueIdFormDTO" resultType="com.epmet.dto.PolyLineDTO">
         SELECT
-            UNIX_TIMESTAMP(statistical_date) AS voteDtae,
+            UNIX_TIMESTAMP(statistical_date) AS voteDate,
             support_increment AS supportIncrement,
             opposition_increment AS oppositionIncrement
         FROM
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/PolyLineDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/PolyLineDTO.java
index 838dfbad15..fc800d4d6e 100644
--- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/PolyLineDTO.java
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/PolyLineDTO.java
@@ -18,7 +18,7 @@ public class PolyLineDTO implements Serializable {
     /**
      * 投票日期
      */
-    private Long voteDtae;
+    private Long voteDate;
 
     /**
      * 当日赞成票数量