Skip to content

5
51business
Commit 2015701d authored by 任国军's avatar 任国军
Browse files
Options

add report more content

parent 449d4871
Pipeline #23499 passed with stage
    in 13 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 5 additions and 11 deletions
    app/model/class/v5/courseV5Questionnaire.js
    View file @ 2015701d
    ...@@ -13,7 +13,7 @@ module.exports = app => { ...@@ -13,7 +13,7 @@ module.exports = app => {
    autoIncrement: true, autoIncrement: true,
    }, },
    cat_id: INTEGER, cat_id: INTEGER,
    user_id: STRING, user_uuid: STRING,
    answer_1: STRING, answer_1: STRING,
    answer_2: STRING, answer_2: STRING,
    answer_3: STRING, answer_3: STRING,
    ......
    app/service/course/v5/report.js
    View file @ 2015701d
    ...@@ -108,17 +108,14 @@ class ReportService extends Service { ...@@ -108,17 +108,14 @@ class ReportService extends Service {
    report.push({ report.push({
    id: v.id, id: v.id,
    title: v.title, title: v.title,
    sub_title: ctx.isEmpty(reportColumnDetailList[v.id]) ? '' : reportColumnDetailList[v.id][0].sub_title, value: ctx.isEmpty(reportColumnDetailList[v.id]) ? [] : reportColumnDetailList[v.id],
    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,
    }); });
    } }
    const tags = await this.getReportTags(userReportInfo); const tags = await this.getReportTags(userReportInfo);
    const recommendClassList = await this.getRecommendClassListByReport(userReportInfo.answer, userReportInfo.user_uuid, userReportInfo.cat_id); 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 = { const ret = {
    id: userReportInfo.id, id: userReportInfo.id,
    ...@@ -157,17 +154,14 @@ class ReportService extends Service { ...@@ -157,17 +154,14 @@ class ReportService extends Service {
    report.push({ report.push({
    id: v.id, id: v.id,
    title: v.title, title: v.title,
    sub_title: ctx.isEmpty(reportColumnDetailList[v.id]) ? '' : reportColumnDetailList[v.id][0].sub_title, value: ctx.isEmpty(reportColumnDetailList[v.id]) ? [] : reportColumnDetailList[v.id],
    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,
    }); });
    } }
    const tags = await this.getReportTags(userReportInfo); const tags = await this.getReportTags(userReportInfo);
    const recommendClassList = await this.getRecommendClassListByReport(userReportInfo.answer, userReportInfo.user_uuid, userReportInfo.cat_id); 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 = { const ret = {
    id: reportId, id: reportId,
    ......
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment