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

OpenAuth.App/ServiceApp/DroneSsnydManage/DroneSsnyApp.cs

@@ -317,6 +317,38 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
             return list;
         }
 
+        /// <summary>
+        /// 项目列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <returns></returns>
+        public List<DroneSsnyd> GetDronssnydExportList(string xiangmumc, string countyid, string streetid,
+            string xiangmuno, string xiangmuyt,int? status)
+        {
+            //获取当前登录用户
+            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)))
+                .WhereIF(status!=null,a=>a.handle_status_id== status)
+                .OrderBy(a => a.end_time, OrderByType.Desc)
+                .ToList();
+
+            return list;
+        }
+
         /// <summary>
         /// 导出
         /// </summary>
@@ -485,7 +517,7 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
         /// <param name="pageSize"></param>
         /// <returns></returns>
         public PageInfo<List<DroneSsnyd>> GetDronssnydList(string xiangmumc, string countyid, string streetid,
-            string xiangmuno, string xiangmuyt,
+            string xiangmuno, string xiangmuyt, int? status,
             int pageIndex, int pageSize)
         {
             int totalCount = 0;
@@ -507,6 +539,7 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
                 .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)))
+                .WhereIF(status != null, a => a.handle_status_id == status)
                 .OrderBy(a => a.end_time, OrderByType.Desc)
                 .ToPageList(pageIndex, pageSize, ref totalCount);
 

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

@@ -14,4 +14,10 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage.Request
         public string xiangmuno {  get; set; }
         public string xiangmuyt {  get; set; }
     }
+
+    public class DroneSsny : TimeOutReq
+    {
+        public int? status { get; set; }
+    }
+
 }

OpenAuth.WebApi/Controllers/ServiceControllers/DroneSsnyController.cs

@@ -67,7 +67,6 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
         /// <param name="pageSize"></param>
         /// <returns></returns>
         [HttpGet]
-        [AllowAnonymous]
         public Response<PageInfo<List<DroneSsnyd>>> TimeOutAlarmList(string xiangmumc, string countyid, string streetid,
             string xiangmuno, string xiangmuyt,
             int page, int limit)
@@ -358,7 +357,6 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
         /// <param name="import"></param>
         /// <returns></returns>
         [HttpPost]
-        [AllowAnonymous]
         public IActionResult TimeoutWarningExport([FromQuery] TimeOutReq import)
         {
             var data = new Response();
@@ -401,7 +399,6 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
         /// <param name="import"></param>
         /// <returns></returns>
         [HttpPost]
-        [AllowAnonymous]
         public IActionResult TimeoutAlarmExport([FromQuery] TimeOutReq import)
         {
             var data = new Response();
@@ -439,7 +436,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
 
         #endregion
 
-        #region 项目列表
+        #region 项目列表 及导出
 
         /// <summary>
         /// 项目列表
@@ -449,12 +446,12 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
         /// <param name="streetid">镇</param>
         /// <param name="xiangmuno">项目编号</param>
         /// <param name="xiangmuyt">项目用途</param>
+        /// <param name="status">项目状态</param>
         /// <param name="pageIndex"></param>
         /// <param name="pageSize"></param>
         /// <returns></returns>
         [HttpGet]
-        [AllowAnonymous]
-        public Response<PageInfo<List<DroneSsnyd>>> GetDronssnydList(string xiangmumc, string countyid, string streetid,
+        public Response<PageInfo<List<DroneSsnyd>>> GetDronssnydList(string xiangmumc, string countyid, string streetid,int? status,
             string xiangmuno, string xiangmuyt,
             int page, int limit)
         {
@@ -462,7 +459,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
             try
             {
                 response.Result =
-                    droneSsnyApp.GetDronssnydList(xiangmumc, countyid, streetid, xiangmuno, xiangmuyt, page, limit);
+                    droneSsnyApp.GetDronssnydList(xiangmumc, countyid, streetid, xiangmuno, xiangmuyt, status,page, limit);
             }
             catch (Exception ex)
             {
@@ -472,7 +469,46 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
 
             return response;
         }
+        /// <summary>
+        /// 项目列表导出
+        /// </summary>
+        /// <param name="import"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public IActionResult GetDronssnydExport([FromQuery] DroneSsny import)
+        {
+            var data = new Response();
+            List<string> headers = null;
+            headers = new List<string>
+            {
+                "项目编号", "项目名称", "乡镇", "村庄", "权利人", "行政区划", "备案编号", "项目开始时间", "项目结束时间", "项目当前用途", "设施农业申请用地面积", "生产设施用地",
+                "辅助设施用地", "下发时间", "项目状态"
+            };
+            var response = droneSsnyApp.GetDronssnydExportList(import.xiangmumc, import.countyid, import.streetid,
+                import.xiangmuno, import.xiangmuyt,import.status);
+            if (response.Count > 0)
+            {
+                var excelRes = droneSsnyApp.ListToExcel(response, headers);
+                if (excelRes.Code == 200)
+                {
+                    return File(excelRes.Result.ToArray(),
+                        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+                        "项目列表" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".xls");
+                }
+                else
+                {
+                    data.Code = excelRes.Code;
+                    data.Message = "导出失败";
+                }
+            }
+            else
+            {
+                data.Code = 300;
+                data.Message = "暂无数据";
+            }
 
+            return Ok(data);
+        }
         #endregion
     }
 }