Merge branch 'master' of http://49.232.152.146:6688/qangqi/dd_school

smart-campus/src/main/java/yangtz/cs/liu/campus/vo/recruit/RecruitExamScoreVo.java

@@ -84,4 +84,7 @@ public class RecruitExamScoreVo extends OurBaseEntity {
     /** 资格线 */
     /** 资格线 */
     @Excel(name = "资格线")
     @Excel(name = "资格线")
     private String passScore;
     private String passScore;
+
+    private String examName;
+    private String notice;
 }
 }

smart-campus/src/main/resources/mapper/recruit/SchoolRecruitRelationMapper.xml

@@ -132,11 +132,14 @@
            sas.height,
            sas.height,
            sas.weight,
            sas.weight,
            sas.telephone1,
            sas.telephone1,
-           sas.telephone2
+           sas.telephone2,
+           se.exam_name,
+           se.notice
     from school_recruit_relation sar
     from school_recruit_relation sar
            left join school_recruit_student sas on sas.id = sar.student_id
            left join school_recruit_student sas on sas.id = sar.student_id
            left join school_recruit_project stp on stp.id = sar.test_id
            left join school_recruit_project stp on stp.id = sar.test_id
            left join junior_high_school jhs on jhs.id = sar.junior_id
            left join junior_high_school jhs on jhs.id = sar.junior_id
+           left join school_recruit_exam se on se.id = sar.exam_id
     where sar.del_flag = '0'
     where sar.del_flag = '0'
       and sas.del_flag = '0'
       and sas.del_flag = '0'
       and sar.id = #{id}
       and sar.id = #{id}