考试安排

zhongzheng-system/src/main/resources/mapper/modules/exam/ExamArrangementStudentMapper.xml

@@ -135,6 +135,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN exam_arrangement e ON s.arrangement_id = e.id
         WHERE 1=1
           AND e.status != 0
+        <if test="startTime != null and startTime != ''">
+            and exists(select * from exam_arrangement_time where start_time BETWEEN #{startTime} and #{endTime})
+        </if>
+        <if test="startTime != null and startTime != ''">
+            or exists(select * from exam_arrangement_time where end_time BETWEEN #{startTime} and #{endTime})
+        </if>
         <if test="examTypeId != null and examTypeId != ''">
             AND e.exam_type_id = #{examTypeId}
         </if>
@@ -151,17 +157,58 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectSubList" parameterType="com.zhongzheng.modules.exam.bo.ExamArrangementQueryBo" resultMap="UserResult">
         SELECT
-        u.*,
-        e.*
+        u.user_id,
+        u.user_accout,
+        u.nickname,
+        u.realname,
+        u.sex,
+        u.id_card,
+        u.telphone,
+        u.user_level,
+        u.user_birth,
+        u.edu_level,
+        u.school_id,
+        u.major,
+        u.entrance_time,
+        u.open_id,
+        u.student_certificate_img,
+        u.id_card_img1,
+        u.id_card_img2,
+        u.country,
+        u.province,
+        u.city,
+        u.integral,
+        u.create_time,
+        u.update_time,
+        u.status,
+        e.id,
+        e.exam_type_id,
+        e.exam_type,
+        e.sign_start_time,
+        e.sign_end_time,
+        e.exam_adress,
+        e.exam_url,
+        e.remarks,
+        e.release_num,
+        e.subscr_pe,
+        e.sign_up_pe,
+        e.release_time,
+        e.exam_time,
+        e.reg_guide,
+        e.exam_period,
+        e.exam_form,
+        e.exam_from_url,
+        e.print_url,
+        e.grades_url,
+        e.score_line_url,
+        e.certificate
         FROM
         exam_arrangement_sub s
         LEFT JOIN `user` u ON s.sub_id = u.user_id
         LEFT JOIN exam_arrangement e ON s.exam_id = e.id
         WHERE 1=1
         AND e.status != 0
-        <if test="startTime != null and startTime != ''">
-            AND t.start_time BETWEEN #{startTime} and #{endTime}
-        </if>
+
         <if test="examId != null and examId != ''">
             AND s.exam_id = #{examId}
         </if>