lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改站班会日期查询

Browse Source
This commit is contained in:
lcj
2025-08-30 03:58:37 +08:00
parent 5d643fbc6a
commit b44de3ff49
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/teammeeting/HseTeamMeetingQueryReq.java
View File

@ -1,11 +1,10 @@
package org.dromara.safety.domain.dto.teammeeting; package org.dromara.safety.domain.dto.teammeeting;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.time.LocalDate;
import java.util.List; import java.util.List;
/** /**
@ -41,8 +40,7 @@ public class HseTeamMeetingQueryReq implements Serializable {
/** /**
* 开会时间 * 开会时间
*/ */
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") private LocalDate meetingDate;
private Date meetingDate;
/** /**
* 宣讲人 * 宣讲人

3
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseTeamMeetingServiceImpl.java
View File

@ -35,6 +35,7 @@ import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDate;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -274,7 +275,7 @@ public class HseTeamMeetingServiceImpl extends ServiceImpl<HseTeamMeetingMapper,
Long projectId = req.getProjectId(); Long projectId = req.getProjectId();
Long teamId = req.getTeamId(); Long teamId = req.getTeamId();
Long contractorId = req.getContractorId(); Long contractorId = req.getContractorId();
Date meetingDate = req.getMeetingDate(); LocalDate meetingDate = req.getMeetingDate();
Long compereId = req.getCompereId(); Long compereId = req.getCompereId();
List<String> participantIdList = req.getParticipantIdList(); List<String> participantIdList = req.getParticipantIdList();
String content = req.getContent(); String content = req.getContent();