code sync

app/controller/report_controller.js

@@ -383,9 +383,9 @@ async function getReportData(ctx, params, filters, memFieldKeys) {
                     break;
                 case 'stage_bills_final':
                     await checkStg(ctx, params);
-                    const stage = ctx.stage;
+                    // const stage = ctx.stage;
                     // runnableRst.push(ctx.service.stageBillsFinal.getFinalDataEx(params.tender_id, params.stage_order));
-                    runnableRst.push(ctx.service.stageBillsFinal.getFinalDataEx(params.tender_id, stage.order));
+                    runnableRst.push(ctx.service.stageBillsFinal.getFinalDataEx(params.tender_id, ctx.stage.order));
                     runnableKey.push('stage_bills_final');
                     break;
                 case 'stage':
@@ -394,9 +394,9 @@ async function getReportData(ctx, params, filters, memFieldKeys) {
                     break;
                 case 'stage_pay':
                     await checkStg(ctx, params);
-                    const stage2 = ctx.stage;
+                    // const stage2 = ctx.stage;
                     // runnableRst.push(ctx.service.stagePay.getAuditorStageData(params.stage_id, params.stage_times, params.stage_order));
-                    runnableRst.push(ctx.service.stagePay.getAuditorStageData(params.stage_id, stage2.times, stage2.order));
+                    runnableRst.push(ctx.service.stagePay.getAuditorStageData(params.stage_id, ctx.stage.times, ctx.stage.order));
                     runnableKey.push('stage_pay');
                     break;
                 case 'mem_stage_im_zl':

app/service/report.js

@@ -123,7 +123,11 @@ async function checkStg(ctx, params) {
     if (ctx.stage === null || ctx.stage === undefined || parseInt(ctx.stage.id) !== parseInt(params.stage_id)) {
         await ctx.service.stage.checkStage(params.stage_id);
         if (ctx.stage) {
-            params.stage_order = ctx.stage.curOrder;
+            // params.stage_order = ctx.stage.curOrder;
+            // console.log('ctx.stage.curOrder: ' + ctx.stage.curOrder);
+            // console.log('ctx.stage.order: ' + ctx.stage.order);
+            params.stage_order = ctx.stage.order; // 经过check stage后，取新的order
+            params.stage_times = ctx.stage.times; // 经过check stage后，取新的times
         }
     }
 }