Merge branch 'master' of http://git.cc-lotus.info/new_train/service-center

app/controller/.attendance.js

@@ -5,6 +5,7 @@ module.exports = {
       'batchid',
       'classid',
       'studentid',
+      'schid',
       'attend'
     ]
   },
@@ -19,6 +20,7 @@ module.exports = {
       'batchid',
       'classid',
       'studentid',
+      'schid',
       'attend'
     ]
   },
@@ -35,6 +37,7 @@ module.exports = {
         batchid:'batchid',
         classid :'classid',
         studentid :'studentid',
+        schid: 'schid',
         attend :'attend'
       }
     },

app/model/attendance.js

@@ -15,6 +15,7 @@ const AttendanceSchema = {
   termid: { type: String, required: false, maxLength: 200 }, // 期id
   batchid: { type: String, required: false, maxLength: 200 }, // 批次id
   classid: { type: String, required: false, maxLength: 200 }, // 班级id
+  schid: { type: String, required: false, maxLength: 200 }, // 学校id
   studentid: { type: String, required: false, maxLength: 200 }, // 学生id
   attend: { type: [ attendInfo ], select: true }, // 考勤信息
 };

app/service/attendance.js

@@ -81,6 +81,7 @@ class AttendanceService extends CrudService {
           batchid: student.batchid,
           classid: student.classid,
           studentid: student.id,
+          schid: student.schid,
           attend: [ newData ],
         };
         await this.model.create(newdata);
@@ -123,6 +124,7 @@ class AttendanceService extends CrudService {
           batchid: student.batchid,
           classid: student.classid,
           studentid: student.id,
+          schid: student.schid,
           attend: [ newData ],
         };
         await this.model.create(newdata);

app/service/student.js

@@ -16,9 +16,8 @@ class StudentService extends CrudService {
 
   // 查询
   async seek({ termid, skip, limit }) {
-    const students = await this.model.find({ termid, classid: null });
-    const data = await this.model.find({ termid, classid: null }).skip(Number(skip)).limit(Number(limit));
-    const total = await students.length;
+    const total = await this.model.count({ termid, $or: [{ classid: null }, { classid: '' }] });
+    const data = await this.model.find({ termid, $or: [{ classid: null }, { classid: '' }] }).skip(Number(skip)).limit(Number(limit));
     const result = { total, data };
     return result;
   }