RIZO/zhuangpei-mesbackend
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

继续修改

Browse Source
This commit is contained in:
qianhao.xu 2024-07-03 19:18:20 +08:00
parent e8beffd320
commit 265c3cc8aa
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
DOAN.Model/MES/dev/Dto/DevicePointInspectionPlanDto.cs
View File

@ -11,6 +11,7 @@ namespace DOAN.Model.MES.dev.Dto
public int? Status { get; set; }
public DateTime? Starttime { get; set; }
public DateTime? Endtime { get; set; }
public int? InnerType { get; set; }
}
/// <summary>

3
DOAN.Model/MES/dev/Dto/DeviceRouteInspectionPlanDto.cs
View File

@ -11,7 +11,8 @@ namespace DOAN.Model.MES.dev.Dto
public DateTime? LifeCycleStart { get; set; }
public DateTime? LifeCycleEnd { get; set; }
public int? Type { get; set; }
public int? ExcuteCycleType { get; set; }
public int? InnerType { get; set; }
}
/// <summary>

3
DOAN.Service/MES/dev/DevicePointInspectionPlanService.cs
View File

@ -30,7 +30,8 @@ namespace DOAN.Service.MES.dev
.AndIF(!string.IsNullOrEmpty(parm.Name), it => it.Name.Contains(parm.Name))
.AndIF(parm.Status > 0, it => it.Status == parm.Status)
.AndIF(parm.Starttime != null, it => it.CreatedTime >= parm.Starttime)
.AndIF(parm.Endtime != null, it => it.CreatedTime <= parm.Endtime);
.AndIF(parm.Endtime != null, it => it.CreatedTime <= parm.Endtime)
.AndIF(parm.InnerType > 0, it => it.InnerType == parm.InnerType);
var response = Queryable()

3
DOAN.Service/MES/dev/DeviceRouteInspectionPlanService.cs
View File

@ -31,7 +31,8 @@ namespace DOAN.Service.MES.dev
predicate.AndIF(!string.IsNullOrEmpty(parm.Name), it => it.Name.Contains(parm.Name))
.AndIF(parm.LifeCycleStart != null, it => it.LifeCycleStart >= parm.LifeCycleStart)
.AndIF(parm.LifeCycleEnd != null, it => it.LifeCycleEnd <= parm.LifeCycleEnd)
.AndIF(parm.Type != 0, it => it.ExcuteCycleType == parm.Type);
.AndIF(parm.ExcuteCycleType > 0, it => it.ExcuteCycleType == parm.ExcuteCycleType)
.AndIF(parm.InnerType>0, it => it.InnerType == parm.InnerType);
var response = Queryable()
.Where(predicate.ToExpression())