|
|
@ -161,6 +161,11 @@ public class Ghre_CourseServices : BaseServices<Ghre_Course, Ghre_CourseDto, Ins |
|
|
|
courseSceneIds = courseSceneIds.Concat(JsonConvert.DeserializeObject<List<long>>(x)).ToList(); |
|
|
|
courseSceneIds = courseSceneIds.Concat(JsonConvert.DeserializeObject<List<long>>(x)).ToList(); |
|
|
|
|
|
|
|
|
|
|
|
}); |
|
|
|
}); |
|
|
|
|
|
|
|
data.ForEach(x => |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
if (x.CourseSceneId != null) |
|
|
|
|
|
|
|
courseSceneIds.Add(x.CourseSceneId.Value); |
|
|
|
|
|
|
|
}); |
|
|
|
courseSceneIds = courseSceneIds.Distinct().ToList(); |
|
|
|
courseSceneIds = courseSceneIds.Distinct().ToList(); |
|
|
|
var courseScenes = await Db.Queryable<Ghre_CourseScene>().Where(x => courseSceneIds.Contains(x.Id)).ToListAsync(); |
|
|
|
var courseScenes = await Db.Queryable<Ghre_CourseScene>().Where(x => courseSceneIds.Contains(x.Id)).ToListAsync(); |
|
|
|
|
|
|
|
|
|
|
@ -172,11 +177,23 @@ public class Ghre_CourseServices : BaseServices<Ghre_Course, Ghre_CourseDto, Ins |
|
|
|
x.IsOPenLabel = x.IsOpen == "1" ? "是" : "否"; |
|
|
|
x.IsOPenLabel = x.IsOpen == "1" ? "是" : "否"; |
|
|
|
var courseClass = classs.Where(a => x.CourseClassId.Contains(a.Id.ToString())).ToList(); |
|
|
|
var courseClass = classs.Where(a => x.CourseClassId.Contains(a.Id.ToString())).ToList(); |
|
|
|
x.CourseClassName = string.Join(",", courseClass.Select(a => a.ClassName + " (" + a.ClassNo + ")")); |
|
|
|
x.CourseClassName = string.Join(",", courseClass.Select(a => a.ClassName + " (" + a.ClassNo + ")")); |
|
|
|
|
|
|
|
|
|
|
|
if (x.CourseSceneIds.IsNotEmptyOrNull()) |
|
|
|
if (x.CourseSceneIds.IsNotEmptyOrNull()) |
|
|
|
{ |
|
|
|
{ |
|
|
|
var courseScene = courseScenes.Where(a => x.CourseSceneIds.Contains(a.Id.ToString())).ToList(); |
|
|
|
x.CourseSceneIds1 = JsonConvert.DeserializeObject<List<long>>(x.CourseSceneIds); |
|
|
|
|
|
|
|
if (x.CourseSceneIds1.Any()) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
var courseScene = courseScenes.Where(a => x.CourseSceneIds1.Contains(a.Id)).ToList(); |
|
|
|
|
|
|
|
x.CourseSceneName = string.Join(",", courseScene.Select(a => a.SceneName + " (" + a.SceneNo + ")")); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
else if (x.CourseSceneId != null) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
var courseScene = courseScenes.Where(a => a.Id == x.CourseSceneId).ToList(); |
|
|
|
x.CourseSceneName = string.Join(",", courseScene.Select(a => a.SceneName + " (" + a.SceneNo + ")")); |
|
|
|
x.CourseSceneName = string.Join(",", courseScene.Select(a => a.SceneName + " (" + a.SceneNo + ")")); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
}); |
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
return new ServicePageResult<Ghre_CourseDto>(filter.pageNum, totalCount, filter.pageSize, data); |
|
|
|
return new ServicePageResult<Ghre_CourseDto>(filter.pageNum, totalCount, filter.pageSize, data); |
|
|
|