Merge remote-tracking branch 'origin/dev_issue_project' into dev

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;
 
     /**
      * 当日赞成票数量

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());

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

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;
 
     /**
      * 当日赞成票数量