BUG#2753

modules/reports/controllers/rpt_controller.js

@@ -506,24 +506,24 @@ function getSummaryComboPages(req, user_id, prjIds, billsSummaryRpt_ids, gljSumm
         }
         if (billRpts.length > 0) {
             rptTplDataFacade.getBudgetSummayDatas(prjIds, req.session.sessionCompilation.overWriteUrl).then(function(summaryRawDataRst) {
-                let savedBillsData = [];
+                // let savedBillsData = [];
                 try {
-                    Object.assign(savedBillsData, summaryRawDataRst.SummaryAuditDetail);
+                    // Object.assign(savedBillsData, summaryRawDataRst.SummaryAuditDetail);
                     for (let idx = 0; idx < billRpts.length; idx++) {
                         pri_setup_rpt_tpl_data(billRpts[idx], summaryRawDataRst);
-                        if (idx < billRpts.length - 1) {
-                            Object.assign(summaryRawDataRst.SummaryAuditDetail, savedBillsData);
-                        }
+                        // if (idx < billRpts.length - 1) {
+                        //     Object.assign(summaryRawDataRst.SummaryAuditDetail, savedBillsData);
+                        // }
                     }
                     if (gljRpts && gljRpts.length > 0) {
                         rptTplDataFacade.getGLJSummayDatas(prjIds).then(function(summaryRawDataRst) {
-                            let savedBillsData = [];
-                            Object.assign(savedBillsData, summaryRawDataRst.SummaryAuditDetail);
+                            // let savedBillsData = [];
+                            // Object.assign(savedBillsData, summaryRawDataRst.SummaryAuditDetail);
                             for (let idx = 0; idx < gljRpts.length; idx++) {
                                 pri_setup_rpt_tpl_data(gljRpts[idx], summaryRawDataRst);
-                                if (idx < gljRpts.length - 1) {
-                                    Object.assign(summaryRawDataRst.SummaryAuditDetail, savedBillsData);
-                                }
+                                // if (idx < gljRpts.length - 1) {
+                                //     Object.assign(summaryRawDataRst.SummaryAuditDetail, savedBillsData);
+                                // }
                             }
                             cb(null, pageRstArr);
                         });
@@ -537,12 +537,13 @@ function getSummaryComboPages(req, user_id, prjIds, billsSummaryRpt_ids, gljSumm
             });
         } else if (gljRpts.length > 0) {
             rptTplDataFacade.getGLJSummayDatas(prjIds).then(function(summaryRawDataRst) {
-                let savedBillsData = [];
-                Object.assign(savedBillsData, summaryRawDataRst.SummaryAuditDetail);
+                // let savedBillsData = [];
+                // Object.assign(savedBillsData, summaryRawDataRst.SummaryAuditDetail);
+                // 养护工料机汇总不用考虑back up问题。模板需要自觉一点，不要修改数据！！！
                 for (let idx = 0; idx < gljRpts.length; idx++) {
                     pri_setup_rpt_tpl_data(gljRpts[idx], summaryRawDataRst);
                     if (idx < gljRpts.length - 1) {
-                        Object.assign(summaryRawDataRst.SummaryAuditDetail, savedBillsData);
+                        // Object.assign(summaryRawDataRst.SummaryAuditDetail, savedBillsData);
                     }
                 }
                 cb(null, pageRstArr);
@@ -923,6 +924,10 @@ module.exports = {
                 }
             });
         } else if ((rpt_bill_tpl_ids && rpt_bill_tpl_ids.length > 0) || (rpt_glj_tpl_ids && rpt_glj_tpl_ids.length > 0)) {
+            // console.log('rpt_bill_tpl_ids:');
+            // console.log(rpt_bill_tpl_ids);
+            // console.log('rpt_glj_tpl_ids:');
+            // console.log(rpt_glj_tpl_ids);
             getSummaryComboPages(req, user_id, prjIds, rpt_bill_tpl_ids, rpt_glj_tpl_ids, pageSize, orientation, customizeCfg, option, JV.OUTPUT_TYPE_NORMAL, function (err, rptSumPageRstArray) {
                 let parallelFunctions = [];
                 pri_Add_Parallel_Functions(parallelFunctions, rptSumPageRstArray, sum_rpt_names, err);