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

Edu.Module.OKR/OKRPeriodModule.cs

@@ -8915,7 +8915,7 @@ and {ruleModel.Time} >='{dmodel.RuleSTime.Value.ToString("yyyy-MM-dd")}' and {ru
         /// <param name="userInfo"></param>
         /// <param name="IsAdmin"></param>
         /// <returns></returns>
-        public List<OKRPersonalDimension> GetOKRGRDateDistributionPage(int pageIndex, int pageSize, out long count, int periodId, int type, int startValue, int endValue, int orderBy, int rangeType, string departIds, int postId, int leaveStatus, UserInfo userInfo, bool IsAdmin = false)
+        public List<OKRPersonalDimension> GetOKRGRDateDistributionPage(int pageIndex, int pageSize, out long count,string EmployeeName, int periodId, int type, int startValue, int endValue, int orderBy, int rangeType, string departIds, int postId, int leaveStatus, UserInfo userInfo, bool IsAdmin = false)
         {
             count = 0;
             var userIdList = new List<int>();
@@ -8938,7 +8938,7 @@ and {ruleModel.Time} >='{dmodel.RuleSTime.Value.ToString("yyyy-MM-dd")}' and {ru
                 userIdList = accountList.Select(x => x.Id).ToList();
             }
             string userIds = string.Join(",", userIdList.Distinct());
-            List<OKRPersonalDimension> RList = oKR_ObjectiveRepository.GetOKRGRDateDistributionPage(pageIndex, pageSize, out count, periodId, startValue, endValue, orderBy, userIds, userInfo.Group_Id);
+            List<OKRPersonalDimension> RList = oKR_ObjectiveRepository.GetOKRGRDateDistributionPage(pageIndex, pageSize, out count, EmployeeName, periodId, startValue, endValue, orderBy, userIds, userInfo.Group_Id);
             return RList;
         }
 

Edu.Repository/OKR/RB_OKR_ObjectiveRepository.cs

@@ -1050,7 +1050,7 @@ SELECT UserId FROM rb_okr_updateprogress WHERE Group_Id={group_Id} and PeriodId=
 
 
         #region 数据看板
-        public List<OKRPersonalDimension> GetOKRGRDateDistributionPage(int pageIndex, int pageSize, out long count, int periodId, int startValue, int endValue, int orderBy, string userIds, int group_Id)
+        public List<OKRPersonalDimension> GetOKRGRDateDistributionPage(int pageIndex, int pageSize, out long count,string EmployeeName, int periodId, int startValue, int endValue, int orderBy, string userIds, int group_Id)
         {
             //            string sql = $@" 
             //select * from(
@@ -1106,7 +1106,7 @@ rb_okr_objectiverelation or1
 LEFT JOIN rb_okr_objective o1 on or1.ObjectiveId = o1.Id
 WHERE  o1.`Status`=2 and  o1.Group_Id={group_Id}   and o1.PeriodId ={periodId} group by o1.CreateBy) as obj  on e.EmployeeId =obj.CreateBy
 LEFT JOIN (SELECT  DATEDIFF(NOW(), MAX(UpdateTime)) as daysum,UserId from rb_okr_updateprogress  GROUP BY UserId) as okrp on e.EmployeeId=okrp.UserId
-where e.RB_Group_id={group_Id} and e.IsLeave =0 {(!string.IsNullOrEmpty(userIds) ? "and e.EmployeeId in (" + userIds + ")" : "")} group by e.EmployeeId
+where e.RB_Group_id={group_Id} and e.IsLeave =0 {(!string.IsNullOrEmpty(userIds) ? "and e.EmployeeId in (" + userIds + ")" : "")}   {(!string.IsNullOrEmpty(EmployeeName) ? "and e.EmName like'%" + EmployeeName + "%'" : "")} group by e.EmployeeId
 )t where 1=1  {orderbyInfo} ";
             var list= GetPage<OKRPersonalDimension>(pageIndex, pageSize, out count, sql).ToList();
             return list;

Edu.WebApi/Controllers/OKR/OKRPeriodController.cs

@@ -2222,7 +2222,7 @@ namespace Edu.WebApi.Controllers.OKR
 
 
 
-        #region 数据看板
+        #region 数据看板  最新
 
         /// <summary>
         /// 获取数据看板员工信息
@@ -2242,6 +2242,7 @@ namespace Edu.WebApi.Controllers.OKR
             int OrderBy = parms.GetInt("OrderBy", 2);// 1升序   2降序
             int RangeType = parms.GetInt("RangeType", 1);//范围类型  非管理端查询  1所有下级  2直属下级
             string DepartIds = parms.GetStringValue("DepartId");//部门ID   管理端可用查询
+            string EmployeeName = parms.GetStringValue("EmployeeName");//部门ID   管理端可用查询
             int PostId = parms.GetInt("PostId", 0);//岗位ID
             int LeaveStatus = parms.GetInt("LeaveStatus", 0);//在职状态
             if (PeriodId <= 0)
@@ -2252,7 +2253,7 @@ namespace Edu.WebApi.Controllers.OKR
             {
                 RangeType = 0;
             }
-            var list = okrPeriodModule.GetOKRGRDateDistributionPage(pageModel.PageIndex, pageModel.PageSize, out long count, PeriodId, Type, StartValue, EndValue, OrderBy, RangeType, DepartIds, PostId, LeaveStatus, userInfo, IsAdmin == 1 ? true : false);
+            var list = okrPeriodModule.GetOKRGRDateDistributionPage(pageModel.PageIndex, pageModel.PageSize, out long count, EmployeeName, PeriodId, Type, StartValue, EndValue, OrderBy, RangeType, DepartIds, PostId, LeaveStatus, userInfo, IsAdmin == 1 ? true : false);
             pageModel.Count = Convert.ToInt32(count);
             pageModel.PageData = list.Select(x => new
             {
@@ -2299,7 +2300,7 @@ namespace Edu.WebApi.Controllers.OKR
 
         #endregion
 
-        #region 个人端数据看板  
+        #region 个人端数据看板  作废
         /// <summary>
         /// 获取个人维度
         /// </summary>
@@ -2358,7 +2359,7 @@ namespace Edu.WebApi.Controllers.OKR
         #endregion
 
 
-        #region 管理端数据看板
+        #region 管理端数据看板  作废
         /// <summary>
         /// 获取管理端数据看板员工分页列表
         /// </summary>