|
@@ -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) {
|
|
function getBillsSummaryReportPages(req, user_id, prjIds, rpt_id, pageSize, orientation, customizeCfg, option, outputType, cb) {
|
|
|
let rptTpl = null;
|
|
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) {
|
|
rptTplFacade.getRptTemplate(rpt_id).then(function(rptTpl) {
|
|
|
let rptDataUtil = new rptDataExtractor();
|
|
let rptDataUtil = new rptDataExtractor();
|
|
|
rptDataUtil.initialize((rptTpl._doc)?rptTpl._doc:rptTpl);
|
|
rptDataUtil.initialize((rptTpl._doc)?rptTpl._doc:rptTpl);
|
|
@@ -506,7 +506,7 @@ function getSummaryComboPages(req, user_id, prjIds, billsSummaryRpt_ids, gljSumm
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
if (billRpts.length > 0) {
|
|
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 = [];
|
|
// let savedBillsData = [];
|
|
|
try {
|
|
try {
|
|
|
// Object.assign(savedBillsData, summaryRawDataRst.SummaryAuditDetail);
|
|
// Object.assign(savedBillsData, summaryRawDataRst.SummaryAuditDetail);
|