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

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java

@@ -903,6 +903,7 @@ public class DemoController {
                 ScreenCentralZoneDataFormDTO formDTO = new ScreenCentralZoneDataFormDTO();
                 formDTO.setCustomerId(customerId);
                 formDTO.setDateId(dateId);
+                formDTO.setProjectId(param.getProjectId());
                 screenProjectSettleService.extractScreenData(formDTO);
             });
         }

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

@@ -255,6 +255,8 @@ public class IssueVoteDetailServiceImpl extends BaseServiceImpl<IssueVoteDetailD
         VoteRedisFormDTO voteRedisFormDTO = this.selectIssueVotingDetail(formDTO);
         IssueVoteStatisticalDTO dto = ConvertUtils.sourceToTarget(voteRedisFormDTO, IssueVoteStatisticalDTO.class);
         dto.setVotableCount(voteRedisFormDTO.getShouldVoteCount());
+        dto.setSupportCount(voteRedisFormDTO.getSupportAmount());
+        dto.setOppositionCount(voteRedisFormDTO.getOppositionAmount());
         issueVoteStatisticalDao.updateBtIssueId(dto);
     }