冲突解决

OpenAuth.App/ServiceApp/DroneSsnydManage/DroneSsnyApp.cs

@@ -5,6 +5,9 @@ using OpenAuth.App.ServiceApp.DroneSsnydManage.Request;
 using OpenAuth.Repository;
 using OpenAuth.Repository.Domain;
 using SqlSugar;
+using Infrastructure;
+using DocumentFormat.OpenXml.Spreadsheet;
+using NPOI.SS.Formula.Functions;
 
 namespace OpenAuth.App.ServiceApp.DroneSsnydManage
 {
@@ -21,15 +24,18 @@ 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()
-                .Where(a => a.end_time <= endTime && a.end_time > DateTime.Now)
-                .OrderBy(a => a.end_time, OrderByType.Desc)
-                .ToPageList(pageIndex, pageSize, ref totalCount);
+                    .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);
 
             return new PageInfo<List<DroneSsnyd>>
             {
@@ -44,15 +50,18 @@ 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()
-                .Where(a => a.end_time < endTime)
-                .OrderBy(a => a.end_time, OrderByType.Desc)
-                .ToPageList(pageIndex, pageSize, ref totalCount);
+                      .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);
 
             return new PageInfo<List<DroneSsnyd>>
             {

OpenAuth.WebApi/Controllers/ServiceControllers/DroneSsnyController.cs

@@ -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)
             {
@@ -46,16 +49,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)
             {