From 7763960c6de146cea590807adc9f4648cc36badf Mon Sep 17 00:00:00 2001 From: "LAPTOP-0SF788NU\\admin" <3306174053@qq.com> Date: Wed, 1 Nov 2023 11:41:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B6=E4=BB=96=E6=A1=A3=E6=A1=88=E6=A1=A3?= =?UTF-8?q?=E6=A1=88-=E5=BD=92=E6=A1=A3=E7=8A=B6=E6=80=81=20=E5=8F=8A=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/20231101JS.sql | 16 ++++++++++++++++ .../vo/ElectronicOtherBaseVO.java | 2 +- .../vo/ElectronicOtherExcelVO.java | 2 +- .../vo/ElectronicOtherExportReqVO.java | 2 +- .../vo/ElectronicOtherPageReqVO.java | 2 +- .../electronicother/ElectronicOtherDO.java | 2 +- .../electronicother/ElectronicOtherMapper.java | 4 ++-- 7 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 sql/20231101JS.sql diff --git a/sql/20231101JS.sql b/sql/20231101JS.sql new file mode 100644 index 00000000..d26fb4a8 --- /dev/null +++ b/sql/20231101JS.sql @@ -0,0 +1,16 @@ +-- 其他档案表 修改归档状态默认值 +alter table electronic_other alter column archive_state set default 0; + +-- 其他档案归档状态字段修改 +ALTER TABLE electronic_other CHANGE column archive_state file_status varchar(64); + +-- 其他档案表新增 档案类型 档案位置 案卷号 +ALTER TABLE electronic_other ADD COLUMN `file_type` varchar(64) NULL DEFAULT NULL COMMENT '档案类型'; +ALTER TABLE electronic_other ADD COLUMN `site` varchar(64) NULL DEFAULT NULL COMMENT '档案位置'; +ALTER TABLE electronic_other ADD COLUMN `files_num` varchar(64) NULL DEFAULT NULL COMMENT '案卷号'; + + +-- 其他档案表 立档单位ID 库房ID 案柜ID +ALTER TABLE electronic_other ADD COLUMN `organization_id` bigint(20) NULL DEFAULT NULL COMMENT '立档单位ID'; +ALTER TABLE electronic_other ADD COLUMN `depot_id` bigint(20) NULL DEFAULT NULL COMMENT '库房ID'; +ALTER TABLE electronic_other ADD COLUMN `cabinet_id` bigint(20) NULL DEFAULT NULL COMMENT '档案柜ID'; diff --git a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicother/vo/ElectronicOtherBaseVO.java b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicother/vo/ElectronicOtherBaseVO.java index e9786f28..fe24f1c7 100644 --- a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicother/vo/ElectronicOtherBaseVO.java +++ b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicother/vo/ElectronicOtherBaseVO.java @@ -72,7 +72,7 @@ public class ElectronicOtherBaseVO { private Long userId; @Schema(description = "归档状态") - private String archiveState; + private String fileStatus; @Schema(description = "立档单位ID") private Long organizationId; diff --git a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicother/vo/ElectronicOtherExcelVO.java b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicother/vo/ElectronicOtherExcelVO.java index 575480b8..d0851fc4 100644 --- a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicother/vo/ElectronicOtherExcelVO.java +++ b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicother/vo/ElectronicOtherExcelVO.java @@ -80,7 +80,7 @@ public class ElectronicOtherExcelVO { private Long userId; @ExcelProperty("归档状态") - private String archiveState; + private String fileStatus; @ExcelProperty("立档单位ID") private Long organizationId; diff --git a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicother/vo/ElectronicOtherExportReqVO.java b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicother/vo/ElectronicOtherExportReqVO.java index 1eae3ba6..e4b248eb 100644 --- a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicother/vo/ElectronicOtherExportReqVO.java +++ b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicother/vo/ElectronicOtherExportReqVO.java @@ -75,7 +75,7 @@ public class ElectronicOtherExportReqVO { private Long userId; @Schema(description = "归档状态") - private String archiveState; + private String fileStatus; @Schema(description = "立档单位ID") private Long organizationId; diff --git a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicother/vo/ElectronicOtherPageReqVO.java b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicother/vo/ElectronicOtherPageReqVO.java index 2e4d4295..808d341c 100644 --- a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicother/vo/ElectronicOtherPageReqVO.java +++ b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicother/vo/ElectronicOtherPageReqVO.java @@ -77,7 +77,7 @@ public class ElectronicOtherPageReqVO extends PageParam { private Long userId; @Schema(description = "归档状态") - private String archiveState; + private String fileStatus; @Schema(description = "立档单位ID") private Long organizationId; diff --git a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/dal/dataobject/electronicother/ElectronicOtherDO.java b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/dal/dataobject/electronicother/ElectronicOtherDO.java index 0ac36b13..8517ef05 100644 --- a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/dal/dataobject/electronicother/ElectronicOtherDO.java +++ b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/dal/dataobject/electronicother/ElectronicOtherDO.java @@ -106,7 +106,7 @@ public class ElectronicOtherDO extends BaseDO { /** * 归档状态 */ - private String archiveState; + private String fileStatus; /** diff --git a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/dal/mysql/electronicother/ElectronicOtherMapper.java b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/dal/mysql/electronicother/ElectronicOtherMapper.java index 4f78c57d..28d756a4 100644 --- a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/dal/mysql/electronicother/ElectronicOtherMapper.java +++ b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/dal/mysql/electronicother/ElectronicOtherMapper.java @@ -39,7 +39,7 @@ public interface ElectronicOtherMapper extends BaseMapperX { .likeIfPresent(ElectronicOtherDO::getDeptName, reqVO.getDeptName()) .eqIfPresent(ElectronicOtherDO::getRecordId, reqVO.getRecordId()) .eqIfPresent(ElectronicOtherDO::getUserId, reqVO.getUserId()) - .eqIfPresent(ElectronicOtherDO::getArchiveState, reqVO.getArchiveState()) + .eqIfPresent(ElectronicOtherDO::getFileStatus, reqVO.getFileStatus()) .orderByDesc(ElectronicOtherDO::getId)); } @@ -65,7 +65,7 @@ public interface ElectronicOtherMapper extends BaseMapperX { .likeIfPresent(ElectronicOtherDO::getDeptName, reqVO.getDeptName()) .eqIfPresent(ElectronicOtherDO::getRecordId, reqVO.getRecordId()) .eqIfPresent(ElectronicOtherDO::getUserId, reqVO.getUserId()) - .eqIfPresent(ElectronicOtherDO::getArchiveState, reqVO.getArchiveState()) + .eqIfPresent(ElectronicOtherDO::getFileStatus, reqVO.getFileStatus()) .orderByDesc(ElectronicOtherDO::getId)); }