Commit 26a993de authored by liudong1993's avatar liudong1993

月结轧账

parent 4d7b31e4
...@@ -2942,6 +2942,7 @@ namespace Edu.Module.Finance ...@@ -2942,6 +2942,7 @@ namespace Edu.Module.Finance
} }
} }
} }
dmodel.SchoolIds = string.Join(",", dmodel.SchoolList.Select(x => x.SId));
Dictionary<string, object> keyValues = new Dictionary<string, object>() { Dictionary<string, object> keyValues = new Dictionary<string, object>() {
{ nameof(RB_RollingAccount_Extend.Month), dmodel.Month}, { nameof(RB_RollingAccount_Extend.Month), dmodel.Month},
{ nameof(RB_RollingAccount_Extend.SchoolIds), dmodel.SchoolIds}, { nameof(RB_RollingAccount_Extend.SchoolIds), dmodel.SchoolIds},
...@@ -2971,6 +2972,7 @@ namespace Edu.Module.Finance ...@@ -2971,6 +2972,7 @@ namespace Edu.Module.Finance
} }
} }
} }
dmodel.SchoolIds = string.Join(",", dmodel.SchoolList.Select(x => x.SId));
bool flag = rollingAccountRepository.Insert(dmodel) >0; bool flag = rollingAccountRepository.Insert(dmodel) >0;
return flag ? "" : "出错了,请联系管理员"; return flag ? "" : "出错了,请联系管理员";
} }
......
...@@ -234,6 +234,10 @@ WHERE 1=1 ...@@ -234,6 +234,10 @@ WHERE 1=1
builder.AppendFormat(" AND A.{0} LIKE @ClassName ", nameof(RB_Class_ViewModel.ClassName)); builder.AppendFormat(" AND A.{0} LIKE @ClassName ", nameof(RB_Class_ViewModel.ClassName));
parameters.Add("ClassName", "%" + query.ClassName.Trim() + "%"); parameters.Add("ClassName", "%" + query.ClassName.Trim() + "%");
} }
if (!string.IsNullOrEmpty(query.ClassNo))
{
builder.AppendFormat(" AND A.{0} ='{1}' ", nameof(RB_Class_ViewModel.ClassNo), query.ClassNo);
}
if (!string.IsNullOrWhiteSpace(query.CourseName)) if (!string.IsNullOrWhiteSpace(query.CourseName))
{ {
builder.AppendFormat(" AND B.{0} LIKE @CourseName ", nameof(RB_Course_ViewModel.CourseName)); builder.AppendFormat(" AND B.{0} LIKE @CourseName ", nameof(RB_Course_ViewModel.CourseName));
......
...@@ -47,6 +47,7 @@ namespace Edu.WebApi.Controllers.Course ...@@ -47,6 +47,7 @@ namespace Edu.WebApi.Controllers.Course
School_Id = base.ParmJObj.GetInt("School_Id"), School_Id = base.ParmJObj.GetInt("School_Id"),
TeacherName = base.ParmJObj.GetStringValue("TeacherName"), TeacherName = base.ParmJObj.GetStringValue("TeacherName"),
CourseName = base.ParmJObj.GetStringValue("CourseName"), CourseName = base.ParmJObj.GetStringValue("CourseName"),
ClassNo = base.ParmJObj.GetStringValue("ClassNo")
}; };
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