From 1ce9ceb1e16a05fb317ef2aa2e046a44427000c6 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 12 Dec 2023 15:28:00 +0800
Subject: [PATCH] 考核类型

---
 src/main/java/org/springblade/modules/assessment/entity/AssessmentTaskEntity.java  |    5 +++++
 src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetWrapper.java |    5 +++++
 2 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/assessment/entity/AssessmentTaskEntity.java b/src/main/java/org/springblade/modules/assessment/entity/AssessmentTaskEntity.java
index 497f8ba..3fa8a25 100644
--- a/src/main/java/org/springblade/modules/assessment/entity/AssessmentTaskEntity.java
+++ b/src/main/java/org/springblade/modules/assessment/entity/AssessmentTaskEntity.java
@@ -47,6 +47,11 @@
 	@ApiModelProperty(value = "考核目的")
 	private String assessmentPurpose;
 	/**
+	 * 考核类型（0：员工考核，1：部门考核）
+	 */
+	@ApiModelProperty(value = "考核目的")
+	private Integer type;
+	/**
 	 * 开始时间
 	 */
 	@ApiModelProperty(value = "开始时间")
diff --git a/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetWrapper.java b/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetWrapper.java
index 6dbf5db..d32a2af 100644
--- a/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetWrapper.java
+++ b/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetWrapper.java
@@ -63,6 +63,11 @@
 		//assessmentSetVO.setCreateUserName(createUser.getName());
 		//assessmentSetVO.setUpdateUserName(updateUser.getName());
 
+		User user = UserCache.getUser(assessmentSetVO.getUserId()); //被考核人
+		assessmentSetVO.setUserName(user.getName());
+		assessmentSetVO.setDeptName(SysCache.getDeptName(Long.valueOf(user.getDeptId())));
+		assessmentSetVO.setPostName(SysCache.getPostName(Long.valueOf(user.getPostId())));
+
 		return assessmentSetVO;
 	}
 

--
Gitblit v1.9.3