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

修改

master
洁 任 2026-02-05 16:21:33 +08:00
parent 7680446b19
commit 4099544343
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/MiViolationReportApp.cs
View File

@ -41,7 +41,7 @@ namespace OpenAuth.App
if (user != null && (users.Id == -1 || level == 0))
{
var list = await base.Repository.AsQueryable()
.Where(p=>p.IsDelete == false)
.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(!string.IsNullOrEmpty(req.key), p => p.Title.Contains(req.key))
@ -57,7 +57,9 @@ namespace OpenAuth.App
Id = p.Id.SelectAll(),
ReportUserName = u.Name,
PointName = m.Name,
OrgName = o.Name
OrgName = o.Name,
StatusName = SqlFunc.Subqueryable<SysDataItemDetail>().Where(a => a.ItemCode == "FMViolationStatus" && a.ItemValue == p.Status.ToString()).Select(a => a.ItemName),
TypeName = SqlFunc.Subqueryable<SysDataItemDetail>().Where(a => a.ItemCode == "JGViolationType" && a.ItemValue == p.ViolationType.ToString()).Select(a => a.ItemName)
})
.ToPageListAsync(req.page, req.limit, totalCount);
return new Response<PageInfo<List<dynamic>>>
@ -84,7 +86,7 @@ namespace OpenAuth.App
{
foreach (var item in orgs)
{
orgidlist.Add(item.ToString());
//orgidlist.Add(item.ToString());
var allchilds = uow.SysOrg.AsQueryable().ToChildList(r => r.ParentId, item);
if (allchilds.Count > 0)
{
@ -98,7 +100,7 @@ namespace OpenAuth.App
.WhereIF(req.status != null, p => p.Status == req.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.HandlingUnit))
.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())
@ -110,7 +112,9 @@ namespace OpenAuth.App
Id = p.Id.SelectAll(),
ReportUserName = u.Name,
PointName = m.Name,
OrgName = o.Name
OrgName = o.Name,
StatusName = SqlFunc.Subqueryable<SysDataItemDetail>().Where(a => a.ItemCode == "FMViolationStatus" && a.ItemValue == p.Status.ToString()).Select(a => a.ItemName).First(),
TypeName = SqlFunc.Subqueryable<SysDataItemDetail>().Where(a => a.ItemCode == "JGViolationType" && a.ItemValue == p.ViolationType.ToString()).Select(a => a.ItemName).First()
})
.ToPageListAsync(req.page, req.limit, totalCount);
@ -136,9 +140,10 @@ namespace OpenAuth.App
.Where(p => p.Id == id)
.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())
.Select((p, r, m, u, u2) => 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())
.Select((p, r, m, pk, u, u2) => new
{
// 提车信息
ReporterName = u.Name,
@ -169,6 +174,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();
@ -226,7 +237,14 @@ namespace OpenAuth.App
result.MinePointLng,
result.MinePointLat
},
Parking = string.IsNullOrEmpty(result.ParkingId) ? null : new
{
result.ParkingId,
result.ParkingCode,
result.ParkingName,
result.Phone,
result.Address
},
Vehicles = vehicles.Select(v => new
{
v.Id,