From cd15c2d9596401ef61ba16088e9f8fd01feb664c Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Mon, 18 Dec 2023 11:13:36 +0800
Subject: [PATCH] 所有部门api
---
src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetWrapper.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 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..60228ed 100644
--- a/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetWrapper.java
+++ b/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetWrapper.java
@@ -24,13 +24,13 @@
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.SpringUtil;
+import org.springblade.modules.assessment.entity.AssessmentScoreEntity;
import org.springblade.modules.assessment.entity.AssessmentSetEntity;
import org.springblade.modules.assessment.entity.AssessmentTaskEntity;
+import org.springblade.modules.assessment.service.IAssessmentScoreService;
import org.springblade.modules.assessment.service.IAssessmentTaskService;
import org.springblade.modules.assessment.vo.AssessmentSetVO;
import org.springblade.modules.system.entity.User;
-import org.springblade.modules.system.service.IUserService;
-import org.springframework.beans.factory.annotation.Autowired;
import java.time.LocalDateTime;
import java.util.List;
@@ -45,9 +45,11 @@
public class AssessmentSetWrapper extends BaseEntityWrapper<AssessmentSetEntity, AssessmentSetVO> {
private static final IAssessmentTaskService assessmentTaskService;
+ private static final IAssessmentScoreService assessmentScoreService;
static {
assessmentTaskService = SpringUtil.getBean(IAssessmentTaskService.class);
+ assessmentScoreService = SpringUtil.getBean(IAssessmentScoreService.class);
}
public static AssessmentSetWrapper build() {
@@ -62,6 +64,11 @@
//User updateUser = UserCache.getUser(assessmentSet.getUpdateUser());
//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,8 +88,25 @@
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)));
+ wrapper.eq("is_assessment_ok", 0);
+ List<AssessmentTaskEntity> assessmentTaskEntityList = assessmentTaskService.list(wrapper);
+ if (assessmentTaskEntityList.size() > 0)
+ vo.setAssessmentTaskVO(AssessmentTaskWrapper.build().entityVO(assessmentTaskEntityList.get(0)));
+ else
+ vo.setAssessmentTaskVO(null);
+
+
+ QueryWrapper<AssessmentScoreEntity> setEntityQueryWrapper = new QueryWrapper<>();
+ setEntityQueryWrapper.eq("score_user_id", vo.getToUserId()); //考核人id
+ setEntityQueryWrapper.eq("be_id", vo.getUserId()); //被考核人id
+ setEntityQueryWrapper.eq("assessment_task_id", vo.getAssessmentTaskVO().getId());//考核任务
+ List<AssessmentScoreEntity> assessmentScoreEntityList = assessmentScoreService.list(setEntityQueryWrapper);
+ if (assessmentScoreEntityList.size() > 0)
+ vo.setAssessmentScoreVO(AssessmentScoreWrapper.build().entityVO(assessmentScoreEntityList.get(0)));
+ else
+ vo.setAssessmentScoreVO(null);
}
IPage<AssessmentSetVO> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
pageVo.setRecords(records);
--
Gitblit v1.9.3