Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.Model/ViewModel/Course/RB_Class_Plan_ViewModel.cs

@@ -53,6 +53,11 @@ namespace Edu.Model.ViewModel.Course
         /// </summary>
         public int ClassType { get; set; }
 
+        /// <summary>
+        /// 班级课时分钟数
+        /// </summary>
+        public int ClassHourMinute { get; set; }
+
         /// <summary>
         /// 老师头像
         /// </summary>

Edu.Module.Course/TeachingRewardsModule.cs

@@ -536,7 +536,9 @@ namespace Edu.Module.Course
                         var ts = Convert.ToDateTime(nowTime + " " + qitem.EndTime) - Convert.ToDateTime(nowTime + " " + qitem.StartTime);
                         minute += (int)ts.TotalMinutes;
                     }
-                    int ksNum = minute / configModel.BasicMinutes; // 未达到一课时时间  算不算一课时
+                    int ClassHourMinute = configModel.BasicMinutes;//课时分钟数
+                    if (item.ClassHourMinute > 0) { ClassHourMinute = item.ClassHourMinute; }
+                    int ksNum = minute / ClassHourMinute; // 未达到一课时时间  算不算一课时
                     //查询课单价
                     var typeModel = typeList.Where(x => x.CTypeId == item.ClassType).FirstOrDefault();
                     var teacherModel = teacherList.Where(x => x.TId == item.TeacherId).FirstOrDefault();
@@ -1215,7 +1217,9 @@ namespace Edu.Module.Course
             //班级课时总分钟数
             int TotalClassMin = class_PlanRepository.GetClassTotalMinute(classId, classModel.Group_Id);
             //总课时
-            int ksNum = TotalClassMin / configModel.BasicMinutes; // 未达到一课时时间  不算一课时
+            int ClassHourMinute = configModel.BasicMinutes;//课时分钟数
+            if (classModel.ClassHourMinute > 0) { ClassHourMinute = classModel.ClassHourMinute; }
+            int ksNum = TotalClassMin / ClassHourMinute; // 未达到一课时时间  不算一课时
 
             //满班率
             decimal FullClassRate = 0;

Edu.Module.Finance/FinanceModule.cs

@@ -2760,15 +2760,21 @@ namespace Edu.Module.Finance
                     });
                 }
 
+                //初始化 基础课时
+                DateTime STime = Convert.ToDateTime(startMonth);
+                while (true)
+                {
+                    DateTime ETime = STime.AddMonths(1).AddDays(-1);
+                    var mlist = RList.Where(x => x.Date >= STime && x.Date <= ETime).ToList();
                     #region 基础课时处理
                     decimal DeductionMoney = 0;
                     if (configModel.BasicHours > 0)
                     {
                         //遍历所有老师
-                    List<int> TeacherIdList = RList.Select(x => x.TeacherId).Distinct().ToList();
+                        List<int> TeacherIdList = mlist.Select(x => x.TeacherId).Distinct().ToList();
                         foreach (var item in TeacherIdList)
                         {
-                        var qblist = RList.Where(x => x.TeacherId == item).OrderBy(x => x.UnitPrice).ThenBy(x => x.Date).ToList();
+                            var qblist = mlist.Where(x => x.TeacherId == item).OrderBy(x => x.Date).ThenBy(x => x.UnitPrice).ToList();
                             decimal BasicHours = (decimal)configModel.BasicHours;
                             foreach (var qitem in qblist)
                             {
@@ -2797,6 +2803,13 @@ namespace Edu.Module.Finance
                         }
                     }
                     #endregion
+
+                    if (STime.Month == Convert.ToDateTime(endMonth).Month)
+                    {
+                        break;
+                    }
+                    STime = STime.AddMonths(1);
+                }
             }
             return RList;
         }
@@ -2859,15 +2872,22 @@ namespace Edu.Module.Finance
                     });
                 }
 
+                //初始化 基础课时
+                DateTime STime = Convert.ToDateTime(startMonth);
+                while (true)
+                {
+                    DateTime ETime = STime.AddMonths(1).AddDays(-1);
+                    var mlist = RList.Where(x => x.Date >= STime && x.Date <= ETime).ToList();
+
                     #region 基础课时处理
                     decimal DeductionMoney = 0;
                     if (configModel.BasicHours > 0)
                     {
                         //遍历所有老师
-                    List<int> TeacherIdList = RList.Select(x => x.TeacherId).Distinct().ToList();
+                        List<int> TeacherIdList = mlist.Select(x => x.TeacherId).Distinct().ToList();
                         foreach (var item in TeacherIdList)
                         {
-                        var qblist = RList.Where(x => x.TeacherId == item).OrderBy(x => x.UnitPrice).ThenBy(x => x.Date).ToList();
+                            var qblist = mlist.Where(x => x.TeacherId == item).OrderBy(x => x.Date).ThenBy(x => x.UnitPrice).ToList();
                             decimal BasicHours = (decimal)configModel.BasicHours;
                             foreach (var qitem in qblist)
                             {
@@ -2897,6 +2917,13 @@ namespace Edu.Module.Finance
                     }
                     #endregion
 
+                    if (STime.Month == Convert.ToDateTime(endMonth).Month)
+                    {
+                        break;
+                    }
+                    STime = STime.AddMonths(1);
+                }
+
                 foreach (var item in RList) {
                     ExcelDataSource firstRow = new ExcelDataSource(30)
                     {

Edu.Repository/Course/RB_Class_PlanRepository.cs

@@ -240,7 +240,7 @@ WHERE ClassId={1} AND ClassDate>'{2}'
         {
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@" 
-SELECT a.*,c.Teacher_Id,c.ClassName,c.ClassType,T.TeacherName ,cou.CourseName
+SELECT a.*,c.Teacher_Id,c.ClassName,c.ClassType,c.ClassHourMinute,T.TeacherName ,cou.CourseName
 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