Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

liyong

4 天以前 d14764d097691d35e7015c2d161c612aa7642a8e

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

@@ -8,13 +8,14 @@
    <select id="queryPage" resultType="com.ruoyi.device.dto.DeviceRepairDto">
        select dr.id,
               dr.device_ledger_id,
                dr.repair_time,
                dr.repair_name,
                dr.remark,
                dr.repair_project,
                dr.repair_time_start as repairTimeStart,
                dr.repair_time_end as repairTimeEnd,
                dr.maintenance_name,
                dr.maintenance_time,
                dr.maintenance_result,
                dr.maintenance_price,
                dr.status,
                dr.create_time,
                dr.update_time,
@@ -39,28 +40,35 @@
            <if test="deviceRepairDto.remark != null">
                and dr.remark like concat('%',#{deviceRepairDto.remark},'%')
            </if>
            <if test="deviceRepairDto.repairProject != null">
                and dr.repair_project like concat('%',#{deviceRepairDto.repairProject},'%')
            </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 test="deviceRepairDto.repairTimeStart != null">
                and dr.repair_time_start &gt;= #{deviceRepairDto.repairTimeStart}
            </if>
            <if test="deviceRepairDto.repairTimeEnd != null">
                and dr.repair_time_end &lt;= #{deviceRepairDto.repairTimeEnd}
            </if>
            <if test="deviceRepairDto.maintenanceTimeStr != null and deviceRepairDto.maintenanceTimeStr != '' ">
                and dr.maintenance_time like concat('%',#{deviceRepairDto.maintenanceTimeStr},'%')
            </if>
        </where>
        order by dr.status asc, dr.create_time desc
    </select>
    <select id="detailById" resultType="com.ruoyi.device.dto.DeviceRepairDto">
        select dr.id,
               dr.device_ledger_id,
               dr.repair_time,
               dr.repair_name,
               dr.remark,
               dr.repair_project,
               dr.repair_time_start as repairTimeStart,
               dr.repair_time_end as repairTimeEnd,
               dr.maintenance_name,
               dr.maintenance_time,
               dr.maintenance_result,
               dr.maintenance_price,
               dr.status,
               dr.create_time,
               dr.update_time,