修改多个模块页面展示逻辑

yinrw

4 天以前 f8913a0b4dd441c74c3dd82306a65708a4b1597e

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

@@ -21,7 +21,8 @@
                dr.update_user,
               dr.tenant_id,
               dl.device_name,
               dl.device_model
               dl.device_model,
               dr.machinery_category
        from device_repair dr
        left join device_ledger dl on dr.device_ledger_id = dl.id
        <where>
@@ -33,7 +34,7 @@
                and dl.device_model like concat('%',#{deviceRepairDto.deviceModel},'%')
            </if>
            <if test="deviceRepairDto.status != null">
                and dl.status = #{deviceRepairDto.status}
                and dr.status = #{deviceRepairDto.status}
            </if>
            <if test="deviceRepairDto.remark != null">
                and dr.remark like concat('%',#{deviceRepairDto.remark},'%')
@@ -49,6 +50,7 @@
                and dr.maintenance_time like concat('%',#{deviceRepairDto.maintenanceTimeStr},'%')
            </if>
        </where>
        order by dr.repair_time desc
    </select>
    <select id="detailById" resultType="com.ruoyi.device.dto.DeviceRepairDto">
        select dr.id,
@@ -66,6 +68,7 @@
               dr.update_user,
               dr.tenant_id,
               dl.device_name,
               dr.machinery_category,
               dl.device_model
        from device_repair dr
                 left join device_ledger dl on dr.device_ledger_id = dl.id