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

klp-wms/src/main/java/com/klp/domain/vo/WmsAttendanceCheckVo.java

@@ -0,0 +1,71 @@
+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 = "HH:mm")
+    private Date p1StartTime;
+    @JsonFormat(pattern = "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 = "HH:mm")
+    private Date p2StartTime;
+    @JsonFormat(pattern = "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;
+}

klp-wms/src/main/java/com/klp/domain/vo/WmsAttendanceRuleVo.java

@@ -0,0 +1,83 @@
+package com.klp.domain.vo;
+
+import java.math.BigDecimal;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.klp.common.annotation.ExcelDictFormat;
+import com.klp.common.convert.ExcelDictConvert;
+import lombok.Data;
+
+
+/**
+ * 考勤规则（迟到/早退/旷工规则配置）视图对象 wms_attendance_rule
+ *
+ * @author klp
+ * @date 2026-05-12
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class WmsAttendanceRuleVo {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long ruleId;
+
+    /**
+     * 迟到警告阈值（分钟内仅警告，不扣款）
+     */
+    @ExcelProperty(value = "迟到警告阈值", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "分=钟内仅警告，不扣款")
+    private Long lateWarn;
+
+    /**
+     * 迟到一级阈值（分钟）
+     */
+    @ExcelProperty(value = "迟到一级阈值", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "分=钟")
+    private Long lateOne;
+
+    /**
+     * 迟到二级阈值（分钟）
+     */
+    @ExcelProperty(value = "迟到二级阈值", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "分=钟")
+    private Long lateTwo;
+
+    /**
+     * 迟到一级扣款（元/次）
+     */
+    @ExcelProperty(value = "迟到一级扣款", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "元=/次")
+    private BigDecimal deductOne;
+
+    /**
+     * 迟到二级扣款（元/次）
+     */
+    @ExcelProperty(value = "迟到二级扣款", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "元=/次")
+    private BigDecimal deductTwo;
+
+    /**
+     * 超过多少分钟按旷工半天处理
+     */
+    @ExcelProperty(value = "超过多少分钟按旷工半天处理")
+    private Long absentHalfDay;
+
+    /**
+     * 连续旷工多少天自动离职
+     */
+    @ExcelProperty(value = "连续旷工多少天自动离职")
+    private Long continuousAbsentDays;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

klp-wms/src/main/java/com/klp/domain/vo/WmsAttendanceScheduleVo.java

@@ -102,6 +102,19 @@ public class WmsAttendanceScheduleVo {
     @ExcelProperty(value = "结束时间")
     private java.util.Date shiftEndTime;
 
+    /**
+     * 班次开始时间2
+     */
+    @JsonFormat(pattern = "HH:mm")
+    @ExcelProperty(value = "开始时间2")
+    private java.util.Date shiftStartTime2;
+
+    /**
+     * 班次结束时间2
+     */
+    @JsonFormat(pattern = "HH:mm")
+    @ExcelProperty(value = "结束时间2")
+    private java.util.Date shiftEndTime2;
     /**
      * 工时
      */