From f814cc5680fffd9db263e690dec96bf8a8a15ecb Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 13 Dec 2023 15:36:45 +0800
Subject: [PATCH] 评分功能

---
 src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetWrapper.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

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..58bb312 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;
 	}
 
@@ -81,6 +86,7 @@
 			vo.setToPostName(SysCache.getPostName(Long.valueOf(user.getPostId())));
 
 			QueryWrapper<AssessmentTaskEntity> wrapper = new QueryWrapper<>();
+			wrapper.eq("type", 0);
 			wrapper.gt("end_time", LocalDateTime.now());
 			vo.setAssessmentTaskVO(AssessmentTaskWrapper.build().entityVO(assessmentTaskService.list(wrapper).get(0)));
 		}

--
Gitblit v1.9.3