Merge remote-tracking branch 'origin/dev' into dev

lxp

2025-03-15 5a697e6fafbe3855336ca5fd7e1785de12840d16

 cnas-require/src/main/resources/mapper/DeviceMaintenanceMapper.xml

@@ -1,20 +1,20 @@
<?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">
<mapper namespace="com.ruoyi.require.mapper.DeviceMaintenanceMapper">

    <select id="getDeviceMaintenanceParam" resultType="com.ruoyi.requier.pojo.DeviceMaintenance">
    <select id="getDeviceMaintenanceParam" resultType="com.ruoyi.require.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 id="getDeviceMaintenancePage" resultType="com.ruoyi.require.pojo.DeviceMaintenance">-->
<!--        select *-->
<!--        from device_maintenance dm-->
<!--        where dm.device_id = #{deviceId}-->
<!--    </select>-->

    <select id="deviceMaintenanceExport" resultType="com.ruoyi.requier.dto.DeviceMaintenanceExport">
    <select id="deviceMaintenanceExport" resultType="com.ruoyi.require.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}