feat：标签新增、下拉增加部门id

龚焕茏

2024-07-09 c5c10c1bb95f5bb7fdc8b714c5c998e78c26e0f7

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

@@ -9,6 +9,7 @@
import com.mindskip.xzs.domain.exam.ExamPaperQuestionItemObject;
import com.mindskip.xzs.domain.exam.ExamPaperTitleItemObject;
import com.mindskip.xzs.domain.other.KeyValue;
import com.mindskip.xzs.domain.vo.ExamTemplatesVO;
import com.mindskip.xzs.domain.vo.PaperExcelVO;
import com.mindskip.xzs.domain.vo.UserVO;
import com.mindskip.xzs.repository.ExamPaperAnswerMapper;
@@ -120,6 +121,7 @@
        String frameTextContentStr = JsonUtil.toJsonStr(frameTextContentList);

        ExamPaper examPaper;
        Integer[] userIds = examPaperEditRequestVM.getUserIds();
        if (actionEnum == ActionEnum.ADD) {
            examPaper = modelMapper.map(examPaperEditRequestVM, ExamPaper.class);
            TextContent frameTextContent = new TextContent(frameTextContentStr, now);
@@ -137,7 +139,10 @@
            TextContent frameTextContent = textContentService.selectById(examPaper.getFrameTextContentId());
            frameTextContent.setContent(frameTextContentStr);
            textContentService.updateByIdFilter(frameTextContent);
            examPaperEditRequestVM.setScore(null);
            examPaperEditRequestVM.setUserIds(null);
            modelMapper.map(examPaperEditRequestVM, examPaper);
            examPaperEditRequestVM.setUserIds(userIds);
            examPaperFromVM(examPaperEditRequestVM, examPaper, titleItemsVM);
            examPaperMapper.updateByPrimaryKeySelective(examPaper);
            //批量修改
@@ -166,6 +171,7 @@
            throw new RuntimeException("该试卷没有题目");
        }
        List<Question> questions = questionMapper.selectByIds(questionIds);

        //单选数量
        Integer singleChoice = questions.stream().filter(e -> e.getQuestionType() == 1).collect(Collectors.toList()).size();
        //多选数量
@@ -181,6 +187,7 @@
            List<ExamQuestionVO> questionItemsVM = t.getQuestionItems().stream().map(i -> {
                        Question question = questions.stream().filter(q -> q.getId().equals(i.getId())).findFirst().get();
                        ExamQuestionVO questionEditRequestVM = questionService.getQuestionEditRequestVM(question);

                        questionEditRequestVM.setTitle("(" + QuestionTypeEnum.fromCode(questionEditRequestVM.getQuestionType()).getName() + ") " + questionEditRequestVM.getTitle());
                        questionEditRequestVM.setItemOrder(generateRandomNumber(questionEditRequestVM.getQuestionType() == 1 ? 0 : ((questionEditRequestVM.getQuestionType() == 2 ? singleChoice : multipleChoice + singleChoice)),
                                questionEditRequestVM.getQuestionType() == 1 ? singleChoice : ((questionEditRequestVM.getQuestionType() == 2 ? multipleChoice + singleChoice : trueFalse + multipleChoice + singleChoice)),
@@ -206,15 +213,18 @@
        vm.setDepartmentIds(examPaperDepartmentService.getByExamPaperId(examPaper.getId())
                .stream().map(ExamPaperDepartment::getDepartmentId).toArray(Integer[]::new));
        List<ExamPaperUser> examPaperUsers = examPaperUserService.getByExamPaperId(examPaper.getId());
        Integer[][] userIds = new Integer[examPaperUsers.size()][2];
        List<Integer> userIds = new ArrayList();
        List<String> userNames = new ArrayList();
        for (int i = 0; i < examPaperUsers.size(); i++) {
            User user = userService.getUserById(examPaperUsers.get(i).getUserId());
            if (ObjectUtils.isNotEmpty(user)) {
                Integer[] userId = {user.getUserLevel(), examPaperUsers.get(i).getUserId()};
                userIds[i] = userId;
                Integer userId = examPaperUsers.get(i).getUserId();
                userIds.add(userId);
                userNames.add(user.getRealName());
            }
        }
        vm.setUserId(userIds);
        vm.setUserIds(userIds);
        vm.setUserNames(userNames);
        return vm;
    }

@@ -626,13 +636,34 @@
    }

    @Override
    public List<ExamPaper> list(List<Integer> deptIds) {
        return examPaperMapper.list(deptIds);
    @Transactional
    public void missExamByTemplateId(ExamTemplatesVO model) {
        List<Integer> id = examPaperMapper.getExamPaperByTemplateId(model);
        model.setPaperIds(id);
        // 根据考试id将选择的补考考生的考试成绩设置为无效
        examPaperAnswerMapper.setMissExamByTemplate(model);
    }

    @Override
    public PageInfo<UserVO> selectStudent(UserVO userVO) {
    public List<ExamPaper> list(List<Integer> deptIds) {
        List<ExamPaper> list = examPaperMapper.list(deptIds);
        List<ExamPaper> template = examPaperMapper.template(deptIds);
        list.addAll(template);
        return list.stream().sorted(Comparator.comparing(ExamPaper::getCreateTime).reversed()).collect(Collectors.toList());
    }

    @Override
    public PageInfo<UserVO> selectStudent(UserVO userVO, List<Integer> adminDeptIds) {
        userVO.setDeptIds(ObjectUtils.isNotEmpty(userVO.getDeptIds()) ? userVO.getDeptIds() : adminDeptIds);
        return PageHelper.startPage(userVO.getPageIndex(), userVO.getPageSize()).doSelectPageInfo(() ->
                examPaperMapper.selectStudent(userVO));
    }

    @Override
    public List<ExamPaper> queryCondition() {
        List<ExamPaper> examPaperList = examPaperMapper.getExamPaper();
        List<ExamPaper> templateList = examPaperMapper.getTemplate();
        examPaperList.addAll(templateList);
        return examPaperList.stream().sorted(Comparator.comparing(ExamPaper::getCreateTime).reversed()).collect(Collectors.toList());
    }
}