From a1c6dd569daef0592b210dfadfd73719b647b398 Mon Sep 17 00:00:00 2001 From: Mlxa0324 Date: Sat, 26 Nov 2022 01:14:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jlw/entity/TeacherOpenCourseMergeResourcesQuestion.java | 5 +++++ .../com/ibeetl/jlw/web/GeneralQuestionLogController.java | 2 +- .../ibeetl/jlw/web/ResourcesQuestionSnapshotController.java | 2 +- .../TeacherOpenCourseMergeResourcesQuestionController.java | 2 +- .../jlw/web/TeacherOpenCourseQuestionLogController.java | 2 +- .../jlw/web/TeacherOpenCourseStudentSigninLogController.java | 2 +- .../com/ibeetl/jlw/web/UniversitiesCollegesController.java | 2 +- ...tiesCollegesJurisdictionExperimentalSystemController.java | 2 +- 8 files changed, 12 insertions(+), 7 deletions(-) diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesQuestion.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesQuestion.java index 779bd59d..8b66c3b9 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesQuestion.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesQuestion.java @@ -1,6 +1,7 @@ package com.ibeetl.jlw.entity; import cn.jlw.util.excel.ExcelSelector; +import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; import com.ibeetl.admin.core.annotation.Dict; import com.ibeetl.admin.core.entity.BaseEntity; @@ -20,6 +21,7 @@ public class TeacherOpenCourseMergeResourcesQuestion extends BaseEntity{ @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.TeacherOpenCourseMergeResourcesQuestion") + @ExcelIgnore private Long teacherOpenCourseMergeResourcesQuestionId ; @@ -92,14 +94,17 @@ public class TeacherOpenCourseMergeResourcesQuestion extends BaseEntity{ //题目状态 （1上架， 2下架） @Dict(type="up_status") + @ExcelIgnore private Integer questionStatus ; //后台用户ID + @ExcelIgnore private Long userId ; //组织机构ID + @ExcelIgnore private Long orgId ; diff --git a/web/src/main/java/com/ibeetl/jlw/web/GeneralQuestionLogController.java b/web/src/main/java/com/ibeetl/jlw/web/GeneralQuestionLogController.java index a30e4e6a..f14bf776 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/GeneralQuestionLogController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/GeneralQuestionLogController.java @@ -289,7 +289,7 @@ public class GeneralQuestionLogController{ List> maps = BeanCopyUtil.baseEntity2MapWithParallel(datas); - String filename = StrUtil.format("做题记录-导出 {}.xlsx", cn.hutool.core.date.DateUtil.formatDate(DateUtil.date())); + String filename = StrUtil.format("做题记录-导出 {}.xlsx", DateUtil.now()); write(resp, filename,"Sheet1", header.values(), convertData(header.keySet(), maps)); } diff --git a/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionSnapshotController.java b/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionSnapshotController.java index 9ab2e0eb..d6de8a5e 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionSnapshotController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionSnapshotController.java @@ -159,7 +159,7 @@ public class ResourcesQuestionSnapshotController extends BaseController { List> maps = baseEntity2MapWithParallel(data.getList()); - String filename = StrUtil.format("考试成绩导出 {}.xlsx", DateUtil.formatDate(DateUtil.date())); + String filename = StrUtil.format("考试成绩导出 {}.xlsx", DateUtil.now()); write(response, filename,"Sheet1", header.values(), convertData(header.keySet(), maps)); } diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeResourcesQuestionController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeResourcesQuestionController.java index 8740324f..69e1264f 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeResourcesQuestionController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeResourcesQuestionController.java @@ -483,7 +483,7 @@ public class TeacherOpenCourseMergeResourcesQuestionController extends BaseContr Assert.notNull(getUser(), "请登录后再操作"); Assert.isNull(getStudent(), "学生无法访问该接口"); - String filename = StrUtil.format("批量题目导入模板 {}", DateUtil.formatDate(DateUtil.date())); + String filename = StrUtil.format("批量题目导入模板 {}", DateUtil.now()); // 输出 Excel ExcelUtil.writeExcel(response, filename, Collections.emptyList(), TeacherOpenCourseMergeResourcesQuestion.class); diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogController.java index 4aec2d99..16e76d44 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogController.java @@ -293,7 +293,7 @@ public class TeacherOpenCourseQuestionLogController { List> maps = BeanCopyUtil.baseEntity2MapWithParallel(datas); - String filename = StrUtil.format("做题记录-导出 {}.xlsx", DateUtil.formatDate(DateUtil.date())); + String filename = StrUtil.format("做题记录-导出 {}.xlsx", DateUtil.now()); write(resp, filename,"Sheet1", header.values(), convertData(header.keySet(), maps)); } diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseStudentSigninLogController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseStudentSigninLogController.java index 13486faf..bed4f4e1 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseStudentSigninLogController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseStudentSigninLogController.java @@ -178,7 +178,7 @@ public class TeacherOpenCourseStudentSigninLogController{ List> maps = BeanCopyUtil.baseEntity2MapWithParallel(datas); - String filename = StrUtil.format("签到日志导出 {}.xlsx", DateUtil.formatDate(DateUtil.date())); + String filename = StrUtil.format("签到日志导出 {}.xlsx", DateUtil.now()); write(resp, filename,"Sheet1", header.values(), convertData(header.keySet(), maps)); } } diff --git a/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesController.java b/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesController.java index 86015e80..79c1dc25 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesController.java @@ -247,7 +247,7 @@ public class UniversitiesCollegesController{ List> maps = BeanCopyUtil.baseEntity2MapWithParallel(datas); - String filename = StrUtil.format("院校导出 {}.xlsx", DateUtil.formatDate(DateUtil.date())); + String filename = StrUtil.format("院校导出 {}.xlsx", DateUtil.now()); write(resp, filename,"Sheet1", header.values(), convertData(header.keySet(), maps)); } } diff --git a/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesJurisdictionExperimentalSystemController.java b/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesJurisdictionExperimentalSystemController.java index 6fd9a151..a3a7b104 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesJurisdictionExperimentalSystemController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesJurisdictionExperimentalSystemController.java @@ -191,7 +191,7 @@ public class UniversitiesCollegesJurisdictionExperimentalSystemController{ // // List> maps = BaseEntity2MapWithParallel(datas); // -// String filename = StrUtil.format("院校权限导出-{}.xlsx", DateUtil.formatDate(DateUtil.date())); +// String filename = StrUtil.format("院校权限导出-{}.xlsx", DateUtil.now()); // write(resp, filename,"Sheet1", header.values(), convertData(header.keySet(), maps)); } }