组卷页码

blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/ArchiveFile.java

@@ -280,6 +280,9 @@ public class ArchiveFile extends BaseEntity {
     @ApiModelProperty("卷内索引")
     private Integer fid;
 
+    @ApiModelProperty("卷内排序")
+    private Integer archiveSort;
+
     //整改情况，0，无整改，1 待整改，2 已整改
     @ApiModelProperty("整改情况")
     private Integer rectification;

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

@@ -1458,7 +1458,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		//1.创建新案卷
 		ArchivesAuto archivesAuto = builtArchives(node, pageN, fileN, startDate, endDate, archiveName);
 		//2.设置文件所属案卷，组卷状态
-		Long archivesAutoId = archivesAuto.getId();
+		//Long archivesAutoId = archivesAuto.getId();
 
 		//封面和生成文件页码
 		archiveAutoPdfService.buildArchiveFrontPdfs(archivesAuto.getProjectId(), archivesAuto, waitArchiveFiles, false);
@@ -1466,11 +1466,9 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		builtFilePageNo(archivesAuto, waitArchiveFiles);//生成文件页码
 
 
-		for (ArchiveFile file : waitArchiveFiles) {
-			file.setArchiveId(archivesAutoId);//设置文件所属案卷
-			file.setIsArchive(1);
-
-		}
+		//设置文件所属案卷，组卷状态,排序
+		Long archivesAutoId = archivesAuto.getId();
+		setArchiveFiles(archivesAutoId,waitArchiveFiles);
 		archiveFileClient.updateArchiveFileForCreateArchive(waitArchiveFiles);
 		try {
 //			for (ArchiveFile saveVo : waitArchiveFiles) {
@@ -1517,7 +1515,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		//1.创建新案卷
 		ArchivesAuto archivesAuto = builtArchives(node, pageN, fileN, startDate, endDate, archiveName);
 		//2.设置文件所属案卷，组卷状态
-		Long archivesAutoId = archivesAuto.getId();
+		//Long archivesAutoId = archivesAuto.getId();
 
 		//封面和生成文件页码
 		archiveAutoPdfService.buildArchiveFrontPdfs(archivesAuto.getProjectId(), archivesAuto, waitArchiveFiles, false);
@@ -1525,11 +1523,9 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		builtFilePageNo(archivesAuto, waitArchiveFiles);//生成文件页码
 
 
-		for (ArchiveFile file : waitArchiveFiles) {
-			file.setArchiveId(archivesAutoId);//设置文件所属案卷
-			file.setIsArchive(1);
-
-		}
+		//设置文件所属案卷，组卷状态,排序
+		Long archivesAutoId = archivesAuto.getId();
+		setArchiveFiles(archivesAutoId,waitArchiveFiles);
 		archiveFileClient.updateArchiveFileForCreateArchive(waitArchiveFiles);
 		try {
 //			for (ArchiveFile saveVo : waitArchiveFiles) {
@@ -1601,12 +1597,16 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 
 		builtFilePageNo(archivesAuto, waitArchiveFiles);
 
-		//3.设置文件所属案卷，组卷状态
+
+//		Long archivesAutoId = archivesAuto.getId();
+//		for (ArchiveFile file : waitArchiveFiles) {
+//			file.setArchiveId(archivesAutoId);//设置文件所属案卷
+//			file.setIsArchive(1);
+//		}
+		//设置文件所属案卷，组卷状态,排序
 		Long archivesAutoId = archivesAuto.getId();
-		for (ArchiveFile file : waitArchiveFiles) {
-			file.setArchiveId(archivesAutoId);//设置文件所属案卷
-			file.setIsArchive(1);
-		}
+		setArchiveFiles(archivesAutoId,waitArchiveFiles);
+
 		archiveFileClient.updateArchiveFileForCreateArchive(waitArchiveFiles);
 		try {
 			batchCreateMetadataFiles(waitArchiveFiles);
@@ -1649,11 +1649,9 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		builtFilePageNo(archivesAuto, waitArchiveFiles);
 
 		//3.设置文件所属案卷，组卷状态
+		//设置文件所属案卷，组卷状态,排序
 		Long archivesAutoId = archivesAuto.getId();
-		for (ArchiveFile file : waitArchiveFiles) {
-			file.setArchiveId(archivesAutoId);//设置文件所属案卷
-			file.setIsArchive(1);
-		}
+		setArchiveFiles(archivesAutoId,waitArchiveFiles);
 		archiveFileClient.updateArchiveFileForCreateArchive(waitArchiveFiles);
 		try {
 //			for (ArchiveFile saveVo : waitArchiveFiles) {
@@ -1705,11 +1703,9 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		builtFilePageNo(archivesAuto, waitArchiveFiles);
 
 		//3.设置文件所属案卷，组卷状态
+		//设置文件所属案卷，组卷状态,排序
 		Long archivesAutoId = archivesAuto.getId();
-		for (ArchiveFile file : waitArchiveFiles) {
-			file.setArchiveId(archivesAutoId);//设置文件所属案卷
-			file.setIsArchive(1);
-		}
+		setArchiveFiles(archivesAutoId,waitArchiveFiles);
 		archiveFileClient.updateArchiveFileForCreateArchive(waitArchiveFiles);
 		try {
 //			for (ArchiveFile saveVo : waitArchiveFiles) {
@@ -4699,4 +4695,19 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		return R.success("保存成功");
 	}
 
+	// 归档文件设置函数
+	public  void setArchiveFiles(Long archivesAutoId, List<ArchiveFile> waitArchiveFiles) {
+		if (waitArchiveFiles == null || archivesAutoId == null) {
+			return; // 处理空指针情况
+		}
+
+		int archiveSortCounter = 1; // 从1开始递增的archiveSort计数器
+
+		for (ArchiveFile file : waitArchiveFiles) {
+			file.setArchiveId(archivesAutoId);   // 设置文件所属案卷ID
+			file.setIsArchive(1);                // 标记文件已归档
+			file.setArchiveSort(archiveSortCounter++); // 设置自增的archiveSort
+		}
+	}
+
 }

blade-service/blade-business/src/main/java/org/springblade/business/mapper/ArchiveFileMapper.xml

@@ -57,6 +57,7 @@
         <result column="is_element" property="isElement"/>
         <result column="pdf_page_url" property="pdfPageUrl"/>
         <result column="fid" property="fid"/>
+        <result column="archive_sort" property="archiveSort"/>
         <result column="rectification" property="rectification"/>
         <result column="m_wbs_tree_contract_p_key_id" property="mWbsTreeContractPKeyId"/>
         <result column="u_image_classification_file_id" property="uImageClassificationFileId"/>
@@ -440,7 +441,7 @@
         from u_archive_file
         where archive_id = #{archiveId}
           and is_deleted = 0
-        order by sort,sort_num,create_time
+        order by archive_sort,sort,sort_num,create_time
     </select>