Merge remote-tracking branch 'origin/master'

zss

2 天以前 beaa6e8dcf350fc50320518b9c92986785a2fac9

Merge remote-tracking branch 'origin/master'

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

@@ -6,7 +6,18 @@
<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,
        su.user_name as create_user_name
@@ -23,7 +34,18 @@
        </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,
               su.user_name as create_user_name

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

@@ -6,7 +6,20 @@
<mapper namespace="com.ruoyi.device.mapper.DeviceRepairMapper">

    <select id="queryPage" resultType="com.ruoyi.device.dto.DeviceRepairDto">
        select dr.*,
        select dr.id,
               dr.device_ledger_id,
                dr.repair_time,
                dr.repair_name,
                dr.remark,
                dr.maintenance_name,
                dr.maintenance_time,
                dr.maintenance_result,
                dr.status,
                dr.create_time,
                dr.update_time,
                dr.create_user,
                dr.update_user,
               dr.tenant_id,
               dl.device_name,
               dl.device_model
        from device_repair dr
@@ -21,11 +34,24 @@
        </where>
    </select>
    <select id="detailById" resultType="com.ruoyi.device.dto.DeviceRepairDto">
        select dr.*,
        select dr.id,
               dr.device_ledger_id,
               dr.repair_time,
               dr.repair_name,
               dr.remark,
               dr.maintenance_name,
               dr.maintenance_time,
               dr.maintenance_result,
               dr.status,
               dr.create_time,
               dr.update_time,
               dr.create_user,
               dr.update_user,
               dr.tenant_id,
               dl.device_name,
               dl.device_model
        from device_repair dr
        left join device_ledger dl on dr.device_ledger_id = dl.id
                 left join device_ledger dl on dr.device_ledger_id = dl.id
        where dr.id = #{id}
    </select>