Merge branch 'main' of http://123.132.248.154:10000/HC_YFZX/LASAPlatform

OpenAuth.App/ServiceApp/ManageApp.cs

@@ -51,7 +51,8 @@ namespace OpenAuth.App.ServiceApp
         /// <param name="pageSize"></param>
         /// <param name="key"></param>
         /// <returns></returns>
-        public async Task<Response<PageInfo<List<LasaDronePort>>>> GetPageList(int page, int limit, string sn, string type, string workspaceid)
+        public async Task<Response<PageInfo<List<LasaDronePort>>>> GetPageList(int page, int limit, string sn,
+            string type, string workspaceid)
         {
             RefAsync<int> totalCount = 0;
             using (var db = UnitWork.CreateContext())
@@ -150,7 +151,8 @@ namespace OpenAuth.App.ServiceApp
         /// <param name="limit"></param>
         /// <param name="key"></param>
         /// <returns></returns>
-        public async Task<Response<PageInfo<List<dynamic>>>> GetUavPageList(int page, int limit, string sn, string type, string workspaceid)
+        public async Task<Response<PageInfo<List<dynamic>>>> GetUavPageList(int page, int limit, string sn, string type,
+            string workspaceid)
         {
             RefAsync<int> totalCount = 0;
             using (var db = UnitWork.CreateContext())
@@ -292,16 +294,17 @@ namespace OpenAuth.App.ServiceApp
                     return false;
             }
         }
+
         //导出无人机信息
         public async Task<string> GetUavSn()
         {
             using (var db = UnitWork.CreateContext())
             {
-                var snList = await db.LasaUav.AsQueryable().Where(r => r.IsDelete == false).Select(r => r.Sn).ToListAsync();
+                var snList = await db.LasaUav.AsQueryable().Where(r => r.IsDelete == false).Select(r => r.Sn)
+                    .ToListAsync();
                 var result = string.Join(Environment.NewLine, snList);
 
                 return result;
-
             }
         }
 
@@ -312,13 +315,15 @@ namespace OpenAuth.App.ServiceApp
         /// <param name="limit"></param>
         /// <param name="key"></param>
         /// <returns></returns>
-        public async Task<Response<PageInfo<List<LasaTask>>>> GetTaskPageList(int page, int limit, string key)
+        public async Task<Response<PageInfo<List<LasaTask>>>> GetTaskPageList(int page, int limit, string key,
+            int? status)
         {
             RefAsync<int> totalCount = 0;
             using (var db = UnitWork.CreateContext())
             {
                 var list = await db.LasaTask.AsQueryable()
                     .WhereIF(!string.IsNullOrEmpty(key), a => a.TaskName.Contains(key))
+                    .WhereIF(status != null, a => a.Status.Equals(status))
                     .ToPageListAsync(page, limit, totalCount);
                 return new Response<PageInfo<List<LasaTask>>>
                 {

OpenAuth.WebApi/Controllers/ServiceControllers/ManageController.cs

@@ -199,12 +199,12 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
         /// <param name="key"></param>
         /// <returns></returns>
         [HttpGet]
-        public async Task<Response<PageInfo<List<LasaTask>>>> GetTaskPageList(int page, int limit, string key)
+        public async Task<Response<PageInfo<List<LasaTask>>>> GetTaskPageList(int page, int limit, string key,int? status)
         {
             var result = new Response<PageInfo<List<LasaTask>>>();
             try
             {
-                result = await _app.GetTaskPageList(page, limit, key);
+                result = await _app.GetTaskPageList(page, limit, key,status);
             }
             catch (Exception ex)
             {