会计报表归档

sql/20231016JS.sql

@@ -15,8 +15,8 @@ CREATE TABLE `lyr-one`.`archives_accounting_report`  (
                                        `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',
+                                       `record_id` bigint(20) NULL DEFAULT NULL COMMENT '归档id',
-                                       `archive_state` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '归档状态',
+                                       `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/accountingreport/vo/AccountingReportBaseVO.java

@@ -43,10 +43,10 @@ public class AccountingReportBaseVO {
     private String encrypt;
 
     @Schema(description = "归档id", example = "25739")
-    private Long archiveId;
+    private Long recordId;
 
     @Schema(description = "归档状态")
-    private String archiveState;
+    private String fileStatus;
 
     @Schema(description = "部门id", example = "6314")
     private Long deptId;

yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/accountingreport/vo/AccountingReportExcelVO.java

@@ -51,10 +51,10 @@ public class AccountingReportExcelVO {
     private String encrypt;
 
     @ExcelProperty("归档id")
-    private Long archiveId;
+    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/accountingreport/vo/AccountingReportExportReqVO.java

@@ -45,10 +45,10 @@ public class AccountingReportExportReqVO {
     private String encrypt;
 
     @Schema(description = "归档id", example = "25739")
-    private Long archiveId;
+    private Long recordId;
 
     @Schema(description = "归档状态")
-    private String archiveState;
+    private String fileStatus;
 
     @Schema(description = "部门id", example = "6314")
     private Long deptId;

yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/accountingreport/vo/AccountingReportPageReqVO.java

@@ -47,10 +47,10 @@ public class AccountingReportPageReqVO extends PageParam {
     private String encrypt;
 
     @Schema(description = "归档id", example = "25739")
-    private Long archiveId;
+    private Long recordId;
 
     @Schema(description = "归档状态")
-    private String archiveState;
+    private String fileStatus;
 
     @Schema(description = "部门id", example = "6314")
     private Long deptId;

yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/dal/dataobject/accountingreport/AccountingReportDO.java

@@ -67,11 +67,11 @@ public class AccountingReportDO extends BaseDO {
     /**
      * 归档id
      */
-    private Long archiveId;
+    private Long recordId;
     /**
      * 归档状态
      */
-    private String archiveState;
+    private String fileStatus;
     /**
      * 部门id
      */

yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/dal/mysql/accountingreport/AccountingReportMapper.java

@@ -31,8 +31,8 @@ public interface AccountingReportMapper extends BaseMapperX<AccountingReportDO>
                 .eqIfPresent(AccountingReportDO::getPeriod, reqVO.getPeriod())
                 .betweenIfPresent(AccountingReportDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(AccountingReportDO::getEncrypt, reqVO.getEncrypt())
-                .eqIfPresent(AccountingReportDO::getArchiveId, reqVO.getArchiveId())
+                .eqIfPresent(AccountingReportDO::getRecordId, reqVO.getRecordId())
-                .eqIfPresent(AccountingReportDO::getArchiveState, reqVO.getArchiveState())
+                .eqIfPresent(AccountingReportDO::getFileStatus, reqVO.getFileStatus())
                 .eqIfPresent(AccountingReportDO::getDeptId, reqVO.getDeptId())
                 .likeIfPresent(AccountingReportDO::getDeptName, reqVO.getDeptName())
                 .orderByDesc(AccountingReportDO::getId));
@@ -50,8 +50,8 @@ public interface AccountingReportMapper extends BaseMapperX<AccountingReportDO>
                 .eqIfPresent(AccountingReportDO::getPeriod, reqVO.getPeriod())
                 .betweenIfPresent(AccountingReportDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(AccountingReportDO::getEncrypt, reqVO.getEncrypt())
-                .eqIfPresent(AccountingReportDO::getArchiveId, reqVO.getArchiveId())
+                .eqIfPresent(AccountingReportDO::getRecordId, reqVO.getRecordId())
-                .eqIfPresent(AccountingReportDO::getArchiveState, reqVO.getArchiveState())
+                .eqIfPresent(AccountingReportDO::getFileStatus, reqVO.getFileStatus())
                 .eqIfPresent(AccountingReportDO::getDeptId, reqVO.getDeptId())
                 .likeIfPresent(AccountingReportDO::getDeptName, reqVO.getDeptName())
                 .orderByDesc(AccountingReportDO::getId));

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

@@ -252,8 +252,8 @@ public class RecordServiceImpl implements RecordService {
             for (Long id : ids) {
                 AccountingReportDO accountingReportDO = new AccountingReportDO();
                 accountingReportDO.setId(id);
-                accountingReportDO.setArchiveId(recordId);
+                accountingReportDO.setRecordId(recordId);
-                accountingReportDO.setArchiveState(AccountingStatusEnum.LOGFILE.getValue());
+                accountingReportDO.setFileStatus(AccountingStatusEnum.LOGFILE.getValue());
                 accountingReportMapper.updateById(accountingReportDO);
             }
         }