From 3ec909b27b3eba956aa9d00cc7a94c179bd04bbf Mon Sep 17 00:00:00 2001 From: 龚焕茏 <2842157468@qq.com> Date: 星期三, 03 七月 2024 18:29:31 +0800 Subject: [PATCH] feat:新增随机时间题目配置 --- src/main/java/com/mindskip/xzs/service/impl/ExamPaperServiceImpl.java | 300 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 272 insertions(+), 28 deletions(-) diff --git a/src/main/java/com/mindskip/xzs/service/impl/ExamPaperServiceImpl.java b/src/main/java/com/mindskip/xzs/service/impl/ExamPaperServiceImpl.java index 298d087..7049976 100644 --- a/src/main/java/com/mindskip/xzs/service/impl/ExamPaperServiceImpl.java +++ b/src/main/java/com/mindskip/xzs/service/impl/ExamPaperServiceImpl.java @@ -1,34 +1,36 @@ package com.mindskip.xzs.service.impl; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.mindskip.xzs.configuration.spring.exception.QuestionException; import com.mindskip.xzs.domain.*; -import com.mindskip.xzs.domain.TextContent; import com.mindskip.xzs.domain.enums.ExamPaperTypeEnum; import com.mindskip.xzs.domain.enums.QuestionTypeEnum; 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; import com.mindskip.xzs.repository.ExamPaperMapper; import com.mindskip.xzs.repository.QuestionMapper; +import com.mindskip.xzs.repository.UserDepartmentMapper; import com.mindskip.xzs.service.*; import com.mindskip.xzs.service.enums.ActionEnum; import com.mindskip.xzs.utility.DateTimeUtil; +import com.mindskip.xzs.utility.ExamUtil; import com.mindskip.xzs.utility.JsonUtil; import com.mindskip.xzs.utility.ModelMapperSingle; -import com.mindskip.xzs.utility.ExamUtil; -import com.mindskip.xzs.viewmodel.admin.exam.ExamPaperEditRequestVM; -import com.mindskip.xzs.viewmodel.admin.exam.ExamPaperPageRequestVM; -import com.mindskip.xzs.viewmodel.admin.exam.ExamPaperTitleItemVM; +import com.mindskip.xzs.viewmodel.admin.exam.*; +import com.mindskip.xzs.viewmodel.admin.question.ExamQuestionVO; import com.mindskip.xzs.viewmodel.admin.question.QuestionEditRequestVM; import com.mindskip.xzs.viewmodel.student.dashboard.PaperFilter; import com.mindskip.xzs.viewmodel.student.dashboard.PaperInfo; import com.mindskip.xzs.viewmodel.student.exam.ExamPaperPageVM; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.mindskip.xzs.domain.ExamPaper; -import com.mindskip.xzs.domain.Question; -import com.mindskip.xzs.domain.User; +import org.apache.commons.lang3.ObjectUtils; import org.modelmapper.ModelMapper; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -42,6 +44,7 @@ protected final static ModelMapper modelMapper = ModelMapperSingle.Instance(); private final ExamPaperMapper examPaperMapper; + private final ExamPaperAnswerMapper examPaperAnswerMapper; private final QuestionMapper questionMapper; private final TextContentService textContentService; private final QuestionService questionService; @@ -49,11 +52,18 @@ private final ExamPaperDepartmentService examPaperDepartmentService; private final ExamPaperSubjectService examPaperSubjectService; private final QuestionSubjectService questionSubjectService; + private final ExamPaperUserService examPaperUserService; + private final UserService userService; + private final UserDepartmentMapper userDepartmentMapper; + private final DepartmentService departmentService; + + @Autowired - public ExamPaperServiceImpl(ExamPaperMapper examPaperMapper, QuestionMapper questionMapper, TextContentService textContentService, QuestionService questionService, SubjectService subjectService, ExamPaperDepartmentService examPaperDepartmentService, ExamPaperSubjectService examPaperSubjectService, QuestionSubjectService questionSubjectService) { + public ExamPaperServiceImpl(ExamPaperMapper examPaperMapper, ExamPaperAnswerMapper examPaperAnswerMapper, QuestionMapper questionMapper, TextContentService textContentService, QuestionService questionService, SubjectService subjectService, ExamPaperDepartmentService examPaperDepartmentService, ExamPaperSubjectService examPaperSubjectService, QuestionSubjectService questionSubjectService, ExamPaperUserService examPaperUserService, UserService userService, UserDepartmentMapper userDepartmentMapper, DepartmentService departmentService) { super(examPaperMapper); this.examPaperMapper = examPaperMapper; + this.examPaperAnswerMapper = examPaperAnswerMapper; this.questionMapper = questionMapper; this.textContentService = textContentService; this.questionService = questionService; @@ -61,6 +71,10 @@ this.examPaperDepartmentService = examPaperDepartmentService; this.examPaperSubjectService = examPaperSubjectService; this.questionSubjectService = questionSubjectService; + this.examPaperUserService = examPaperUserService; + this.userService = userService; + this.userDepartmentMapper = userDepartmentMapper; + this.departmentService = departmentService; } @@ -92,9 +106,10 @@ List<ExamPaperTitleItemObject> frameTextContentList = new ArrayList<>(); List<ExamPaperTitleItemVM> titleItemsVM = new ArrayList<>(); //闅忔満璇曞嵎 - if (examPaperEditRequestVM.getSubjectSource().size() != 0) { + if (examPaperEditRequestVM.getQuestionTypeVMS().size() != 0) { // Map<Integer, Integer> questionList = questionService.getAll().stream().collect(Collectors.toMap(Question::getId, Question::getScore)); - randomQuestion(examPaperEditRequestVM, frameTextContentList, titleItemsVM); +// randomQuestion(examPaperEditRequestVM, frameTextContentList, titleItemsVM); + randomQuestionType(examPaperEditRequestVM, frameTextContentList, titleItemsVM); } if (titleItemsVM.size() == 0) { titleItemsVM = examPaperEditRequestVM.getTitleItems(); @@ -106,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); @@ -114,6 +130,7 @@ examPaper.setCreateTime(now); examPaper.setCreateUser(user.getId()); examPaper.setDeleted(false); + examPaper.setUserIds(examPaperEditRequestVM.getMenuIds()); examPaperFromVM(examPaperEditRequestVM, examPaper, titleItemsVM); examPaperMapper.insertSelective(examPaper); @@ -122,41 +139,63 @@ 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); //鎵归噺淇敼 examPaperDepartmentService.removeByExamPaperId(examPaper.getId()); examPaperSubjectService.removeByExamPaperId(examPaper.getId()); } - addExamPaperDepartment(examPaperEditRequestVM, examPaper); +// addExamPaperDepartment(examPaperEditRequestVM, examPaper); + addExamPaperUser(examPaperEditRequestVM, examPaper); //鎵归噺娣诲姞璇曞嵎鍏宠仈鐢ㄦ埛 addExamPaperSubject(examPaperEditRequestVM, examPaper); return examPaper; } @Override - public ExamPaperEditRequestVM examPaperToVM(Integer id) { + public ExamPaperEditRequestVO examPaperToVM(Integer id) { ExamPaper examPaper = examPaperMapper.selectByPrimaryKey(id); - ExamPaperEditRequestVM vm = modelMapper.map(examPaper, ExamPaperEditRequestVM.class); + ExamPaperEditRequestVO vm = modelMapper.map(examPaper, ExamPaperEditRequestVO.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() .flatMap(t -> t.getQuestionItems().stream() .map(q -> q.getId())) .collect(Collectors.toList()); + if (ObjectUtils.isEmpty(questionIds)) { + throw new RuntimeException("璇ヨ瘯鍗锋病鏈夐鐩�"); + } List<Question> questions = questionMapper.selectByIds(questionIds); + + //鍗曢�夋暟閲� + Integer singleChoice = questions.stream().filter(e -> e.getQuestionType() == 1).collect(Collectors.toList()).size(); + //澶氶�夋暟閲� + Integer multipleChoice = questions.stream().filter(e -> e.getQuestionType() == 2).collect(Collectors.toList()).size(); + //鍒ゆ柇鏁伴噺 + Integer trueFalse = questions.stream().filter(e -> e.getQuestionType() == 3).collect(Collectors.toList()).size(); Integer order = 0; Set<Integer> generatedNumbers = new HashSet<>(); Random random = new Random(); - List<ExamPaperTitleItemVM> examPaperTitleItemVMS = examPaperTitleItemObjects.stream().map(t -> { - ExamPaperTitleItemVM tTitleVM = modelMapper.map(t, ExamPaperTitleItemVM.class); - List<QuestionEditRequestVM> questionItemsVM = t.getQuestionItems().stream().map(i -> { + List<ExamPaperTitleItemVO> examPaperTitleItemVMS = examPaperTitleItemObjects.stream().map(t -> { + ExamPaperTitleItemVO tTitleVM = new ExamPaperTitleItemVO(); + BeanUtils.copyProperties(t, tTitleVM); + List<ExamQuestionVO> questionItemsVM = t.getQuestionItems().stream().map(i -> { Question question = questions.stream().filter(q -> q.getId().equals(i.getId())).findFirst().get(); - QuestionEditRequestVM questionEditRequestVM = questionService.getQuestionEditRequestVM(question); - questionEditRequestVM.setItemOrder(getRandomNumber(t.getQuestionItems().size() - 1, generatedNumbers, random)); + 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)), + generatedNumbers, random)); +// questionEditRequestVM.setItemOrder(getRandomNumber(t.getQuestionItems().size() - 1, generatedNumbers, random)); + return questionEditRequestVM; - }).sorted(Comparator.comparing(QuestionEditRequestVM::getItemOrder)) + }).sorted(Comparator.comparing(ExamQuestionVO::getItemOrder)) .collect(Collectors.toList()); tTitleVM.setQuestionItems(questionItemsVM); return tTitleVM; @@ -173,6 +212,19 @@ .stream().map(ExamPaperSubject::getSubjectId).toArray(Integer[]::new)); vm.setDepartmentIds(examPaperDepartmentService.getByExamPaperId(examPaper.getId()) .stream().map(ExamPaperDepartment::getDepartmentId).toArray(Integer[]::new)); + List<ExamPaperUser> examPaperUsers = examPaperUserService.getByExamPaperId(examPaper.getId()); + 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 = examPaperUsers.get(i).getUserId(); + userIds.add(userId); + userNames.add(user.getRealName()); + } + } + vm.setUserIds(userIds); + vm.setUserNames(userNames); return vm; } @@ -183,8 +235,8 @@ @Override - public Integer selectAllCount() { - return examPaperMapper.selectAllCount(); + public Integer selectAllCount(List<Integer> deptIds) { + return examPaperMapper.selectAllCount(deptIds); } @Override @@ -207,6 +259,22 @@ @Override public List<ExamPaper> gets(Integer[] ids) { return examPaperMapper.gets(ids); + } + + @Override + public List<PaperExcelVO> getPaperExcelById(Integer id) { + List<PaperExcelVO> paperExcel = examPaperMapper.getPaperExcelById(id); + paperExcel = paperExcel.stream().map(e->{ + e.setPaperScore(ExamUtil.scoreToVM(Integer.parseInt(e.getPaperScore()))); + e.setUserScore(ExamUtil.scoreToVM(Integer.parseInt(e.getUserScore()))); + List<UserDepartment> userDepartments = userDepartmentMapper.selectByUserId(Integer.parseInt(e.getUserId())); + if(userDepartments.size() != 0){ + Department byId = departmentService.getById(userDepartments.get(0).getDepartmentId()); + e.setDepartmentName(byId.getName()); + } + return e; + }).collect(Collectors.toList()); + return paperExcel; } private void examPaperFromVM(ExamPaperEditRequestVM examPaperEditRequestVM, ExamPaper examPaper, List<ExamPaperTitleItemVM> titleItemsVM) { @@ -244,7 +312,7 @@ } private void addExamPaperDepartment(ExamPaperEditRequestVM examPaperEditRequestVM, ExamPaper examPaper) { - if(examPaperEditRequestVM.getDepartmentIds().length==0){ + if (examPaperEditRequestVM.getDepartmentIds().length == 0) { return; } List<ExamPaperDepartment> list = Arrays.asList(examPaperEditRequestVM.getDepartmentIds()).stream().map(e -> { @@ -257,7 +325,27 @@ examPaperDepartmentService.saves(list); } + private void addExamPaperUser(ExamPaperEditRequestVM examPaperEditRequestVM, ExamPaper examPaper) { + if (examPaperEditRequestVM.getUserIds().length == 0) { + return; + } + if (examPaperUserService.getByExamPaperId(examPaper.getId()).size() > 0) { + examPaperUserService.removeByExamPaperId(examPaper.getId()); + } + List<ExamPaperUser> list = Arrays.asList(examPaperEditRequestVM.getUserIds()).stream().map(e -> { + ExamPaperUser examPaperUser = new ExamPaperUser(); + examPaperUser.setUserId(e); + examPaperUser.setExamPaperId(examPaper.getId()); + examPaperUser.setDeleted("0"); + return examPaperUser; + }).collect(Collectors.toList()); + examPaperUserService.saves(list); + } + private void addExamPaperSubject(ExamPaperEditRequestVM examPaperEditRequestVM, ExamPaper examPaper) { + if (examPaperSubjectService.getByExamPaperId(examPaper.getId()).size() > 0) { + examPaperSubjectService.removeByExamPaperId(examPaper.getId()); + } List<ExamPaperSubject> subjectList = Arrays.asList(examPaperEditRequestVM.getSubjectId()).stream().map(e -> { ExamPaperSubject examPaperSubject = new ExamPaperSubject(); examPaperSubject.setSubjectId(e); @@ -289,6 +377,7 @@ int remainingScore = totalScore; for (int i = 0; i < quantity - 1; i++) { + // 濡傛灉棰樻暟閲忚秴杩囦簡棰樺簱鏁伴噺锛屾姤閿� if (i >= scoresMap.size()) { throw new QuestionException(); } @@ -303,7 +392,6 @@ keys.remove(index); } } - if (!values.isEmpty()) { int index = random.nextInt(values.size()); int score = values.get(index); @@ -319,7 +407,7 @@ * @param frameTextContentList * @param titleItemsVM title */ - private void randomQuestion(ExamPaperEditRequestVM examPaperEditRequestVM, List<ExamPaperTitleItemObject> frameTextContentList, List<ExamPaperTitleItemVM> titleItemsVM) throws QuestionException { + private void randomQuesrandomQuestiontion(ExamPaperEditRequestVM examPaperEditRequestVM, List<ExamPaperTitleItemObject> frameTextContentList, List<ExamPaperTitleItemVM> titleItemsVM) throws QuestionException { Map<Integer, Integer> subjectSource = examPaperEditRequestVM.getSubjectSource(); //鎬绘暟閲� Integer sum = subjectSource.values().stream().mapToInt(Integer::intValue).sum(); @@ -339,7 +427,7 @@ Integer order = 0; for (Integer key : subjectSource.keySet()) { // key锛氭暟閲� //璇ユ爣绛惧搴旂殑鍒嗘暟 澶氶�夛細3 鍒ゆ柇锛�3 鍗曢�夛細4 - Integer source = 80 * subjectSource.get(key) / sum - mark; + Integer source = 100 * subjectSource.get(key) / sum - mark; // 澶氶�夊拰鍒ゆ柇鏁伴噺 Integer multipleNumber = (subjectSource.get(key) + count) * 3 / 10; //澶氶�夊拰鍒ゆ柇鍒嗘暟 @@ -404,6 +492,94 @@ } + /** + * 闅忔満璇曞嵎 + * + * @param examPaperEditRequestVM 浼犲弬 + * @param frameTextContentList + * @param titleItemsVM title + */ + private void randomQuestionType(ExamPaperEditRequestVM examPaperEditRequestVM, List<ExamPaperTitleItemObject> frameTextContentList, List<ExamPaperTitleItemVM> titleItemsVM) throws QuestionException { + + + //鍗曢�� + Integer singleChoice = examPaperEditRequestVM.getQuestionTypeVMS().stream().mapToInt(QuestionTypeVM::getSingleChoice).sum(); + //澶氶�� + Integer multipleChoice = examPaperEditRequestVM.getQuestionTypeVMS().stream().mapToInt(QuestionTypeVM::getMultipleChoice).sum(); + //鍒ゆ柇 + Integer judgment = examPaperEditRequestVM.getQuestionTypeVMS().stream().mapToInt(QuestionTypeVM::getTrueFalse).sum(); + + + if ((singleChoice * 2 + multipleChoice * 2 + judgment * 2) != new Integer(100)) { + throw new QuestionException(); + } + + ExamPaperTitleItemObject examPaperTitleItemObject = new ExamPaperTitleItemObject(); + examPaperTitleItemObject.setName(examPaperEditRequestVM.getTitleItems().get(0).getName()); + + ExamPaperTitleItemVM examPaperTitleItemVM = new ExamPaperTitleItemVM(); + //titleItemsVM + examPaperTitleItemVM.setName(examPaperEditRequestVM.getTitleItems().get(0).getName()); + + List<ExamPaperQuestionItemObject> examPaperQuestionItemObjectList = new ArrayList<>(); + + List<QuestionEditRequestVM> questionItems = new ArrayList<>(); + + List<QuestionTypeVM> questionTypeVMList = examPaperEditRequestVM.getQuestionTypeVMS(); + Integer order = 0; + for (QuestionTypeVM questionTypeVM : questionTypeVMList) { + + List<Integer> questions = questionSubjectService.getSubjectBySubjectIds(examPaperEditRequestVM.getSubjectId()) + .stream().map(QuestionSubject::getQuestionId).collect(Collectors.toList()); + List<Question> list = questionService.selectByIds(questions); + // List<Question> list = questionService.getAll(); + + Map<Integer, Integer> multiple = new HashMap<>(); + //澶氶�� + Map<Integer, Integer> multipleMap = list.stream() + .filter(e -> Objects.equals(QuestionTypeEnum.MultipleChoice.getCode(), e.getQuestionType())) + .collect(Collectors.toMap(Question::getId, Question::getScore)); + Integer multipleSource = questionTypeVM.getMultipleChoice() * 2; + selectRandomScores(multiple, multipleMap, questionTypeVM.getMultipleChoice(), multipleSource); + + + //鍒ゆ柇 + List<Question> collect1 = list.stream().filter(e -> Objects.equals(e.getQuestionType(), QuestionTypeEnum.TrueFalse.getCode())).collect(Collectors.toList()); + Map<Integer, Integer> judgmentMap = collect1.stream().collect(Collectors.toMap(Question::getId, Question::getScore)); + Integer trueFalse1 = questionTypeVM.getTrueFalse(); + Integer trueFalse = trueFalse1 * 2; + selectRandomScores(multiple, judgmentMap, questionTypeVM.getTrueFalse(), trueFalse); + + //鍗曢�夊垎鏁� + Integer radioSource = questionTypeVM.getSingleChoice() * 4; + //鍗曢�� + Map<Integer, Integer> radioMap = list.stream() + .filter(e -> Objects.equals(e.getQuestionType(), QuestionTypeEnum.SingleChoice.getCode())) + .collect(Collectors.toMap(Question::getId, Question::getScore)); + selectRandomScores(multiple, radioMap, questionTypeVM.getSingleChoice(), radioSource); + +// titleItemsVM.add(examPaperTitleItemVM); + for (Integer k : multiple.keySet()) { + ExamPaperQuestionItemObject examPaperQuestionItemObject = new ExamPaperQuestionItemObject(); + examPaperQuestionItemObject.setId(k); + examPaperQuestionItemObject.setItemOrder(order++); + examPaperQuestionItemObjectList.add(examPaperQuestionItemObject); + //titleItemsVM + QuestionEditRequestVM questionEditRequestVM = new QuestionEditRequestVM(); + questionEditRequestVM.setScore(multiple.get(k).toString()); + questionItems.add(questionEditRequestVM); + } + + examPaperTitleItemObject.setQuestionItems(examPaperQuestionItemObjectList); + + //titleItemsVM + examPaperTitleItemVM.setQuestionItems(questionItems); + } + frameTextContentList.add(examPaperTitleItemObject); + titleItemsVM.add(examPaperTitleItemVM); + + } + public Integer getRandomNumber(Integer a, Set<Integer> generatedNumbers, Random random) { if (a <= 0) { throw new IllegalArgumentException("a蹇呴』涓烘鏁存暟"); @@ -423,4 +599,72 @@ generatedNumbers.add(randomNumber); return randomNumber; } + + /** + * 涓や釜鏁颁箣鍓嶇殑闅忔満鏁帮紙涓嶉噸澶嶏級 + * + * @param a + * @param b + * @return + */ + public static int generateRandomNumber(Integer a, Integer b, Set<Integer> generatedNumbers, Random random) { + + int randomNumber = random.nextInt(b - a) + a; + while (generatedNumbers.contains(randomNumber)) { + randomNumber = random.nextInt(b - a) + a; + } + generatedNumbers.add(randomNumber); + + return randomNumber; + } + + @Override + @Transactional + public void missExam(ExamPaperEditRequestVM model) { + // 淇敼鍘熸潵鐨勮瘯鍗锋椂闂� + if (ObjectUtils.isNotEmpty(model.getLimitDateTime())) { + ExamPaper examPaper = new ExamPaper(); + examPaper.setId(model.getExamPaperId()); + examPaper.setLimitStartTime(DateTimeUtil.parse(model.getLimitDateTime().get(0), DateTimeUtil.STANDER_FORMAT)); + examPaper.setLimitEndTime(DateTimeUtil.parse(model.getLimitDateTime().get(1), DateTimeUtil.STANDER_FORMAT)); + examPaperMapper.updateByPrimaryKeySelective(examPaper); + } + // 鏍规嵁鑰冭瘯id灏嗛�夋嫨鐨勮ˉ鑰冭�冪敓鐨勮�冭瘯鎴愮哗璁剧疆涓烘棤鏁� + examPaperAnswerMapper.setMissExam(model); + + // 琛ヨ�冩椂灏嗘病鏈夐�夋嫨鐨勫苟涓旀病鏈夊弬鍔犺繃鑰冭瘯鐨勮�冪敓澧炲姞涓�鏉¢浂鍒嗚�冭瘯璁板綍锛屽惁鍒欐病鏈夊弬鍔犺繃鑰冭瘯鐨勫嵆浣夸笉琚�夋嫨涔熷彲浠ュ弬鍔犺ˉ鑰� + examPaperAnswerMapper.insertDefault(model); + } + + @Override + @Transactional + public void missExamByTemplateId(ExamTemplatesVO model) { + List<Integer> id = examPaperMapper.getExamPaperByTemplateId(model); + model.setPaperIds(id); + // 鏍规嵁鑰冭瘯id灏嗛�夋嫨鐨勮ˉ鑰冭�冪敓鐨勮�冭瘯鎴愮哗璁剧疆涓烘棤鏁� + examPaperAnswerMapper.setMissExamByTemplate(model); + } + + @Override + 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()); + } } -- Gitblit v1.8.0