Browse Source

根据考点查询考场

haogh 1 tháng trước cách đây
mục cha
commit
77c7a75c86

+ 7 - 0
src/main/java/com/qmth/exam/reserve/controller/admin/ExamRoomController.java

@@ -86,4 +86,11 @@ public class ExamRoomController extends BaseController {
         return map;
     }
 
+
+    @ApiOperation(value = "根据考点查询所有可用的考场")
+    @PostMapping(value = "/list")
+    public List<ExamRoomEntity> listExamRoomByExamSiteId(@RequestParam Long examSiteId) {
+        return examRoomService.listExamRoomByExamSiteId(examSiteId);
+    }
+
 }

+ 1 - 1
src/main/java/com/qmth/exam/reserve/controller/admin/TimePeriodExamRoomController.java

@@ -28,7 +28,7 @@ public class TimePeriodExamRoomController extends BaseController {
 
     @ApiOperation(value = "日期时段列表")
     @PostMapping(value = "/detail/list")
-    public List<TimePeriodExamSiteVo> ListDetail(@ApiParam("考场ID") @RequestParam(required = false) Long examRoomId) {
+    public List<TimePeriodExamSiteVo> ListDetail(@ApiParam("考场ID") @RequestParam(required = true) Long examRoomId) {
         if(examRoomId == null) {
             return new ArrayList<>();
         }

+ 5 - 2
src/main/java/com/qmth/exam/reserve/dao/ExamRoomDao.java

@@ -3,13 +3,16 @@ package com.qmth.exam.reserve.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qmth.boot.core.collection.PageResult;
-import com.qmth.exam.reserve.bean.examsite.ExamSiteVO;
 import com.qmth.exam.reserve.bean.room.ExamRoomReq;
 import com.qmth.exam.reserve.bean.room.ExamRoomVO;
 import com.qmth.exam.reserve.entity.ExamRoomEntity;
+import io.lettuce.core.dynamic.annotation.Param;
+
+import java.util.List;
 
 public interface ExamRoomDao extends BaseMapper<ExamRoomEntity> {
 
     IPage<ExamRoomVO> pageExamRoom(Page<ExamRoomVO> page, ExamRoomReq req);
+
+    List<ExamRoomEntity> listExamRoomByExamSiteId(@Param("examSiteId") Long examSiteId, @Param("enable") Boolean enable);
 }

+ 2 - 0
src/main/java/com/qmth/exam/reserve/service/ExamRoomService.java

@@ -23,4 +23,6 @@ public interface ExamRoomService extends IService<ExamRoomEntity> {
     List<Map<String, Object>> importExamRoom(LoginUser user, InputStream inputStream);
 
     List<ExamRoomEntity> listExamRoom(Long examSiteId);
+
+    List<ExamRoomEntity> listExamRoomByExamSiteId(Long examSiteId);
 }

+ 5 - 0
src/main/java/com/qmth/exam/reserve/service/impl/ExamRoomServiceImpl.java

@@ -202,6 +202,11 @@ public class ExamRoomServiceImpl extends ServiceImpl<ExamRoomDao, ExamRoomEntity
         return list(wrapper);
     }
 
+    @Override
+    public List<ExamRoomEntity> listExamRoomByExamSiteId(Long examSiteId) {
+        return baseMapper.listExamRoomByExamSiteId(examSiteId, Boolean.TRUE);
+    }
+
     private void saveRoom(ExamRoomEntity room) {
         ExamRoomEntity examRoom = getExamRoom(room.getExamSiteId(), room.getCode());
         if (examRoom != null) {

+ 8 - 0
src/main/resources/mapper/ExamRoomMapper.xml

@@ -34,4 +34,12 @@
         </if>
         order by r.update_time desc
     </select>
+
+    <select id="listExamRoomByExamSiteId" resultType="com.qmth.exam.reserve.entity.ExamRoomEntity">
+        select id, code, name, address, capacity
+        from t_exam_room
+        where exam_site_id = #{examSiteId}
+          and enable = #{enable}
+    </select>
+
 </mapper>