Commit ee4be693 authored by 吴春's avatar 吴春

提交代码

parent 33334ff0
...@@ -661,7 +661,7 @@ LEFT JOIN (SELECT OrderGuestId, ...@@ -661,7 +661,7 @@ LEFT JOIN (SELECT OrderGuestId,
SUM(CASE CheckStatus WHEN 1 THEN 1 ELSE 0 END) as AbsenceNum, SUM(CASE CheckStatus WHEN 1 THEN 1 ELSE 0 END) as AbsenceNum,
SUM(CASE CheckStatus WHEN 2 THEN 1 ELSE 0 END) as LeaveNum SUM(CASE CheckStatus WHEN 2 THEN 1 ELSE 0 END) as LeaveNum
from rb_class_check where `Status`=0 and CheckStatus <>0 GROUP BY OrderGuestId) as gc on gc.OrderGuestId=a.Id from rb_class_check where `Status`=0 and CheckStatus <>0 GROUP BY OrderGuestId) as gc on gc.OrderGuestId=a.Id
LEFT JOIN (SELECT StuId,COUNT(*) as EventlogNum from rb_student_eventlog where `Status`=0 GROUP BY StuId) as eventlog on eventlog.StuId=sog.Student_Id LEFT JOIN (SELECT StuId,COUNT(*) as EventlogNum from rb_student_eventlog where `Status`=0 GROUP BY StuId) as eventlog on eventlog.StuId=a.Id
WHERE 1=1 and A.Status=0 and class.Status=0 and class.ClassStatus <>4 and b.OrderState<>3 WHERE 1=1 and A.Status=0 and class.Status=0 and class.ClassStatus <>4 and b.OrderState<>3
"); ");
if (demodel.Group_Id > 0) if (demodel.Group_Id > 0)
......
...@@ -339,7 +339,7 @@ namespace Edu.WebApi.Controllers.Course ...@@ -339,7 +339,7 @@ namespace Edu.WebApi.Controllers.Course
item.Teacher_Id, item.Teacher_Id,
item.TeacherName, item.TeacherName,
item.OrderId, item.OrderId,
item.OrderTime, OrderTime = item.OrderTime.HasValue ? item.OrderTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
item.EnterID, item.EnterID,
item.EnterName, item.EnterName,
item.PreferPrice, item.PreferPrice,
...@@ -413,7 +413,7 @@ namespace Edu.WebApi.Controllers.Course ...@@ -413,7 +413,7 @@ namespace Edu.WebApi.Controllers.Course
{ {
OrderGuestId = base.ParmJObj.GetInt("OrderGuestId"), OrderGuestId = base.ParmJObj.GetInt("OrderGuestId"),
CheckStatus = base.ParmJObj.GetInt("CheckStatus", 0), CheckStatus = base.ParmJObj.GetInt("CheckStatus", 0),
MakeUpStatus= base.ParmJObj.GetInt("MakeUpStatus", 0) MakeUpStatus = base.ParmJObj.GetInt("MakeUpStatus", 0)
}; };
query.Group_Id = base.UserInfo.Group_Id; query.Group_Id = base.UserInfo.Group_Id;
List<object> result = new List<object>(); List<object> result = new List<object>();
......
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