页面修改

Edu.Module.Course/ClassModule.cs

@@ -1826,7 +1826,7 @@ namespace Edu.Module.Course
                         item.GuestName,
                         item.Age,
                         CreateTimeStr = Common.ConvertHelper.FormatTime(item.CreateTime),
-                        item.Mobile,
+                        Mobile=item.StuTel,
                         item.OrderId,
                         EnterName = UserReidsCache.GetUserLoginInfo(item.EnterID)?.AccountName ?? "",
                         item.ContractTotalHours,

Edu.Module.Course/SellAchievementsModule.cs

@@ -1765,7 +1765,7 @@ namespace Edu.Module.Course
                     string orderIds = string.Join(",", orderList.Select(x => x.OrderId));
                     var bdList = customer_BalanceDetailRepository.GetCustomerBalanceDetailListRepository(new Model.ViewModel.Customer.RB_Customer_BalanceDetail_ViewModel() { Group_Id = userInfo.Group_Id, QOrderIds = orderIds });
 
-                    if (RuleModel.Type == 3)
+                    if (RuleModel!=null&&RuleModel.Type == 3)
                     {
                         //当前匹配教师规则  只查询老师的业绩
                         foreach (var item in rulelist.Where(x => x.Id == RuleModel.Id))
@@ -1879,7 +1879,7 @@ namespace Edu.Module.Course
                             }
                         }
                         //再查询当前用户的
-                        foreach (var item in rulelist.Where(x => x.Id == RuleModel.Id))
+                        foreach (var item in rulelist.Where(x => x.Id == (RuleModel?.Id??0)))
                         {
                             if (string.IsNullOrEmpty(item.ChildEmpIds))
                             {

Edu.Repository/Sell/RB_Order_GuestRepository.cs

@@ -134,7 +134,7 @@ namespace Edu.Repository.Sell
 SELECT sog.Student_Id as StudentId,A.*,cs.ClassName,cs.Teacher_Id,cs.ClassNo,IFNULL(B.JoinType,0) AS JoinType,IFNULL(B.TargetJoinType,0) AS TargetJoinType,IFNULL(B.StartClassHours,0) AS StartClassHours
        ,IFNULL(C.CourseName,'') AS CourseName,B.EffectStatus,B.EffectTime,B.UpOrderId,B.OrderType,B.CourseId,B.IsRenewOrder,B.RenewOrderId,B.EnterID
        ,sc.StopClassEffectTime,B.SourceOrderId,B.TargetOrderId,IFNULL(D.FirstClassHours,0)+IFNULL(D.SecondClassHours,0)+IFNULL(D.ThirdClassHours,0) AS ContractTotalHours
-	   ,IFNULL(stu.StuIcon,'') AS UserIcon
+	   ,IFNULL(stu.StuIcon,'') AS UserIcon,stu.StuTel,stu.StuRealMobile
 FROM RB_Order_Guest AS A LEFT JOIN rb_order AS B ON A.OrderId=B.OrderId
      LEFT JOIN rb_class AS cs ON B.ClassId=cs.ClassId
      LEFT JOIN rb_student_orderguest as sog on sog.GuestId=a.Id
@@ -345,13 +345,15 @@ WHERE {where}";
             builder.AppendFormat(@"
 SELECT A.*,IFNULL(B.JoinType,0) AS JoinType,IFNULL(B.TargetJoinType,0) AS TargetJoinType,IFNULL(B.StartClassHours,0) AS StartClassHours,IFNULL(C.CourseName,'') AS CourseName
        ,class.ClassName,b.EnterID,plan.TotalPlanNum,planr.Ranks ,B.EffectStatus,B.EffectTime,B.UpOrderId,B.OrderType,B.CourseId,B.IsRenewOrder,B.RenewOrderId
-       ,sc.StopClassEffectTime,B.SourceOrderId,B.TargetOrderId
+       ,sc.StopClassEffectTime,B.SourceOrderId,B.TargetOrderId,stu.StuTel,stu.StuRealMobile
 FROM RB_Order_Guest AS A LEFT JOIN rb_order AS B ON A.OrderId=B.OrderId
-LEFT JOIN rb_class as class on class.ClassId=a.ClassId
+     LEFT JOIN rb_class as class on class.ClassId=a.ClassId
+	 LEFT JOIN rb_student_orderguest as sog on sog.GuestId=a.Id
+	 LEFT JOIN rb_student AS stu ON sog.Student_Id=stu.StuId
      LEFT JOIN rb_course AS C ON (B.CourseId=C.CourseId AND B.CourseId>0 AND B.OrderType=1)
-LEFT JOIN (SELECT ClassId,COUNT(*) TotalPlanNum from rb_class_plan where `Status`=0 GROUP BY ClassId) as plan on plan.ClassId=class.ClassId
-LEFT JOIN (SELECT ClassId,COUNT(*) Ranks from rb_class_plan where `Status`=0 and DATE_FORMAT(ClassDate,'%Y-%m-%d') <=DATE_FORMAT(NOW(),'%Y-%m-%d') GROUP BY ClassId) as planr on planr.ClassId=class.ClassId
-LEFT JOIN (SELECT OrderGuestId,MAX(TakeEffectTime) as StopClassEffectTime from rb_student_stopclass where IsAuditThrough=1 GROUP BY OrderGuestId) as sc on sc.OrderGuestId=a.Id
+     LEFT JOIN (SELECT ClassId,COUNT(*) TotalPlanNum from rb_class_plan where `Status`=0 GROUP BY ClassId) as plan on plan.ClassId=class.ClassId
+     LEFT JOIN (SELECT ClassId,COUNT(*) Ranks from rb_class_plan where `Status`=0 and DATE_FORMAT(ClassDate,'%Y-%m-%d') <=DATE_FORMAT(NOW(),'%Y-%m-%d') GROUP BY ClassId) as planr on planr.ClassId=class.ClassId
+     LEFT JOIN (SELECT OrderGuestId,MAX(TakeEffectTime) as StopClassEffectTime from rb_student_stopclass where IsAuditThrough=1 GROUP BY OrderGuestId) as sc on sc.OrderGuestId=a.Id
 WHERE  1=1 and A.Status=0 and class.Status=0   and b.OrderState<>3 
 ");
             if (demodel.Group_Id > 0)

Edu.WebApi/Controllers/Course/TeacherClassController.cs

@@ -246,7 +246,7 @@ namespace Edu.WebApi.Controllers.Course
                 {
                     item.Id,
                     item.GuestName,
-                    item.Mobile,
+                    Mobile=item.StuTel,
                     item.ClassId,
                     item.ClassName,
                     item.CourseId,