浏览代码

feat: 工程特征-单项工程名称,默认读取建设项目名称

vian 5 年之前
父节点
当前提交
6658171390
共有 2 个文件被更改,包括 12 次插入3 次删除
  1. 1 1
      config/config.js
  2. 11 2
      modules/pm/models/project_model.js

+ 1 - 1
config/config.js

@@ -123,7 +123,7 @@ module.exports = {
   pp_sc: {
     title: "纵横公路云造价",
     startPort: 3060,
-    server: "172.18.111.231",
+    server: "112.74.42.187",
     port: "27017",
     dbname: 'smartcost',
     options: {

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

@@ -188,15 +188,24 @@ ProjectsDAO.prototype.updateUserProjects = async function (userId, compilationId
                     //data.updateData.property.basicInformation = basicInformation;
                     //工程特征
                     if(data.updateData.property.featureLibID){
+                        const matchedConstructionProject = datas.find(item => item.updateData.projType === projectType.project);
+                        let constructionProjectName = '';
+                        if (matchedConstructionProject) {
+                            constructionProjectName = matchedConstructionProject.updateData.name;
+                        } else {
+                            const findConstructionProject = await Projects.findOne({ ID: data.updateData.ParentID }).lean();
+                            constructionProjectName = findConstructionProject && findConstructionProject.name || '';
+                        }
                         //项目类别(valuationType)、养护类别(engineering)、费用标准(feeStandard)根据新建分选的选项去赋值
                         let assign = {
                             valuationType: data.updateData.property.valuationType === ValuationType.BUDGET ? '预算' : '工程量清单',
                             engineering: data.updateData.property.engineeringName,
                             feeStandard: data.updateData.property.feeStandardName,
-                            // 新建分段文件时,默认将“工程特征”-“单项工程名称”、“编制范围”填写分段文件的名称
+                            // 新建分段文件时,默认将“编制范围”填写分段文件的名称
                             // 为了防止用户漏填,导出电子招标文件时,有数据
                             compilationScope: data.updateData.name,
-                            singleProjName: data.updateData.name,
+                            // 新建分段文件时,默认将“工程特征”-“单项工程名称”填写建设项目名称
+                            singleProjName: constructionProjectName,
                         };
                         data.updateData.property.projectFeature = await pmFacade.getProjectFeature(data.updateData.property.featureLibID, assign);
                     }