Merge branch 'master' of http://smartcost.f3322.net:3000/SmartCost/ConstructionCost

modules/reports/util/rpt_construct_data_util.js

@@ -396,6 +396,18 @@ function filterData(sourceData, handleCfg, prjData) {
         }
         return rst;
     };
+    let private_chkArrVal = function(arr, key, compVal, compStr){
+        let rst = false;
+        for (let arrItem of arr) {
+            if (arrItem[key]) {
+                rst = private_chkVal(arrItem[key], compVal, compStr);
+            }
+            if (rst) {
+                break;
+            }
+        }
+        return rst;
+    };
     let compareObj = {};
     for (let item of tempRstArr) {
         let compRst = true;
@@ -404,7 +416,26 @@ function filterData(sourceData, handleCfg, prjData) {
         for (let cfg of handleCfg[JV.PROP_FILTER_KEYS]) {
             if (cfg[JV.PROP_FILTER_COMPARE_VAL]) {
                 //比较key值
-                compRst = private_chkVal(item[cfg.key], cfg[JV.PROP_FILTER_COMPARE_VAL], cfg[JV.PROP_FILTER_CONDITION]);
+                let keys = cfg.key.split(".");
+                if (keys.length > 1) {
+                    let lastObj = item;
+                    for (let i = 0; i < keys.length - 1; i++) {
+                        lastObj = item[keys[i]];
+                        if (!(lastObj)) {
+                            compRst = false;
+                            break;
+                        }
+                    }
+                    if (lastObj) {
+                        if (lastObj instanceof Array) {
+                            compRst = private_chkArrVal(lastObj, keys[keys.length - 1], cfg[JV.PROP_FILTER_COMPARE_VAL], cfg[JV.PROP_FILTER_CONDITION]);
+                        } else {
+                            compRst = private_chkVal(lastObj[keys[keys.length - 1]], cfg[JV.PROP_FILTER_COMPARE_VAL], cfg[JV.PROP_FILTER_CONDITION]);
+                        }
+                    }
+                } else {
+                    compRst = private_chkVal(item[cfg.key], cfg[JV.PROP_FILTER_COMPARE_VAL], cfg[JV.PROP_FILTER_CONDITION]);
+                }
             } else if (cfg[JV.PROP_FILTER_COMPARE_OBJ] && cfg[JV.PROP_FILTER_COMPARE_OBJ_KEY]){
                 //通过其他对象来过滤
                 if (!curComparePrjData) {

test/unit/reports/test_tpl_09_1.js

@@ -49,7 +49,6 @@ fs.readFile(__dirname.slice(0, __dirname.length - 18) + '/public/web/date_util.j
     eval(data);
 });
 
-//*
 test('测试 - 测试模板啦: ', function (t) {
     rptTplFacade.getRptTemplate(demoRptId).then(function(rptTpl) {
         let rptDataUtil = new rptDataExtractor();
@@ -60,9 +59,6 @@ test('测试 - 测试模板啦: ', function (t) {
         rptTplDataFacade.prepareProjectData(userId_Dft, demoPrjId, filter, function (err, msg, rawDataObj) {
             if (!err) {
                 try {
-                    // if (filter.indexOf('ration') >= 0 && filter.indexOf('ration_glj') >= 0) {
-                    //     rptDataUtil.moveRationData(rawDataObj, filter);
-                    // }
                     // fsUtil.writeObjToFile(rawDataObj, "D:/GitHome/ConstructionCost/tmp/rptTplRawDataObject_建筑09-1表.jsp");
                     let tplData = rptDataUtil.assembleData(rawDataObj);
                     // fsUtil.writeObjToFile(tplData, "D:/GitHome/ConstructionCost/tmp/rptTplAssembledData_建筑09-1表.jsp");
@@ -96,41 +92,6 @@ test('测试 - 测试模板啦: ', function (t) {
         })
     });
 });
-//*/
-
-/*/
-test('测试 - 保存小数位数问题: ', function (t) {
-    require('./rpt_test_decimal');
-    let rpt_decimal_mdl = mongoose.model("rpt_decimal_test");
-    let num = 300000;
-    let ID = 1;
-    for (let i = 0.0001; i < 1; (i+=0.0001)) {
-        let test_doc = {};
-        test_doc.ID = ID;
-        test_doc.Value1 = num + i;
-        test_doc.Value2 = num + i + 0.1 + 0.2;
-        test_doc.Value3 = parseFloat((num + i + 0.1 + 0.2).toFixed(5));
-        rpt_decimal_mdl.create(test_doc);
-        ID++;
-    }
-    t.pass('pass save decimal ok!');
-    t.end();
-});
-//*/
-/*/
-test('测试 - 显示保存小数位数问题: ', function (t) {
-    require('./rpt_test_decimal');
-    let rpt_decimal_mdl = mongoose.model("rpt_decimal_test");
-    rpt_decimal_mdl.find({}).then(function (rst) {
-        //console.log(rst);
-        if (rst.length > 0) {
-            fsUtil.writeObjToFile(rst, "D:/GitHome/ConstructionCost/tmp/testDecimalResult.jsp");
-        }
-        t.pass('pass get decimal ok!');
-        t.end();
-    });
-});
-//*/
 
 test('close the connection', function (t) {
     setTimeout(function () {

test/unit/reports/test_tpl_11.js

@@ -0,0 +1,103 @@
+/**
+ * Created by Tony on 2018/5/11.
+ */
+
+let test = require('tape');
+import JpcEx from "../../../modules/reports/rpt_component/jpc_ex";
+import JV from "../../../modules/reports/rpt_component/jpc_value_define";
+let config = require("../../../config/config.js");
+config.setupDb(process.env.NODE_ENV);
+let mongoose = require("mongoose");
+let fileUtils = require("../../../modules/common/fileUtils");
+let path = require('path');
+let dbm = require("../../../config/db/db_manager");
+let rpt_cfg = require('./rpt_cfg');
+dbm.connect(process.env.NODE_ENV);
+
+//统一引用models
+fileUtils.getGlobbedFiles('../../../modules/all_models/*.js').forEach(function(modelPath) {
+    require(path.resolve(modelPath));
+});
+
+//config.setupCache();
+let cfgCacheUtil = require("../../../config/cacheCfg");
+cfgCacheUtil.setupDftCache();
+
+let fsUtil = require("../../../public/fsUtil");
+
+let demoPrjId = - 1;
+let demoRptId = 247, pagesize = "A4";
+
+// let userId_Leng = "59cdf14a0034a1000ba52b97"; //小冷User Id 换成_id了 QQ号
+let userId_Leng = "5acac1e885bf55000bd055ba"; //小冷User Id2
+// demoPrjId = 720; //QA: DW3
+//demoPrjId = 1626; //QA:
+demoPrjId = 2260; //QA:
+//*/
+let userId_Dft = userId_Leng;
+/*/
+ let userId_Dft = "595328da1934dc327cad08eb";
+ //*/
+
+let rptTplFacade = require("../../../modules/reports/facade/rpt_template_facade");
+let rptTplDataFacade = require("../../../modules/reports/facade/rpt_tpl_data_facade");
+
+import rptDataExtractor from "../../../modules/reports/util/rpt_construct_data_util";
+
+let fs = require('fs');
+//设置Date Format函数
+fs.readFile(__dirname.slice(0, __dirname.length - 18) + '/public/web/date_util.js', 'utf8', 'r', function (err, data) {
+    eval(data);
+});
+
+test('测试 - 测试模板: 表-11 ', function (t) {
+    rptTplFacade.getRptTemplate(demoRptId).then(function(rptTpl) {
+        let rptDataUtil = new rptDataExtractor();
+        rptDataUtil.initialize(rptTpl._doc);
+        let filter = rptDataUtil.getDataRequestFilter();
+        console.log(filter);
+        //正常应该根据报表模板定义的数据类型来请求数据
+        rptTplDataFacade.prepareProjectData(userId_Dft, demoPrjId, filter, function (err, msg, rawDataObj) {
+            if (!err) {
+                try {
+                    // fsUtil.writeObjToFile(rawDataObj, "D:/GitHome/ConstructionCost/tmp/rptTplRawDataObject_建筑11表.jsp");
+                    let tplData = rptDataUtil.assembleData(rawDataObj);
+                    // fsUtil.writeObjToFile(tplData, "D:/GitHome/ConstructionCost/tmp/rptTplAssembledData_建筑11表.jsp");
+                    //it's time to build the report!!!
+                    let printCom = JpcEx.createNew();
+                    rptTpl[JV.NODE_MAIN_INFO][JV.NODE_PAGE_INFO][JV.PROP_PAGE_SIZE] = pagesize;
+                    let defProperties = rpt_cfg;
+                    let dftOption = JV.PAGING_OPTION_NORMAL;
+                    printCom.initialize(rptTpl);
+                    printCom.analyzeData(rptTpl, tplData, defProperties, dftOption);
+                    let maxPages = printCom.totalPages;
+                    let pageRst = printCom.outputAsSimpleJSONPageArray(rptTpl, tplData, 1, maxPages, defProperties);
+                    if (pageRst) {
+                        // fsUtil.writeObjToFile(pageRst, "D:/GitHome/ConstructionCost/tmp/testBuiltPageResult_建筑11表.jsp");
+                    } else {
+                        console.log("oh! no pages were created!");
+                    }
+                } catch (ex) {
+                    console.log(ex);
+                    t.pass('pass with exception!');
+                    t.end();
+                }
+
+                t.pass('pass succeeded!');
+                t.end();
+            } else {
+                console.log(msg);
+                t.pass('pass with error!');
+                t.end();
+            }
+        })
+    });
+});
+
+test('close the connection', function (t) {
+    setTimeout(function () {
+        mongoose.disconnect();
+        t.pass('closing db connection');
+        t.end();
+    }, 1000);
+});