提交代码

Edu.Model/ViewModel/OKR/OKRPersonalDimension.cs

@@ -11,6 +11,10 @@ namespace Edu.Model.ViewModel.OKR
         /// </summary>
         public int Id { get; set; }
 
+        /// <summary>
+        /// 员工名称
+        /// </summary>
+        public int AccountId { get; set; }
 
         /// <summary>
         /// 员工名称
@@ -47,7 +51,11 @@ namespace Edu.Model.ViewModel.OKR
         public int Type { get; set; }
 
 
+        public int PeriodId { get; set; }
+        public int School_Id { get; set; }
+
 
+        public int Group_Id { get; set; }
 
     }
 }

Edu.Repository/OKR/RB_OKR_ObjectiveRepository.cs

@@ -311,5 +311,108 @@ WHERE o1.CreateBy in({CreateBys})  and o2.CreateBy ={id} and o1.`Status`=2 and
             return Get<RB_OKR_Objective_ViewModel>(sql).ToList();
         }
 
+
+
+
+
+
+        /// <summary>
+        /// 获取员工查询SQL
+        /// </summary>
+        /// <param name="query"></param>
+        /// <param name="parameters"></param>
+        /// <returns></returns>
+        public string GetEmployeeSqlReposiroty(OKRPersonalDimension query, DynamicParameters parameters)
+        {
+            StringBuilder where = new StringBuilder();
+            StringBuilder where2 = new StringBuilder();
+
+            StringBuilder wheremanager = new StringBuilder();
+            StringBuilder whereteacher = new StringBuilder();
+            StringBuilder whereassist = new StringBuilder();
+            if (query != null)
+            {
+                if (query.Group_Id > 0)
+                {
+                    where.AppendFormat(" AND B.{0}={1} ", nameof(OKRPersonalDimension.Group_Id), query.Group_Id);
+                }
+                if (query.School_Id > 0)
+                {
+                    where.AppendFormat(" AND B.{0}={1} ", nameof(OKRPersonalDimension.School_Id), query.School_Id);
+                }
+             
+                if (query.Dept_Id > 0)
+                {
+                    where.AppendFormat(" AND B.{0}={1} ", nameof(OKRPersonalDimension.Dept_Id), query.Dept_Id);
+                }
+               
+                //if (!string.IsNullOrEmpty(query.StartEntryTime))
+                //{
+                //    where.AppendFormat(" AND b.{0}>='{1}' ", nameof(Employee_ViewModel.EntryTime), query.StartEntryTime);
+                //}
+                //if (!string.IsNullOrEmpty(query.EndEntryTime))
+                //{
+                //    where.AppendFormat(" AND b.{0}<='{1} 23:59:59' ", nameof(Employee_ViewModel.EntryTime), query.EndEntryTime);
+                //}
+            }
+
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.Id as AccountId,A.Account,orro.ObjectiveNCount,orro.Score,A.Group_Id,A.School_Id,A.EmployeeName,A.UserIcon,A.LeaveStatus,A.AccountType
+      ,IFNULL(G.GroupName,'') AS GroupName,IFNULL(s.SName,'') AS SchoolName
+      ,IFNULL(d.DeptId,0) AS Dept_Id,IFNULL(d.DeptName,'') AS DeptName
+FROM 
+(
+		SELECT A.Id,A.Account,A.`Password`, 1 as AccountType,B.MId as AccountId
+               ,A.CreateBy,A.CreateTime,A.UpdateBy,A.UpdateTime,A.Group_Id,A.`Status`,A.AnnualLeaveDay,A.DirectSupervisor
+               ,b.School_Id,IFNULL(B.MName,'') AS EmployeeName,B.MHead AS UserIcon,B.Dept_Id,B.Post_Id,B.IDCard
+               ,B.Sex,B.Education,B.EntryTime,B.Address,B.BirthDate
+               ,B.LeaveStatus,B.LeaveTime,B.MTel AS EmployeeTel,IFNULL(B.Email,'') AS Email
+		FROM rb_manager AS B LEFT JOIN rb_account AS A  ON A.AccountId=B.MId AND A.AccountType=1
+		WHERE 1=1 {0} {1}
+		UNION ALL
+		SELECT A.Id,A.Account,A.`Password`, 2 as AccountType,B.TId as AccountId
+              ,A.CreateBy,A.CreateTime,A.UpdateBy,A.UpdateTime,A.Group_Id,A.`Status`,A.AnnualLeaveDay,A.DirectSupervisor
+              ,b.School_Id,IFNULL(B.TeacherName,'') AS EmployeeName,B.TeacherIcon AS UserIcon,B.Dept_Id,B.Post_Id,B.IDCard
+              ,B.Sex,B.Education,B.EntryTime,B.Address,B.BirthDate
+              ,B.LeaveStatus,B.LeaveTime,B.TeacherTel AS EmployeeTel,IFNULL(B.Email,'') AS Email
+		FROM rb_teacher AS B LEFT JOIN rb_account AS A  ON A.AccountId=B.TId AND A.AccountType=2
+		WHERE 1=1 {0} {2}
+		UNION ALL
+		SELECT A.Id,A.Account,A.`Password`, 3 as AccountType,B.AId as AccountId
+              ,A.CreateBy,A.CreateTime,A.UpdateBy,A.UpdateTime,A.Group_Id,A.`Status`,A.AnnualLeaveDay,A.DirectSupervisor
+              ,b.School_Id,IFNULL(B.AssistName,'') AS EmployeeName,B.AssistIcon AS UserIcon,B.Dept_Id,B.Post_Id,B.IDCard
+              ,B.Sex,B.Education,B.EntryTime,B.Address,B.BirthDate
+              ,B.LeaveStatus,B.LeaveTime,B.AssistTel AS EmployeeTel,IFNULL(B.Email,'') AS Email
+		FROM  rb_assist AS B LEFT JOIN rb_account AS A  ON A.AccountId=B.AId AND A.AccountType=3
+		WHERE 1=1 {0} {3}
+) AS A LEFT JOIN rb_group AS g ON A.Group_Id=g.GId
+       LEFT JOIN rb_school AS s ON A.School_Id=s.SId
+       LEFT JOIN rb_department AS d ON A.Dept_Id=d.DeptId
+      LEFT JOIN (SELECT a.CreateBy,COUNT(*) as ObjectiveNCount,SUM(Score) as Score from rb_okr_objective as a LEFT JOIN  rb_okr_objectiverelation as b on a.Id=b.ObjectiveId GROUP BY a.CreateBy) as 
+orro on orro.CreateBy=a.Id 
+WHERE  1=1 {4}
+", where.ToString(), wheremanager.ToString(), whereteacher.ToString(), whereassist.ToString(), where2.ToString());
+            return builder.ToString();
+        }
+
+
+        /// <summary>
+        /// 获取员工okr列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<OKRPersonalDimension> GetAllEmployeeOKRPPageRepository(int pageIndex, int pageSize, out long rowsCount, OKRPersonalDimension query)
+        {
+            DynamicParameters parameters = new DynamicParameters();
+            string sql = GetEmployeeSqlReposiroty(query, parameters);
+            var list = GetPage<OKRPersonalDimension>(pageIndex, pageSize, out rowsCount, sql, parameters).ToList();
+            return list;
+        }
+
+
     }
 }

Edu.WebApi/Controllers/OKR/OKRPeriodController.cs

@@ -1450,15 +1450,16 @@ namespace Edu.WebApi.Controllers.OKR
         public ApiResult GetOKRPersonalDimensionList()
         {
             var userInfo = base.UserInfo;
-
-            List<OKRPersonalDimension> allList = okrPeriodModule.GetOKRPersonalDimensionList(userInfo);
-
             JObject parms = JObject.Parse(RequestParm.Msg.ToString());
             int PeriodId = parms.GetInt("PeriodId", 0);
+            int DeptId = parms.GetInt("DeptId", 0);
             if (PeriodId <= 0)
             {
                 return ApiResult.ParamIsNull();
             }
+            List<OKRPersonalDimension> allList = okrPeriodModule.GetOKRPersonalDimensionList(userInfo.Group_Id,userInfo.Id, DeptId);
+
+           
             if (allList == null || !allList.Any(x => x.Type == 2))
             {
                 return ApiResult.Failed("您没有下级");
@@ -1498,5 +1499,34 @@ namespace Edu.WebApi.Controllers.OKR
 
         #endregion
 
+
+        #region 管理端数据看板
+        /// <summary>
+        /// 获取评论分页列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetAllEmployeeOKRPPageList()
+        {
+            var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
+            var query = new OKRPersonalDimension()
+            {
+
+                School_Id = base.ParmJObj.GetInt("School_Id"),
+                PeriodId = base.ParmJObj.GetInt("PeriodId", 0)
+            };
+           
+            query.Group_Id = base.UserInfo.Group_Id;
+            var list = okrPeriodModule.GetAllEmployeeOKRPPageRepository(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
+            foreach (var item in list)
+            {
+                var objRelation = okrPeriodModule.GetOKRPersonalRelationAlignList(base.UserInfo.Group_Id, query.PeriodId, item.AccountId.ToString(), item.AccountId);
+            }
+            pageModel.Count = rowsCount;
+            pageModel.PageData = list;
+            return ApiResult.Success(data: pageModel);
+        }
+        #endregion
+
     }
 }