HC_YFZX
/
Infrastructure
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/DataMaintenance' into DataMaintenance

DataMaintenance
陈伟 2025-04-01 16:35:29 +08:00
parent c5179164fc e6a00ed315
commit 402d320958
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenAuth.App/ServiceApp/FireManagement/FireGridApp.cs
View File

@ -75,15 +75,19 @@ namespace OpenAuth.App.ServiceApp.FireManagement
} }
} }
//查询打卡点 //查询打卡点
public async Task<Response<PageInfo<List<dynamic>>>> GetCheckPointList(string pointName, int pageIndex, int pageSize) public async Task<Response<PageInfo<List<dynamic>>>> GetCheckPointList(long areaid, string pointName, int pageIndex, int pageSize)
{ {
using (SugarDbContext db = base.UnitWork.CreateContext()) using (SugarDbContext db = base.UnitWork.CreateContext())
{ {
var chileorg = (await db.SysOrg.AsQueryable().ToChildListAsync(it => it.ParentId, areaid)).Select(it => it.Id).ToList();
RefAsync<int> totalNumber = 0; RefAsync<int> totalNumber = 0;
var query = await db.FmCheckInPoint.AsQueryable() var query = await db.FmCheckInPoint.AsQueryable()
.LeftJoin<SysUser>((a, b) => a.CreateId == b.Id) .LeftJoin<SysUser>((a, b) => a.CreateId == b.Id)
.LeftJoin<FmCheckArea>((a, b, c) => a.Id == c.PointId)
.Where((a, b) => a.IsDelete == false) .Where((a, b) => a.IsDelete == false)
.WhereIF(!string.IsNullOrEmpty(pointName), (a, b) => a.PointName.Contains(pointName)) .WhereIF(!string.IsNullOrEmpty(pointName), (a, b, c) => a.PointName.Contains(pointName))
.WhereIF(areaid != 0, (a, b, c) => chileorg.Contains(c.AreaId))
.Select<dynamic>((a, b) => new .Select<dynamic>((a, b) => new
{ {
a.Id, a.Id,

4
OpenAuth.WebApi/Controllers/ServiceControllers/FireManagement/FireGridController.cs
View File

@ -50,12 +50,12 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement
/// <param name="limit"></param> /// <param name="limit"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpGet]
public async Task<Response<PageInfo<List<dynamic>>>> GetCheckPointList(string pointName, int page, int limit) public async Task<Response<PageInfo<List<dynamic>>>> GetCheckPointList(long areaid,string pointName, int page, int limit)
{ {
Response<PageInfo<List<dynamic>>> response = new Response<PageInfo<List<dynamic>>>(); Response<PageInfo<List<dynamic>>> response = new Response<PageInfo<List<dynamic>>>();
try try
{ {
return await _app.GetCheckPointList(pointName, page, limit); return await _app.GetCheckPointList(areaid,pointName, page, limit);
} }
catch (Exception ex) catch (Exception ex)
{ {