diff --git a/ruoyi-dw/src/main/java/com/ruoyi/dw/controller/CjStudentController.java b/ruoyi-dw/src/main/java/com/ruoyi/dw/controller/CjStudentController.java index 2b0e73f..522a57d 100644 --- a/ruoyi-dw/src/main/java/com/ruoyi/dw/controller/CjStudentController.java +++ b/ruoyi-dw/src/main/java/com/ruoyi/dw/controller/CjStudentController.java @@ -65,6 +65,15 @@ public class CjStudentController extends BaseController return getDataTable(list); } + /** + * 获取学院下拉框数据 + * @return + */ + @GetMapping("/xy") + public AjaxResult xySelect(){ + return AjaxResult.success(cjStudentService.selectXyList()); + } + /** * 导出采集学生信息列表 */ diff --git a/ruoyi-dw/src/main/java/com/ruoyi/dw/domain/vo/XyVo.java b/ruoyi-dw/src/main/java/com/ruoyi/dw/domain/vo/XyVo.java new file mode 100644 index 0000000..ad80df2 --- /dev/null +++ b/ruoyi-dw/src/main/java/com/ruoyi/dw/domain/vo/XyVo.java @@ -0,0 +1,14 @@ +package com.ruoyi.dw.domain.vo; + +public class XyVo { + + private String xy; + + public String getXy() { + return xy; + } + + public void setXy(String xy) { + this.xy = xy; + } +} diff --git a/ruoyi-dw/src/main/java/com/ruoyi/dw/mapper/CjStudentMapper.java b/ruoyi-dw/src/main/java/com/ruoyi/dw/mapper/CjStudentMapper.java index 7f6f41e..4e3c849 100644 --- a/ruoyi-dw/src/main/java/com/ruoyi/dw/mapper/CjStudentMapper.java +++ b/ruoyi-dw/src/main/java/com/ruoyi/dw/mapper/CjStudentMapper.java @@ -3,6 +3,7 @@ package com.ruoyi.dw.mapper; import java.util.List; import com.ruoyi.dw.domain.CjStudent; import com.ruoyi.dw.domain.vo.StudentExportVo; +import com.ruoyi.dw.domain.vo.XyVo; import org.apache.ibatis.annotations.Param; /** @@ -21,6 +22,8 @@ public interface CjStudentMapper */ public CjStudent selectCjStudentById(Long id); + public List selectXy(); + /** * 查询采集学生信息列表 * diff --git a/ruoyi-dw/src/main/java/com/ruoyi/dw/service/ICjStudentService.java b/ruoyi-dw/src/main/java/com/ruoyi/dw/service/ICjStudentService.java index 4dbc0d4..a538197 100644 --- a/ruoyi-dw/src/main/java/com/ruoyi/dw/service/ICjStudentService.java +++ b/ruoyi-dw/src/main/java/com/ruoyi/dw/service/ICjStudentService.java @@ -3,6 +3,7 @@ package com.ruoyi.dw.service; import java.util.List; import com.ruoyi.dw.domain.CjStudent; import com.ruoyi.dw.domain.vo.StudentExportVo; +import com.ruoyi.dw.domain.vo.XyVo; import org.springframework.web.multipart.MultipartFile; /** @@ -89,4 +90,6 @@ public interface ICjStudentService public int importData(MultipartFile file); public int importCjStudent(MultipartFile file); + + public List selectXyList(); } diff --git a/ruoyi-dw/src/main/java/com/ruoyi/dw/service/impl/CjStudentServiceImpl.java b/ruoyi-dw/src/main/java/com/ruoyi/dw/service/impl/CjStudentServiceImpl.java index b816fe9..9171ca3 100644 --- a/ruoyi-dw/src/main/java/com/ruoyi/dw/service/impl/CjStudentServiceImpl.java +++ b/ruoyi-dw/src/main/java/com/ruoyi/dw/service/impl/CjStudentServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.dw.domain.CjStudent; import com.ruoyi.dw.domain.vo.StudentExportVo; +import com.ruoyi.dw.domain.vo.XyVo; import com.ruoyi.dw.mapper.CjStudentMapper; import com.ruoyi.dw.service.ICjStudentService; import org.apache.poi.ss.usermodel.*; @@ -472,4 +473,9 @@ public class CjStudentServiceImpl implements ICjStudentService return 0; } + @Override + public List selectXyList() { + return cjStudentMapper.selectXy(); + } + } diff --git a/ruoyi-dw/src/main/resources/mapper/dw/CjStudentMapper.xml b/ruoyi-dw/src/main/resources/mapper/dw/CjStudentMapper.xml index 912277e..9037e72 100644 --- a/ruoyi-dw/src/main/resources/mapper/dw/CjStudentMapper.xml +++ b/ruoyi-dw/src/main/resources/mapper/dw/CjStudentMapper.xml @@ -33,6 +33,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, xm,xh,bj, xb, zy,xy,sydsh, sydshi, bynf, zgyl, gzdw, dwxz, dwdz, zwjb, shjz, dbry, rysfzs,sj, yx, qt, sfqr,update_time from cj_student + +