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

提车信息相关添加

master
洁 任 2026-02-04 17:00:58 +08:00
parent 95430823d5
commit 6feca47f6a
8 changed files with 320 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,11 +1,15 @@
using DocumentFormat.OpenXml.EMMA;
using Infrastructure;
using NPOI.SS.Formula.Functions;
using OpenAuth.App.BaseApp.Base;
using OpenAuth.App.Interface;
using OpenAuth.App.Request;
using OpenAuth.App.Response;
using OpenAuth.App.ServiceApp.MiManager.Request;
using OpenAuth.Repository;
using OpenAuth.Repository.Domain;
using Org.BouncyCastle.Ocsp;
using SqlSugar;
namespace OpenAuth.App
@ -23,22 +27,111 @@ namespace OpenAuth.App
#region 查询
/// <summary>
/// 分页
/// 电脑端分页查询
/// </summary>
public async Task<Response<PageInfo<List<MiVehiclePickup>>>> LoadAllPage(PageReq request)
public async Task<Response<PageInfo<List<dynamic>>>> LoadAllPage(MiVehiclePickUpreq req)
{
RefAsync<int> totalCount = 0;
var result = new PageInfo<SysRole>();
var list = await base.Repository.AsQueryable()
.ToPageListAsync(request.page, request.limit, totalCount);
return new Response<PageInfo<List<MiVehiclePickup>>>
var user=_auth.GetCurrentUser();
var users = user.User;
//如果不是超级管理员
if(user != null && users.Id != -1)
{
Result = new PageInfo<List<MiVehiclePickup>>
//查询所有子部门
List<string> orgidlist = new List<string>();
var orgs = user.Orgs?.Select(r => r.Id).ToList();
using (var uow = base.UnitWork.CreateContext())
{
Items = list,
Total = totalCount
foreach (var item in orgs)
{
orgidlist.Add(item.ToString());
var allchilds = uow.SysOrg.AsQueryable().ToChildList(r => r.ParentId, item);
if (allchilds.Count > 0)
{
orgidlist = orgidlist.Concat(allchilds.Select(r => r.Id.ToString())).ToList();
}
}
var list = await uow.MiVehiclePickup.AsQueryable()
.WhereIF(req.begindate != null && req.enddate != null, p => p.InitiateTime >= req.begindate && p.InitiateTime < req.enddate)
.WhereIF(req.status != null, p => p.Status == req.status)
.LeftJoin<MiViolationReport>((p, r) => p.ViolationReportId == r.Id)
.Where((p, r) => orgidlist.Contains(r.HandlingUnit))
.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
{
Id = p.Id.SelectAll(),
InitiatorName = u.Name,
PointName = m.Name
})
.ToPageListAsync(req.page, req.limit, totalCount);
return new Response<PageInfo<List<dynamic>>>
{
Result = new PageInfo<List<dynamic>>
{
Items = list,
Total = totalCount
}
};
}
}
else
{
var list = await base.Repository.AsQueryable()
.WhereIF(req.begindate != null && req.enddate != null, p => p.InitiateTime >= req.begindate && p.InitiateTime < req.enddate)
.WhereIF(req.status != null, p => p.Status == req.status)
.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
{
Id = p.Id.SelectAll(),
InitiatorName = u.Name,
PointName = m.Name
})
.ToPageListAsync(req.page, req.limit, totalCount);
return new Response<PageInfo<List<dynamic>>>
{
Result = new PageInfo<List<dynamic>>
{
Items = list,
Total = totalCount
}
};
}
}
/// <summary>
/// app扫码查询当前停车场提车信息
/// </summary>
/// <param name="parkingid"></param>
/// <returns></returns>
public async Task<Response<List<dynamic>>> Loadpickupinfo(string parkingid)
{
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)
.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,
PointName = m.Name
}).ToListAsync();
return new Response<List<dynamic>>
{
Result = list
};
}
#endregion
@ -47,20 +140,33 @@ namespace OpenAuth.App
{
return await Repository.GetByIdAsync(id);
}
/// <summary>
/// 添加
/// </summary>
public async Task<Response<bool>> Add(MiVehiclePickup model)
{
var flag = await Repository.InsertAsync(model);
return new Response<bool>
{
if (string.IsNullOrEmpty(model.ViolationReportId))
{
Result = flag,
Message = flag == true ? "success" : "error"
};
throw new Exception("请指定违法信息");
}
using (var uow = base.UnitWork.CreateContext())
{
model.Id = Guid.NewGuid().ToString();
model.InitiateTime = DateTime.Now;
model.Status = 0;
await uow.MiVehiclePickup.InsertAsync(model);
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();
return new Response<bool>
{
Result = flag,
Message = flag == true ? "success" : "error"
};
}
}
@ -69,9 +175,9 @@ namespace OpenAuth.App
/// 删除
/// </summary>
/// <param name="ids"></param>
public async Task<Response<bool>> Delete(List<MiVehiclePickup> models)
public async Task<Response<bool>> Delete(List<string> ids)
{
var flag = await Repository.DeleteAsync(models);
var flag = await Repository.DeleteAsync(r=>ids.Contains(r.Id));
return new Response<bool>
{
@ -96,6 +202,84 @@ namespace OpenAuth.App
};
}
/// <summary>
/// 审核
/// </summary>
/// <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 violat = await base.Repository.ChangeRepository<SugarRepositiry<MiViolationReport>>().AsQueryable().Where(R => R.Id == info.ViolationReportId).FirstAsync();
if (info != null)
{
using (var uow = base.UnitWork.CreateContext())
{
if (model.Isagree)
{
info.Status = 1;
}
else
{
info.Status = 2;
}
info.ReviewComments = model.ReviewComments;
info.Reviewer = user.Id.ToString();
info.ReviewTime = DateTime.Now;
await uow.MiVehiclePickup.UpdateAsync(info);
violat.Status = 3;
await uow.MiViolationReport.UpdateAsync(violat);
var flag = uow.Commit();
return new Response<bool>
{
Result = flag,
Message = flag == true ? "success" : "error"
};
}
}
else
{
throw new Exception("数据丢失");
}
}
/// <summary>
/// 提车
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
/// <exception cref="Exception"></exception>
public async Task<Response<bool>> PickUpCar(PickupCar model)
{
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())
{
info.Status = 3;
await uow.MiVehiclePickup.UpdateAsync(info);
violat.Status = 4;
await uow.MiViolationReport.UpdateAsync(violat);
var flag=uow.Commit();
return new Response<bool>
{
Result = flag,
Message = flag == true ? "success" : "error"
};
}
}
else
{
throw new Exception("数据丢失");
}
}
/// <summary>
/// 事务示例
/// </summary>

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

@ -151,7 +151,7 @@ namespace OpenAuth.App
//上报信息
var model = request.MapTo<MiViolationReport>();
model.Id = Guid.NewGuid().ToString();
model.Status = "待处理";
model.Status = 0;
//现场照片
var photos = request.SencePhotos.MapToList<MiScenePhoto>();

18
OpenAuth.App/ServiceApp/MiManager/Request/MiVehiclePickUpreq.cs Normal file
View File

@ -0,0 +1,18 @@
using OpenAuth.App.Request;
using Org.BouncyCastle.Bcpg.OpenPgp;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace OpenAuth.App.ServiceApp.MiManager.Request
{
public class MiVehiclePickUpreq: PageReq
{
public string pointname { get; set; }
public DateTime? begindate { get; set; }
public DateTime? enddate { get; set; }
public short? status { get; set; }
}
}

24
OpenAuth.App/ServiceApp/MiManager/Request/PickUpAuditReq.cs Normal file
View File

@ -0,0 +1,24 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace OpenAuth.App.ServiceApp.MiManager.Request
{
public class PickUpAuditReq
{
/// <summary>
/// 提车信息id
/// </summary>
public string Id { get; set; }
/// <summary>
/// 审核是否通过
/// </summary>
public bool Isagree { get; set; }
/// <summary>
/// 审核意见
/// </summary>
public string ReviewComments { get; set; }
}
}

13
OpenAuth.App/ServiceApp/MiManager/Request/PickupCar.cs Normal file
View File

@ -0,0 +1,13 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace OpenAuth.App.ServiceApp.MiManager.Request
{
public class PickupCar
{
public string Id { get; set; }
}
}

12
OpenAuth.Repository/Domain/MiVehiclePickup.cs
View File

@ -35,7 +35,7 @@ namespace OpenAuth.Repository.Domain
/// Default:'待审核'::character varying
/// Nullable:True
/// </summary>
public string Status {get;set;}
public short? Status {get;set;}
/// <summary>
/// Desc:发起人
@ -72,12 +72,10 @@ namespace OpenAuth.Repository.Domain
/// </summary>
public string Remark {get;set;}
/// <summary>
/// Desc:创建时间
/// Default:DateTime.Now
/// Nullable:True
/// </summary>
public DateTime? CreateTime {get;set;}
/// <summary>
/// 审核意见
/// </summary>
public string ReviewComments { get;set;}
}
}

2
OpenAuth.Repository/Domain/MiViolationReport.cs
View File

@ -36,7 +36,7 @@ namespace OpenAuth.Repository.Domain
/// Default:'待处理'::character varying
/// Nullable:True
/// </summary>
public string Status { get; set; }
public short? Status { get; set; }
/// <summary>
/// Desc:当事人姓名

56
OpenAuth.WebApi/Controllers/ServiceControllers/MiVehiclePickupController.cs
View File

@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Mvc;
using OpenAuth.App;
using OpenAuth.App.Request;
using OpenAuth.App.Response;
using OpenAuth.App.ServiceApp.MiManager.Request;
using OpenAuth.Repository.Domain;
namespace OpenAuth.WebApi.Controllers
@ -31,11 +32,17 @@ namespace OpenAuth.WebApi.Controllers
/// 分页
/// </summary>
[HttpGet]
public async Task<Response<PageInfo<List<MiVehiclePickup>>>> LoadAllPage([FromQuery] PageReq request)
public async Task<Response<PageInfo<List<dynamic>>>> LoadAllPage([FromQuery] MiVehiclePickUpreq request)
{
return await _app.LoadAllPage(request);
}
[HttpGet]
public async Task<Response<List<dynamic>>> Loadpickupinfo(string parkingid)
{
return await _app.Loadpickupinfo(parkingid);
}
#endregion
#region 实体
@ -113,12 +120,55 @@ namespace OpenAuth.WebApi.Controllers
/// 删除
/// </summary>
[HttpPost]
public async Task<Response<bool>> Delete([FromBody] List<MiVehiclePickup> models)
public async Task<Response<bool>> Delete([FromBody] List<string> ids)
{
var result = new Response<bool>();
try
{
result = await _app.Delete(models);
result = await _app.Delete(ids);
}
catch (Exception ex)
{
result.Code = 500;
result.Message = ex.InnerException?.Message ?? ex.Message;
}
return result;
}
#endregion
#region 提车审核
/// <summary>
/// 提车审核
/// </summary>
[HttpPost]
public async Task<Response<bool>> PickUpAudit(PickUpAuditReq model)
{
var result = new Response<bool>();
try
{
result = await _app.PickUpAudit(model);
}
catch (Exception ex)
{
result.Code = 500;
result.Message = ex.InnerException?.Message ?? ex.Message;
}
return result;
}
/// <summary>
/// 提车确认
/// </summary>
[HttpPost]
public async Task<Response<bool>> PickUpCar(PickupCar model)
{
var result = new Response<bool>();
try
{
result = await _app.PickUpCar(model);
}
catch (Exception ex)