报表查询审批人数据问题

app/lib/rpt_data_analysis.js

@@ -1400,8 +1400,6 @@ const stageSelectConverse = {
         if (!gsDefine || !gsDefine.enable || !gsDefine.setting || gsDefine.setting === '') return;
         const gsCustom = csRela.cDefine ? csRela.cDefine.stage_select : null;
         if (gsCustom) {
-            console.log(gsCustom[0]);
-            console.log(data.mem_stage_sum_bills[0]);
             for (const t of options.table) {
                 switch (t) {
                     case 'mem_stage_sum_bills':

app/service/report.js

@@ -85,7 +85,7 @@ module.exports = app => {
                             runnableKey.push(filter);
                             break;
                         case 'stage_audit':
-                            runnableRst.push(service.reportMemory.getStageAuditors(params.tender_id, params.stage_id), memFieldKeys[filter]);
+                            runnableRst.push(service.reportMemory.getStageAuditors(params.tender_id, params.stage_id));
                             runnableKey.push(filter);
                             break;
                         case 'mem_stage_bills':
@@ -115,6 +115,7 @@ module.exports = app => {
                         case 'change_audit_list':
                             runnableRst.push(service.changeAuditList.getChangeAuditBills(params.tender_id)); // 获取所有审核通过的变更清单
                             runnableKey.push(filter);
+                            console.log(filter);
                             break;
                         case 'mem_stage_jgcl':
                             runnableRst.push(service.reportMemory.getStageJgcl(params.tender_id, params.stage_id, memFieldKeys[filter]));
@@ -183,22 +184,10 @@ module.exports = app => {
             for (let idx = 0; idx < runnableKey.length; idx++) {
                 rst[runnableKey[idx]] = queryRst[idx];
             }
+            this.ctx.helper.saveBufferFile(JSON.stringify(queryRst, '', '\t'), this.ctx.app.baseDir + '/reportDataOrg.json');
+            this.ctx.helper.saveBufferFile(JSON.stringify(rst, '', '\t'), this.ctx.app.baseDir + '/reportData.json');
             for (const filter of filters) {
                 switch (filter) {
-                    // test模式下，上方Promise.all的方式，取不到以下3个数据
-                    case 'ledger_cooperation':
-                        rst[filter] = await service.ledgerCooperation.getValidData(params.tender_id);
-                        break;
-                    case 'stage_audit':
-                        rst[filter] = await service.reportMemory.getStageAuditors(params.tender_id, params.stage_id), memFieldKeys[filter];
-                        break;
-                    case 'mem_stage_im_zl':
-                        rst[filter] = await service.reportMemory.getStageImZlData(params.tender_id, params.stage_id, memFieldKeys[filter]);
-                        break;
-                    case 'mem_sign_select':
-                        rst[filter] = await service.reportMemory.getSignSelect(params.tender_id, params.stage_id, customSelect);
-                        break;
-
                     case 'mem_stage_im_tz':
                         rst[filter] = await service.reportMemory.getStageImTzData(params.tender_id, params.stage_id, memFieldKeys[filter]);
                         break;

app/service/report_memory.js

@@ -994,7 +994,6 @@ module.exports = app => {
                 end_time: auditors && auditors.length > 0 ? auditors[0].begin_time : null,
                 sort: 0,
             }, ...auditors];
-            console.log(auditors);
             return result;
         }
 

app/service/stage_audit.js

@@ -1325,5 +1325,4 @@ module.exports = app => {
     }
 
     return StageAudit;
-    return StageAudit;
 };

builder_report_index_define.js

@@ -744,7 +744,6 @@ const stage_im_tz = {
         { name: '审批意见2', field: 'co_opinion2', type: dataType.time },
         { name: '审批意见3', field: 'co_opinion3', type: dataType.time },
         { name: '审批意见4', field: 'co_opinion4', type: dataType.time },
-
     ],
 };
 const stage_im_tz_bills = {