Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop

qushaowei

2024-03-28 1a2258c4eca2e7514b6096004fa1c3e0036b402b

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml

@@ -16,7 +16,6 @@
        t1.preventive_measure preventiveMeasure,
        t1.fault_remove faultRemove,
        t1.fault_description faultDescription,
        t1.fault_time faultTime,
        t1.photo photo,
        t1.is_stop isStop,
        t1.maintenance_method maintenanceMethod,
@@ -34,6 +33,7 @@
        t1.business_type businessType,
        t1.responsibility_id responsibilityId,
        t1.outsourcing_unit outsourcingUnit,
        t1.actual_hour actualHour,
        t1.remark,
        t1.repair_order_uda1 repairOrderUda1,
        t1.repair_order_uda2 repairOrderUda2,
@@ -46,10 +46,12 @@
        report.accept_time acceptTime,
        report.err_uda3 errUda3,
        report.fault_hour faultHour,
        report.fault_time faultTime,
        t2.num equipmentNum,
        t2.name equipmentName,
        t2.model equipmentModel,
        t2.specific_equipment specificEquipment,
        t2.equipment_importance_id equipmentImportanceId,
        t3.depart_name departName,
        t4.name outsourcingUnitName,
        t5.realname responsibilityName,
@@ -95,11 +97,26 @@
        <if test="specificEquipment != null and specificEquipment != ''">
            and t2.specific_equipment = #{specificEquipment}
        </if>
        <if test="equipmentImportanceId != null and  equipmentImportanceId != ''">
            and t2. equipment_importance_id = #{equipmentImportanceId}
        </if>
        <if test="teamId != null and teamId != ''">
            and t1.team_id = #{teamId}
        </if>
        <if test="repairOrderType != null and repairOrderType != ''">
        and t1.repair_order_type = #{repairOrderType}
            and t1.repair_order_type = #{repairOrderType}
        </if>
        <if test="faultStartTime != null">
            and report.fault_time &gt;= #{faultStartTime}
        </if>
        <if test="faultEndTime != null">
            and report.fault_time &lt;= #{faultEndTime}
        </if>
        <if test="createStartTime != null">
            and t1.create_time &gt;= #{createStartTime}
        </if>
        <if test="createEndTime != null">
            and t1.create_time &lt;= #{createEndTime}
        </if>
        order by t1.create_time desc
    </select>