chenwei
/
lanlingxian_ziranziyuanheguihua
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: chenwei:29697615e50c3c8c3220329169d356ad7a297981
Branches Tags
chenwei:dev
chenwei:main
...
compare: chenwei:7bb33e9788b0803b94b4675be25ef681ba5e12f8
Branches Tags
chenwei:dev
chenwei:main

3 Commits
29697615e5 ... 7bb33e9788

Author SHA1 Message Date
洁 任 7bb33e9788 合并 2025-05-25 11:34:20 +08:00
洁 任 2cf9a98f56 添加登录用户乡镇筛选 2025-05-25 11:33:17 +08:00
洁 任 005e440a9a 注释添加 2025-05-24 17:33:42 +08:00
2 changed files with 47 additions and 2 deletions
Show Stats Expand all files Collapse all files

43
OpenAuth.App/ServiceApp/DroneSsnydManage/DroneSsnyApp.cs
View File

@ -31,12 +31,22 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
int totalCount = 0;
var endTime = DateTime.Now.AddMonths(2);
//获取当前登录用户
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 = base.Repository.AsQueryable()
.WhereIF(!string.IsNullOrEmpty(xiangmumc), a => a.xiangmu_name.Contains(xiangmumc))
.WhereIF(!string.IsNullOrEmpty(countyid), a => a.countyid == countyid)
.WhereIF(!string.IsNullOrEmpty(streetid), a => a.streetid == streetid)
.WhereIF(!string.IsNullOrEmpty(xiangmuyt), a => a.xiangmu_yt == xiangmuyt)
.WhereIF(!string.IsNullOrEmpty(xiangmuno), a => a.xiangmu_no == xiangmuno)
.WhereIF(!string.IsNullOrEmpty(xiangmuyt),a=>a.xiangmu_yt== xiangmuyt)
.WhereIF(!string.IsNullOrEmpty(xiangmuno),a=>a.xiangmu_no==xiangmuno)
.WhereIF(!issystem,a=>(ids.Contains(a.countyid)||ids.Contains(a.streetid)))
.Where(a => a.end_time <= endTime && a.end_time > DateTime.Now)
.OrderBy(a => a.end_time, OrderByType.Desc)
.ToPageList(pageIndex, pageSize, ref totalCount);
@ -62,12 +72,22 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
int totalCount = 0;
var endTime = DateTime.Now;
//获取当前登录用户
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 = base.Repository.AsQueryable()
.WhereIF(!string.IsNullOrEmpty(xiangmumc), a => a.xiangmu_name.Contains(xiangmumc))
.WhereIF(!string.IsNullOrEmpty(countyid), a => a.countyid == countyid)
.WhereIF(!string.IsNullOrEmpty(streetid), a => a.streetid == streetid)
.WhereIF(!string.IsNullOrEmpty(xiangmuyt), a => a.xiangmu_yt == xiangmuyt)
.WhereIF(!string.IsNullOrEmpty(xiangmuno), a => a.xiangmu_no == xiangmuno)
.WhereIF(!issystem, a => (ids.Contains(a.countyid) || ids.Contains(a.streetid)))
.Where(a => a.end_time < endTime)
.OrderBy(a => a.end_time, OrderByType.Desc)
.ToPageList(pageIndex, pageSize, ref totalCount);
@ -197,12 +217,22 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
{
var endTime = DateTime.Now.AddMonths(2);
//获取当前登录用户
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 = base.Repository.AsQueryable()
.WhereIF(!string.IsNullOrEmpty(xiangmumc), a => a.xiangmu_name.Contains(xiangmumc))
.WhereIF(!string.IsNullOrEmpty(countyid), a => a.countyid == countyid)
.WhereIF(!string.IsNullOrEmpty(streetid), a => a.streetid == streetid)
.WhereIF(!string.IsNullOrEmpty(xiangmuyt), a => a.xiangmu_yt == xiangmuyt)
.WhereIF(!string.IsNullOrEmpty(xiangmuno), a => a.xiangmu_no == xiangmuno)
.WhereIF(!issystem, a => (ids.Contains(a.countyid) || ids.Contains(a.streetid)))
.Where(a => a.end_time <= endTime && a.end_time > DateTime.Now)
.OrderBy(a => a.end_time, OrderByType.Desc)
.ToList();
@ -221,12 +251,21 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
{
var endTime = DateTime.Now;
//获取当前登录用户
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 = base.Repository.AsQueryable()
.WhereIF(!string.IsNullOrEmpty(xiangmumc), a => a.xiangmu_name.Contains(xiangmumc))
.WhereIF(!string.IsNullOrEmpty(countyid), a => a.countyid == countyid)
.WhereIF(!string.IsNullOrEmpty(streetid), a => a.streetid == streetid)
.WhereIF(!string.IsNullOrEmpty(xiangmuyt), a => a.xiangmu_yt == xiangmuyt)
.WhereIF(!string.IsNullOrEmpty(xiangmuno), a => a.xiangmu_no == xiangmuno)
.WhereIF(!issystem, a => (ids.Contains(a.countyid) || ids.Contains(a.streetid)))
.Where(a => a.end_time < endTime)
.OrderBy(a => a.end_time, OrderByType.Desc)
.ToList();

6
OpenAuth.WebApi/Controllers/ServiceControllers/DroneSsnyController.cs
View File

@ -29,6 +29,8 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
/// <param name="xiangmumc">项目名称</param>
/// <param name="countyid">县</param>
/// <param name="streetid">镇</param>
/// <param name="xiangmuno">项目编号</param>
/// <param name="xiangmuyt">项目用途</param>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <returns></returns>
@ -59,6 +61,8 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
/// <param name="xiangmumc">项目名称</param>
/// <param name="countyid">县</param>
/// <param name="streetid">镇</param>
/// <param name="xiangmuno">项目编号</param>
/// <param name="xiangmuyt">项目用途</param>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <returns></returns>
@ -442,6 +446,8 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
/// <param name="xiangmumc">项目名称</param>
/// <param name="countyid">县</param>
/// <param name="streetid">镇</param>
/// <param name="xiangmuno">项目编号</param>
/// <param name="xiangmuyt">项目用途</param>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <returns></returns>