|
@@ -161,13 +161,15 @@ public class InterlockCountDayServiceImpl extends ServiceImpl<InterlockCountDayM
|
|
for (InterlockDetail detail : detailList) {
|
|
for (InterlockDetail detail : detailList) {
|
|
if (ybStatusAnNormalValue.equals(detail.getInstrumentStatus())){
|
|
if (ybStatusAnNormalValue.equals(detail.getInstrumentStatus())){
|
|
ybAnNormalNumber++;
|
|
ybAnNormalNumber++;
|
|
- break;
|
|
|
|
|
|
+ }
|
|
|
|
+ if (ybStatusNormalValue.equals(detail.getInstrumentStatus())){
|
|
|
|
+ ybNormalNumber++;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- if (summaryList.size() > 0){
|
|
|
|
- ybNormalNumber = summaryList.size() - ybAnNormalNumber;
|
|
|
|
- }
|
|
|
|
|
|
+ //if (summaryList.size() > 0){
|
|
|
|
+ // ybNormalNumber = summaryList.size() - ybAnNormalNumber;
|
|
|
|
+ //}
|
|
InterlockAndYbStatus interlockAndYbStatus1 = new InterlockAndYbStatus();
|
|
InterlockAndYbStatus interlockAndYbStatus1 = new InterlockAndYbStatus();
|
|
interlockAndYbStatus1.setStatusName("正常");
|
|
interlockAndYbStatus1.setStatusName("正常");
|
|
interlockAndYbStatus1.setNumber(String.valueOf(ybNormalNumber));
|
|
interlockAndYbStatus1.setNumber(String.valueOf(ybNormalNumber));
|