页面修改

Edu.Model/Entity/Course/RB_Order.cs

@@ -199,5 +199,15 @@ namespace Edu.Model.Entity.Course
         /// (教育订单使用)订单性质(1-直通车,2-代收代付,3-返佣)
         /// </summary>
         public decimal OldPreferPrice { get; set; }
+
+        /// <summary>
+        /// 课程编号
+        /// </summary>
+        public int CourseId { get; set; }
+
+        /// <summary>
+        /// 插班开始课时
+        /// </summary>
+        public int StartClassHours { get; set; }
     }
 }

Edu.Model/ViewModel/Course/RB_Class_Plan_ViewModel.cs

@@ -73,6 +73,7 @@ namespace Edu.Model.ViewModel.Course
         /// 上课开始时间
         /// </summary>
         public string StartTime { get; set; }
+
         /// <summary>
         /// 上课结束时间
         /// </summary>
@@ -92,5 +93,10 @@ namespace Edu.Model.ViewModel.Course
         /// 学生id
         /// </summary>
         public int StuId { get; set; }
+
+        /// <summary>
+        /// 每一节课分钟数
+        /// </summary>
+        public int ClassMinutes { get; set; }
     }
 }

Edu.Module.Course/OrderModule.cs

@@ -222,13 +222,34 @@ namespace Edu.Module.Course
         /// <summary>
         /// 获取班级课程信息
         /// </summary>
-        /// <param name="classId"></param>
+        /// <param name="classId">班级编号</param>
+        /// <param name="Group_Id">集团编号</param>
         /// <returns></returns>
-        public Dictionary<string,object> GetClassCourseListModule(int classId)
+        public Dictionary<string, object> GetClassCourseListModule(int classId, int Group_Id)
         {
             Dictionary<string, object> fileds = new Dictionary<string, object>();
-
+            var planList = class_PlanRepository.GetClassPlanListRepository(new RB_Class_Plan_ViewModel() { ClassId = classId, EndTime = Common.ConvertHelper.FormatDate(DateTime.Now) });
+            var totalMinutes = planList?.Sum(qitem => qitem.ClassMinutes) ?? 0;
+            //查询基础课时时长
+            var configModel = class_ConfigRepository.GetClassConfigRepository(new RB_Class_Config_ViewModel() { Group_Id = Group_Id });
+            var finishHours = totalMinutes / (configModel?.BasicMinutes ?? 45.0);
+            fileds.Add("finishHours", finishHours);
+            var classModel = classRepository.GetEntity(classId);
+            var courseModel = courseRepository.GetEntity(classModel.CouseId);
+            if (courseModel != null && courseModel.CourseId > 0)
+            {
+                fileds.Add("currentCourse", new {
+                    courseModel.CourseId,
+                    courseModel.CourseName,
+                    courseModel.ClassHours,
+                    courseModel.SellPrice
+                });
+            }
             var courseList = class_CourseRepository.GetClassCourseListRepository(new RB_Class_Course_Extend() { ClassId = classId });
+            if (courseList != null)
+            {
+                fileds.Add("otherCourse", courseList.Select(qitem=> new{qitem.CourseId,qitem.CourseName,qitem.ClassHours,qitem.SellPrice }));
+            }
             return fileds;
         }
 

Edu.Repository/Course/RB_Class_PlanRepository.cs

@@ -24,8 +24,10 @@ namespace Edu.Repository.Course
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
 SELECT A.*,IFNULL(B.RoomName,'') AS RoomName,IFNULL(T.TeacherName,'') AS TeacherName,IFNULL(T.TeacherHead,'') AS UserIcon
+       ,Time.StartTime,time.EndTime,TIMESTAMPDIFF(MINUTE, CONCAT('2020-12-16',' ',time.StartTime), CONCAT('2020-12-16',' ',time.EndTime)) AS ClassMinutes
 FROM RB_Class_Plan AS A LEFT JOIN rb_class_room AS B ON A.ClassRoomId=B.RoomId
      LEFT JOIN rb_teacher AS T ON A.TeacherId=T.TId
+     LEFT JOIN rb_class_time AS time ON A.ClassPlanId=Time.ClassPlanId
 WHERE 1=1 
 ");
             builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.Status), (int)DateStateEnum.Normal);
@@ -59,10 +61,61 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND DATE_FORMAT(A.{0},'%y/%m')>='{1}' ", nameof(RB_Class_Plan_ViewModel.ClassDate), query.StartTime);
                 }
+                if (!string.IsNullOrEmpty(query.EndTime))
+                {
+                    builder.AppendFormat(" AND DATE_FORMAT(A.{0},'%y/%m')<='{1} 23:59:59' ", nameof(RB_Class_Plan_ViewModel.ClassDate), query.EndTime);
+                }
             }
             return Get<RB_Class_Plan_ViewModel>(builder.ToString()).ToList();
         }
 
+        /// <summary>
+        /// 获取班级上课计划
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Class_Plan_ViewModel> GetClassPlanModelRepository(RB_Class_Plan_ViewModel query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@" 
+SELECT a.* 
+FROM rb_class_plan as a 
+WHERE  a.`Status`=0 ");
+            if (query != null)
+            {
+                if (query.Group_Id > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.Group_Id), query.Group_Id);
+                }
+                if (query.School_Id > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.School_Id), query.School_Id);
+                }
+                if (query.ClassId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.ClassId), query.ClassId);
+                }
+                if (query.Status >= 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.Status), (int)query.Status);
+                }
+                if (!string.IsNullOrEmpty(query.QClassDateStr))
+                {
+                    builder.AppendFormat(@" AND DATE_FORMAT(a.ClassDate,'%Y-%m-%d')=DATE_FORMAT('{0}','%Y-%m-%d') ", query.QClassDateStr);
+                }
+                else
+                {
+                    builder.AppendFormat(@" AND DATE_FORMAT(a.ClassDate,'%Y-%m-%d')=DATE_FORMAT(NOW(),'%Y-%m-%d') ");
+                }
+            }
+            builder.AppendFormat(@" ORDER BY  ClassDate DESC  ");
+            return Get<RB_Class_Plan_ViewModel>(builder.ToString()).ToList();
+        }
+
+
         /// <summary>
         /// 判断是否存在
         /// </summary>
@@ -115,10 +168,12 @@ WHERE ClassId={1} AND ClassDate>'{2}'
         public List<RB_Class_Plan_ViewModel> GetClassPlanList_V2(RB_Class_Plan_ViewModel query)
         {
             StringBuilder builder = new StringBuilder();
-            builder.AppendFormat(@" SELECT a.*,c.Teacher_Id,c.ClassName,c.ClassType,T.TeacherName from rb_class_plan as a 
-left join rb_class c on a.ClassId = c.ClassId
-LEFT JOIN rb_teacher AS T ON a.TeacherId=T.TId
- where  a.`Status`=0 ");
+            builder.AppendFormat(@" 
+SELECT a.*,c.Teacher_Id,c.ClassName,c.ClassType,T.TeacherName 
+FROM rb_class_plan as a 
+    LEFT JOIN rb_class c on a.ClassId = c.ClassId
+    LEFT JOIN rb_teacher AS T ON a.TeacherId=T.TId
+where  a.`Status`=0 ");
             if (query != null)
             {
                 if (query.Group_Id > 0)
@@ -165,12 +220,13 @@ LEFT JOIN rb_teacher AS T ON a.TeacherId=T.TId
         /// <returns></returns>
         public List<RB_Class_Plan_ViewModel> GetClassPlanLogPageListRepository(int pageIndex, int pageSize, out long rowsCount, RB_Class_Plan_ViewModel query)
         {
-
             StringBuilder builder = new StringBuilder();
-            builder.AppendFormat(@" SELECT a.*,b.Teacher_Id,c.TeacherName from rb_class_plan as a 
-LEFT JOIN rb_class as b on a.ClassId=b.ClassId
-LEFT JOIN rb_teacher as c on c.TId=a.TeacherId
- where  a.`Status`=0 and DATE_FORMAT(a.ClassDate,'%Y-%m-%d')<=DATE_FORMAT(NOW(),'%Y-%m-%d') ");
+            builder.AppendFormat(@"
+SELECT a.*,b.Teacher_Id,c.TeacherName 
+FROM rb_class_plan as a 
+    LEFT JOIN rb_class as b on a.ClassId=b.ClassId
+    LEFT JOIN rb_teacher as c on c.TId=a.TeacherId
+WHERE  a.`Status`=0 and DATE_FORMAT(a.ClassDate,'%Y-%m-%d')<=DATE_FORMAT(NOW(),'%Y-%m-%d') ");
             if (query != null)
             {
                 if (query.Group_Id > 0)
@@ -193,58 +249,11 @@ LEFT JOIN rb_teacher as c on c.TId=a.TeacherId
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.Status), (int)query.Status);
                 }
-
             }
             builder.AppendFormat(@" order by  ClassDate desc  ");
             return GetPage<RB_Class_Plan_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList();
         }
 
-        /// <summary>
-        /// 获取班级上课计划
-        /// </summary>
-        /// <param name="pageIndex"></param>
-        /// <param name="pageSize"></param>
-        /// <param name="rowsCount"></param>
-        /// <param name="query"></param>
-        /// <returns></returns>
-        public List<RB_Class_Plan_ViewModel> GetClassPlanModelRepository(RB_Class_Plan_ViewModel query)
-        {
-
-            StringBuilder builder = new StringBuilder();
-            builder.AppendFormat(@" 
-SELECT a.* 
-FROM rb_class_plan as a 
-WHERE  a.`Status`=0 ");
-            if (query != null)
-            {
-                if (query.Group_Id > 0)
-                {
-                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.Group_Id), query.Group_Id);
-                }
-                if (query.School_Id > 0)
-                {
-                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.School_Id), query.School_Id);
-                }
-                if (query.ClassId > 0)
-                {
-                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.ClassId), query.ClassId);
-                }
-                if (query.Status >= 0)
-                {
-                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.Status), (int)query.Status);
-                }
-                if (!string.IsNullOrEmpty(query.QClassDateStr))
-                {
-                    builder.AppendFormat(@" AND DATE_FORMAT(a.ClassDate,'%Y-%m-%d')=DATE_FORMAT('{0}','%Y-%m-%d') ", query.QClassDateStr);
-                }
-                else
-                {
-                    builder.AppendFormat(@" AND DATE_FORMAT(a.ClassDate,'%Y-%m-%d')=DATE_FORMAT(NOW(),'%Y-%m-%d') ");
-                }
-            }
-            builder.AppendFormat(@" ORDER BY  ClassDate DESC  ");
-            return Get<RB_Class_Plan_ViewModel>(builder.ToString()).ToList();
-        }
      
         /// <summary>
         /// 获取班级累计上课时间（分钟）
@@ -271,10 +280,6 @@ WHERE p.`Status`=0 AND p.Group_Id={group_Id} AND p.ClassId ={classId}
         }
 
 
-
-
-
-
         /// <summary>
         /// 获取班级上课计划列表
         /// </summary>

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -354,7 +354,9 @@ namespace Edu.WebApi.Controllers.Course
                 IsLessPrice=base.ParmJObj.GetInt("IsLessPrice"),
                 LessPrice=base.ParmJObj.GetDecimal("LessPrice"),
                 OrderNature=(OrderNatureEnum)base.ParmJObj.GetInt("OrderNature"),
-                OldPreferPrice=base.ParmJObj.GetDecimal("OldPreferPrice")
+                OldPreferPrice=base.ParmJObj.GetDecimal("OldPreferPrice"),
+                CourseId=base.ParmJObj.GetInt("CourseId"),
+                StartClassHours=base.ParmJObj.GetInt("StartClassHours"),
             };
             if (demodel.OrderType== OrderTypeEnum.CourseOrder &&demodel.ClassId <= 0)
             {
@@ -1550,7 +1552,7 @@ namespace Edu.WebApi.Controllers.Course
         public ApiResult GetChaClassInfo()
         {
             var ClassId = base.ParmJObj.GetInt("ClassId");
-            var otherClassList = orderModule.GetClassCourseListModule(ClassId);
+            var otherClassList = orderModule.GetClassCourseListModule(ClassId, base.UserInfo.Group_Id);
             return ApiResult.Success(data: otherClassList);
         }