From df6efd77578c8ba54d1ae3be9198c70fb5173399 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期六, 29 八月 2026 01:46:11 +0800
Subject: [PATCH] feat(mes): 报工只填写报工数量,合格/不良数量由质检确定;快速报工响应返回剩余可报工数量
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeRespVO.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 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..8706fc4 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("鍛樺伐濮撳悕")
@@ -64,6 +64,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;
--
Gitblit v1.9.3