修改questionnaire的question字段为数组

app/controller/question.js

@@ -38,7 +38,6 @@ class QusetionController extends Controller {
   // 查询
   async query() {
     const res = await this.service.query(this.ctx.query);
-    console.log(res);
     this.ctx.ok({ ...res });
   }
 

app/controller/questionnaire.js

@@ -38,7 +38,7 @@ class QuestionnaireController extends Controller {
   // 查询
   async query() {
     const res = await this.service.query(this.ctx.query);
-    this.ctx.ok({ msg: 'queried', data: res });
+    this.ctx.ok({ ...res });
   }
 
   // GET

app/model/questionnaire.js

@@ -2,16 +2,12 @@
 const Schema = require('mongoose').Schema;
 const metaPlugin = require('naf-framework-mongoose/lib/model/meta-plugin');
 
-// 问题code表
-const questions = new Schema({
-  questionid: { type: String, required: false, maxLength: 200 }, // 序号
-});
 
 // 问卷表
 const QuestionnaireSchema = {
   name: { type: String, required: true, maxLength: 200 }, // 问卷名称
   num: { type: String, required: true, maxLength: 200 }, // 序号
-  question: { type: [ questions ], select: true }, // 问题code
+  question: [ String ], // 问题code
 };
 
 

app/service/questionnaire.js

@@ -30,6 +30,7 @@ class QuestionnaireService extends CrudService {
 
   // 根据id更新问卷信息
   async update({ id }, data) {
+    console.log(data);
     const questionnaire = await this.questionnairemodel.findById(id);
     if (questionnaire.name) {
       questionnaire.name = data.name;
@@ -38,12 +39,16 @@ class QuestionnaireService extends CrudService {
       questionnaire.num = data.num;
     }
     questionnaire.question = data.question;
+    console.log(questionnaire);
     return await questionnaire.save();
   }
 
   // 查询
   async query({ skip, limit, ...num }) {
-    return await this.model.find(num).skip(Number(skip)).limit(Number(limit));
+    const total = await (await this.questionnairemodel.find(num)).length;
+    const data = await this.questionnairemodel.find(num).skip(Number(skip)).limit(Number(limit));
+    const result = { total, data };
+    return result;
   }
 
   // 查询详情
@@ -53,7 +58,7 @@ class QuestionnaireService extends CrudService {
     const datas = [];
     // 根据问卷中保存的问卷题目id查询题目详情
     for (const code of questions) {
-      const question = await this.questionmodel.findById(code.questionid);
+      const question = await this.questionmodel.findById(code);
       // 将查询出的题目放入一个数组中
       datas.push(question);
     }