Merge branch 'dev' of http://123.132.248.154:10000/chenwei/lanlingxian_ziranziyuanheguihua into dev

OpenAuth.App/ServiceApp/DroneSsnydManage/DroneSsnyApp.cs

@@ -24,7 +24,7 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
         /// <param name="pageIndex"></param>
         /// <param name="pageSize"></param>
         /// <returns></returns>
-        public PageInfo<List<DroneSsnyd>> TimeoutWarning(string xiangmumc, string countyid, string streetid,
+        public PageInfo<List<DroneSsnyd>> TimeoutWarning(string xiangmumc, string countyid, string streetid, string xiangmuno, string xiangmuyt,
             int pageIndex, int pageSize)
         {
             int totalCount = 0;
@@ -34,6 +34,8 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
                 .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)
                 .Where(a => a.end_time <= endTime && a.end_time > DateTime.Now)
                 .OrderBy(a => a.end_time, OrderByType.Desc)
                 .ToPageList(pageIndex, pageSize, ref totalCount);
@@ -52,7 +54,7 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
         /// <param name="pageIndex"></param>
         /// <param name="pageSize"></param>
         /// <returns></returns>
-        public PageInfo<List<DroneSsnyd>> TimeOutAlarmList(string xiangmumc, string countyid, string streetid,
+        public PageInfo<List<DroneSsnyd>> TimeOutAlarmList(string xiangmumc, string countyid, string streetid, string xiangmuno, string xiangmuyt,
             int pageIndex, int pageSize)
         {
             int totalCount = 0;
@@ -62,6 +64,8 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
                 .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)
                 .Where(a => a.end_time < endTime)
                 .OrderBy(a => a.end_time, OrderByType.Desc)
                 .ToPageList(pageIndex, pageSize, ref totalCount);
@@ -186,7 +190,7 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
         #region 导出
 
         //超期预警
-        public List<DroneSsnyd> TimeoutWarningExport(string xiangmumc, string countyid, string streetid)
+        public List<DroneSsnyd> TimeoutWarningExport(string xiangmumc, string countyid, string streetid,string xiangmuno, string xiangmuyt)
         {
             var endTime = DateTime.Now.AddMonths(2);
 
@@ -194,6 +198,8 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
                 .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)
                 .Where(a => a.end_time <= endTime && a.end_time > DateTime.Now)
                 .OrderBy(a => a.end_time, OrderByType.Desc)
                 .ToList();
@@ -207,7 +213,7 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
         /// <param name="pageIndex"></param>
         /// <param name="pageSize"></param>
         /// <returns></returns>
-        public List<DroneSsnyd> TimeOutAlarmExport(string xiangmumc, string countyid, string streetid)
+        public List<DroneSsnyd> TimeOutAlarmExport(string xiangmumc, string countyid, string streetid, string xiangmuno, string xiangmuyt)
         {
             var endTime = DateTime.Now;
 
@@ -215,6 +221,8 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
                 .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)
                 .Where(a => a.end_time < endTime)
                 .OrderBy(a => a.end_time, OrderByType.Desc)
                 .ToList();
@@ -384,7 +392,7 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
         #region 项目列表
 
         /// <summary>
-        /// 到期预警
+        /// 项目列表
         /// </summary>
         /// <param name="pageIndex"></param>
         /// <param name="pageSize"></param>

OpenAuth.App/ServiceApp/DroneSsnydManage/Request/TimeOutReq.cs

@@ -11,5 +11,7 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage.Request
         public string xiangmumc { get; set; }
         public string countyid { get; set; }
         public string streetid { get; set; }
+        public string xiangmuno {  get; set; }
+        public string xiangmuyt {  get; set; }
     }
 }

OpenAuth.WebApi/Controllers/ServiceControllers/DroneSsnyController.cs

@@ -1,3 +1,4 @@
+using DocumentFormat.OpenXml.Office.CustomUI;
 using Infrastructure;
 using Infrastructure.Utilities.Excel;
 using Microsoft.AspNetCore.Authorization;
@@ -34,13 +35,13 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
         /// <returns></returns>
         [HttpGet]
         [AllowAnonymous]
-        public Response<PageInfo<List<DroneSsnyd>>> TimeoutWarning(string xiangmumc, string countyid, string streetid,
+        public Response<PageInfo<List<DroneSsnyd>>> TimeoutWarning(string xiangmumc, string countyid, string streetid,string xiangmuno,string xiangmuyt,
             int page, int limit)
         {
             var response = new Response<PageInfo<List<DroneSsnyd>>>();
             try
             {
-                response.Result = droneSsnyApp.TimeoutWarning(xiangmumc, countyid, streetid, page, limit);
+                response.Result = droneSsnyApp.TimeoutWarning(xiangmumc, countyid, streetid, xiangmuno, xiangmuyt, page, limit);
             }
             catch (Exception ex)
             {
@@ -62,13 +63,13 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
         /// <returns></returns>
         [HttpGet]
         [AllowAnonymous]
-        public Response<PageInfo<List<DroneSsnyd>>> TimeOutAlarmList(string xiangmumc, string countyid, string streetid,
+        public Response<PageInfo<List<DroneSsnyd>>> TimeOutAlarmList(string xiangmumc, string countyid, string streetid, string xiangmuno, string xiangmuyt,
             int page, int limit)
         {
             var response = new Response<PageInfo<List<DroneSsnyd>>>();
             try
             {
-                response.Result = droneSsnyApp.TimeOutAlarmList(xiangmumc, countyid, streetid, page, limit);
+                response.Result = droneSsnyApp.TimeOutAlarmList(xiangmumc, countyid, streetid, xiangmuno, xiangmuyt, page, limit);
             }
             catch (Exception ex)
             {
@@ -334,7 +335,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
                 "项目编号", "项目名称", "乡镇", "村庄", "权利人", "行政区划", "备案编号", "项目开始时间", "项目结束时间", "项目当前用途", "设施农业申请用地面积", "生产设施用地",
                 "辅助设施用地", "下发时间", "项目状态"
             };
-            var response = droneSsnyApp.TimeoutWarningExport(import.xiangmumc, import.countyid, import.streetid);
+            var response = droneSsnyApp.TimeoutWarningExport(import.xiangmumc, import.countyid, import.streetid,import.xiangmuno,import.xiangmuyt);
             if (response.Count > 0)
             {
                 var excelRes = droneSsnyApp.ListToExcel(response, headers);
@@ -376,7 +377,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
                 "项目编号", "项目名称", "乡镇", "村庄", "权利人", "行政区划", "备案编号", "项目开始时间", "项目结束时间", "项目当前用途", "设施农业申请用地面积", "生产设施用地",
                 "辅助设施用地", "下发时间", "项目状态"
             };
-            var response = droneSsnyApp.TimeOutAlarmExport(import.xiangmumc, import.countyid, import.streetid);
+            var response = droneSsnyApp.TimeOutAlarmExport(import.xiangmumc, import.countyid, import.streetid,import.xiangmuno, import.xiangmuyt);
             if (response.Count > 0)
             {
                 var excelRes = droneSsnyApp.ListToExcel(response, headers);