Browse Source

报表数据获取,独立

MaiXinRong 5 years ago
parent
commit
927246d618
2 changed files with 6 additions and 2 deletions
  1. 2 2
      app/controller/report_controller.js
  2. 4 0
      app/service/report.js

+ 2 - 2
app/controller/report_controller.js

@@ -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. 这里只用一份数据,根据实际应用情况,先备份

+ 4 - 0
app/service/report.js

@@ -79,6 +79,10 @@ module.exports = app => {
                             runnableRst.push(service.reportMemory.getStagePosData(params.tender_id, params.stage_id, memFieldKeys[filter]));
                             runnableKey.push(filter);
                             break;
+                        case 'mem_stage_bills_compare':
+                            runnableRst.push(service.reportMemory.getStageBillsCompareData(params.tender_id, params.stage_id, memFieldKeys[filter]));
+                            runnableKey.push(filter);
+                            break;
                         case 'change':
                             runnableRst.push(service.change.getListByStatus(params.tender_id, 3)); // 获取所有审核通过的变更主信息
                             runnableKey.push(filter);