Commit 3af08596 authored by Aria's avatar Aria

add ages

parent df0107b3
Pipeline #19543 failed with stage
in 8 seconds
......@@ -166,6 +166,22 @@ class OnlineService extends Service {
}
classCats = _.groupBy(classCats, 'class_id');
// 年龄段
const classToAge = await ctx.classModel.V4.CourseOnlineClassToAge.findAll({ where: { class_id: { $in: classIds }, status: 'online', is_deleted: 0 }, attributes: [ 'class_id', 'age_id' ] });
const ageIds = R.pluck('age_id', classToAge);
let ages = await ctx.classModel.V4.CourseOnlineAge.findAll({ where: { id: { $in: ageIds } } });
ages = _.groupBy(ages, 'id');
let classAge = [];
for (const v of classToAge) {
const tmp = {
id: v.age_id,
class_id: v.class_id,
name: ctx.isEmpty(ages[v.age_id]) ? '' : ages[v.age_id][0].name,
};
classAge.push(tmp);
}
classAge = _.groupBy(classAge, 'class_id');
// 班型
const classToTypes = await ctx.classModel.V4.CourseOnlineClassToType.findAll({ where: { class_id: { $in: classIds }, status: 'online', is_deleted: 0 }, attributes: [ 'class_id', 'type_id' ] });
const typeIds = R.pluck('type_id', classToTypes);
......@@ -201,6 +217,7 @@ class OnlineService extends Service {
time: v.time,
created_time: v.created_time,
cats: ctx.isEmpty(classCats[v.id]) ? [] : classCats[v.id],
age: ctx.isEmpty(classAge[v.id]) ? [] : classAge[v.id],
};
result.push(tmp);
}
......@@ -288,6 +305,22 @@ class OnlineService extends Service {
}
classCats = _.groupBy(classCats, 'class_id');
// 年龄段
const classToAge = await ctx.classModel.V4.CourseOnlineClassToAge.findAll({ where: { class_id: { $in: classIds }, status: 'online', is_deleted: 0 }, attributes: [ 'class_id', 'age_id' ] });
const ageIds = R.pluck('age_id', classToAge);
let ages = await ctx.classModel.V4.CourseOnlineAge.findAll({ where: { id: { $in: ageIds } } });
ages = _.groupBy(ages, 'id');
let classAge = [];
for (const v of classToAge) {
const tmp = {
id: v.age_id,
class_id: v.class_id,
name: ctx.isEmpty(ages[v.age_id]) ? '' : ages[v.age_id][0].name,
};
classAge.push(tmp);
}
classAge = _.groupBy(classAge, 'class_id');
// 班型
const classToTypes = await ctx.classModel.V4.CourseOnlineClassToType.findAll({ where: { class_id: { $in: classIds }, status: 'online', is_deleted: 0 }, attributes: [ 'class_id', 'type_id' ] });
const typeIds = R.pluck('type_id', classToTypes);
......@@ -334,6 +367,7 @@ class OnlineService extends Service {
time: v.time,
created_time: v.created_time,
cats: ctx.isEmpty(classCats[v.id]) ? [] : classCats[v.id],
age: ctx.isEmpty(classAge[v.id]) ? [] : classAge[v.id],
};
result.push(tmp);
}
......
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