|
@@ -455,7 +455,7 @@ async function getAllPagesCommon(ctx, rptTpl, params, option, outputType, baseDi
|
|
|
// console.log(rptTpl);
|
|
|
const filter = rptDataUtil.getDataRequestFilter();
|
|
|
// console.log(filter.tables);
|
|
|
- const rawDataObj = await getReportData(ctx, params, filter.tables, filter.memFieldKeys);
|
|
|
+ const rawDataObj = await ctx.service.report.getReportData(params, filter.tables, filter.memFieldKeys);
|
|
|
// console.log(rawDataObj);
|
|
|
try {
|
|
|
const printCom = JpcEx.createNew();
|
|
@@ -543,7 +543,7 @@ async function getMultiRptsCommon(ctx, params, outputType, baseDir) {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- const rawDataObj = await getReportData(ctx, params, filterTables, memFieldKeys);
|
|
|
+ const rawDataObj = await ctx.service.report.getReportData(params, filterTables, memFieldKeys);
|
|
|
try {
|
|
|
const rptPageRstArray = [];
|
|
|
// 1. 这里只用一份数据,根据实际应用情况,先备份
|