zs 1 éve
szülő
commit
7b0751698e

+ 6 - 2
src/entity/users/company.entity.ts

@@ -10,14 +10,18 @@ export class Company extends BaseModel {
   name: string;
   @prop({ required: false, index: false, zh: 'logo' })
   logo: Array<any>;
-  @prop({ required: false, index: true, zh: '企业标签' })
-  tags: Array<any>;
   @prop({ required: false, index: false, zh: '统一信用代码' })
   code: string;
+  @prop({ required: false, index: false, zh: '企业类型' })
+  pattern: string;
+  @prop({ required: false, index: false, zh: '企业规模' })
+  scale: string;
   @prop({ required: false, index: true, zh: '联系电话' })
   phone: string;
   @prop({ required: false, index: true, zh: '所属行业' })
   type: string;
+  @prop({ required: false, index: true, zh: '所在地区' })
+  area: Array<any>;
   @prop({ required: false, index: false, zh: '法定代表人' })
   representative: string;
   @prop({ required: false, index: false, zh: '电子邮箱' })

+ 4 - 0
src/entity/users/expert.entity.ts

@@ -12,6 +12,10 @@ export class Expert extends BaseModel {
   gender: string;
   @prop({ required: false, index: false, zh: '出生年月' })
   birth: string;
+  @prop({ required: false, index: false, zh: '证件类型' })
+  cardType: string;
+  @prop({ required: false, index: false, zh: '证件号码' })
+  card: string;
   @prop({ required: false, index: true, zh: '联系电话' })
   phone: string;
   @prop({ required: false, index: true, zh: '所属领域' })

+ 6 - 6
src/entity/users/unit.entity.ts

@@ -9,15 +9,15 @@ export class Unit extends BaseModel {
   @prop({ required: false, index: false, zh: '科研机构名称' })
   name: string;
   @prop({ required: false, index: true, zh: '联系人' })
-  contacts: string;
+  person: string;
   @prop({ required: false, index: true, zh: '联系电话' })
-  contacts_phone: string;
-  @prop({ required: false, index: false, zh: '图片' })
-  file: Array<any>;
+  person_phone: string;
   @prop({ required: false, index: false, zh: '简介' })
   brief: string;
-  @prop({ required: false, index: true, zh: '状态' })
-  status: string;
+  @prop({ required: false, index: false, zh: '地址' })
+  address: string;
   @prop({ required: false, index: true, zh: '是否公开' })
   is_show: string;
+  @prop({ required: false, index: true, zh: '状态' })
+  status: string;
 }

+ 15 - 5
src/interface/users/company.interface.ts

@@ -20,14 +20,18 @@ export class FVO_company {
   'name': string = undefined;
   @ApiProperty({ description: 'logo' })
   'logo': Array<any> = undefined;
-  @ApiProperty({ description: '企业标签' })
-  'tags': Array<any> = undefined;
   @ApiProperty({ description: '统一信用代码' })
   'code': string = undefined;
+  @ApiProperty({ description: '企业类型' })
+  'pattern': string = undefined;
+  @ApiProperty({ description: '企业规模' })
+  'scale': string = undefined;
   @ApiProperty({ description: '联系电话' })
   'phone': string = undefined;
   @ApiProperty({ description: '所属行业' })
   'type': string = undefined;
+  @ApiProperty({ description: '所在地区' })
+  'area': Array<any> = undefined;
   @ApiProperty({ description: '法定代表人' })
   'representative': string = undefined;
   @ApiProperty({ description: '电子邮箱' })
@@ -94,18 +98,24 @@ export class CDTO_company {
   @ApiProperty({ description: 'logo' })
   @Rule(RuleType['array']().empty(''))
   'logo': Array<any> = undefined;
-  @ApiProperty({ description: '企业标签' })
-  @Rule(RuleType['array']().empty(''))
-  'tags': Array<any> = undefined;
   @ApiProperty({ description: '统一信用代码' })
   @Rule(RuleType['string']().empty(''))
   'code': string = undefined;
+  @ApiProperty({ description: '企业类型' })
+  @Rule(RuleType['string']().empty(''))
+  'pattern': string = undefined;
+  @ApiProperty({ description: '企业规模' })
+  @Rule(RuleType['string']().empty(''))
+  'scale': string = undefined;
   @ApiProperty({ description: '联系电话' })
   @Rule(RuleType['string']().empty(''))
   'phone': string = undefined;
   @ApiProperty({ description: '所属行业' })
   @Rule(RuleType['string']().empty(''))
   'type': string = undefined;
+  @ApiProperty({ description: '所在地区' })
+  @Rule(RuleType['array']().empty(''))
+  'area': Array<any> = undefined;
   @ApiProperty({ description: '法定代表人' })
   @Rule(RuleType['string']().empty(''))
   'representative': string = undefined;

+ 10 - 0
src/interface/users/expert.interface.ts

@@ -22,6 +22,10 @@ export class FVO_expert {
   'gender': string = undefined;
   @ApiProperty({ description: '出生年月' })
   'birth': string = undefined;
+  @ApiProperty({ description: '证件类型' })
+  'cardType': string = undefined;
+  @ApiProperty({ description: '证件号码' })
+  'card': string = undefined;
   @ApiProperty({ description: '联系电话' })
   'phone': string = undefined;
   @ApiProperty({ description: '所属领域' })
@@ -93,6 +97,12 @@ export class CDTO_expert {
   @ApiProperty({ description: '出生年月' })
   @Rule(RuleType['string']().empty(''))
   'birth': string = undefined;
+  @ApiProperty({ description: '证件类型' })
+  @Rule(RuleType['string']().empty(''))
+  'cardType': string = undefined;
+  @ApiProperty({ description: '证件号码' })
+  @Rule(RuleType['string']().empty(''))
+  'card': string = undefined;
   @ApiProperty({ description: '联系电话' })
   @Rule(RuleType['string']().empty(''))
   'phone': string = undefined;

+ 12 - 12
src/interface/users/unit.interface.ts

@@ -19,11 +19,11 @@ export class FVO_unit {
   @ApiProperty({ description: '科研机构名称' })
   'name': string = undefined;
   @ApiProperty({ description: '联系人' })
-  'contacts': string = undefined;
+  'person': string = undefined;
   @ApiProperty({ description: '联系电话' })
-  'contacts_phone': string = undefined;
-  @ApiProperty({ description: '图片' })
-  'file': Array<any> = undefined;
+  'person_phone': string = undefined;
+  @ApiProperty({ description: '地址' })
+  'address': string = undefined;
   @ApiProperty({ description: '简介' })
   'brief': string = undefined;
   @ApiProperty({ description: '状态' })
@@ -35,16 +35,16 @@ export class FVO_unit {
 export class QDTO_unit extends SearchBase {
   constructor() {
     const like_prop = [];
-    const props = ['user', 'contacts', 'contacts_phone', 'status', 'is_show'];
+    const props = ['user', 'person', 'person_phone', 'status', 'is_show'];
     const mapping = [];
     super({ like_prop, props, mapping });
   }
   @ApiProperty({ description: '平台用户id' })
   'user': string = undefined;
   @ApiProperty({ description: '联系人' })
-  'contacts': string = undefined;
+  'person': string = undefined;
   @ApiProperty({ description: '联系电话' })
-  'contacts_phone': string = undefined;
+  'person_phone': string = undefined;
   @ApiProperty({ description: '状态' })
   'status': string = undefined;
   @ApiProperty({ description: '是否公开' })
@@ -67,13 +67,13 @@ export class CDTO_unit {
   'name': string = undefined;
   @ApiProperty({ description: '联系人' })
   @Rule(RuleType['string']().empty(''))
-  'contacts': string = undefined;
+  'person': string = undefined;
   @ApiProperty({ description: '联系电话' })
   @Rule(RuleType['string']().empty(''))
-  'contacts_phone': string = undefined;
-  @ApiProperty({ description: '图片' })
-  @Rule(RuleType['array']().empty(''))
-  'file': Array<any> = undefined;
+  'person_phone': string = undefined;
+  @ApiProperty({ description: '地址' })
+  @Rule(RuleType['string']().empty(''))
+  'address': string = undefined;
   @ApiProperty({ description: '简介' })
   @Rule(RuleType['string']().empty(''))
   'brief': string = undefined;