diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java index bdbf47bc78..c6334dd86e 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java @@ -148,4 +148,15 @@ public interface IssueVoteStatisticalService extends BaseService imp //5:缓存中网格下表决中的议题总数减1 govIssueRedis.subtractWorkGrassrootsIssueRedDotValue(entity.getGridId()); + try { + issueVoteStatisticalService.syncVotingCacheToDbByParams(formDTO.getIssueId(),entity.getGridId(),null); + }catch (RenException e){ + logger.error(e.getMsg()); + } } /** @@ -581,6 +586,11 @@ public class IssueServiceImpl extends BaseServiceImpl imp //6:缓存中网格下表决中的议题总数减1 govIssueRedis.subtractWorkGrassrootsIssueRedDotValue(entity.getGridId()); + try{ + issueVoteStatisticalService.syncVotingCacheToDbByParams(formDTO.getIssueId(),entity.getGridId(),null); + }catch(RenException e){ + logger.error(e.getMsg()); + } } /** 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 320138bfc5..60b0aabbc3 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 @@ -252,7 +252,7 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl issues = issueDao.selectIssueIdsByCondition(issueParam); - if(null == issues || issues.size()< NumConstant.ONE){ + if(null == issues || issues.isEmpty()){ return; } Set ids = issues.stream().map(IssueDTO::getId).collect(Collectors.toSet()); @@ -285,9 +285,7 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl listToUpdate = new ArrayList<>(); setVotableCountsAndUpdateCache(listToUpdate, existedIds.stream().flatMap(existedId -> issues.stream().filter(issue -> - StringUtils.equals(issue.getId(),existedId)).map(issueDTO -> { - return issueDTO; - })).collect(Collectors.toSet()), + StringUtils.equals(issue.getId(),existedId))).collect(Collectors.toSet()), votableCountMap); // 批量更新listToUpdate @@ -417,8 +415,10 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl votableCount = + resiGroupFeignClient.votableCount(gridParam); + if(votableCount.success() && null != votableCount.getData()){ + toUpd.setVotableCount(votableCount.getData()); + } + + if(StringUtils.isNotBlank(statisticalId)){ + toUpd.setId(statisticalId); + update(toUpd); + }else{ + IssueVoteStatisticalDTO existedStatistical = getByIssueId(issueId); + if(null != existedStatistical && StringUtils.isNotBlank(existedStatistical.getId())){ + toUpd.setId(existedStatistical.getId()); + update(toUpd); + } + } + + } + /** * @Description 遍历应表决数 * @param list - List | Set | Map