add report more content

app/model/class/v5/courseV5Questionnaire.js

@@ -13,7 +13,7 @@ module.exports = app => {
       autoIncrement: true,
     },
     cat_id: INTEGER,
-    user_id: STRING,
+    user_uuid: STRING,
     answer_1: STRING,
     answer_2: STRING,
     answer_3: STRING,

app/service/course/v5/report.js

@@ -108,17 +108,14 @@ class ReportService extends Service {
       report.push({
         id: v.id,
         title: v.title,
-        sub_title: ctx.isEmpty(reportColumnDetailList[v.id]) ? '' : reportColumnDetailList[v.id][0].sub_title,
-        level: ctx.isEmpty(reportColumnDetailList[v.id]) ? '' : reportColumnDetailList[v.id][0].level,
-        content: ctx.isEmpty(reportColumnDetailList[v.id]) ? '' : reportColumnDetailList[v.id][0].content,
-        advice: ctx.isEmpty(reportColumnDetailList[v.id]) ? '' : reportColumnDetailList[v.id][0].advice,
+        value: ctx.isEmpty(reportColumnDetailList[v.id]) ? [] : reportColumnDetailList[v.id],
       });
     }
 
     const tags = await this.getReportTags(userReportInfo);
     const recommendClassList = await this.getRecommendClassListByReport(userReportInfo.answer, userReportInfo.user_uuid, userReportInfo.cat_id);
 
-    const userQuestionnaire = await ctx.classModel.V5.CourseV5Questionnaire.findOne({ where: { user_id: userReportInfo.user_uuid, cat_id: userReportInfo.cat_id } });
+    const userQuestionnaire = await ctx.classModel.V5.CourseV5Questionnaire.findOne({ where: { user_uuid: userReportInfo.user_uuid, cat_id: userReportInfo.cat_id } });
 
     const ret = {
       id: userReportInfo.id,
@@ -157,17 +154,14 @@ class ReportService extends Service {
       report.push({
         id: v.id,
         title: v.title,
-        sub_title: ctx.isEmpty(reportColumnDetailList[v.id]) ? '' : reportColumnDetailList[v.id][0].sub_title,
-        level: ctx.isEmpty(reportColumnDetailList[v.id]) ? '' : reportColumnDetailList[v.id][0].level,
-        content: ctx.isEmpty(reportColumnDetailList[v.id]) ? '' : reportColumnDetailList[v.id][0].content,
-        advice: ctx.isEmpty(reportColumnDetailList[v.id]) ? '' : reportColumnDetailList[v.id][0].advice,
+        value: ctx.isEmpty(reportColumnDetailList[v.id]) ? [] : reportColumnDetailList[v.id],
       });
     }
 
     const tags = await this.getReportTags(userReportInfo);
     const recommendClassList = await this.getRecommendClassListByReport(userReportInfo.answer, userReportInfo.user_uuid, userReportInfo.cat_id);
 
-    const userQuestionnaire = await ctx.classModel.V5.CourseV5Questionnaire.findOne({ where: { user_id: userReportInfo.user_uuid, cat_id: userReportInfo.cat_id } });
+    const userQuestionnaire = await ctx.classModel.V5.CourseV5Questionnaire.findOne({ where: { user_uuid: userReportInfo.user_uuid, cat_id: userReportInfo.cat_id } });
 
     const ret = {
       id: reportId,