code sync

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);
@@ -293,6 +294,12 @@ class Rpt_Data_Extractor {
             if (rawDataObj.SummaryAuditDetail) {
                 setupFunc($PROJECT.SUMMARY, `SummaryAuditDetail`, {"data": rawDataObj.SummaryAuditDetail});
             }
+            if (rawDataObj.SummaryGljAudit) {
+                setupMainFunc($PROJECT.SUMMARY, `SummaryGljAudit`, rawDataObj.SummaryGljAudit);
+            }
+            if (rawDataObj.SummaryGljAuditDetail) {
+                setupFunc($PROJECT.SUMMARY, `SummaryGljAuditDetail`, {"data": rawDataObj.SummaryGljAuditDetail});
+            }
         }
         //综合费率
         let feeRate = getModuleDataByKey(rawDataObj.prjData, "feeRate");
@@ -597,7 +604,8 @@ function filterData(sourceData, handleCfg, prjData) {
         let rst = false;
         if (arr.length > 0) {
             for (let arrItem of arr) {
-                if (arrItem[key]) {
+                if (arrItem[key] !== undefined) {
+                    // 可以为null值去判断
                     rst = private_chkVal(arrItem[key], compVal, compStr);
                 }
                 if (rst) {
@@ -1297,6 +1305,7 @@ function setupFunc(obj, prop, ownRawObj) {
     obj[prop]["myOwnOrgRawDataObj"] = ownRawObj.data;
     obj[prop].getProperty = ext_getProperty;
     obj[prop].getGljFreightProperty = ext_getGljFreightProperty;
+    obj[prop].getGljOriginalProperty = ext_getGljOriginalProperty;
     obj[prop].getPropertyByRefId = ext_getPropertyByRefId;
     obj[prop].getFee = ext_getFee;
     obj[prop].getPropertyByForeignId = ext_getPropertyByForeignId;
@@ -1532,6 +1541,18 @@ function ext_getGljFreightProperty(propKey) {
     return rst;
 }
 
+function ext_getGljOriginalProperty(propKey) {
+    let rst = [], parentObj = this;
+    let dtObj = parentObj["myOwnRawDataObj"];
+    if (propKey && dtObj) {
+        for (let dItem of getActDataArr(dtObj, "originalList")) {
+            let doc = (dItem._doc === null || dItem._doc === undefined)?dItem:dItem._doc;
+            pri_push_property(propKey, doc, rst);
+        }
+    }
+    return rst;
+}
+
 function ext_getProperty(propKey) {
     let rst = [], parentObj = this;
     let dtObj = parentObj["myOwnRawDataObj"];