预约明细

src/main/java/com/qmth/exam/reserve/bean/timeperiod/TimePeriodExamSiteBean.java

@@ -28,6 +28,9 @@ public class TimePeriodExamSiteBean implements IModel {
     @ApiModelProperty("是否开启")
     private Boolean enable;
 
+    @ApiModelProperty("考点ID")
+    private Long examSiteId;
+
     @Override
     public boolean equals(Object o) {
         if (this == o)

src/main/java/com/qmth/exam/reserve/controller/admin/StudentApplyController.java

@@ -103,7 +103,7 @@ public class StudentApplyController extends BaseController {
         if (Role.TEACHING.equals(user.getRole())) {
             teachingId = user.getCategoryId();
         }
-        List<Map<String, Object>> failRecords = new ArrayList<>();
+        List<Map<String, Object>> failRecords;
         try {
             failRecords = studentApplyService.importPreExam(user, teachingId, level, file.getInputStream());
         } catch (IOException e) {

src/main/resources/mapper/TimePeriodMapper.xml

@@ -22,18 +22,21 @@
 
     <select id="listTimePeriodByExamSiteId" resultType="com.qmth.exam.reserve.bean.timeperiod.TimePeriodExamSiteBean">
         SELECT
-            tpes.id,
-            tp.id timePeriodId,
-            tp.start_time startTime,
-            tp.end_time endTime,
-            tpes.enable
+        tpes.id,
+        tp.id timePeriodId,
+        tp.start_time startTime,
+        tp.end_time endTime,
+        tpes.enable,
+        tpes.exam_site_id examSiteId
         FROM
-            t_time_period_exam_site tpes,
-            t_time_period tp
+        t_time_period_exam_site tpes,
+        t_time_period tp
         WHERE
-            tpes.time_period_id = tp.id
-          AND tpes.exam_site_id = #{examSiteId}
-          AND tp.apply_task_id = #{taskId}
+        tpes.time_period_id = tp.id
+        AND tp.apply_task_id = #{taskId}
+        <if test="examSiteId != null">
+            AND tpes.exam_site_id = #{examSiteId}
+        </if>
         order by tp.start_time
     </select>