页面修改

Edu.Common/Enum/User/AssistTypeEnum.cs

@@ -39,5 +39,6 @@ namespace Edu.Common.Enum.User
         /// </summary>
         [EnumField("其他")]
         Other = 5,
+ 
     }
 }

Edu.Model/ViewModel/User/RB_Student_ViewModel.cs

@@ -415,5 +415,20 @@ namespace Edu.Model.ViewModel.User
         /// 开发题库
         /// </summary>
         public string OpenBankLevel { get; set; }
+
+        /// <summary>
+        /// 毕业时间
+        /// </summary>
+        public DateTime? GraduationTime { get; set; }
+
+        /// <summary>
+        /// 开始上课时间
+        /// </summary>
+        public DateTime? BeginClassDate { get; set; }
+
+        /// <summary>
+        /// 班主任
+        /// </summary>
+        public int HeadTeacherId { get; set; }
     }
 }
\ No newline at end of file

Edu.Model/ViewModel/User/RB_Teacher_Static_Extend.cs

@@ -25,4 +25,25 @@ namespace Edu.Model.ViewModel.User
         /// </summary>
         public int DeptId { get; set; }
     }
+
+    /// <summary>
+    /// 老师跟踪信息
+    /// </summary>
+    public class TeacherFollow
+    {
+        /// <summary>
+        /// 教师编号
+        /// </summary>
+        public int TeacherId { get; set; }
+
+        /// <summary>
+        /// 跟踪学员条数
+        /// </summary>
+        public decimal FollowCount { get; set; }
+
+        /// <summary>
+        /// 完成次数
+        /// </summary>
+        public decimal FinishTimes { get; set; }
+    }
 }

Edu.Module.User/StudentStatModule.cs

@@ -89,7 +89,6 @@ namespace Edu.Module.User
         /// <returns></returns>
         public object GetStudentFollowUpPageModule(int pageIndex, int pageSize, out long count, RB_Student_ViewModel demodel)
         {
-
             object Robj = new object();
             var slist = student_OrderGuestRepository.GetStudentFollowUpPageRepository(pageIndex, pageSize, out count, demodel);
             if (slist.Any())
@@ -280,6 +279,8 @@ namespace Edu.Module.User
                         item.AdvisorStatus,
                         item.AdvisorStatusName,
                         item.AdvisorList,
+                        BeginClassDate = Common.ConvertHelper.FormatDate(item.BeginClassDate),
+                        GraduationTime = Common.ConvertHelper.FormatDate(item.GraduationTime),
                     };
                     RList.Add(StuObj);
                 }

Edu.Module.User/TeacherAssessmentModule.cs

@@ -48,6 +48,8 @@ namespace Edu.Module.User
         /// </summary>
         private readonly Rb_dictvalueRepository dictvalueRepository = new Rb_dictvalueRepository();
 
+        
+
         #region 基础配置
 
         /// <summary>
@@ -373,9 +375,7 @@ namespace Edu.Module.User
         public object GetTeacherAssessmentDetailModule(int Id)
         {
             object result = new object();
-
             var extModel = teacher_AssessmentRepository.GetEntity<RB_Teacher_Assessment_Extend>(Id);
-
             var detailsList = teacher_Assessment_DetailsRepository.GetTeacherAssessmentDetailsListRepository(new RB_Teacher_Assessment_Details_Extend()
             {
                 TeacherAssessmentId = (extModel?.Id ?? 0),
@@ -554,6 +554,7 @@ namespace Edu.Module.User
             };
             bool flag = teacher_AssessmentRepository.Update(fileds, new WhereHelper(nameof(RB_Teacher_Assessment_Extend.Id), model.Id));
             return flag;
+
         }
         #endregion
     }

Edu.Repository/User/RB_Student_OrderGuestRepository.cs

@@ -456,6 +456,10 @@ where sog.Status =0 and o.Group_Id ={group_Id} and o.OrderState <>3 and IFNULL(o
             {
                 where += $@" AND s.StuId IN (SELECT StuId FROM rb_student_assist WHERE AssistId ={demodel.ConsultantId} AND `Status`=0)";
             }
+            if (demodel.HeadTeacherId > 0)
+            {
+                where += $@" AND s.StuId IN (SELECT StuId FROM rb_student_assist WHERE AssistId ={demodel.HeadTeacherId} AND `Status`=0 AND AssistType=4)";
+            }
             if (demodel.CourseId > 0)
             {
                 where += $" and o.CourseId ={demodel.CourseId}";
@@ -515,17 +519,18 @@ where sog.Status =0 and o.Group_Id ={group_Id} and o.OrderState <>3 and IFNULL(o
 
             string sql = $@"
 SELECT s.StuId,s.StuName,s.StuTel,s.FirstEnrollDate,s.StuRealMobile,s.StuPurpose,s.QQ,DATE_FORMAT(ec.CreateTime,'%Y-%m-%d') as followUpTime
-			 ,c.CourseId,c.CourseName,s.JapanBaseInfo,s.StuBirth,org.GuestState as StuGuestState,s.StuChannel,s.CreateType,s.StuSourceId,s.CreateBy
-       ,s.AdvisorStatus,s.AdvisorWinRate,s.AdvisorExpectDate,IFNULL(B.Name,'') AS AdvisorStatusName
+	   ,c.CourseId,c.CourseName,s.JapanBaseInfo,s.StuBirth,org.GuestState as StuGuestState,s.StuChannel,s.CreateType,s.StuSourceId,s.CreateBy
+       ,s.AdvisorStatus,s.AdvisorWinRate,s.AdvisorExpectDate,IFNULL(B.Name,'') AS AdvisorStatusName,org.GraduationTime,clcheck.ClassDate AS BeginClassDate
 FROM rb_student s
 		INNER JOIN rb_student_orderguest og on og.Student_Id = s.StuId
 		INNER JOIN (SELECT og.Student_Id,MAX(og.Id) as Id FROM rb_student_orderguest og INNER JOIN rb_order o on og.OrderId = o.OrderId	WHERE o.OrderState <>3 GROUP BY og.Student_Id) stu on og.Id = stu.Id and og.Student_Id = s.StuId
 		INNER JOIN rb_order_guest org on org.Id = og.GuestId
 		INNER JOIN rb_order o on og.OrderId = o.OrderId
-		inner join rb_class cl on cl.ClassId = o.ClassId
+		INNER JOIN rb_class cl on cl.ClassId = o.ClassId
 		INNER JOIN rb_course c on o.CourseId = c.CourseId
 		LEFT JOIN rb_education_contract ec on ec.GuestId = og.GuestId
 		LEFT JOIN rb_student_advisorconfig AS b ON s.AdvisorStatus=B.Id
+		LEFT JOIN (SELECT OrderGuestId,MIN(ClassDate) AS ClassDate FROM rb_class_check WHERE Status=0 AND CheckStatus=0  GROUP BY OrderGuestId) AS clcheck ON org.Id=clcheck.OrderGuestId
 ";
             if (!string.IsNullOrEmpty(demodel.SFTime) && !string.IsNullOrEmpty(demodel.EFTime)) {
                 //增加跟进链表

Edu.Repository/User/RB_Teacher_StaticRepository.cs

@@ -221,6 +221,18 @@ WHERE 1=1 AND A.Date<>'0001-01-01 00:00:00'
             return list;
         }
 
+        /// <summary>
+        /// 根据存储过程统计教师跟踪信息
+        /// </summary>
+        /// <param name="DateStr"></param>
+        /// <returns></returns>
+        public List<TeacherFollow> GetTeacherFollowByProcRepository(string DateStr)
+        {
+            string sql = string.Format("call proc_teacher_follow('{0}') ", DateStr);
+            var list = Get<TeacherFollow>(sql).ToList();
+            return list;
+        }
+
         /// <summary>
         /// 清除数据
         /// </summary>

Edu.WebApi/Controllers/User/StudentStatController.cs

@@ -66,6 +66,7 @@ namespace Edu.WebApi.Controllers.User
                 StuType = base.ParmJObj.GetInt("StuType"),
                 WeChatNo = base.ParmJObj.GetStringValue("WeChatNo"),
                 StuPurpose = base.ParmJObj.GetInt("StuPurpose"),
+                HeadTeacherId=base.ParmJObj.GetInt("HeadTeacherId"),
             };
             string schoolId = base.ParmJObj.GetStringValue("School_Id");
             if (schoolId != "-1")
@@ -129,6 +130,7 @@ namespace Edu.WebApi.Controllers.User
                 StuType = base.ParmJObj.GetInt("StuType"),
                 WeChatNo = base.ParmJObj.GetStringValue("WeChatNo"),
                 StuPurpose = base.ParmJObj.GetInt("StuPurpose"),
+                HeadTeacherId = base.ParmJObj.GetInt("HeadTeacherId"),
             };
             string schoolId = base.ParmJObj.GetStringValue("School_Id");
             if (schoolId != "-1")

Edu.WebApi/Controllers/User/TeacherStaticController.cs

@@ -190,6 +190,7 @@ namespace Edu.WebApi.Controllers.User
                     {
                        new ExcelColumn("老师"){ CellWidth=15},
                         new ExcelColumn("学生人数"){ CellWidth=15},
+                        new ExcelColumn("班主任学生互动"){ CellWidth=15},
                         new ExcelColumn("上课时数"){ CellWidth=15},
                         new ExcelColumn("线上与学生互动数"){ CellWidth=10},
                         new ExcelColumn("续约(含留学)"){ CellWidth=15},
@@ -222,6 +223,7 @@ namespace Edu.WebApi.Controllers.User
                         new ExcelColumn(dObj.GetStringValue("DateStr"))
                     };
                     columns.Add(new ExcelColumn(dObj.GetStringValue("StudentCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("FinishTimes") + "/" + dObj.GetStringValue("FollowCount")));
                     columns.Add(new ExcelColumn(dObj.GetStringValue("AttendClassHourScore")));
                     columns.Add(new ExcelColumn(dObj.GetStringValue("OnLineInteractiveScore")));
                     columns.Add(new ExcelColumn(dObj.GetStringValue("RenewScore")));