首检添加数据看板
This commit is contained in:
@@ -1,15 +1,11 @@
|
||||
using System;
|
||||
using SqlSugar;
|
||||
using Infrastructure.Attribute;
|
||||
using Infrastructure.Extensions;
|
||||
using SqlSugar;
|
||||
using System;
|
||||
using ZR.Model;
|
||||
using ZR.Model.Dto;
|
||||
using ZR.Model.MES.wms;
|
||||
using ZR.Repository;
|
||||
using ZR.Service.Business.IBusinessService;
|
||||
using System.Linq;
|
||||
using ZR.Service.mes.wms.IService;
|
||||
using ZR.Model.MES.wms.Dto;
|
||||
using ZR.Repository;
|
||||
using ZR.Service.mes.wms.IService;
|
||||
|
||||
namespace ZR.Service.Business
|
||||
{
|
||||
@@ -32,13 +28,13 @@ namespace ZR.Service.Business
|
||||
.AndIF(parm.Type > 0, it => it.Type == parm.Type)
|
||||
.AndIF(!string.IsNullOrEmpty(parm.Description), it => it.Description.Contains(parm.Description))
|
||||
// 当天0点
|
||||
.AndIF(DateTime.TryParse(parm.StartTimeStr,out searchStartTime), it => it.CreatedTime > searchStartTime)
|
||||
.AndIF(DateTime.TryParse(parm.StartTimeStr, out searchStartTime), it => it.CreatedTime > searchStartTime)
|
||||
// 当天23点59分59秒
|
||||
.AndIF(DateTime.TryParse(parm.EndTimeStr, out searchEndTime), it => it.CreatedTime < searchEndTime.AddDays(1).AddTicks(-1))
|
||||
;
|
||||
var response = Queryable()
|
||||
.Where(predicate.ToExpression())
|
||||
.OrderBy(it=>it.CreatedTime,OrderByType.Desc)
|
||||
.OrderBy(it => it.CreatedTime, OrderByType.Desc)
|
||||
.ToPage<WmGoodsChangeLog, WmGoodsChangeLogDto>(parm);
|
||||
return response;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user