fix

server/duibats/src/controller/awards.controller.ts

-/** @format */
-
 import { CODE_TYPES, EIGHT_HOURS,PRIZE_TYPE,SHIP_STATUS } from './../constants'
 import { services, paramsCheck } from '../decorator'
 
@@ -52,17 +50,17 @@ export default class BaseController {
   async getAwardsList(context: Context, { session }, [awardsService]: [AwardsService]) {
     let { cloud } = context
     let {
-      activityId = '',
-      title = '',
-      pageNo = 1,
-      pageSize = 10,
-      prizeId = null,
-      userNick = '',
-      prizeType = null,
-      prizeDataType = null,
-      shipStatus = null,
-      startTime = null,
-      endTime = null,
+      activityId,
+      title,
+      prizeId,
+      userNick,
+      startTime,
+      endTime,
+      shipStatus,
+      prizeType,
+      prizeDataType,
+      pageNo,
+      pageSize
     } = context.data
     // 获取活动中奖列表
     let awardList = await awardsService.getAwardListByActivityId({
@@ -107,20 +105,30 @@ export default class BaseController {
     }
     console.log(list, '导出报表')
     let xlsxData = [
-      // [
-      //   <% for(var i = 0; i < winnersExportData.length; ++i) {%>
-      //     <%- `${winnersExportData[i]},`  %>
-      //   <% } %>
-      // ]
+      [
+        '奖品编号',
+        '用户id',
+        '中奖时间',
+        '地址填写时间',
+        '奖品类型',
+        '发奖来源',
+        '奖品名称',
+        '收货人',
+        '联系方式',
+        '收货地址',
+        '发货状态',
+        '物流公司',
+        '物流单号'
+      ]
     ]
     res.forEach((v, index, arr) => {
       let prizeDataType = '/';
       let prizeType = '/';
       let shipTxt = '/';
       if (v) {
-        // <% for(var i = 0; i < formatPrize.length; ++i) {%>
-        //   <%- `if (v.prizeDataType == ${formatPrize[i].prizeDataType}) prizeDataType = '${formatPrize[i].prizeSource}'`
-        // %><% } %> 
+        <% for(var i = 0; i < formatPrize.length; ++i) {%>
+          <%- `if (v.prizeDataType == ${formatPrize[i].prizeDataType}) prizeDataType = '${formatPrize[i].name}'`
+        %><% } %> 
         // if (v.prizeDataType == 1) prizeDataType = '关卡获得'
         // if (v.prizeDataType == 2) prizeDataType = '排行榜'
         // if (v.prizeDataType == 3) prizeDataType = '分享获得'
@@ -136,19 +144,19 @@ export default class BaseController {
         if (v.type == PRIZE_TYPE.THANK) prizeType = '谢谢参与'
       }
       xlsxData.push([
-        // <%- winnersExportData.includes('奖品编号') && `v._id,` %>
-        // <%- winnersExportData.includes('用户id') && `v.userNick,` %>
-        // <%- winnersExportData.includes('中奖时间') && `v.createTime ? formatTime(new Date(v.createTime + EIGHT_HOURS)) : '',` %>
-        // <%- winnersExportData.includes('地址填写时间') && `v.type == 3 ? (v.receiveTime ? formatTime(new Date(v.receiveTime + EIGHT_HOURS)) : '暂未填写') : '/',` %>
-        // <%- winnersExportData.includes('奖品类型') && `prizeType` %>
-        // <%- winnersExportData.includes('发奖来源') && `prizeDataType,` %>
-        // <%- winnersExportData.includes('奖品名称') && `v.type == 2 ? `${v.credits || 0}积分` : v.name || '',` %>
-        // <%- winnersExportData.includes('收货人') && `v.type == 3 ? v.receiveName || '' : '/',` %>
-        // <%- winnersExportData.includes('联系方式') && `v.type == 3 ? (v.phone ? v.phone + '' : '暂未填写') : '/',` %>
-        // <%- winnersExportData.includes('收货地址') && `v.type == 3 ? v.province + v.city + v.area + v.streetName + v.addressDetail || '暂未填写' : '/',` %>
-        // <%- winnersExportData.includes('发货地址') && `shipTxt,` %>
-        // <%- winnersExportData.includes('物流公司') && `v.type == 3 ? v.shipCompany || '' : '/',` %>
-        // <%- winnersExportData.includes('物流单号') && `v.type == 3 ? (v.shipNum ? v.shipNum + '' : '') : '/'` %>
+        v._id,
+        v.userNick,
+        v.createTime ? formatTime(new Date(v.createTime + EIGHT_HOURS)) : '',
+        v.type == 3 ? (v.receiveTime ? formatTime(new Date(v.receiveTime + EIGHT_HOURS)) : '暂未填写') : '/',
+        prizeType,
+        prizeDataType,
+        v.type == 2 ? `${v.credits || 0}积分` : v.name || '',
+        v.type == 3 ? v.receiveName || '' : '/',
+        v.type == 3 ? (v.phone ? v.phone + '' : '暂未填写') : '/',
+        v.type == 3 ? v.province + v.city + v.area + v.streetName + v.addressDetail || '暂未填写' : '/',
+        shipTxt,
+        v.type == 3 ? v.shipCompany || '' : '/',
+        v.type == 3 ? (v.shipNum ? v.shipNum + '' : '') : '/'
       ])
     })
     let buffer = xlsx.build([