Merge branch 'lk20230426'

blade-service-api/blade-business-api/src/main/java/org/springblade/business/feign/ArchiveFileClient.java

@@ -81,6 +81,11 @@ public interface ArchiveFileClient {
     @PostMapping(API_PREFIX + "/batchDeleteArchiveFile")
     void batchDeleteArchiveFile(@RequestBody List<Long> ids);
 
+    /**
+     * 获取节点下未归档的文件
+     * @param nodeId
+     * @return
+     */
     @PostMapping(API_PREFIX + "/getListByNodeID")
-    List<ArchiveFile> getListByNodeID(@RequestParam String nodeId,@RequestParam Integer isArchive);
+    List<ArchiveFile> getListByNodeID(@RequestParam String nodeId);
 }

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

@@ -663,7 +663,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 			int specification = Integer.parseInt(specificationStr);
 			int specificationSize=specification*10;
 			//步骤3：查询节点下的未组卷文件
-			List<ArchiveFile> archiveFiles = archiveFileClient.getListByNodeID(node.getId().toString(),0);
+			List<ArchiveFile> archiveFiles = archiveFileClient.getListByNodeID(node.getId().toString());
 			//步骤4：遍历未归档文件
 			//待组卷文件集合
 			List<ArchiveFile> waitArchiveFiles = new ArrayList<>();
@@ -758,7 +758,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 			//根据分组ID来创建唯一案卷
 			Long archiveAutoGroupId=node.getArchiveAutoGroupId();
 			//步骤2：查询节点下的未归档文件
-			List<ArchiveFile> archiveFiles = archiveFileClient.getListByNodeID(node.getId().toString(),0);
+			List<ArchiveFile> archiveFiles = archiveFileClient.getListByNodeID(node.getId().toString());
 			//步骤3：遍历未归档文件
 			if(archiveFiles!=null){
 				for(ArchiveFile file:archiveFiles){
@@ -843,7 +843,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 			}
 
 			//步骤3.2：查询出当前节点未组卷的文件
-			List<ArchiveFile> archiveFiles = archiveFileClient.getListByNodeID(node.getId().toString(),0);
+			List<ArchiveFile> archiveFiles = archiveFileClient.getListByNodeID(node.getId().toString());
 			//步骤3.3：遍历未组卷文件
 			int archiveFilesSize=0;
 			for(ArchiveFile file:archiveFiles){

blade-service/blade-business/src/main/java/org/springblade/business/feignClient/ArchiveFileClientImpl.java

@@ -203,8 +203,8 @@ public class ArchiveFileClientImpl implements ArchiveFileClient {
     }
 
     @Override
-    public List<ArchiveFile> getListByNodeID(String nodeId,Integer isArchive) {
-        List<ArchiveFile> files = fileMapper.getListByNodeID(nodeId, isArchive);
+    public List<ArchiveFile> getListByNodeID(String nodeId) {
+        List<ArchiveFile> files = fileMapper.getListByNodeID(nodeId);
         return files;
     }
 

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

@@ -75,5 +75,5 @@ public interface ArchiveFileMapper extends BaseMapper<ArchiveFile> {
 
     List<ArchiveFile> getAllArchiveFileByArchiveIds(@Param("ids") List<String> ids);
 
-	public List<ArchiveFile> getListByNodeID(@Param("nodeId") String nodeId,@Param("isArchive")Integer isArchive);
+	public List<ArchiveFile> getListByNodeID(@Param("nodeId") String nodeId);
 }

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

@@ -305,7 +305,7 @@
         select * from u_archive_file
         where
           node_id = #{nodeId} and
-          is_archive = #{isArchive} and
+          ( is_archive = 0 OR is_archive IS NULL )  and
           is_deleted = 0
           order by sort
     </select>