|
|
@ -68,9 +68,9 @@ public class EquipAlarmRecordController : ControllerBase
|
|
|
|
Expression<Func<EquipAlarmRecord, bool>> predicate = it => true;
|
|
|
|
Expression<Func<EquipAlarmRecord, bool>> predicate = it => true;
|
|
|
|
|
|
|
|
|
|
|
|
// 动态添加查询条件
|
|
|
|
// 动态添加查询条件
|
|
|
|
if (req.TypeCode != -1)
|
|
|
|
if (req.EquipTypeCode != -1)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
predicate = predicate.And(it => it.EquipTypeCode == req.TypeCode);
|
|
|
|
predicate = predicate.And(it => it.EquipTypeCode == req.EquipTypeCode);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!string.IsNullOrWhiteSpace(req.EquipCode))
|
|
|
|
if (!string.IsNullOrWhiteSpace(req.EquipCode))
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -112,7 +112,7 @@ public class EquipAlarmRecordController : ControllerBase
|
|
|
|
|
|
|
|
|
|
|
|
IMapper mapper = config.CreateMapper();
|
|
|
|
IMapper mapper = config.CreateMapper();
|
|
|
|
|
|
|
|
|
|
|
|
if (req.TypeCode==(int)EquipmentType.Plc)
|
|
|
|
if (req.EquipTypeCode==(int)EquipmentType.Plc)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (language == "en")
|
|
|
|
if (language == "en")
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -131,7 +131,7 @@ public class EquipAlarmRecordController : ControllerBase
|
|
|
|
{ FileDownloadName = DateTime.Now.ToString("yyyyMMddHHmm") + "未处理报警日志.xlsx" };
|
|
|
|
{ FileDownloadName = DateTime.Now.ToString("yyyyMMddHHmm") + "未处理报警日志.xlsx" };
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (req.TypeCode==(int)EquipmentType.Charger)
|
|
|
|
if (req.EquipTypeCode==(int)EquipmentType.Charger)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (language == "en")
|
|
|
|
if (language == "en")
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -207,9 +207,9 @@ public class EquipAlarmRecordController : ControllerBase
|
|
|
|
Expression<Func<EquipAlarmProcessRecord, bool>> predicate = it => true;
|
|
|
|
Expression<Func<EquipAlarmProcessRecord, bool>> predicate = it => true;
|
|
|
|
|
|
|
|
|
|
|
|
// 动态添加查询条件
|
|
|
|
// 动态添加查询条件
|
|
|
|
if (req.TypeCode != -1)
|
|
|
|
if (req.EquipTypeCode != -1)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
predicate = predicate.And(it => it.EquipTypeCode == req.TypeCode);
|
|
|
|
predicate = predicate.And(it => it.EquipTypeCode == req.EquipTypeCode);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!string.IsNullOrWhiteSpace(req.EquipCode))
|
|
|
|
if (!string.IsNullOrWhiteSpace(req.EquipCode))
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -251,7 +251,7 @@ public class EquipAlarmRecordController : ControllerBase
|
|
|
|
IMapper mapper = config.CreateMapper();
|
|
|
|
IMapper mapper = config.CreateMapper();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (req.TypeCode==(int)EquipmentType.Plc)
|
|
|
|
if (req.EquipTypeCode==(int)EquipmentType.Plc)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (language == "en")
|
|
|
|
if (language == "en")
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -271,7 +271,7 @@ public class EquipAlarmRecordController : ControllerBase
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (req.TypeCode==(int)EquipmentType.Charger)
|
|
|
|
if (req.EquipTypeCode==(int)EquipmentType.Charger)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (language == "en")
|
|
|
|
if (language == "en")
|
|
|
|
{
|
|
|
|
{
|
|
|
|