课耗统计调整 老师课时 使用 学生签到表里的

Edu.Module.Finance/FinanceModule.cs

@@ -2413,9 +2413,7 @@ namespace Edu.Module.Finance
                         int Minutes = (int)(Convert.ToDateTime("2021-06-29 " + item.EndDate) - Convert.ToDateTime("2021-06-29 " + item.StartDate)).TotalMinutes;
                         decimal Hours = Math.Round(Convert.ToDecimal(Minutes) / 60, 2, MidpointRounding.AwayFromZero);//小时
                         //上课课时
-                        decimal ClassHourMinute = configModel.BasicMinutes;//课时分钟数
-                        if (item.ClassHourMinute > 0) { ClassHourMinute = item.ClassHourMinute; }
-                        decimal KSNum = Math.Round(Convert.ToDecimal(Minutes) / ClassHourMinute, 2, MidpointRounding.AwayFromZero); // 未达到一课时时间  算不算一课时
+                        decimal KSNum = item.CurrentDeductionHours;//使用签到表的课时
 
                         var typeModel = cTypeList.Where(x => x.CTypeId == item.ClassType).FirstOrDefault();
 
@@ -2423,6 +2421,8 @@ namespace Edu.Module.Finance
                         //课时费  需要每个班级  单独计算  因为 班级有附加费用
                         decimal KSMoney = KSNum * unitPrice;
 
+                        decimal ClassHourMinute = configModel.BasicMinutes;//课时分钟数
+                        if (item.ClassHourMinute > 0) { ClassHourMinute = item.ClassHourMinute; }
                         decimal HourMoney = Math.Round(unitPrice / ClassHourMinute * 60, 2, MidpointRounding.AwayFromZero);//没小时课时费
 
                         DateList.Add(new RB_Teaching_BonusDetail_ViewModel
@@ -2563,9 +2563,7 @@ namespace Edu.Module.Finance
                         int Minutes = (int)(Convert.ToDateTime("2021-06-29 " + item.EndDate) - Convert.ToDateTime("2021-06-29 " + item.StartDate)).TotalMinutes;
                         decimal Hours = Math.Round(Convert.ToDecimal(Minutes) / 60, 2, MidpointRounding.AwayFromZero);//小时
                         //上课课时
-                        decimal ClassHourMinute = configModel.BasicMinutes;//课时分钟数
-                        if (item.ClassHourMinute > 0) { ClassHourMinute = item.ClassHourMinute; }
-                        decimal KSNum = Math.Round(Convert.ToDecimal(Minutes) / ClassHourMinute, 2, MidpointRounding.AwayFromZero); // 未达到一课时时间  算不算一课时
+                        decimal KSNum = item.CurrentDeductionHours;//使用签到表课时
 
                         var typeModel = cTypeList.Where(x => x.CTypeId == item.ClassType).FirstOrDefault();
 
@@ -2573,6 +2571,8 @@ namespace Edu.Module.Finance
                         //课时费  需要每个班级  单独计算  因为 班级有附加费用
                         decimal KSMoney = KSNum * unitPrice;
 
+                        decimal ClassHourMinute = configModel.BasicMinutes;//课时分钟数
+                        if (item.ClassHourMinute > 0) { ClassHourMinute = item.ClassHourMinute; }
                         decimal HourMoney = Math.Round(unitPrice / ClassHourMinute * 60, 2, MidpointRounding.AwayFromZero);//没小时课时费
 
                         DateList.Add(new RB_Teaching_BonusDetail_ViewModel
@@ -2739,9 +2739,7 @@ namespace Edu.Module.Finance
                     int Minutes = (int)(Convert.ToDateTime("2021-06-29 " + item.EndDate) - Convert.ToDateTime("2021-06-29 " + item.StartDate)).TotalMinutes;
                     decimal Hours = Math.Round(Convert.ToDecimal(Minutes) / 60, 2, MidpointRounding.AwayFromZero);//小时
                     //上课课时
-                    decimal ClassHourMinute = configModel.BasicMinutes;//课时分钟数
-                    if (item.ClassHourMinute > 0) { ClassHourMinute = item.ClassHourMinute; }
-                    decimal KSNum = Math.Round(Convert.ToDecimal(Minutes) / ClassHourMinute, 2, MidpointRounding.AwayFromZero); // 未达到一课时时间  算不算一课时
+                    decimal KSNum = item.CurrentDeductionHours;//课时直接取这里的了， 这个可手动调整了；
 
                     var typeModel = cTypeList.Where(x => x.CTypeId == item.ClassType).FirstOrDefault();
 
@@ -2749,6 +2747,8 @@ namespace Edu.Module.Finance
                     //课时费  需要每个班级  单独计算  因为 班级有附加费用
                     decimal KSMoney = KSNum * unitPrice;
 
+                    decimal ClassHourMinute = configModel.BasicMinutes;//课时分钟数
+                    if (item.ClassHourMinute > 0) { ClassHourMinute = item.ClassHourMinute; }
                     decimal HourMoney = Math.Round(unitPrice / ClassHourMinute * 60, 2, MidpointRounding.AwayFromZero);//每小时课时费
 
 
@@ -2856,9 +2856,7 @@ namespace Edu.Module.Finance
                     int Minutes = (int)(Convert.ToDateTime("2021-06-29 " + item.EndDate) - Convert.ToDateTime("2021-06-29 " + item.StartDate)).TotalMinutes;
                     decimal Hours = Math.Round(Convert.ToDecimal(Minutes) / 60, 2, MidpointRounding.AwayFromZero);//小时
                     //上课课时
-                    decimal ClassHourMinute = configModel.BasicMinutes;//课时分钟数
-                    if (item.ClassHourMinute > 0) { ClassHourMinute = item.ClassHourMinute; }
-                    decimal KSNum = Math.Round(Convert.ToDecimal(Minutes) / ClassHourMinute, 2, MidpointRounding.AwayFromZero); // 未达到一课时时间  算不算一课时
+                    decimal KSNum = item.CurrentDeductionHours;
 
                     var typeModel = cTypeList.Where(x => x.CTypeId == item.ClassType).FirstOrDefault();
 
@@ -2866,6 +2864,8 @@ namespace Edu.Module.Finance
                     //课时费  需要每个班级  单独计算  因为 班级有附加费用
                     decimal KSMoney = KSNum * unitPrice;
 
+                    decimal ClassHourMinute = configModel.BasicMinutes;//课时分钟数
+                    if (item.ClassHourMinute > 0) { ClassHourMinute = item.ClassHourMinute; }
                     decimal HourMoney = Math.Round(unitPrice / ClassHourMinute * 60, 2, MidpointRounding.AwayFromZero);//没小时课时费
 
                     RList.Add(new RB_Teaching_BonusDetail_ViewModel

Edu.Repository/Course/RB_Class_CheckRepository.cs

@@ -438,7 +438,7 @@ GROUP BY tt.TeacherId,tt.OrderGuestId
             }
 
             string sql = $@"
-SELECT p.TeacherId,t2.TeacherName,t2.BaseHourFee,t2.BaseHoursEnabled,t2.EnableTime,c.ClassName,co.CourseName,p.ClassId,c.ClassType,c.ClassNo,c.ClassHourMinute,c.CouseId,p.ClassDate,p.ClassTimeId,t.StartTime as StartDate,t.EndTime as EndDate FROM rb_class_check p
+SELECT p.TeacherId,t2.TeacherName,t2.BaseHourFee,t2.BaseHoursEnabled,t2.EnableTime,c.ClassName,co.CourseName,p.ClassId,c.ClassType,c.ClassNo,c.ClassHourMinute,c.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
 LEFT JOIN rb_teacher t2 on p.TeacherId = t2.TId
 LEFT JOIN rb_class c on p.ClassId = c.ClassId
@@ -476,7 +476,7 @@ ORDER BY p.ClassDate ASC
             }
 
             string sql = $@"
-SELECT p.TeacherId,t2.TeacherName,t2.BaseHourFee,c.ClassName,co.CourseName,p.ClassId,c.ClassType,c.ClassNo,c.ClassHourMinute,c.CouseId,p.ClassDate,p.ClassTimeId,t.StartTime as StartDate,t.EndTime as EndDate FROM rb_class_check p
+SELECT p.TeacherId,t2.TeacherName,t2.BaseHourFee,c.ClassName,co.CourseName,p.ClassId,c.ClassType,c.ClassNo,c.ClassHourMinute,c.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
 LEFT JOIN rb_teacher t2 on p.TeacherId = t2.TId
 LEFT JOIN rb_class c on p.ClassId = c.ClassId