员工信息

xieb

2024-01-15 34a4a46e889622da977fc039eaef7e9a47731d76

员工信息

 src/main/java/org/springblade/modules/assessment/wrapper/AssessmentScoreWrapper.java

@@ -19,7 +19,6 @@
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;
@@ -29,6 +28,7 @@
import org.springblade.modules.assessment.service.IAssessmentTaskService;
import org.springblade.modules.assessment.vo.AssessmentScoreVO;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IUserService;

import java.util.List;
import java.util.Objects;
@@ -46,10 +46,13 @@
    private static final IAssessmentScoreService assessmentScoreService;
    private static final IAssessmentTaskService assessmentTaskService;

    private static final IUserService userService;

    static {
        assessmentSetService = SpringUtil.getBean(IAssessmentSetService.class);
        assessmentScoreService = SpringUtil.getBean(IAssessmentScoreService.class);
        assessmentTaskService = SpringUtil.getBean(IAssessmentTaskService.class);
        userService = SpringUtil.getBean(IUserService.class);
    }

    public static AssessmentScoreWrapper build() {
@@ -74,7 +77,7 @@
        //开始处理
        for (AssessmentScoreVO vo: records) {
            if (vo.getType() == 0) {
                User user = UserCache.getUser(vo.getBeId()); //被考核人
                User user = userService.getById(vo.getBeId()); //被考核人
                vo.setUserName(user.getName());
                vo.setCode(user.getCode());
                vo.setDeptName(SysCache.getDeptName(Long.valueOf(user.getDeptId())));
@@ -84,7 +87,7 @@
                vo.setDeptName(SysCache.getDeptName(Long.valueOf(vo.getBeId())));
            }

            User scoreUser = UserCache.getUser(vo.getScoreUserId()); //考核人
            User scoreUser = userService.getById(vo.getScoreUserId()); //考核人
            vo.setScoreUserName(scoreUser.getName());
            vo.setScoreDeptName(SysCache.getDeptName(Long.valueOf(scoreUser.getDeptId())));
            vo.setScorePostName(SysCache.getPostName(Long.valueOf(scoreUser.getPostId())));

 src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java

@@ -33,7 +33,6 @@
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringUtil;
import org.springblade.modules.evaluate.dto.EvaluateTaskDTO;
import org.springblade.modules.evaluate.entity.EvaluateTaskEntity;
import org.springblade.modules.evaluate.excel.EvaluateTaskExcel;
@@ -124,14 +123,26 @@
    @GetMapping("/userList")
    @ApiOperation(value = "分页", notes = "传入user")
    public R<IPage<UserVO>> userList(Query query,User user) {
        if (StringUtil.isBlank(user.getDeptId()))
            return R.fail(-1,"部门id不能为空");
        QueryWrapper<User> queryWrapper = Condition.getQueryWrapper(user);
        IPage<User> pages = userService.page(Condition.getPage(query), queryWrapper);
        return R.data(UserWrapper.build().pageVO(pages));
    }

    /**
     * 员工列表 不分页
     * @param query
     * @param user
     * @return
     */
    @GetMapping("/userListBy")
    @ApiOperation(value = "分页", notes = "传入user")
    public R<List<UserVO>> userListBy(Query query,User user) {
        QueryWrapper<User> queryWrapper = Condition.getQueryWrapper(user);
        List<User> list = userService.list(Condition.getPage(query), queryWrapper);
        return R.data(UserWrapper.build().listVO(list));
    }

    /**
     * 评优任务表 自定义分页
     */
    @GetMapping("/page")