From 6d3482679dc6730ec4eb247130db0763e4704727 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期一, 27 五月 2024 10:40:43 +0800 Subject: [PATCH] 修改用学员时处理部门管理员标识 --- src/main/java/com/mindskip/xzs/service/impl/ExamPaperServiceImpl.java | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 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 8001bb0..8eb7a39 100644 --- a/src/main/java/com/mindskip/xzs/service/impl/ExamPaperServiceImpl.java +++ b/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; @@ -626,8 +627,20 @@ } @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) { - return examPaperMapper.list(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 @@ -636,4 +649,12 @@ 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