会计账簿归档

sql/book20230922Js.sql

@@ -16,8 +16,8 @@ CREATE TABLE `lyr-one`.`archives_accounting_book`  (
                                        `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
                                        `deleted` bit(1) NULL DEFAULT b'0' COMMENT '是否删除',
                                        `encrypt` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '加密',
-                                       `archive_id` bigint(20) NULL DEFAULT NULL COMMENT '归档id',
-                                       `archive_state` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '归档状态',
+                                       `record_id` bigint(20) NULL DEFAULT NULL COMMENT '归档id',
+                                       `file_status` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '归档状态',
                                        `dept_id` bigint(20) NULL DEFAULT NULL COMMENT '部门id',
                                        `dept_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门',
                                        `tenant_id` bigint(20) NULL DEFAULT NULL COMMENT '住户编号',

yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/accountingbook/vo/AccountingBookBaseVO.java

@@ -43,7 +43,7 @@ public class AccountingBookBaseVO {
     private Long recordId;
 
     @Schema(description = "归档状态")
-    private String archiveState;
+    private String fileStatus;
 
     @Schema(description = "部门id", example = "15870")
     private Long deptId;

yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/accountingbook/vo/AccountingBookExcelVO.java

@@ -51,7 +51,7 @@ public class AccountingBookExcelVO {
     private Long recordId;
 
     @ExcelProperty("归档状态")
-    private String archiveState;
+    private String fileStatus;
 
     @ExcelProperty("部门id")
     private Long deptId;

yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/accountingbook/vo/AccountingBookExportReqVO.java

@@ -45,7 +45,7 @@ public class AccountingBookExportReqVO {
     private Long recordId;
 
     @Schema(description = "归档状态")
-    private String archiveState;
+    private String fileStatus;
 
     @Schema(description = "部门id", example = "15870")
     private Long deptId;

yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/accountingbook/vo/AccountingBookPageReqVO.java

@@ -53,7 +53,7 @@ public class AccountingBookPageReqVO extends PageParam {
     private Long recordId;
 
     @Schema(description = "归档状态")
-    private String archiveState;
+    private String fileStatus;
 
     @Schema(description = "部门id", example = "15870")
     private Long deptId;

yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/dal/dataobject/accountingbook/AccountingBookDO.java

@@ -79,7 +79,7 @@ public class AccountingBookDO extends BaseDO {
     /**
      * 归档状态
      */
-    private String archiveState;
+    private String fileStatus;
     /**
      * 部门id
      */

yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/dal/mysql/accountingbook/AccountingBookMapper.java

@@ -34,7 +34,7 @@ public interface AccountingBookMapper extends BaseMapperX<AccountingBookDO> {
                 .betweenIfPresent(AccountingBookDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(AccountingBookDO::getEncrypt, reqVO.getEncrypt())
                 .eqIfPresent(AccountingBookDO::getRecordId, reqVO.getRecordId())
-                .eqIfPresent(AccountingBookDO::getArchiveState, reqVO.getArchiveState())
+                .eqIfPresent(AccountingBookDO::getFileStatus, reqVO.getFileStatus())
                 .eqIfPresent(AccountingBookDO::getDeptId, reqVO.getDeptId())
                 .likeIfPresent(AccountingBookDO::getName,reqVO.getName())
                 .likeIfPresent(AccountingBookDO::getDeptName, reqVO.getDeptName())
@@ -53,7 +53,7 @@ public interface AccountingBookMapper extends BaseMapperX<AccountingBookDO> {
                 .betweenIfPresent(AccountingBookDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(AccountingBookDO::getEncrypt, reqVO.getEncrypt())
                 .eqIfPresent(AccountingBookDO::getRecordId, reqVO.getRecordId())
-                .eqIfPresent(AccountingBookDO::getArchiveState, reqVO.getArchiveState())
+                .eqIfPresent(AccountingBookDO::getFileStatus, reqVO.getFileStatus())
                 .eqIfPresent(AccountingBookDO::getDeptId, reqVO.getDeptId())
                 .likeIfPresent(AccountingBookDO::getDeptName, reqVO.getDeptName())
                 .orderByDesc(AccountingBookDO::getId));

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

@@ -233,7 +233,7 @@ public class RecordServiceImpl implements RecordService {
                 AccountingBookDO accountingBookDO = new AccountingBookDO();
                 accountingBookDO.setId(id);
                 accountingBookDO.setRecordId(recordId);
-                accountingBookDO.setArchiveState(AccountingStatusEnum.LOGFILE.getValue());
+                accountingBookDO.setFileStatus(AccountingStatusEnum.LOGFILE.getValue());
                 accountingBookMapper.updateById(accountingBookDO);
             }
         }