组卷提名规则

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

@@ -60,6 +60,6 @@ public interface IArchiveNameService {
      */
     String generateFullLevelName(
             List<Long> nodeList,
-            NodeHierarchy hierarchy
+            NodeHierarchy hierarchy,boolean useCovering
     );
 }

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

@@ -203,7 +203,7 @@ public class ArchiveNameServiceImpl implements IArchiveNameService {
     @Override
     public String generateFullLevelName(
             List<Long> nodeIds,
-            NodeHierarchy hierarchy
+            NodeHierarchy hierarchy,boolean useCovering
     ) {
         // 1. 获取输入节点
         Map<Long, ArchiveTreeContract> allNodeMap = hierarchy.getAllNodeMap();
@@ -283,7 +283,7 @@ public class ArchiveNameServiceImpl implements IArchiveNameService {
                                 }
                             }
 
-                            if (allGroupsFullyCovered) {
+                            if (allGroupsFullyCovered && useCovering) {
                                 nameParts.add(getLevelName(hierarchy, grandParentId));
                                 canUseGrandParentName = true;
                             }
@@ -317,7 +317,7 @@ public class ArchiveNameServiceImpl implements IArchiveNameService {
                 int childrenCount = (allChildren != null) ? allChildren.size() : 0;
 
                 // 检查是否全覆盖所有子节点
-                if (childrenCount > 0 && groupNodes.size() == childrenCount) {
+                if (childrenCount > 0 && groupNodes.size() == childrenCount ) {
                     // 只有组内第一个父节点使用完整层级名称
                     String parentName = firstParentInGroup ?
                             getLevelName(hierarchy, groupId) :

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

@@ -1289,7 +1289,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 
 
 	private String builtArchiveName_new(List<ArchiveFile> waitArchiveFiles, ArchiveTreeContract node, boolean isCrossNode
-	,IArchiveNameService.NodeHierarchy nameInfo,Set<Long> multiVolumeNodes) {
+	,IArchiveNameService.NodeHierarchy nameInfo,Set<Long> multiVolumeNodes,Integer archiveAutoType) {
 
 		String archiveName = "";
 
@@ -1359,9 +1359,14 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 
 		String fullPath = "";
 		if (extFlag == true) {
-			fullPath =  archiveNameService.generateFullLevelName(nodeIds, nameInfo);
+			fullPath =  archiveNameService.generateFullLevelName(nodeIds, nameInfo,true);
 		}else {
-			fullPath =  node.getNodeName();
+			//独立组卷，且非工序节点，取节点名曾即可
+			if (archiveAutoType == 3) {
+				fullPath =  node.getNodeName();
+			}else {
+				fullPath =  archiveNameService.generateFullLevelName(nodeIds, nameInfo,false);
+			}
 		}
 
 
@@ -1552,7 +1557,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 			return;
 		}
 
-		String archiveName = builtArchiveName_new(waitArchiveFiles, node, false,nameInfo,multiVolumeNodes);//获取案卷题名
+		String archiveName = builtArchiveName_new(waitArchiveFiles, node, false,nameInfo,multiVolumeNodes,3);//获取案卷题名
 		//1.创建新案卷
 		ArchivesAuto archivesAuto = builtArchives(node, pageN, fileN, startDate, endDate, archiveName);
 		//2.设置文件所属案卷，组卷状态
@@ -1628,7 +1633,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		}
 		//默认组卷存在跨节点组卷  注意案卷归属节点，案卷命名方式
 		//获取案卷题名
-		String archiveName = builtArchiveName_new(waitArchiveFiles, node, true,nameInfo,multiVolumeNodes);//获取案卷题名
+		String archiveName = builtArchiveName_new(waitArchiveFiles, node, true,nameInfo,multiVolumeNodes,2);//获取案卷题名
 
 		//1.创建新案卷
 		ArchivesAuto archivesAuto = builtArchives(node, pageN, fileN, startDate, endDate, archiveName);