From 4752e32d3a4c2a1d6fc288f77cab6f374dd127bb Mon Sep 17 00:00:00 2001 From: JiilingLee <462362@qq.com> Date: Tue, 24 Oct 2023 11:34:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E8=AE=A1=E6=8A=A5=E8=A1=A8=E5=BD=92?= =?UTF-8?q?=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/20231016JS.sql | 4 ++-- .../admin/accountingreport/vo/AccountingReportBaseVO.java | 4 ++-- .../accountingreport/vo/AccountingReportExcelVO.java | 4 ++-- .../accountingreport/vo/AccountingReportExportReqVO.java | 4 ++-- .../accountingreport/vo/AccountingReportPageReqVO.java | 4 ++-- .../dataobject/accountingreport/AccountingReportDO.java | 4 ++-- .../mysql/accountingreport/AccountingReportMapper.java | 8 ++++---- .../module/archives/service/record/RecordServiceImpl.java | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/sql/20231016JS.sql b/sql/20231016JS.sql index d3811e8f..d46a878d 100644 --- a/sql/20231016JS.sql +++ b/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', - `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 '住户编号', diff --git a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/accountingreport/vo/AccountingReportBaseVO.java b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/accountingreport/vo/AccountingReportBaseVO.java index 372b774c..fe7a89df 100644 --- a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/accountingreport/vo/AccountingReportBaseVO.java +++ b/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; diff --git a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/accountingreport/vo/AccountingReportExcelVO.java b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/accountingreport/vo/AccountingReportExcelVO.java index c0dd846d..0c63d228 100644 --- a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/accountingreport/vo/AccountingReportExcelVO.java +++ b/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; diff --git a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/accountingreport/vo/AccountingReportExportReqVO.java b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/accountingreport/vo/AccountingReportExportReqVO.java index 4172d719..777383cd 100644 --- a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/accountingreport/vo/AccountingReportExportReqVO.java +++ b/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; diff --git a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/accountingreport/vo/AccountingReportPageReqVO.java b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/accountingreport/vo/AccountingReportPageReqVO.java index df6fedc4..dbb5b9b3 100644 --- a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/accountingreport/vo/AccountingReportPageReqVO.java +++ b/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; diff --git a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/dal/dataobject/accountingreport/AccountingReportDO.java b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/dal/dataobject/accountingreport/AccountingReportDO.java index e1facfae..5cea80d9 100644 --- a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/dal/dataobject/accountingreport/AccountingReportDO.java +++ b/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 */ diff --git a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/dal/mysql/accountingreport/AccountingReportMapper.java b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/dal/mysql/accountingreport/AccountingReportMapper.java index 93e50967..850a6e5c 100644 --- a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/dal/mysql/accountingreport/AccountingReportMapper.java +++ b/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 .eqIfPresent(AccountingReportDO::getPeriod, reqVO.getPeriod()) .betweenIfPresent(AccountingReportDO::getCreateTime, reqVO.getCreateTime()) .eqIfPresent(AccountingReportDO::getEncrypt, reqVO.getEncrypt()) - .eqIfPresent(AccountingReportDO::getArchiveId, reqVO.getArchiveId()) - .eqIfPresent(AccountingReportDO::getArchiveState, reqVO.getArchiveState()) + .eqIfPresent(AccountingReportDO::getRecordId, reqVO.getRecordId()) + .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 .eqIfPresent(AccountingReportDO::getPeriod, reqVO.getPeriod()) .betweenIfPresent(AccountingReportDO::getCreateTime, reqVO.getCreateTime()) .eqIfPresent(AccountingReportDO::getEncrypt, reqVO.getEncrypt()) - .eqIfPresent(AccountingReportDO::getArchiveId, reqVO.getArchiveId()) - .eqIfPresent(AccountingReportDO::getArchiveState, reqVO.getArchiveState()) + .eqIfPresent(AccountingReportDO::getRecordId, reqVO.getRecordId()) + .eqIfPresent(AccountingReportDO::getFileStatus, reqVO.getFileStatus()) .eqIfPresent(AccountingReportDO::getDeptId, reqVO.getDeptId()) .likeIfPresent(AccountingReportDO::getDeptName, reqVO.getDeptName()) .orderByDesc(AccountingReportDO::getId)); diff --git a/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/service/record/RecordServiceImpl.java b/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/service/record/RecordServiceImpl.java index bebfc002..c87cb42b 100644 --- a/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/service/record/RecordServiceImpl.java +++ b/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.setArchiveState(AccountingStatusEnum.LOGFILE.getValue()); + accountingReportDO.setRecordId(recordId); + accountingReportDO.setFileStatus(AccountingStatusEnum.LOGFILE.getValue()); accountingReportMapper.updateById(accountingReportDO); } }