小么熊🐻 2 лет назад
Родитель
Сommit
ba0d132d36

+ 4 - 2
nbjk-admin/src/main/java/com/miaxis/app/controller/exam/ExamInfoController.java

@@ -12,9 +12,11 @@ import com.miaxis.common.utils.ip.IpUtils;
 import com.miaxis.dict.domain.DictCity;
 import com.miaxis.dict.service.IDictCityService;
 import com.miaxis.exam.domain.ExamInfo;
+import com.miaxis.exam.dto.ExamInfoDto;
 import com.miaxis.exam.service.IExamInfoService;
 import com.miaxis.exam.vo.ExamInfoCityVo;
 import com.miaxis.exam.vo.ExamInfoProviceVo;
+import com.miaxis.exam.vo.ExamInfoVipVo;
 import io.swagger.annotations.*;
 import oracle.jdbc.driver.DatabaseError;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,9 +60,9 @@ public class ExamInfoController extends BaseController {
             @ApiImplicitParam(name = "pageNum", value = "当前页码", dataType = "int", paramType = "query", required = false),
             @ApiImplicitParam(name = "pageSize", value = "每页数据量", dataType = "int", paramType = "query", required = false),
     })
-    public ResponsePageInfo<ExamInfo> list(@ModelAttribute ExamInfo examInfo) {
+    public ResponsePageInfo<ExamInfoVipVo> list(@ModelAttribute ExamInfoDto examInfoDto) {
         startPage();
-        List<ExamInfo> list = examInfoService.selectExamInfoList(examInfo);
+        List<ExamInfoVipVo> list = examInfoService.selectExamInfoList(examInfoDto);
         return toResponsePageInfo(list);
     }
 

+ 4 - 2
nbjk-service/src/main/java/com/miaxis/exam/mapper/ExamInfoMapper.java

@@ -3,8 +3,10 @@ package com.miaxis.exam.mapper;
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.miaxis.exam.domain.ExamInfo;
+import com.miaxis.exam.dto.ExamInfoDto;
 import com.miaxis.exam.vo.ExamInfoCityVo;
 import com.miaxis.exam.vo.ExamInfoProviceVo;
+import com.miaxis.exam.vo.ExamInfoVipVo;
 
 /**
  * 考场信息Mapper接口
@@ -16,10 +18,10 @@ public interface ExamInfoMapper extends BaseMapper<ExamInfo> {
     /**
      * 查询考场信息列表
      *
-     * @param examInfo 考场信息
+     * @param examInfoDto 考场信息
      * @return 考场信息集合
      */
-    public List<ExamInfo> selectExamInfoList(ExamInfo examInfo);
+    public List<ExamInfoVipVo> selectExamInfoList(ExamInfoDto examInfoDto);
 
     /**
      * 获取考场存在的所有省份

+ 3 - 1
nbjk-service/src/main/java/com/miaxis/exam/service/IExamInfoService.java

@@ -3,8 +3,10 @@ package com.miaxis.exam.service;
 import java.util.List;
 import com.miaxis.exam.domain.ExamInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.miaxis.exam.dto.ExamInfoDto;
 import com.miaxis.exam.vo.ExamInfoCityVo;
 import com.miaxis.exam.vo.ExamInfoProviceVo;
+import com.miaxis.exam.vo.ExamInfoVipVo;
 
 /**
  * 考场信息Service接口
@@ -19,7 +21,7 @@ public interface IExamInfoService extends IService<ExamInfo>{
      * @param examInfo 考场信息
      * @return 考场信息集合
      */
-    List<ExamInfo> selectExamInfoList(ExamInfo examInfo);
+    List<ExamInfoVipVo> selectExamInfoList(ExamInfoDto examInfo);
 
     List<ExamInfoProviceVo> getProvice();
 

+ 5 - 3
nbjk-service/src/main/java/com/miaxis/exam/service/impl/ExamInfoServiceImpl.java

@@ -2,8 +2,10 @@ package com.miaxis.exam.service.impl;
 
 import java.util.List;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.miaxis.exam.dto.ExamInfoDto;
 import com.miaxis.exam.vo.ExamInfoCityVo;
 import com.miaxis.exam.vo.ExamInfoProviceVo;
+import com.miaxis.exam.vo.ExamInfoVipVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.miaxis.exam.mapper.ExamInfoMapper;
@@ -24,12 +26,12 @@ public class ExamInfoServiceImpl extends ServiceImpl<ExamInfoMapper, ExamInfo> i
     /**
      * 查询考场信息列表
      *
-     * @param examInfo 考场信息
+     * @param examInfoDto 考场信息
      * @return 考场信息
      */
     @Override
-    public List<ExamInfo> selectExamInfoList(ExamInfo examInfo){
-        return examInfoMapper.selectExamInfoList(examInfo);
+    public List<ExamInfoVipVo> selectExamInfoList(ExamInfoDto examInfoDto){
+        return examInfoMapper.selectExamInfoList(examInfoDto);
     }
 
     @Override