HC_YFZX
/
feixian_weifajianguan
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

测试修改

master
洁 任 2026-02-07 10:23:42 +08:00
parent 34dcd16f33
commit 15acc264ce
1 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
OpenAuth.App/ServiceApp/MiManager/MiViolationReportApp.cs
View File

@ -48,16 +48,20 @@ namespace OpenAuth.App
.WhereIF(req.viotype != null, p => p.ViolationType == req.viotype)
.LeftJoin<MiMinePoint>((p, m) => p.MinePointId == m.Id)
.LeftJoin<SysUser>((p, m, u) => p.Reporter == u.Id.ToString())
.LeftJoin<SysOrg>((p, m, u, o) => p.ReportUnit == o.Id.ToString())
.WhereIF(!string.IsNullOrEmpty(req.pointname), (p, m, u, o) => m.Name.Contains(req.pointname))
.OrderBy((p, m, u, o) => p.Status)
.OrderByDescending((p, m, u, o) => p.ReportTime)
.Select<dynamic>((p, m, u, o) => new
.LeftJoin<SysUser>((p,m,u,s)=>p.Handler==s.Id.ToString())
.LeftJoin<SysOrg>((p, m, u, s, o) => p.ReportUnit == o.Id.ToString())
.LeftJoin<SysOrg>((p, m, u, s, o,d) => p.HandlingUnit == d.Id.ToString())
.WhereIF(!string.IsNullOrEmpty(req.pointname), (p, m, u, s, o, d) => m.Name.Contains(req.pointname))
.OrderBy((p, m, u, s, o, d) => p.Status)
.OrderByDescending((p, m, u, s, o, d) => p.ReportTime)
.Select<dynamic>((p, m, u, s, o, d) => new
{
Id = p.Id.SelectAll(),
ReportUserName = u.Name,
PointName = m.Name,
OrgName = o.Name
OrgName = o.Name,
HandelUserName=s.Name,
HandelUnit=d.Name
})
.ToPageListAsync(req.page, req.limit, totalCount);
return new Response<PageInfo<List<dynamic>>>
@ -101,16 +105,20 @@ namespace OpenAuth.App
.Where(p => orgidlist.Contains(p.ReportUnit))
.LeftJoin<MiMinePoint>((p, m) => p.MinePointId == m.Id)
.LeftJoin<SysUser>((p, m, u) => p.Reporter == u.Id.ToString())
.LeftJoin<SysOrg>((p, m, u, o) => p.ReportUnit == o.Id.ToString())
.WhereIF(!string.IsNullOrEmpty(req.pointname), (p, m, u, o) => m.Name.Contains(req.pointname))
.OrderBy((p, m, u, o) => p.Status)
.OrderByDescending((p, m, u, o) => p.ReportTime)
.Select<dynamic>((p, m, u, o) => new
.LeftJoin<SysUser>((p, m, u, s) => p.Handler == s.Id.ToString())
.LeftJoin<SysOrg>((p, m, u, s, o) => p.ReportUnit == o.Id.ToString())
.LeftJoin<SysOrg>((p, m, u, s, o, d) => p.HandlingUnit == d.Id.ToString())
.WhereIF(!string.IsNullOrEmpty(req.pointname), (p, m, u, s, o, d) => m.Name.Contains(req.pointname))
.OrderBy((p, m, u, s, o, d) => p.Status)
.OrderByDescending((p, m, u, s, o, d) => p.ReportTime)
.Select<dynamic>((p, m, u, s, o, d) => new
{
Id = p.Id.SelectAll(),
ReportUserName = u.Name,
PointName = m.Name,
OrgName = o.Name
OrgName = o.Name,
HandelUserName = s.Name,
HandelUnit = d.Name
})
.ToPageListAsync(req.page, req.limit, totalCount);
@ -139,12 +147,14 @@ namespace OpenAuth.App
.LeftJoin<MiParking>((p, r, m, pk) => p.ParkingId == pk.Id)
.LeftJoin<SysUser>((p, r, m, pk,u) => p.Reporter == u.Id.ToString())
.LeftJoin<SysUser>((p, r, m, pk, u, u2) => p.Handler == u2.Id.ToString())
.Select((p, r, m, pk, u, u2) => new
.LeftJoin<SysOrg>((p, r, m, pk, u, u2,o)=>p.HandlingUnit==o.Id.ToString())
.Select((p, r, m, pk, u, u2, o) => new
{
// 提车信息
ReporterName = u.Name,
HandlerName = u2.Name,
ReportUnitName=r.Name,
HandUnitName=o.Name,
// 违法上报信息
p.Id,
@ -220,12 +230,15 @@ namespace OpenAuth.App
result.HandlingTime,
result.ReportTime,
result.Reporter,
result.ReporterName,
result.HandlerName,
result.ReportUnit,
result.ReportUnitName,
result.Lng,
result.Lat,
result.StatusName,
result.ViolationTypeName
result.ViolationTypeName,
result.HandUnitName
},
MinePoint = string.IsNullOrEmpty(result.MinePointId) ? null : new