Commit 6170f098 by zxw

GetEquipmentInfo接口新增updateTime查询条件

parent 497a1a28
......@@ -107,5 +107,7 @@ namespace JmpModel.Model
public int? SafeLevel { get; set; }
[Column("is_map")]
public short? IsMap { get; set; }
[Column("update_time", TypeName = "datetime")]
public DateTime? UpdateTime { get; set; }
}
}
\ No newline at end of file
......@@ -179,6 +179,7 @@ namespace JunmpPoliceStation.Controllers
/// "isCurrentLevel":"true"本级,"false"本级及下级
/// "currentState":"当前状态"
/// "createTime":"时间"
/// "updateTime":"最后更新时间"
/// "page":"页数",
/// "size":"当页数量",
/// }
......@@ -200,6 +201,7 @@ namespace JunmpPoliceStation.Controllers
int.TryParse(entity.page, out int page);
int.TryParse(entity.size, out int size);
string createTime = entity.createTime;
string updateTime = entity.updateTime;
if (size == 0)
{
size = 10;
......@@ -251,7 +253,11 @@ namespace JunmpPoliceStation.Controllers
{
expression = expression.AndAlso(t => t.CreateTime >= DateTime.Parse(createTime));
}
if (!string.IsNullOrEmpty(updateTime))
{
expression = expression.AndAlso(t => t.UpdateTime >= DateTime.Parse(updateTime));
}
var allState = _unitOfWork.EquipmentStateRepository.GetList(p => !string.IsNullOrEmpty(p.TransferId) && !string.IsNullOrEmpty(p.Eqiupment.Epc),null,false, stateParam).ToList();
var equipments = _unitOfWork.ViewEquipmentDetailRepository.GetPageAsync(expression, "-CreateTime", page, size, false, param).Result;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论