Browse Source

统一调用接口

TonyKang 5 năm trước cách đây
mục cha
commit
d7b3d95fe4

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

@@ -427,7 +427,7 @@ function getMultiRptsCommon(user_id, prj_id, rpt_ids, pageSize, orientation, cus
 
 function getBillsSummaryReportPages(req, user_id, prjIds, rpt_id, pageSize, orientation, customizeCfg, option, outputType, cb) {
     let rptTpl = null;
-    rptTplDataFacade.getBudgetSummayDatas(prjIds, req.session.sessionCompilation.overWriteUrl).then(function(summaryRawDataRst) {
+    rptTplDataFacade.getBudgetSummayDatas(prjIds, req.session.sessionUser.id, req.session.sessionCompilation._id, req.session.sessionCompilation.overWriteUrl).then(function(summaryRawDataRst) {
         rptTplFacade.getRptTemplate(rpt_id).then(function(rptTpl) {
             let rptDataUtil = new rptDataExtractor();
             rptDataUtil.initialize((rptTpl._doc)?rptTpl._doc:rptTpl);
@@ -506,7 +506,7 @@ function getSummaryComboPages(req, user_id, prjIds, billsSummaryRpt_ids, gljSumm
             }
         }
         if (billRpts.length > 0) {
-            rptTplDataFacade.getBudgetSummayDatas(prjIds, req.session.sessionCompilation.overWriteUrl).then(function(summaryRawDataRst) {
+            rptTplDataFacade.getBudgetSummayDatas(prjIds, req.session.sessionUser.id, req.session.sessionCompilation._id, req.session.sessionCompilation.overWriteUrl).then(function(summaryRawDataRst) {
                 // let savedBillsData = [];
                 try {
                     // Object.assign(savedBillsData, summaryRawDataRst.SummaryAuditDetail);

+ 2 - 2
modules/reports/facade/rpt_tpl_data_facade.js

@@ -43,8 +43,8 @@ function prepareProjectData(userId, prjId, filter, callback) {
     });
 }
 
-async function getBudgetSummayDatas(prjIds, overWriteUrl) {
-    return await projectFacade.getBudgetSummayDatas(prjIds, overWriteUrl);
+async function getBudgetSummayDatas(prjIds, userId, CompilationId, overWriteUrl) {
+    return await projectFacade.getBudgetSummayDatas(prjIds, userId, CompilationId, overWriteUrl);
 }
 
 async function getGLJSummayDatas(prjIds) {