Merge remote-tracking branch 'origin/master'

zss

15 小时以前 beaa6e8dcf350fc50320518b9c92986785a2fac9

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

@@ -6,26 +6,52 @@
<mapper namespace="com.ruoyi.device.mapper.DeviceMaintenanceMapper">

    <select id="queryPage" resultType="com.ruoyi.device.dto.DeviceMaintenanceDto">
        select dm.*,
        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
               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
        <where>
            <if test="deviceRepairDto.deviceName != null">
                and dl.device_name like concat('%',#{deviceRepairDto.deviceName},'%')
            <if test="deviceMaintenanceDto.deviceName != null">
                and dl.device_name like concat('%',#{deviceMaintenanceDto.deviceName},'%')
            </if>
            <if test="deviceRepairDto.deviceModel != null">
                and dl.device_model like concat('%',#{deviceRepairDto.deviceModel},'%')
            <if test="deviceMaintenanceDto.deviceModel != null">
                and dl.device_model like concat('%',#{deviceMaintenanceDto.deviceModel},'%')
            </if>
        </where>
    </select>
    <select id="detailById" resultType="com.ruoyi.device.dto.DeviceMaintenanceDto">
        select dm.*,
        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
               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
        where dm.id = #{id}
    </select>