|
@@ -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) {
|