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

修改

master
洁 任 2026-02-12 10:05:18 +08:00
parent 7001cac12a
commit 4744d4d338
1 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
OpenAuth.App/ServiceApp/MiManager/MiVehiclePickupApp.cs
View File

@ -88,14 +88,17 @@ namespace OpenAuth.App
.LeftJoin<MiViolationReport>((p, r) => p.ViolationReportId == r.Id)
.LeftJoin<MiMinePoint>((p, r, m) => r.MinePointId == m.Id)
.LeftJoin<SysUser>((p, r, m, u) => p.Initiator == u.Id.ToString())
.WhereIF(!string.IsNullOrEmpty(req.pointname), (p, r, m, u) => m.Name.Contains(req.pointname))
.WhereIF(!string.IsNullOrEmpty(req.key), (p, r, m, u) => u.Name.Contains(req.key))
.OrderByDescending((p, r, m, u) => p.InitiateTime)
.Select<dynamic>((p, r, m, u) => new
.LeftJoin<SysUser>((p, r, m, u,u1) => p.Reviewer == u1.Id.ToString())
.WhereIF(!string.IsNullOrEmpty(req.pointname), (p, r, m, u, u1) => m.Name.Contains(req.pointname))
.WhereIF(!string.IsNullOrEmpty(req.key), (p, r, m, u, u1) => u.Name.Contains(req.key))
.OrderByDescending((p, r, m, u, u1) => p.InitiateTime)
.Select<dynamic>((p, r, m, u, u1) => new
{
Id = p.Id.SelectAll(),
InitiatorName = u.Name,
PointName = m.Name
PointName = m.Name,
ReviewerName = u1.Name
})
.ToPageListAsync(req.page, req.limit, totalCount);
return new Response<PageInfo<List<dynamic>>>
@ -167,10 +170,11 @@ namespace OpenAuth.App
.Where(p => p.Id == result.ViolationReportId)
.LeftJoin<SysOrg>((p, r) => p.ReportUnit == r.Id.ToString())
.LeftJoin<MiMinePoint>((p, r, m) => p.MinePointId == m.Id)
.LeftJoin<SysUser>((p, r, m, u) => p.Reporter == u.Id.ToString())
.LeftJoin<SysUser>((p, r, m, u, u2) => p.Handler == u2.Id.ToString())
.LeftJoin<SysOrg>((p, r, m, u, u2, o) => p.HandlingUnit == o.Id.ToString())
.Select((p, r, m, u, u2, o) => new
.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())
.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,
@ -201,6 +205,12 @@ namespace OpenAuth.App
m.CountyName,
MinePointLng = m.Lng,
MinePointLat = m.Lat,
// 停车场信息
ParkingId = pk.Id,
ParkingCode = pk.Num,
ParkingName = pk.Name,
pk.Phone,
pk.Address
})
.FirstAsync();
@ -276,6 +286,14 @@ namespace OpenAuth.App
result1.MinePointLng,
result1.MinePointLat
},
Parking = string.IsNullOrEmpty(result1.ParkingId) ? null : new
{
result1.ParkingId,
result1.ParkingCode,
result1.ParkingName,
result1.Phone,
result1.Address
},
Vehicles = vehicles.Select(v => new
{