Commit 9504a0d0 authored by liudong1993's avatar liudong1993

1

parent d711c739
......@@ -791,6 +791,10 @@ WHERE 1=1 AND A.Status=0 AND class.Status=0 AND class.ClassStatus <>4 AND b.Or
{
builder.AppendFormat($@" AND st.StuChannel ={demodel.StuChannelId}");
}
if (demodel.StuSourceId > 0)
{
builder.AppendFormat($@" AND st.StuSourceId ={demodel.StuSourceId}");
}
builder.AppendFormat($@" order by A.{nameof(RB_Order_Guest_Extend.Id)} desc");
return GetPage<RB_Order_Guest_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList();
......
......@@ -282,6 +282,10 @@ INNER JOIN rb_order o on sog.OrderId = o.OrderId
{
where += $" and s.{nameof(RB_Student_ViewModel.CreateType)} ={(int)demodel.CreateType}";
}
if (demodel.StuSourceId > 0)
{
where += $" and s.{nameof(RB_Student_ViewModel.StuSourceId)} ={demodel.StuSourceId}";
}
if (demodel.StuGuestState > 0)
{
where += $" and org.GuestState ={(int)demodel.StuGuestState}";
......@@ -428,6 +432,10 @@ LEFT JOIN rb_education_contract ec on ec.GuestId = og.GuestId";
{
where += $" and s.{nameof(RB_Student_ViewModel.CreateType)} ={(int)demodel.CreateType}";
}
if (demodel.StuSourceId > 0)
{
where += $" and s.{nameof(RB_Student_ViewModel.StuSourceId)} ={demodel.StuSourceId}";
}
if (demodel.StuStage > 0)
{
where += $" and s.{nameof(RB_Student_ViewModel.StuStage)} ={demodel.StuStage}";
......
......@@ -307,6 +307,7 @@ namespace Edu.WebApi.Controllers.Course
GuestState=(GuestStateEnum)base.ParmJObj.GetInt("GuestState"),
StuChannelId = base.ParmJObj.GetInt("StuChannelId", 0),
CreateType = (Common.Enum.User.StuCreateTypeEnum)base.ParmJObj.GetInt("CreateType", 0),
StuSourceId = base.ParmJObj.GetInt("StuSourceId", 0),
};
model.School_Id = -1;
var schoolId = base.ParmJObj.GetStringValue("School_Id");
......
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