diff --git a/server/src/main/java/com/ruoyi/clazz/controller/ClazzController.java b/server/src/main/java/com/ruoyi/clazz/controller/ClazzController.java index 5f2dc61..bc16074 100644 --- a/server/src/main/java/com/ruoyi/clazz/controller/ClazzController.java +++ b/server/src/main/java/com/ruoyi/clazz/controller/ClazzController.java @@ -7,6 +7,7 @@ import com.ruoyi.clazz.domain.Clazz; import com.ruoyi.clazz.domain.req.ClazzEditReq; import com.ruoyi.clazz.domain.req.ClazzQueryReq; import com.ruoyi.clazz.domain.req.ClazzSaveReq; +import com.ruoyi.clazz.domain.res.ClazzGroupRes; import com.ruoyi.clazz.server.ClazzService; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.utils.poi.ExcelUtil; @@ -108,4 +109,15 @@ public class ClazzController extends BaseController { public Result remove(@PathVariable List ids) { return toAjax(clazzService.removeBatchByIds(ids)); } + + /** + * 根据学生id查询小组信息 + */ + @ApiOperation("根据学生id查询小组信息") + @PreAuthorize("@ss.hasPermi('clazz:clazz:query')") + @GetMapping(value = "/queryGroup/{id}") + public Result> getGroupInfo(@PathVariable("id") Long id) { + return Result.success(clazzService.getGroupInfo(id)); + } + } diff --git a/server/src/main/java/com/ruoyi/clazz/controller/ClazzGroupController.java b/server/src/main/java/com/ruoyi/clazz/controller/ClazzGroupController.java new file mode 100644 index 0000000..6b4578e --- /dev/null +++ b/server/src/main/java/com/ruoyi/clazz/controller/ClazzGroupController.java @@ -0,0 +1,28 @@ +package com.ruoyi.clazz.controller; + +import com.ruoyi.clazz.domain.res.ClazzGroupRes; +import com.ruoyi.clazz.server.ClazzGroupService; +import com.ruoyi.clazz.server.ClazzService; +import com.ruoyi.common.core.domain.Result; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +public class ClazzGroupController { + @Autowired + private ClazzGroupService clazzGroupService; + + @GetMapping("/queryGroup/{id}") + public Result> getGroupInfo(@PathVariable("id") Long id) { + + return Result.success(clazzGroupService.getGroupInfo(id)); + } +} + diff --git a/server/src/main/java/com/ruoyi/clazz/domain/res/ClazzGroupRes.java b/server/src/main/java/com/ruoyi/clazz/domain/res/ClazzGroupRes.java new file mode 100644 index 0000000..dcedd03 --- /dev/null +++ b/server/src/main/java/com/ruoyi/clazz/domain/res/ClazzGroupRes.java @@ -0,0 +1,13 @@ +package com.ruoyi.clazz.domain.res; + +import com.ruoyi.clazz.domain.Clazz; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class ClazzGroupRes extends Clazz { + private String groupName; +} diff --git a/server/src/main/java/com/ruoyi/clazz/mapper/ClazzGroupMapper.java b/server/src/main/java/com/ruoyi/clazz/mapper/ClazzGroupMapper.java new file mode 100644 index 0000000..04a79ca --- /dev/null +++ b/server/src/main/java/com/ruoyi/clazz/mapper/ClazzGroupMapper.java @@ -0,0 +1,12 @@ +package com.ruoyi.clazz.mapper; + +import com.ruoyi.clazz.domain.res.ClazzGroupRes; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface ClazzGroupMapper { + List getGroupInfo(@Param("id") Long id); +} diff --git a/server/src/main/java/com/ruoyi/clazz/mapper/ClazzMapper.java b/server/src/main/java/com/ruoyi/clazz/mapper/ClazzMapper.java index 9401878..ea13c1c 100644 --- a/server/src/main/java/com/ruoyi/clazz/mapper/ClazzMapper.java +++ b/server/src/main/java/com/ruoyi/clazz/mapper/ClazzMapper.java @@ -3,7 +3,11 @@ package com.ruoyi.clazz.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.clazz.domain.Clazz; +import com.ruoyi.clazz.domain.res.ClazzGroupRes; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 学生Mapper接口 @@ -14,4 +18,5 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface ClazzMapper extends BaseMapper { + List getGroupInfo(@Param("id") Long id); } diff --git a/server/src/main/java/com/ruoyi/clazz/server/ClazzGroupService.java b/server/src/main/java/com/ruoyi/clazz/server/ClazzGroupService.java new file mode 100644 index 0000000..c4eaf40 --- /dev/null +++ b/server/src/main/java/com/ruoyi/clazz/server/ClazzGroupService.java @@ -0,0 +1,9 @@ +package com.ruoyi.clazz.server; + +import com.ruoyi.clazz.domain.res.ClazzGroupRes; + +import java.util.List; + +public interface ClazzGroupService { + List getGroupInfo(Long id); +} diff --git a/server/src/main/java/com/ruoyi/clazz/server/ClazzService.java b/server/src/main/java/com/ruoyi/clazz/server/ClazzService.java index 0deb5ff..b5291f9 100644 --- a/server/src/main/java/com/ruoyi/clazz/server/ClazzService.java +++ b/server/src/main/java/com/ruoyi/clazz/server/ClazzService.java @@ -3,6 +3,7 @@ package com.ruoyi.clazz.server; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.clazz.domain.Clazz; +import com.ruoyi.clazz.domain.res.ClazzGroupRes; import java.util.List; @@ -21,4 +22,5 @@ public interface ClazzService extends IService { */ public List list(Clazz clazz); + List getGroupInfo(Long id); } diff --git a/server/src/main/java/com/ruoyi/clazz/server/impl/ClazzGroupServiceImpl.java b/server/src/main/java/com/ruoyi/clazz/server/impl/ClazzGroupServiceImpl.java new file mode 100644 index 0000000..4bdf13e --- /dev/null +++ b/server/src/main/java/com/ruoyi/clazz/server/impl/ClazzGroupServiceImpl.java @@ -0,0 +1,21 @@ +package com.ruoyi.clazz.server.impl; + +import com.ruoyi.clazz.domain.res.ClazzGroupRes; +import com.ruoyi.clazz.mapper.ClazzGroupMapper; +import com.ruoyi.clazz.server.ClazzGroupService; +import com.ruoyi.clazz.server.ClazzService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class ClazzGroupServiceImpl implements ClazzGroupService { + @Autowired + private ClazzGroupMapper clazzGroupMapper; + @Override + public List getGroupInfo(Long id) { + List list = clazzGroupMapper.getGroupInfo(id); + return list; + } +} diff --git a/server/src/main/java/com/ruoyi/clazz/server/impl/ClazzServiceImpl.java b/server/src/main/java/com/ruoyi/clazz/server/impl/ClazzServiceImpl.java index 086365e..5e9702b 100644 --- a/server/src/main/java/com/ruoyi/clazz/server/impl/ClazzServiceImpl.java +++ b/server/src/main/java/com/ruoyi/clazz/server/impl/ClazzServiceImpl.java @@ -4,10 +4,12 @@ import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.clazz.domain.Clazz; +import com.ruoyi.clazz.domain.res.ClazzGroupRes; import com.ruoyi.clazz.mapper.ClazzMapper; import com.ruoyi.clazz.server.ClazzService; import com.ruoyi.common.utils.ObjUtils; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -19,7 +21,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; */ @Slf4j @Service -public class ClazzServiceImpl extends ServiceImpl implements ClazzService { +public class ClazzServiceImpl extends ServiceImpl implements ClazzService { + @Autowired + private ClazzMapper clazzMapper; /** * 查询学生列表 @@ -66,4 +70,10 @@ public class ClazzServiceImpl extends ServiceImpl implements return list(queryWrapper); } + + @Override + public List getGroupInfo(Long id) { + List list =clazzMapper.getGroupInfo(id); + return list; + } } diff --git a/server/src/main/resources/mapper/clazz/ClazzGroupMapper.xml b/server/src/main/resources/mapper/clazz/ClazzGroupMapper.xml new file mode 100644 index 0000000..ee33dab --- /dev/null +++ b/server/src/main/resources/mapper/clazz/ClazzGroupMapper.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/server/src/main/resources/mapper/clazz/ClazzMapper.xml b/server/src/main/resources/mapper/clazz/ClazzMapper.xml index 7db9f7b..4bd5676 100644 --- a/server/src/main/resources/mapper/clazz/ClazzMapper.xml +++ b/server/src/main/resources/mapper/clazz/ClazzMapper.xml @@ -20,7 +20,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + + + + + + + + select id, stu_number, stu_name, stu_age, stu_gender, stu_clazz, create_time, create_by, update_time, update_by, sys_user, is_delete, remark from clazz + + + select c.stu_number, c.stu_name, c.stu_age, c.stu_gender, s.group_name from stu_group s LEFT JOIN clazz c on c.id=s.id WHERE s.id =#{id} +