zs před 4 měsíci
rodič
revize
bf87e06a22

+ 11 - 11
src/controller/platform/match.controller.ts

@@ -44,18 +44,18 @@ export class MatchController implements BaseController {
   @Validate()
   @ApiResponse({ type: CVO_match })
   async create(@Body() data: object) {
-    const extColumns = ['ext_info', 'ext_finals']
-    const matchData = omit(data, extColumns)
-    let extData = pick(data, extColumns)
+    const extColumns = ['ext_info', 'ext_finals'];
+    const matchData = omit(data, extColumns);
+    let extData = pick(data, extColumns);
     const dbData = await this.service.create(matchData);
     // 如果类型是4,需要特殊处理下,补充赛事拓展表
     if (get(matchData, 'type') === '4') {
       // 查查有没有拓展数据,有就不创建了
-      const match_id = dbData.id
-      const ed = await this.matchExtService.fetch({ match_id })
+      const match_id = dbData.id;
+      const ed = await this.matchExtService.fetch({ match_id });
       if (!ed) {
-        extData = { match_id, ...extData }
-        await this.matchExtService.create(extData)
+        extData = { match_id, info: get(extData, 'ext_info'), finals: get(extData, 'ext_finals') };
+        await this.matchExtService.create(extData);
       }
     }
     const result = new CVO_match(dbData);
@@ -68,14 +68,14 @@ export class MatchController implements BaseController {
   @ApiResponse({ type: UVAO_match })
   async update(@Param('id') id: number, @Body() data: object) {
     if (!id) throw new ServiceError(ErrorCode.ID_NOT_FOUND);
-    const extColumns = ['ext_info', 'ext_finals']
-    const matchData = omit(data, extColumns)
-    let extData = pick(data, extColumns)
+    const extColumns = ['ext_info', 'ext_finals'];
+    const matchData = omit(data, extColumns);
+    let extData = pick(data, extColumns);
     const result = await this.service.update({ id }, matchData);
     await this.service.updateProject({ id }, data);
     // 如果类型是4,需要特殊处理下,补充赛事拓展表,不需要修改状态和赛事id
     if (get(matchData, 'type') === '4') {
-      await this.matchExtService.update({ match_id: id }, extData)
+      await this.matchExtService.update({ match_id: id }, extData);
     }
     return result;
   }

+ 1 - 1
src/entity/match/matchExt.entity.ts

@@ -11,4 +11,4 @@ export class MatchExt extends BaseModel {
   info: Array<any>;
   @Column({ type: 'jsonb', nullable: true, comment: '决赛分数维度设置' })
   finals: Array<any>;
-}
+}

+ 0 - 2
src/entity/platform/match.entity.ts

@@ -51,6 +51,4 @@ export class Match extends BaseModel {
   order_num: number;
   @Column({ type: 'character varying', nullable: true, comment: '状态', default: '0' })
   status: string;
-  @Column({ type: 'jsonb', nullable: true, comment: '调查问卷', default: [] })
-  investigate: Array<any>;
 }

+ 0 - 5
src/interface/platform/match.interface.ts

@@ -56,8 +56,6 @@ export class FVO_match {
   'order_num': number = undefined;
   @ApiProperty({ description: '状态' })
   'status': string = undefined;
-  @ApiProperty({ description: '调查问卷' })
-  'investigate': Array<any> = undefined;
 }
 
 export class QDTO_match extends SearchBase {
@@ -175,9 +173,6 @@ export class CDTO_match {
   @ApiProperty({ description: '状态' })
   @Rule(RuleType['string']().empty(''))
   'status': string = undefined;
-  @ApiProperty({ description: '调查问卷' })
-  @Rule(RuleType['array']().empty(''))
-  'investigate': Array<any> = undefined;
 }
 
 export class CVO_match extends FVO_match {