master
洁 任
parent
6feca47f6a
commit
37649ad4fc
|
|
@ -1,6 +1,7 @@
|
|||
|
||||
using DocumentFormat.OpenXml.EMMA;
|
||||
using Infrastructure;
|
||||
using Infrastructure.Extensions;
|
||||
using NPOI.SS.Formula.Functions;
|
||||
using OpenAuth.App.BaseApp.Base;
|
||||
using OpenAuth.App.Interface;
|
||||
|
|
@ -30,12 +31,12 @@ namespace OpenAuth.App
|
|||
/// 电脑端分页查询
|
||||
/// </summary>
|
||||
public async Task<Response<PageInfo<List<dynamic>>>> LoadAllPage(MiVehiclePickUpreq req)
|
||||
{
|
||||
{
|
||||
RefAsync<int> totalCount = 0;
|
||||
var user=_auth.GetCurrentUser();
|
||||
var user = _auth.GetCurrentUser();
|
||||
var users = user.User;
|
||||
//如果不是超级管理员
|
||||
if(user != null && users.Id != -1)
|
||||
if (user != null && users.Id != -1)
|
||||
{
|
||||
//查询所有子部门
|
||||
List<string> orgidlist = new List<string>();
|
||||
|
|
@ -89,7 +90,7 @@ namespace OpenAuth.App
|
|||
.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)
|
||||
.OrderByDescending((p, r, m, u) => p.InitiateTime)
|
||||
.Select<dynamic>((p, r, m, u) => new
|
||||
{
|
||||
Id = p.Id.SelectAll(),
|
||||
|
|
@ -118,7 +119,7 @@ namespace OpenAuth.App
|
|||
var list = await base.Repository.AsQueryable()
|
||||
.Where(p => p.Status == 1)
|
||||
.LeftJoin<MiViolationReport>((p, r) => p.ViolationReportId == r.Id)
|
||||
.Where((p, r)=>r.ParkingId==parkingid)
|
||||
.Where((p, r) => r.ParkingId == parkingid)
|
||||
.LeftJoin<MiMinePoint>((p, r, m) => r.MinePointId == m.Id)
|
||||
.LeftJoin<SysUser>((p, r, m, u) => p.Initiator == u.Id.ToString())
|
||||
.OrderByDescending(p => p.InitiateTime)
|
||||
|
|
@ -136,10 +137,179 @@ namespace OpenAuth.App
|
|||
}
|
||||
#endregion
|
||||
|
||||
public async Task<MiVehiclePickup> Get(object id)
|
||||
|
||||
public async Task<dynamic> Get(string id)
|
||||
{
|
||||
return await Repository.GetByIdAsync(id);
|
||||
using (var uow = base.UnitWork.CreateContext())
|
||||
{
|
||||
var result = await base.Repository.AsQueryable()
|
||||
.Where(p => p.Id == id)
|
||||
.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())
|
||||
.LeftJoin<SysUser>((p, r, m, u, u2) => p.Reviewer == u2.Id.ToString())
|
||||
.Select((p, r, m, u, u2) => new
|
||||
{
|
||||
// 提车信息
|
||||
PickupId = p.Id,
|
||||
p.Status,
|
||||
p.Initiator,
|
||||
InitiatorName = u.Name,
|
||||
p.InitiateTime,
|
||||
p.Reviewer,
|
||||
ReviewerName = u2.Name,
|
||||
p.ReviewTime,
|
||||
p.Remark,
|
||||
|
||||
// 违法上报信息
|
||||
ReportId = r.Id,
|
||||
r.Title,
|
||||
ReportStatus = r.Status,
|
||||
r.PartyName,
|
||||
r.PartyPhone,
|
||||
r.ViolationType,
|
||||
r.ProblemDescription,
|
||||
r.HandlingOpinion,
|
||||
r.HandlingUnit,
|
||||
r.Handler,
|
||||
r.HandlingTime,
|
||||
r.ReportTime,
|
||||
r.Reporter,
|
||||
r.ReportUnit,
|
||||
r.Lng,
|
||||
r.Lat,
|
||||
|
||||
// 盗采点信息
|
||||
MinePointId = m.Id,
|
||||
MinePointName = m.Name,
|
||||
m.CountyName,
|
||||
MinePointLng = m.Lng,
|
||||
MinePointLat = m.Lat,
|
||||
})
|
||||
.FirstAsync();
|
||||
|
||||
if (result == null)
|
||||
return null;
|
||||
|
||||
// 查询车辆信息
|
||||
var vehicles = await uow.MiVehicle.AsQueryable()
|
||||
.Where(v => v.ViolationReportId == result.ReportId)
|
||||
.ToListAsync();
|
||||
|
||||
// 查询车辆图片
|
||||
List<MiVehicleImage> vehicleImages = new List<MiVehicleImage>();
|
||||
if (vehicles.Any())
|
||||
{
|
||||
var vehicleIds = vehicles.Select(v => v.Id).ToList();
|
||||
vehicleImages = await uow.MiVehicleImage.AsQueryable()
|
||||
.Where(vi => vehicleIds.Contains(vi.VehicleId))
|
||||
.ToListAsync();
|
||||
}
|
||||
|
||||
// 查询现场照片
|
||||
var scenePhotos = await uow.MiScenePhoto.AsQueryable()
|
||||
.Where(sp => sp.ViolationReportId == result.ReportId)
|
||||
.ToListAsync();
|
||||
|
||||
return new
|
||||
{
|
||||
PickupInfo = new
|
||||
{
|
||||
result.PickupId,
|
||||
result.Status,
|
||||
result.Initiator,
|
||||
result.InitiatorName,
|
||||
result.InitiateTime,
|
||||
result.Reviewer,
|
||||
result.ReviewerName,
|
||||
result.ReviewTime,
|
||||
result.Remark
|
||||
},
|
||||
|
||||
ViolationReport = new
|
||||
{
|
||||
result.ReportId,
|
||||
result.Title,
|
||||
result.ReportStatus,
|
||||
result.PartyName,
|
||||
result.PartyPhone,
|
||||
result.ViolationType,
|
||||
result.ProblemDescription,
|
||||
result.HandlingOpinion,
|
||||
result.HandlingUnit,
|
||||
result.Handler,
|
||||
result.HandlingTime,
|
||||
result.ReportTime,
|
||||
result.Reporter,
|
||||
result.ReportUnit,
|
||||
result.Lng,
|
||||
result.Lat
|
||||
},
|
||||
|
||||
MinePoint = string.IsNullOrEmpty(result.MinePointId) ? null : new
|
||||
{
|
||||
result.MinePointId,
|
||||
result.MinePointName,
|
||||
result.CountyName,
|
||||
result.MinePointLng,
|
||||
result.MinePointLat
|
||||
},
|
||||
|
||||
Vehicles = vehicles.Select(v => new
|
||||
{
|
||||
v.Id,
|
||||
v.LicensePlate,
|
||||
v.Type,
|
||||
v.Name,
|
||||
v.IdCard,
|
||||
v.Phone,
|
||||
Images = vehicleImages
|
||||
.Where(img => img.VehicleId == v.Id)
|
||||
.Select(img => new
|
||||
{
|
||||
img.Id,
|
||||
img.Image,
|
||||
img.Lng,
|
||||
img.Lat,
|
||||
img.Angle,
|
||||
img.CreateTime
|
||||
})
|
||||
.ToList()
|
||||
}).ToList(),
|
||||
|
||||
ScenePhotos = scenePhotos.Select(sp => new
|
||||
{
|
||||
sp.Id,
|
||||
sp.Image,
|
||||
sp.Lng,
|
||||
sp.Lat,
|
||||
sp.Angle,
|
||||
sp.CreateTime
|
||||
}).ToList()
|
||||
};
|
||||
}
|
||||
}
|
||||
//public async Task<dynamic> Get(string id)
|
||||
//{
|
||||
// var list = await base.Repository.AsQueryable()
|
||||
// .Where(p => p.Id == id)
|
||||
// .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())
|
||||
// .OrderByDescending(p => p.InitiateTime)
|
||||
// .Select<dynamic>((p, r, m, u) => new
|
||||
// {
|
||||
// Id = p.Id.SelectAll(),
|
||||
// InitiatorName = u.Name,
|
||||
// Vehicle = SqlFunc.Subqueryable<MiVehicle>().Where(a => a.ViolationReportId == r.Id).Select(a => new
|
||||
// {
|
||||
// VehicleInfo = a.Id.SelectAll(),
|
||||
// image = SqlFunc.Subqueryable<MiVehicleImage>().Where(b => b.VehicleId == a.Id).ToList()
|
||||
// }),
|
||||
// PointName = m.Name
|
||||
// }).ToListAsync();
|
||||
// return await Repository.GetByIdAsync(id);
|
||||
//}
|
||||
/// <summary>
|
||||
/// 添加
|
||||
/// </summary>
|
||||
|
|
@ -159,7 +329,7 @@ namespace OpenAuth.App
|
|||
var violat = await base.Repository.ChangeRepository<SugarRepositiry<MiViolationReport>>().AsQueryable().Where(R => R.Id == model.ViolationReportId).FirstAsync();
|
||||
violat.Status = 2;
|
||||
await uow.MiViolationReport.UpdateAsync(violat);
|
||||
var flag=uow.Commit();
|
||||
var flag = uow.Commit();
|
||||
|
||||
return new Response<bool>
|
||||
{
|
||||
|
|
@ -177,14 +347,14 @@ namespace OpenAuth.App
|
|||
/// <param name="ids"></param>
|
||||
public async Task<Response<bool>> Delete(List<string> ids)
|
||||
{
|
||||
var flag = await Repository.DeleteAsync(r=>ids.Contains(r.Id));
|
||||
var flag = await Repository.DeleteAsync(r => ids.Contains(r.Id));
|
||||
|
||||
return new Response<bool>
|
||||
{
|
||||
Result = flag,
|
||||
Message = flag == true ? "success" : "error"
|
||||
};
|
||||
|
||||
return new Response<bool>
|
||||
{
|
||||
Result = flag,
|
||||
Message = flag == true ? "success" : "error"
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -209,10 +379,10 @@ namespace OpenAuth.App
|
|||
/// <param name="obj"></param>
|
||||
public async Task<Response<bool>> PickUpAudit(PickUpAuditReq model)
|
||||
{
|
||||
var user=_auth.GetCurrentUser().User;
|
||||
var info=await base.Repository.AsQueryable().Where(R=>R.Id== model.Id).FirstAsync();
|
||||
var user = _auth.GetCurrentUser().User;
|
||||
var info = await base.Repository.AsQueryable().Where(R => R.Id == model.Id).FirstAsync();
|
||||
var violat = await base.Repository.ChangeRepository<SugarRepositiry<MiViolationReport>>().AsQueryable().Where(R => R.Id == info.ViolationReportId).FirstAsync();
|
||||
if (info != null)
|
||||
if (info != null)
|
||||
{
|
||||
using (var uow = base.UnitWork.CreateContext())
|
||||
{
|
||||
|
|
@ -256,7 +426,7 @@ namespace OpenAuth.App
|
|||
var user = _auth.GetCurrentUser().User;
|
||||
var info = await base.Repository.AsQueryable().Where(R => R.Id == model.Id).FirstAsync();
|
||||
var violat = await base.Repository.ChangeRepository<SugarRepositiry<MiViolationReport>>().AsQueryable().Where(R => R.Id == info.ViolationReportId).FirstAsync();
|
||||
|
||||
|
||||
if (info != null)
|
||||
{
|
||||
using (var uow = base.UnitWork.CreateContext())
|
||||
|
|
@ -265,7 +435,7 @@ namespace OpenAuth.App
|
|||
await uow.MiVehiclePickup.UpdateAsync(info);
|
||||
violat.Status = 4;
|
||||
await uow.MiViolationReport.UpdateAsync(violat);
|
||||
var flag=uow.Commit();
|
||||
var flag = uow.Commit();
|
||||
|
||||
return new Response<bool>
|
||||
{
|
||||
|
|
@ -288,7 +458,7 @@ namespace OpenAuth.App
|
|||
public async Task<Response<bool>> AssignModule()
|
||||
{
|
||||
using (var uwo = UnitWork.CreateContext())
|
||||
{
|
||||
{
|
||||
//await uwo.SysRoleElement.InsertRangeAsync(model.ElementIds.Select(a => new SysRoleElement { RoleId = model.RoleId, ElementId = a }).ToList());
|
||||
|
||||
var flag = uwo.Commit();
|
||||
|
|
|
|||
|
|
@ -37,6 +37,11 @@ namespace OpenAuth.WebApi.Controllers
|
|||
return await _app.LoadAllPage(request);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// app扫码查询当前停车场提车信息
|
||||
/// </summary>
|
||||
/// <param name="parkingid">停车场id</param>
|
||||
/// <returns></returns>
|
||||
[HttpGet]
|
||||
public async Task<Response<List<dynamic>>> Loadpickupinfo(string parkingid)
|
||||
{
|
||||
|
|
@ -50,9 +55,10 @@ namespace OpenAuth.WebApi.Controllers
|
|||
/// 实体
|
||||
/// </summary>
|
||||
[HttpGet]
|
||||
public async Task<Response<MiVehiclePickup>> Get(object id)
|
||||
[AllowAnonymous]
|
||||
public async Task<Response<dynamic>> Get(string id)
|
||||
{
|
||||
var result = new Response<MiVehiclePickup>();
|
||||
var result = new Response<dynamic>();
|
||||
try
|
||||
{
|
||||
result.Result =await _app.Get(id);
|
||||
|
|
|
|||
Loading…
Reference in New Issue