lrf402788946 há 4 anos atrás
pai
commit
845cf67860
3 ficheiros alterados com 8 adições e 2 exclusões
  1. 1 1
      app/controller/task.js
  2. 6 1
      app/service/task.js
  3. 1 0
      config/config.default.js

+ 1 - 1
app/controller/task.js

@@ -14,7 +14,7 @@ class TaskController extends Controller {
 
   async export() {
     const res = await this.service.export(this.ctx.request.body);
-    this.ctx.ok(res);
+    this.ctx.ok({ data: res });
   }
 }
 

+ 6 - 1
app/service/task.js

@@ -97,12 +97,17 @@ class TaskService extends CrudService {
       lessonid: { $in: lessonids },
     });
     taskList = JSON.parse(JSON.stringify(taskList));
+    const arr = [];
+    for (const task of taskList) {
+      const r = arr.find(f => f.studentid === task.studentid && f.lessonid === task.lessonid);
+      if (r) arr.push(task);
+    }
     // taskList = taskList.map(i => {
     //   const r = lessonList.find(i => i._id === i.lessonid);
     //   if (r) i.lessonname = r.subname;
     //   return i;
     // });
-    return JSON.parse(JSON.stringify(taskList));
+    return JSON.parse(JSON.stringify(arr));
   }
 
   async getFnDir(range) {

+ 1 - 0
config/config.default.js

@@ -80,6 +80,7 @@ module.exports = appInfo => {
     repos_root_path: '/usr/local/workspace/service-file/upload',
     repos_root_url_excel: '/excel/',
     repos_root_url_experience: '/experience/',
+    repos_root_url_zip: '/zip/',
   };
   // mq配置
   // config.amqp = {