From fdbc5af6474abb39120b771af87005aeb6186ae5 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期一, 14 九月 2026 15:28:28 +0800
Subject: [PATCH] feat: 售后工单按条绑定部门与原因类型；新增加班工资管理；员工附件留档
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeRespVO.java | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 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..383b2b5 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("鍛樺伐濮撳悕")
@@ -64,6 +65,26 @@
@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("鍏ヨ亴鏃ユ湡")
private LocalDate hireDate;
@@ -80,6 +101,11 @@
@ExcelProperty(value = "鍛樺伐鐘舵��", converter = DictConvert.class)
@DictFormat("hrm_employee_status")
private Integer employeeStatus;
+
+ @Schema(description = "鍛樺伐绫诲埆")
+ @ExcelProperty(value = "鍛樺伐绫诲埆", converter = DictConvert.class)
+ @DictFormat("hrm_employee_category")
+ private Integer employeeCategory;
@Schema(description = "骞村亣浣欓锛堝ぉ锛�")
@ExcelProperty("骞村亣浣欓")
@@ -123,4 +149,7 @@
@ExcelProperty("鍒涘缓鏃堕棿")
private LocalDateTime createTime;
+ @Schema(description = "闄勪欢鍒楄〃")
+ private List<StorageBlobRespDTO> attachmentList;
+
}
\ No newline at end of file
--
Gitblit v1.9.3