From 11af23e0c7976eed1211ba2ca0beae3a12e19310 Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期三, 12 三月 2025 15:37:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 cnas-require/src/main/resources/mapper/DeviceMaintenanceMapper.xml |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/cnas-require/src/main/resources/mapper/DeviceMaintenanceMapper.xml b/cnas-require/src/main/resources/mapper/DeviceMaintenanceMapper.xml
new file mode 100644
index 0000000..c596bbd
--- /dev/null
+++ b/cnas-require/src/main/resources/mapper/DeviceMaintenanceMapper.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.requier.mapper.DeviceMaintenanceMapper">
+
+    <select id="getDeviceMaintenanceParam" resultType="com.ruoyi.requier.pojo.DeviceMaintenance">
+        select id,device_id,device_name, device_number,management_number,content,name
+        ,date from device_maintenance
+    </select>
+
+<!--    <select id="getDeviceMaintenancePage" resultType="com.ruoyi.requier.pojo.DeviceMaintenance">-->
+<!--        select *-->
+<!--        from device_maintenance dm-->
+<!--        where dm.device_id = #{deviceId}-->
+<!--    </select>-->
+
+    <select id="deviceMaintenanceExport" resultType="com.ruoyi.requier.dto.DeviceMaintenanceExport">
+        select id, device_id, device_name, device_number, management_number, content, date, if(maintenance_type = 1, '璁″垝涓淮鎶�', '浣跨敤鍓嶅悗缁存姢'), next_date, name, comments
+        from device_maintenance dm
+        where dm.device_id = #{deviceId}
+    </select>
+</mapper>

--
Gitblit v1.9.3