Merge branch 'main' of http://git.cc-lotus.info/Information/cxyy-service

src/entity/platform/achievement.entity.ts

@@ -37,7 +37,7 @@ export class Achievement extends BaseModel {
   file: Array<any>;
   @Column({ type: 'character varying', nullable: true, comment: '成果状态', default: '0' })
   achievement_status: string;
-  @Column({ type: 'character varying', nullable: true, comment: '是否公开', default: '1' })
+  @Column({ type: 'character varying', nullable: true, comment: '是否公开', default: '0' })
   is_use: string;
   @Column({ type: 'character varying', nullable: true, comment: '状态', default: '0' })
   status: string;

src/entity/platform/demand.entity.ts

@@ -29,7 +29,7 @@ export class Demand extends BaseModel {
   brief: string;
   @Column({ type: 'character varying', nullable: true, comment: '需求状态', default: '0' })
   demand_status: string;
-  @Column({ type: 'character varying', nullable: true, comment: '是否公开', default: '1' })
+  @Column({ type: 'character varying', nullable: true, comment: '是否公开', default: '0' })
   is_use: string;
   @Column({ type: 'character varying', nullable: true, comment: '状态' })
   status: string;

src/entity/platform/match.entity.ts

@@ -11,6 +11,10 @@ export class Match extends BaseModel {
   name: string;
   @Column({ type: 'character varying', nullable: true, comment: '类型' })
   type: string;
+  @Column({ type: 'character varying', nullable: true, comment: '赛事类型' })
+  match_type: string;
+  @Column({ type: 'character varying', nullable: true, comment: '路由' })
+  href: string;
   @Column({ type: 'character varying', nullable: true, comment: '组织单位' })
   work: string;
   @Column({ type: 'character varying', nullable: true, comment: '地点' })
@@ -33,7 +37,7 @@ export class Match extends BaseModel {
   file: Array<any>;
   @Column({ type: 'character varying', nullable: true, comment: '赛事状态', default: '0' })
   match_status: string;
-  @Column({ type: 'character varying', nullable: true, comment: '是否公开', default: '1' })
+  @Column({ type: 'character varying', nullable: true, comment: '是否公开', default: '0' })
   is_use: string;
   @Column({ type: 'character varying', nullable: true, comment: '状态', default: '0' })
   status: string;

src/entity/platform/news.entity.ts

@@ -20,7 +20,7 @@ export class News extends BaseModel {
   number: number;
   @Column({ type: 'character varying', nullable: true, comment: '类型 0:政策新闻,1:新闻资讯', default: '0' })
   type: string;
-  @Column({ type: 'character varying', nullable: true, comment: '是否使用', default: '1' })
+  @Column({ type: 'character varying', nullable: true, comment: '是否使用', default: '0' })
   is_use: string;
   @Column({ type: 'character varying', nullable: true, comment: '状态', default: '0' })
   status: string;

src/entity/platform/project.entity.ts

@@ -25,10 +25,6 @@ export class Project extends BaseModel {
   area: Array<any>;
   @Column({ type: 'text', nullable: true, comment: '简介' })
   brief: string;
-  @Column({ type: 'character varying', nullable: true, comment: '是否公开' })
-  is_use: string;
-  @Column({ type: 'character varying', nullable: true, comment: '状态' })
-  status: string;
   @Column({ type: 'character varying', nullable: true, comment: '项目主体' })
   main: string;
   @Column({ type: 'character varying', nullable: true, comment: '项目进展' })
@@ -39,4 +35,8 @@ export class Project extends BaseModel {
   source: string;
   @Column({ type: 'character varying', nullable: true, comment: '产业分类' })
   industry: string;
+  @Column({ type: 'character varying', nullable: true, comment: '是否公开', default: '0' })
+  is_use: string;
+  @Column({ type: 'character varying', nullable: true, comment: '状态', default: '0' })
+  status: string;
 }

src/entity/platform/sign.entity.ts

@@ -25,7 +25,6 @@ export class Sign extends BaseModel {
   remark: string;
   @Column({ type: 'character varying', nullable: true, comment: '状态', default: '0' })
   status: string;
-
   @Column({ type: 'character varying', nullable: true, comment: '隶属单位' })
   unit: string;
 }

src/entity/platform/supply.entity.ts

@@ -29,7 +29,7 @@ export class Supply extends BaseModel {
   brief: string;
   @Column({ type: 'character varying', nullable: true, comment: '需求状态', default: '0' })
   demand_status: string;
-  @Column({ type: 'character varying', nullable: true, comment: '是否公开', default: '1' })
+  @Column({ type: 'character varying', nullable: true, comment: '是否公开', default: '0' })
   is_use: string;
   @Column({ type: 'character varying', nullable: true, comment: '状态' })
   status: string;

src/entity/users/company.entity.ts

@@ -46,7 +46,6 @@ export class Company extends BaseModel {
   companyStatus: string;
   @Column({ type: 'character varying', default: '0', comment: '状态' })
   status: string;
-
   @Column({ type: 'character varying', nullable: true, comment: '产品' })
   products: string;
 }

src/interface/platform/demand.interface.ts

@@ -1,6 +1,7 @@
 import { Rule, RuleType } from '@midwayjs/validate';
 import { ApiProperty } from '@midwayjs/swagger';
 import { dealVO } from '../../frame/VOBase';
+import { SearchBase } from '../../frame/SearchBase';
 export class FVO_demand {
   constructor(data: object) {
     dealVO(this, data);
@@ -57,7 +58,7 @@ export class FVO_demand {
   'is_use': string = undefined;
 }
 
-export class QDTO_demand {
+export class QDTO_demand extends SearchBase {
   @ApiProperty({ description: '用户id' })
   'user': number = undefined;
   @ApiProperty({ description: '标签' })

src/interface/platform/match.interface.ts

@@ -16,6 +16,10 @@ export class FVO_match {
   'name': string = undefined;
   @ApiProperty({ description: '类型' })
   'type': string = undefined;
+  @ApiProperty({ description: '赛事类型' })
+  'match_type': string = undefined;
+  @ApiProperty({ description: '路由' })
+  'href': string = undefined;
   @ApiProperty({ description: '组织单位' })
   'work': string = undefined;
   @ApiProperty({ description: '所属产业' })
@@ -53,6 +57,10 @@ export class QDTO_match extends SearchBase {
   'name': string = undefined;
   @ApiProperty({ description: '类型' })
   'type': string = undefined;
+  @ApiProperty({ description: '赛事类型' })
+  'match_type': string = undefined;
+  @ApiProperty({ description: '路由' })
+  'href': string = undefined;
   @ApiProperty({ description: '开始时间' })
   'start_time': string = undefined;
   @ApiProperty({ description: '结束时间' })
@@ -89,6 +97,12 @@ export class CDTO_match {
   @ApiProperty({ description: '类型' })
   @Rule(RuleType['string']().empty(''))
   'type': string = undefined;
+  @ApiProperty({ description: '赛事类型' })
+  @Rule(RuleType['string']().empty(''))
+  'match_type': string = undefined;
+  @ApiProperty({ description: '路由' })
+  @Rule(RuleType['string']().empty(''))
+  'href': string = undefined;
   @ApiProperty({ description: '组织单位' })
   @Rule(RuleType['string']().empty(''))
   'work': string = undefined;