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

modules/reports/controllers/rpt_controller.js

@@ -329,6 +329,80 @@ function getAllPagesCommon(user_id, prj_id, rpt_id, pageSize, orientation, custo
     })
 }
 
+function getMultiRptsCommon(user_id, prj_id, rpt_ids, pageSize, orientation, customizeCfg, option, outputType, cb) {
+    for (let idx = 0; idx < rpt_ids.length; idx++) {
+        rpt_ids[idx] = parseInt(rpt_ids[idx]); //转换一下，以防万一
+    }
+    rptTplFacade.getRptTemplates(rpt_ids).then(function(rptTpls) {
+        let rptDataUtil = new rptDataExtractor();
+        let filters = [];
+        for (let rptTpl of rptTpls) {
+            rptDataUtil.initialize((rptTpl._doc)?rptTpl._doc:rptTpl);
+            let filter = rptDataUtil.getDataRequestFilter();
+            for (let dtlFilter of filter) {
+                if (filters.indexOf(dtlFilter) < 0) {
+                    filters.push(dtlFilter);
+                }
+            }
+            //正常应该根据报表模板定义的数据类型来请求数据
+            rptTplDataFacade.prepareProjectData(userId_Dft, demoPrjId, filters, function (err, msg, rawDataObj) {
+                if (!err) {
+                    try {
+                        //1. 这里只用一份数据，根据实际应用情况，只需要保留copy三样数据： bills, ration, ration_glj, projectGLJ
+                        let savedBillsData = [], savedRationData = [], savedGljData = [];
+                        for (let dtlData of rawDataObj.prjData) {
+                            if (dtlData.moduleName === 'bills') {
+                                Object.assign(savedBillsData, dtlData.data);
+                            } else if (dtlData.moduleName === 'ration') {
+                                Object.assign(savedRationData, dtlData.data);
+                            } else if (dtlData.moduleName === 'ration_glj') {
+                                Object.assign(savedGljData, dtlData.data);
+                            } else if (dtlData.moduleName === 'projectGLJ') {
+                                //这个待定
+                            }
+                        }
+                        //2. 一个一个模板创建数据
+                        for (let tplIdx = 0; tplIdx < rptTpls.length; tplIdx++) {
+                            let rptTpl = (rptTpls[tplIdx]._doc)?rptTpls[tplIdx]._doc:rptTpls[tplIdx];
+                            rptDataUtil.initialize(rptTpl);
+                            let tplData = rptDataUtil.assembleData(rawDataObj);
+                            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, JV.OUTPUT_TYPE_EXCEL);
+                            let maxPages = printCom.totalPages;
+                            let customizeCfg = {"fillZero": true};
+                            let pageRst = printCom.outputAsSimpleJSONPageArray(rptTpl, tplData, 1, maxPages, defProperties, customizeCfg);
+                            if (pageRst) {
+                            } else {
+                            }
+                            //注意：这里需要把清单、定额、工料机数据assign回去!!!
+                            for (let dtlData of rawDataObj.prjData) {
+                                if (dtlData.moduleName === 'bills' && savedBillsData.length > 0) {
+                                    Object.assign(dtlData.data, savedBillsData);
+                                } else if (dtlData.moduleName === 'ration' && savedRationData.length > 0) {
+                                    Object.assign(dtlData.data, savedRationData);
+                                } else if (dtlData.moduleName === 'ration_glj' && savedGljData.length > 0) {
+                                    Object.assign(dtlData.data, savedGljData);
+                                } else if (dtlData.moduleName === 'projectGLJ') {
+                                    //这个待定
+                                }
+                            }
+                        }
+                    } catch (ex) {
+                        console.log(ex);
+                    } finally {
+                    }
+                } else {
+                    //
+                }
+            })
+        }
+    });
+}
+
 
 module.exports = {
     getReportAllPages: function (req, res) {
@@ -389,6 +463,14 @@ module.exports = {
             option = params.option;
         let user_id = req.session.sessionUser.id;
         let dftOption = option||JV.PAGING_OPTION_NORMAL;
+        getMultiRptsCommon(user_id, prj_id, rpt_ids, pageSize, orientation, customizeCfg, dftOption, JV.OUTPUT_TYPE_NORMAL, function (err, rptPageRstArray) {
+            if(err){
+                callback(req, res, '数据有误', null);
+            }
+            else{
+                callback(req, res, err, rptPageRstArray);
+            }
+        });
     },
 
     getReportAllPagesSvg: function (req, res) {

modules/reports/facade/rpt_template_facade.js

@@ -5,10 +5,16 @@ import mongoose from "mongoose";
 let rpt_tpl_mdl = mongoose.model("rpt_templates");
 
 module.exports = {
-    getRptTemplate: getRptTemplate
+    getRptTemplate: getRptTemplate,
+    getRptTemplates: getRptTemplates
 };
 
 async function getRptTemplate(tplId) {
     //console.log('templateId: ' + parseInt(tplId));
     return await  rpt_tpl_mdl.findOne({"ID": parseInt(tplId)}, '-_id');
 }
+
+async function getRptTemplates(tplIds) {
+    //console.log('templateId: ' + parseInt(tplId));
+    return await  rpt_tpl_mdl.find({"ID": {"$in": tplIds}}, '-_id');
+}

modules/reports/rpt_component/jpc_cross_tab.js

@@ -353,7 +353,7 @@ JpcCrossTabSrv.prototype.createNew = function(){
         //3. 交叉数据
         rst = rst.concat(me.outputPreviewContent(rptTpl, bands, controls, $CURRENT_RPT, customizeCfg, maxRowRec, maxColRec, unitFactor));
         //4. 交叉行拓展
-        rst = rst.concat(me.outputPreviewTabExt(rptTpl, bands, controls, $CURRENT_RPT, customizeCfg, maxRowRec, unitFactor));
+        rst = rst.concat(me.outputPreviewTabExt(rptTpl, bands, controls, $CURRENT_RPT, customizeCfg, maxRowRec, maxColRec, unitFactor));
         //5. 交叉行拓展合计
         rst = rst.concat(me.outputPreviewSumTabExt(rptTpl, bands, controls, $CURRENT_RPT, customizeCfg, maxRowRec, unitFactor));
         //6. 交叉列合计
@@ -374,9 +374,9 @@ JpcCrossTabSrv.prototype.createNew = function(){
     JpcCrossTabResult.outputPreviewTabSum = function(rptTpl, bands, controls, $CURRENT_RPT, customizeCfg, maxRowRec, tabNodeName, unitFactor) {
         return this.private_OutputPreviewCommon(rptTpl, bands, controls, $CURRENT_RPT, customizeCfg, maxRowRec, 1, rptTpl[JV.NODE_CROSS_INFO][tabNodeName], unitFactor);
     };
-    JpcCrossTabResult.outputPreviewTabExt = function(rptTpl, bands, controls, $CURRENT_RPT, customizeCfg, maxRowRec, unitFactor) {
+    JpcCrossTabResult.outputPreviewTabExt = function(rptTpl, bands, controls, $CURRENT_RPT, customizeCfg, maxRowRec, maxColRec, unitFactor) {
         //交叉行拓展
-        return this.private_OutputPreviewCommon(rptTpl, bands, controls, $CURRENT_RPT, customizeCfg, maxRowRec, 1, rptTpl[JV.NODE_CROSS_INFO][JV.NODE_CROSS_ROW_EXT], unitFactor);
+        return this.private_OutputPreviewCommon(rptTpl, bands, controls, $CURRENT_RPT, customizeCfg, maxRowRec, maxColRec, rptTpl[JV.NODE_CROSS_INFO][JV.NODE_CROSS_ROW_EXT], unitFactor);
     };
     JpcCrossTabResult.outputPreviewSumTabExt = function(rptTpl, bands, controls, $CURRENT_RPT, customizeCfg, maxRowRec, unitFactor) {
         //交叉行拓展合计

modules/reports/util/rpt_yanghu_data_util.js

@@ -1114,7 +1114,7 @@ function sortData(sourceData, sortCfg, prjData) {
             }
             let destArr = [];
             // fsUtil.writeObjToFile(newTopArr, "D:/GitHome/ConstructionCost/tmp/sortedAndFlattedRstBefore.jsp");
-            treeUtil.getFlatArray(newTopArr, destArr);
+            treeUtil.getFlatArray(newTopArr, destArr, true);
             replaceActDataArr(sourceData, destArr);
             // fsUtil.writeObjToFile(sourceData.data, "D:/GitHome/ConstructionCost/tmp/sortedAndFlattedRst.jsp");
             break;
@@ -1228,7 +1228,7 @@ function setupFunc(obj, prop, ownRawObj) {
     obj[prop] = {};
     obj[prop]["myOwnRawDataObj"] = ownRawObj;
     obj[prop]["myOwnOrgRawDataObj"] = ownRawObj.data;
-    obj[prop].getProperty = ext_getPropety;
+    obj[prop].getProperty = ext_getProperty;
     obj[prop].getPropertyByRefId = ext_getPropertyByRefId;
     obj[prop].getFee = ext_getFee;
     obj[prop].getPropertyByForeignId = ext_getPropertyByForeignId;
@@ -1440,7 +1440,7 @@ function ext_getRatioDataPriceMapProperty(propKey) {
     return rst;
 }
 
-function ext_getPropety(propKey) {
+function ext_getProperty(propKey) {
     let rst = [], parentObj = this;
     let dtObj = parentObj["myOwnRawDataObj"];
     if (propKey && dtObj) {

public/treeUtil.js

@@ -2,16 +2,164 @@
  * Created by Tony on 2017/3/14.
  */
 
-import fs from 'fs';
+// import fs from 'fs';
+//
+// function getTreeNodeUtil() {
+//     let tmpRst = null;
+//     let data = fs.readFileSync(__dirname + '/web/treeDataHelper.js', 'utf8', 'r');
+//     //console.log(data);
+//     eval(data + ' ; tmpRst = tree_Data_Helper; ');
+//     return tmpRst;
+// }
+//
+// const treeNodeUtil = getTreeNodeUtil();
 
-function getTreeNodeUtil() {
-    let tmpRst = null;
-    let data = fs.readFileSync(__dirname + '/web/treeDataHelper.js', 'utf8', 'r');
-    //console.log(data);
-    eval(data + ' ; tmpRst = tree_Data_Helper; ');
-    return tmpRst;
-}
 
-const treeNodeUtil = getTreeNodeUtil();
+const NODE_ID = "ID", P_ID = "ParentID", NEXT_ID = "NextSiblingID", ADHOC_PRE_ID="Previous_ID", CHILDREN_NODE = "items", SUB_ID = "sub_ids",
+    EMPTY_ID_VAL = -1, TREE_LEVEL = 'treeLevel', TOP_BILL_ID = "topBillID", TREE_FLAT_SERIAL_ORDER = "treeFlatSerialOrder";
 
-module.exports = treeNodeUtil;
+let tree_Data_Helper = {
+    buildTreeNodeDirectly: function(data, addLevel) {
+        let topArr = [], rst = [], tmpNodes = {}, prefix = "id_";
+        let private_getStartNode = function (idArr) {
+            let tmpNodeRst = null;
+            for (let i = 0; i < idArr.length; i++) {
+                if (parseInt(tmpNodes[prefix + idArr[i]][ADHOC_PRE_ID]) === EMPTY_ID_VAL) {
+                    tmpNodeRst = tmpNodes[prefix + idArr[i]];
+                    break;
+                }
+            }
+            return tmpNodeRst;
+        };
+        let private_buildNodeData = function(parentItem, idArr, treeLevel, tbID) {
+            let iter = [], nextNode = private_getStartNode(idArr), pushedIds = [];
+            while (nextNode !== null && nextNode !== undefined ) {
+                if (parentItem) {
+                    parentItem[CHILDREN_NODE].push(nextNode);
+                } else {
+                    rst.push(nextNode);
+                }
+                iter.push(nextNode);
+                pushedIds.push(nextNode[NODE_ID]);
+                nextNode[TOP_BILL_ID] = tbID;
+                if (parentItem === null) {
+                    nextNode[TOP_BILL_ID] = nextNode[NODE_ID];
+                    if (nextNode.flags && nextNode.flags.length > 0) {
+                        for (let flag of nextNode.flags) {
+                            if (flag.fieldName === "fixed") {
+                                nextNode[TOP_BILL_ID] = flag.flag;
+                                break;
+                            }
+                        }
+                    }
+                }
+                if (addLevel) nextNode[TREE_LEVEL] = treeLevel;
+                nextNode = tmpNodes[prefix + nextNode[NEXT_ID]];
+                if (nextNode === null || nextNode === undefined) {
+                    //备注： 考虑到实际数据的健壮性，有些节点会掉链子，需要用 parentItem[SUB_ID] 比对已经加上的节点，如发现加上的节点数量不够，那就得在这里补充上去
+                    if (parentItem) {
+                        if (parentItem[SUB_ID].length > iter.length) {
+                            for (let subId of parentItem[SUB_ID]) {
+                                if (pushedIds.indexOf(subId) < 0) {
+                                    let restNode = tmpNodes[prefix + subId];
+                                    if (addLevel) restNode[TREE_LEVEL] = treeLevel;
+                                    restNode[TOP_BILL_ID] = tbID;
+                                    parentItem[CHILDREN_NODE].push(restNode);
+                                    iter.push(restNode);
+                                }
+                            }
+                        }
+                    } else {
+                        if (idArr.length > iter.length) {
+                            for (let topId of idArr) {
+                                if (pushedIds.indexOf(topId) < 0) {
+                                    let restNode = tmpNodes[prefix + topId];
+                                    if (addLevel) restNode[TREE_LEVEL] = treeLevel;
+                                    restNode[TOP_BILL_ID] = restNode[NODE_ID];
+                                    if (restNode.flags && restNode.flags.length > 0) {
+                                        for (let flag of restNode.flags) {
+                                            if (flag.fieldName === "fixed") {
+                                                restNode[TOP_BILL_ID] = flag.flag;
+                                                break;
+                                            }
+                                        }
+                                    }
+                                    rst.push(restNode);
+                                    iter.push(restNode);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            pushedIds = [];
+            for (let i = 0; i < iter.length; i++) {
+                let rtbID = tbID;
+                if (parentItem === null) {
+                    rtbID = iter[i][TOP_BILL_ID];
+                }
+                private_buildNodeData(iter[i], iter[i][SUB_ID], (treeLevel + 1), rtbID);
+            }
+        };
+        //1. 给每个节点设置key, 顺便找Top Node
+        for (let i = 0; i < data.length; i++) {
+            tmpNodes[prefix + data[i][NODE_ID]] = data[i];
+            data[i][ADHOC_PRE_ID] = EMPTY_ID_VAL;
+            data[i][SUB_ID] = [];
+            data[i][CHILDREN_NODE] = [];
+            if (parseInt(data[i][P_ID]) === EMPTY_ID_VAL) {
+                topArr.push(data[i][NODE_ID]);
+            }
+        }
+        //2. 通过key，设置好兄弟/父子关系
+        for (let psi = 0; psi < data.length; psi++) {
+            if (parseInt(data[psi][NEXT_ID]) !== EMPTY_ID_VAL) {
+                if (tmpNodes[prefix + data[psi][NEXT_ID]] !== undefined){
+                    if (tmpNodes[prefix + data[psi][NEXT_ID]][P_ID] === data[psi][P_ID]) {
+                        tmpNodes[prefix + data[psi][NEXT_ID]][ADHOC_PRE_ID] = data[psi][NODE_ID];
+                    } else {
+                        tmpNodes[prefix + data[psi][NEXT_ID]][ADHOC_PRE_ID] = EMPTY_ID_VAL;
+                        data[psi][NEXT_ID] = EMPTY_ID_VAL;
+                    }
+                }
+            }
+            if (parseInt(data[psi][P_ID]) !== EMPTY_ID_VAL) {
+                tmpNodes[prefix + data[psi][P_ID]][SUB_ID].push(data[psi][NODE_ID]);
+            }
+        }
+        //3. 开build
+        private_buildNodeData(null, topArr, 0, -1);
+        //try to release and return
+        tmpNodes = null;
+        topArr.length = 0;
+        return rst;
+    },
+
+    getFlatArray: function (srcArr, destArr, addSerialOrder) {
+        let serialStartOrder = 0;
+        let private_put = function (parentItem) {
+            if (addSerialOrder) {
+                parentItem[TREE_FLAT_SERIAL_ORDER] = serialStartOrder;
+                serialStartOrder++;
+                //说明：当清单通过树排序后，为了后续的排序方便，有必要加这个序号，并作为指标提供
+            }
+            destArr.push(parentItem);
+            if (parentItem.items) {
+                for (let subItem of parentItem.items) {
+                    private_put(subItem);
+                }
+            }
+        }
+        for (let node of srcArr) {
+            private_put(node);
+        }
+        for (let item of destArr) {
+            delete item[CHILDREN_NODE];
+            delete item[SUB_ID];
+            delete item[ADHOC_PRE_ID];
+        }
+    }
+};
+
+
+module.exports = tree_Data_Helper;

test/unit/public/testRefAndCopy.js

@@ -0,0 +1,44 @@
+/**
+ * Created by Tony on 2019/3/10.
+ */
+
+var test = require('tape');
+// var stringUtil = require('../../../public/stringUtil');
+
+// test('测试引用于拷贝', function(t){
+//     let orgObj = {k1: "abc", items: [1, 2, 3]};
+//     let refObj = orgObj.items;
+//     console.log("before delete property: ");
+//     console.log(orgObj);
+//     delete orgObj.items;
+//     console.log("after delete property: ");
+//     console.log(orgObj);
+//     orgObj.items = refObj;
+//     console.log("then recover deleted property: ");
+//     console.log(orgObj);
+//     t.end();
+// });
+
+// test('测试assign', function(t){
+//     let orgObj = {k1: "abc", items: [6, 2, 3, 4, 5]};
+//     let refObj = [];
+//     Object.assign(refObj, orgObj.items);
+//     console.log(orgObj);
+//     orgObj.items.sort();
+//     console.log(orgObj);
+//     // orgObj.items = refObj;
+//     console.log(refObj);
+//     t.end();
+// })
+
+test('测试assign more', function(t){
+    let orgObj = {k1: "abc", items: [{a: 1}, {a: 2, items: [1, 2, 3]}, {a: 3, items: [6, 4, 5]}]};
+    let refObj = [];
+    Object.assign(refObj, orgObj.items);
+    // console.log(orgObj);
+    // orgObj.items.sort();
+    console.log(orgObj);
+    // orgObj.items = refObj;
+    console.log(refObj);
+    t.end();
+})

test/unit/reports/test_multi_rpts.js

@@ -0,0 +1,191 @@
+/**
+ * Created by Tony on 2019/3/10.
+ */
+
+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 pm_facade = require('../../../modules/pm/facade/pm_facade');
+
+let demoRptIds = [];
+// demoRptIds.push(38); //5.2.2表
+// demoRptIds.push(6); //封面
+// demoRptIds.push(22); //03
+// demoRptIds.push(26); //07
+// demoRptIds.push(28); //09
+// demoRptIds.push(27); //08
+// demoRptIds.push(24); //05
+// demoRptIds.push(20); //01
+// demoRptIds.push(23); //04 综合费率表
+// demoRptIds.push(56); //24
+demoRptIds.push(36); //5.1
+demoRptIds.push(49); //5.5
+// demoRptIds.push(66); //5.4
+
+let pagesize = "A4";
+
+let userId_Leng = "5c3ffa9aa0a92732f41216e0"; //小冷User Id (养护的)
+// let userId_me = "5b6a60b1c4ba33000dd417c0"; //我的
+// let userId_HaiZhu = "5b5a66c4a3c23e000dccdd77"; //海珠user id
+let demoPrjId = - 1;
+// demoPrjId = 720; //QA: DW3
+//demoPrjId = 1626; //QA:
+// demoPrjId = 2260; //QA:
+// demoPrjId = 410; //QA:
+// demoPrjId = 313; //PROD:
+// demoPrjId = 455; //PROD:
+// demoPrjId = 618; //PROD:
+demoPrjId = 815; //PROD:
+// demoPrjId = 4107; //UAT:
+//*/
+let userId_Dft = userId_Leng;
+// let userId_Dft = "5a025c4c15074d134c2b9689";
+/*/
+ 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_yanghu_data_util";
+import rpt_xl_util from "../../../modules/reports/util/rpt_excel_util";
+import rpt_pdf_util from "../../../modules/reports/util/rpt_pdf_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('测试 - 测试模板啦: ', function (t) {
+    rptTplFacade.getRptTemplates(demoRptIds).then(function(rptTpls) {
+        // console.log(rptTpls);
+        let rptDataUtil = new rptDataExtractor();
+        let filters = [];
+        let summaryRst = [];
+        let summaryIdxArr = [];
+        //let promiseArr = [null, null];
+        let promisesArr = []; //
+        for (let tplFilterIdx = 0; tplFilterIdx < rptTpls.length; tplFilterIdx++) {
+            let rptTpl = rptTpls[tplFilterIdx];
+            rptDataUtil.initialize((rptTpl._doc)?rptTpl._doc:rptTpl);
+            let filter = rptDataUtil.getDataRequestFilter(summaryRst);
+            for (let dtlFilter of filter) {
+                if (filters.indexOf(dtlFilter) < 0) {
+                    filters.push(dtlFilter);
+                }
+            }
+            if (summaryRst.length > 0) {
+                summaryIdxArr.push(tplFilterIdx);
+                promisesArr.push([null, null]);
+                if (summaryRst.indexOf(`Construct`) >= 0 || summaryRst.indexOf(`ConstructDetail`) >= 0) {
+                    promisesArr[promisesArr.length - 1][0] = pm_facade.getSummaryInfoByTender(demoPrjId, pm_facade.projectType.project);
+                }
+                if (summaryRst.indexOf(`Segment`) >= 0 || summaryRst.indexOf(`SegmentDetail`) >= 0) {
+                    promisesArr[promisesArr.length - 1][1] = pm_facade.getSummaryInfoByTender(demoPrjId, pm_facade.projectType.engineering);
+                }
+            }
+        }
+        //正常应该根据报表模板定义的数据类型来请求数据
+        rptTplDataFacade.prepareProjectData(userId_Dft, demoPrjId, filters, function (err, msg, rawDataObj) {
+            if (!err) {
+                try {
+                    //1. 这里只用一份数据，根据实际应用情况，只需要保留copy三样数据： bills, ration, ration_glj, projectGLJ
+                    let savedBillsData = [], savedRationData = [], savedGljData = [];
+                    for (let dtlData of rawDataObj.prjData) {
+                        if (dtlData.moduleName === 'bills') {
+                            Object.assign(savedBillsData, dtlData.data);
+                        } else if (dtlData.moduleName === 'ration') {
+                            Object.assign(savedRationData, dtlData.data);
+                        } else if (dtlData.moduleName === 'ration_glj') {
+                            Object.assign(savedGljData, dtlData.data);
+                        } else if (dtlData.moduleName === 'projectGLJ') {
+                            //这个待定
+                        }
+                    }
+                    //2. 一个一个模板创建数据
+                    for (let tplIdx = 0; tplIdx < rptTpls.length; tplIdx++) {
+                        let rptTpl = (rptTpls[tplIdx]._doc)?rptTpls[tplIdx]._doc:rptTpls[tplIdx];
+                        rptDataUtil.initialize(rptTpl);
+                        let tplData = rptDataUtil.assembleData(rawDataObj);
+                        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, JV.OUTPUT_TYPE_EXCEL);
+                        let maxPages = printCom.totalPages;
+                        let customizeCfg = {"fillZero": true};
+                        let pageRst = printCom.outputAsSimpleJSONPageArray(rptTpl, tplData, 1, maxPages, defProperties, customizeCfg);
+                        if (pageRst) {
+                            fsUtil.writeObjToFile(pageRst, "D:/GitHome/YangHuCost/tmp/testBuiltPageResult_测试模板_" + tplIdx + ".jsp");
+                            // rpt_xl_util.exportExcel(pageRst, pagesize, "local_test_rpt_excel", true, null, null, function(uuidName){
+                            //     console.log("excel uuid: " + uuidName);
+                            // });
+                            // rpt_pdf_util.export_pdf_file(pageRst, pagesize, 'local_test_rpt_pdf', function(uuidName){
+                            //     console.log("pdf uuid: " + uuidName);
+                            // });
+                        } else {
+                            console.log("oh! no pages were created!");
+                        }
+                        //注意：这里需要把清单、定额、工料机数据assign回去!!!
+                        for (let dtlData of rawDataObj.prjData) {
+                            if (dtlData.moduleName === 'bills' && savedBillsData.length > 0) {
+                                Object.assign(dtlData.data, savedBillsData);
+                            } else if (dtlData.moduleName === 'ration' && savedRationData.length > 0) {
+                                Object.assign(dtlData.data, savedRationData);
+                            } else if (dtlData.moduleName === 'ration_glj' && savedGljData.length > 0) {
+                                Object.assign(dtlData.data, savedGljData);
+                            } else if (dtlData.moduleName === 'projectGLJ') {
+                                //这个待定
+                            }
+                        }
+                    }
+                    //let tplData = rptDataUtil.assembleData(rawDataObj);
+                } catch (ex) {
+                    console.log(ex);
+                    t.pass('pass with exception!');
+                    t.end();
+                } finally {
+                    t.pass('pass succeeded!');
+                    // t.end();
+                    mongoose.disconnect();
+                    t.pass('closing db connection');
+                    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);
+});

test/unit/reports/test_rpt_test_template.js

@@ -38,8 +38,8 @@ let demoPrjId = - 1;
 
 // let demoRptId = 56; //24
 // let demoRptId = 36; //5.1
-// let demoRptId = 49; //5.5
-let demoRptId = 66; //5.4
+let demoRptId = 49; //5.5
+// let demoRptId = 66; //5.4
 
 let pagesize = "A4";
 //288: 11-2表(新)
@@ -83,7 +83,7 @@ test('测试 - 测试模板啦: ', function (t) {
         rptDataUtil.initialize(rptTpl._doc);
         let filter = rptDataUtil.getDataRequestFilter();
         // filter.push('ration');  //临时用
-        filter.push('ration_coe'); //临时用2
+        // filter.push('ration_coe'); //临时用2
         // filter.push('projectGLJ'); //临时用3
         console.log(filter);
         //正常应该根据报表模板定义的数据类型来请求数据