Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/controller/report_controller.js

@@ -574,6 +574,11 @@ module.exports = app => {
                 stgAudit = await ctx.service.paymentDetailAudit.getAuditors(params.detail_id, params.stage_times);
                 stgAuditForOrg = await ctx.service.paymentDetailAudit.getAuditors(params.detail_id, 1);
                 stageFlow = await ctx.service.paymentDetailAudit.getAuditorsWithOwner(params.detail_id);
+                const paymentDetailList = await ctx.service.paymentDetail.getDetail(params.detail_id);
+                if (paymentDetailList && paymentDetailList.length > 0) {
+                    const payment = paymentDetailList[0];
+                    stageList.push({ id: params.stage_id, user_id: payment.uid, status: payment.status });
+                }
             }
 
             stageFlow.forEach(x => {
@@ -679,6 +684,11 @@ module.exports = app => {
                 stageList = await ctx.service.stage.getValidStagesShort(params.tender_id);
             } else {
                 stgAudit = await ctx.service.paymentDetailAudit.getAuditors(params.detail_id);
+                const paymentDetailList = await ctx.service.paymentDetail.getDetail(params.detail_id);
+                if (paymentDetailList && paymentDetailList.length > 0) {
+                    const payment = paymentDetailList[0];
+                    stageList.push({ id: params.stage_id, user_id: payment.uid, status: payment.status });
+                }
             }
 
             // const stgAudit = await ctx.service.stageAudit.getStageAudit(params.stage_id, params.stage_times);