From 586e854c5894bb0e5aeef0ff99ac9a11dde7dde9 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Mon, 18 Dec 2023 09:03:58 +0800
Subject: [PATCH] 后台管理评分列表详情考核人信息
---
src/main/java/org/springblade/modules/assessment/vo/AssessmentScoreVO.java | 6 ++++++
src/main/java/org/springblade/modules/assessment/wrapper/AssessmentScoreWrapper.java | 6 ++++++
2 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/assessment/vo/AssessmentScoreVO.java b/src/main/java/org/springblade/modules/assessment/vo/AssessmentScoreVO.java
index 11e6cc7..10579e4 100644
--- a/src/main/java/org/springblade/modules/assessment/vo/AssessmentScoreVO.java
+++ b/src/main/java/org/springblade/modules/assessment/vo/AssessmentScoreVO.java
@@ -32,9 +32,15 @@
public class AssessmentScoreVO extends AssessmentScoreEntity {
private static final long serialVersionUID = 1L;
+ //被考核人
private String userName;
private String code;//工号
private String deptName;//部门
private String postName;//职位
+ //考核人
+ private String scoreUserName;
+ private String scoreDeptName;
+ private String scorePostName;
+
}
diff --git a/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentScoreWrapper.java b/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentScoreWrapper.java
index c0fa2bd..bfb0d4c 100644
--- a/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentScoreWrapper.java
+++ b/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentScoreWrapper.java
@@ -86,10 +86,16 @@
vo.setCode(user.getCode());
vo.setDeptName(SysCache.getDeptName(Long.valueOf(user.getDeptId())));
vo.setPostName(SysCache.getPostName(Long.valueOf(user.getPostId())));
+
} else {
vo.setDeptName(SysCache.getDeptName(Long.valueOf(vo.getBeId())));
}
+ User scoreUser = UserCache.getUser(vo.getScoreUserId()); //考核人
+ vo.setScoreUserName(scoreUser.getName());
+ vo.setScoreDeptName(SysCache.getDeptName(Long.valueOf(scoreUser.getDeptId())));
+ vo.setScorePostName(SysCache.getPostName(Long.valueOf(scoreUser.getPostId())));
+
}
IPage<AssessmentScoreVO> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
--
Gitblit v1.9.3