Merge remote-tracking branch 'origin/master'

Lius

2024-07-25 854856127101ea6cbbc261db46cb06ac141d6ab0

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

@@ -92,7 +92,7 @@
                    if(equipmentReportRepair.getFaultTime() != null && equipmentReportRepair.getFaultTime().compareTo(endDate) < 0 &&  equipmentReportRepair.getFaultTime().compareTo(startDate) > 0){
                        //2、验收时间在查询时间段内
                        if(equipmentReportRepair.getAcceptTime() != null && equipmentReportRepair.getAcceptTime().compareTo(endDate) < 0){
                            equipmentFaultTime = equipmentFaultTime.add(new BigDecimal(equipmentReportRepair.getFaultHour()));
                            equipmentFaultTime = equipmentFaultTime.add(equipmentReportRepair.getFaultHour());
                            count++;
                            //3、验收时间大于查询结束时间
                        }else {
@@ -189,4 +189,35 @@
        }
        return faultIntervalTimeList;
    }


    @Override
    public List<Map<String, Object>> getEquipmentMTBF(Map<String, Object> params) {
        return this.baseMapper.getEquipmentMTBF(params);
    }

    @Override
    public List<Map<String, Object>> getMTBFTotalAvailableTime(Map<String, Object> params) {
        return this.baseMapper.getMTBFTotalAvailableTime(params);
    }

    @Override
    public List<Map<String, Object>> getEquipmentList(Map<String, Object> params) {
        return this.baseMapper.getEquipmentList(params);
    }

    @Override
    public List<Map<String, Object>> getCenterEquipmentMTBF(Map<String, Object> params) {
        return this.baseMapper.getCenterEquipmentMTBF(params);
    }

    @Override
    public List<Map<String, Object>> getCenterMTBFTotalAvailableTime(Map<String, Object> params) {
        return this.baseMapper.getCenterMTBFTotalAvailableTime(params);
    }

    @Override
    public List<Map<String, Object>> getWorkCenterList(Map<String, Object> params) {
        return this.baseMapper.getWorkCenterList(params);
    }
}