lrf 2 years ago
parent
commit
84e35f2a05
2 changed files with 10 additions and 4 deletions
  1. 9 3
      app/service/statistics.js
  2. 1 1
      app/z_router/statistics.js

+ 9 - 3
app/service/statistics.js

@@ -354,9 +354,15 @@ class StatisticsService extends CrudService {
     pipeline.push({ $project: { ...baseCol, studentList: { $concatArrays: [ '$zStudent', '$lStudent' ] } } });
     pipeline.push({ $unwind: '$studentList' });
     pipeline.push({ $project: { ...baseCol, name: '$studentList.name', is_pay: '$studentList.is_pay', is_sign: '$studentList.is_sign', icon: '$studentList.icon' } });
-    pipeline.push({ $sort: { time_start: 1 } });
-    const res = await this.lessonModel.aggregate(pipeline);
-    return res;
+    const qp = _.cloneDeep(pipeline);
+    if (parseInt(skip)) qp.push({ $skip: parseInt(skip) });
+    if (parseInt(limit)) qp.push({ $limit: parseInt(limit) });
+    const data = await this.lessonModel.aggregate(qp);
+    const tp = _.cloneDeep(pipeline);
+    tp.push(this.totalPip());
+    const tr = await this.lessonModel.aggregate(tp);
+    const total = this.getTotal(tr);
+    return { data, total };
   }
 
   async schoolInByLesson({ school_id, time = 'm', skip = 0, limit }) {

+ 1 - 1
app/z_router/statistics.js

@@ -7,7 +7,7 @@ const rkey = 'statistics';
 const ckey = 'statistics';
 const keyZh = '统计';
 const routes = [
-  { method: 'post', path: `${rkey}/studentSign`, controller: `${ckey}.studentSign`, name: `${ckey}studentSign`, zh: `${keyZh}-学员签到情况` },
+  { method: 'post', path: `${rkey}/studentSign`, middleware: [ 'dealQuery' ], controller: `${ckey}.studentSign`, name: `${ckey}studentSign`, zh: `${keyZh}-学员签到情况` },
   { method: 'get', path: `${rkey}/schoolInByLesson`, middleware: [ 'dealQuery' ], controller: `${ckey}.schoolInByLesson`, name: `${ckey}schoolInByLesson`, zh: `${keyZh}-收入明细` },
   { method: 'get', path: `${rkey}/coachStudentLesson`, controller: `${ckey}.coachStudentLesson`, name: `${ckey}coachStudentLesson`, zh: `${keyZh}-教练,学员情况` },
   { method: 'get', path: `${rkey}/coachLesson`, controller: `${ckey}.coachLesson`, name: `${ckey}coachLesson`, zh: `${keyZh}-教练,授课情况` },