1

Edu.Module.OKR/OKRPeriodModule.cs

@@ -7321,7 +7321,7 @@ and {ruleModel.Time} >='{dmodel.RuleSTime.Value.ToString("yyyy-MM-dd")}' and {ru
             }
             else
             {
-                var accountList = accountRepository.GetAccountListExtRepository(new Model.ViewModel.User.RB_Account_ViewModel() { Group_Id = userInfo.Group_Id, Dept_Id = departId, IsSelectLevelNor = 1 });
+                var accountList = accountRepository.GetAccountListExtRepository(new Model.ViewModel.User.RB_Account_ViewModel() { Group_Id = userInfo.Group_Id, Dept_Id = departId, Post_Id = postId, LeaveStatus = leaveStatus, IsSelectLevelNor = 1 });
                 userIdList = accountList.Select(x => x.Id).ToList();
             }
 
@@ -7572,7 +7572,7 @@ and {ruleModel.Time} >='{dmodel.RuleSTime.Value.ToString("yyyy-MM-dd")}' and {ru
             }
             else
             {
-                var accountList = accountRepository.GetAccountListExtRepository(new Model.ViewModel.User.RB_Account_ViewModel() { Group_Id = userInfo.Group_Id, Dept_Id = departId, IsSelectLevelNor = 1 });
+                var accountList = accountRepository.GetAccountListExtRepository(new Model.ViewModel.User.RB_Account_ViewModel() { Group_Id = userInfo.Group_Id, Dept_Id = departId, Post_Id = postId, LeaveStatus = leaveStatus, IsSelectLevelNor = 1 });
                 userIdList = accountList.Select(x => x.Id).ToList();
             }
             string userIds = string.Join(",", userIdList.Distinct());
@@ -8154,6 +8154,49 @@ and {ruleModel.Time} >='{dmodel.RuleSTime.Value.ToString("yyyy-MM-dd")}' and {ru
             }
             return Rlist;
         }
+
+        /// <summary>
+        /// 获取概率统计
+        /// </summary>
+        /// <param name="periodId"></param>
+        /// <param name="rangeType"></param>
+        /// <param name="departId"></param>
+        /// <param name="postId"></param>
+        /// <param name="leaveStatus"></param>
+        /// <param name="userInfo"></param>
+        /// <param name="v"></param>
+        /// <returns></returns>
+        public object GetOKRProbabilityInfo(int periodId, int rangeType, int departId, int postId, int leaveStatus, UserInfo userInfo, bool IsAdmin)
+        {
+            var userIdList = new List<int>();
+            if (IsAdmin == false)
+            {
+                if (rangeType == 1)
+                {
+                    //查询该用户下所有的下级用户
+                    userIdList = GetMyAllDownlineUserIdList(userInfo, departId, postId, leaveStatus);
+                }
+                else
+                {
+                    //首先查询用户的所有直属下级
+                    userIdList = GetMyUnderlingUserIdList(userInfo, departId, postId, leaveStatus);
+                }
+            }
+            else
+            {
+                var accountList = accountRepository.GetAccountListExtRepository(new Model.ViewModel.User.RB_Account_ViewModel() { Group_Id = userInfo.Group_Id, Dept_Id = departId, Post_Id = postId, LeaveStatus = leaveStatus, IsSelectLevelNor = 1 });
+                userIdList = accountList.Select(x => x.Id).ToList();
+            }
+            //填写率查询
+
+            //对齐率查询 
+
+            //打分率查询
+
+            //最近7天更新率
+
+            return "";
+        }
         #endregion
 
         #region 春姐 统计

Edu.WebApi/Controllers/OKR/OKRPeriodController.cs

@@ -2124,6 +2124,32 @@ namespace Edu.WebApi.Controllers.OKR
             bool flag = okrPeriodModule.SetOKRMatterIgnore(PeriodId, Type, userInfo);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
+
+        /// <summary>
+        /// 获取概率查询
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetOKRProbabilityStatistics() {
+            var userInfo = base.UserInfo;
+            JObject parms = JObject.Parse(RequestParm.Msg.ToString());
+            int PeriodId = parms.GetInt("PeriodId", 0);//周期id
+            int IsAdmin = parms.GetInt("IsAdmin", 2);//是否管理端查询  1是  2否
+            int RangeType = parms.GetInt("RangeType", 1);//范围类型  非管理端查询  1所有下级  2直属下级
+            int DepartId = parms.GetInt("DepartId", 0);//部门ID   管理端可用查询
+            int PostId = parms.GetInt("PostId", 0);//岗位ID
+            int LeaveStatus = parms.GetInt("LeaveStatus", 0);//在职状态
+            if (PeriodId <= 0)
+            {
+                return ApiResult.ParamIsNull();
+            }
+            if (IsAdmin == 1)
+            {
+                RangeType = 0;
+            }
+            var obj = okrPeriodModule.GetOKRProbabilityInfo(PeriodId, RangeType, DepartId, PostId, LeaveStatus, userInfo, IsAdmin == 1 ? true : false);
+            return ApiResult.Success("", obj);
+        }
         #endregion
 
         #region 个人端数据看板