TonyKang 6 лет назад
Родитель
Сommit
07aa4ddd28

+ 2 - 2
modules/pm/facade/pm_facade.js

@@ -706,8 +706,8 @@ function getBuildingArea(projFeature){
 
 
 //根据单位工程ID获取经济指标信息
 //根据单位工程ID获取经济指标信息
 //@param {Number}prj_id @return {Object}
 //@param {Number}prj_id @return {Object}
-async function getIndexReportData(prj_id) {
-    return await project_facade.getIndexReportData(prj_id);
+async function getIndexReportData(prj_id, filters) {
+    return await project_facade.getIndexReportData(prj_id, filters);
 }
 }
 
 
 //根据单位工程ID获取汇总信息
 //根据单位工程ID获取汇总信息

+ 1 - 1
modules/reports/controllers/rpt_controller.js

@@ -242,7 +242,7 @@ function getAllPagesCommon(user_id, prj_id, rpt_id, pageSize, orientation, custo
                 }
                 }
             }
             }
             if (economicRst.length > 0) {
             if (economicRst.length > 0) {
-                promiseArr[2] = pm_facade.getIndexReportData(prj_id);
+                promiseArr[2] = pm_facade.getIndexReportData(prj_id, economicRst);
             }
             }
             rptTplDataFacade.prepareProjectData(user_id, prj_id, filter, function (err, msg, rawDataObj) {
             rptTplDataFacade.prepareProjectData(user_id, prj_id, filter, function (err, msg, rawDataObj) {
                 if (!err) {
                 if (!err) {

+ 1 - 1
test/unit/reports/test_rpt_test_template.js

@@ -67,7 +67,7 @@ let userId_me = "5b6a60b1c4ba33000dd417c0"; //我的
 // demoPrjId = 2260; //QA:
 // demoPrjId = 2260; //QA:
 // demoPrjId = 5029; //
 // demoPrjId = 5029; //
 // demoPrjId = 5029; //项目名称过长
 // demoPrjId = 5029; //项目名称过长
-demoPrjId = 8464; //
+demoPrjId = 8522; //
 // demoPrjId = 4107; //UAT:
 // demoPrjId = 4107; //UAT:
 //*/
 //*/
 let userId_Dft = userId_Leng;
 let userId_Dft = userId_Leng;