feat(config): 添加新环境配置并扩展设备台账功能

云

2 天以前 4f55d3cb4bc644e4534106336f2047af1a4db5df

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

@@ -8,6 +8,7 @@
    <select id="queryPage" resultType="com.ruoyi.device.vo.DeviceRepairVo">
        select dr.id,
               dr.device_ledger_id,
               dr.area_id,
                dr.repair_time,
                dr.repair_name,
                dr.remark,
@@ -22,12 +23,14 @@
                dr.update_time,
                dr.create_user,
                dr.update_user,
               dr.tenant_id,
               dl.device_name,
               dl.device_model,
               dr.machinery_category
                dr.tenant_id,
                dl.device_name,
                dl.device_model,
               dr.machinery_category,
               da.area_name
        from device_repair dr
        left join device_ledger dl on dr.device_ledger_id = dl.id
        left join device_area da on dl.area_id = da.id
        <where>
            <if test="deviceRepairDto.deviceName != null">
                and dl.device_name like concat('%',#{deviceRepairDto.deviceName},'%')
@@ -51,12 +54,16 @@
            <if test="deviceRepairDto.maintenanceTimeStr != null and deviceRepairDto.maintenanceTimeStr != '' ">
                and dr.maintenance_time like concat('%',#{deviceRepairDto.maintenanceTimeStr},'%')
            </if>
            <if test="deviceRepairDto.areaId != null">
                and dr.area_id = #{deviceRepairDto.areaId}
            </if>
        </where>
        order by dr.create_time desc
    </select>
    <select id="detailById" resultType="com.ruoyi.device.vo.DeviceRepairVo">
        select dr.id,
               dr.device_ledger_id,
               dr.area_id,
               dr.repair_time,
               dr.repair_name,
               dr.remark,
@@ -74,9 +81,11 @@
               dr.tenant_id,
               dl.device_name,
               dr.machinery_category,
               dl.device_model
               dl.device_model,
               da.area_name
        from device_repair dr
                 left join device_ledger dl on dr.device_ledger_id = dl.id
                 left join device_area da on dl.area_id = da.id
        where dr.id = #{id}
    </select>