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/SafetyEquipmentServiceImpl.java | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/safety/service/impl/SafetyEquipmentServiceImpl.java b/src/main/java/com/ruoyi/safety/service/impl/SafetyEquipmentServiceImpl.java
new file mode 100644
index 0000000..40fc090
--- /dev/null
+++ b/src/main/java/com/ruoyi/safety/service/impl/SafetyEquipmentServiceImpl.java
@@ -0,0 +1,34 @@
+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.SafetyEquipmentMapper;
+import com.ruoyi.safety.pojo.SafetyEquipment;
+import com.ruoyi.safety.service.SafetyEquipmentService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class SafetyEquipmentServiceImpl extends SafetyBaseServiceImpl<SafetyEquipmentMapper, SafetyEquipment>
+ implements SafetyEquipmentService {
+
+ @Override
+ public IPage<SafetyEquipment> queryPage(Page<SafetyEquipment> page, SafetyEquipment query) {
+ QueryWrapper<SafetyEquipment> wrapper = new QueryWrapper<SafetyEquipment>().orderByDesc("create_time");
+ if (query != null) {
+ if (hasText(query.getName())) {
+ wrapper.like("name", query.getName());
+ }
+ if (hasText(query.getModel())) {
+ wrapper.like("model", query.getModel());
+ }
+ if (query.getAreaId() != null) {
+ wrapper.eq("area_id", query.getAreaId());
+ }
+ if (query.getStatus() != null) {
+ wrapper.eq("status", query.getStatus());
+ }
+ }
+ return page(page, wrapper);
+ }
+}
--
Gitblit v1.9.3