Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

油漆实验室

Browse Source
This commit is contained in:
卢江海
2025-03-28 17:29:12 +08:00
parent 19c72cd56c
commit 2c5caafacd
8 changed files with 534 additions and 514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ZR.Service/mes/ql/PLTestService.cs
View File

@@ -66,15 +66,17 @@ namespace ZR.Service.mes.ql
/// <param name="pageSize"></param>
/// <returns></returns>
/// <exception cref="NotImplementedException"></exception>
public (List<PLTest>, int) GetPLTestTable(DateTime starttime, DateTime endTime, string code,string description, int pageNum, int pageSize)
public (List<PLTest>, int) GetPLTestTable(DateTime starttime, DateTime endTime, string code,string description, int pageNum, int pageSize, int dateType)
{
starttime = starttime.ToLocalTime();
endTime = endTime.ToLocalTime();
//starttime = starttime.ToLocalTime();
//endTime = endTime.ToLocalTime();
int totalNum = 0;
var predicate = Expressionable.Create<PLTest>()
.AndIF(starttime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.CreatedTime >= starttime.ToLocalTime())
.AndIF(endTime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.CreatedTime <= endTime.ToLocalTime())
.AndIF(!string.IsNullOrEmpty(code), it => it.Code.Contains(code))
.AndIF(starttime > new DateTime(2023, 1, 1, 0, 0, 0)&&dateType==1, it => it.CreatedTime >= starttime)
.AndIF(endTime > new DateTime(2023, 1, 1, 0, 0, 0) && dateType == 1, it => it.CreatedTime <= endTime)
.AndIF(starttime > new DateTime(2023, 1, 1, 0, 0, 0) && dateType == 2, it =>Convert.ToDateTime(it.Dt) >= starttime)
.AndIF(endTime > new DateTime(2023, 1, 1, 0, 0, 0) && dateType == 2, it => Convert.ToDateTime(it.Dt) <= endTime)
.AndIF(!string.IsNullOrEmpty(code), it => it.Code.Contains(code))
.AndIF(!string.IsNullOrEmpty(description), it => it.Description.Contains(description))
.ToExpression();