|
@@ -60,7 +60,7 @@ public class AlarmRecordService extends AlarmBaseService {
|
|
|
// 如果查询历史报警,查询报警状态为“已恢复”和”已过期”的报警,或者【报警状态等于“未恢复”且报警处理状态等于“处理完成”】的报警
|
|
|
if (EnumAlarmListType.HISTORY.name().equals(listType)) {
|
|
|
BooleanExpression historyAlarmExpression = qAlarmRecord.state.eq(EnumAlarmState.END.getType())
|
|
|
- .or(qAlarmRecord.state.eq(EnumAlarmState.END.getType()))
|
|
|
+ .or(qAlarmRecord.state.eq(EnumAlarmState.EXPIRE.getType()))
|
|
|
.or(qAlarmRecord.treatState.eq(EnumAlarmTreatState.DONE.getType()));
|
|
|
expressions.add(historyAlarmExpression);
|
|
|
}
|