监考端接口

themis-business/src/main/java/com/qmth/themis/business/bean/backend/ReexamListDoneBean.java

@@ -3,6 +3,8 @@ package com.qmth.themis.business.bean.backend;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.util.Objects;
+
 /**
  * @Description: 重考已审列表返回对象
  * @Param:

themis-business/src/main/resources/mapper/TEExamReexamMapper.xml

@@ -80,10 +80,10 @@
                  and teera.auditing_id = #{userId}
              </if>
              <if test="examId != null and examId != ''">
-                 and tees.exam_id = #{examId}
+                 and teer.exam_id = #{examId}
              </if>
              <if test="examActivityId != null and examActivityId != ''">
-                 and tees.exam_activity_id = #{examActivityId}
+                 and teer.exam_activity_id = #{examActivityId}
              </if>
              <if test="roomCode != null and roomCode != ''">
                  and tees.room_code = #{roomCode}
@@ -118,6 +118,76 @@
     </select>
 
     <select id="reexamPageDoneList" resultType="com.qmth.themis.business.bean.backend.ReexamListDoneBean">
-
+        select
+            teer.id as reexamId,
+            teer.exam_id as examId,
+            teer.exam_activity_id as examActivityId,
+            teea.code as examActivityCode,
+            tees.room_code as roomCode,
+            tees.room_name as roomName,
+            tees.course_code as courseCode,
+            tees.course_name as courseName,
+            tees.`identity`,
+            tee.name as examName,
+            tees.name,
+            teer.reason,
+            teer.create_time as applyTime,
+            teer.auditing_status as auditingStatus,
+            teer.update_time as auditingTime,
+            tbu.name as applyName,
+            tbu1.name as auditingName,
+            if(teer.auditing_status = 0,'通过','不通过') as auditingStatusStr
+        from
+            t_e_exam_reexam teer
+        left join t_e_exam_student tees on
+            tees.id = teer.exam_student_id
+        left join t_e_exam tee on
+            tee.id = teer.exam_id
+        left join t_e_exam_activity teea on
+            teea.id = teer.exam_activity_id
+        left join t_b_user tbu on
+            tbu.id = teer.create_id
+        left join t_b_user tbu1 on
+            tbu1.id = teer.auditing_id
+        <where>
+            <if test="userId != null and userId !=''">
+                and teer.auditing_id = #{userId}
+            </if>
+            <if test="examId != null and examId != ''">
+                and teer.exam_id = #{examId}
+            </if>
+            <if test="examActivityId != null and examActivityId != ''">
+                and teer.exam_activity_id = #{examActivityId}
+            </if>
+            <if test="roomCode != null and roomCode != ''">
+                and tees.room_code = #{roomCode}
+            </if>
+            <if test="courseCode != null and courseCode != ''">
+                and tees.course_code like CONCAT(#{courseCode},'%')
+            </if>
+            <if test="name != null and name !=''">
+                and tees.name like CONCAT(#{name},'%')
+            </if>
+            <if test="identity != null and identity !=''">
+                and tees.identity like CONCAT(#{identity},'%')
+            </if>
+            <if test="auditingStatus != null and auditingStatus !='' or auditingStatus == 0">
+                and teer.auditing_status = #{auditingStatus}
+            </if>
+            <if test="reasonStartTime != null and reasonStartTime != ''">
+                and teer.create_time &gt;= #{reasonStartTime}
+            </if>
+            <if test="reasonEndTime != null and reasonEndTime != ''">
+                and teer.create_time &lt;= #{reasonEndTime}
+            </if>
+            <if test="applyName != null and applyName !=''">
+                and tbu.name like CONCAT(#{applyName},'%')
+            </if>
+            and tee.enable = 1
+            and teea.enable = 1
+            and tees.enable = 1
+            and teer.status = 2
+        </where>
+        order by tees.room_code
     </select>
 </mapper>