From 1b77c2724e38d087f3eab4a2f27b3b165f4265dc Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 25 五月 2026 14:37:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_tide' into dev_tide
---
src/main/java/com/ruoyi/safety/service/impl/SafetyTrainingRecordServiceImpl.java | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/safety/service/impl/SafetyTrainingRecordServiceImpl.java b/src/main/java/com/ruoyi/safety/service/impl/SafetyTrainingRecordServiceImpl.java
new file mode 100644
index 0000000..f858cba
--- /dev/null
+++ b/src/main/java/com/ruoyi/safety/service/impl/SafetyTrainingRecordServiceImpl.java
@@ -0,0 +1,36 @@
+package com.ruoyi.safety.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.safety.mapper.SafetyTrainingRecordMapper;
+import com.ruoyi.safety.pojo.SafetyTrainingRecord;
+import com.ruoyi.safety.service.SafetyTrainingRecordService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class SafetyTrainingRecordServiceImpl
+ extends SafetyBaseServiceImpl<SafetyTrainingRecordMapper, SafetyTrainingRecord>
+ implements SafetyTrainingRecordService {
+
+ @Override
+ public IPage<SafetyTrainingRecord> queryPage(Page<SafetyTrainingRecord> page, SafetyTrainingRecord query) {
+ QueryWrapper<SafetyTrainingRecord> wrapper =
+ new QueryWrapper<SafetyTrainingRecord>().orderByDesc("create_time");
+ if (query != null) {
+ if (query.getPlanId() != null) {
+ wrapper.eq("plan_id", query.getPlanId());
+ }
+ if (query.getEmployeeId() != null) {
+ wrapper.eq("employee_id", query.getEmployeeId());
+ }
+ if (hasText(query.getEmployeeName())) {
+ wrapper.like("employee_name", query.getEmployeeName());
+ }
+ if (query.getStatus() != null) {
+ wrapper.eq("status", query.getStatus());
+ }
+ }
+ return page(page, wrapper);
+ }
+}
--
Gitblit v1.9.3