master
parent
76c91f4b3a
commit
f3ed210832
|
|
@ -50,7 +50,7 @@ namespace OpenAuth.App
|
|||
var list = await base.Repository.AsQueryable()
|
||||
.Where(p => p.IsDelete == false)
|
||||
.WhereIF(req.begindate != null && req.enddate != null, p => p.ReportTime >= req.begindate && p.ReportTime < req.enddate)
|
||||
.WhereIF(req.status != null, p => p.Status == req.status)
|
||||
.WhereIF(req.status.Count>0, p => req.status.Contains(p.Status))
|
||||
.WhereIF(!string.IsNullOrEmpty(req.key), p => p.Title.Contains(req.key))
|
||||
.WhereIF(req.viotype != null, p => p.ViolationType == req.viotype)
|
||||
.LeftJoin<MiMinePoint>((p, m) => p.MinePointId == m.Id)
|
||||
|
|
@ -106,7 +106,7 @@ namespace OpenAuth.App
|
|||
var list = await uow.MiViolationReport.AsQueryable()
|
||||
.Where(p => p.IsDelete == false)
|
||||
.WhereIF(req.begindate != null && req.enddate != null, p => p.ReportTime >= req.begindate && p.ReportTime < req.enddate)
|
||||
.WhereIF(req.status != null, p => p.Status == req.status)
|
||||
.WhereIF(req.status != null, p => req.status.Contains(p.Status))
|
||||
.WhereIF(!string.IsNullOrEmpty(req.key), p => p.Title.Contains(req.key))
|
||||
.WhereIF(req.viotype != null, p => p.ViolationType == req.viotype)
|
||||
.Where(p => orgidlist.Contains(p.ReportUnit) || orgidlist.Contains(p.HandlingUnit) || p.Reporter == user.User.Id.ToString() || p.Handler == user.User.Id.ToString())
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ namespace OpenAuth.App.ServiceApp.MiManager.Request
|
|||
/// <summary>
|
||||
/// 状态(0待处理,1已处理,2已开单提车,3已审核,4已提车)
|
||||
/// </summary>
|
||||
public short? status { get; set; }
|
||||
public List<short?> status { get; set; }
|
||||
/// <summary>
|
||||
/// 盗采点名称
|
||||
/// </summary>
|
||||
|
|
|
|||
Loading…
Reference in New Issue