3.0.0-bug修改

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/ExamTaskDetailCardDto.java

@@ -27,6 +27,8 @@ public class ExamTaskDetailCardDto {
     // 审核流程taskId
     private String flowTaskId;
     private String examId;
+    private String examName;
+    private String semesterName;
 
     @ApiModelProperty(value = "是否是子流程驳回")
     private boolean subFlowReject;
@@ -174,4 +176,20 @@ public class ExamTaskDetailCardDto {
     public void setExamId(String examId) {
         this.examId = examId;
     }
+
+    public String getExamName() {
+        return examName;
+    }
+
+    public void setExamName(String examName) {
+        this.examName = examName;
+    }
+
+    public String getSemesterName() {
+        return semesterName;
+    }
+
+    public void setSemesterName(String semesterName) {
+        this.semesterName = semesterName;
+    }
 }

distributed-print-business/src/main/resources/mapper/ExamTaskMapper.xml

@@ -557,6 +557,8 @@
         SELECT
             e.id examTaskId,
             e.exam_id examId,
+            g.name examName,
+            h.name semesterName,
             case #{source} when 'REVIEW' then ifnull(c.paper_type, a.paper_type) else a.paper_type end paperType,
             case #{source} when 'REVIEW' then ifnull(c.paper_attachment_ids, a.paper_attachment_ids) else a.paper_attachment_ids end paperAttachmentIds,
             case #{source} when 'REVIEW' then ifnull(c.card_id, a.card_id) else a.card_id end cardId,
@@ -580,6 +582,10 @@
             exam_card d on c.card_id = d.id
                 left join
             t_f_flow_approve f on e.flow_id = f.flow_id
+                left join
+            basic_exam g on e.exam_id = g.id
+                left join
+            basic_semester h on g.semester_id = h.id
         where e.id = #{examTaskId}
     </select>