update

edu-user/edu-user-server/src/main/java/com/keao/edu/user/page/ExamReviewQueryInfo.java

@@ -49,6 +49,9 @@ public class ExamReviewQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "考试时间")
     private String examStartTime;
 
+    @ApiModelProperty(value = "考试结束时间")
+    private String examEndTime;
+
     public Long getRegistId() {
         return registId;
     }
@@ -160,4 +163,12 @@ public class ExamReviewQueryInfo extends QueryInfo {
     public void setStudentStatus(StudentRegistrationStatusEnum studentStatus) {
         this.studentStatus = studentStatus;
     }
+
+    public String getExamEndTime() {
+        return examEndTime;
+    }
+
+    public void setExamEndTime(String examEndTime) {
+        this.examEndTime = examEndTime;
+    }
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExaminationBasicServiceImpl.java

@@ -240,6 +240,10 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
 
         List<Integer> childOrganIds = organizationService.getChildOrganIds(organId, true);
 
+        if(!childOrganIds.contains(examinationBasic.getOrganId())){
+            throw new BizException("删除失败");
+        }
+
         if (StringUtils.isBlank(reason)) {
             reason = "后台手动关闭";
         }

edu-user/edu-user-server/src/main/resources/config/mybatis/ExamRegistrationMapper.xml

@@ -237,6 +237,7 @@
 			er.last_music_theory_certificate_url_,
 			er.level_fee_,
 			er.theory_level_fee_,
+			er.song_json_,
 			er.organ_id_,
 			er.subject_id_,
 			er.level_,

edu-user/edu-user-server/src/main/resources/config/mybatis/ExamReviewMapper.xml

@@ -134,11 +134,11 @@
 			<if test="teacherType!=null">
 				AND er.teacher_type_=#{teacherType}
 			</if>
-			<if test="examStartTime!=null">
-				AND DATE_FORMAT( ero.exam_start_time_, '%Y-%m-%d' ) = #{examStartTime}
+			<if test="examStartTime!=null and examEndTime!=null">
+				AND DATE_FORMAT( ero.exam_start_time_, '%Y-%m-%d' ) BETWEEN  #{examStartTime} AND #{examEndTime}
 			</if>
 			<if test="search!=null and search!=''">
-				AND er.real_name_ LIKE CONCAT(#{search}, '%')
+				AND su.real_name_ LIKE CONCAT(#{search}, '%')
 			</if>
 		</where>
 	</sql>
@@ -168,6 +168,7 @@
 		FROM
 			exam_review er
 			LEFT JOIN exam_registration ere ON ere.id_=er.exam_registration_id_
+			LEFT JOIN exam_room ero ON ero.id_=er.exam_room_id_
 			LEFT JOIN sys_user su ON su.id_=er.teacher_id_
 		<include refid="findExamResultCondition"/>
 	</select>

edu-user/edu-user-server/src/main/resources/config/mybatis/ExamSubjectSongMapper.xml

@@ -101,7 +101,6 @@
 
 	<sql id="queryCondition">
 		<where>
-			ess.tenant_id_ = #{tenantId}
 			<if test="examId!=null">
 				AND ess.examination_basic_id_ = #{examId}
 			</if>