BUG #3411 03汇总表 不同计算方式的处理

modules/main/facade/project_facade.js

@@ -370,6 +370,9 @@ function getReportData(nameList, items, prjTypeNames, compilationScopes, decimal
         if (c.children.length > 0) {
           tbill.billsTtlPrice = sumChildren;
           tbill['技术经济综合指标'] = (tbill.billsTtlAmt && parseFloat(tbill.billsTtlAmt) !== 0) ? scMathUtil.roundForObj(tbill.billsTtlPrice / tbill.billsTtlAmt, 2) : scMathUtil.roundForObj(tbill.billsTtlPrice, 2);
+        } else if (c.calcBase && c.calcBase.indexOf('@') >= 0) {
+          // 说明：在实际中，发现清单‘第一、二、三部分费用合计’没有再计算，这样会造成问题
+          recalcTotalItem(tbill, arr, isProgressiveType, progressiveInterval);
         }
         if (level > 0) temTotalPrice = scMathUtil.roundForObj(tbill.billsTtlPrice + temTotalPrice, decimal.bills.totalPrice);
       }

modules/reports/controllers/rpt_controller.js

@@ -453,7 +453,7 @@ async function getBillsSummaryReportPages(req, user_id, prjIds, rpt_id, pageSize
     rptDataUtil.initialize((rptTpl._doc)?rptTpl._doc:rptTpl);
     try {
         let tplData = rptDataUtil.assembleData(summaryRawDataRst);
-        // fsUtil.writeObjToFile(summaryRawDataRst, "D:/GitHome/temp/billsSummaryRawDataRstRawData.jsp");
+        // fsUtil.writeObjToFile(summaryRawDataRst, "D:/GitHome/Temp/billsSummaryRawDataRstRawData.jsp");
         let printCom = JpcEx.createNew();
         if (pageSize) rptTpl[JV.NODE_MAIN_INFO][JV.NODE_PAGE_INFO][JV.PROP_PAGE_SIZE] = pageSize;
         //console.log("orientation: " + (orientation === 'null'));