21-2表调整

config/config.js

@@ -28,7 +28,7 @@ module.exports = {
                 useMongoClient: true
             }
     },
-    pp:{  server: "172.18.111.231",
+    pp:{  server: "112.74.42.187",
         port: "27017",
         options:{
             user:'smartcost',

modules/reports/facade/rpt_tpl_data_facade.js

@@ -7,9 +7,11 @@
 // let projectConst = consts.projectConst;
 let prjMdl = require('../../../modules/pm/models/project_model');
 let projectDataMdl = require('../../../modules/main/models/project');
+let projectFacade = require('../../../modules/main/facade/project_facade');
 
 module.exports = {
-    prepareProjectData: prepareProjectData
+    prepareProjectData: prepareProjectData,
+    getBudgetSummayDatas: getBudgetSummayDatas
 };
 
 function prepareProjectData(userId, prjId, filter, callback) {
@@ -38,4 +40,8 @@ function prepareProjectData(userId, prjId, filter, callback) {
             callback(err, msg, null);
         }
     });
+}
+
+async function getBudgetSummayDatas(prjIds) {
+    return await projectFacade.getBudgetSummayDatas(prjIds);
 }

modules/reports/util/rpt_yanghu_data_util.js

@@ -1794,6 +1794,9 @@ function getActDataArr(dtObj) {
         if (dtObj.moduleName === "projectGLJ") {
             rst = dtObj.data.gljList;
         }
+        if (dtObj.moduleName === "calc_program") {
+            rst = dtObj.data.templates;
+        }
     }
     return rst;
 }

test/unit/reports/test_preview_page.js

@@ -26,7 +26,8 @@ let fsUtil = require("../../../public/fsUtil");
 // let demoPrjId = - 1;
 // let demoRptId = 275; //重庆09年建筑 09表
 // let demoRptId = 229; //重庆09年建筑 封2表
-let demoRptId = 28; //09 重庆养护2018
+// let demoRptId = 28; //09 重庆养护2018
+let demoRptId = 68; //01-2 重庆养护2018
 
 let pagesize = "A4";
 

test/unit/reports/test_rpt_test_template.js

@@ -41,8 +41,9 @@ let demoPrjId = - 1;
 // let demoRptId = 49; //5.5
 // let demoRptId = 66; //5.4
 // let demoRptId = 67; //21-2
-// let demoRptId = 31; //21-1
-let demoRptId = 37; //5.2.1 计日工劳务
+let demoRptId = 31; //21-1
+// let demoRptId = 37; //5.2.1 计日工劳务
+// let demoRptId = 68; //01-2
 
 let pagesize = "A4";
 //288: 11-2表(新)
@@ -59,8 +60,10 @@ let userId_Leng = "5c3ffa9aa0a92732f41216e0"; //小冷User Id (养护的)
 // demoPrjId = 455; //PROD:
 // demoPrjId = 776; //PROD:
 // demoPrjId = 671; //PROD:
+demoPrjId = 473; //UAT
 // demoPrjId = 653; //PROD:
-demoPrjId = 756; //PROD:
+// demoPrjId = 756; //PROD:
+// demoPrjId = 815; //PROD:
 // demoPrjId = 4107; //UAT:
 //*/
 let userId_Dft = userId_Leng;
@@ -90,8 +93,8 @@ test('测试 - 测试模板啦: ', function (t) {
         // filter.push('ration');  //临时用
         // filter.push('ration_coe'); //临时用2
         // filter.push('projectGLJ'); //临时用3
-        filter.push('calc_program'); //临时用4
-        // console.log(filter);
+        // filter.push('calc_program'); //临时用4
+        console.log(filter);
         //正常应该根据报表模板定义的数据类型来请求数据
         rptTplDataFacade.prepareProjectData(userId_Dft, demoPrjId, filter, function (err, msg, rawDataObj) {
             if (!err) {

test/unit/reports/test_summary_multi_prjs.js

@@ -0,0 +1,55 @@
+/**
+ * Created by Tony on 2019/3/27.
+ */
+
+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);
+
+let demoPrjs = [662, 664];
+let userId_Leng = "5c3ffa9aa0a92732f41216e0"; //小冷User Id (养护的)
+// let userId_me = "5b6a60b1c4ba33000dd417c0"; //我的
+let userId_Dft = userId_Leng;
+
+//统一引用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 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";
+
+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) {
+    //project_facade.getBudgetSummayDatas([517,521]);
+
+});
+
+test('close the connection', function (t) {
+    setTimeout(function () {
+        mongoose.disconnect();
+        t.pass('closing db connection');
+        t.end();
+    }, 1000);
+});