code tune

modules/reports/controllers/rpt_controller.js

@@ -378,7 +378,7 @@ function getMultiRptsCommon(user_id, prj_id, rpt_ids, pageSize, orientation, cus
                     }
                     //2. 一个一个模板创建数据
                     for (let tplIdx = 0; tplIdx < rptTpls.length; tplIdx++) {
-                        console.log('tplIdx: ' + tplIdx);
+                        // console.log('tplIdx: ' + tplIdx);
                         let rptTpl = (rptTpls[tplIdx]._doc)?rptTpls[tplIdx]._doc:rptTpls[tplIdx];
                         rptDataUtil.initialize(rptTpl);
                         let tplData = rptDataUtil.assembleData(rawDataObj);

modules/reports/rpt_component/helper/jpc_helper_common_output.js

@@ -6,9 +6,9 @@ let JpcCommonOutputHelper = {
     createCommonOutputWithoutDecorate: function (node, value, forceCombine) {
         let me = this, rst = {};
         //1. font/style/control
-        rst[JV.PROP_FONT] = node[[JV.PROP_FONT]];
-        rst[JV.PROP_CONTROL] = node[[JV.PROP_CONTROL]];
-        rst[JV.PROP_STYLE] = node[[JV.PROP_STYLE]];
+        rst[JV.PROP_FONT] = node[JV.PROP_FONT];
+        rst[JV.PROP_CONTROL] = node[JV.PROP_CONTROL];
+        rst[JV.PROP_STYLE] = node[JV.PROP_STYLE];
         //2. value
         rst[JV.PROP_VALUE] = value;
         me.formatCell(node[JV.PROP_FORMAT], rst);
@@ -28,9 +28,9 @@ let JpcCommonOutputHelper = {
     createCommonOutput: function (node, value, controls) {
         let me = this, rst = {};
         //1. font/style/control
-        rst[JV.PROP_FONT] = node[[JV.PROP_FONT]];
-        rst[JV.PROP_CONTROL] = node[[JV.PROP_CONTROL]];
-        rst[JV.PROP_STYLE] = node[[JV.PROP_STYLE]];
+        rst[JV.PROP_FONT] = node[JV.PROP_FONT];
+        rst[JV.PROP_CONTROL] = node[JV.PROP_CONTROL];
+        rst[JV.PROP_STYLE] = node[JV.PROP_STYLE];
         //2. value
         rst[JV.PROP_VALUE] = value;
         JpcFieldHelper.decorateValue(rst, controls);

modules/reports/util/rpt_yanghu_data_util.js

@@ -329,9 +329,11 @@ class Rpt_Data_Extractor {
         let feeRate = getModuleDataByKey(rawDataObj.prjData, "feeRate");
         if (feeRate) {
             //把综合费率树结构数据拉扁
+            // fsUtil.writeObjToFile(feeRate, "D:/GitHome/temp/feeRateObj.jsp");
             // console.log(feeRate);
             let newFeeRates = setupFeeRate(feeRate.data._doc);
             // console.log(newFeeRates);
+            // fsUtil.writeObjToFile(newFeeRates, "D:/GitHome/temp/newFeeRateObj.js");
             feeRate.data._doc.rates = newFeeRates;
         }
 
@@ -346,9 +348,9 @@ class Rpt_Data_Extractor {
                         filterData(srcData, preHandle, rawDataObj.prjData);
                         break;
                     case JV.PROP_HANDLE_TYPE_SUM:
-                        // fsUtil.writeObjToFile(rawDataObj, "D:/GitHome/ConstructionCost/tmp/insertedRawDataData10.jsp");
+                        // fsUtil.writeObjToFile(rawDataObj, "D:/GitHome/temp/insertedRawDataData10.jsp");
                         summaryData(srcData, preHandle, rawDataObj.prjData, rawDataObj.prj);
-                        // fsUtil.writeObjToFile(rawDataObj, "D:/GitHome/ConstructionCost/tmp/insertedRawDataData11.jsp");
+                        // fsUtil.writeObjToFile(rawDataObj, "D:/GitHome/temp/insertedRawDataData11.jsp");
                         break;
                     case JV.PROP_HANDLE_TYPE_ADD_DUMMY:
                         addDummyData(srcData, preHandle);
@@ -421,11 +423,11 @@ class Rpt_Data_Extractor {
         assembleFields(tpl[JV.NODE_FIELD_MAP][JV.NODE_DETAIL_FIELDS_EX], rptDataObj[JV.DATA_DETAIL_DATA_EX], $PROJECT);
         // console.log(JV.DATA_DETAIL_DATA_EX);
         // console.log(rptDataObj[JV.DATA_DETAIL_DATA_EX]);
-        // fsUtil.writeObjToFile(rptDataObj, "D:/GitHome/ConstructionCost/tmp/insertedOriginalData.jsp");
-        // fsUtil.writeObjToFile(rawDataObj, "D:/GitHome/ConstructionCost/tmp/insertedRawDataData.jsp");
-        // fsUtil.writeObjToFile($PROJECT, "D:/GitHome/ConstructionCost/tmp/$PROJECTData.jsp");
-        // fsUtil.writeObjToFile(tpl[JV.NODE_FIELD_MAP][JV.NODE_MASTER_FIELDS], "D:/GitHome/ConstructionCost/tmp/masterFieldsAfterAssemble.jsp");
-        // fsUtil.writeObjToFile(tpl[JV.NODE_FIELD_MAP][JV.NODE_DETAIL_FIELDS], "D:/GitHome/ConstructionCost/tmp/detailFieldsAfterAssemble.jsp");
+        // fsUtil.writeObjToFile(rptDataObj, "D:/GitHome/temp/insertedOriginalData.jsp");
+        // fsUtil.writeObjToFile(rawDataObj, "D:/GitHome/temp/insertedRawDataData.jsp");
+        // fsUtil.writeObjToFile($PROJECT, "D:/GitHome/temp/$PROJECTData.jsp");
+        // fsUtil.writeObjToFile(tpl[JV.NODE_FIELD_MAP][JV.NODE_MASTER_FIELDS], "D:/GitHome/temp/masterFieldsAfterAssemble.jsp");
+        // fsUtil.writeObjToFile(tpl[JV.NODE_FIELD_MAP][JV.NODE_DETAIL_FIELDS], "D:/GitHome/temp/detailFieldsAfterAssemble.jsp");
         return rptDataObj;
     };
 
@@ -554,7 +556,7 @@ function summaryData(sourceData, handleCfg, prjData, prjMain){
         }
     }
     replaceActDataArr(sourceData, rstArr);
-    // fsUtil.writeObjToFile(sourceData.data, "D:/GitHome/ConstructionCost/tmp/sumRst.jsp");
+    // fsUtil.writeObjToFile(sourceData.data, "D:/GitHome/temp/sumRst.jsp");
 }
 
 function filterData(sourceData, handleCfg, prjData) {
@@ -772,7 +774,7 @@ function filterData(sourceData, handleCfg, prjData) {
         rstArr = newRstArr;
     }
     replaceActDataArr(sourceData, rstArr);
-    // fsUtil.writeObjToFile(sourceData.data, "D:/GitHome/ConstructionCost/tmp/filteredRst.jsp");
+    // fsUtil.writeObjToFile(sourceData.data, "D:/GitHome/temp/filteredRst.jsp");
 }
 
 function adjustData(sourceData, adjustCfg) {
@@ -906,7 +908,7 @@ function moveRationData(rationData, rawDataObj) {
                 //无
             }
         }
-        // fsUtil.writeObjToFile(rationGljData.data, "D:/GitHome/ConstructionCost/tmp/afterMoveGLJ.jsp");
+        // fsUtil.writeObjToFile(rationGljData.data, "D:/GitHome/temp/afterMoveGLJ.jsp");
     }
 }
 
@@ -1211,16 +1213,16 @@ function sortData(sourceData, sortCfg, prjData) {
                 newTopArr = rst;
             }
             let destArr = [];
-            // fsUtil.writeObjToFile(newTopArr, "D:/GitHome/ConstructionCost/tmp/sortedAndFlattedRstBefore.jsp");
+            // fsUtil.writeObjToFile(newTopArr, "D:/GitHome/temp/sortedAndFlattedRstBefore.jsp");
             treeUtil.getFlatArray(newTopArr, destArr, true);
             // console.log(destArr);
             replaceActDataArr(sourceData, destArr);
-            // fsUtil.writeObjToFile(sourceData.data, "D:/GitHome/ConstructionCost/tmp/sortedAndFlattedRst.jsp");
+            // fsUtil.writeObjToFile(sourceData.data, "D:/GitHome/temp/sortedAndFlattedRst.jsp");
             break;
         case "normal":
             private_normal_sort(tempRstArr, sortCfg[JV.PROP_SORT_KEYS]);
             replaceActDataArr(sourceData, tempRstArr);
-            // fsUtil.writeObjToFile(sourceData.data, "D:/GitHome/ConstructionCost/tmp/normalSortedRst.jsp");
+            // fsUtil.writeObjToFile(sourceData.data, "D:/GitHome/temp/normalSortedRst.jsp");
             break;
         case "accord_to_parent":
             let pcKey = sortCfg[JV.PROP_PARENT_CHILD_SORT_KEY];
@@ -1443,8 +1445,20 @@ function ext_getRateProperty(propKey) {
     let rst = [], parentObj = this;
     let dtObj = parentObj["myOwnRawDataObj"];
     if (propKey && dtObj) {
-        for (let rate of dtObj.data._doc.rates) {
-            rst.push(rate[propKey]);
+        if (propKey instanceof Array) {
+            for (let pKey of propKey) {
+                for (let rate of dtObj.data._doc.rates) {
+                    if (rate[pKey]) {
+                        rst.push(rate[pKey]);
+                    } else {
+                        rst.push(0);
+                    }
+                }
+            }
+        } else {
+            for (let rate of dtObj.data._doc.rates) {
+                rst.push(rate[propKey]);
+            }
         }
     }
     return rst;