Commit 38e99de4 authored by liudong1993's avatar liudong1993

1

parent fb4bf25f
...@@ -1469,15 +1469,7 @@ namespace Edu.Module.Course ...@@ -1469,15 +1469,7 @@ namespace Edu.Module.Course
if (flag) if (flag)
{ {
//更新学员完成课时 //更新学员完成课时
decimal completeHours = 0; decimal completeHours = (oldModel?.FinishClassHours ?? 0) + item.CurrentDeductionHours;
if (item.CheckStatus == 2)
{
//请假不扣课时
completeHours = (oldModel?.FinishClassHours ?? 0);
}
else {
completeHours = (oldModel?.FinishClassHours ?? 0) + item.CurrentDeductionHours;
}
Dictionary<string, object> orderFileds = new Dictionary<string, object>() Dictionary<string, object> orderFileds = new Dictionary<string, object>()
{ {
......
...@@ -155,7 +155,7 @@ WHERE 1=1 AND `Status` =0 and CheckStatus =0 "); ...@@ -155,7 +155,7 @@ WHERE 1=1 AND `Status` =0 and CheckStatus =0 ");
builder.AppendFormat(@" builder.AppendFormat(@"
SELECT A.OrderGuestId AS GuestId,SUM(A.StudyNum) AS FinishMinutes,SUM(A.CurrentDeductionHours) AS FinishClassHours SELECT A.OrderGuestId AS GuestId,SUM(A.StudyNum) AS FinishMinutes,SUM(A.CurrentDeductionHours) AS FinishClassHours
FROM rb_class_check AS A FROM rb_class_check AS A
WHERE A.`Status`=0 AND A.CheckStatus <>2 "); WHERE A.`Status`=0 ");
if (!string.IsNullOrEmpty(guestIds)) if (!string.IsNullOrEmpty(guestIds))
{ {
builder.AppendFormat(" AND A.OrderGuestId IN({0})", guestIds); builder.AppendFormat(" AND A.OrderGuestId IN({0})", guestIds);
......
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