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/employee/vo/HrmEmployeeRespVO.java | 48 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 44 insertions(+), 4 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeRespVO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeRespVO.java
index 29d9d9f..9ab2b40 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeRespVO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeRespVO.java
@@ -32,12 +32,12 @@
@ExcelProperty("閮ㄩ棬鍚嶇О")
private String deptName;
- @Schema(description = "宀椾綅ID")
- private Long postId;
+ @Schema(description = "宀椾綅ID鍒楄〃")
+ private List<Long> postIds;
- @Schema(description = "宀椾綅鍚嶇О")
+ @Schema(description = "宀椾綅鍚嶇О鍒楄〃")
@ExcelProperty("宀椾綅鍚嶇О")
- private String postName;
+ private String postNames;
@Schema(description = "鍛樺伐濮撳悕")
@ExcelProperty("鍛樺伐濮撳悕")
@@ -63,6 +63,26 @@
@Schema(description = "韬唤璇佸彿")
@ExcelProperty("韬唤璇佸彿")
private String idCard;
+
+ @Schema(description = "姘戞棌")
+ @ExcelProperty("姘戞棌")
+ private String nation;
+
+ @Schema(description = "濠氬Щ鐘舵��")
+ @ExcelProperty("濠氬Щ鐘舵��")
+ private String marriageStatus;
+
+ @Schema(description = "骞撮緞")
+ @ExcelProperty("骞撮緞")
+ private Integer age;
+
+ @Schema(description = "瀛﹀巻")
+ @ExcelProperty("瀛﹀巻")
+ private String education;
+
+ @Schema(description = "鏀挎不闈㈣矊")
+ @ExcelProperty("鏀挎不闈㈣矊")
+ private String politicalStatus;
@Schema(description = "鍏ヨ亴鏃ユ湡")
@ExcelProperty("鍏ヨ亴鏃ユ湡")
@@ -96,6 +116,26 @@
@ExcelProperty("鍩烘湰宸ヨ祫")
private BigDecimal baseSalary;
+ @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 = "瑙掕壊ID鍒楄〃")
private List<Long> roleIds;
--
Gitblit v1.9.3