|
@@ -590,7 +590,7 @@ public class PaperController extends ControllerSupport {
|
|
@Naked
|
|
@Naked
|
|
@ApiOperation(value = "预览试卷页面")
|
|
@ApiOperation(value = "预览试卷页面")
|
|
@GetMapping(value = "/paper/pdf/{paperId}")
|
|
@GetMapping(value = "/paper/pdf/{paperId}")
|
|
- public String viewPaper(Model model, @PathVariable String paperId) {
|
|
|
|
|
|
+ public String viewPaper(Model model, @PathVariable String paperId, @RequestParam(required = false) String examName) {
|
|
Paper paper = cn.com.qmth.examcloud.core.questions.base.Model.of(paperRepo.findById(paperId));
|
|
Paper paper = cn.com.qmth.examcloud.core.questions.base.Model.of(paperRepo.findById(paperId));
|
|
if (paper == null) {
|
|
if (paper == null) {
|
|
throw new StatusException("500", "试卷信息不存在!");
|
|
throw new StatusException("500", "试卷信息不存在!");
|
|
@@ -604,6 +604,7 @@ public class PaperController extends ControllerSupport {
|
|
|
|
|
|
PaperExp viewPaper = exportPaperAbstractService.previewPDF(paper);
|
|
PaperExp viewPaper = exportPaperAbstractService.previewPDF(paper);
|
|
model.addAttribute("htmlList", JsonUtil.toJson(ParsePaper.convertPaperHtml(viewPaper)));
|
|
model.addAttribute("htmlList", JsonUtil.toJson(ParsePaper.convertPaperHtml(viewPaper)));
|
|
|
|
+ model.addAttribute("examName", examName);
|
|
model.addAttribute("courseName", viewPaper.getCourseName());
|
|
model.addAttribute("courseName", viewPaper.getCourseName());
|
|
model.addAttribute("courseNo", viewPaper.getCourseNo());
|
|
model.addAttribute("courseNo", viewPaper.getCourseNo());
|
|
model.addAttribute("courseLevel", viewPaper.getCourseLevel());
|
|
model.addAttribute("courseLevel", viewPaper.getCourseLevel());
|
|
@@ -616,7 +617,7 @@ public class PaperController extends ControllerSupport {
|
|
@Naked
|
|
@Naked
|
|
@ApiOperation(value = "预览试卷答案页面")
|
|
@ApiOperation(value = "预览试卷答案页面")
|
|
@GetMapping(value = "/paper/answer/pdf/{paperId}")
|
|
@GetMapping(value = "/paper/answer/pdf/{paperId}")
|
|
- public String viewPaperAnswer(Model model, @PathVariable String paperId) {
|
|
|
|
|
|
+ public String viewPaperAnswer(Model model, @PathVariable String paperId, @RequestParam(required = false) String examName) {
|
|
Paper paper = cn.com.qmth.examcloud.core.questions.base.Model.of(paperRepo.findById(paperId));
|
|
Paper paper = cn.com.qmth.examcloud.core.questions.base.Model.of(paperRepo.findById(paperId));
|
|
if (paper == null) {
|
|
if (paper == null) {
|
|
throw new StatusException("500", "试卷答案信息不存在!");
|
|
throw new StatusException("500", "试卷答案信息不存在!");
|
|
@@ -633,6 +634,7 @@ public class PaperController extends ControllerSupport {
|
|
model.addAttribute("courseNo", viewPaper.getCourseNo());
|
|
model.addAttribute("courseNo", viewPaper.getCourseNo());
|
|
model.addAttribute("courseName", viewPaper.getCourseName());
|
|
model.addAttribute("courseName", viewPaper.getCourseName());
|
|
model.addAttribute("courseLevel", viewPaper.getCourseLevel());
|
|
model.addAttribute("courseLevel", viewPaper.getCourseLevel());
|
|
|
|
+ model.addAttribute("examName", examName);
|
|
|
|
|
|
//String html = manager.getExportServiceName() + "_answer";
|
|
//String html = manager.getExportServiceName() + "_answer";
|
|
String html = "sddxExportPaperService_answer";
|
|
String html = "sddxExportPaperService_answer";
|