Merge branch 'master' of http://192.168.1.41:3000/maixinrong/Calculation

Conflicts:
	app/controller/report_controller.js

app/controller/report_controller.js

@@ -341,6 +341,117 @@ module.exports = app => {
     return ReportController;
 };
 
+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;
+        }
+    }
+}
+async function getReportData(ctx, params, filters, memFieldKeys) {
+    const rst = {};
+    const runnableRst = [];
+    const runnableKey = []; // 这个配合runnableRst用，未来考虑并行查询优化
+    // console.log('params');
+    // console.log(params);
+    // console.log('memFieldKeys');
+    // console.log(memFieldKeys);
+    for (const filter of filters) {
+        if (runnableKey.indexOf(filter) < 0) {
+            switch (filter) {
+                case 'project' :
+                    runnableRst.push(ctx.service.project.getProjectById(params.project_id));
+                    runnableKey.push('project');
+                    break;
+                case 'tender_info' :
+                    runnableRst.push(ctx.service.tenderInfo.getTenderInfo(params.tender_id));
+                    runnableKey.push('tender_info');
+                    break;
+                case 'ledger' :
+                    runnableRst.push(ctx.service.ledger.getData(params.tender_id, 0));
+                    runnableKey.push('ledger');
+                    break;
+                case 'deal_bills' :
+                    // console.log('has push deal_bills! ' + params.tender_id);
+                    runnableRst.push(ctx.service.dealBills.getDataByTenderId(params.tender_id));
+                    runnableKey.push('deal_bills');
+                    break;
+                case 'stage_bills':
+                    runnableRst.push(ctx.service.stageBills.getLastestStageData(params.tender_id, params.stage_id));
+                    runnableKey.push('stage_bills');
+                    break;
+                case 'stage_bills_final':
+                    await checkStg(ctx, params);
+                    // 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, ctx.stage.order));
+                    runnableKey.push('stage_bills_final');
+                    break;
+                case 'stage':
+                    runnableRst.push(ctx.service.stage.getStageById(params.stage_id));
+                    runnableKey.push('stage');
+                    break;
+                case 'stage_pay':
+                    await checkStg(ctx, params);
+                    // 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, ctx.stage.times, ctx.stage.order));
+                    runnableKey.push('stage_pay');
+                    break;
+                case 'mem_stage_im_zl':
+                    // memFieldKeys[filter]
+                    runnableRst.push(ctx.service.reportMemory.getStageImZlData(params.tender_id, params.stage_id, memFieldKeys[filter]));
+                    runnableKey.push(filter);
+                    break;
+                case 'mem_month_progress':
+                    runnableRst.push(ctx.service.reportMemory.getMonthProgress(params.tender_id, memFieldKeys[filter]));
+                    runnableKey.push(filter);
+                    break;
+                case 'mem_stage_bills':
+                    runnableRst.push(ctx.service.reportMemory.getStageBillsData(params.tender_id, params.stage_id, memFieldKeys[filter]));
+                    runnableKey.push(filter);
+                    break;
+                case 'mem_stage_pos':
+                    runnableRst.push(ctx.service.reportMemory.getStagePosData(params.tender_id, params.stage_id, memFieldKeys[filter]));
+                    runnableKey.push(filter);
+                    break;
+                case 'mem_stage_bills_compare':
+                    runnableRst.push(ctx.service.reportMemory.getStagePosData(params.tender_id, params.stage_id, memFieldKeys[filter]));
+                    runnableKey.push(filter);
+                    break;
+                case 'change':
+                    runnableRst.push(ctx.service.change.getListByStatus(params.tender_id, 3)); // 获取所有审核通过的变更主信息
+                    runnableKey.push('change');
+                    break;
+                case 'change_audit_list':
+                    runnableRst.push(ctx.service.changeAuditList.getChangeAuditBills(params.tender_id)); // 获取所有审核通过的变更清单
+                    runnableKey.push('change_audit_list');
+                    break;
+                default:
+                    break;
+            }
+        }
+    }
+    const queryRst = await Promise.all(runnableRst);
+    for (let idx = 0; idx < runnableKey.length; idx++) {
+        rst[runnableKey[idx]] = queryRst[idx];
+    }
+    for (const filter of filters) {
+        switch (filter) {
+            case 'mem_stage_im_tz':
+                rst[filter] = await ctx.service.reportMemory.getStageImTzData(params.tender_id, params.stage_id, memFieldKeys[filter]);
+                break;
+            case 'mem_stage_im_tz_bills':
+                rst[filter] = await ctx.service.reportMemory.getStageImTzBillsData(params.tender_id, params.stage_id, memFieldKeys[filter]);
+                break;
+            default:
+                break;
+        }
+    }
+    return rst;
+}
+
 async function getAllPagesCommon(ctx, rptTpl, params, option, outputType, baseDir) {
     // let rptTpl = null;
     const rptDataUtil = new rptDataExtractor();

app/reports/util/rpt_calculation_data_util.js

@@ -784,7 +784,7 @@ function assembleFields(fieldList, rstDataArr, $PROJECT) {
                         vrst.splice(0,1);
                     }
                 } else if (field.Precision.type === 'flexible') {
-                    console.log('field.Precision.flexibleMapExpression: ' + field.Precision.flexibleMapExpression);
+                    // console.log('field.Precision.flexibleMapExpression: ' + field.Precision.flexibleMapExpression);
                     const vrst = eval(field.Precision.flexibleMapExpression);
                     if (vrst && vrst.length === 1) {
                         const tmpFlexObj = []; // 计量的动态精度对象与建筑/养护有所不同，需要重新生成

app/service/report.js

@@ -126,4 +126,17 @@ module.exports = app => {
     }
 
     return Report;
-};
+};
+
+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;
+            // 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
+        }
+    }
+}

app/service/report_memory.js

@@ -509,6 +509,26 @@ module.exports = app => {
             //     'chapter',                                                                                              //1
             // ]);
         }
+
+        async getStagePayData(tid, sid, fields) {
+            await this.ctx.service.tender.checkTender(tid);
+            await this.ctx.service.stage.checkStage(sid);
+
+            const dealPay = await this.ctx.service.stagePay.getStagePays(ctx.stage);
+
+            if (ctx.stage.order > 1) {
+                renderData.pre = await ctx.service.stageBillsFinal.getSumTotalPrice(ctx.stage.tid, ctx.stage.order - 1);
+                renderData.pre.gather_tp = ctx.helper.add(renderData.pre.contract_tp, renderData.pre.qc_tp);
+            } else {
+                renderData.pre = {contract_tp: null, qc_tp: null, gather_tp: null};
+            }
+            if (!this.ctx.stage.readOnly && this.ctx.stage.check_calc) {
+                // 计算 本期金额
+                const PayCalculator = require('../lib/pay_calc');
+                const payCalculator = new PayCalculator(this.ctx, this.ctx.stage, this.ctx.tender.info);
+                await payCalculator.calculateAll(dealPay);
+            }
+        }
     }
 
     return ReportMemory;