From b44de3ff4959502557c7637f58384a07f7c69044 Mon Sep 17 00:00:00 2001
From: lcj <2331845269@qq.com>
Date: Sat, 30 Aug 2025 03:58:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AB=99=E7=8F=AD=E4=BC=9A?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/dto/teammeeting/HseTeamMeetingQueryReq.java      | 6 ++----
 .../safety/service/impl/HseTeamMeetingServiceImpl.java      | 3 ++-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/teammeeting/HseTeamMeetingQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/teammeeting/HseTeamMeetingQueryReq.java
index f576a425..1527990e 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/teammeeting/HseTeamMeetingQueryReq.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/teammeeting/HseTeamMeetingQueryReq.java
@@ -1,11 +1,10 @@
 package org.dromara.safety.domain.dto.teammeeting;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDate;
 import java.util.List;
 
 /**
@@ -41,8 +40,7 @@ public class HseTeamMeetingQueryReq implements Serializable {
     /**
      * 开会时间
      */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
-    private Date meetingDate;
+    private LocalDate meetingDate;
 
     /**
      * 宣讲人
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseTeamMeetingServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseTeamMeetingServiceImpl.java
index 4c91e9e5..4f8ca3c3 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseTeamMeetingServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseTeamMeetingServiceImpl.java
@@ -35,6 +35,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDate;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -274,7 +275,7 @@ public class HseTeamMeetingServiceImpl extends ServiceImpl<HseTeamMeetingMapper,
         Long projectId = req.getProjectId();
         Long teamId = req.getTeamId();
         Long contractorId = req.getContractorId();
-        Date meetingDate = req.getMeetingDate();
+        LocalDate meetingDate = req.getMeetingDate();
         Long compereId = req.getCompereId();
         List<String> participantIdList = req.getParticipantIdList();
         String content = req.getContent();