|
|
@@ -112,7 +112,7 @@ ProjectsDAO.prototype.getUserProject = function (userId, ProjId, callback) {
|
|
|
});
|
|
|
};
|
|
|
|
|
|
-ProjectsDAO.prototype.updateUserProjects = async function (userId, compilationId, compilationName, datas, callback) {
|
|
|
+ProjectsDAO.prototype.updateUserProjects = async function (userId, compilationId, compilationName,overWriteUrl, datas, callback) {
|
|
|
let data, project, updateLength = 0, hasError = false, deleteInfo = null, i, newProject;
|
|
|
let updateAll = function (err) {
|
|
|
if (!err) {
|
|
|
@@ -174,6 +174,10 @@ ProjectsDAO.prototype.updateUserProjects = async function (userId, compilationId
|
|
|
data.updateData.property.displaySetting = displaySetting;
|
|
|
|
|
|
data.updateData.property.billsCalcMode = 0;
|
|
|
+ if(overWriteUrl && overWriteUrl !=""){
|
|
|
+ let overWrite = require("../../.."+overWriteUrl);
|
|
|
+ if(overWrite.getBillsCalcMode) data.updateData.property.billsCalcMode = overWrite.getBillsCalcMode();//重写清单计费取费方式
|
|
|
+ }
|
|
|
data.updateData.property.zanguCalcMode = 0;
|
|
|
//计算选项
|
|
|
data.updateData.property.calcOptions = calcOptions;
|