Merge remote-tracking branch 'origin/master'

fuliqi

2023-11-28 304a91f9eb9bb34996f84ba7278b109c6cf842eb

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

@@ -128,6 +128,7 @@
            examPaper.setCreateTime(now);
            examPaper.setCreateUser(user.getId());
            examPaper.setDeleted(false);
            examPaper.setUserIds(examPaperEditRequestVM.getMenuIds());
            examPaperFromVM(examPaperEditRequestVM, examPaper, titleItemsVM);
            examPaperMapper.insertSelective(examPaper);

@@ -154,6 +155,7 @@
        ExamPaper examPaper = examPaperMapper.selectByPrimaryKey(id);
        ExamPaperEditRequestVM vm = modelMapper.map(examPaper, ExamPaperEditRequestVM.class);
        vm.setLevel(examPaper.getGradeLevel());
        vm.setMenuIds(examPaper.getUserIds());
        TextContent frameTextContent = textContentService.selectById(examPaper.getFrameTextContentId());
        List<ExamPaperTitleItemObject> examPaperTitleItemObjects = JsonUtil.toJsonListObject(frameTextContent.getContent(), ExamPaperTitleItemObject.class);
        List<Integer> questionIds = examPaperTitleItemObjects.stream()
@@ -490,7 +492,7 @@
        Integer judgment = examPaperEditRequestVM.getQuestionTypeVMS().stream().mapToInt(QuestionTypeVM::getTrueFalse).sum();


        if ((singleChoice * 2 + multipleChoice * 2 + judgment * 2) != new Integer(100)) {
        if ((singleChoice * 2 + multipleChoice * 2 + judgment * 2) != new Integer(10)) {
            throw new QuestionException();
        }