1 约课调整 + 老师基础课时调整

Edu.Model/Entity/User/RB_Teacher.cs

@@ -212,5 +212,10 @@ namespace Edu.Model.Entity.User
         /// 是否是电话客服
         /// </summary>
         public int IsTenCccUser { get; set; }
+
+        /// <summary>
+        /// 增加的基础课时
+        /// </summary>
+        public int BaseHoursAdd { get; set; }
     }
 }
\ No newline at end of file

Edu.Model/ViewModel/Grade/RB_Class_Check_ViewModel.cs

@@ -160,6 +160,11 @@ namespace Edu.Model.ViewModel.Grade
         /// </summary>
         public string EnableTime { get; set; }
 
+        /// <summary>
+        /// 基础课时增加
+        /// </summary>
+        public int BaseHoursAdd { get; set; }
+
         /// <summary>
         /// 班级课时分钟数
         /// </summary>

Edu.Model/ViewModel/Reserve/RB_Reserve_Class_Extend.cs

@@ -100,6 +100,11 @@ namespace Edu.Model.ViewModel.Reserve
         /// </summary>
         public string EnableTime { get; set; }
 
+        /// <summary>
+        /// 基础课时增加
+        /// </summary>
+        public int BaseHoursAdd { get; set; }
+
         /// <summary>
         /// 校区
         /// </summary>

Edu.Model/ViewModel/Sell/RB_Teaching_BonusDetail_ViewModel.cs

@@ -103,6 +103,11 @@ namespace Edu.Model.ViewModel.Sell
         /// </summary>
         public string EnableTime { get; set; }
 
+        /// <summary>
+        /// 基础课时增加
+        /// </summary>
+        public int BaseHoursAdd { get; set; }
+
         #endregion
     }
 }
\ No newline at end of file

Edu.Model/ViewModel/User/Employee_ViewModel.cs

@@ -202,6 +202,11 @@ namespace Edu.Model.ViewModel.User
         /// </summary>
         public string EnableTime { get; set; }
 
+        /// <summary>
+        /// 基础课时增加
+        /// </summary>
+        public int BaseHoursAdd { get; set; }
+
         /// <summary>
         /// 企业微信用户Ids
         /// </summary>

Edu.Module.Course/ScrollClassModule.cs

@@ -3002,6 +3002,20 @@ namespace Edu.Module.Course
             }
             return "";
         }
+
+        /// <summary>
+        /// 获取课程章节名称
+        /// </summary>
+        /// <param name="courseId"></param>
+        /// <param name="courseGradeId"></param>
+        /// <param name="courseGradeNo"></param>
+        /// <param name="userInfo"></param>
+        /// <returns></returns>
+        public string GetScrollCourseChapterName(int courseId, int courseGradeId, int courseGradeNo, UserInfo userInfo)
+        {
+            var chapterModel = course_ChapterRepository.GetChapterListRepository(new RB_Course_Chapter_ViewModel() { Group_Id = userInfo.Group_Id, CourseId = courseId, CourseRate = (Common.Enum.Course.CourseRateEnum)courseGradeId, ChapterGradeNo = courseGradeNo }).FirstOrDefault();
+            return chapterModel?.ChapterName ?? "";
+        }
         #endregion
 
         #region 初始化

Edu.Module.Course/TeachingRewardsModule.cs

@@ -751,7 +751,7 @@ namespace Edu.Module.Course
                             continue;
                         }
                         var qblist = blist.Where(x => x.TeacherId == item).OrderBy(x => x.Date).ThenBy(x => x.UnitPrice).ToList();
-                        decimal BasicHours = configModel.BasicHours;
+                        decimal BasicHours = configModel.BasicHours + teacherModel.BaseHoursAdd;
                         foreach (var qitem in qblist)
                         {
                             decimal CourseHour = 0, DeductionHour = 0;

Edu.Module.Finance/FinanceModule.cs

@@ -3225,7 +3225,7 @@ namespace Edu.Module.Finance
                             foreach (var tId in TeacherIdList)
                             {
                                 var qblist = mlist.Where(x => x.TeacherId == tId).OrderBy(x => x.Date).ThenBy(x => x.UnitPrice).ToList();
-                                decimal BasicHours = (decimal)configModel.BasicHours;
+                                decimal BasicHours = (decimal)(configModel.BasicHours + item.BaseHoursAdd);
                                 foreach (var qitem in qblist)
                                 {
                                     decimal CourseHour = 0, DeductionHour = 0;
@@ -3408,7 +3408,7 @@ namespace Edu.Module.Finance
                             foreach (var tId in TeacherIdList)
                             {
                                 var qblist = mlist.Where(x => x.TeacherId == tId).OrderBy(x => x.Date).ThenBy(x => x.UnitPrice).ToList();
-                                decimal BasicHours = (decimal)configModel.BasicHours;
+                                decimal BasicHours = (decimal)(configModel.BasicHours + item.BaseHoursAdd);
                                 foreach (var qitem in qblist)
                                 {
                                     decimal CourseHour = 0, DeductionHour = 0;
@@ -3561,6 +3561,7 @@ namespace Edu.Module.Finance
                         Money = KSMoney,
                         BaseHoursEnabled = item.BaseHoursEnabled,
                         EnableTime = item.EnableTime,
+                        BaseHoursAdd = item.BaseHoursAdd,
                         SName = item.SName
                     });
                 }
@@ -3590,6 +3591,7 @@ namespace Edu.Module.Finance
                             CouseClassify = 2,
                             BaseHoursEnabled = item.BaseHoursEnabled,
                             EnableTime = item.EnableTime,
+                            BaseHoursAdd = item.BaseHoursAdd,
                             SName = item.SName
                         });
                     }
@@ -3612,7 +3614,7 @@ namespace Edu.Module.Finance
                         foreach (var item in TeacherIdList)
                         {
                             var qblist = mlist.Where(x => x.TeacherId == item).OrderBy(x => x.Date).ThenBy(x => x.UnitPrice).ToList();
-                            decimal BasicHours = (decimal)configModel.BasicHours;
+                            decimal BasicHours = (decimal)(configModel.BasicHours + (mlist.FirstOrDefault()?.BaseHoursAdd ?? 0));
                             foreach (var qitem in qblist)
                             {
                                 decimal CourseHour = 0, DeductionHour = 0;
@@ -3764,7 +3766,7 @@ namespace Edu.Module.Finance
                         foreach (var item in TeacherIdList)
                         {
                             var qblist = mlist.Where(x => x.TeacherId == item).OrderBy(x => x.Date).ThenBy(x => x.UnitPrice).ToList();
-                            decimal BasicHours = (decimal)configModel.BasicHours;
+                            decimal BasicHours = (decimal)(configModel.BasicHours + (mlist.FirstOrDefault()?.BaseHoursAdd ?? 0));
                             foreach (var qitem in qblist)
                             {
                                 decimal CourseHour = 0, DeductionHour = 0;
@@ -4252,7 +4254,7 @@ namespace Edu.Module.Finance
                             foreach (var item in TeacherIdList)
                             {
                                 var qblist = mlist.Where(x => x.TeacherId == item).OrderBy(x => x.Date).ThenBy(x => x.UnitPrice).ToList();
-                                decimal BasicHours = (decimal)configModel.BasicHours;
+                                decimal BasicHours = (decimal)(configModel.BasicHours + (mlist.FirstOrDefault()?.BaseHoursAdd ?? 0));
                                 foreach (var qitem in qblist)
                                 {
                                     decimal CourseHour = 0, DeductionHour = 0;
@@ -4682,7 +4684,7 @@ namespace Edu.Module.Finance
                         foreach (var item in TeacherIdList)
                         {
                             var qblist = mlist.Where(x => x.TeacherId == item).OrderBy(x => x.Date).ThenBy(x => x.UnitPrice).ToList();
-                            decimal BasicHours = (decimal)configModel.BasicHours;
+                            decimal BasicHours = (decimal)(configModel.BasicHours + (mlist.FirstOrDefault()?.BaseHoursAdd ?? 0));
                             foreach (var qitem in qblist)
                             {
                                 decimal CourseHour = 0, DeductionHour = 0;

Edu.Module.User/TeacherModule.cs

@@ -431,6 +431,7 @@ namespace Edu.Module.User
                 fileds.Add(nameof(RB_Teacher_ViewModel.Specialty), model.Specialty);
                 fileds.Add(nameof(RB_Teacher_ViewModel.BaseHoursEnabled), model.BaseHoursEnabled);
                 fileds.Add(nameof(RB_Teacher_ViewModel.EnableTime), model.EnableTime);
+                fileds.Add(nameof(RB_Teacher_ViewModel.BaseHoursAdd), model.BaseHoursAdd);
                 #region 修改日志
                 string logContent = "";
                 if (model.TeacherName != oldModel.TeacherName)
@@ -478,6 +479,18 @@ namespace Edu.Module.User
                 {
                     logContent += string.Format(",将特长由【{0}】修改为【{1}】。", oldModel.Specialty, model.Specialty);
                 }
+                if (model.BaseHoursEnabled != oldModel.BaseHoursEnabled)
+                {
+                    logContent += string.Format(",将基础课时开启由【{0}】修改为【{1}】。", oldModel.BaseHoursEnabled, model.BaseHoursEnabled);
+                }
+                if (model.EnableTime != oldModel.EnableTime)
+                {
+                    logContent += string.Format(",将基础课时启用时间由【{0}】修改为【{1}】。", oldModel.EnableTime, model.EnableTime);
+                }
+                if (model.BaseHoursAdd != oldModel.BaseHoursAdd)
+                {
+                    logContent += string.Format(",将基础课时增加由【{0}】修改为【{1}】。", oldModel.BaseHoursAdd, model.BaseHoursAdd);
+                }
                 if (!string.IsNullOrEmpty(logContent))
                 {
                     //新增日志

Edu.Repository/Grade/RB_Class_CheckRepository.cs

@@ -562,7 +562,7 @@ GROUP BY tt.TeacherId,tt.OrderGuestId
             }
 
             string sql = $@"
-SELECT p.TeacherId,t2.TeacherName,t2.BaseHourFee,t2.BaseHoursEnabled,t2.EnableTime,if(cp.PlanType=2,'预约课',c.ClassName) as ClassName,if(cp.PlanType=2,co2.CourseName,co.CourseName) as CourseName,p.ClassId,
+SELECT p.TeacherId,t2.TeacherName,t2.BaseHourFee,t2.BaseHoursEnabled,t2.EnableTime,t2.BaseHoursAdd,if(cp.PlanType=2,'预约课',c.ClassName) as ClassName,if(cp.PlanType=2,co2.CourseName,co.CourseName) as CourseName,p.ClassId,
 c.ClassType,c.ClassNo,if(cp.PlanType=2,s2.SName,s.SName) as SName,c.ClassHourMinute,if(cp.PlanType=2,cp.CourseId,c.CouseId) as CouseId,p.ClassDate,p.ClassTimeId,t.StartTime as StartDate,t.EndTime as EndDate,Max(p.CurrentDeductionHours) as CurrentDeductionHours 
 FROM rb_class_check p
 INNER JOIN rb_class_time t on p.ClassTimeId = t.ClassTimeId

Edu.Repository/Reserve/RB_Reserve_ClassRepository.cs

@@ -233,7 +233,7 @@ where {where}";
                 where += $@" and c.{nameof(RB_Reserve_Class_Extend.ClassDate)} <='{endMonth} 23:59:59'";
             }
 
-            string sql = $@"select c.*,t.ClassHourFee,t.LessonName,t2.TeacherName,t2.BaseHoursEnabled,t2.EnableTime,s.SName
+            string sql = $@"select c.*,t.ClassHourFee,t.LessonName,t2.TeacherName,t2.BaseHoursEnabled,t2.EnableTime,t2.BaseHoursAdd,s.SName
 from RB_Reserve_Class c 
 left join rb_triallesson t on c.TrialLessonId = t.Id
 LEFT JOIN rb_teacher t2 on c.TeacherId = t2.TId

Edu.Repository/User/RB_AccountRepository.cs

@@ -473,7 +473,7 @@ FROM
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
 SELECT ar.AccountRemark,A.Id,A.Account,A.Password,A.AccountId,A.WorkUserId,A.IsWorkTransfer,A.Group_Id,A.School_Id,A.EmployeeName,A.UserIcon,A.IDCard,A.Sex,A.Education,A.EntryTime,A.Address,A.BirthDate
-      ,A.LeaveStatus,A.LeaveTime,A.EmployeeTel,A.AccountType,A.Email,A.BaseHourFee,A.BaseHoursEnabled,A.EnableTime,IFNULL(A.DirectSupervisor,0) AS DirectSupervisor
+      ,A.LeaveStatus,A.LeaveTime,A.EmployeeTel,A.AccountType,A.Email,A.BaseHourFee,A.BaseHoursEnabled,A.EnableTime,A.BaseHoursAdd,IFNULL(A.DirectSupervisor,0) AS DirectSupervisor
       ,IFNULL(G.GroupName,'') AS GroupName,IFNULL(s.SName,'') AS SchoolName
       ,IFNULL(d.DeptId,0) AS Dept_Id,IFNULL(d.DeptName,'') AS DeptName,IFNULL(p.PostId,0) AS Post_Id, IFNULL(p.PostName,'') AS PostName
       ,(CASE  WHEN CONCAT(DATE_FORMAT(now(),'%Y'),'-',DATE_FORMAT(BirthDate,'%m-%d')) >= DATE_FORMAT(now(),'%Y-%m-%d')  
@@ -487,7 +487,7 @@ FROM
                ,b.School_Id,IFNULL(B.MName,'') AS EmployeeName,B.MHead AS UserIcon,B.Dept_Id,B.Post_Id,B.IDCard
                ,B.Sex,B.Education,B.EntryTime,B.Address,B.BirthDate
                ,B.LeaveStatus,B.LeaveTime,B.MTel AS EmployeeTel,IFNULL(B.Email,'') AS Email
-               ,0 as BaseHourFee,0 as BaseHoursEnabled,'' as EnableTime,B.UserRole,B.IsTenCccUser
+               ,0 as BaseHourFee,0 as BaseHoursEnabled,'' as EnableTime,0 as BaseHoursAdd,B.UserRole,B.IsTenCccUser
 		FROM rb_manager AS B LEFT JOIN rb_account AS A  ON A.AccountId=B.MId AND A.AccountType=1
 		WHERE 1=1 {0} {1}
 		UNION ALL
@@ -496,7 +496,7 @@ FROM
               ,b.School_Id,IFNULL(B.TeacherName,'') AS EmployeeName,B.TeacherIcon AS UserIcon,B.Dept_Id,B.Post_Id,B.IDCard
               ,B.Sex,B.Education,B.EntryTime,B.Address,B.BirthDate
               ,B.LeaveStatus,B.LeaveTime,B.TeacherTel AS EmployeeTel,IFNULL(B.Email,'') AS Email
-              ,B.BaseHourFee,B.BaseHoursEnabled,B.EnableTime,B.UserRole,B.IsTenCccUser
+              ,B.BaseHourFee,B.BaseHoursEnabled,B.EnableTime,B.BaseHoursAdd,B.UserRole,B.IsTenCccUser
 		FROM rb_teacher AS B LEFT JOIN rb_account AS A  ON A.AccountId=B.TId AND A.AccountType=2
 		WHERE 1=1 {0} {2}
 		UNION ALL
@@ -505,7 +505,7 @@ FROM
               ,b.School_Id,IFNULL(B.AssistName,'') AS EmployeeName,B.AssistIcon AS UserIcon,B.Dept_Id,B.Post_Id,B.IDCard
               ,B.Sex,B.Education,B.EntryTime,B.Address,B.BirthDate
               ,B.LeaveStatus,B.LeaveTime,B.AssistTel AS EmployeeTel,IFNULL(B.Email,'') AS Email
-              ,0 as BaseHourFee,0 as BaseHoursEnabled,'' as EnableTime,0 AS UserRole,0 AS IsTenCccUser
+              ,0 as BaseHourFee,0 as BaseHoursEnabled,'' as EnableTime,0 as BaseHoursAdd,0 AS UserRole,0 AS IsTenCccUser
 		FROM  rb_assist AS B LEFT JOIN rb_account AS A  ON A.AccountId=B.AId AND A.AccountType=3  
 		WHERE 1=1 {0} {3}
 ) AS A LEFT JOIN rb_group AS g ON A.Group_Id=g.GId

Edu.WebApi/Controllers/Course/ScrollController.cs

@@ -967,6 +967,26 @@ namespace Edu.WebApi.Controllers.Course
             }            
         }
 
+        /// <summary>
+        /// 获取约课章节的名称
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetScrollCourseChapterName() {
+            var userInfo = base.UserInfo;
+            int CourseId = base.ParmJObj.GetInt("CourseId", 0);
+            int CourseGradeId = base.ParmJObj.GetInt("CourseGradeId", 0);
+            int CourseGradeNo = base.ParmJObj.GetInt("CourseGradeNo", 0);
+
+            if (CourseId <= 0 || CourseGradeId <= 0 || CourseGradeNo <= 0)
+            {
+                return ApiResult.ParamIsNull();
+            }
+
+            string Name = scrollClassModule.GetScrollCourseChapterName(CourseId, CourseGradeId, CourseGradeNo, userInfo);
+            return ApiResult.Success("", Name);
+        }
+
         #endregion
 
         #region 初始化约课数据

Edu.WebApi/Controllers/User/UserController.cs

@@ -449,7 +449,8 @@ namespace Edu.WebApi.Controllers.User
                 AuditStatus = AccountStatusEnum.Pass,
                 Specialty = base.ParmJObj.GetStringValue("Specialty"),
                 BaseHoursEnabled = base.ParmJObj.GetInt("BaseHoursEnabled", 0),
-                EnableTime = base.ParmJObj.GetStringValue("EnableTime")
+                EnableTime = base.ParmJObj.GetStringValue("EnableTime"),
+                BaseHoursAdd = base.ParmJObj.GetInt("BaseHoursAdd", 0)
             };
             extModel.TeachTag = base.ParmJObj.GetStringValue("TeachTag");
             extModel.CreateBy = base.UserInfo.Id;