diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/dashboard/OaWorkshopReportController.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/dashboard/OaWorkshopReportController.java index 432c3a6..45c002a 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/dashboard/OaWorkshopReportController.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/dashboard/OaWorkshopReportController.java @@ -1,11 +1,13 @@ package com.ruoyi.oa.controller.dashboard; +import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.oa.domain.vo.dashboard.OaWorkshopReportSummaryVo; import com.ruoyi.oa.service.IOaWorkshopReportService; import lombok.RequiredArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -25,8 +27,8 @@ public class OaWorkshopReportController extends BaseController { private final IOaWorkshopReportService workshopReportService; @GetMapping("/summary") - public R summary(@RequestParam(required = false) Date startTime, - @RequestParam(required = false) Date endTime) { + public R summary(@RequestParam(required = false) @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd") Date startTime, + @RequestParam(required = false) @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { return R.ok(workshopReportService.summary(startTime, endTime)); }