From 5fdef9812e312ab1980bee1a933cee51f611bf80 Mon Sep 17 00:00:00 2001 From: JiilingLee <462362@qq.com> Date: Wed, 18 Oct 2023 10:46:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B6=E4=BB=96=E4=BC=9A=E8=AE=A1=E8=B5=84?= =?UTF-8?q?=E6=96=99=E5=BD=92=E6=A1=A3=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/accounting20230925JilingLee.sql | 2 +- .../accounting/controller/admin/other/vo/OtherBaseVO.java | 3 +++ .../accounting/controller/admin/other/vo/OtherExcelVO.java | 2 +- .../controller/admin/other/vo/OtherExportReqVO.java | 2 +- .../accounting/controller/admin/other/vo/OtherPageReqVO.java | 2 +- .../accounting/controller/admin/other/vo/OtherRespVO.java | 2 +- .../yudao/module/accounting/dal/dataobject/other/OtherDO.java | 2 +- .../yudao/module/accounting/dal/mysql/other/OtherMapper.java | 4 ++-- .../module/archives/service/record/RecordServiceImpl.java | 2 +- 9 files changed, 12 insertions(+), 9 deletions(-) diff --git a/sql/accounting20230925JilingLee.sql b/sql/accounting20230925JilingLee.sql index b2846338..2e6f58dd 100644 --- a/sql/accounting20230925JilingLee.sql +++ b/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', diff --git a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/other/vo/OtherBaseVO.java b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/other/vo/OtherBaseVO.java index dc99f20b..e847e554 100644 --- a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/other/vo/OtherBaseVO.java +++ b/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; + } diff --git a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/other/vo/OtherExcelVO.java b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/other/vo/OtherExcelVO.java index 4a128875..3b6154c9 100644 --- a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/other/vo/OtherExcelVO.java +++ b/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; diff --git a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/other/vo/OtherExportReqVO.java b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/other/vo/OtherExportReqVO.java index c9dd115a..dff8a512 100644 --- a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/other/vo/OtherExportReqVO.java +++ b/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; diff --git a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/other/vo/OtherPageReqVO.java b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/other/vo/OtherPageReqVO.java index a3915745..93ef9d1d 100644 --- a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/other/vo/OtherPageReqVO.java +++ b/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; diff --git a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/other/vo/OtherRespVO.java b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/other/vo/OtherRespVO.java index 48e3b62a..7c5dc783 100644 --- a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/other/vo/OtherRespVO.java +++ b/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; } diff --git a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/dal/dataobject/other/OtherDO.java b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/dal/dataobject/other/OtherDO.java index f0202961..92555cf6 100644 --- a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/dal/dataobject/other/OtherDO.java +++ b/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; /** * 备注 */ diff --git a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/dal/mysql/other/OtherMapper.java b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/dal/mysql/other/OtherMapper.java index 37d742cd..ea25096f 100644 --- a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/dal/mysql/other/OtherMapper.java +++ b/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 { .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 { .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)); } 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 ce48b3e2..88b42789 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 @@ -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); } }