Merge remote-tracking branch 'origin/master'

xiangpei

2024-07-16 a820ec5dc1682ac0a31fcbdba3eb4d2c0fe74b64

 src/main/java/com/mindskip/xzs/service/impl/ExamPaperServiceImpl.java

@@ -271,6 +271,24 @@
            if(userDepartments.size() != 0){
                Department byId = departmentService.getById(userDepartments.get(0).getDepartmentId());
                e.setDepartmentName(byId.getName());
                e.setDeptId(byId.getId());
            }
            return e;
        }).collect(Collectors.toList());
        return paperExcel;
    }

    @Override
    public List<PaperExcelVO> getRandomPaperExcelById(Integer id) {
        List<PaperExcelVO> paperExcel = examPaperMapper.getRandomPaperExcelById(id);
        paperExcel = paperExcel.stream().map(e->{
            e.setPaperScore(ExamUtil.scoreToVM(Integer.parseInt(e.getPaperScore())));
            e.setUserScore(ExamUtil.scoreToVM(Integer.parseInt(e.getUserScore())));
            List<Department> userDepartments = userDepartmentMapper.selectDeptByUserId(Integer.parseInt(e.getUserId()));
            if(userDepartments.size() != 0) {
                Department department = userDepartments.get(0);
                e.setDepartmentName(department.getName());
                e.setDeptId(department.getId());
            }
            return e;
        }).collect(Collectors.toList());