同步三环

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

@@ -40,7 +40,7 @@ public class ExternalDataArchiveFileService {
         List<ArchiveFile> upFiles = new ArrayList<>();
 
         //外部文件
-        List<ArchiveFile> externalFiles = listConvert(req.getNodeId(), req.getFiles(), externalDataInfo);
+        List<ArchiveFile> externalFiles = listConvert(req.getNodeId(), req.getFiles(), externalDataInfo,req.getTransType());
 
         List<String> outIds = Optional.ofNullable(externalFiles)
                 .orElseGet(Collections::emptyList)
@@ -61,7 +61,7 @@ public class ExternalDataArchiveFileService {
         addAndUpdateFiles(addFiles,upFiles);
     }
 
-    public List<ArchiveFile> listConvert(String nodeId, List<ArchiveFileVo> archiveFileVos, ExternalDataInfo externalDataInfo) {
+    public List<ArchiveFile> listConvert(String nodeId, List<ArchiveFileVo> archiveFileVos, ExternalDataInfo externalDataInfo,Integer transType) {
 
         List<ArchiveFile> archiveFiles = new ArrayList<>();
         Map<String, Long> archiveFileOutIdMapping = new LinkedHashMap<>();
@@ -84,9 +84,14 @@ public class ExternalDataArchiveFileService {
 
             ArchiveFile archiveFile = new ArchiveFile();
 
-            // 拷贝属性
+            //
             archiveFile.fromExternal(archiveFileVo);
 
+            //模式1，只传递未组卷得案卷
+            if (transType != null && transType == 1) {
+                archiveFile.setIsArchive(0);
+            }
+
             // 设置新ID（从映射表中获取）
             Long newNodeId = archiveFileOutIdMapping.get(archiveFileVo.getId());
             archiveFile.setId(newNodeId);

blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchivesAutoServiceImpl.java

@@ -1300,7 +1300,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		Long contractId = node.getContractId();
 		if (contractId != null && contractId != -1) {
 			ContractInfo contract = contractClient.getContractById(contractId);
-			contractName = contract.getContractName();
+			contractName = contract.getContractNumber();
 		}
 		//获取案卷题名
 		archiveName = projectName;