合并

OpenAuth.App/ServiceApp/ManageApp.cs

@@ -282,13 +282,22 @@ namespace OpenAuth.App.ServiceApp
         /// </summary>
         /// <param name="key"></param>
         /// <returns></returns>
-        public async Task<Response<List<dynamic>>> GetWorkspaceList(string key)
+        public async Task<Response<List<dynamic>>> GetWorkspaceList(int isjoin,string key,int state,string order= "\"CreateTime\" desc")
         {
             RefAsync<int> totalCount = 0;
             using (var db = UnitWork.CreateContext())
             {
+                var userid = _auth.GetCurrentUser().User.Id;
+                List<string> ids=new List<string>();
+                if (isjoin == 1)
+                {
+                    ids=db.LasaSpaceUser.AsQueryable().Where(r=>r.UserId== userid)?.Select(r => r.WorkSpaceId).ToList();
+                }
                 var list = await db.LasaWorkspace.AsQueryable()
                     .WhereIF(!string.IsNullOrEmpty(key), a => a.WorkspaceName.Contains(key))
+                    .WhereIF(state != 0, a => a.Sate == state)
+                    .WhereIF(isjoin == 1, a => ids.Contains(a.Id))
+                    .WhereIF(isjoin == 2, a => !ids.Contains(a.Id))
                     .LeftJoin<SysUser>((a, u) => a.CreateId == u.Id)
                     .Select<dynamic>((a, u) => new
                     {
@@ -299,9 +308,12 @@ namespace OpenAuth.App.ServiceApp
                         a.CreateTime,
                         a.CreateId,
                         u.Account,
-                        u.Name
-                    })
+                        u.Name,
+                        UserNames = SqlFunc.Subqueryable<LasaSpaceUser>().Where(r => r.WorkSpaceId == a.Id).LeftJoin<SysUser>((r, s) => r.UserId == s.Id).SelectStringJoin((r, s) => s.Name, ",")
+                    }).MergeTable()
+                    .OrderBy(order)
                     .ToListAsync();
+
                 return new Response<List<dynamic>>
                 {
                     Result = list
@@ -469,6 +481,21 @@ namespace OpenAuth.App.ServiceApp
             }
         }
 
+        //归档项目 
+        public async Task<Response<bool>> CompleteWorkspace(string id)
+        {
+            using (var db = UnitWork.CreateContext())
+            {
+                await db.LasaWorkspace.UpdateAsync(u => new LasaWorkspace
+                {
+                    Sate = 2
+                }, u => u.Id == id);
+                if (db.Commit())
+                    return new Response<bool> { Result = true, Message = "归档成功" };
+                else
+                    return new Response<bool> { Result = false, Message = "归档失败" };
+            }
+        }
         #endregion
 
         public async Task ExecuteFlyTask(string taskId)

OpenAuth.WebApi/Controllers/ServiceControllers/ManageController.cs

@@ -294,15 +294,18 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
         /// <summary>
         /// 获取项目列表
         /// </summary>
-        /// <param name="key"></param>
+        /// <param name="isjoin">是否是已加入的项目（0全部，1加入，2未加入）</param>
+        /// <param name="key">项目名称筛选</param>
+        /// <param name="state">状态（0全部，1进行中，2已归档）</param>
+        /// <param name="order">排序</param>
         /// <returns></returns>
         [HttpGet]
-        public async Task<Response<List<dynamic>>> GetWorkspaceList(string key)
+        public async Task<Response<List<dynamic>>> GetWorkspaceList(int isjoin, string key, int state, string order = "\"CreateTime\" desc")
         {
             var result = new Response<List<dynamic>>();
             try
             {
-                result = await _app.GetWorkspaceList(key);
+                result = await _app.GetWorkspaceList(isjoin,key,state,order);
             }
             catch (Exception ex)
             {
@@ -343,6 +346,15 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
             return await _app.DeleteWorkspace(id);
         }
 
+        /// <summary>
+        /// 归档项目
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<Response<bool>> CompleteWorkspace(string id)
+        {
+            return await _app.CompleteWorkspace(id);
+        }
         /// <summary>
         /// 获取机场列表，添加项目使用
         /// </summary>