art: 所有设备 台账 维修工单 根据设备id查询维修工单,并过滤掉已完成的维修工单

zhangherong

2025-03-05 dfadab4fecc90bd2ad720dc67eba44c4b69b155a

art: 所有设备 台账 维修工单 根据设备id查询维修工单,并过滤掉已完成的维修工单

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java

@@ -378,6 +378,8 @@
                 repairOrder.getCreateEndTime(),
                 repairOrder.getEquipmentImportanceId(),
                 repairOrder.getFaultCause(),
                 null,
                 null,
                 null
         );


 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrder.java

@@ -320,6 +320,6 @@

    @TableField(exist = false)
    private List<Map<String, Object>> equipmentFaultCause;


    @TableField(exist = false)
    private String statusEnums;
}

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

@@ -45,7 +45,9 @@
                                         @Param("createEndTime")Date createEndTime,
                                         @Param("equipmentImportanceId")String equipmentImportanceId,
                                         @Param("faultCause")String faultCause,
                                         @Param("workCenterIds")List<String> workCenterIds
                                         @Param("workCenterIds")List<String> workCenterIds,
                                         @Param("equipmentId") String equipmentId,
                                         @Param("statusEnums") List<String> statusEnums


    );

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

@@ -129,6 +129,15 @@
                #{workCenterId}
            </foreach>
        </if>
        <if test="equipmentId != null">
            and t1.equipment_id = #{equipmentId}
        </if>
        <if test="statusEnums != null">
            and t1.status not in
            <foreach collection="statusEnums" open="(" separator="," close=")" item="statusEnum">
                #{statusEnum}
            </foreach>
        </if>
        order by t1.create_time desc
    </select>


 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/RepairOrderServiceImpl.java

@@ -121,6 +121,12 @@
        if(StringUtils.isNotBlank(repairOrder.getNums())){
            equipNums = Arrays.asList(repairOrder.getNums().trim().split("\n")).stream().filter(num->!num.equals("\n")).collect(Collectors.toList());
        }
        //状态筛选
        List<String> statusEnumList = null;
        if(repairOrder.getStatusEnums() != null && StringUtils.isNotBlank(repairOrder.getStatusEnums())) {
            String[] statusEnums = repairOrder.getStatusEnums().split(",");
            statusEnumList = Arrays.asList(statusEnums);
        }
        return page.setRecords(baseMapper.getRepairOrderList(page,
                repairOrder.getId(),
                repairOrder.getNum(),
@@ -140,7 +146,9 @@
                repairOrder.getCreateEndTime(),
                repairOrder.getEquipmentImportanceId(),
                repairOrder.getFaultCause(),
                workCenterIds
                workCenterIds,
                repairOrder.getEquipmentId(),
                statusEnumList
                ));
    }