|
@@ -21,7 +21,7 @@ public class KaoqinRecord extends BaseEntity
|
|
|
private Long recordId;
|
|
|
|
|
|
/** 打卡人id */
|
|
|
- @Excel(name = "打卡人id")
|
|
|
+
|
|
|
private Long userId;
|
|
|
|
|
|
/** 打卡人姓名 */
|
|
@@ -29,7 +29,7 @@ public class KaoqinRecord extends BaseEntity
|
|
|
private String userName;
|
|
|
|
|
|
/** 部门Id */
|
|
|
- @Excel(name = "部门Id")
|
|
|
+
|
|
|
private Long deptId;
|
|
|
|
|
|
/** 部门名称 */
|
|
@@ -37,7 +37,7 @@ public class KaoqinRecord extends BaseEntity
|
|
|
private String deptName;
|
|
|
|
|
|
/** 部门祖籍列表 */
|
|
|
- @Excel(name = "部门祖籍列表")
|
|
|
+
|
|
|
private String ancestors;
|
|
|
|
|
|
/** 打卡时间 年 */
|
|
@@ -65,15 +65,13 @@ public class KaoqinRecord extends BaseEntity
|
|
|
private String kaAddressAmIn;
|
|
|
|
|
|
/** 打卡地点经度-暂时无用 */
|
|
|
- @Excel(name = "打卡地点经度-暂时无用")
|
|
|
+
|
|
|
private String kaLog;
|
|
|
|
|
|
/** 打卡地点维度--暂时无用 */
|
|
|
- @Excel(name = "打卡地点维度--暂时无用")
|
|
|
private String kaLat;
|
|
|
|
|
|
/** 打卡分类 1:上午上班 2:上午下班 3:下午上班 4:下午下班-暂时无用 */
|
|
|
- @Excel(name = "打卡分类 1:上午上班 2:上午下班 3:下午上班 4:下午下班-暂时无用")
|
|
|
private String kaSort;
|
|
|
|
|
|
/** 打卡地点名称-上午下班 */
|
|
@@ -109,19 +107,19 @@ public class KaoqinRecord extends BaseEntity
|
|
|
private Date kaTimePmOut;
|
|
|
|
|
|
/** 打卡类别-上午上班 1正常 2:迟到 3:外勤 4:早退 */
|
|
|
- @Excel(name = "打卡类别-上午上班 1正常 2:迟到 3:外勤 4:早退 ")
|
|
|
+ @Excel(name = "打卡类别 ",readConverterExp = "1=正常,2=迟到,3=外勤,4=早退,5=缺卡")
|
|
|
private String kaTypeAmIn;
|
|
|
|
|
|
/** 打卡类别-上午下班 1正常 2:迟到 3:外勤 4:早退 */
|
|
|
- @Excel(name = "打卡类别-上午下班 1正常 2:迟到 3:外勤 4:早退")
|
|
|
+ @Excel(name = "打卡类别 ",readConverterExp = "1=正常,2=迟到,3=外勤,4=早退,5=缺卡")
|
|
|
private String kaTypeAmOut;
|
|
|
|
|
|
/** 打卡类别-下午上班 1正常 2:迟到 3:外勤 4:早退 */
|
|
|
- @Excel(name = "打卡类别-下午上班 1正常 2:迟到 3:外勤 4:早退")
|
|
|
+ @Excel(name = "打卡类别 ",readConverterExp = "1=正常,2=迟到,3=外勤,4=早退,5=缺卡")
|
|
|
private String kaTypePmIn;
|
|
|
|
|
|
/** 打卡类别-下午下班 1正常 2:迟到 3:外勤 4:早退 */
|
|
|
- @Excel(name = "打卡类别-下午下班 1正常 2:迟到 3:外勤 4:早退")
|
|
|
+ @Excel(name = "打卡类别 ",readConverterExp = "1=正常,2=迟到,3=外勤,4=早退,5=缺卡")
|
|
|
private String kaTypePmOut;
|
|
|
|
|
|
/**
|
|
@@ -146,23 +144,18 @@ public class KaoqinRecord extends BaseEntity
|
|
|
private String kaPmOutPhoto;
|
|
|
|
|
|
/** 打卡状态 1正常 2异常 */
|
|
|
- @Excel(name = "打卡状态 1正常 2异常")
|
|
|
private String kaStatus;
|
|
|
|
|
|
/** $column.columnComment */
|
|
|
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
|
|
private String remarkAmIn;
|
|
|
|
|
|
/** 备注 */
|
|
|
- @Excel(name = "备注")
|
|
|
private String remarkAmOut;
|
|
|
|
|
|
/** $column.columnComment */
|
|
|
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
|
|
private String remarkPmIn;
|
|
|
|
|
|
/** $column.columnComment */
|
|
|
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
|
|
private String remarkPmOut;
|
|
|
|
|
|
public String getKaType() {
|