现场PBL修改后代码提交

This commit is contained in:
2024-11-13 15:53:15 +08:00
parent 4fcad8a63e
commit 368941225e
14 changed files with 319 additions and 188 deletions

View File

@@ -25,6 +25,7 @@ namespace DOAN.Service.PBL
var response = Queryable()
.Where(predicate.ToExpression())
.OrderByDescending(it => it.CreatedTime)
.ToPage<MesInterationLog, MesInterationLogDto>(parm);
return response;
@@ -75,7 +76,7 @@ namespace DOAN.Service.PBL
var predicate = Expressionable.Create<MesInterationLog>()
.AndIF(!string.IsNullOrEmpty(parm.Workorder),it=>it.Workorder.Contains(parm.Workorder))
.AndIF(parm.TimeRange[0]>DateTime.MinValue, it => it.CreatedTime >=parm.TimeRange[0])
.AndIF(parm.TimeRange[1]>DateTime.MinValue, it => it.CreatedTime <=parm.TimeRange[1])
.AndIF(parm.TimeRange[1]>DateTime.MinValue, it => it.CreatedTime <=parm.TimeRange[1].Value.Add(new TimeSpan(23, 59, 59)))
;
return predicate;