From 531b50cab6e42e6146a419bc71c5b494fff774b2 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期二, 27 十月 2026 09:48:33 +0800
Subject: [PATCH] feat(hrm): 考勤规则支持 Excel 导入；修复定位打卡测试类编译错误

---
 yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeRespVO.java |   53 ++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 46 insertions(+), 7 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..8518054 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
@@ -4,6 +4,7 @@
 import cn.idev.excel.annotation.ExcelProperty;
 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
+import cn.iocoder.yudao.module.system.api.storage.dto.StorageBlobRespDTO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -32,12 +33,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("鍛樺伐濮撳悕")
@@ -45,7 +46,7 @@
 
     @Schema(description = "鎬у埆")
     @ExcelProperty(value = "鎬у埆", converter = DictConvert.class)
-    @DictFormat("system_user_sex")
+    @DictFormat("hrm_gender")
     private Integer gender;
 
     @Schema(description = "鍑虹敓鏃ユ湡")
@@ -53,7 +54,7 @@
     private LocalDate birthday;
 
     @Schema(description = "鎵嬫満鍙风爜")
-    @ExcelProperty("鎵嬫満鍙风爜")
+    @ExcelProperty("鎵嬫満鍙�")
     private String phone;
 
     @Schema(description = "閭")
@@ -63,6 +64,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("鍏ヨ亴鏃ユ湡")
@@ -81,6 +102,11 @@
     @DictFormat("hrm_employee_status")
     private Integer employeeStatus;
 
+    @Schema(description = "鍛樺伐绫诲埆")
+    @ExcelProperty(value = "鍛樺伐绫诲埆", converter = DictConvert.class)
+    @DictFormat("hrm_employee_category")
+    private Integer employeeCategory;
+
     @Schema(description = "骞村亣浣欓锛堝ぉ锛�")
     @ExcelProperty("骞村亣浣欓")
     private BigDecimal annualLeaveBalance;
@@ -96,11 +122,21 @@
     @ExcelProperty("鍩烘湰宸ヨ祫")
     private BigDecimal baseSalary;
 
+    /**
+     * 宀椾綅宸ヨ祫
+     */
+    private BigDecimal postSalary;
+
+    /**
+     * 宸ラ緞宸ヨ祫
+     */
+    private BigDecimal senioritySalary;
+
     @Schema(description = "瑙掕壊ID鍒楄〃")
     private List<Long> roleIds;
 
     @Schema(description = "瑙掕壊鍚嶇О鍒楄〃")
-    @ExcelProperty("瑙掕壊")
+    @ExcelProperty("鐢ㄦ埛瑙掕壊")
     private String roleNames;
 
     @Schema(description = "寮�鎴烽摱琛�")
@@ -123,4 +159,7 @@
     @ExcelProperty("鍒涘缓鏃堕棿")
     private LocalDateTime createTime;
 
+    @Schema(description = "闄勪欢鍒楄〃")
+    private List<StorageBlobRespDTO> attachmentList;
+
 }
\ No newline at end of file

--
Gitblit v1.9.3