diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/util/excelGroupValidation/ExcelFile.java b/admin-core/src/main/java/com/ibeetl/admin/core/util/excelGroupValidation/ExcelFile.java index 72de36cc..9766600f 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/util/excelGroupValidation/ExcelFile.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/util/excelGroupValidation/ExcelFile.java @@ -60,9 +60,9 @@ public @interface ExcelFile { boolean enableDataValidation() default false; /** - * 数据页名称 + * 数据页名称前缀,后面自动拼接上hidden。用于导入过滤用 */ - String dataSheetName() default "dataSheet"; + String dataSheetNamePrefix() default "dataSheet"; /** * 隐藏数据页 diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/util/excelGroupValidation/ExcelUtil.java b/admin-core/src/main/java/com/ibeetl/admin/core/util/excelGroupValidation/ExcelUtil.java index 7875ee82..f1062e6e 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/util/excelGroupValidation/ExcelUtil.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/util/excelGroupValidation/ExcelUtil.java @@ -60,7 +60,7 @@ public class ExcelUtil { Sheet dataSheet = null; if (annotation.enableDataValidation()) { // 创建数据页 - dataSheet = workbook.createSheet(annotation.dataSheetName()); + dataSheet = workbook.createSheet(annotation.dataSheetNamePrefix() + "_hidden"); // 设置隐藏属性 workbook.setSheetHidden(workbook.getSheetIndex(dataSheet), annotation.datasheetHidden()); } diff --git a/doc/sql/mysql/tianze-pro-update.sql b/doc/sql/mysql/tianze-pro-update.sql index dc039620..f0b64cb4 100644 --- a/doc/sql/mysql/tianze-pro-update.sql +++ b/doc/sql/mysql/tianze-pro-update.sql @@ -557,3 +557,4 @@ create table notice_read alter table notice_read comment '通知公告等-已读时间记录'; ALTER TABLE teacher_open_course_chat_log ADD COLUMN chat_log_full_id varchar(2000) COMMENT '互动日志全路径ID'; +ALTER TABLE school_class ADD COLUMN university_faculty_id bigint(20) COMMENT '院系ID';