3.4.0 update

distributed-print/install/mysql/upgrade/3.4.0.sql

@@ -70,6 +70,12 @@ ALTER TABLE `exam_student`
     CHANGE COLUMN `student_code` `student_code` VARCHAR(100) CHARACTER SET 'utf8mb4' NULL COMMENT '考生代码' ;
 
 
+update exam_task a set a.course_id = (select bc.id from basic_course bc where a.school_id = bc.school_id and a.course_code = bc.code) where a.course_id is null;
+update exam_card a set a.course_id = (select bc.id from basic_course bc where a.school_id = bc.school_id and a.course_code = bc.code) where a.course_id is null;
+update exam_detail_course a set a.course_id = (select bc.id from basic_course bc where a.school_id = bc.school_id and a.course_code = bc.code) where a.course_id is null;
+update teach_course a set a.course_id = (select bc.id from basic_course bc where a.school_id = bc.school_id and a.course_code = bc.code) where a.course_id is null;
+-- update t_p_course a set a.course_id = (select bc.id from basic_course bc where a.school_id = bc.school_id and a.course_code = bc.code) where a.course_id is null;
+update t_b_sync_task a set a.course_id = (select bc.id from basic_course bc where a.school_id = bc.school_id and a.course_code = bc.code) where a.course_id is null;
 
 -- drop table if exists exam_detail_course_paper_type;
 -- drop table if exists basic_template_org;

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/dto/mark/score/StudentObjectiveAnswerDto.java

@@ -4,6 +4,8 @@ public class StudentObjectiveAnswerDto {
 
     private Integer mainNumber;
     private Integer subNumber;
+    // 标答
+    private String standardAnswer;
     private String answer;
     private Boolean exist;
     private Integer questionType;
@@ -24,6 +26,14 @@ public class StudentObjectiveAnswerDto {
         this.subNumber = subNumber;
     }
 
+    public String getStandardAnswer() {
+        return standardAnswer;
+    }
+
+    public void setStandardAnswer(String standardAnswer) {
+        this.standardAnswer = standardAnswer;
+    }
+
     public String getAnswer() {
         return answer;
     }

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkStudentServiceImpl.java

@@ -522,6 +522,7 @@ public class MarkStudentServiceImpl extends ServiceImpl<MarkStudentMapper, MarkS
                 StudentObjectiveAnswerDto studentObjectiveAnswerDto = new StudentObjectiveAnswerDto();
                 studentObjectiveAnswerDto.setMainNumber(q != null ? q.getMainNumber() : 0);
                 studentObjectiveAnswerDto.setSubNumber(q != null ? q.getSubNumber() : 0);
+                studentObjectiveAnswerDto.setStandardAnswer(q != null ? q.getAnswer() : null);
                 studentObjectiveAnswerDto.setAnswer(answer);
                 studentObjectiveAnswerDto.setExist(q != null && q.getTotalScore() > 0);
                 studentObjectiveAnswerDto.setQuestionType(q != null ? q.getQuestionType() : 0);