From 0f0d2d7a8c7f15160e1abe0bae19afc0eb63f113 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=95=B8=E9=9D=9E?= <8153694@qq.com> Date: Tue, 22 Aug 2023 16:19:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=AC=E6=9C=88=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xhx/module/attendance/model/AttendanceRecordEntity.java | 2 +- .../xhx/module/attendance/model/vo/AttendanceRecordVo.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceRecordEntity.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceRecordEntity.java index 68632b42..368dc525 100644 --- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceRecordEntity.java +++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceRecordEntity.java @@ -64,7 +64,7 @@ public class AttendanceRecordEntity extends AttendanceRecordVo { /** * 鎵撳崱鏃ユ湡 */ - @Excel(name = "鎵撳崱鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "鎵撳崱鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd") private Date attendanceDate; /** * 澶囨敞 diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/vo/AttendanceRecordVo.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/vo/AttendanceRecordVo.java index f9c00657..a535df5c 100644 --- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/vo/AttendanceRecordVo.java +++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/vo/AttendanceRecordVo.java @@ -19,13 +19,13 @@ public class AttendanceRecordVo extends BaseEntityLong { private List<AttendanceGroupFixedworkSpecialVo> list; - @Excels({ +/* @Excels({ @Excel(name = "涓婄彮鎵撳崱鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", targetAttr = "goWorkDate", type = Excel.Type.EXPORT), @Excel(name = "涓婄彮鎵撳崱缁撴灉", readConverterExp = "1=姝e父,2=璇峰亣,3=缂哄崱,4=杩熷埌,5=鏃╅€€", targetAttr = "goWorkResult", type = Excel.Type.EXPORT), @Excel(name = "涓嬬彮鎵撳崱鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", targetAttr = "offWorkDate", type = Excel.Type.EXPORT), @Excel(name = "涓嬬彮鎵撳崱缁撴灉", readConverterExp = "1=姝e父,2=璇峰亣,3=缂哄崱,4=杩熷埌,5=鏃╅€€", targetAttr = "offWorkResult", type = Excel.Type.EXPORT) - }) + })*/ private AttendanceRecordDetailEntity attendanceRecordDetailEntity; /** -- 2.24.3