其他会计资料归档状态字段修改

sql/accounting20230925JilingLee.sql

@@ -27,7 +27,7 @@ CREATE TABLE `accounting_other`  (
                                      `record_id` bigint(20) NULL DEFAULT NULL COMMENT '归档id',
                                      `user_id` bigint(20) NULL DEFAULT NULL COMMENT '用户id',
                                      `deleted` bit(1) NULL DEFAULT b'0' COMMENT '是否删除',
-                                     `archive_state` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '归档状态',
+                                     `file_status` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '归档状态',
                                      `tenant_id` bigint(20) NOT NULL COMMENT '租户编号 一个集团/总公司对应一个租户',
                                      `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
                                      `attr1` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '预留字段1',

yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/other/vo/OtherBaseVO.java

@@ -50,4 +50,7 @@ public class OtherBaseVO {
     @Schema(description = "文件地址")
     private String fileUrl;
 
+    @Schema(description = "归档状态")
+    private String fileStatus;
+
 }

yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/other/vo/OtherExcelVO.java

@@ -81,7 +81,7 @@ public class OtherExcelVO {
     private Long userId;
 
     @ExcelProperty("归档状态")
-    private String archiveState;
+    private String fileStatus;
 
     @ExcelProperty("备注")
     private String remark;

yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/other/vo/OtherExportReqVO.java

@@ -72,7 +72,7 @@ public class OtherExportReqVO {
     private Long userId;
 
     @Schema(description = "归档状态")
-    private String archiveState;
+    private String fileStatus;
 
     @Schema(description = "备注", example = "你猜")
     private String remark;

yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/other/vo/OtherPageReqVO.java

@@ -74,7 +74,7 @@ public class OtherPageReqVO extends PageParam {
     private Long userId;
 
     @Schema(description = "归档状态")
-    private String archiveState;
+    private String fileStatus;
 
     @Schema(description = "备注", example = "你猜")
     private String remark;

yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/other/vo/OtherRespVO.java

@@ -41,6 +41,6 @@ public class OtherRespVO extends OtherBaseVO {
     private Long userId;
 
     @Schema(description = "归档状态")
-    private String archiveState;
+    private String fileStatus;
 
 }

yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/dal/dataobject/other/OtherDO.java

@@ -104,7 +104,7 @@ public class OtherDO extends BaseDO {
     /**
      * 归档状态
      */
-    private String archiveState;
+    private String fileStatus;
     /**
      * 备注
      */

yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/dal/mysql/other/OtherMapper.java

@@ -38,7 +38,7 @@ public interface OtherMapper extends BaseMapperX<OtherDO> {
                 .likeIfPresent(OtherDO::getDeptName, reqVO.getDeptName())
                 .eqIfPresent(OtherDO::getRecordId, reqVO.getRecordId())
                 .eqIfPresent(OtherDO::getUserId, reqVO.getUserId())
-                .eqIfPresent(OtherDO::getArchiveState, reqVO.getArchiveState())
+                .eqIfPresent(OtherDO::getFileStatus, reqVO.getFileStatus())
                 .eqIfPresent(OtherDO::getRemark, reqVO.getRemark())
                 .orderByDesc(OtherDO::getId));
     }
@@ -64,7 +64,7 @@ public interface OtherMapper extends BaseMapperX<OtherDO> {
                 .likeIfPresent(OtherDO::getDeptName, reqVO.getDeptName())
                 .eqIfPresent(OtherDO::getRecordId, reqVO.getRecordId())
                 .eqIfPresent(OtherDO::getUserId, reqVO.getUserId())
-                .eqIfPresent(OtherDO::getArchiveState, reqVO.getArchiveState())
+                .eqIfPresent(OtherDO::getFileStatus, reqVO.getFileStatus())
                 .eqIfPresent(OtherDO::getRemark, reqVO.getRemark())
                 .orderByDesc(OtherDO::getId));
     }

yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/service/record/RecordServiceImpl.java

@@ -238,7 +238,7 @@ public class RecordServiceImpl implements RecordService {
                 OtherDO otherDO = new OtherDO();
                 otherDO.setId(id);
                 otherDO.setRecordId(recordId);
-                otherDO.setArchiveState(AccountingStatusEnum.LOGFILE.getValue());
+                otherDO.setFileStatus(AccountingStatusEnum.LOGFILE.getValue());
                 otherMapper.updateById(otherDO);
             }
         }