Merge remote-tracking branch 'origin/master'

blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/entity/ArchiveProjectConfig.java

@@ -36,6 +36,14 @@ public class ArchiveProjectConfig extends BaseEntity {
     //是否打页码
     public boolean isPage() {
         return getFactorType().contains("5");
-    }
-
+    };
+
+    //是否同步wbs节点
+    public boolean bSyncWbs() {
+        return getFactorType().contains("6");
+    };
+    //是否4位虚数
+    public boolean bAutoIndexLen4() {
+        return getFactorType().contains("7");
+    };
 }

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/WbsTreeVO2.java

@@ -65,6 +65,7 @@ public class WbsTreeVO2 implements INode<WbsTreeVO2> {
     }
 
     public boolean isProcessType() {
+
         if (this.getMajorDataType() != null) {
             if (this.getMajorDataType() == 1
                     || this.getMajorDataType() == 2

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

@@ -1729,7 +1729,13 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 				contractId = node.getContractId();
 			}
 		}
-		this.refreshFileNumberNoSlipt(list,contractId,nodeId,bforce);
+
+		Integer indexType = 0;
+		ArchiveProjectConfig config = archiveProjectConfigService.getByProjectIdOrNew(projectId);
+		if (config!= null && config.bAutoIndexLen4()) {
+			indexType = 1;
+		}
+		this.refreshFileNumberNoSlipt(list,contractId,nodeId,bforce,indexType);
 	}
 
 	/**
@@ -1738,7 +1744,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 	 * @param contractId
 	 * @param nodeId
 	 */
-	public void refreshFileNumberNoSlipt(List<ArchiveTreeContract> archiveTreeContracts,Long contractId,Long nodeId,boolean bforce) {
+	public void refreshFileNumberNoSlipt(List<ArchiveTreeContract> archiveTreeContracts,Long contractId,Long nodeId,boolean bforce,Integer indexType) {
 
 		List<ArchiveTreeContractVO2> subTreeList = new ArrayList<>();
 		List<List<ArchiveTreeContract>>  subGroupedList = new ArrayList<>();
@@ -1795,6 +1801,10 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 				}
 
 				String fileNumber = fileNumberPrefix +"_"+ index;
+				if (indexType == 1) {
+					String formattedIndex = String.format("%04d", index);
+					fileNumber = fileNumberPrefix + "_" + formattedIndex;
+				}
 				if (bforce) {
 					if (archiveAutoPdfService.refreshFileNumberForce(archivesAuto,fileNumber)){
 						changeList.add(archivesAuto);

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TaskServiceImpl.java

@@ -1223,7 +1223,7 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
             ArchiveProjectConfig archiveProjectConfig = archiveAutoClient.getByProjectIdOrNew(query.getProjectId());
 
             //测试阶段，必须打开项目配置才能同步wbs节点
-            if (archiveProjectConfig != null && archiveProjectConfig.getFactorType().contains("6")) {
+            if (archiveProjectConfig != null && archiveProjectConfig.bSyncWbs()) {
                 //废除
                 if (status == 0) {
                     delArchiveFileBusinessData(query.getProjectId(), query.getWbsId());

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

@@ -425,9 +425,9 @@ public class ArTreeContractInitServiceImpl {
             if(wbsTreeVO2.getNodeType() == null){
                 continue;
             }
-            if (!wbsTreeVO2.isProcessType()) {
-                continue;
-            }
+//            if (!wbsTreeVO2.isProcessType()) {
+//                continue;
+//            }
 
             //只展示指定层级之上的
             if (!wbsTreeVO2.isMatchLevel(level)) {

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

@@ -191,7 +191,7 @@ public class ArchiveTreeContractSyncImpl {
         ArchiveProjectConfig archiveProjectConfig = archiveAutoClient.getByProjectIdOrNew(projectId);
 
         //测试阶段，必须打开项目配置才能同步wbs节点
-        if (archiveProjectConfig!= null && archiveProjectConfig.getFactorType().contains("6")) {
+        if (archiveProjectConfig!= null && archiveProjectConfig.bSyncWbs()) {
             //todo 等测试OK再打开
             saveList =arTreeContractInitService.getContractExtNodes(AuthUtil.getTenantId(),projectId,dstTree,classify);
         }
@@ -628,12 +628,12 @@ public class ArchiveTreeContractSyncImpl {
             if (current == null) {
                 return null; // 如果没有找到对应的节点，则返回 null
             }
-            if (current.getNodeType() <= nodeType &&
-                    ! (current.getNodeName().contains("中间交工")
-                            || current.getNodeName().contains("质量评定")
-                            || current.getNodeName().contains("开工报告")
-                            || current.getNodeName().contains("质量检验评定")
-                            || current.getNodeName().contains("质量验收评定"))
+            if (current.getNodeType() <= nodeType
+//                    && ! (current.getNodeName().contains("中间交工")
+//                            || current.getNodeName().contains("质量评定")
+//                            || current.getNodeName().contains("开工报告")
+//                            || current.getNodeName().contains("质量检验评定")
+//                            || current.getNodeName().contains("质量验收评定"))
                           ) {
                 return current.getPKeyId(); // 如果找到了符合要求的节点，则返回其 pKeyId 属性值
             }

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

@@ -403,9 +403,9 @@ public class ArchiveTreeServiceImpl extends BaseServiceImpl<ArchiveTreeMapper, A
         for (WbsTreeVO2 wbsTreeVO2 : wbsTreeVO2List) {
             //只展示指定层级之上的
 
-            if (!wbsTreeVO2.isProcessType()) {
-                continue;
-            }
+//            if (!wbsTreeVO2.isProcessType()) {
+//                continue;
+//            }
 
             if (!wbsTreeVO2.isMatchLevel(level)) {
                 continue;