From 1d8c02e7ff54859d1c738205baff4e47b487689c Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Tue, 7 May 2024 21:39:24 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D-=E5=8A=B3=E5=8A=A1?= =?UTF-8?q?=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xz.security/controller/WorkerAccessRecordController.java | 4 ++-- .../xmgl/modules/xz.security/entity/WorkerAccessRecord.java | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/controller/WorkerAccessRecordController.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/controller/WorkerAccessRecordController.java index 42f0ac157..6437c1c90 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/controller/WorkerAccessRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/controller/WorkerAccessRecordController.java @@ -165,9 +165,9 @@ public class WorkerAccessRecordController { ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); List pageList = workerAccessRecordService.list(queryWrapper); //导出文件名称 - mv.addObject(NormalExcelConstants.FILE_NAME, "党员活动、学习讲话、党员关怀列表"); + mv.addObject(NormalExcelConstants.FILE_NAME, "导出列表"); mv.addObject(NormalExcelConstants.CLASS, WorkerAccessRecord.class); - mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("党员活动、学习讲话、党员关怀列表数据", "导出人:Jeecg", "导出信息")); + mv.addObject(NormalExcelConstants.PARAMS, new ExportParams()); mv.addObject(NormalExcelConstants.DATA_LIST, pageList); return mv; } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/WorkerAccessRecord.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/WorkerAccessRecord.java index 6c479a241..20d6e8992 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/WorkerAccessRecord.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/WorkerAccessRecord.java @@ -59,7 +59,7 @@ public class WorkerAccessRecord implements Serializable { /** * 创建时间 yyyy-MM-dd HH:mm:ss */ - @Excel(name = "创建时间 yyyy-MM-dd HH:mm:ss", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "使用时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建时间 yyyy-MM-dd HH:mm:ss") @@ -70,6 +70,5 @@ public class WorkerAccessRecord implements Serializable { @Excel(name = "更新时间 yyyy-MM-dd HH:mm:ss", width = 20, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "更新时间 yyyy-MM-dd HH:mm:ss") private java.util.Date updateTime; }