|
@@ -233,13 +233,18 @@ public class TwinCalcDayServiceImpl implements ITwinCalcDayService {
|
|
|
day.setEfficiencyA(ea);
|
|
|
day.setEfficiencyB(eb);
|
|
|
day.setEfficiency(ee);
|
|
|
- if (day.getLength().intValue() == 0) {
|
|
|
+ //如果米长为0,稼动率处理
|
|
|
+ if (day.getLengthA().doubleValue() == 0d) {
|
|
|
day.setOpenTimeA(BigDecimal.ZERO);
|
|
|
- day.setOpenTimeB(BigDecimal.ZERO);
|
|
|
- day.setCloseTimeA(BigDecimal.valueOf(teamTimeA));
|
|
|
- day.setCloseTimeB(BigDecimal.valueOf(teamTimeB));
|
|
|
+ day.setCloseTimeA(BigDecimal.ZERO);
|
|
|
day.setEfficiencyA(BigDecimal.ZERO);
|
|
|
+ }
|
|
|
+ if (day.getLengthB().doubleValue() == 0d) {
|
|
|
+ day.setOpenTimeB(BigDecimal.ZERO);
|
|
|
+ day.setCloseTimeB(BigDecimal.ZERO);
|
|
|
day.setEfficiencyB(BigDecimal.ZERO);
|
|
|
+ }
|
|
|
+ if (day.getLength().doubleValue() == 0d) {
|
|
|
day.setEfficiency(BigDecimal.ZERO);
|
|
|
}
|
|
|
List<TwinCalcAlarms> alarms = alarmsList.stream().filter(a -> a.getDeviceId().equals(entry.getKey())).collect(Collectors.toList());
|