|
|
@@ -26,8 +26,6 @@ class LessonService extends CrudService {
|
|
|
}
|
|
|
const terms = res.termnum;
|
|
|
const _lessonmode = await this.lmodel.find();
|
|
|
- // 取得模板内容并转化成json
|
|
|
- const lessonmode = JSON.parse(_lessonmode.lessons);
|
|
|
// 循环取得所有期
|
|
|
for (const elm of terms) {
|
|
|
// 根据期id清空课程表
|
|
|
@@ -46,20 +44,22 @@ class LessonService extends CrudService {
|
|
|
// 循环班级
|
|
|
for (const cla of _classs) {
|
|
|
// 取得课程模板信息
|
|
|
- let lessonmode_ = _.find(lessonmode, { type: cla.type });
|
|
|
+ let lessonmode_ = _.find(_lessonmode, { type: cla.type });
|
|
|
if (!lessonmode_) {
|
|
|
lessonmode_ = _lessonmode[0];
|
|
|
if (!lessonmode_) {
|
|
|
throw new BusinessError(ErrorCode.DATA_NOT_EXIST, '课程模板信息不存在');
|
|
|
}
|
|
|
}
|
|
|
+ // 取得模板内容并转化成json
|
|
|
+ const lessons_ = JSON.parse(lessonmode_.lessons);
|
|
|
// 记录天数
|
|
|
let i = 1;
|
|
|
// 循环天数
|
|
|
const newlesson = [];
|
|
|
for (const day of sedays) {
|
|
|
// 循环课程模板，将模板信息排入班级课程表中
|
|
|
- for (const lessm of lessonmode_) {
|
|
|
+ for (const lessm of lessons_) {
|
|
|
// 循环插入模板信息
|
|
|
if (lessm['day' + i] !== '--') {
|
|
|
let _subid = '';
|
liuyu