修改

app/service/student.js

@@ -15,6 +15,7 @@ class StudentService extends CrudService {
     this.tmodel = this.ctx.model.Trainplan;
     this.clamodel = this.ctx.model.Class;
     this.upmodel = this.ctx.model.Uploadtask;
+    this.gmodel = this.ctx.model.Group;
   }
 
   // 查询
@@ -137,7 +138,8 @@ class StudentService extends CrudService {
     const data = [];
     for (const student of students) {
       const _student = _.cloneDeep(student);
-      const group = await this.ctx.service.group.findbystuid({ stuid: _student.id });
+      const groups = await this.gmodel.find({ classid: _student.classid });
+      const group = groups.find(item => item.students.find(stuinfo => stuinfo.stuid === _student.id));
       if (group && group.score) {
         _student.groupscore = group.score;
       }

app/service/teaplan.js

@@ -178,116 +178,6 @@ class TeaplanService extends CrudService {
     return data;
   }
 
-  async adivide({ trainplanid }) {
-    const data = [];
-    // 根据全年计划表id查出对应的全年计划详细信息
-    const trainplan = await this.tmodel.findById(trainplanid);
-    // 将全年计划中的批次信息取出放在一个数组中
-    const batchList = [];
-    for (const term of trainplan.termnum) {
-      for (const batch of term.batchnum) {
-        batchList.push(batch);
-      }
-    }
-    // 查询本培训计划中班主任全年计划表的全部信息
-    const teaplanList = await this.model.find({ trainplanid });
-    // 查询所有班主任信息
-    const headteacherList = await this.hmodel.find();
-    let noteaList = [];
-    // 遍历所有批次信息
-    for (const _batch of batchList) {
-      // 遍历班主任全年计划表
-      for (const teaplan of teaplanList) {
-        if ((teaplan.nodate).length > 0) {
-          // 遍历班主任全年计划表中的不能上课的日期
-          for (const nodate of teaplan.nodate) {
-          // 如果不能上课的日期在该批次的开始时间和结束时间中，将该班主任加入不能上课的班主任数组中
-            if (moment(nodate).isBetween(_batch.startdate, _batch.enddate, null, '[]')) {
-              noteaList.push(teaplan);
-            }
-          }
-        }
-        const headteacherInfo = _.filter(headteacherList, item => item.id === teaplan.headteacherid);
-        // 如果班主任信息列表中班主任上报了班主任全年计划，将其移除
-        if (headteacherInfo.length >= 1) {
-          _.remove(headteacherList, item => item.id === teaplan.headteacherid);
-        }
-        // 过滤出已分配的数据中该班主任的数据
-        const teaInfo = _.filter(data, item => item.headteacherid === teaplan.headteacherid);
-        // 计算出每个班主任担任过班主任的次数
-        teaplan.teacount = await this.cmodel.count({ headteacherid: teaplan.headteacherid }) + teaInfo.length;
-        // 如果已分配的数据中该班主任的数据长度大于0
-        if (teaInfo.length > 0) {
-          // 遍历已分配的数据中该班主任的数据
-          for (const _teaInfo of teaInfo) {
-            // 查询该班主任已分配的数据中的班级信息
-            const _class = await this.cmodel.findById(_teaInfo.classid);
-            // 根据班级的批次id查出该班级的开始时间和结束时间
-            const batchInfo = _.filter(batchList, item => item.id === _class.batchid);
-            // 如果该班级的开始时间和结束时间于当前遍历批次的开始时间和结束时间有重合部分，将该班主任加入不能上课的班主任数组中
-            if (await this.isrepeat(batchInfo.startdate, batchInfo.enddate, _batch.startdate, _batch.enddate)) {
-              noteaList.push(teaplan);
-            }
-          }
-        }
-      }
-      for (const headteacher of headteacherList) {
-        headteacher.headteacherid = headteacher.id;
-        // 过滤出已分配的数据中该班主任的数据
-        const teaInfo = _.filter(data, item => item.headteacherid === headteacher.headteacherid);
-        // 计算出每个班主任担任过班主任的次数
-        headteacher.teacount = await this.cmodel.count({ headteacherid: headteacher.id }) + teaInfo.length;
-        // 如果已分配的数据中该班主任的数据长度大于0
-        if (teaInfo.length > 0) {
-          // 遍历已分配的数据中该班主任的数据
-          for (const _teaInfo of teaInfo) {
-            // 查询该班主任已分配的数据中的班级信息
-            const _class = await this.cmodel.findById(_teaInfo.classid);
-            // 根据班级的批次id查出该班级的开始时间和结束时间
-            const batchInfo = _.filter(batchList, item => item.id === _class.batchid);
-            // 如果该班级的开始时间和结束时间于当前遍历批次的开始时间和结束时间有重合部分，将该班主任加入不能上课的班主任数组中
-            if (await this.isrepeat(batchInfo.startdate, batchInfo.enddate, _batch.startdate, _batch.enddate)) {
-              _.remove(headteacherList, item => item.id === headteacher.id);
-            }
-          }
-        }
-      }
-      // 将数组去重
-      noteaList = _.uniqWith(noteaList, _.isEqual);
-      // 将班主任全年计划表过滤，去除在不能上课的班主任数组中已存在的数据
-      let teaList = _.difference(teaplanList, noteaList);
-      teaList = _.concat(teaList, headteacherList);
-      // 将不能上课的班主任数组清空
-      noteaList = [];
-      const departmentList = await this.departmentcount(teaList);
-      for (const department of departmentList) {
-        // 如果部门中人员的数量减去能部门中上课的班主任数量小于一，那么将能上课的班主任数组中部门为该部门的班主任移除一个
-        if ((department.dcount - department.dnum) < 1) {
-          let _noteaList = _.filter(teaList, item => item.deparmentid === department.deparmentid);
-          _noteaList = _.orderBy(_noteaList, [ 'teacount' ], [ 'desc' ]);
-          teaList = _.difference(teaList, _noteaList[0]);
-        }
-      }
-      // 将该批次最终筛选出的能上课的班主任数组按每个班主任担任过班主任的次数倒序排序
-      teaList = _.orderBy(teaList, [ 'teacount' ], [ 'asc' ]);
-      console.log(teaList);
-
-      // 查出该批次下所有的班级
-      const classList = await this.cmodel.find({ batchid: _batch.id });
-      // 循环该批次下所有的班级
-      let index = 0;
-      for (const _class of classList) {
-        if (teaList[index]) {
-          data.push({ classid: _class.id, headteacherid: teaList[index].headteacherid });
-        } else {
-          data.push({ classid: _class.id, headteacherid: undefined });
-        }
-        index = index + 1;
-      }
-    }
-    return data;
-  }
-
   // 判断两个时间段是否有重合部分
   async isrepeat(startdate1, enddate1, startdate2, enddate2) {
     let result = true;