|
|
@@ -20,6 +20,7 @@ let projectsModel = mongoose.model('projects');
|
|
|
let async_n = require("async");
|
|
|
let _ = require('lodash');
|
|
|
let ration_model = require('../models/ration');
|
|
|
+let optionModel = mongoose.model('options');
|
|
|
let bill_model = require('../models/bills');
|
|
|
let consts = require('../models/project_consts');
|
|
|
let projectConsts = consts.projectConst;
|
|
|
@@ -295,7 +296,7 @@ async function getBudgetSummayDatas(projectIDs,userID,compilationID,overWriteUrl
|
|
|
let prjTypeNames = [];
|
|
|
let compilationScopes = [];
|
|
|
let decimal = null;
|
|
|
- let isProgressiveType = false;
|
|
|
+ let isProgressiveType = true;
|
|
|
for(let ID of projectIDs){
|
|
|
projects.push(await getBillsByProjectID(ID)) ;
|
|
|
}
|
|
|
@@ -312,9 +313,11 @@ async function getBudgetSummayDatas(projectIDs,userID,compilationID,overWriteUrl
|
|
|
prjTypeNames.push(projects[i].prjTypeName);
|
|
|
compilationScopes.push(projects[i].compilationScope);
|
|
|
decimal = await mergeProject(mp.roots,projects[i].roots);
|
|
|
- if(projects[i].progressiveType == 0) isProgressiveType = true;
|
|
|
}
|
|
|
|
|
|
+ let options_setting = await optionModel.findOne({user_id: userID, compilation_id: compilationID}).lean();
|
|
|
+ if(options_setting && options_setting.options && options_setting.options.GENERALOPTS) isProgressiveType = options_setting.options.GENERALOPTS.progressiveType == 1 ?false:true;
|
|
|
+
|
|
|
let SummaryAuditDetail = getReportData(names,mp.roots,prjTypeNames,compilationScopes,decimal,isProgressiveType,mp.progressiveInterval,overWriteUrl);
|
|
|
let parentProject = await projectsModel.findOne({ID:mp.ParentID});
|
|
|
let result = {
|
