diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/DailyStatisticalVoteJobResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/DailyStatisticalVoteJobResultDTO.java index 60199aa0fd..7bb45f5a4e 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/DailyStatisticalVoteJobResultDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/DailyStatisticalVoteJobResultDTO.java @@ -4,6 +4,7 @@ import com.epmet.commons.tools.constant.NumConstant; import lombok.Data; import java.io.Serializable; +import java.util.Date; /** * @Author zxc @@ -20,7 +21,7 @@ public class DailyStatisticalVoteJobResultDTO implements Serializable { /** * 统计日期 */ - private String statisticalDate; + private Date statisticalDate; /** * 到该日的总赞成数 diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteStatisticalDailyController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteStatisticalDailyController.java index 108e477862..1d4128ace9 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteStatisticalDailyController.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteStatisticalDailyController.java @@ -100,7 +100,7 @@ public class IssueVoteStatisticalDailyController { * @date 2020.05.20 15:39 **/ @PostMapping(value = "dailystatisticalvotejob") - public Result dailyStatisticalVoteJob(DailyStatisticalVoteJob form){ + public Result dailyStatisticalVoteJob(@RequestBody DailyStatisticalVoteJob form){ // issueVoteStatisticalDailyService.countVotingDailyStatistic(); issueVoteStatisticalDailyService.countVotingDailyStatisticNew(form); return new Result(); diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteDetailDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteDetailDao.xml index d501921aa5..def42fc563 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteDetailDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteDetailDao.xml @@ -199,7 +199,7 @@ COUNT(CASE WHEN vd.ATTITUDE = 'opposition' THEN 1 END) AS oppositionIncrement, COUNT(CASE WHEN vd.ATTITUDE = 'support' THEN 1 END) AS supportCount, COUNT(CASE WHEN vd.ATTITUDE = 'support' THEN 1 END) AS supportIncrement, - #{dateId} AS statisticalDate + str_to_date(#{dateId},'%Y-%m-%d') AS statisticalDate FROM issue_vote_detail vd WHERE vd.DEL_FLAG = '0' AND vd.CUSTOMER_ID = #{customerId}