页面修改

Edu.Model/ViewModel/Course/RB_Order_Guest_ViewModel.cs

@@ -247,5 +247,11 @@ namespace Edu.Model.ViewModel.Course
         /// 上课计划id
         /// </summary>
         public int ClassPlanId { get; set; }
+
+        /// <summary>
+        /// 合同总课时
+        /// </summary>
+        public int ContractTotalHours { get; set; }
+
     }
 }
\ No newline at end of file

Edu.Module.Course/ClassModule.cs

 using Edu.AOP.CustomerAttribute;
+using Edu.Cache.User;
 using Edu.Common.Enum;
 using Edu.Common.Enum.Course;
 using Edu.Common.Plugin;
@@ -1321,6 +1322,8 @@ namespace Edu.Module.Course
                         CreateTimeStr = Common.ConvertHelper.FormatTime(item.CreateTime),
                         item.Mobile,
                         item.OrderId,
+                        EnterName= UserReidsCache.GetUserLoginInfo(item.EnterID)?.AccountName??"",
+                        item.ContractTotalHours,
                         item.TotalHours,
                         item.CompleteHours,
                         item.ValidClassHours,

Edu.Repository/Course/RB_Order_GuestRepository.cs

@@ -114,11 +114,12 @@ namespace Edu.Repository.Course
 
             string sql = $@" 
 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,B.EffectStatus,B.EffectTime,B.UpOrderId,B.OrderType,B.CourseId,B.IsRenewOrder,B.RenewOrderId
-       ,sc.StopClassEffectTime,B.SourceOrderId,B.TargetOrderId
+       ,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
 FROM RB_Order_Guest AS A LEFT JOIN rb_order AS B ON A.OrderId=B.OrderId
      LEFT JOIN rb_course AS C ON (B.CourseId=C.CourseId AND B.CourseId>0 AND B.OrderType=1)
      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 rb_education_contract AS D ON A.OrderId=D.OrderId AND A.Id=D.GuestId AND D.IsSystemUse=1
 WHERE 1=1 and A.Status=0 {where}";
             return Get<RB_Order_Guest_ViewModel>(sql).ToList();
         }