Merge remote-tracking branch 'origin/master'

jinlin

2024-12-10 a8ce806c8a81f685fa9fafaa453820197ced9961

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java

@@ -1105,7 +1105,8 @@
                ParamData paramData = paramDataList.stream().filter(item ->
                        dataId.equals(item.getProductId())).collect(Collectors.toList()).get(0);
                Double ratio = paramData.getTaskMtbcfOperatingRatio();
                if (null != ratio && ratio > 0) {
//                if (null != ratio && ratio > 0) {
                if (null != ratio && ratio != 1.0) {
                    // 间断型设备的处理
                    double cycon = taskPhaseModel.getOperatConditDuration() * ratio;
                    double cycdown = taskPhaseModel.getOperatConditDuration() - cycon;