修改

src/entity/core/course.entity.ts

@@ -6,20 +6,24 @@ import { BaseModel } from 'free-midway-component';
 export class Course extends BaseModel {
   @prop({ required: false, index: true, zh: '老师id' })
   teacher: string;
-  @prop({ required: false, index: false, zh: '名称' })
+  @prop({ required: false, index: true, zh: '课程名称' })
   name: string;
   @prop({ required: false, index: true, zh: '学科' })
   subject: string;
+  @prop({ required: false, index: true, zh: '年级' })
+  grade: string;
   @prop({ required: false, index: true, zh: '类型' })
   type: string;
   @prop({ required: false, index: false, zh: '金额' })
   money: number;
-  @prop({ required: false, index: false, zh: '开始时间' })
+  @prop({ required: false, index: true, zh: '开始时间' })
   start_time: string;
   @prop({ required: false, index: false, zh: '结束时间' })
   end_time: string;
   @prop({ required: false, index: false, zh: '简介' })
   brief: string;
-  @prop({ required: false, index: false, zh: '状态' })
+  @prop({ required: false, index: false, zh: '状态', default: '0' })
   status: string;
+  @prop({ required: false, index: false, zh: '是否公开', default: '1' })
+  is_show: string;
 }

src/entity/core/student.entity.ts

@@ -12,14 +12,10 @@ export class Student extends BaseModel {
   nick_name: string;
   @prop({ required: false, index: true, zh: '性别' })
   gender: string;
+  @prop({ required: false, index: true, zh: '出生日期' })
+  birth: string;
   @prop({ required: false, index: true, zh: '手机号' })
   phone: string;
-  @prop({ required: false, index: true, zh: '年龄' })
-  age: string;
-  @prop({ required: false, index: true, zh: '年级' })
-  grade: string;
-  @prop({ required: false, index: false, zh: '家庭地址' })
-  address: string;
   @prop({ required: false, index: true, zh: '状态' })
   status: string;
 }

src/entity/core/teacher.entity.ts

@@ -12,20 +12,14 @@ export class Teacher extends BaseModel {
   nick_name: string;
   @prop({ required: false, index: true, zh: '性别' })
   gender: string;
-  @prop({ required: false, index: true, zh: '年龄' })
-  age: string;
+  @prop({ required: false, index: true, zh: '出生日期' })
+  birth: string;
   @prop({ required: false, index: true, zh: '手机号' })
   phone: string;
-  @prop({ required: false, index: true, zh: '所教年级' })
-  grade: string;
-  @prop({ required: false, index: false, zh: '身份证类型' })
-  cardType: string;
-  @prop({ required: false, index: true, zh: '身份证号码' })
-  card: string;
+  @prop({ required: false, index: true, zh: '身份证照片正反面' })
+  card: Array<any>;
   @prop({ required: false, index: true, zh: '学历' })
   education: string;
-  @prop({ required: false, index: false, zh: '学科' })
-  subject: string;
   @prop({ required: false, index: true, zh: '院校' })
   college: string;
   @prop({ required: false, index: true, zh: '学业状态' })
@@ -34,6 +28,6 @@ export class Teacher extends BaseModel {
   brief: string;
   @prop({ required: false, index: true, zh: '状态' })
   status: string;
-  @prop({ required: false, index: true, zh: '是否公开' })
+  @prop({ required: false, index: true, zh: '是否公开', default: '1' })
   is_show: string;
 }

src/interface/core/course.interface.ts

@@ -16,10 +16,12 @@ export class FVO_course {
   _id: string = undefined;
   @ApiProperty({ description: '老师id' })
   'teacher': string = undefined;
-  @ApiProperty({ description: '名称' })
+  @ApiProperty({ description: '课程名称' })
   'name': string = undefined;
   @ApiProperty({ description: '学科' })
   'subject': string = undefined;
+  @ApiProperty({ description: '年级' })
+  'grade': string = undefined;
   @ApiProperty({ description: '类型' })
   'type': string = undefined;
   @ApiProperty({ description: '金额' })
@@ -32,21 +34,33 @@ export class FVO_course {
   'brief': string = undefined;
   @ApiProperty({ description: '状态' })
   'status': string = undefined;
+  @ApiProperty({ description: '是否公开' })
+  'is_show': string = undefined;
 }
 
 export class QDTO_course extends SearchBase {
   constructor() {
     const like_prop = [];
-    const props = ['teacher', 'subject', 'type'];
+    const props = ['teacher', 'name', 'subject','type', 'grade', 'status', 'is_show', 'start_time'];
     const mapping = [];
     super({ like_prop, props, mapping });
   }
   @ApiProperty({ description: '老师id' })
   'teacher': string = undefined;
+  @ApiProperty({ description: '课程名称' })
+  'name': string = undefined;
   @ApiProperty({ description: '学科' })
   'subject': string = undefined;
+  @ApiProperty({ description: '年级' })
+  'grade': string = undefined;
   @ApiProperty({ description: '类型' })
   'type': string = undefined;
+  @ApiProperty({ description: '开始时间' })
+  'start_time': string = undefined;
+  @ApiProperty({ description: '状态' })
+  'status': string = undefined;
+  @ApiProperty({ description: '是否公开' })
+  'is_show': string = undefined;
 }
 
 export class QVO_course extends FVO_course {
@@ -60,12 +74,15 @@ export class CDTO_course {
   @ApiProperty({ description: '老师id' })
   @Rule(RuleType['string']().empty(''))
   'teacher': string = undefined;
-  @ApiProperty({ description: '名称' })
+  @ApiProperty({ description: '课程名称' })
   @Rule(RuleType['string']().empty(''))
   'name': string = undefined;
   @ApiProperty({ description: '学科' })
   @Rule(RuleType['string']().empty(''))
   'subject': string = undefined;
+  @ApiProperty({ description: '年级' })
+  @Rule(RuleType['string']().empty(''))
+  'grade': string = undefined;
   @ApiProperty({ description: '类型' })
   @Rule(RuleType['string']().empty(''))
   'type': string = undefined;
@@ -84,6 +101,9 @@ export class CDTO_course {
   @ApiProperty({ description: '状态' })
   @Rule(RuleType['string']().empty(''))
   'status': string = undefined;
+  @ApiProperty({ description: '是否公开' })
+  @Rule(RuleType['string']().empty(''))
+  'is_show': string = undefined;
 }
 
 export class CVO_course extends FVO_course {

src/interface/core/student.interface.ts

@@ -28,8 +28,8 @@ export class FVO_student {
   'age': string = undefined;
   @ApiProperty({ description: '年级' })
   'grade': string = undefined;
-  @ApiProperty({ description: '家庭地址' })
-  'address': string = undefined;
+  @ApiProperty({ description: '出生日期' })
+  'birth': string = undefined;
   @ApiProperty({ description: '状态' })
   'status': string = undefined;
 }
@@ -84,9 +84,9 @@ export class CDTO_student {
   @ApiProperty({ description: '年级' })
   @Rule(RuleType['string']().empty(''))
   'grade': string = undefined;
-  @ApiProperty({ description: '家庭地址' })
+  @ApiProperty({ description: '出生日期' })
   @Rule(RuleType['string']().empty(''))
-  'address': string = undefined;
+  'birth': string = undefined;
   @ApiProperty({ description: '状态' })
   @Rule(RuleType['string']().empty(''))
   'status': string = undefined;

src/interface/core/teacher.interface.ts

@@ -22,20 +22,14 @@ export class FVO_teacher {
   'nick_name': string = undefined;
   @ApiProperty({ description: '性别' })
   'gender': string = undefined;
-  @ApiProperty({ description: '年龄' })
-  'age': string = undefined;
+  @ApiProperty({ description: '出生日期' })
+  'birth': string = undefined;
   @ApiProperty({ description: '手机号' })
   'phone': string = undefined;
-  @ApiProperty({ description: '所教年级' })
-  'grade': string = undefined;
-  @ApiProperty({ description: '身份证类型' })
-  'cardType': string = undefined;
-  @ApiProperty({ description: '身份证号码' })
-  'card': string = undefined;
+  @ApiProperty({ description: '身份证照片正反面' })
+  'card': Array<any> = undefined;
   @ApiProperty({ description: '学历' })
   'education': string = undefined;
-  @ApiProperty({ description: '学科' })
-  'subject': string = undefined;
   @ApiProperty({ description: '院校' })
   'college': string = undefined;
   @ApiProperty({ description: '学业状态' })
@@ -50,8 +44,8 @@ export class FVO_teacher {
 
 export class QDTO_teacher extends SearchBase {
   constructor() {
-    const like_prop = ['nick_name'];
-    const props = ['openid', 'is_show', 'gender', 'age', 'phone', 'grade', 'card', 'education', 'college', 'learnStatus', 'brief', 'status'];
+    const like_prop = [];
+    const props = ['openid', 'nick_name', 'gender', 'phone', 'education', 'college', 'learnStatus', 'status', 'is_show'];
     const mapping = [];
     super({ like_prop, props, mapping });
   }
@@ -61,22 +55,14 @@ export class QDTO_teacher extends SearchBase {
   'nick_name': string = undefined;
   @ApiProperty({ description: '性别' })
   'gender': string = undefined;
-  @ApiProperty({ description: '年龄' })
-  'age': string = undefined;
   @ApiProperty({ description: '手机号' })
   'phone': string = undefined;
-  @ApiProperty({ description: '所教年级' })
-  'grade': string = undefined;
-  @ApiProperty({ description: '身份证号码' })
-  'card': string = undefined;
   @ApiProperty({ description: '学历' })
   'education': string = undefined;
   @ApiProperty({ description: '院校' })
   'college': string = undefined;
   @ApiProperty({ description: '学业状态' })
   'learnStatus': string = undefined;
-  @ApiProperty({ description: '简介' })
-  'brief': string = undefined;
   @ApiProperty({ description: '状态' })
   'status': string = undefined;
   @ApiProperty({ description: '是否公开' })
@@ -103,27 +89,18 @@ export class CDTO_teacher {
   @ApiProperty({ description: '性别' })
   @Rule(RuleType['string']().empty(''))
   'gender': string = undefined;
-  @ApiProperty({ description: '年龄' })
+  @ApiProperty({ description: '出生日期' })
   @Rule(RuleType['string']().empty(''))
-  'age': string = undefined;
+  'birth': string = undefined;
   @ApiProperty({ description: '手机号' })
   @Rule(RuleType['string']().empty(''))
   'phone': string = undefined;
-  @ApiProperty({ description: '所教年级' })
-  @Rule(RuleType['string']().empty(''))
-  'grade': string = undefined;
-  @ApiProperty({ description: '身份证类型' })
-  @Rule(RuleType['string']().empty(''))
-  'cardType': string = undefined;
-  @ApiProperty({ description: '身份证号码' })
-  @Rule(RuleType['string']().empty(''))
-  'card': string = undefined;
+  @ApiProperty({ description: '身份证照片正反面' })
+  @Rule(RuleType['array']().empty(''))
+  'card': Array<any> = undefined;
   @ApiProperty({ description: '学历' })
   @Rule(RuleType['string']().empty(''))
   'education': string = undefined;
-  @ApiProperty({ description: '学科' })
-  @Rule(RuleType['string']().empty(''))
-  'subject': string = undefined;
   @ApiProperty({ description: '院校' })
   @Rule(RuleType['string']().empty(''))
   'college': string = undefined;