diff --git a/Entity/Api/Req/QueryAlarmReq.cs b/Entity/Api/Req/QueryAlarmReq.cs index d45a92b..0e72afa 100644 --- a/Entity/Api/Req/QueryAlarmReq.cs +++ b/Entity/Api/Req/QueryAlarmReq.cs @@ -6,4 +6,8 @@ public class QueryAlarmReq : QueryPageModel { public int TypeCode { get; set; } = -1; public string? EquipCode { get; set; } + + public string? ErrorLevel { get; set; } + + public DateTime? StartTime { get; set; } } diff --git a/Service/Station/EquipAlarmRecordService.cs b/Service/Station/EquipAlarmRecordService.cs index d05e76f..dcc2d93 100644 --- a/Service/Station/EquipAlarmRecordService.cs +++ b/Service/Station/EquipAlarmRecordService.cs @@ -33,8 +33,11 @@ public class EquipAlarmRecordService : BaseServices int totalCount = 0; int reqTypeCode = req.TypeCode; var equipCode = req.EquipCode; + var errorLevel = req.ErrorLevel; List list = BaseDal.Queryable().WhereIF(reqTypeCode != -1, it => it.EquipTypeCode == reqTypeCode) .WhereIF(ObjUtils.IsNotNullOrWhiteSpace(equipCode), it => it.EquipCode == equipCode) + .WhereIF(ObjUtils.IsNotNullOrWhiteSpace(errorLevel), it => it.ErrorLevel == errorLevel) + .WhereIF(req.StartTime.HasValue, it => it.StartTime == req.StartTime) .OrderBy(it => it.CreatedTime, OrderByType.Desc) .ToPageList(req.PageNum, req.PageSize, ref totalCount); @@ -84,9 +87,12 @@ public class EquipAlarmRecordService : BaseServices int totalCount = 0; int reqTypeCode = req.TypeCode; var equipCode = req.EquipCode; + var errorLevel = req.ErrorLevel; List list = ProcessRecordRepository.Queryable() .WhereIF(reqTypeCode != -1, it => it.EquipTypeCode == reqTypeCode) .WhereIF(ObjUtils.IsNotNullOrWhiteSpace(equipCode), it => it.EquipCode == equipCode) + .WhereIF(ObjUtils.IsNotNullOrWhiteSpace(errorLevel), it => it.ErrorLevel == errorLevel) + .WhereIF(req.StartTime.HasValue, it => it.StartTime == req.StartTime) .OrderBy(it => it.CreatedTime, OrderByType.Desc) .ToPageList(req.PageNum, req.PageSize, ref totalCount);