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/SafetyTrainingMaterialServiceImpl.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 50 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/safety/service/impl/SafetyTrainingMaterialServiceImpl.java b/src/main/java/com/ruoyi/safety/service/impl/SafetyTrainingMaterialServiceImpl.java
new file mode 100644
index 0000000..2ee4e6c
--- /dev/null
+++ b/src/main/java/com/ruoyi/safety/service/impl/SafetyTrainingMaterialServiceImpl.java
@@ -0,0 +1,50 @@
+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.SafetyTrainingMaterialMapper;
+import com.ruoyi.safety.pojo.SafetyTrainingMaterial;
+import com.ruoyi.safety.service.SafetyTrainingMaterialService;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+
+@Service
+public class SafetyTrainingMaterialServiceImpl
+ extends SafetyBaseServiceImpl<SafetyTrainingMaterialMapper, SafetyTrainingMaterial>
+ implements SafetyTrainingMaterialService {
+
+ @Override
+ public IPage<SafetyTrainingMaterial> queryPage(Page<SafetyTrainingMaterial> page,
+ SafetyTrainingMaterial query) {
+ QueryWrapper<SafetyTrainingMaterial> wrapper =
+ new QueryWrapper<SafetyTrainingMaterial>().orderByDesc("create_time");
+ if (query != null) {
+ if (hasText(query.getName())) {
+ wrapper.like("name", query.getName());
+ }
+ if (hasText(query.getType())) {
+ wrapper.eq("type", query.getType());
+ }
+ if (query.getStatus() != null) {
+ wrapper.eq("status", query.getStatus());
+ }
+ }
+ return page(page, wrapper);
+ }
+
+ @Override
+ public boolean saveSafety(SafetyTrainingMaterial entity) {
+ if (entity.getUploadTime() == null) {
+ entity.setUploadTime(LocalDateTime.now());
+ }
+ if (!hasText(entity.getUploader())) {
+ entity.setUploader(currentUsername());
+ }
+ if (entity.getUploaderId() == null) {
+ entity.setUploaderId(currentUserId());
+ }
+ return super.saveSafety(entity);
+ }
+}
--
Gitblit v1.9.3