diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceLeaveRecordEntity.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceLeaveRecordEntity.java index 693f4f5bab0089cb35c365790965985ea028b769..f1c7edef02c3060844816305609d309b4761d55e 100644 --- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceLeaveRecordEntity.java +++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceLeaveRecordEntity.java @@ -36,6 +36,7 @@ public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo { /** * 鎵€灞為儴闂� */ + @Excel(name = "閮ㄩ棬") private String deptName; /** * 鐢佃瘽鍙风爜 @@ -50,18 +51,25 @@ public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo { /** * 寮€濮嬫椂闂� */ - @Excel(name = "寮€濮嬫椂闂�", width = 30, dateFormat = "yyyy-MM-dd") + @Excel(name = "寮€濮嬫椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date startTime; /** * 缁撴潫鏃堕棿 */ - @Excel(name = "缁撴潫鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd") + @Excel(name = "缁撴潫鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date endTime; /** * 鏃堕暱,鍗曚綅绉� */ - @Excel(name = "鏃堕暱,鍗曚綅绉�") + private Integer duration; + + /** + * 閽夐拤鍘熷璇峰亣鏃堕棿璁板綍 + */ + @Excel(name = "璇峰亣鏃堕棿") + private String sourceDingTime; + /** * 璇峰亣浜嬬敱 */ @@ -110,10 +118,7 @@ public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo { * 澶勭悊鐘舵€� */ private Integer processStatus; - /** - * 閽夐拤鍘熷璇峰亣鏃堕棿璁板綍 - */ - private String sourceDingTime; + @Override public int hashCode() { return this.getId().hashCode();