议题详情折线图添加一直表决中的情况

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