Merge branch 'master' of http://192.168.1.41:3000/SmartCost/ConstructionCost

modules/main/models/project.js

@@ -50,7 +50,7 @@ moduleMap[projectConsts.RATION_TEMPLATE] = ration_template;
 moduleMap[projectConsts.PROJECT_INFO] = pmController;
 moduleMap[projectConsts.EVALUATE_LIST] = evaluate_facade;
 moduleMap[projectConsts.BID_EVALUATION_LIST] = bid_facade;
-moduleMap[projectConsts.contractor_list] = contractor_facade;
+moduleMap[projectConsts.CONTRACTOR_LIST] = contractor_facade;
 
 var Project = function (){};
 

test/unit/reports/test_rpt_test_template.js

@@ -72,7 +72,7 @@ let userId_me = "5b6a60b1c4ba33000dd417c0"; //我的
 // demoPrjId = 2260; //QA:
 // demoPrjId = 5029; //
 // demoPrjId = 5029; //项目名称过长
-demoPrjId = 10430; //
+demoPrjId = 22032; //
 // demoPrjId = 4107; //UAT:
 //*/
 let userId_Dft = userId_Leng;
@@ -107,12 +107,15 @@ test('测试 - 测试模板啦: ', function (t) {
         // return;
 
         let filter = rptDataUtil.getDataRequestFilter();
+        // filter.push("project_info");
+        filter.push("contractor_list");
         // console.log(filter);
         //正常应该根据报表模板定义的数据类型来请求数据
         rptTplDataFacade.prepareProjectData(userId_Dft, demoPrjId, filter, function (err, msg, rawDataObj) {
             if (!err) {
                 try {
-                    // fsUtil.writeObjToFile(rawDataObj, "D:/GitHome/ConstructionCost/tmp/rptTplRawDataObject_测试模板.jsp");
+                    let dt = new Date();
+                    fsUtil.writeObjToFile(rawDataObj, "D:/GitHome/ConstructionCost/tmp/rptTplRawDataObject_" + dt.getTime() + "_测试模板.jsp");
                     let tplData = rptDataUtil.assembleData(rawDataObj);
                     // fsUtil.writeObjToFile(rawDataObj, "D:/GitHome/ConstructionCost/tmp/rptTplRawDataAfterCacl_测试模板.jsp");
                     // fsUtil.writeObjToFile(tplData, "D:/GitHome/ConstructionCost/tmp/rptTplAssembledData_测试模板.jsp");