From 675af262e4e511c9a240d9c1fa3332d1dc8d0c42 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 13 一月 2026 13:15:37 +0800
Subject: [PATCH] 1.工时管理：辅助工时编辑后录入人姓名变成编辑人问题修复 2.外购下单：标签打印功能调整 3.人员：培训计划导入导出添加【培训大类】字段 4.业务管理：报检新增【物料属性】字段选择，其余页面添加【物料属性】查询条件以及数据回显
---
cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceMaintenanceMapper.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceMaintenanceMapper.java b/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceMaintenanceMapper.java
index 0297885..e538a31 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceMaintenanceMapper.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceMaintenanceMapper.java
@@ -1,20 +1,26 @@
package com.ruoyi.device.mapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.device.excel.DeviceMaintenanceExport;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.device.dto.DeviceMaintenanceDto;
import com.ruoyi.device.pojo.DeviceMaintenance;
import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
+import org.apache.ibatis.annotations.Param;
/**
* 璁惧缁存姢淇濆吇
*/
@Mapper
public interface DeviceMaintenanceMapper extends BaseMapper<DeviceMaintenance> {
- List<DeviceMaintenance> getDeviceMaintenanceParam();
+ /**
+ * 璁惧缁存姢鍒嗛〉鏌ヨ
+ * @param page
+ * @return
+ */
+ IPage<DeviceMaintenanceDto> selectDeviceMaintenancePage(@Param("page") Page page, @Param("ew") QueryWrapper<DeviceMaintenanceDto> ew);
- List<DeviceMaintenanceExport> deviceMaintenanceExport(Integer deviceId);
}
--
Gitblit v1.9.3