命题申请入口修改

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

@@ -12,7 +12,7 @@ public class ExamTaskDetailCardDto {
     private String examTaskId;
     private String paperType;
     private String paperAttachmentIds;
-    private String cardId;
+//    private String cardId;
     private String paperConfirmAttachmentIds;
     private String remark;
     private String exposedPaperType;
@@ -21,7 +21,7 @@ public class ExamTaskDetailCardDto {
     private Boolean enable;
     private String makeMethod;
     private Integer drawCount;
-    private String status;
+//    private String status;
     private String flowId;
     private Integer setup;
     // 审核流程taskId
@@ -77,13 +77,13 @@ public class ExamTaskDetailCardDto {
         this.paperAttachmentIds = paperAttachmentIds;
     }
 
-    public String getCardId() {
-        return cardId;
-    }
-
-    public void setCardId(String cardId) {
-        this.cardId = cardId;
-    }
+//    public String getCardId() {
+//        return cardId;
+//    }
+//
+//    public void setCardId(String cardId) {
+//        this.cardId = cardId;
+//    }
 
     public String getPaperConfirmAttachmentIds() {
         return paperConfirmAttachmentIds;
@@ -149,14 +149,13 @@ public class ExamTaskDetailCardDto {
         this.drawCount = drawCount;
     }
 
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
+//    public String getStatus() {
+//        return status;
+//    }
+//
+//    public void setStatus(String status) {
+//        this.status = status;
+//    }
     public String getFlowId() {
         return flowId;
     }

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

@@ -658,9 +658,9 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
             examStudent.setStudentClazzType(StudentClazzEnum.TEACH_CLAZZ);
             examStudent.setCreateId(userId);
             examStudent.setUpdateId(userId);
+            examStudent.setPaperNumber(paperNumber);
             examStudentList.add(examStudent);
 
-
             BasicStudentExtrasParam basicStudentExtrasParam = new BasicStudentExtrasParam();
 
             basicStudentExtrasParam.setStudentName(studentName);

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

@@ -605,13 +605,11 @@
             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, b.id) else b.id end cardId,
             a.paper_confirm_attachment_ids paperConfirmAttachmentIds,
             a.remark,
             a.exposed_paper_type exposedPaperType,
             ifnull(d.make_method, a.make_method) makeMethod,
             a.draw_count drawCount,
-            ifnull(d.status, b.status) status,
             e.flow_id flowId,
             f.setup,
             f.status as flowStatus
@@ -621,9 +619,6 @@
             exam_task_detail a on a.exam_task_id = e.id
                 left JOIN
             exam_task_paper_log c ON a.exam_task_id = c.exam_task_id and c.review = false
-                JOIN
-            exam_card b ON FIND_IN_SET(b.id, REPLACE(substring_index(substring_index(CONVERT((a.paper_attachment_ids ->>'$[*].cardId')
-                                                                                             USING utf8), ']', 1), '[',-1),'"',''))
                 left join
             exam_card d on c.card_id = d.id
                 left join