From c8bcb31b06e80bfcfb5324379098e5c666e49e18 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 02 Jan 2024 13:48:48 +0800
Subject: [PATCH] 考核任务设置考核人
---
src/main/java/org/springblade/modules/assessment/excel/AssessmentSetAssessorExcel.java | 40 ++++++++++++++++++++++++++++++++--------
1 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/springblade/modules/assessment/excel/AssessmentSetDeptExcel.java b/src/main/java/org/springblade/modules/assessment/excel/AssessmentSetAssessorExcel.java
similarity index 72%
rename from src/main/java/org/springblade/modules/assessment/excel/AssessmentSetDeptExcel.java
rename to src/main/java/org/springblade/modules/assessment/excel/AssessmentSetAssessorExcel.java
index 3774c30..94c273f 100644
--- a/src/main/java/org/springblade/modules/assessment/excel/AssessmentSetDeptExcel.java
+++ b/src/main/java/org/springblade/modules/assessment/excel/AssessmentSetAssessorExcel.java
@@ -28,16 +28,16 @@
/**
- * 考核权重-部门 Excel实体类
+ * 考核任务考核人 Excel实体类
*
- * @author aix
- * @since 2023-12-12
+ * @author Aix
+ * @since 2024-01-02
*/
@Data
@ColumnWidth(25)
@HeadRowHeight(20)
@ContentRowHeight(18)
-public class AssessmentSetDeptExcel implements Serializable {
+public class AssessmentSetAssessorExcel implements Serializable {
private static final long serialVersionUID = 1L;
@@ -48,17 +48,41 @@
@ExcelProperty("租户ID")
private String tenantId;
/**
- * 被考核人
+ * 被考核人表id
*/
@ColumnWidth(20)
- @ExcelProperty("被考核人")
- private Long deptId;
+ @ExcelProperty("被考核人表id")
+ private Long assessmentSetId;
/**
* 考核人
*/
@ColumnWidth(20)
@ExcelProperty("考核人")
- private Long toUserId;
+ private Long userId;
+ /**
+ * 考核人名称
+ */
+ @ColumnWidth(20)
+ @ExcelProperty("考核人名称")
+ private String userName;
+ /**
+ * 考核人部门id
+ */
+ @ColumnWidth(20)
+ @ExcelProperty("考核人部门id")
+ private Long deptId;
+ /**
+ * 考核人部门名称
+ */
+ @ColumnWidth(20)
+ @ExcelProperty("考核人部门名称")
+ private String deptName;
+ /**
+ * 考核人职位名称
+ */
+ @ColumnWidth(20)
+ @ExcelProperty("考核人职位名称")
+ private String postName;
/**
* 权值
*/
--
Gitblit v1.9.3