档案分卷

blade-service/blade-business/src/main/java/org/springblade/business/controller/ArchiveFileController.java

@@ -553,8 +553,8 @@ public class ArchiveFileController extends BladeController {
     @GetMapping("/selectVolumeBefore")
     @ApiOperationSupport(order = 3)
     @ApiOperation(value = "查询分卷之前的文件")
-    public R<VolumeDto3> selectVolumeBefore(@RequestParam Long archiveId){
-        VolumeDto3 dto = archiveFileService.selectVolumeBefore(archiveId);
+    public R<VolumeDto3> selectVolumeBefore(@RequestParam Long archiveId,Integer type){
+        VolumeDto3 dto = archiveFileService.selectVolumeBefore(archiveId,type);
         return R.data(dto);
     }
 }

blade-service/blade-business/src/main/java/org/springblade/business/service/IArchiveFileService.java

@@ -86,5 +86,5 @@ public interface IArchiveFileService extends BaseService<ArchiveFile> {
 
     List<VolumeDto1> selectVolumeAfter(Long archiveId);
 
-    VolumeDto3 selectVolumeBefore(Long archiveId);
+    VolumeDto3 selectVolumeBefore(Long archiveId,Integer type);
 }

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

@@ -465,7 +465,7 @@ public class ArchiveFileServiceImpl extends BaseServiceImpl<ArchiveFileMapper, A
     }
 
     @Override
-    public VolumeDto3 selectVolumeBefore(Long archiveId) {
+    public VolumeDto3 selectVolumeBefore(Long archiveId,Integer type) {
         ArchivesAuto auto = archiveAutoClient.getArchiveById(archiveId);
         VolumeDto3 dto=new VolumeDto3();
         if(auto.getIsVolume()==1&&StringUtils.isEmpty(auto.getVolumeIds())){
@@ -474,11 +474,13 @@ public class ArchiveFileServiceImpl extends BaseServiceImpl<ArchiveFileMapper, A
             String sql="select id,file_number,file_name,file_time,duty_user,file_page from u_archive_file where archive_id="+auto.getId()+" and is_deleted=0 order by archive_sort,sort,sort_num,create_time";
             List<VolumeDto4> dto2s = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(VolumeDto4.class));
             dto.getList().addAll(dto2s);
-            for (String autoId : archivesAutoIds) {
-                String sql1="select id,file_number,file_name,file_time,duty_user,file_page from u_archive_file where archive_id="+autoId+" and is_deleted=0 order by archive_sort,sort,sort_num,create_time";
-                List<VolumeDto4> dto2s1 = jdbcTemplate.query(sql1, new BeanPropertyRowMapper<>(VolumeDto4.class));
-                dto2s1.stream().forEach(dto2 -> dto2.setIsCheck(1));
-                dto.getList().addAll(dto2s);
+            if(type==2){
+                for (String autoId : archivesAutoIds) {
+                    String sql1="select id,file_number,file_name,file_time,duty_user,file_page from u_archive_file where archive_id="+autoId+" and is_deleted=0 order by archive_sort,sort,sort_num,create_time";
+                    List<VolumeDto4> dto2s1 = jdbcTemplate.query(sql1, new BeanPropertyRowMapper<>(VolumeDto4.class));
+                    dto2s1.stream().forEach(dto2 -> dto2.setIsCheck(1));
+                    dto.getList().addAll(dto2s);
+                }
             }
             dto.setId(auto.getId());
             dto.setName(auto.getName());