档案合并案卷

blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchivesAutoController.java

@@ -519,14 +519,14 @@ public class ArchivesAutoController extends BladeController {
 	@ApiOperationSupport(order = 13)
 	@ApiOperation(value = "重新生成案卷", notes = "传入ids")
 	@Transactional
-	public R reCreateArchiveAuto(String ids){
+	public R reCreateArchiveAuto(@ApiParam(value = "主键集合", required = true) @RequestParam String ids){
 		//先查出勾选的案卷
-		List<ArchivesAuto> archivesAutoList=archivesAutoService.selectArchiveAutosByIds(ids);
+		List<ArchivesAuto> archivesAutoList=archivesAutoService.listByIds(Func.toLongList(ids));
 		if(archivesAutoList.size()<=1){
 			return R.fail("请选择多个案卷进行合并");
 		}
 		archivesAutoList.sort(Comparator.comparingInt(a -> {
-			String[] parts = a.getName().split("_");
+			String[] parts = a.getFileNumber().split("_");
 			return Integer.parseInt(parts[parts.length - 1]); // 取最后一个部分作为数字
 		}));
 		//根据档号后缀排序 拿到第一个

blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/ArchivesAutoMapper.java

@@ -229,7 +229,6 @@ public interface ArchivesAutoMapper extends BaseMapper<ArchivesAuto> {
 
     List<ArchivesAutoVO4> selectAllArchiveAuto(@Param("projectId")Long projectId, @Param("contractId") Long contractId, @Param("nodeIds") List<String> nodeIds,@Param("isArchive")Integer isArchive);
 
-    List<ArchivesAuto> selectArchiveAutosByIds(@Param("ids")String ids);
 
 
 }

blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/ArchivesAutoMapper.xml

@@ -1435,10 +1435,4 @@
         </foreach>
         ORDER BY uaa.auto_file_sort Asc
     </select>
-    <select id="selectArchiveAutosByIds" resultType="org.springblade.archive.entity.ArchivesAuto">
-        select * from u_archives_auto where id in
-        <foreach collection="ids" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </select>
 </mapper>

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

@@ -167,6 +167,5 @@ public interface IArchivesAutoService extends BaseService<ArchivesAuto> {
 
 	void reCreateArchiveAuto(ArchivesAuto archivesAuto, List<ArchiveFile> waitArchiveFiles);
 
-	List<ArchivesAuto> selectArchiveAutosByIds(String ids);
 
 }

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

@@ -1432,7 +1432,6 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		//生成文件对应的页码，返回url
 		archiveAutoPdfService.builtFilePageNo(archivesAuto, waitArchiveFiles);
 		this.updateById(archivesAuto);
-
 		return "";
 	}
 
@@ -1489,12 +1488,10 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		archiveAutoPdfService.buildArchiveFrontPdfs(archivesAuto.getProjectId(), archivesAuto, waitArchiveFiles, true);
 		//生成页码
 		builtFilePageNo(archivesAuto, waitArchiveFiles);
+		archiveFileClient.updateArchiveFile(waitArchiveFiles);
 	}
 
-	@Override
-	public List<ArchivesAuto> selectArchiveAutosByIds(String ids) {
-		return this.baseMapper.selectArchiveAutosByIds(ids);
-	}
+
 
 
 	/**