Browse Source

增加序号位数

huangtf 1 year ago
parent
commit
285dc11119

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

@@ -41,7 +41,12 @@ public class ArchiveProjectConfig extends BaseEntity {
     /**
      *  流水号类型,0 默认,无虚数, 1 4位虚数
      */
-    private Integer IndexType;
+    private Integer indexType;
+
+    /**
+     *  序号位数,默认为0
+     */
+    private Integer indexNum;
 
     //是否打页码
     public boolean isPage() {

+ 1 - 1
blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchiveProjectConfigController.java

@@ -37,7 +37,7 @@ public class ArchiveProjectConfigController {
         archiveProjectConfig.setFactorType(config.getFactorType());
         archiveProjectConfig.setIndexType(config.getIndexType());
         archiveProjectConfig.setDirType(config.getDirType());
-
+        archiveProjectConfig.setIndexNum(config.getIndexNum());
         boolean result = archiveProjectConfigService.updateById(archiveProjectConfig);
         return R.status(result);
     }

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

@@ -1771,7 +1771,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		Integer indexType = 0;
 		ArchiveProjectConfig config = archiveProjectConfigService.getByProjectIdOrNew(projectId);
 
-		this.refreshFileNumberNoSlipt(list,contractId,nodeId,bforce,config.getIndexType(),config.getDirType());
+		this.refreshFileNumberNoSlipt(list,contractId,nodeId,bforce,config.getIndexType(),config.getDirType(),config.getIndexNum());
 	}
 
 	/**
@@ -1780,7 +1780,8 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 	 * @param contractId
 	 * @param nodeId
 	 */
-	public void refreshFileNumberNoSlipt(List<ArchiveTreeContract> archiveTreeContracts,Long contractId,Long nodeId,boolean bforce,Integer indexType, Integer dirType) {
+	public void refreshFileNumberNoSlipt(List<ArchiveTreeContract> archiveTreeContracts,Long contractId,Long nodeId,
+										 boolean bforce,Integer indexType, Integer dirType,Integer indexNum) {
 
 		List<ArchiveTreeContractVO2> subTreeList = new ArrayList<>();
 		List<List<ArchiveTreeContract>>  subGroupedList = new ArrayList<>();
@@ -1845,7 +1846,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 
 				String fileNumber = fileNumberPrefix +"_"+ index;
 				if (indexType == 1) {
-					String formattedIndex = String.format("%04d", index);
+					String formattedIndex = String.format("%0" + indexNum + "d", index);
 					fileNumber = fileNumberPrefix + "_" + formattedIndex;
 				}
 				if (bforce) {