From fe4a5c78dc6c4e21e57d9652be9d4a42dccf0ca1 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 05 十一月 2026 20:29:07 +0800
Subject: [PATCH] fix(hrm): 考勤异常申请字段匹配与申请人回填；补充 hrm_audit_status 字典脚本
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmSalaryCalculationRespVO.java | 135 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 124 insertions(+), 11 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmSalaryCalculationRespVO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmSalaryCalculationRespVO.java
index 945b210..e15afb1 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmSalaryCalculationRespVO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmSalaryCalculationRespVO.java
@@ -8,6 +8,7 @@
import lombok.Data;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
@Schema(description = "绠＄悊鍚庡彴 - 钖叕鏍哥畻 Response VO")
@@ -41,6 +42,126 @@
@ExcelProperty("閮ㄩ棬鍚嶇О")
private String deptName;
+ @Schema(description = "鍏ヨ亴鏃ユ湡")
+ @ExcelProperty("鍏ヨ亴鏃ユ湡")
+ private LocalDate hireDate;
+
+ @Schema(description = "宀椾綅鍚嶇О锛堝涓敤閫楀彿鍒嗛殧锛�")
+ @ExcelProperty("宀椾綅")
+ private String postName;
+
+ // ========== 涔濇硴宸ヨ祫琛細鏍囧噯椤癸紙鍙栬嚜鍛樺伐妗ｆ锛� ==========
+
+ @Schema(description = "鏍囧噯宸ヨ祫")
+ @ExcelProperty("鏍囧噯宸ヨ祫")
+ private BigDecimal standardSalary;
+
+ @Schema(description = "宀椾綅宸ヨ祫")
+ @ExcelProperty("宀椾綅宸ヨ祫")
+ private BigDecimal postSalary;
+
+ @Schema(description = "鍔犵彮宸ヨ祫鏍囧噯锛堝厓/灏忔椂锛�")
+ @ExcelProperty("鍔犵彮宸ヨ祫(鏍囧噯)")
+ private BigDecimal overtimeHourlyRate;
+
+ @Schema(description = "瀹夊叏鐜繚濂栨爣鍑�")
+ @ExcelProperty("瀹夊叏鐜繚濂�(鏍囧噯)")
+ private BigDecimal safetyAwardStandard;
+
+ @Schema(description = "缁╂晥鏍囧噯")
+ @ExcelProperty("缁╂晥(鏍囧噯)")
+ private BigDecimal performanceStandard;
+
+ // ========== 涔濇硴宸ヨ祫琛細鍑哄嫟涓庤钖� ==========
+
+ @Schema(description = "鏍囧噯鍑哄嫟澶╂暟")
+ @ExcelProperty("鏍囧噯鍑哄嫟澶╂暟")
+ private Integer workDays;
+
+ @Schema(description = "璁¤柂鍑哄嫟锛堝ぉ锛�")
+ @ExcelProperty("璁¤柂鍑哄嫟")
+ private BigDecimal paidAttendanceDays;
+
+ @Schema(description = "鏍囧噯鍑哄嫟鏃堕暱锛堝皬鏃讹級")
+ @ExcelProperty("鏍囧噯鍑哄嫟鏃堕暱")
+ private BigDecimal standardWorkHours;
+
+ @Schema(description = "鍔犵彮鏃堕暱锛堝皬鏃讹級")
+ @ExcelProperty("鍔犵彮鏃堕暱")
+ private BigDecimal overtimeHours;
+
+ @Schema(description = "娉曞畾鍋囨棩鏃堕暱锛堝皬鏃讹級")
+ @ExcelProperty("娉曞畾鍋囨棩鏃堕暱")
+ private BigDecimal legalHolidayHours;
+
+ @Schema(description = "鏍囧噯鍑哄嫟宸ヨ祫")
+ @ExcelProperty("鏍囧噯鍑哄嫟宸ヨ祫")
+ private BigDecimal standardAttendancePay;
+
+ @Schema(description = "鍔犵彮宸ヨ祫")
+ @ExcelProperty("鍔犵彮宸ヨ祫")
+ private BigDecimal overtimePay;
+
+ @Schema(description = "娉曞畾鍋囧伐璧�")
+ @ExcelProperty("娉曞畾鍋囧伐璧�")
+ private BigDecimal legalHolidayPay;
+
+ @Schema(description = "瀹夊叏鐜繚濂�")
+ @ExcelProperty("瀹夊叏鐜繚濂�")
+ private BigDecimal safetyAward;
+
+ @Schema(description = "娴姩缁╂晥宸ヨ祫")
+ @ExcelProperty("娴姩缁╂晥宸ヨ祫")
+ private BigDecimal floatingPerformancePay;
+
+ @Schema(description = "搴斾粯宸ヨ祫")
+ @ExcelProperty("搴斾粯宸ヨ祫")
+ private BigDecimal payableSalary;
+
+ @Schema(description = "宸ラ緞宸ヨ祫")
+ @ExcelProperty("宸ラ緞宸ヨ祫")
+ private BigDecimal seniorityPay;
+
+ @Schema(description = "澶滅彮琛ュ姪")
+ @ExcelProperty("澶滅彮琛ュ姪")
+ private BigDecimal nightShiftAllowance;
+
+ @Schema(description = "瀛﹀巻琛ヨ创")
+ @ExcelProperty("瀛﹀巻琛ヨ创")
+ private BigDecimal educationAllowance;
+
+ @Schema(description = "浣撴")
+ @ExcelProperty("浣撴")
+ private BigDecimal healthCheckAllowance;
+
+ @Schema(description = "浼樼鍛樺伐濂�")
+ @ExcelProperty("浼樼鍛樺伐濂�")
+ private BigDecimal excellentEmployeeAward;
+
+ @Schema(description = "鍏朵粬琛ュ姪")
+ @ExcelProperty("鍏朵粬琛ュ姪")
+ private BigDecimal otherSubsidy;
+
+ @Schema(description = "閮ㄩ棬缁╂晥")
+ @ExcelProperty("閮ㄩ棬缁╂晥")
+ private BigDecimal deptPerformance;
+
+ @Schema(description = "鍔犻」鍚堣")
+ @ExcelProperty("鍔犻」鍚堣")
+ private BigDecimal additionTotal;
+
+ @Schema(description = "婕忔墦鍗�")
+ @ExcelProperty("婕忔墦鍗�")
+ private BigDecimal missedPunchDeduction;
+
+ @Schema(description = "杩熷埌鏃╅��")
+ @ExcelProperty("杩熷埌鏃╅��")
+ private BigDecimal lateEarlyDeduction;
+
+ @Schema(description = "鎵ｆ鍚堣")
+ @ExcelProperty("鎵ｆ鍚堣")
+ private BigDecimal deductionTotal;
+
@Schema(description = "鍩烘湰宸ヨ祫")
@ExcelProperty("鍩烘湰宸ヨ祫")
private BigDecimal baseSalary;
@@ -48,10 +169,6 @@
@Schema(description = "缁╂晥宸ヨ祫")
@ExcelProperty("缁╂晥宸ヨ祫")
private BigDecimal performanceSalary;
-
- @Schema(description = "鍔犵彮宸ヨ祫")
- @ExcelProperty("鍔犵彮宸ヨ祫")
- private BigDecimal overtimePay;
@Schema(description = "椁愯ˉ")
@ExcelProperty("椁愯ˉ")
@@ -89,13 +206,9 @@
@ExcelProperty("瀹炲彂宸ヨ祫")
private BigDecimal actualSalary;
- @Schema(description = "鍑哄嫟澶╂暟")
- @ExcelProperty("鍑哄嫟澶╂暟")
- private Integer workDays;
-
- @Schema(description = "鍔犵彮鏃堕暱")
- @ExcelProperty("鍔犵彮鏃堕暱")
- private BigDecimal overtimeHours;
+ @Schema(description = "鎺掔彮鎬诲伐鏃�")
+ @ExcelProperty("鎺掔彮鎬诲伐鏃�")
+ private BigDecimal totalWorkHours;
@Schema(description = "鐘舵��")
@ExcelProperty(value = "鐘舵��", converter = DictConvert.class)
--
Gitblit v1.9.3