Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.Repository/OKR/RB_OKR_ObjectiveRepository.cs

@@ -59,6 +59,10 @@ namespace Edu.Repository.OKR
             {
                 where += $@" and {nameof(RB_OKR_Objective_ViewModel.Group_Id)} ={demodel.Group_Id}";
             }
+            if (demodel.Id > 0)
+            {
+                where += $@" and {nameof(RB_OKR_Objective_ViewModel.Id)} ={demodel.Id}";
+            }
             if (!string.IsNullOrEmpty(demodel.ObjectiveIds))
             {
                 where += $@" and {nameof(RB_OKR_Objective_ViewModel.Id)} in({demodel.ObjectiveIds})";

Edu.Repository/OKR/RB_OKR_PermissionRepository.cs

@@ -90,6 +90,10 @@ namespace Edu.Repository.OKR
             {
                 where += $@" and {nameof(RB_OKR_Permission_ViewModel.State)} ={demodel.State}";
             }
+            if (demodel.CreateBy > 0)
+            {
+                where += $@" and {nameof(RB_OKR_Permission_ViewModel.CreateBy)} ={demodel.CreateBy}";
+            }
 
             string sql = $@" select * from RB_OKR_Permission where {where} order by Id desc";
             return Get<RB_OKR_Permission_ViewModel>(sql).ToList();

Edu.WebApi/Controllers/OKR/OKRPeriodController.cs

@@ -413,8 +413,16 @@ namespace Edu.WebApi.Controllers.OKR
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public ApiResult GetOKRMyObjectiveInfo() { 
-            
+        public ApiResult GetOKRMyObjectiveInfo() {
+            var userInfo = base.UserInfo;
+            JObject parms = JObject.Parse(RequestParm.Msg.ToString());
+            int ObjectiveId = parms.GetInt("ObjectiveId", 0);
+            if (ObjectiveId <= 0)
+            {
+                return ApiResult.ParamIsNull("请传递目标id");
+            }
+            var obj = okrPeriodModule.GetOKRMyObjectiveInfo(ObjectiveId, userInfo);
+            return ApiResult.Success("", obj);
         }
 
         /// <summary>
@@ -696,6 +704,41 @@ namespace Edu.WebApi.Controllers.OKR
         }
 
         //权限  添加对齐  审核  评论  左边人员列表   对齐视图  数据看板  （管理员版  对齐视图  数据看板）
+
+        #region 添加对齐
+        /// <summary>
+        /// 添加对齐
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SgetOKRMyObjectiveParent() {
+
+            return ApiResult.Success();
+        }
+
+        /// <summary>
+        /// 获取他人的目标列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetOKROthersObjectiveList()
+        {
+            var userInfo = base.UserInfo;
+            JObject parms = JObject.Parse(RequestParm.Msg.ToString());
+            int PeriodId = parms.GetInt("PeriodId", 0);
+            int UserId = parms.GetInt("UserId", 0);
+            if (PeriodId <= 0)
+            {
+                return ApiResult.ParamIsNull("请传递周期id");
+            }
+            if (UserId <= 0)
+            {
+                return ApiResult.ParamIsNull("请传递用户id");
+            }
+            var list = okrPeriodModule.GetOKROthersObjectiveList(PeriodId, UserId, userInfo);
+            return ApiResult.Success("", list);
+        }
+        #endregion
         #endregion