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

筛选条件添加

dev
洁 任 2025-05-21 16:03:36 +08:00
parent d604adcbc4
commit 5b15d95d06
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,6 +9,8 @@ using System.Threading.Tasks;
using OpenAuth.App.Interface;
using SqlSugar;
using Infrastructure;
using DocumentFormat.OpenXml.Spreadsheet;
using NPOI.SS.Formula.Functions;
namespace OpenAuth.App.ServiceApp.DroneSsnydManage
{
@ -25,12 +27,15 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <returns></returns>
public PageInfo<List<DroneSsnyd>> TimeoutWarning(int pageIndex, int pageSize)
public PageInfo<List<DroneSsnyd>> TimeoutWarning(string xiangmumc, string countyid, string streetid, int pageIndex, int pageSize)
{
int totalCount = 0;
var endTime = DateTime.Now.AddMonths(2);
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)
.Where(a => a.end_time <= endTime&&a.end_time>DateTime.Now)
.OrderBy(a => a.end_time, OrderByType.Desc)
.ToPageList(pageIndex, pageSize, ref totalCount);
@ -48,12 +53,15 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <returns></returns>
public PageInfo<List<DroneSsnyd>> TimeOutAlarmList(int pageIndex, int pageSize)
public PageInfo<List<DroneSsnyd>> TimeOutAlarmList(string xiangmumc, string countyid, string streetid, int pageIndex, int pageSize)
{
int totalCount = 0;
var endTime = DateTime.Now;
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)
.Where(a => a.end_time<endTime)
.OrderBy(a => a.end_time, OrderByType.Desc)
.ToPageList(pageIndex, pageSize, ref totalCount);

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

@ -23,16 +23,19 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
/// <summary>
/// 超期预警
/// </summary>
/// <param name="xiangmumc">项目名称</param>
/// <param name="countyid">县</param>
/// <param name="streetid">镇</param>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <returns></returns>
[HttpGet]
public Response<PageInfo<List<DroneSsnyd>>> TimeoutWarning(int page, int limit)
public Response<PageInfo<List<DroneSsnyd>>> TimeoutWarning(string xiangmumc, string countyid, string streetid, int page, int limit)
{
var response = new Response<PageInfo<List<DroneSsnyd>>>();
try
{
response.Result = droneSsnyApp.TimeoutWarning(page, limit);
response.Result = droneSsnyApp.TimeoutWarning(xiangmumc, countyid, streetid,page, limit);
}
catch (Exception ex)
{
@ -45,16 +48,19 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
/// <summary>
/// 超期报警
/// </summary>
/// <param name="xiangmumc">项目名称</param>
/// <param name="countyid">县</param>
/// <param name="streetid">镇</param>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <returns></returns>
[HttpGet]
public Response<PageInfo<List<DroneSsnyd>>> TimeOutAlarmList(int page, int limit)
public Response<PageInfo<List<DroneSsnyd>>> TimeOutAlarmList(string xiangmumc, string countyid,string streetid,int page, int limit)
{
var response = new Response<PageInfo<List<DroneSsnyd>>>();
try
{
response.Result = droneSsnyApp.TimeOutAlarmList(page, limit);
response.Result = droneSsnyApp.TimeOutAlarmList(xiangmumc, countyid, streetid, page, limit);
}
catch (Exception ex)
{