任务列表查询添加

OpenAuth.App/ServiceApp/FireManagement/FireManagementApp.cs

@@ -246,6 +246,31 @@ namespace OpenAuth.App.ServiceApp.FireManagement
             }
         }
 
+        /// <summary>
+        /// 查询任务列表--后台使用
+        /// </summary>
+        /// <returns></returns>
+        public async Task<Response<PageInfo<List<FmFireclueTask>>>> GetTaskPageList(FireClueTaskReq req)
+        {
+            using (var db = base.UnitWork.CreateContext())
+            {
+                RefAsync<int> totalNumber = 0;
+                var tasks = await db.FmFireclueTask.AsQueryable()
+                    .Where(r => r.IsDelete == false)
+                    .WhereIF(req.state!=null,r=>r.State==req.state)
+                    .WhereIF(req.type!=null,r=>r.Type==req.type)
+                    .WhereIF(req.tasktimebegin!=null&&req.tasktimeend!=null,r=>r.TaskTime>=req.tasktimebegin&&r.TaskTime<=req.tasktimeend)
+                    .LeftJoin<FmFireclueInfo>((r,f)=>r.Fireclueid==f.Id)
+                    .WhereIF(!string.IsNullOrEmpty(req.name),(r,f)=>r.Content.Contains(req.name)||f.Describe.Contains(req.name))
+                    .ToPageListAsync(req.page, req.limit, totalNumber);
+                return new Response<PageInfo<List<FmFireclueTask>>>
+                {
+                    Result = new PageInfo<List<FmFireclueTask>> { Items = tasks, Total = totalNumber }
+                };
+            }
+        }
+
+
         /// <summary>
         /// 查询任务列表
         /// </summary>

OpenAuth.App/ServiceApp/FireManagement/Request/FireClueTaskReq.cs

@@ -0,0 +1,33 @@
+using Infrastructure;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OpenAuth.App.ServiceApp.FireManagement.Request
+{
+    public class FireClueTaskReq
+    {
+        //当前页
+        public int page { get; set; }
+        //每页条数
+        public int limit { get; set; }
+        //任务内容或者火情线索名称
+        public string name { get; set; }
+        //状态（1待接收、2已接收、3已完成）
+        public int? state { get; set; }
+        //任务类型：uav-无人机核查，verify-人员现场核查，helicopter-直升机核查
+        public string type { get; set; }
+        //任务下发开始时间
+        public DateTime? tasktimebegin { get; set; }
+        //任务下发结束时间
+        public DateTime? tasktimeend { get; set; }
+        
+        public FireClueTaskReq()
+        {
+            page = 1;
+            limit = 10;
+        }
+    }
+}

OpenAuth.Repository/Domain/FireManagement/FmFireclueTask.cs

@@ -75,7 +75,7 @@ namespace OpenAuth.Repository.Domain.FireManagement
         /// </summary>
         public int ActOn { get; set; }
         
-
+        public string Type { get; set; }
         /// <summary>
         /// 逻辑删除标志
         /// </summary>

OpenAuth.WebApi/Controllers/ServiceControllers/FireManagement/FireManagementController.cs

@@ -28,6 +28,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement
             _app = app;
         }
 
+        #region   任务
         /// <summary>
         /// 下发防火线索任务
         /// </summary>
@@ -154,6 +155,31 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement
             return response;
         }
 
+        /// <summary>
+        /// 查询任务列表--后台使用
+        /// </summary>
+        /// <param name="username"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public async Task<Response<PageInfo<List<FmFireclueTask>>>> GetTaskPageList([FromQuery] FireClueTaskReq req)
+        {
+            Response<PageInfo<List<FmFireclueTask>>> response = new Response<PageInfo<List<FmFireclueTask>>>();
+            try
+            {
+                return await _app.GetTaskPageList(req);
+            }
+            catch (Exception ex)
+            {
+                response.Code = 500;
+                response.Message = ex.InnerException?.Message ?? ex.Message;
+            }
+            return response;
+        }
+        #endregion
+
+
+
+        #region 人员单位管理
         /// <summary>
         /// 查询人员单位信息
         /// </summary>
@@ -173,8 +199,6 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement
             }
             return response;
         }
-
-        #region 人员单位管理
         /// <summary>
         /// 添加人员单位
         /// </summary>