Joshi
41a31e7568
- 移除了 WmsAttendanceCheck 实体中 delFlag 字段的 TableLogic 注解 - 修复了跨天情况下工作日期范围计算的逻辑错误 - 修正了跨天考勤窗口开始时间的计算方式 - 将考勤检查VO中时间段字段的时间格式从 HH:mm 更新为 yyyy-MM-dd HH:mm
72 lines
2.2 KiB
Java
72 lines
2.2 KiB
Java
package com.klp.domain.vo;
|
|
|
|
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
|
import com.alibaba.excel.annotation.ExcelProperty;
|
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
|
import lombok.Data;
|
|
|
|
import java.math.BigDecimal;
|
|
import java.util.Date;
|
|
|
|
@Data
|
|
@ExcelIgnoreUnannotated
|
|
public class WmsAttendanceCheckVo {
|
|
|
|
private Long checkId;
|
|
private Long scheduleId;
|
|
private Long userId;
|
|
|
|
@ExcelProperty(value = "员工姓名")
|
|
private String employeeName;
|
|
|
|
@JsonFormat(pattern = "yyyy-MM-dd")
|
|
@ExcelProperty(value = "日期")
|
|
private Date workDate;
|
|
|
|
@ExcelProperty(value = "班次")
|
|
private String shiftName;
|
|
|
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
|
|
private Date p1StartTime;
|
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
|
|
private Date p1EndTime;
|
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
|
|
private Date p1FirstCheck;
|
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
|
|
private Date p1LastCheck;
|
|
@ExcelProperty(value = "上午迟到(分钟)")
|
|
private Integer p1LateMinutes;
|
|
@ExcelProperty(value = "上午早退(分钟)")
|
|
private Integer p1EarlyMinutes;
|
|
@ExcelProperty(value = "上午状态")
|
|
private String p1Status;
|
|
@ExcelProperty(value = "上午扣款")
|
|
private BigDecimal p1Deduct;
|
|
|
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
|
|
private Date p2StartTime;
|
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
|
|
private Date p2EndTime;
|
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
|
|
private Date p2FirstCheck;
|
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
|
|
private Date p2LastCheck;
|
|
@ExcelProperty(value = "下午迟到(分钟)")
|
|
private Integer p2LateMinutes;
|
|
@ExcelProperty(value = "下午早退(分钟)")
|
|
private Integer p2EarlyMinutes;
|
|
@ExcelProperty(value = "下午状态")
|
|
private String p2Status;
|
|
@ExcelProperty(value = "下午扣款")
|
|
private BigDecimal p2Deduct;
|
|
|
|
@ExcelProperty(value = "旷工类型")
|
|
private String absentType;
|
|
@ExcelProperty(value = "连续旷工天数")
|
|
private Integer continuousAbsentDays;
|
|
@ExcelProperty(value = "总扣款")
|
|
private BigDecimal totalDeduct;
|
|
@ExcelProperty(value = "总体状态")
|
|
private String overallStatus;
|
|
}
|