议题列表表决中的议题表决修改

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/AllIssueListResultDTO.java

@@ -3,6 +3,7 @@ package com.epmet.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Author zxc
@@ -57,4 +58,7 @@ public class AllIssueListResultDTO implements Serializable {
      * 来源类型 话题：resi_topic；直接立议题：issue；事件：ic_event
      */
     private String sourceType;
+
+    private Date decidedTime;
+    private Date votingDeadline;
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@@ -83,10 +83,13 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.time.LocalDate;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
+import static com.epmet.commons.tools.utils.DateUtils.DATE_PATTERN;
+
 /**
  * @Author zxc
  * @CreateTime 2020/5/11 9:46
@@ -2068,6 +2071,17 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         }
         if (CollectionUtils.isNotEmpty(result.getList())){
             for (AllIssueListResultDTO l : result.getList()) {
+                if (l.getIssueStatus().equals(ModuleConstants.ISSUE_STATUS_VOTING)){
+                    String endDate = null == l.getVotingDeadline() ?
+                            DateUtils.format(new Date(),DATE_PATTERN) :
+                            DateUtils.format(l.getVotingDeadline(),DATE_PATTERN);
+                    String today = LocalDate.now().toString();
+                    if (today.equals(endDate)){
+                        PolyLineDTO polyLineDTO = issueVoteDetailDao.polyLineData(l.getIssueId(), endDate);
+                        l.setSupportCount(l.getSupportCount() + polyLineDTO.getSupportIncrement());
+                        l.setOppositionCount(l.getOppositionCount() + polyLineDTO.getOppositionIncrement());
+                    }
+                }
                 GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(l.getGridId());
                 if(null == gridInfo){
                     logger.warn("查询网格信息失败："+l.getGridId());

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml

@@ -894,8 +894,10 @@
             i.ORG_ID,
             i.CREATED_TIME,
             i.suggestion,
-            vs.support_count,
-            vs.OPPOSITION_COUNT
+            ifnull(vs.support_count,0) AS supportCount,
+            ifnull(vs.OPPOSITION_COUNT,0) AS oppositionCount,
+            i.VOTING_DEADLINE,
+            i.DECIDED_TIME
         FROM issue i
         LEFT JOIN issue_vote_statistical vs ON vs.ISSUE_ID = i.ID AND vs.DEL_FLAG = '0'
         WHERE i.DEL_FLAG = '0'