Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

liyong

6 天以前 88ae1e650fc2fc30928edfe8f3cc39108d8d1ccd

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

@@ -5,7 +5,7 @@

<mapper namespace="com.ruoyi.device.mapper.DeviceRepairMapper">

    <select id="queryPage" resultType="com.ruoyi.device.dto.DeviceRepairDto">
    <select id="queryPage" resultType="com.ruoyi.device.vo.DeviceRepairVo">
        select dr.id,
               dr.device_ledger_id,
                dr.repair_time,
@@ -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>
@@ -32,15 +33,25 @@
            <if test="deviceRepairDto.deviceModel != null">
                and dl.device_model like concat('%',#{deviceRepairDto.deviceModel},'%')
            </if>
            <if test="deviceRepairDto.status != null">
                and dr.status = #{deviceRepairDto.status}
            </if>
            <if test="deviceRepairDto.remark != null">
                and dr.remark like concat('%',#{deviceRepairDto.remark},'%')
            </if>
            <if test="deviceRepairDto.maintenanceName != null">
                and dr.maintenance_name like concat('%',#{deviceRepairDto.maintenanceName},'%')
            </if>

            <if test="deviceRepairDto.repairTimeStr != null and deviceRepairDto.repairTimeStr != '' ">
                and dr.repair_time like concat('%',#{deviceRepairDto.repairTimeStr},'%')
            </if>
            <if test="deviceRepairDto.maintenanceTimeStr != null and deviceRepairDto.maintenanceTimeStr != '' ">
                and dr.maintenance_time like concat('%',#{deviceRepairDto.maintenanceTimeStr},'%')
            </if>
        </where>
    </select>
    <select id="detailById" resultType="com.ruoyi.device.dto.DeviceRepairDto">
    <select id="detailById" resultType="com.ruoyi.device.vo.DeviceRepairVo">
        select dr.id,
               dr.device_ledger_id,
               dr.repair_time,
@@ -56,6 +67,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