Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexOriginExtractServiceImpl.java

@@ -88,7 +88,7 @@ public class IndexOriginExtractServiceImpl implements IndexOriginExtractService
         threadPool.submit(() -> {
             try {
                 long startCpc = System.currentTimeMillis();
-                //calCpcIndexService.calCpcPartyAbility(customerId, monthId);
+                calCpcIndexService.calCpcPartyAbility(customerId, monthId);
                 log.error("党员相关-党建能力执行完毕======总耗时:{}ms，customerId:{}",System.currentTimeMillis()-startCpc, param.getCustomerId());
             } catch (Exception e) {
                 log.error("抽取【党员相关数据】发生异常,参数:" + JSON.toJSONString(param), e);

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

@@ -131,12 +131,12 @@ public class IssueVoteDetailServiceImpl extends BaseServiceImpl<IssueVoteDetailD
     public void vote(VoteFormDTO formDTO) {
         IssueVoteDetailEntity entity = new IssueVoteDetailEntity();
         BeanUtils.copyProperties(formDTO,entity);
-        VoteRedisFormDTO redisData = issueVoteDetailRedis.get(formDTO.getIssueId());
+        VoteRedisFormDTO redisData = issueVoteDetailRedis.getVoteStatistical(formDTO.getIssueId());
         if (redisData==null){
             VoteRedisFormDTO voteRedisFormDTO = new VoteRedisFormDTO();
             voteRedisFormDTO.setIssueId(formDTO.getIssueId());
             issueVoteDetailRedis.set(voteRedisFormDTO);
-            redisData = issueVoteDetailRedis.get(formDTO.getIssueId());
+            redisData = voteRedisFormDTO;
         }
         redisData.setIssueId(formDTO.getIssueId());
         if (formDTO.getAttitude().equals(IssueConstant.SUPPORT)){

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

@@ -163,7 +163,7 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
                 voteResultDTO.setVoteFlag(false);
             } else {
                 voteResultDTO.setVoteFlag(true);
-                VoteRedisFormDTO redisData = issueVoteDetailRedis.get(issueId.getIssueId());
+                VoteRedisFormDTO redisData = issueVoteDetailRedis.getVoteStatistical(issueId.getIssueId());
                 voteResultDTO.setVoteType(voteStatus);
                 voteResultDTO.setSupportCount(redisData.getSupportAmount());
                 voteResultDTO.setOppositionCount(redisData.getOppositionAmount());
@@ -181,7 +181,7 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
     @Override
     public VotingTrendResultDTO votingTrend(IssueIdFormDTO issueId) {
         //缓存获取议题表决详情
-        VoteRedisFormDTO voteRedisFormDTO = issueVoteDetailRedis.get(issueId.getIssueId());
+        VoteRedisFormDTO voteRedisFormDTO = issueVoteDetailRedis.getVoteStatistical(issueId.getIssueId());
         VotingTrendResultDTO votingTrendResultDTO = new VotingTrendResultDTO();
         BeanUtils.copyProperties(voteRedisFormDTO, votingTrendResultDTO);
         votingTrendResultDTO.setRealityVoteCount(voteRedisFormDTO.getSupportAmount() + voteRedisFormDTO.getOppositionAmount());