状态问题

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

@@ -73,8 +73,8 @@ public class ArchiveFileTaskController extends BladeController {
                 //固定水印图片章
                 String pngQzUrl = "https://bladex-chongqing-info.oss-cn-hangzhou.aliyuncs.com//upload/20230911/5b42583d931664b785ebf481c37d17bc.png";
                 for (ArchiveFile archiveFile : archiveFileList) {
-                    if (!archiveFile.getStatus().equals(0) || !archiveFile.getStatus().equals(3)) {
-                        throw new ServiceException("只有【未上报】状态的业务数据才能认证！");
+                    if (Arrays.asList(1, 2).contains(archiveFile.getStatus())) {
+                        throw new ServiceException("只有【未上报 或 已废除】状态的业务数据才能认证！");
                     }
                     if (!archiveFile.getIsCertification().equals(0)) {
                         throw new ServiceException("只有【未认证】状态的业务数据才能认证！");

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

@@ -379,8 +379,8 @@ public class TaskController extends BladeController {
         List<ArchiveFile> archiveFiles = jdbcTemplate.query("select * from u_archive_file where id in (" + archiveTaskBatchReportDTO.getDataIds() + ")", new BeanPropertyRowMapper<>(ArchiveFile.class));
         if (archiveFiles.size() > 0) {
             for (ArchiveFile archive : archiveFiles) {
-                if (!archive.getStatus().equals(0) || !archive.getStatus().equals(3)) {
-                    throw new ServiceException("只有【未上报】状态的业务数据才能上报！");
+                if (Arrays.asList(1, 2).contains(archive.getStatus())) {
+                    throw new ServiceException("只有【未上报 或 已废除】状态的业务数据才能上报！");
                 }
                 if (!archive.getIsCertification().equals(0)) {
                     throw new ServiceException("只有【未认证】状态的业务数据才能上报！");