From 0fd9dfab35e6bc88a9c57c9f6c17677ba1f702b0 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Fri, 12 Dec 2025 11:56:50 +0800 Subject: [PATCH] =?UTF-8?q?feat(oa):=20=E6=B7=BB=E5=8A=A0=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E5=8F=82=E6=95=B0=E6=A0=BC=E5=BC=8F=E5=8C=96=E6=94=AF?= =?UTF-8?q?=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 为startTime和endTime参数添加@JsonFormat注解 - 为startTime和endTime参数添加@DateTimeFormat注解 - 设置日期格式为"yyyy-MM-dd" - 设置时区为"GMT+8" --- .../oa/controller/dashboard/OaWorkshopReportController.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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)); }