fix reportInfo

app/model/class/v5/courseV5ReportColumnDetail.js

@@ -13,7 +13,10 @@ module.exports = app => {
       autoIncrement: true,
     },
     report_column_id: INTEGER,
+    sub_title: STRING,
+    level: INTEGER,
     content: STRING,
+    advice: STRING,
     status: INTEGER,
     is_deleted: INTEGER,
     number: INTEGER,

app/service/course/v5/report.js

@@ -85,7 +85,7 @@ class ReportService extends Service {
       ctx.failed('尚未生成报告');
     }
 
-    let reportColumnDetailList = ctx.isEmpty(userReportInfo.report_column_detail_ids) ? [] : await ctx.classModel.V5.CourseV5ReportColumnDetail.findAll({ where: { id: { $in: eval(userReportInfo.report_column_detail_ids) }, status: 1, is_deleted: 0 }, attributes: [ 'id', 'report_column_id', 'content' ], raw: true });
+    let reportColumnDetailList = ctx.isEmpty(userReportInfo.report_column_detail_ids) ? [] : await ctx.classModel.V5.CourseV5ReportColumnDetail.findAll({ where: { id: { $in: eval(userReportInfo.report_column_detail_ids) }, status: 1, is_deleted: 0 }, attributes: [ 'id', 'report_column_id', 'sub_title', 'level', 'content', 'advice' ], raw: true });
     const reportColumnList = await ctx.classModel.V5.CourseV5ReportColumn.findAll({ where: { id: { $in: R.pluck('report_column_id', reportColumnDetailList) } }, order: [[ 'sort', 'asc' ]], attributes: [ 'id', 'title' ], raw: true });
     reportColumnDetailList = _.groupBy(reportColumnDetailList, 'report_column_id');
 
@@ -94,7 +94,10 @@ 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,
       });
     }
 
@@ -118,7 +121,7 @@ class ReportService extends Service {
       ctx.failed('尚未生成报告');
     }
 
-    let reportColumnDetailList = ctx.isEmpty(userReportInfo.report_column_detail_ids) ? [] : await ctx.classModel.V5.CourseV5ReportColumnDetail.findAll({ where: { id: { $in: eval(userReportInfo.report_column_detail_ids) }, status: 1, is_deleted: 0 }, attributes: [ 'id', 'report_column_id', 'content' ], raw: true });
+    let reportColumnDetailList = ctx.isEmpty(userReportInfo.report_column_detail_ids) ? [] : await ctx.classModel.V5.CourseV5ReportColumnDetail.findAll({ where: { id: { $in: eval(userReportInfo.report_column_detail_ids) }, status: 1, is_deleted: 0 }, attributes: [ 'id', 'report_column_id', 'sub_title', 'level', 'content', 'advice' ], raw: true });
     const reportColumnList = await ctx.classModel.V5.CourseV5ReportColumn.findAll({ where: { id: { $in: R.pluck('report_column_id', reportColumnDetailList) } }, order: [[ 'sort', 'asc' ]], attributes: [ 'id', 'title' ], raw: true });
     reportColumnDetailList = _.groupBy(reportColumnDetailList, 'report_column_id');
 
@@ -127,7 +130,10 @@ 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,
       });
     }
 
@@ -236,6 +242,10 @@ class ReportService extends Service {
     classList = _.orderBy(classList, [ 'score', 'filter_price' ], [ 'desc', 'asc' ]);
     classList = classList.slice(0, 3);
 
+    for (let i = 0; i < classList.length; i++) {
+      classList[i].match = 99 - i * 3 - Math.floor(Math.random() * 3);
+    }
+
     return classList;
   }
 
@@ -368,6 +378,10 @@ class ReportService extends Service {
     classToColumn = _.groupBy(classToColumn, 'class_id');
     columnList = _.groupBy(columnList, 'id');
 
+    // 获取所有机构
+    let institutionList = await ctx.classModel.V5.CourseV5Institution.findAll({ where: { id: { $in: R.pluck('institution_id', classList) } } });
+    institutionList = _.groupBy(institutionList, 'id');
+
     const ret = [];
     for (const v of classList) {
       const classAgeList = [];
@@ -421,6 +435,7 @@ class ReportService extends Service {
       }
 
       const tmpClass = v;
+      tmpClass.institution_name = ctx.isEmpty(institutionList[v.institution_id]) ? '' : institutionList[v.institution_id][0].name;
       tmpClass.age_list = classAgeList;
       tmpClass.type_list = classTypeList;
       tmpClass.frequency_list = classFrequencyList;