原生电子文件

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

@@ -712,13 +712,17 @@ public class ArchiveAutoPdfServiceImpl implements IArchiveAutoPdfService {
         }
 
         // 将日期赋值给startDate和endDate
-        if (!minDate.isEmpty()) {
-            LocalDateTime localDateTime = FormulaUtil.parseStringToLocalDateTime(minDate,"yyyyMMdd");
-            archive.setStartDate(localDateTime);
-        }
-        if (!maxDate.isEmpty()) {
-            LocalDateTime localDateTime = FormulaUtil.parseStringToLocalDateTime(maxDate,"yyyyMMdd");
-            archive.setEndDate(localDateTime);
+        try {
+            if (!minDate.isEmpty()) {
+                LocalDateTime localDateTime = FormulaUtil.parseStringToLocalDateTime(minDate,"yyyyMMdd");
+                archive.setStartDate(localDateTime);
+            }
+            if (!maxDate.isEmpty()) {
+                LocalDateTime localDateTime = FormulaUtil.parseStringToLocalDateTime(maxDate,"yyyyMMdd");
+                archive.setEndDate(localDateTime);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
 
         Map<String, Object> archivesAutoMap = new ObjectMapper().convertValue(archive, Map.class);

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

@@ -680,9 +680,17 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
     public void archiveAutoMethod(Long projectId, Long contractId, Long nodeId) {
         //步骤一：把档号集合初始化
         indexMap = new HashMap<>();
-        //步骤二：查询归档树节点。存在未归档文件的节点。
+        //步list = {ArrayList@18238}  size = 19骤二：查询归档树节点。存在未归档文件的节点。
         List<ArchiveTreeContract> list = archiveTreeContractClient.getHavedFileNodeByProjectID(projectId);
 
+
+		if (nodeId!= null) {
+			ArchiveTreeContract node = archiveTreeContractClient.getArchiveTreeContractById(nodeId);
+			if (node!= null && node.getContractId() != null) {
+				contractId = node.getContractId();
+			}
+		}
+
         //按合同段过滤
         List<ArchiveTreeContract> authlist = authFilter(list, contractId, nodeId);
 
@@ -1681,6 +1689,12 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 	 */
 	public void refreshFileNumberNoSlipt(Long projectId,Long contractId,Long nodeId,boolean bforce) {
 		List<ArchiveTreeContract> list = archiveTreeContractClient.getListByProjectId(projectId);
+		if (nodeId!= null) {
+			ArchiveTreeContract node = archiveTreeContractClient.getArchiveTreeContractById(nodeId);
+			if (node!= null && node.getContractId() != null) {
+				contractId = node.getContractId();
+			}
+		}
 		this.refreshFileNumberNoSlipt(list,contractId,nodeId,bforce);
 	}
 
@@ -2058,12 +2072,12 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 						result.add(contract);
 					}
 				}else{
-					if (StringUtils.isEmpty(contract.getTreeCode()) || contractId.toString().equals(contract.getTreeCode())) {
+					if (StringUtils.isEmpty(contract.getTreeCode()) || contractId.toString().equals(contract.getTreeCode())  || contractId.equals(contract.getContractId())) {
 						result.add(contract);
 					}
 				}
 			} else {
-				if (treeCode.equals(contract.getTreeCode()) || contractId.toString().equals(contract.getTreeCode())) {
+				if (treeCode.equals(contract.getTreeCode()) || contractId.toString().equals(contract.getTreeCode()) || contractId.equals(contract.getContractId())) {
 					result.add(contract);
 				}
 			}

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ArchiveTreeContractSyncImpl.java

@@ -266,6 +266,7 @@ public class ArchiveTreeContractSyncImpl {
                     for (ContractRelationJlyz contractRelationJlyz: list) {
                         syncBusinessData(projectId,contractRelationJlyz.getId(),2);
                     }
+
                 }else {
                     //将项目未锁定案卷拆卷
                     syncBusinessData(projectId,contractId,1);