班级筛选
This commit is contained in:
parent
e6f5ef8932
commit
cf887be6de
@ -2013,6 +2013,8 @@ namespace VOL.Business.Services.Training
|
||||
{
|
||||
Id = td.Id,
|
||||
ClassId = td.ClassId,
|
||||
GradeName = td.GradeName,
|
||||
ClassName = td.ClassName,
|
||||
GradeAndClass = $"{td.GradeName}-{td.ClassName}",
|
||||
TeacherName = td.TeacherName,
|
||||
StartingEndingTime = $"{(td.StartTime.HasValue ? td.StartTime.Value.ToString("yyyy-MM-dd HH:mm") : string.Empty)}{(td.EndTime.HasValue ? " - " + td.EndTime.Value.ToString("yyyy-MM-dd HH:mm") : string.Empty)}"
|
||||
@ -2028,6 +2030,16 @@ namespace VOL.Business.Services.Training
|
||||
query = query.Where(x => x.TeacherName.Contains(paramDto.TeacherName ?? ""));
|
||||
}
|
||||
|
||||
if (!paramDto.GradeName.IsNullOrEmpty())
|
||||
{
|
||||
query = query.Where(x => x.GradeName.Contains(paramDto.GradeName ?? ""));
|
||||
}
|
||||
|
||||
if (!paramDto.ClassName.IsNullOrEmpty())
|
||||
{
|
||||
query = query.Where(x => x.ClassName.Contains(paramDto.ClassName ?? ""));
|
||||
}
|
||||
|
||||
res.Total = await query.CountAsync();
|
||||
|
||||
var list = await query
|
||||
|
||||
@ -26,6 +26,16 @@ namespace VOL.Model
|
||||
/// </summary>
|
||||
public int? ClassId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 年级名称
|
||||
/// </summary>
|
||||
public string? GradeName { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 班级名称
|
||||
/// </summary>
|
||||
public string? ClassName { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 教师名
|
||||
/// </summary>
|
||||
|
||||
@ -22,6 +22,16 @@ namespace VOL.Model
|
||||
/// </summary>
|
||||
public int? ClassId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 年级名称
|
||||
/// </summary>
|
||||
public string GradeName { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 班级名称
|
||||
/// </summary>
|
||||
public string ClassName { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 年级-班级
|
||||
/// </summary>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user