From 9c7b1e49a3e57e8744e5dde71cabcd125b4a71f4 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 02 Jan 2024 13:33:51 +0800
Subject: [PATCH] 考核任务设置被考核人
---
src/main/java/org/springblade/modules/assessment/entity/AssessmentSetEntity.java | 12 +++---
src/main/java/org/springblade/modules/assessment/controller/AssessmentSetController.java | 2
src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetWrapper.java | 66 --------------------------------
3 files changed, 8 insertions(+), 72 deletions(-)
diff --git a/src/main/java/org/springblade/modules/assessment/controller/AssessmentSetController.java b/src/main/java/org/springblade/modules/assessment/controller/AssessmentSetController.java
index 82646b5..43eea94 100644
--- a/src/main/java/org/springblade/modules/assessment/controller/AssessmentSetController.java
+++ b/src/main/java/org/springblade/modules/assessment/controller/AssessmentSetController.java
@@ -54,7 +54,7 @@
@RestController
@AllArgsConstructor
@RequestMapping("assessment/assessmentSet")
-@Api(value = "考核权重", tags = "个人考核权重设置接口")
+@Api(value = "被考核人", tags = "被考核人设置接口")
public class AssessmentSetController extends BladeController {
private final IAssessmentSetService assessmentSetService;
diff --git a/src/main/java/org/springblade/modules/assessment/entity/AssessmentSetEntity.java b/src/main/java/org/springblade/modules/assessment/entity/AssessmentSetEntity.java
index e88169d..11e8e26 100644
--- a/src/main/java/org/springblade/modules/assessment/entity/AssessmentSetEntity.java
+++ b/src/main/java/org/springblade/modules/assessment/entity/AssessmentSetEntity.java
@@ -39,10 +39,10 @@
/**
* 评优任务
*/
- @ApiModelProperty(value = "评优任务")
+ @ApiModelProperty(value = "考核任务")
private Long assessmentTaskId;
- @ApiModelProperty(value = "评优任务名称")
+ @ApiModelProperty(value = "考核任务名称")
private String assessmentTaskName;
/**
@@ -54,22 +54,22 @@
/**
* 考核人
*/
- @ApiModelProperty(value = "考核人")
+ @ApiModelProperty(value = "被考核人名称")
private String userName;
/**
* 部门id
*/
- @ApiModelProperty(value = "部门id")
+ @ApiModelProperty(value = "被考核人部门id")
private Long deptId;
/**
* 部门名称
*/
- @ApiModelProperty(value = "部门名称")
+ @ApiModelProperty(value = "被考核人部门名称")
private String deptName;
/**
* 职位名称
*/
- @ApiModelProperty(value = "职位名称")
+ @ApiModelProperty(value = "被考核人职位名称")
private String postName;
}
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 f76170d..b312626 100644
--- a/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetWrapper.java
+++ b/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetWrapper.java
@@ -16,24 +16,15 @@
*/
package org.springblade.modules.assessment.wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.springblade.common.cache.SysCache;
-import org.springblade.common.cache.UserCache;
+
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 java.time.LocalDateTime;
-import java.util.List;
import java.util.Objects;
/**
@@ -65,62 +56,7 @@
//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())));
-
- user = UserCache.getUser(assessmentSetVO.getToUserId()); //考核人
- assessmentSetVO.setToUserName(user.getName());
- assessmentSetVO.setToDeptName(SysCache.getDeptName(Long.valueOf(user.getDeptId())));
- assessmentSetVO.setToPostName(SysCache.getPostName(Long.valueOf(user.getPostId())));
-
return assessmentSetVO;
}
-
- @Override
- public IPage<AssessmentSetVO> pageVO(IPage<AssessmentSetEntity> pages) {
- List<AssessmentSetVO> records = listVO(pages.getRecords());
- for (AssessmentSetVO vo:records) {
- User user = UserCache.getUser(vo.getUserId()); //被考核人
- vo.setUserName(user.getName());
- vo.setDeptName(SysCache.getDeptName(Long.valueOf(user.getDeptId())));
- vo.setPostName(SysCache.getPostName(Long.valueOf(user.getPostId())));
-
- user = UserCache.getUser(vo.getToUserId()); //考核人
- vo.setToUserName(user.getName());
- vo.setToDeptName(SysCache.getDeptName(Long.valueOf(user.getDeptId())));
- vo.setToPostName(SysCache.getPostName(Long.valueOf(user.getPostId())));
-
- QueryWrapper<AssessmentTaskEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("type", 0);
- wrapper.gt("end_time", LocalDateTime.now());
- 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);
-
-
- if(null != vo.getAssessmentTaskVO()) {
- 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);
- return pageVo;
- }
-
}
--
Gitblit v1.9.3