430最终问题项修改

qushaowei

2024-09-29 454545bd4207d99d153e263c68f821f856f0e884

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

@@ -165,13 +165,14 @@
        mom_eam_equipment t1
        LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'equipment_status' ) t2 ON t1.equipment_status = t2.item_value
        WHERE t1.del_flag = '0'
        <if test="params.num != 'null' and params.num != ''">
            and t1.num like concat('%',#{params.num},'%')
        </if>
        <if test="params.name != 'null' and params.name != ''">
            and t1.name like concat('%',#{params.name},'%')
        </if>

    </select>
    <!--        <if test="params.num != 'null' and params.num != ''">-->
    <!--            and t1.num like concat('%',#{params.num},'%')-->
    <!--        </if>-->
    <!--        <if test="params.name != 'null' and params.name != ''">-->
    <!--            and t1.name like concat('%',#{params.name},'%')-->
    <!--        </if>-->
    <select id="getEquipmentList" resultType="org.jeecg.modules.eam.entity.Equipment">
    select
        t1.id id,
@@ -405,6 +406,9 @@
        t1.next_technology_status_qualification_time nextTechnologyStatusQualificationTime,
        t1.technology_status_qualification_time technologyStatusQualificationTime,
        t1.technology_status_verification_type technologyStatusVerificationType,
        t1.second_maintenance_time secondMaintenanceTime,
        t1.third_maintenance_time thirdMaintenanceTime,
        t1.next_third_maintenance_time nextThirdMaintenanceTime,
        t1.line_id lineId,
        t1.is_meta isMeta,
        t1.id showId,