Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

This commit is contained in:
2026-05-12 17:15:41 +08:00
22 changed files with 1268 additions and 36 deletions

View File

@@ -0,0 +1,19 @@
package com.klp.domain.bo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.util.Date;
@Data
public class AttendanceCheckBo {
@NotNull(message = "开始日期不能为空")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date startDate;
@NotNull(message = "结束日期不能为空")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date endDate;
}

View File

@@ -0,0 +1,20 @@
package com.klp.domain.bo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
@Data
public class WmsAttendanceCheckBo {
private Long userId;
private String employeeName;
private Long shiftId;
@JsonFormat(pattern = "yyyy-MM-dd")
private Date startDate;
@JsonFormat(pattern = "yyyy-MM-dd")
private Date endDate;
}

View File

@@ -0,0 +1,67 @@
package com.klp.domain.bo;
import com.klp.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;
import java.math.BigDecimal;
/**
* 考勤规则(迟到/早退/旷工规则配置)业务对象 wms_attendance_rule
*
* @author klp
* @date 2026-05-12
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class WmsAttendanceRuleBo extends BaseEntity {
/**
* 主键ID
*/
private Long ruleId;
/**
* 迟到警告阈值(分钟内仅警告,不扣款)
*/
private Long lateWarn;
/**
* 迟到一级阈值(分钟)
*/
private Long lateOne;
/**
* 迟到二级阈值(分钟)
*/
private Long lateTwo;
/**
* 迟到一级扣款(元/次)
*/
private BigDecimal deductOne;
/**
* 迟到二级扣款(元/次)
*/
private BigDecimal deductTwo;
/**
* 超过多少分钟按旷工半天处理
*/
private Long absentHalfDay;
/**
* 连续旷工多少天自动离职
*/
private Long continuousAbsentDays;
/**
* 备注
*/
private String remark;
}