2 Angajamente 4275213dfa ... fe529d9565

Autor SHA1 Permisiunea de a trimite mesaje. Dacă este dezactivată, utilizatorul nu va putea trimite nici un fel de mesaj Data
  laibulaizheli fe529d9565 Merge branch 'dev' of http://219.151.181.73:3000/zhuwei/bladex into dev 3 săptămâni în urmă
  laibulaizheli 928cd97482 推送平天路 3 săptămâni în urmă

+ 2 - 0
blade-service/blade-archive/src/main/java/org/springblade/archive/external/impl/ExternalDataArchiveAutoService.java

@@ -195,6 +195,7 @@ public class ExternalDataArchiveAutoService {
                     localArchive.setOutUrl(externalArchive.getOutUrl());
                     localArchive.setName(externalArchive.getName());
                     localArchive.setFileNumber(externalArchive.getFileNumber());
+                    localArchive.setNodeId(externalArchive.getNodeId());
                     upArchives.add(localArchive);
                 }
             }
@@ -206,6 +207,7 @@ public class ExternalDataArchiveAutoService {
         // 检查关键字段差异
         return !Objects.equals(external.getOutUrl(), local.getOutUrl())
                 || !Objects.equals(external.getName(), local.getName())
+                || !Objects.equals(external.getNodeId(), local.getNodeId())
                 || !Objects.equals(external.getFileNumber(), local.getFileNumber());
 
         // 扩展检查示例(如需其他字段比较,可追加条件):

+ 9 - 1
blade-service/blade-archive/src/main/java/org/springblade/archive/external/impl/ExternalDataArchiveFileService.java

@@ -191,7 +191,14 @@ public class ExternalDataArchiveFileService {
             boolean pdfUrlDifferent = external.getPdfPageUrl() != null &&
                     !Objects.equals(external.getPdfPageUrl(), local.getPdfPageUrl());
 
-            return !Objects.equals(extUtimeStr, localUtimeStr) || pdfUrlDifferent;
+            // 新增nodeId比较:当external的nodeId非空时,与local的nodeId比较
+            boolean nodeIdDifferent = external.getNodeId() != null &&
+                    !Objects.equals(external.getNodeId(), local.getNodeId());
+
+            // 任意字段不同即需要更新
+            return !Objects.equals(extUtimeStr, localUtimeStr)
+                    || pdfUrlDifferent
+                    || nodeIdDifferent; // 新增nodeId判断
         }
     }
 
@@ -210,6 +217,7 @@ public class ExternalDataArchiveFileService {
         local.setFilePage(external.getFilePage());
         local.setFileSize(external.getFileSize());
         local.setUtime(external.getUtime());
+        local.setNodeId(external.getNodeId());
         //local.setArchiveId(external.getArchiveId());
     }
 

+ 10 - 1
blade-service/blade-archive/src/main/java/org/springblade/archive/external/utils/TransUtil.java

@@ -473,7 +473,16 @@ public class TransUtil {
 
 
         // (八)缺陷责任期资料
-        put("8a0aa647278548fa9edba59b78c4", 1945023416096522240L);
+        put("1d4c9460a9954d9d8ffcccc39f78", 1945023416096522240L);
+
+        // 四、施工安全及文明施工文件
+        put("fbca27defd5e48c1b08527154f87", 1927992893478273030L);
+
+        // 五、进度控制文件
+        put("c034b7bf1f4a44b78d422821337d", 1927992893478273031L);
+
+        // 八、施工原始记录
+        put("c52cf546b94d4099b0701a023caa", 1927992893478273037L);
         //二工程管理文件
         //施工准备文件 -1.施工项目部组建、印章启用、人员任命文件,进场人员资质报审文件,施工设备仪器进场报审文件、设备仪器校验、率定文件
         //put("0b0ac82851d7484bba414bb1ccbd", 1892759789415432263L);

+ 1 - 0
blade-service/blade-business/src/main/java/org/springblade/business/feignClient/ArchiveFileClientImpl.java

@@ -330,6 +330,7 @@ public class ArchiveFileClientImpl implements ArchiveFileClient {
                         local.setFilePage(external.getFilePage());
                         local.setFileSize(external.getFileSize());
                         local.setUtime(external.getUtime());
+                        local.setNodeId(external.getNodeId());
                     }
                     return local;
                 })