diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/teacher/TeacherExamPaperController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/teacher/TeacherExamPaperController.java index 201bdb5..6bfd9ab 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/teacher/TeacherExamPaperController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/teacher/TeacherExamPaperController.java @@ -10,6 +10,7 @@ import com.ruoyi.test.domain.ClassExamPaper; import com.ruoyi.test.domain.DO.*; import com.ruoyi.test.domain.ExamPaper; import com.ruoyi.test.domain.TeacherManageClass; +import com.ruoyi.test.domain.Vo.QuestionbankVo1; import com.ruoyi.test.seriver.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -45,6 +46,12 @@ public class TeacherExamPaperController { @Autowired private IQuestionbankService iQuestionbankService; + @ApiOperation("试卷题目获取") + @GetMapping("getExamPaperQuestions") + public R> getExamPaperQuestions(Long id){ + return R.ok(iExamPaperService.getExamPaperQuestions(id)); + } + @ApiOperation("发布试卷") @PostMapping("addExamPaper") public R addExamPaper(@RequestBody ClassExamPaper classExamPaper){ diff --git a/ruoyi-test/src/main/java/com/ruoyi/test/seriver/IExamPaperService.java b/ruoyi-test/src/main/java/com/ruoyi/test/seriver/IExamPaperService.java index ed93fa8..d5a27c6 100644 --- a/ruoyi-test/src/main/java/com/ruoyi/test/seriver/IExamPaperService.java +++ b/ruoyi-test/src/main/java/com/ruoyi/test/seriver/IExamPaperService.java @@ -6,6 +6,7 @@ import com.ruoyi.test.domain.ExamPaper; import com.ruoyi.test.domain.TeacherManageClass; import com.ruoyi.test.domain.TeacherSubject; import com.ruoyi.test.domain.Vo.ExamPaperVo; +import com.ruoyi.test.domain.Vo.QuestionbankVo1; //import com.ruoyi.test.domain.Vo.ExamCreateVo; import java.util.List; @@ -44,4 +45,6 @@ public interface IExamPaperService { List selectByGlId(Long teacherId); List getExamPaperList(Long teacherId); + + List getExamPaperQuestions(Long id); } diff --git a/ruoyi-test/src/main/java/com/ruoyi/test/seriver/Impl/ExamPaperServiceImpl.java b/ruoyi-test/src/main/java/com/ruoyi/test/seriver/Impl/ExamPaperServiceImpl.java index e5f30fa..8d0d86c 100644 --- a/ruoyi-test/src/main/java/com/ruoyi/test/seriver/Impl/ExamPaperServiceImpl.java +++ b/ruoyi-test/src/main/java/com/ruoyi/test/seriver/Impl/ExamPaperServiceImpl.java @@ -4,13 +4,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.google.gson.Gson; import com.ruoyi.test.domain.*; import com.ruoyi.test.domain.DO.PaperCreateDO; import com.ruoyi.test.domain.Vo.ExamPaperVo; -import com.ruoyi.test.mapper.ClassExamPaperMapper; -import com.ruoyi.test.mapper.ExamPaperMapper; -import com.ruoyi.test.mapper.MarkedtestMapper; -import com.ruoyi.test.mapper.StudentClassMapper; +import com.ruoyi.test.domain.Vo.QuestionbankVo1; +import com.ruoyi.test.mapper.*; import com.ruoyi.test.seriver.IExamPaperService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -20,6 +19,7 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; @Service @@ -33,6 +33,10 @@ public class ExamPaperServiceImpl extends ServiceImpl selectAll(int pagenum,int pagesize) { @@ -192,6 +196,33 @@ public class ExamPaperServiceImpl extends ServiceImpl getExamPaperQuestions(Long id) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ExamCreate::getPid,id); + List list = examCreateMapper.selectList(queryWrapper) + .stream() + .map(ExamCreate::getId) + .collect(Collectors.toList()); + Gson gson = new Gson(); + List questionbankVo1s = new ArrayList<>(); + for(Long questionId : list){ + LambdaQueryWrapper queryWrapper1 = new LambdaQueryWrapper<>(); + queryWrapper1.eq(Questionbank::getId,questionId); + Questionbank questionbank = questionbankMapper.selectOne(queryWrapper1); + QuestionbankVo1 questionbankVo1 = new QuestionbankVo1(); + questionbankVo1.setId(questionId); + questionbankVo1.setContent(questionbank.getContent()); + String chance = questionbank.getChance(); + List> listMap = gson.fromJson(chance,List.class); + questionbankVo1.setChance(listMap); + questionbankVo1s.add(questionbankVo1); + } + + System.out.println("=============="+questionbankVo1s); + return questionbankVo1s; + } + // @Override // public List totalExamPaper(List list, List list2) { // List list1 = new ArrayList<>(); diff --git a/vue2/vue/src/views/Teacher/TeacherExam.vue b/vue2/vue/src/views/Teacher/TeacherExam.vue index 73283e8..fe67c1b 100644 --- a/vue2/vue/src/views/Teacher/TeacherExam.vue +++ b/vue2/vue/src/views/Teacher/TeacherExam.vue @@ -1,15 +1,15 @@