Commit 0f0d2d7a authored by 赵啸非's avatar 赵啸非

修改本月统计

parent 41ea13f8
...@@ -64,7 +64,7 @@ public class AttendanceRecordEntity extends AttendanceRecordVo { ...@@ -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; private Date attendanceDate;
/** /**
* 备注 * 备注
......
...@@ -19,13 +19,13 @@ public class AttendanceRecordVo extends BaseEntityLong { ...@@ -19,13 +19,13 @@ public class AttendanceRecordVo extends BaseEntityLong {
private List<AttendanceGroupFixedworkSpecialVo> list; 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 = "上班打卡时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", targetAttr = "goWorkDate", type = Excel.Type.EXPORT),
@Excel(name = "上班打卡结果", readConverterExp = "1=正常,2=请假,3=缺卡,4=迟到,5=早退", targetAttr = "goWorkResult", type = Excel.Type.EXPORT), @Excel(name = "上班打卡结果", readConverterExp = "1=正常,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 = "下班打卡时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", targetAttr = "offWorkDate", type = Excel.Type.EXPORT),
@Excel(name = "下班打卡结果", readConverterExp = "1=正常,2=请假,3=缺卡,4=迟到,5=早退", targetAttr = "offWorkResult", type = Excel.Type.EXPORT) @Excel(name = "下班打卡结果", readConverterExp = "1=正常,2=请假,3=缺卡,4=迟到,5=早退", targetAttr = "offWorkResult", type = Excel.Type.EXPORT)
}) })*/
private AttendanceRecordDetailEntity attendanceRecordDetailEntity; private AttendanceRecordDetailEntity attendanceRecordDetailEntity;
/** /**
......
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