Browse Source

1.修复bug
2.新增单价文件字段

olym 7 years ago
parent
commit
0c211aeb50

+ 12 - 1
modules/glj/controllers/glj_controller.js

@@ -334,7 +334,13 @@ class GLJController extends BaseController {
                 if (currentUnitPrice === null) {
                     throw '不存在对应单价文件';
                 }
+                // 获取当前项目的rootProjectId
+                let projectData = await ProjectModel.getProject(projectId);
+                let rootProjectId = projectData.property.rootProjectID !== undefined ? projectData.property.rootProjectID : 0;
+
                 insertData = JSON.parse(JSON.stringify(currentUnitPrice));
+                insertData.root_project_id = rootProjectId;
+                insertData.user_id = insertData.user_id === undefined ? request.session.sessionUser.ssoId : insertData.user_id;
                 delete insertData._id;
                 delete insertData.ID;
             }
@@ -388,12 +394,17 @@ class GLJController extends BaseController {
         try {
             // 当前单价文件id
             let currentUnitPriceId = await ProjectModel.getUnitPriceFileId(projectId);
+            // 获取当前项目的rootProjectId
+            let projectData = await ProjectModel.getProject(projectId);
+            let rootProjectId = projectData.property.rootProjectID !== undefined ? projectData.property.rootProjectID : 0;
 
             // 新增单价文件信息
             let unitPriceFileModel = new UnitPriceFileModel();
             let insertData = {
                 name: name,
-                project_id: projectId
+                project_id: projectId,
+                user_id: request.session.sessionUser.ssoId,
+                root_project_id: rootProjectId
             };
             let addResult = await unitPriceFileModel.add(insertData);
             if (!addResult) {

+ 4 - 0
modules/glj/models/schemas/unit_price_file.js

@@ -19,6 +19,10 @@ let modelSchema = {
     },
     // 显示名称
     name: String,
+    // 所属用户id
+    user_id: Number,
+    // 顶层projectId
+    root_project_id: Number,
 };
 let model = mongoose.model(collectionName, new Schema(modelSchema, {versionKey: false, collection: collectionName}));
 export {model as default, collectionName as collectionName};

+ 3 - 1
modules/pm/models/project_model.js

@@ -75,7 +75,9 @@ ProjectsDAO.prototype.updateUserProjects = async function(userId, datas, callbac
 
                     let insertData = {
                         name: data.updateData.name,
-                        project_id: data.updateData.ID
+                        project_id: data.updateData.ID,
+                        user_id: userId,
+                        root_project_id: data.property.rootProjectID
                     };
                     let addResult = await unitPriceFileModel.add(insertData);
                     if (!addResult) {