修正刷新档号接口

blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchivesAutoController.java

@@ -275,7 +275,10 @@ public class ArchivesAutoController extends BladeController {
 	@ApiOperation(value = "获取归档树同级节点", notes = "传入节点id")
 	public R test1() {
 
-		archiveAutoPdfService.test1();
+		//archiveAutoPdfService.test1();
+		Long projectId = 1645263362890129410L;
+		List<ArchiveTreeContract> list = archiveTreeContractClient.getListByProjectId(projectId);
+		archivesAutoService.refreshFileNumberNoSlipt(list);
 		return R.data("");
 	}
 

blade-service/blade-archive/src/main/java/org/springblade/archive/service/IArchiveAutoPdfService.java

@@ -2,6 +2,7 @@ package org.springblade.archive.service;
 
 import org.springblade.archive.entity.ArchivesAuto;
 import org.springblade.business.entity.ArchiveFile;
+import org.springblade.manager.entity.ArchiveTreeContract;
 
 import java.util.List;
 import java.util.Map;
@@ -28,4 +29,5 @@ public interface IArchiveAutoPdfService {
 
     //合并pdf
     String MergePdfAndUpload(List<String> urlList,String fileName,String filePath,Long projectId) ;
+
 }

blade-service/blade-archive/src/main/java/org/springblade/archive/service/IArchivesAutoService.java

@@ -20,6 +20,7 @@ import org.springblade.archive.entity.ArchivesAuto;
 import org.springblade.archive.vo.ArchivesAutoVO;
 import org.springblade.core.mp.base.BaseService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.manager.entity.ArchiveTreeContract;
 
 import java.util.List;
 import java.util.Map;
@@ -68,4 +69,7 @@ public interface IArchivesAutoService extends BaseService<ArchivesAuto> {
 
 	//从案卷里删除文件
 	boolean removeFiles(String ids);
+
+
+	void refreshFileNumberNoSlipt(List<ArchiveTreeContract> archiveTreeContracts);
 }

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

@@ -963,6 +963,16 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		return this.list(queryWrapper);
 	}
 
+
+	/**
+	 * 刷新项目档号
+	 * @param projectId
+	 */
+	public void refreshFileNumberNoSlipt(Long projectId) {
+		List<ArchiveTreeContract> list = archiveTreeContractClient.getListByProjectId(projectId);
+		this.refreshFileNumberNoSlipt(list);
+	}
+
 	/**
 	 * 不重组的情况下刷新档号
 	 * @param archiveTreeContracts
@@ -985,7 +995,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 			index =1;
 			List<ArchivesAuto> archivesAutos = findArchivesAutosByIds(ids);
 			if (archivesAutos == null || archivesAutos.size() == 0) {
-				return;
+				continue;
 			}
 			String fileNumberPrefix=subList.get(0).getFileNumberPrefix();
 			String archiveNameSuffix=subList.get(0).getArchiveNameSuffix();
@@ -1126,4 +1136,5 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 	}
 
 
+
 }

blade-service/blade-archive/src/main/java/org/springblade/archive/utils/ArchiveTreeUtil.java

@@ -45,9 +45,14 @@ public class ArchiveTreeUtil {
                 subTreeList.add(subTree);
 
             }else {
-                for (ArchiveTreeContractVO2 contractNode : subTree.getChildren()){
-                    subTreeList.add(contractNode);
+                if (subTree.getChildren().get(0).getExtType() == 2) {
+                    for (ArchiveTreeContractVO2 contractNode : subTree.getChildren()){
+                        subTreeList.add(contractNode);
+                    }
+                }else {
+                    subTreeList.add(subTree);
                 }
+
             }
         }
 

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ArchiveTreeContractMapper.xml

@@ -331,9 +331,9 @@
         order by tree_sort asc
     </select>
     <select id="getListByProjectId" resultType="org.springblade.manager.entity.ArchiveTreeContract">
-        select id,project_id as projectId,parent_id as parentId,ancestors,node_name as nodeName,status,is_deleted as isDeleted,create_time as createTime
+        select id,project_id as projectId,parent_id as parentId,ancestors,node_name as nodeName,status,tree_code as treeCode, ext_type as extType, is_deleted as isDeleted,create_time as createTime
         from m_archive_tree_contract
-        where project_id=#{projectId};
+        where project_id=#{projectId} and is_deleted = 0 order by tree_sort asc;
     </select>