广西接口code sync

web/building_saas/standard_interface/export/guangxi_common.js

@@ -258,7 +258,7 @@ INTERFACE_EXPORT = (() => {
         this.attrs = [];
         this.children = [];
       }
-  
+
       // 建设项目根节点信息
       function CprjInfo(projectName) {
         let baseInfo = _.find(projectData.property.basicInformation, {
@@ -268,6 +268,7 @@ INTERFACE_EXPORT = (() => {
         let Zbdljg = _.find(baseInfo.items, { "key": "proxy" });
         let Shijian = _.find(baseInfo.items, { "key": "compileDate" });
         let Zbbh = _.find(baseInfo.items, { "key": "projNum" });
+        let keyId = _.find(baseInfo.items, { "key": "keyId" });
         const attrs = [{
             name: "CprjName",
             value: projectName,
@@ -294,7 +295,7 @@ INTERFACE_EXPORT = (() => {
           },
           {
             name: "KeyId",
-            value: uuid.v1()
+            value: (keyId) ? keyId : uuid.v1()
           }
         ];
         Element.call(this, "CprjInfo", attrs);
@@ -311,6 +312,7 @@ INTERFACE_EXPORT = (() => {
   
         //投标的时候取基本信息的makeData字段
         if(isBidSubmission) makeData = _.find(baseInfo.items, { "key": "makeDate" });
+        let keyId = _.find(baseInfo.items, { "key": "systemInfoKeyId" });
         let hardID = UTIL.generateHardwareId();
         let [cpuId, diskId, macId] = hardID.split(";");
         const attrs = [{
@@ -351,7 +353,7 @@ INTERFACE_EXPORT = (() => {
           },
           {
             name: "KeyId",
-            value: uuid.v1()
+            value: (keyId) ? keyId : uuid.v1()
           }
         ];
         // if (isBidSubmission)

web/building_saas/standard_interface/import/guangxi_common.js

@@ -78,7 +78,11 @@ INTERFACE_IMPORT = (() => {
           { key: 'natureConstruction', value: natureConstruction },  
           { key: 'terrainCategory', value: terrainCategory },  
           { key: 'roadGrade', value: roadGrade },  
-          { key: 'makeDate', value: getValue(CprjInfo, ['SystemInfo','_MakeDate']) },  
+          { key: 'makeDate', value: getValue(CprjInfo, ['SystemInfo','_MakeDate']) },
+          { key: 'keyId', value: getValue(CprjInfo, ['KeyId']) },
+          { key: 'systemInfoKeyId', value: getValue(CprjInfo, ['SystemInfo','KeyId']) },
+          { key: 'CostBasisKeyId', value: getValue(CprjInfo, ['CostBasis','KeyId']) },
+          // { key: 'keyId', value: getValue(CprjInfo, ['SystemInfo','KeyId']) },
   
         ]
         for (let t of EprjInfos) {