vian 4 лет назад
Родитель
Сommit
43ac2e7008

+ 1 - 0
modules/all_models/projects.js

@@ -16,6 +16,7 @@ const shareSchema = new Schema({
 }, {versionKey: false, _id: false});
 const ProjectSchema = new Schema({
     "ID":{type: Number, index: true},
+    "GUID": String, // 接口需要
     "ParentID": Number,
     "NextSiblingID": Number,
     "userID": String,

+ 3 - 0
modules/pm/facade/pm_facade.js

@@ -572,6 +572,7 @@ async function copyExample(userID, compilation, projIDs,nameMap){
         data.NextSiblingID = IDMapping[data.NextSiblingID] ? IDMapping[data.NextSiblingID] : -1;
         data.createDateTime = newDate;
         data.userID = userID;
+        data.GUID = uuidV1();
         data.compilation = compilation;
         data.fileVer = await index.getVersion();
         data.shareInfo = [];
@@ -662,6 +663,7 @@ async function copyProject(userID, compilationID, data, newProjectID = null, del
     logger.info("复制项目: 旧项目ID: "+originalID+ " ------- 新项目ID: "+newProjectID);
     //更新项目的属性;
     projectMap['copy'].document.ID = newProjectID;
+    projectMap['copy'].document.GUID = uuidV1();
     if(projectMap['copy'].document.property.calcProgramFile){
         projectMap['copy'].document.property.calcProgramFile.ID = calcProgramFileID;
     }
@@ -2329,6 +2331,7 @@ async function handleMainProjectDatas(mainData,updateData,userID) {
             p.ParentID = projectIDMap[p.ParentID];
             p.NextSiblingID = projectIDMap[p.NextSiblingID];
         }
+        p.GUID = uuidV1(); // 接口需要
         p.userID =userID;
         p.shareInfo=[];
         if(p.projType == "Tender"){

+ 2 - 0
modules/pm/models/project_model.js

@@ -53,6 +53,7 @@ let Projects = mongoose.model('projects');
 let mainColLibModel = mongoose.model('std_main_col_lib');
 let projSettingModel = mongoose.model('proj_setting');
 let optionModel = mongoose.model('options');
+const uuidV1 = require('uuid/v1');
 
 function ProjectsDAO() {
 }
@@ -140,6 +141,7 @@ ProjectsDAO.prototype.updateUserProjects = async function (userId, compilationId
                 if(compilation.overWriteUrl && compilation.overWriteUrl!=""){
                     overWrite = require("../../.."+compilation.overWriteUrl);
                 }
+                data.updateData.GUID = uuidV1();
                 data.updateData['userID'] = userId;
                 data.updateData['compilation'] = compilationId;
                 data.updateData['createDateTime'] = new Date();