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

src/controller/match/matchExt.controller.ts

@@ -376,17 +376,17 @@ export class MatchExtController implements BaseController {
     await this.service.checkMatchExtStatus(match_id, '5');
     const matchInfo = await this.matchService.fetch({ id: match_id });
     const match_name = get(matchInfo, 'name');
-    const { data: extList } = await this.service.query({ match_id, ext_status: '5', status: '0', final_confirm: '1' });
+    const { data: extList } = await this.matchRegService.query({ match_id, ext_status: '5', status: '0', final_confirm: '1' });
     for (const i of extList) {
       const user_id = get(i, 'user_id');
       if (!user_id) continue;
-      const userInfo = this.userService.fetch({ id: user_id });
+      const userInfo = await this.userService.fetch({ id: user_id });
       if (!userInfo) continue;
       const phone = get(userInfo, 'phone');
       if (!phone) continue;
       const nick_name = get(userInfo, 'nick_name');
       if (!nick_name) continue;
-      const start_time = get(i, 'start_time');
+      const start_time = get(i, 'final_start_time');
       if (!start_time) continue;
       const smsMsg = `${nick_name} 您参加的赛事: ${match_name} 将于 ${start_time} 开始, 请您在网站或小程序中进行确认,以避免主办方将您误认为拒赛而采用其他选手代替`;
       // TODO: 发短信
@@ -505,6 +505,7 @@ export class MatchExtController implements BaseController {
      * 组织内容:
      *  赛事报名表:
      *    reg.final_order_no =>'0'
+     * id,order_no
      */
     await this.service.checkMatchExtStatus(match_id, '5');
     const { data: list } = await this.matchRegService.query({ match_id, ext_status: '5', final_confirm: '0' }, { order: { final_order_no: 'ASC' } });

src/controller/match/matchRegistration.controller.ts

@@ -264,12 +264,12 @@ export class MatchRegistrationController implements BaseController {
         const type = get(is, 'type');
         const val = get(is, 'reply', '');
         // 0:单选;2:下拉;3:单行文本;4:多行文本
-        if (type === '0' || type === '2' || type === '3' || type === '4') {
+        if (type === '0' || type === '2' || type === '3' || type === '4' || type === '5') {
           item.push(val);
         } else if (type === '1') {
           // 1:多选
           item.push(val.join(';'));
-        } else if (type === '5' || type === '7') {
+        } else if (type === '6' || type === '8') {
           // 5:图片/文件;7:附件模板
           // 1.需要确定单元格位置,生成超链接格式,1个单元格只能有一个超链接
           const sid = get(is, 'sid');
@@ -293,7 +293,7 @@ export class MatchRegistrationController implements BaseController {
           //     tooltip: uri
           //   }
           // }
-        } else if (type === '6') {
+        } else if (type === '7') {
           // 6:数组,将sid外的 key,value拼成字符串作为内容
           if (!isArray(val)) continue;
           const midArr = [];