|
@@ -693,18 +693,11 @@ async function getMultiRptsCommon(ctx, params, outputType, baseDir) {
|
|
|
rptTpls[rtIdx] = JSON.parse(rptTpls[rtIdx].rpt_content);
|
|
|
rptTpls[rtIdx].id = id;
|
|
|
}
|
|
|
+
|
|
|
const rptDataUtil = new rptDataExtractor();
|
|
|
const filterTables = [];
|
|
|
const memFieldKeys = {};
|
|
|
- if (rptTpls.length > 1) {
|
|
|
- rptTpls.sort(function(item1, item2) {
|
|
|
- const i1 = (item1._doc) ? item1._doc : item1;
|
|
|
- const i2 = (item2._doc) ? item2._doc : item2;
|
|
|
- const ID1 = params.rpt_ids.indexOf(i1[JV.PROP_ID]);
|
|
|
- const ID2 = params.rpt_ids.indexOf(i2[JV.PROP_ID]);
|
|
|
- return ID1 - ID2;
|
|
|
- });
|
|
|
- }
|
|
|
+
|
|
|
for (const rptTpl of rptTpls) {
|
|
|
rptDataUtil.initialize(rptTpl);
|
|
|
const filter = rptDataUtil.getDataRequestFilter();
|