项目变更及历史项目列表及导出加用户过滤

dev
陈伟 2025-05-25 13:57:06 +08:00
parent 575ab75323
commit 13e52a0c9d
1 changed files with 36 additions and 0 deletions

View File

@ -107,6 +107,14 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
/// <exception cref="NotImplementedException"></exception>
public PageInfo<List<DroneSsnyd>> HistoryProject(DroneSsnyAppPageReq req)
{
//获取当前登录用户
var orgs = _auth.GetCurrentUser().Orgs;
List<string> ids= new List<string>();
if (orgs != null && orgs.Count > 0)
{
ids=orgs.Select(r=>r.Id.ToString()).ToList();
}
bool issystem=_auth.IsSystem();
var totalCount = 0;
var list = Repository.AsQueryable()
.Where(a => a.handle_status_id == 99)
@ -114,6 +122,7 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
.WhereIF(!string.IsNullOrEmpty(req.xiangmu_yt), a => a.xiangmu_yt == req.xiangmu_yt)
.WhereIF(!string.IsNullOrEmpty(req.xiangmu_no), a => a.xiangmu_no.Contains(req.xiangmu_no))
.WhereIF(!string.IsNullOrEmpty(req.xiangmu_name), a => a.xiangmu_name.Contains(req.xiangmu_name))
.WhereIF(!issystem,a=>(ids.Contains(a.countyid)||ids.Contains(a.streetid)))
.OrderBy(a => a.end_time, OrderByType.Desc)
.ToPageList(req.page, req.limit, ref totalCount);
return new PageInfo<List<DroneSsnyd>>
@ -130,6 +139,14 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
/// <returns></returns>
public PageInfo<List<DroneSsnyd>> ProjectChange(DroneSsnyAppPageReq req)
{
//获取当前登录用户
var orgs = _auth.GetCurrentUser().Orgs;
List<string> ids= new List<string>();
if (orgs != null && orgs.Count > 0)
{
ids=orgs.Select(r=>r.Id.ToString()).ToList();
}
bool issystem=_auth.IsSystem();
var totalCount = 0;
var list = Repository.AsQueryable()
.Where(a => a.handle_status_id != 99)
@ -137,6 +154,7 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
.WhereIF(!string.IsNullOrEmpty(req.xiangmu_yt), a => a.xiangmu_yt == req.xiangmu_yt)
.WhereIF(!string.IsNullOrEmpty(req.xiangmu_no), a => a.xiangmu_no.Contains(req.xiangmu_no))
.WhereIF(!string.IsNullOrEmpty(req.xiangmu_name), a => a.xiangmu_name.Contains(req.xiangmu_name))
.WhereIF(!issystem,a=>(ids.Contains(a.countyid)||ids.Contains(a.streetid)))
.OrderBy(a => a.end_time, OrderByType.Desc)
.ToPageList(req.page, req.limit, ref totalCount);
return new PageInfo<List<DroneSsnyd>>
@ -148,12 +166,21 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
public List<DroneSsnydExport> HistoryProjectList(DroneSnnyAppReq req)
{
//获取当前登录用户
var orgs = _auth.GetCurrentUser().Orgs;
List<string> ids= new List<string>();
if (orgs != null && orgs.Count > 0)
{
ids=orgs.Select(r=>r.Id.ToString()).ToList();
}
bool issystem=_auth.IsSystem();
var list = Repository.AsQueryable()
.Where(a => a.handle_status_id == 99)
.WhereIF(!string.IsNullOrEmpty(req.streetid), a => a.streetid == req.streetid)
.WhereIF(!string.IsNullOrEmpty(req.xiangmu_yt), a => a.xiangmu_yt == req.xiangmu_yt)
.WhereIF(!string.IsNullOrEmpty(req.xiangmu_no), a => a.xiangmu_no.Contains(req.xiangmu_no))
.WhereIF(!string.IsNullOrEmpty(req.xiangmu_name), a => a.xiangmu_name.Contains(req.xiangmu_name))
.WhereIF(!issystem,a=>(ids.Contains(a.countyid)||ids.Contains(a.streetid)))
.Select(
a => new DroneSsnydExport()
{
@ -179,12 +206,21 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
public List<DroneSsnydExport> ProjectChangeExport(DroneSnnyAppReq req)
{
//获取当前登录用户
var orgs = _auth.GetCurrentUser().Orgs;
List<string> ids= new List<string>();
if (orgs != null && orgs.Count > 0)
{
ids=orgs.Select(r=>r.Id.ToString()).ToList();
}
bool issystem=_auth.IsSystem();
var list = Repository.AsQueryable()
.Where(a => a.handle_status_id != 99)
.WhereIF(!string.IsNullOrEmpty(req.streetid), a => a.streetid == req.streetid)
.WhereIF(!string.IsNullOrEmpty(req.xiangmu_yt), a => a.xiangmu_yt == req.xiangmu_yt)
.WhereIF(!string.IsNullOrEmpty(req.xiangmu_no), a => a.xiangmu_no.Contains(req.xiangmu_no))
.WhereIF(!string.IsNullOrEmpty(req.xiangmu_name), a => a.xiangmu_name.Contains(req.xiangmu_name))
.WhereIF(!issystem,a=>(ids.Contains(a.countyid)||ids.Contains(a.streetid)))
.Select(
a => new DroneSsnydExport()
{