1

xieb

2024-01-15 1dca355eb004bf15df3ef88bc7d290e98e5f6e05

1

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

@@ -64,11 +64,13 @@
        for (EvaluateTaskReferrerEntity po:list) {
            Map<String,Object> map = new HashMap<>();
            User user = userService.getById(po.getCreateUser());//投票人
            map.put("userName", user.getName());
            map.put("deptName", SysCache.getDeptNames(user.getDeptId()));
            map.put("postName", SysCache.getPostNames(user.getPostId()));
            map.put("remark", po.getRemark());//投票理由
            maps.add(map);
            if (null != user) {
                map.put("userName", user.getName());
                map.put("deptName", SysCache.getDeptNames(user.getDeptId()));
                map.put("postName", SysCache.getPostNames(user.getPostId()));
                map.put("remark", po.getRemark());//投票理由
                maps.add(map);
            }
        }

        return maps;

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

@@ -118,22 +118,6 @@
            if (entities.size() > 0)
                vo.setEvaluateCandidateResultVOS(EvaluateCandidateResultWrapper.build().listVO(entities));

//            QueryWrapper qw = new QueryWrapper();
//            qw.eq("evaluate_task_id", vo.getId());
//            List<EvaluateTaskCategoryEntity> evaluateTaskCategoryEntities = evaluateTaskCategoryService.list(qw);
//            int evaluateCount = evaluateTaskCategoryEntities.stream().mapToInt(EvaluateTaskCategoryEntity::getPeopleNum).sum(); // 计算总数
//
//            if (vo.getType() == 0) {
//                vo.setIsVote(entities.size() == evaluateCount);
//                if (entities.size() > 0)
//                    vo.setEvaluateCandidateResultVOS(EvaluateCandidateResultWrapper.build().listVO(entities));
//            } else {
//                vo.setIsVote(entities.size() > 0);
//                if (entities.size() > 0)
//                    vo.setEvaluateCandidateResultVOS(EvaluateCandidateResultWrapper.build().listVO(entities));
//            }


        }

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