From d4db1ccea38686ebe308bafd759ac62f4c55c51c Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Thu, 21 May 2020 10:07:28 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E6=B7=BB=E5=8A=A0/=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E4=BA=BA=E5=91=98=E5=8E=BB=E9=99=A4=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/IssueVoteDetailService.java  | 18 ++++++++++++++++++
 .../impl/IssueVoteDetailServiceImpl.java       | 10 ++++++++++
 .../IssueVoteStatisticalDailyServiceImpl.java  |  2 +-
 .../service/impl/CustomerGridServiceImpl.java  |  3 +++
 4 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteDetailService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteDetailService.java
index e62b795bbb..ea15c4f305 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteDetailService.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteDetailService.java
@@ -109,4 +109,22 @@ public interface IssueVoteDetailService extends BaseService<IssueVoteDetailEntit
      * @author zxc
      */
     JoinVoteResultDTO joinVote(CheckVoteFormDTO checkVoteFormDTO);
+
+    /**
+     * @Description 将所有表决中的投票数从缓存同步到数据库，要进行数据对比，若数据一致无需更新
+     * @param
+     * @return
+     * @author wangc
+     * @date 2020.05.21 09:07
+    **/
+    void syncVotingCacheToDb();
+
+    /**
+     * @Description 对指定的issueId的议题表决统计数缓存与Db同步
+     * @param issueId
+     * @return
+     * @author wangc
+     * @date 2020.05.21 09:09
+    **/
+    void syncVotingCacheToDbByIssueId(String issueId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java
index c5274d4ad2..52db0edb05 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java
@@ -187,4 +187,14 @@ public class IssueVoteDetailServiceImpl extends BaseServiceImpl<IssueVoteDetailD
         return resultDTO;
     }
 
+    @Override
+    public void syncVotingCacheToDb() {
+
+    }
+
+    @Override
+    public void syncVotingCacheToDbByIssueId(String issueId) {
+
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalDailyServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalDailyServiceImpl.java
index adea467e4e..f751546313 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalDailyServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalDailyServiceImpl.java
@@ -202,7 +202,7 @@ public class IssueVoteStatisticalDailyServiceImpl extends BaseServiceImpl<IssueV
                         }
                     }
                 }
-                //遍历完List之后，检查是否有因为昨日未表决过某钟态度而漏掉昨日之前的表决信息
+                //遍历完List之后，检查是否有因为昨日未表决过某种态度而漏掉昨日之前的表决信息
                 if(null != existedInfo){
                     if(null == dailyStatisticalToUpdate.getOppositionCount()){
                         //昨日无人反对该议题
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
index 341af37278..c49dba30d7 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
@@ -413,6 +413,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
         CustomerGridEntity gridMsg =
                 baseDao.selectById(gridId);
         //2.校验权限
+        /*
         if(null != gridMsg && StringUtils.isNotBlank(gridMsg.getId()) && StringUtils.equals(gridMsg.getDelFlag(),NumConstant.ZERO_STR)){
             CommonUserFormDTO userParam = new CommonUserFormDTO();
             userParam.setCustomerId(gridMsg.getCustomerId());
@@ -436,6 +437,8 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
             log.error(ModuleConstant.GRID_INFO_NOT_FOUND);
         }
         return new Result<CustomerGridEntity>().error();
+        */
+         return new Result<CustomerGridEntity>().ok(gridMsg);
     }