Merge branch 'dev'

merge

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/ExamDetailCourse.java

@@ -49,6 +49,18 @@ public class ExamDetailCourse extends BaseEntity implements Serializable {
     @TableField("paper_type")
     private String paperType;
 
+    @ApiModelProperty(value = "备用题卡json")
+    @TableField("attachment_id")
+    private String attachmentId;
+
+    public String getAttachmentId() {
+        return attachmentId;
+    }
+
+    public void setAttachmentId(String attachmentId) {
+        this.attachmentId = attachmentId;
+    }
+
     public String getPaperType() {
         return paperType;
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/service/impl/TaskLogicServiceImpl.java

@@ -298,10 +298,11 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                         list[3].addAll(examStudentTempPdfList);
                         examStudentService.saveOrUpdateBatch(examStudentList);
                         jsonObject.put("card", jsonArray);
-                        examCardDetail.setAttachmentId(jsonObject.toJSONString());
+                        examDetailCourse.setAttachmentId(jsonObject.toJSONString());
                     }
                     examCardDetailService.saveOrUpdateBatch(examCardDetailList);
                 }
+                examDetailCourse.setAttachmentId(jsonObject.toJSONString());
                 examTaskDetailService.saveOrUpdateBatch(examTaskDetailList);
             }
             detailCourseService.saveOrUpdateBatch(examDetailCourseList);