Commit b5a78fab authored by 廖旭伟's avatar 廖旭伟

考勤汇总导出结果列顺序修改

parent bcd09ec4
...@@ -43,6 +43,32 @@ public class AttendanceStatEntity extends AttendanceStatVo { ...@@ -43,6 +43,32 @@ public class AttendanceStatEntity extends AttendanceStatVo {
*/ */
@Excel(name = "部门名称") @Excel(name = "部门名称")
private String deptName; private String deptName;
/**
* 手机号码
*/
private String phoneNumer;
@Excel(name = "出勤天数")
private Integer workDays;
/**
* 出勤天数
*/
@Excel(name = "实际出勤天数")
private Integer goTimes;
/**
* 考勤汇总-出勤率(%)
*/
@Excel(name = "考勤汇总-出勤率",percentEnabled = true,suffix="%",scale=2)
private BigDecimal attendanceRate;
/**
* 上午缺卡次数
*/
@Excel(name = "缺卡次数")
private Integer morningTimes;
/**
* 下午缺卡次数
*/
private Integer afternoonTimes;
/** /**
* 回单位(天) * 回单位(天)
*/ */
...@@ -133,11 +159,7 @@ public class AttendanceStatEntity extends AttendanceStatVo { ...@@ -133,11 +159,7 @@ public class AttendanceStatEntity extends AttendanceStatVo {
*/ */
@Excel(name = "考勤汇总-其他") @Excel(name = "考勤汇总-其他")
private BigDecimal otherDays; private BigDecimal otherDays;
/**
* 考勤汇总-出勤率(%)
*/
@Excel(name = "考勤汇总-出勤率",percentEnabled = true,suffix="%",scale=2)
private BigDecimal attendanceRate;
/** /**
* 考勤汇总-未按规定打卡(含忘记打卡) * 考勤汇总-未按规定打卡(含忘记打卡)
*/ */
...@@ -219,26 +241,7 @@ public class AttendanceStatEntity extends AttendanceStatVo { ...@@ -219,26 +241,7 @@ public class AttendanceStatEntity extends AttendanceStatVo {
*/ */
@Excel(name = "陪产假") @Excel(name = "陪产假")
private BigDecimal paternityLeaveDays; private BigDecimal paternityLeaveDays;
/**
* 手机号码
*/
private String phoneNumer;
@Excel(name = "应到天数")
private Integer workDays;
/**
* 出勤天数
*/
@Excel(name = "出勤天数")
private Integer goTimes;
/**
* 上午缺卡次数
*/
@Excel(name = "缺卡次数")
private Integer morningTimes;
/**
* 下午缺卡次数
*/
private Integer afternoonTimes;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment