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/HrmEmployeeSaveReqVO.java | 42 ++++++++++++++++++++++++++++++++++++------
1 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeSaveReqVO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeSaveReqVO.java
index 243900d..e78b451 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeSaveReqVO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeSaveReqVO.java
@@ -23,9 +23,9 @@
@NotNull(message = "閮ㄩ棬涓嶈兘涓虹┖")
private Long deptId;
- @Schema(description = "宀椾綅ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "宀椾綅涓嶈兘涓虹┖")
- private Long postId;
+ @Schema(description = "宀椾綅ID鍒楄〃", requiredMode = Schema.RequiredMode.REQUIRED, example = "[1, 2]")
+ @NotEmpty(message = "宀椾綅涓嶈兘涓虹┖")
+ private List<Long> postIds;
@Schema(description = "鍛樺伐濮撳悕", requiredMode = Schema.RequiredMode.REQUIRED, example = "寮犱笁")
@NotEmpty(message = "鍛樺伐濮撳悕涓嶈兘涓虹┖")
@@ -52,6 +52,21 @@
message = "韬唤璇佸彿鏍煎紡涓嶆纭�")
private String idCard;
+ @Schema(description = "姘戞棌", example = "姹夋棌")
+ private String nation;
+
+ @Schema(description = "濠氬Щ鐘舵��", example = "宸插")
+ private String marriageStatus;
+
+ @Schema(description = "骞撮緞", example = "30")
+ private Integer age;
+
+ @Schema(description = "瀛﹀巻", example = "鏈")
+ private String education;
+
+ @Schema(description = "鏀挎不闈㈣矊", example = "涓叡鍏氬憳")
+ private String politicalStatus;
+
@Schema(description = "鍏ヨ亴鏃ユ湡", requiredMode = Schema.RequiredMode.REQUIRED, example = "2020-03-01")
@NotNull(message = "鍏ヨ亴鏃ユ湡涓嶈兘涓虹┖")
private LocalDate hireDate;
@@ -75,6 +90,21 @@
@Schema(description = "鍩烘湰宸ヨ祫", example = "10000.00")
private BigDecimal baseSalary;
+ @Schema(description = "鏍囧噯宸ヨ祫", example = "8000.00")
+ private BigDecimal standardSalary;
+
+ @Schema(description = "宀椾綅宸ヨ祫", example = "2000.00")
+ private BigDecimal postSalary;
+
+ @Schema(description = "鍔犵彮宸ヨ祫鏍囧噯锛堝厓/灏忔椂锛�", example = "45.98")
+ private BigDecimal overtimeHourlyRate;
+
+ @Schema(description = "瀹夊叏鐜繚濂栨爣鍑�", example = "500.00")
+ private BigDecimal safetyAwardStandard;
+
+ @Schema(description = "缁╂晥鏍囧噯", example = "1500.00")
+ private BigDecimal performanceStandard;
+
@Schema(description = "瑙掕壊ID鍒楄〃", example = "[1, 2]")
private List<Long> roleIds;
@@ -94,14 +124,14 @@
@Schema(description = "鏁欒偛缁忓巻鍒楄〃")
@Valid
- private List<HrmEmployeeEducationSaveReqVO> educationList;
+ private List<HrmEmployeeEducationSaveReqVO> educations;
@Schema(description = "宸ヤ綔缁忓巻鍒楄〃")
@Valid
- private List<HrmEmployeeWorkHistorySaveReqVO> workHistoryList;
+ private List<HrmEmployeeWorkHistorySaveReqVO> workHistories;
@Schema(description = "绱ф�ヨ仈绯讳汉鍒楄〃")
@Valid
- private List<HrmEmployeeEmergencyContactSaveReqVO> emergencyContactList;
+ private List<HrmEmployeeEmergencyContactSaveReqVO> emergencyContacts;
}
\ No newline at end of file
--
Gitblit v1.9.3