Lius
2025-04-07 0369fbb67fefc80905c4f88ef36abf87d32f2559
设备报修字段修改
已修改2个文件
8 ■■■■■ 文件已修改
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamReportRepairMapper.xml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java
@@ -13,6 +13,8 @@
    String INSPECTION_ORDER_CODE_RULE = "EamInspectionOrder";
    //周保编码规则
    String WEEK_MAINTENANCE_CODE_RULE = "WeekMaintenanceCodeRule";
    // 维修工单编码规则
    String REPAIR_ORDER_CODE_RULE = "RepairOrderCodeRule";
    /**
     * 备件请购单状态 1:已创建 2:已提交 3:已通过 4:已驳回 5:已完成
     */
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamReportRepairMapper.xml
@@ -8,11 +8,11 @@
            t2.equipment_name
        FROM
            eam_report_repair t1
                LEFT JOIN eam_equipment t2 ON t1.equipment_id = t2.equipment_code
                LEFT JOIN eam_equipment t2 ON t1.equipment_id = t2.id
        <where>
            <choose>
                <when test="equipmentIds != null and equipmentIds.size() > 0 ">
                    AND t1.equipment_id IN
                    AND t2.equipment_code IN
                    <foreach collection="equipmentIds" item="equipmentId" index="index" open="(" close=")" separator=",">
                        {equipmentId}
                    </foreach>
@@ -22,7 +22,7 @@
                </otherwise>
            </choose>
            <if test="eamReportRepair.equipmentId != null and eamReportRepair.equipmentId != ''">
                AND t1.equipment_id LIKE CONCAT(CONCAT('%',#{ eamReportRepair.equipmentId }),'%')
                AND t2.equipment_code LIKE CONCAT(CONCAT('%',#{ eamReportRepair.equipmentId }),'%')
            </if>
            <if test="eamReportRepair.equipmentName != null and eamReportRepair.equipmentName != ''">
                AND t2.equipment_name = LIKE CONCAT(CONCAT('%',#{ eamReportRepair.equipmentName }),'%')