公司评优、部门评优

xieb

2024-01-09 2ab77e0b8957147f4937a055c55393acc793e79e

公司评优、部门评优

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

@@ -112,7 +112,7 @@
        User user = userService.getById(AuthUtil.getUser().getUserId());
        queryWrapper.like("polling_persons" , user.getEmployeeType());
        IPage<EvaluateTaskEntity> pages = evaluateTaskService.page(Condition.getPage(query), queryWrapper);
        return R.data(EvaluateTaskWrapper.build().pageVO(pages));
        return R.data(EvaluateTaskWrapper.build().h5CandidatePageVO(pages));
    }

    /**

 src/main/java/org/springblade/modules/evaluate/vo/EvaluateTaskVO.java

@@ -37,4 +37,6 @@

    private List<EvaluateTaskReferrerVO> evaluateTaskReferrerVOS; //投票详情

    private List<EvaluateCandidateResultVO> evaluateCandidateResultVOS;//公司投票结果和部门投票结果

}

 src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskWrapper.java

@@ -24,8 +24,10 @@
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.SpringUtil;
import org.springblade.modules.evaluate.dto.EvaluateTaskDTO;
import org.springblade.modules.evaluate.entity.EvaluateCandidateResultEntity;
import org.springblade.modules.evaluate.entity.EvaluateTaskEntity;
import org.springblade.modules.evaluate.entity.EvaluateTaskReferrerEntity;
import org.springblade.modules.evaluate.service.IEvaluateCandidateResultService;
import org.springblade.modules.evaluate.service.IEvaluateTaskReferrerService;
import org.springblade.modules.evaluate.vo.EvaluateTaskVO;

@@ -42,8 +44,11 @@

    private static final IEvaluateTaskReferrerService evaluateTaskReferrerService;

    private static final IEvaluateCandidateResultService evaluateCandidateResultService;

    static {
        evaluateTaskReferrerService = SpringUtil.getBean(IEvaluateTaskReferrerService.class);
        evaluateCandidateResultService = SpringUtil.getBean(IEvaluateCandidateResultService.class);
    }

    public static EvaluateTaskWrapper build() {
@@ -98,16 +103,16 @@
    public IPage<EvaluateTaskVO> h5CandidatePageVO(IPage<EvaluateTaskEntity> pages) {
        List<EvaluateTaskVO> records = listVO(pages.getRecords());

//        for (EvaluateTaskVO vo: records) {
//            QueryWrapper queryWrapper = new QueryWrapper();
//            queryWrapper.eq("create_user", AuthUtil.getUserId());
//            queryWrapper.eq("evaluate_task_id", vo.getId());
//            List<EvaluateTaskReferrerEntity> evaluateTaskReferrerEntities = evaluateTaskReferrerService.list(queryWrapper);
//
//            vo.setIsVote(evaluateTaskReferrerEntities.size() > 0);
//            if (vo.getIsVote())
//                vo.setEvaluateTaskReferrerVOS(EvaluateTaskReferrerWrapper.build().listVO(evaluateTaskReferrerEntities));
//        }
        for (EvaluateTaskVO vo: records) {
            QueryWrapper queryWrapper = new QueryWrapper();
            queryWrapper.eq("create_user", AuthUtil.getUserId());
            queryWrapper.eq("evaluate_task_id", vo.getId());
            List<EvaluateCandidateResultEntity> entities = evaluateCandidateResultService.list(queryWrapper);

            vo.setIsVote(entities.size() > 0);
            if (vo.getIsVote())
                vo.setEvaluateCandidateResultVOS(EvaluateCandidateResultWrapper.build().listVO(entities));
        }

        IPage<EvaluateTaskVO> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
        pageVo.setRecords(records);