Merge branch 'master' of http://192.168.1.41:3000/maixinrong/Calculation

app/controller/report_controller.js

@@ -650,11 +650,11 @@ async function getMultiRptsCommon(ctx, params, outputType, baseDir) {
             const dftOption = params.option || JV.PAGING_OPTION_NORMAL;
 
             printCom.initialize(rptTpl);
-            const customDefine = await ctx.service.rptCustomDefine.getDataByCondition({
+            const cdDefine = await ctx.service.rptCustomDefine.getDataByCondition({
                 tid: params.tender_id, sid: params.stage_id, rid: params.rpt_tpl_id
             });
             // console.log(rptTpl);
-            printCom.analyzeData(ctx.helper, rptTpl, tplData, defProperties, dftOption, outputType, customDefine);
+            printCom.analyzeData(ctx.helper, rptTpl, tplData, defProperties, dftOption, outputType, cdDefine);
             const maxPages = printCom.totalPages;
             let pageRst = null;
             // console.log(maxPages);