工料机汇总接口调整

modules/reports/controllers/rpt_controller.js

@@ -553,6 +553,7 @@ function getGljSummaryReportPages(user_id, prjIds, rpt_id, pageSize, orientation
             let rptDataUtil = new rptDataExtractor();
             rptDataUtil.initialize((rptTpl._doc)?rptTpl._doc:rptTpl);
             try {
+                fsUtil.writeObjToFile(summaryRawDataRst, "D:/GitHome/temp/summaryRawDataRstRawData.jsp");
                 let tplData = rptDataUtil.assembleData(summaryRawDataRst);
                 let printCom = JpcEx.createNew();
                 if (pageSize) rptTpl[JV.NODE_MAIN_INFO][JV.NODE_PAGE_INFO][JV.PROP_PAGE_SIZE] = pageSize;

modules/reports/util/rpt_yanghu_data_util.js

@@ -273,7 +273,8 @@ class Rpt_Data_Extractor {
         }
         //还有汇总的...
         if (rawDataObj.hasOwnProperty(`Construct`) || rawDataObj.hasOwnProperty(`ConstructDetail`) || rawDataObj.hasOwnProperty(`Segment`) || rawDataObj.hasOwnProperty(`SegmentDetail`)
-            || rawDataObj.hasOwnProperty(`SummaryAudit`) || rawDataObj.hasOwnProperty(`SummaryAuditDetail`)) {
+            || rawDataObj.hasOwnProperty(`SummaryAudit`) || rawDataObj.hasOwnProperty(`SummaryAuditDetail`)
+            || rawDataObj.hasOwnProperty(`SummaryGljAudit`) || rawDataObj.hasOwnProperty(`SummaryGljAuditDetail`)) {
             $PROJECT.SUMMARY = {};
             if (rawDataObj.Construct) {
                 setupMainFunc($PROJECT.SUMMARY, `Construct`, rawDataObj.Construct);