xieb
2023-12-15 c919939d3fa3100acdda4b67d7452d0936148f1b
考核结果
2 files modified
47 ■■■■■ changed files
src/main/java/org/springblade/modules/assessment/vo/AssessmentScoreVO.java 8 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/assessment/wrapper/AssessmentScoreWrapper.java 39 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/assessment/vo/AssessmentScoreVO.java
@@ -32,9 +32,9 @@
public class AssessmentScoreVO extends AssessmentScoreEntity {
    private static final long serialVersionUID = 1L;
    private Boolean isAssessmentOk;//是否考核完成
    private AssessmentTaskVO assessmentTaskVO;//考核任务
    private String userName;
    private String code;//工号
    private String deptName;//部门
    private String postName;//职位
}
src/main/java/org/springblade/modules/assessment/wrapper/AssessmentScoreWrapper.java
@@ -17,6 +17,10 @@
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;
@@ -28,6 +32,8 @@
import org.springblade.modules.assessment.service.IAssessmentSetService;
import org.springblade.modules.assessment.service.IAssessmentTaskService;
import org.springblade.modules.assessment.vo.AssessmentScoreVO;
import org.springblade.modules.assessment.vo.AssessmentSetVO;
import org.springblade.modules.system.entity.User;
import java.util.List;
import java.util.Objects;
@@ -66,21 +72,32 @@
        //assessmentScoreVO.setCreateUserName(createUser.getName());
        //assessmentScoreVO.setUpdateUserName(updateUser.getName());
        //考核数量
        QueryWrapper<AssessmentSetEntity> AssessmentSetEntityWrapper = new QueryWrapper<>();
        AssessmentSetEntityWrapper.eq("user_id",assessmentScoreVO.getBeId());
        long userAssCount = assessmentSetService.count(AssessmentSetEntityWrapper);
        //已经考核数量
        QueryWrapper<AssessmentScoreEntity> wrapper = new QueryWrapper<>();
        wrapper.eq("be_id",assessmentScoreVO.getBeId());
        long assCount = assessmentScoreService.count(wrapper);
        assessmentScoreVO.setIsAssessmentOk(userAssCount == assCount);
        assessmentScoreVO.setAssessmentTaskVO(AssessmentTaskWrapper.build().entityVO(assessmentTaskService.getById(assessmentScoreVO.getAssessmentTaskId())));
        return assessmentScoreVO;
    }
    @Override
    public IPage<AssessmentScoreVO> pageVO(IPage<AssessmentScoreEntity> pages) {
        List<AssessmentScoreVO> records = listVO(pages.getRecords());
        //开始处理
        for (AssessmentScoreVO vo: records) {
            if (vo.getType() == 0) {
                User user = UserCache.getUser(vo.getBeId()); //被考核人
                vo.setUserName(user.getName());
                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())));
            }
        }
        IPage<AssessmentScoreVO> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
        pageVo.setRecords(records);
        return pageVo;
    }
    @Override
    public List<AssessmentScoreVO> listVO(List<AssessmentScoreEntity> list) {
        return list.stream().map(this::entityVO).collect(Collectors.toList());