소스 검색

add examName for pdf.

deason 6 년 전
부모
커밋
10f2efdac3

+ 4 - 2
examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/PaperController.java

@@ -590,7 +590,7 @@ public class PaperController extends ControllerSupport {
     @Naked
     @ApiOperation(value = "预览试卷页面")
     @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));
         if (paper == null) {
             throw new StatusException("500", "试卷信息不存在!");
@@ -604,6 +604,7 @@ public class PaperController extends ControllerSupport {
 
         PaperExp viewPaper = exportPaperAbstractService.previewPDF(paper);
         model.addAttribute("htmlList", JsonUtil.toJson(ParsePaper.convertPaperHtml(viewPaper)));
+        model.addAttribute("examName", examName);
         model.addAttribute("courseName", viewPaper.getCourseName());
         model.addAttribute("courseNo", viewPaper.getCourseNo());
         model.addAttribute("courseLevel", viewPaper.getCourseLevel());
@@ -616,7 +617,7 @@ public class PaperController extends ControllerSupport {
     @Naked
     @ApiOperation(value = "预览试卷答案页面")
     @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));
         if (paper == null) {
             throw new StatusException("500", "试卷答案信息不存在!");
@@ -633,6 +634,7 @@ public class PaperController extends ControllerSupport {
         model.addAttribute("courseNo", viewPaper.getCourseNo());
         model.addAttribute("courseName", viewPaper.getCourseName());
         model.addAttribute("courseLevel", viewPaper.getCourseLevel());
+        model.addAttribute("examName", examName);
 
         //String html = manager.getExportServiceName() + "_answer";
         String html = "sddxExportPaperService_answer";

+ 3 - 1
examcloud-core-questions-starter/src/main/resources/templates/sddxExportPaperService_answer.ftl

@@ -238,7 +238,9 @@
             <div id="e_box_0" class="e_box">
                 <div class="e_paper_title">
                     <h1>山东大学继续(网络)教育</h1>
-                    <h3><b><em>2019年06月</em></b>期末考试</h3>
+                    <#if examName??>
+                        <h3>${examName}</h3>
+                    </#if>
                     <div class="e_description">
                         <span>课程名称:<em style="color: #FF0000">${courseName!}</em></span>
                         <span>课程代码:<em style="color: #FF0000">${courseNo!}</em></span>

+ 3 - 1
examcloud-core-questions-starter/src/main/resources/templates/sddxExportPaperService_paper.ftl

@@ -238,7 +238,9 @@
             <div id="e_box_0" class="e_box">
                 <div class="e_paper_title">
                     <h1>山东大学继续(网络)教育</h1>
-                    <h3><b><em>2019年06月</em></b>期末考试</h3>
+                    <#if examName??>
+                        <h3>${examName}</h3>
+                    </#if>
                     <div class="e_description">
                         <span>课程名称:<em style="color: #FF0000">${courseName!}</em></span>
                         <span>课程代码:<em style="color: #FF0000">${courseNo!}</em></span>