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/SafetyTrainingPlanServiceImpl.java | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/safety/service/impl/SafetyTrainingPlanServiceImpl.java b/src/main/java/com/ruoyi/safety/service/impl/SafetyTrainingPlanServiceImpl.java
new file mode 100644
index 0000000..37eb4ac
--- /dev/null
+++ b/src/main/java/com/ruoyi/safety/service/impl/SafetyTrainingPlanServiceImpl.java
@@ -0,0 +1,35 @@
+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.SafetyTrainingPlanMapper;
+import com.ruoyi.safety.pojo.SafetyTrainingPlan;
+import com.ruoyi.safety.service.SafetyTrainingPlanService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class SafetyTrainingPlanServiceImpl
+ extends SafetyBaseServiceImpl<SafetyTrainingPlanMapper, SafetyTrainingPlan>
+ implements SafetyTrainingPlanService {
+
+ @Override
+ public IPage<SafetyTrainingPlan> queryPage(Page<SafetyTrainingPlan> page, SafetyTrainingPlan query) {
+ QueryWrapper<SafetyTrainingPlan> wrapper = new QueryWrapper<SafetyTrainingPlan>().orderByDesc("create_time");
+ if (query != null) {
+ if (hasText(query.getYear())) {
+ wrapper.eq("`year`", query.getYear());
+ }
+ if (hasText(query.getPost())) {
+ wrapper.like("post", query.getPost());
+ }
+ if (hasText(query.getLevel())) {
+ wrapper.eq("`level`", query.getLevel());
+ }
+ if (query.getStatus() != null) {
+ wrapper.eq("status", query.getStatus());
+ }
+ }
+ return page(page, wrapper);
+ }
+}
--
Gitblit v1.9.3