diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/DesExtractController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/DesExtractController.java index e1e21564..490491c3 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/DesExtractController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/DesExtractController.java @@ -2,10 +2,13 @@ package org.dromara.design.controller; import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; +import org.apache.poi.ss.formula.functions.T; +import org.dromara.design.domain.DesUser; import org.dromara.design.domain.bo.DesCollectFileBo; import org.dromara.design.domain.bo.DesUserBo; import org.dromara.design.domain.dto.desCollect.DesCollectBatchDto; @@ -150,4 +153,13 @@ public class DesExtractController extends BaseController { return R.ok(desExtractService.fileList(id)); } + /*** + * 查询提资人对应专业 + */ + @GetMapping("/getProfession/{id}") + public R> getProfession(@PathVariable Long id){ + List majors = deUserService.selectUserMajors(id); + return R.ok( majors); + } + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/mapper/DesUserMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/mapper/DesUserMapper.java index 3439832f..03bbbf01 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/mapper/DesUserMapper.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/mapper/DesUserMapper.java @@ -1,9 +1,12 @@ package org.dromara.design.mapper; +import org.apache.ibatis.annotations.Select; import org.dromara.design.domain.DesUser; import org.dromara.design.domain.vo.DesUserVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import java.util.List; + /** * 设计人员Mapper接口 * @@ -12,4 +15,9 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; */ public interface DesUserMapper extends BaseMapperPlus { + + // 查询用户专业 + @Select("select user_major from des_user where user_id = ${userId}") + List selectUserMajors(Long userId); + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/IDesUserService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/IDesUserService.java index 3c7307a6..f478c32a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/IDesUserService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/IDesUserService.java @@ -78,4 +78,10 @@ public interface IDesUserService extends IService{ * @return */ Boolean batchAddOrUpdate( DesUserBatchDto dto); + + + /*** + * 查询用户对应专业 + */ + List selectUserMajors(Long userId); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesUserServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesUserServiceImpl.java index af457319..83b1ce3c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesUserServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesUserServiceImpl.java @@ -141,4 +141,9 @@ public class DesUserServiceImpl extends ServiceImpl impl //todo:发消息 return baseMapper.insertBatch(desUsers); } + + @Override + public List selectUserMajors(Long userId){ + return baseMapper.selectUserMajors(userId); + } }