add feedback

app/controller/course/v5/option.js

@@ -30,6 +30,30 @@ class OptionController extends Controller {
     const ret = await service.course.v5.option.getCategoryList(queryParams);
     ctx.success(ret);
   }
+
+  // 获取反馈类型列表
+  async getFeedbackTypeList() {
+    const { ctx, service } = this;
+    const ret = await service.course.v5.option.getFeedbackTypeList();
+
+    ctx.success(ret);
+  }
+
+  // 上传反馈内容
+  async addFeedback() {
+    const { ctx, service } = this;
+    const params = ctx.request.body;
+
+    if (ctx.isEmpty(params) || ctx.isEmpty(params.type)) {
+      ctx.failed('type is empty');
+    }
+    if (ctx.isEmpty(params) || ctx.isEmpty(params.content)) {
+      ctx.failed('content is empty');
+    }
+
+    const ret = await service.course.v5.option.addFeedback(params);
+    ctx.success(ret);
+  }
 }
 
 module.exports = OptionController;

app/model/class/v5/courseFeedback.js

+'use strict';
+
+
+const moment = require('moment');
+
+module.exports = app => {
+  const { STRING, INTEGER, DATE } = app.Sequelize;
+
+  const CourseFeedback = app.classModel.define('course_feedback', {
+    id: {
+      type: INTEGER,
+      primaryKey: true,
+      autoIncrement: true,
+    },
+    user_uuid: STRING,
+    type: INTEGER,
+    content: STRING,
+    images: STRING,
+    is_deleted: INTEGER,
+    created_time: {
+      type: DATE,
+      allowNull: true,
+      get() {
+        const date = this.getDataValue('created_time');
+        return date ? moment(date).format('YYYY-MM-DD HH:mm:ss') : undefined;
+      },
+    },
+    updated_time: {
+      type: DATE,
+      allowNull: true,
+      get() {
+        const date = this.getDataValue('updated_time');
+        return date ? moment(date).format('YYYY-MM-DD HH:mm:ss') : undefined;
+      },
+    },
+  }, {
+    timestamps: false,
+    tableName: 'course_feedback',
+  });
+
+  return CourseFeedback;
+
+};

app/router/course_v5.js

@@ -16,6 +16,8 @@ module.exports = app => {
   router.get('third', '/banner/all', 'course.v5.option.getBannerList');// 获取banner列表
   router.get('third', '/options', 'course.v5.option.getOptions');// 获取配置项
   router.post('third', '/wechat/qrcode', 'course.v5.wechat.getQRCode');// 获取二维码
+  router.get('third', '/feedback/type', 'course.v5.option.getFeedbackTypeList');// 获取反馈分类
+  router.post('third', '/feedback', auth, 'course.v5.option.addFeedback');// 反馈
 
   router.get('third', '/class/all', auth, 'course.v5.institution.getClassList');// 获取课程列表
   router.get('third', '/class/:class_id', auth, 'course.v5.institution.getClassInfo');// 获取课程详情

app/service/course/v5/option.js

@@ -2,6 +2,7 @@
 'use strict';
 
 const Service = require('egg').Service;
+const moment = require('moment');
 
 const MODE = [
   {
@@ -147,6 +148,39 @@ class OptionService extends Service {
   }
 
 
+  // 获取反馈类型列表
+  async getFeedbackTypeList() {
+    const ret = {
+      list: [
+        { id: 1, name: '使用疑问' },
+        { id: 2, name: '功能故障' },
+        { id: 3, name: '数据错误' },
+        { id: 4, name: '投诉' },
+        { id: 5, name: '提建议' },
+      ],
+    };
+
+    return ret;
+  }
+
+  // 提交反馈
+  async addFeedback(input) {
+    const { ctx } = this;
+
+    const data = {
+      user_uuid: ctx.userUuid,
+      type: input.type,
+      content: input.content,
+      images: input.images,
+      status: 1,
+      is_deleted: 0,
+      created_time: moment().format('YYYY-MM-DD HH:mm:ss'),
+    };
+
+    await ctx.classModel.V5.CourseFeedback.create(data);
+
+    return { result: true };
+  }
 }
 
 module.exports = OptionService;

app/service/course/v5/report.js

@@ -85,6 +85,8 @@ class ReportService extends Service {
       ctx.failed('尚未生成报告');
     }
 
+    const category = await ctx.classModel.V5.CourseV5Category.findOne({ where: { id: userReportInfo.cat_id }, attributes: [ 'name', 'url' ] });
+
     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');
@@ -107,6 +109,7 @@ class ReportService extends Service {
     const userBabyInfo = await ctx.classModel.V5.CourseV5UserBaby.findOne({ where: { user_uuid: userReportInfo.user_uuid, status: 1, is_deleted: 0 }, attributes: [ 'user_uuid', 'baby_sex', 'baby_name' ] });
 
     const ret = {
+      category: ctx.isEmpty(category) ? {} : category,
       tags,
       report,
       user: userBabyInfo,
@@ -124,6 +127,8 @@ class ReportService extends Service {
       ctx.failed('尚未生成报告');
     }
 
+    const category = await ctx.classModel.V5.CourseV5Category.findOne({ where: { id: userReportInfo.cat_id }, attributes: [ 'name', 'url' ] });
+
     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');
@@ -146,6 +151,7 @@ class ReportService extends Service {
     const userBabyInfo = await ctx.classModel.V5.CourseV5UserBaby.findOne({ where: { user_uuid: userReportInfo.user_uuid, status: 1, is_deleted: 0 }, attributes: [ 'user_uuid', 'baby_sex', 'baby_name' ] });
 
     const ret = {
+      category: ctx.isEmpty(category) ? {} : category,
       tags,
       report,
       user: userBabyInfo,