提交代码

Edu.Model/ViewModel/OKR/OKRPersonalDimension.cs

@@ -88,5 +88,11 @@ namespace Edu.Model.ViewModel.OKR
         /// </summary>
         public decimal ScoreRate { get; set; }
 
+
+        public int Post_Id { get; set; }
+
+
+        public  int LeaveStatus { get; set; }
+
     }
 }

Edu.Model/ViewModel/User/RB_Department_ViewModel.cs

@@ -45,6 +45,7 @@ namespace Edu.Model.ViewModel.User
         /// </summary>
         public string QDeptIds { get; set; }
 
+
         /// <summary>
         /// 上级ids
         /// </summary>

Edu.Repository/OKR/RB_OKR_ObjectiveRepository.cs

@@ -387,6 +387,21 @@ WHERE o1.CreateBy in({CreateBys})  and o2.CreateBy ={id} and o1.`Status`=2 and
 
 
 
+        /// <summary>
+        /// 获取个人维度对齐量
+        /// </summary>
+        /// <param name="group_Id"></param>
+        /// <param name="periodId"></param>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public List<RB_OKR_Objective_ViewModel> GetOKRPersonalRelationAlignList_V2(int group_Id, int periodId, string CreateBys)
+        {
+            string sql = $@"SELECT COUNT(0) as ChildNum,o1.CreateBy FROM 
+rb_okr_objectiverelation or1
+LEFT JOIN rb_okr_objective o1 on or1.ObjectiveId = o1.Id
+WHERE o1.CreateBy in({CreateBys})  and o1.`Status`=2 and  o1.Group_Id={group_Id}   and o1.PeriodId ={periodId} group by o1.CreateBy  ";
+            return Get<RB_OKR_Objective_ViewModel>(sql).ToList();
+        }
 
 
 
@@ -423,6 +438,15 @@ WHERE o1.CreateBy in({CreateBys})  and o2.CreateBy ={id} and o1.`Status`=2 and
                 {
                     where.AppendFormat(" AND B.{0}={1} ", nameof(OKRPersonalDimension.Dept_Id), query.Dept_Id);
                 }
+                if (query.Post_Id > 0)
+                {
+                    where.AppendFormat(" AND B.{0}={1} ", nameof(OKRPersonalDimension.Post_Id), query.Post_Id);
+                }
+                if (query.LeaveStatus > 0)
+                {
+                    where.AppendFormat(" AND B.{0}={1} ", nameof(OKRPersonalDimension.LeaveStatus), query.LeaveStatus);
+                }
+                
                 if (query.PeriodId > 0)
                 {
                     whereperiodId.AppendFormat(" AND a.{0}={1} ", nameof(OKRPersonalDimension.PeriodId), query.PeriodId);