|
|
@@ -326,7 +326,7 @@ class LessonService extends CrudService {
|
|
|
have_teacherLesson = JSON.parse(JSON.stringify(have_teacherLesson));
|
|
|
const newArr = [];
|
|
|
for (const l of have_teacherLesson) {
|
|
|
- // 整理时间
|
|
|
+ // 整理时间 TODO,不需要合并时间了,先留着,之后真不需要就删掉
|
|
|
const { subid, teaid, date } = l;
|
|
|
const isBefore = moment().isBefore(date);
|
|
|
if (!isBefore) false;
|
|
|
@@ -361,7 +361,7 @@ class LessonService extends CrudService {
|
|
|
// 班主任 需要知道 期,批,班,时间段,星期段,礼仪课教师,用餐地点,拓展计划地点,开班仪式地点,上课地点
|
|
|
const { term, batch, headteacher, name, headteacherid, startdate, enddate } = classInfo;
|
|
|
if (!headteacherid) return;
|
|
|
- let msg = `班主任-${headteacher},中心已经安排您为: ${term}期-${batch}批-${name.includes('班') ? name : `${name}班`} 班主任`;
|
|
|
+ let msg = `班主任-${headteacher},中心已经安排您为: ${term}期-${name.includes('班') ? name : `${name}班`} 班主任`;
|
|
|
if (startdate && enddate) msg = `${msg} \n 本班时间为:${startdate}(星期${this.weekList[moment(startdate).day()]}) 至 ${enddate} (星期${this.weekList[moment(enddate).day()]})`;
|
|
|
if (_.get(classInfo, 'kbyslocationid'))msg = `${msg} \n 开班仪式地点为:${_.get(classInfo, 'kbyslocation')}`;
|
|
|
if (_.get(classInfo, 'kzjhlocationid'))msg = `${msg} \n 拓展训练地点为:${_.get(classInfo, 'kzjhlocation')}`;
|
|
|
@@ -386,14 +386,14 @@ class LessonService extends CrudService {
|
|
|
if (!classInfo || !lessonInfo) return;
|
|
|
const { term, batch, name, headteacherid } = classInfo;
|
|
|
const { date, subname, timeList } = lessonInfo;
|
|
|
- let msg = `教师-${lessonInfo.teaname}您好,中心已经为您安排了 \n ${term}期-${batch}批-${name.includes('班') ? name : `${name}班`}`;
|
|
|
+ let msg = `教师-${lessonInfo.teaname}您好,中心已经为您安排了 \n ${term}期-${name.includes('班') ? name : `${name}班`}`;
|
|
|
if (date) msg = `${msg} \n 上课日期:${date}(星期${this.weekList[moment(date).day()]})`;
|
|
|
- if (timeList && _.isArray(timeList)) {
|
|
|
- msg = `${msg} \n 上课时间:`;
|
|
|
- for (const time of timeList) {
|
|
|
- msg = `${msg} ${time}`;
|
|
|
- }
|
|
|
- }
|
|
|
+ // if (timeList && _.isArray(timeList)) {
|
|
|
+ // msg = `${msg} \n 上课时间:`;
|
|
|
+ // for (const time of timeList) {
|
|
|
+ // msg = `${msg} ${time}`;
|
|
|
+ // }
|
|
|
+ // }
|
|
|
if (subname) msg = `${msg} \n 课程:${subname}`;
|
|
|
if (_.get(classInfo, 'jslocationid'))msg = `${msg} \n 上课教室地点为:${_.get(classInfo, 'jslocation')}`;
|
|
|
if (_.get(classInfo, 'headteacherid')) {
|
