页面修改

Edu.Repository/User/RB_Student_OrderGuestRepository.cs

@@ -480,7 +480,16 @@ where sog.Status =0 and o.Group_Id ={group_Id} and o.OrderState <>3 and IFNULL(o
                 //全部
                 if (demodel.BelongType == 1)
                 {
-                    where += $@" AND (s.CreateBy={demodel.CreateBy} OR s.StuId IN (SELECT StuId FROM rb_student_assist WHERE AssistId ={demodel.CreateBy} AND `Status`=0))";
+                    string tempCreateIds = demodel.CreateBy.ToString();
+                    if (!string.IsNullOrEmpty(demodel.QCreateBys))
+                    {
+                        tempCreateIds += "," + demodel.QCreateBys;
+                    }
+                    where+=string.Format(@"
+  AND (  s.CreateBy IN({0}) 
+      OR s.StuId IN (SELECT StuId FROM rb_student_assist WHERE AssistId IN({0}) AND `Status`=0)
+      )
+", tempCreateIds.TrimStart(',').TrimEnd(','));
                 }
                 //我负责的
                 else if (demodel.BelongType == 2)

Edu.WebApi/Controllers/User/StudentStatController.cs

@@ -14,6 +14,7 @@ using Edu.Model.ViewModel.Customer;
 using Edu.Model.ViewModel.Sell;
 using Edu.Model.ViewModel.User;
 using Edu.Module.Course;
+using Edu.Module.OKR;
 using Edu.Module.User;
 using Edu.Repository.Course;
 using Edu.WebApi.Filter;
@@ -35,6 +36,11 @@ namespace Edu.WebApi.Controllers.User
         /// </summary>
         private readonly StudentStatModule studentStatModule = new StudentStatModule();
 
+        /// <summary>
+        /// OKR处理类
+        /// </summary>
+        private readonly OKRPeriodModule okrPeriodModule = new OKRPeriodModule();
+
         #region 学员跟进
 
         /// <summary>
@@ -79,29 +85,45 @@ namespace Edu.WebApi.Controllers.User
                 demodel.CreateIds = Common.Plugin.JsonHelper.DeserializeObject<List<int>>(CreateIds);
             }
             demodel.Group_Id = userInfo.Group_Id;
-       
+
             if (demodel.IsQueryMyStu == 1)
             {
-                demodel.CreateBy = userInfo.Id;
+                demodel.CreateBy = base.UserInfo.Id;
             }
-            else
+            else if (demodel.BelongType == 1)
             {
-                if (demodel.BelongType == 1)
+                if (base.UserInfo.IsMarket == 1)
                 {
-                    demodel.BelongType = 0;//暂先查全部
+                    if (base.UserInfo.IsManager == 0)
+                    {
+                        demodel.CreateBy = base.UserInfo.Id;
+                    }
+                    else if (base.UserInfo.IsManager == 1)
+                    {
+                        var tempList = okrPeriodModule.GetOKRPersonalDimensionListModule(base.UserInfo.Group_Id, base.UserInfo.Id, base.UserInfo.DeptId);
+                        string QCreateBys = "";
+                        if (tempList != null && tempList.Count > 0)
+                        {
+                            foreach (var jItem in tempList)
+                            {
+                                JObject jObj = JObject.Parse(JsonHelper.Serialize(jItem));
+                                QCreateBys += jObj.GetStringValue("Id") + ",";
+                            }
+                        }
+                        if (!string.IsNullOrEmpty(QCreateBys))
+                        {
+                            demodel.QCreateBys = QCreateBys.TrimStart(',').TrimEnd(',');
+                        }
+                    }
                 }
-                if (demodel.BelongType > 1)
+                else
                 {
-                    demodel.CreateBy = userInfo.Id;
+                    demodel.BelongType = 0;
                 }
             }
-
-            if (base.UserInfo.IsMarket == 1)
+            else if (demodel.BelongType > 1)
             {
-                if (base.UserInfo.IsManager == 0)
-                {
-                    demodel.CreateBy = userInfo.Id;
-                }
+                demodel.CreateBy = base.UserInfo.Id;
             }
             var list = studentStatModule.GetStudentFollowUpPageModule(pmodel.PageIndex, pmodel.PageSize, out long count, demodel);
             pmodel.Count = count;
@@ -155,20 +177,37 @@ namespace Edu.WebApi.Controllers.User
             {
                 demodel.CreateBy = base.UserInfo.Id;
             }
-            else
+            else if (base.UserInfo.IsMarket == 1)
             {
-                if (demodel.BelongType == 1)
+                if (base.UserInfo.IsManager == 0)
                 {
-                    demodel.BelongType = 0;//暂先查全部
+                    demodel.CreateBy = base.UserInfo.Id;
                 }
-                if (demodel.BelongType > 1)
+                else if (base.UserInfo.IsManager == 1)
                 {
-                    demodel.CreateBy = base.UserInfo.Id;
+                    var tempList = okrPeriodModule.GetOKRPersonalDimensionListModule(base.UserInfo.Group_Id, base.UserInfo.Id, base.UserInfo.DeptId);
+                    string QCreateBys = "";
+                    if (tempList != null && tempList.Count > 0)
+                    {
+                        foreach (var jItem in tempList)
+                        {
+                            JObject jObj = JObject.Parse(JsonHelper.Serialize(jItem));
+                            QCreateBys += jObj.GetStringValue("Id") + ",";
+                        }
+                    }
+                    if (!string.IsNullOrEmpty(QCreateBys))
+                    {
+                        demodel.QCreateBys = QCreateBys.TrimStart(',').TrimEnd(',');
+                    }
                 }
             }
-            if (base.UserInfo.IsMarket == 1)
+            else
             {
-                if (base.UserInfo.IsManager == 0)
+                if (demodel.BelongType == 1)
+                {
+                    demodel.BelongType = 0;//暂先查全部
+                }
+                if (demodel.BelongType > 1)
                 {
                     demodel.CreateBy = base.UserInfo.Id;
                 }