Commit 30c19983 authored by liudong1993's avatar liudong1993

1 甲鹤试听课调整

parent a8994290
...@@ -614,6 +614,8 @@ namespace Edu.Module.Course ...@@ -614,6 +614,8 @@ namespace Edu.Module.Course
if (stlist.Any()) { if (stlist.Any()) {
//每次试听课 算一个课时 //每次试听课 算一个课时
foreach (var item in stlist) { foreach (var item in stlist) {
if (item.ClassHourFee > 0)
{
stDateList.Add(new RB_Teaching_BonusDetail_ViewModel() stDateList.Add(new RB_Teaching_BonusDetail_ViewModel()
{ {
BonusId = bonusId, BonusId = bonusId,
...@@ -637,6 +639,7 @@ namespace Edu.Module.Course ...@@ -637,6 +639,7 @@ namespace Edu.Module.Course
}); });
} }
} }
}
#endregion #endregion
......
...@@ -3194,6 +3194,8 @@ namespace Edu.Module.Finance ...@@ -3194,6 +3194,8 @@ namespace Edu.Module.Finance
decimal ClassHourMinute = configModel.BasicMinutes;//课时分钟数 decimal ClassHourMinute = configModel.BasicMinutes;//课时分钟数
decimal Hours = Math.Round(1 * ClassHourMinute / 60, 2, MidpointRounding.AwayFromZero);//小时 decimal Hours = Math.Round(1 * ClassHourMinute / 60, 2, MidpointRounding.AwayFromZero);//小时
foreach (var item in rclist) { foreach (var item in rclist) {
if (item.ClassHourFee > 0)
{
DateList.Add(new RB_Teaching_BonusDetail_ViewModel DateList.Add(new RB_Teaching_BonusDetail_ViewModel
{ {
Date = item.ClassDate, Date = item.ClassDate,
...@@ -3213,6 +3215,7 @@ namespace Edu.Module.Finance ...@@ -3213,6 +3215,7 @@ namespace Edu.Module.Finance
}); });
} }
} }
}
//查询期间 学生的上课总课时 + 合同课时单价 //查询期间 学生的上课总课时 + 合同课时单价
var sTimeList = class_CheckRepository.GetStudentHoursList(groupId, userIds, startMonth, endMonth); var sTimeList = class_CheckRepository.GetStudentHoursList(groupId, userIds, startMonth, endMonth);
...@@ -3372,6 +3375,8 @@ namespace Edu.Module.Finance ...@@ -3372,6 +3375,8 @@ namespace Edu.Module.Finance
decimal ClassHourMinute = configModel.BasicMinutes;//课时分钟数 decimal ClassHourMinute = configModel.BasicMinutes;//课时分钟数
decimal Hours = Math.Round(1 * ClassHourMinute / 60, 2, MidpointRounding.AwayFromZero);//小时 decimal Hours = Math.Round(1 * ClassHourMinute / 60, 2, MidpointRounding.AwayFromZero);//小时
foreach (var item in rclist) foreach (var item in rclist)
{
if (item.ClassHourFee > 0)
{ {
DateList.Add(new RB_Teaching_BonusDetail_ViewModel DateList.Add(new RB_Teaching_BonusDetail_ViewModel
{ {
...@@ -3392,6 +3397,7 @@ namespace Edu.Module.Finance ...@@ -3392,6 +3397,7 @@ namespace Edu.Module.Finance
}); });
} }
} }
}
DateList = DateList.OrderBy(x => x.Date).ToList(); DateList = DateList.OrderBy(x => x.Date).ToList();
...@@ -3587,6 +3593,8 @@ namespace Edu.Module.Finance ...@@ -3587,6 +3593,8 @@ namespace Edu.Module.Finance
decimal ClassHourMinute = configModel.BasicMinutes;//课时分钟数 decimal ClassHourMinute = configModel.BasicMinutes;//课时分钟数
decimal Hours = Math.Round(1 * ClassHourMinute / 60, 2, MidpointRounding.AwayFromZero);//小时 decimal Hours = Math.Round(1 * ClassHourMinute / 60, 2, MidpointRounding.AwayFromZero);//小时
foreach (var item in rclist) foreach (var item in rclist)
{
if (item.ClassHourFee > 0)
{ {
RList.Add(new RB_Teaching_BonusDetail_ViewModel RList.Add(new RB_Teaching_BonusDetail_ViewModel
{ {
...@@ -3611,6 +3619,7 @@ namespace Edu.Module.Finance ...@@ -3611,6 +3619,7 @@ namespace Edu.Module.Finance
}); });
} }
} }
}
RList = RList.OrderBy(x => x.Date).ToList(); RList = RList.OrderBy(x => x.Date).ToList();
...@@ -3740,6 +3749,8 @@ namespace Edu.Module.Finance ...@@ -3740,6 +3749,8 @@ namespace Edu.Module.Finance
decimal ClassHourMinute = configModel.BasicMinutes;//课时分钟数 decimal ClassHourMinute = configModel.BasicMinutes;//课时分钟数
decimal Hours = Math.Round(1 * ClassHourMinute / 60, 2, MidpointRounding.AwayFromZero);//小时 decimal Hours = Math.Round(1 * ClassHourMinute / 60, 2, MidpointRounding.AwayFromZero);//小时
foreach (var item in rclist) foreach (var item in rclist)
{
if (item.ClassHourFee > 0)
{ {
RList.Add(new RB_Teaching_BonusDetail_ViewModel RList.Add(new RB_Teaching_BonusDetail_ViewModel
{ {
...@@ -3764,6 +3775,7 @@ namespace Edu.Module.Finance ...@@ -3764,6 +3775,7 @@ namespace Edu.Module.Finance
}); });
} }
} }
}
RList = RList.OrderBy(x => x.Date).ToList(); RList = RList.OrderBy(x => x.Date).ToList();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment