yys 修改巡检模块，通知管理

maven

8 天以前 685c8f92c76760da1ff3a5d88f34201c7e0006bd

 src/main/resources/mapper/device/DeviceMaintenanceMapper.xml

@@ -7,19 +7,19 @@

    <select id="queryPage" resultType="com.ruoyi.device.dto.DeviceMaintenanceDto">
        select dm.id,
               dm.device_ledger_id,
               dm.maintenance_plan_time,
                dm.maintenance_actually_time,
                dm.maintenance_result,
                dm.status,
                dm.create_time,
                dm.update_time,
                dm.create_user,
                dm.update_user,
                dm.tenant_id,
                dm.maintenance_actually_name,
               dl.device_name,
               dl.device_model,
        dm.device_ledger_id,
        dm.maintenance_plan_time,
        dm.maintenance_actually_time,
        dm.maintenance_result,
        dm.status,
        dm.create_time,
        dm.update_time,
        dm.create_user,
        dm.update_user,
        dm.tenant_id,
        dm.maintenance_actually_name,
        dl.device_name,
        dl.device_model,
        su.user_name as create_user_name
        from device_maintenance dm
        left join device_ledger dl on dm.device_ledger_id = dl.id
@@ -31,6 +31,9 @@
            </if>
            <if test="deviceMaintenanceDto.deviceModel != null">
                and dl.device_model like concat('%',#{deviceMaintenanceDto.deviceModel},'%')
            </if>
            <if test="deviceMaintenanceDto.status != null">
                and dm.status = #{deviceMaintenanceDto.status}
            </if>
            <if test="deviceMaintenanceDto.maintenanceActuallyName != null">
                and dm.maintenance_actually_name like concat('%',#{deviceMaintenanceDto.maintenanceActuallyName},'%')
@@ -60,9 +63,14 @@
               dl.device_model,
               su.user_name as create_user_name
        from device_maintenance dm
        left join device_ledger dl on dm.device_ledger_id = dl.id
        left join sys_user su on dm.create_user = su.user_id
                 left join device_ledger dl on dm.device_ledger_id = dl.id
                 left join sys_user su on dm.create_user = su.user_id
        where dm.id = #{id}
    </select>
    <select id="list1" resultType="com.ruoyi.device.pojo.DeviceMaintenance">
        select *
        from device_maintenance
        where device_ledger_id = #{id}
    </select>

</mapper>