diff --git a/ruoyi-application/src/main/java/com/ruoyi/web/controller/classe/ClasseController.java b/ruoyi-application/src/main/java/com/ruoyi/web/controller/classe/ClasseController.java index 8986f21..3b23c90 100644 --- a/ruoyi-application/src/main/java/com/ruoyi/web/controller/classe/ClasseController.java +++ b/ruoyi-application/src/main/java/com/ruoyi/web/controller/classe/ClasseController.java @@ -3,9 +3,6 @@ package com.ruoyi.web.controller.classe; import java.util.List; import javax.servlet.http.HttpServletResponse; -import com.ruoyi.system.domain.Groupe; -import com.ruoyi.system.domain.req.GroupeQueryReq; -import com.ruoyi.system.service.GroupeService; import io.swagger.annotations.*; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; @@ -42,7 +39,6 @@ public class ClasseController extends BaseController { @Autowired private ClasseService classeService; - /** * 查询班级信息列表 */ @@ -112,13 +108,4 @@ public class ClasseController extends BaseController { public Result remove(@PathVariable List classeIds) { return toAjax(classeService.removeBatchByIds(classeIds)); } - - - @ApiOperation("获取小组信息列表") - @PreAuthorize("@ss.hasPermi('system:groupe:list')") - @GetMapping("/selectGroupe") - public Result> list() { - List list=classeService.selectGroupe(); - return Result.success(list); - } } diff --git a/ruoyi-application/src/main/java/com/ruoyi/web/controller/groupe/GroupeController.java b/ruoyi-application/src/main/java/com/ruoyi/web/controller/groupe/GroupeController.java index 8b06386..73cd149 100644 --- a/ruoyi-application/src/main/java/com/ruoyi/web/controller/groupe/GroupeController.java +++ b/ruoyi-application/src/main/java/com/ruoyi/web/controller/groupe/GroupeController.java @@ -25,6 +25,7 @@ import com.ruoyi.system.domain.req.GroupeEditReq; import com.ruoyi.system.service.GroupeService; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.system.domain.Classe; /** * 小组信息Controller @@ -75,6 +76,16 @@ public class GroupeController extends BaseController { return Result.success(groupeService.getById(groupId)); } + /** + * 获取小组详细信息展示 + */ + @ApiOperation("获取小组详细信息") + @PreAuthorize("@ss.hasPermi('system:groupe:query')") + @GetMapping(value = "/findGroupByClassId/{classeId}") + @ApiImplicitParam(name = "classeId", value = "classeId", required = true, dataType = "Long", paramType = "path", dataTypeClass = Long.class) + public Result> findGroupByClassId(@PathVariable("classeId") Long classeId) { + return Result.success(groupeService.findGroupByClassId(classeId)); + } /** * 新增小组信息 */ diff --git a/ruoyi-basic/ruoyi-classe/src/main/java/com/ruoyi/system/domain/Classe.java b/ruoyi-basic/ruoyi-classe/src/main/java/com/ruoyi/system/domain/Classe.java index d2bb512..927dd24 100644 --- a/ruoyi-basic/ruoyi-classe/src/main/java/com/ruoyi/system/domain/Classe.java +++ b/ruoyi-basic/ruoyi-classe/src/main/java/com/ruoyi/system/domain/Classe.java @@ -42,18 +42,12 @@ public class Classe extends BaseEntity { @ApiModelProperty(name = "班级名称", value = "班级名称") private String classeName; - /** 小组id */ - @Excel(name = "小组id") - @ApiModelProperty(name = "小组id", value = "小组id") - private String groups; - /** * 查询构造器 */ public static Classe queryBuild( ClasseQueryReq classeQueryReq){ return Classe.builder() .classeName(classeQueryReq.getClasseName()) - .groups(classeQueryReq.getGroups()) .build(); } @@ -63,7 +57,6 @@ public class Classe extends BaseEntity { public static Classe saveBuild(ClasseSaveReq classeSaveReq){ return Classe.builder() .classeName(classeSaveReq.getClasseName()) - .groups(classeSaveReq.getGroups()) .build(); } @@ -74,7 +67,6 @@ public class Classe extends BaseEntity { return Classe.builder() .classeId(classeId) .classeName(classeEditReq.getClasseName()) - .groups(classeEditReq.getGroups()) .build(); } diff --git a/ruoyi-basic/ruoyi-classe/src/main/java/com/ruoyi/system/domain/req/ClasseEditReq.java b/ruoyi-basic/ruoyi-classe/src/main/java/com/ruoyi/system/domain/req/ClasseEditReq.java index 3925242..186ad84 100644 --- a/ruoyi-basic/ruoyi-classe/src/main/java/com/ruoyi/system/domain/req/ClasseEditReq.java +++ b/ruoyi-basic/ruoyi-classe/src/main/java/com/ruoyi/system/domain/req/ClasseEditReq.java @@ -30,8 +30,4 @@ public class ClasseEditReq extends BaseEntity { @ApiModelProperty(name = "班级名称", value = "班级名称") private String classeName; - /** 小组id */ - @ApiModelProperty(name = "小组id", value = "小组id") - private String groups; - } diff --git a/ruoyi-basic/ruoyi-classe/src/main/java/com/ruoyi/system/domain/req/ClasseQueryReq.java b/ruoyi-basic/ruoyi-classe/src/main/java/com/ruoyi/system/domain/req/ClasseQueryReq.java index 07acda0..e236609 100644 --- a/ruoyi-basic/ruoyi-classe/src/main/java/com/ruoyi/system/domain/req/ClasseQueryReq.java +++ b/ruoyi-basic/ruoyi-classe/src/main/java/com/ruoyi/system/domain/req/ClasseQueryReq.java @@ -30,8 +30,4 @@ public class ClasseQueryReq extends BaseEntity { @ApiModelProperty(name = "班级名称", value = "班级名称") private String classeName; - /** 小组id */ - @ApiModelProperty(name = "小组id", value = "小组id") - private String groups; - } diff --git a/ruoyi-basic/ruoyi-classe/src/main/java/com/ruoyi/system/domain/req/ClasseSaveReq.java b/ruoyi-basic/ruoyi-classe/src/main/java/com/ruoyi/system/domain/req/ClasseSaveReq.java index ab314d6..08d7406 100644 --- a/ruoyi-basic/ruoyi-classe/src/main/java/com/ruoyi/system/domain/req/ClasseSaveReq.java +++ b/ruoyi-basic/ruoyi-classe/src/main/java/com/ruoyi/system/domain/req/ClasseSaveReq.java @@ -36,9 +36,4 @@ public class ClasseSaveReq extends BaseEntity { @ApiModelProperty(name = "班级名称", value = "班级名称") private String classeName; - /** 小组id */ - - @ApiModelProperty(name = "小组id", value = "小组id") - private String groups; - } diff --git a/ruoyi-basic/ruoyi-classe/src/main/java/com/ruoyi/system/mapper/ClasseMapper.java b/ruoyi-basic/ruoyi-classe/src/main/java/com/ruoyi/system/mapper/ClasseMapper.java index e273bad..1e514e2 100644 --- a/ruoyi-basic/ruoyi-classe/src/main/java/com/ruoyi/system/mapper/ClasseMapper.java +++ b/ruoyi-basic/ruoyi-classe/src/main/java/com/ruoyi/system/mapper/ClasseMapper.java @@ -3,7 +3,6 @@ package com.ruoyi.system.mapper; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.system.domain.Classe; -import com.ruoyi.system.domain.Groupe; /** * 班级信息Mapper接口 @@ -13,6 +12,4 @@ import com.ruoyi.system.domain.Groupe; */ public interface ClasseMapper extends BaseMapper { - List selectGroupe(); - } diff --git a/ruoyi-basic/ruoyi-classe/src/main/java/com/ruoyi/system/service/ClasseService.java b/ruoyi-basic/ruoyi-classe/src/main/java/com/ruoyi/system/service/ClasseService.java index 663fb7b..0bb82c8 100644 --- a/ruoyi-basic/ruoyi-classe/src/main/java/com/ruoyi/system/service/ClasseService.java +++ b/ruoyi-basic/ruoyi-classe/src/main/java/com/ruoyi/system/service/ClasseService.java @@ -3,7 +3,6 @@ package com.ruoyi.system.service; import java.util.List; import com.ruoyi.system.domain.Classe; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.system.domain.Groupe; /** * 班级信息Service接口 @@ -20,7 +19,4 @@ public interface ClasseService extends IService { */ public List list(Classe classe); - List selectGroupe(); - - } diff --git a/ruoyi-basic/ruoyi-classe/src/main/java/com/ruoyi/system/service/impl/ClasseServiceImpl.java b/ruoyi-basic/ruoyi-classe/src/main/java/com/ruoyi/system/service/impl/ClasseServiceImpl.java index 0c8aea9..53b6cb0 100644 --- a/ruoyi-basic/ruoyi-classe/src/main/java/com/ruoyi/system/service/impl/ClasseServiceImpl.java +++ b/ruoyi-basic/ruoyi-classe/src/main/java/com/ruoyi/system/service/impl/ClasseServiceImpl.java @@ -4,9 +4,7 @@ import java.util.List; import com.ruoyi.common.utils.ObjUtils; import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.domain.Groupe; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.system.mapper.ClasseMapper; import com.ruoyi.system.domain.Classe; @@ -24,8 +22,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @Service public class ClasseServiceImpl extends ServiceImpl implements ClasseService { - @Autowired - ClasseMapper classeMapper; /** * 查询班级信息列表 * @@ -41,18 +37,9 @@ public class ClasseServiceImpl extends ServiceImpl implem queryWrapper.like(Classe::getClasseName, classe.getClasseName()); } - if (ObjUtils.notNull(classe.getGroups())){ - queryWrapper.eq(Classe::getGroups, classe.getGroups()); - } - return list(queryWrapper); } - - @Override - public List selectGroupe() { - return classeMapper.selectGroupe(); - } } diff --git a/ruoyi-basic/ruoyi-classe/src/main/resources/mapper/system/ClasseMapper.xml b/ruoyi-basic/ruoyi-classe/src/main/resources/mapper/system/ClasseMapper.xml index 1e085c9..deb8df2 100644 --- a/ruoyi-basic/ruoyi-classe/src/main/resources/mapper/system/ClasseMapper.xml +++ b/ruoyi-basic/ruoyi-classe/src/main/resources/mapper/system/ClasseMapper.xml @@ -7,7 +7,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - @@ -15,9 +14,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select classe_id, classe_name, groups, create_by, create_time, update_by, update_time from classe + select classe_id, classe_name, create_by, create_time, update_by, update_time from classe - diff --git a/ruoyi-basic/ruoyi-groupe/src/main/java/com/ruoyi/system/domain/Groupe.java b/ruoyi-basic/ruoyi-groupe/src/main/java/com/ruoyi/system/domain/Groupe.java index 9d2b946..1168034 100644 --- a/ruoyi-basic/ruoyi-groupe/src/main/java/com/ruoyi/system/domain/Groupe.java +++ b/ruoyi-basic/ruoyi-groupe/src/main/java/com/ruoyi/system/domain/Groupe.java @@ -42,12 +42,18 @@ public class Groupe extends BaseEntity { @ApiModelProperty(name = "小组名称", value = "小组名称") private String groupName; + /** 班级id */ + @Excel(name = "班级id") + @ApiModelProperty(name = "班级id", value = "班级id") + private Long classes; + /** * 查询构造器 */ public static Groupe queryBuild( GroupeQueryReq groupeQueryReq){ return Groupe.builder() .groupName(groupeQueryReq.getGroupName()) + .classes(groupeQueryReq.getClasses()) .build(); } @@ -57,6 +63,7 @@ public class Groupe extends BaseEntity { public static Groupe saveBuild(GroupeSaveReq groupeSaveReq){ return Groupe.builder() .groupName(groupeSaveReq.getGroupName()) + .classes(groupeSaveReq.getClasses()) .build(); } @@ -67,6 +74,7 @@ public class Groupe extends BaseEntity { return Groupe.builder() .groupId(groupId) .groupName(groupeEditReq.getGroupName()) + .classes(groupeEditReq.getClasses()) .build(); } diff --git a/ruoyi-basic/ruoyi-groupe/src/main/java/com/ruoyi/system/domain/req/GroupeEditReq.java b/ruoyi-basic/ruoyi-groupe/src/main/java/com/ruoyi/system/domain/req/GroupeEditReq.java index 6c14c32..5b6620a 100644 --- a/ruoyi-basic/ruoyi-groupe/src/main/java/com/ruoyi/system/domain/req/GroupeEditReq.java +++ b/ruoyi-basic/ruoyi-groupe/src/main/java/com/ruoyi/system/domain/req/GroupeEditReq.java @@ -30,4 +30,8 @@ public class GroupeEditReq extends BaseEntity { @ApiModelProperty(name = "小组名称", value = "小组名称") private String groupName; + /** 班级id */ + @ApiModelProperty(name = "班级id", value = "班级id") + private Long classes; + } diff --git a/ruoyi-basic/ruoyi-groupe/src/main/java/com/ruoyi/system/domain/req/GroupeQueryReq.java b/ruoyi-basic/ruoyi-groupe/src/main/java/com/ruoyi/system/domain/req/GroupeQueryReq.java index 7971a01..c009cb2 100644 --- a/ruoyi-basic/ruoyi-groupe/src/main/java/com/ruoyi/system/domain/req/GroupeQueryReq.java +++ b/ruoyi-basic/ruoyi-groupe/src/main/java/com/ruoyi/system/domain/req/GroupeQueryReq.java @@ -30,4 +30,8 @@ public class GroupeQueryReq extends BaseEntity { @ApiModelProperty(name = "小组名称", value = "小组名称") private String groupName; + /** 班级id */ + @ApiModelProperty(name = "班级id", value = "班级id") + private Long classes; + } diff --git a/ruoyi-basic/ruoyi-groupe/src/main/java/com/ruoyi/system/domain/req/GroupeSaveReq.java b/ruoyi-basic/ruoyi-groupe/src/main/java/com/ruoyi/system/domain/req/GroupeSaveReq.java index 02a0df8..982c72a 100644 --- a/ruoyi-basic/ruoyi-groupe/src/main/java/com/ruoyi/system/domain/req/GroupeSaveReq.java +++ b/ruoyi-basic/ruoyi-groupe/src/main/java/com/ruoyi/system/domain/req/GroupeSaveReq.java @@ -36,4 +36,9 @@ public class GroupeSaveReq extends BaseEntity { @ApiModelProperty(name = "小组名称", value = "小组名称") private String groupName; + /** 班级id */ + + @ApiModelProperty(name = "班级id", value = "班级id") + private Long classes; + } diff --git a/ruoyi-basic/ruoyi-groupe/src/main/java/com/ruoyi/system/service/GroupeService.java b/ruoyi-basic/ruoyi-groupe/src/main/java/com/ruoyi/system/service/GroupeService.java index 790aa43..a526107 100644 --- a/ruoyi-basic/ruoyi-groupe/src/main/java/com/ruoyi/system/service/GroupeService.java +++ b/ruoyi-basic/ruoyi-groupe/src/main/java/com/ruoyi/system/service/GroupeService.java @@ -19,4 +19,5 @@ public interface GroupeService extends IService { */ public List list(Groupe groupe); + List findGroupByClassId(Long classeId); } diff --git a/ruoyi-basic/ruoyi-groupe/src/main/java/com/ruoyi/system/service/impl/GroupeServiceImpl.java b/ruoyi-basic/ruoyi-groupe/src/main/java/com/ruoyi/system/service/impl/GroupeServiceImpl.java index 5c1b8ff..6535dae 100644 --- a/ruoyi-basic/ruoyi-groupe/src/main/java/com/ruoyi/system/service/impl/GroupeServiceImpl.java +++ b/ruoyi-basic/ruoyi-groupe/src/main/java/com/ruoyi/system/service/impl/GroupeServiceImpl.java @@ -5,6 +5,7 @@ import java.util.List; import com.ruoyi.common.utils.ObjUtils; import com.ruoyi.common.utils.StringUtils; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.system.mapper.GroupeMapper; import com.ruoyi.system.domain.Groupe; @@ -22,6 +23,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @Service public class GroupeServiceImpl extends ServiceImpl implements GroupeService { + @Autowired + private GroupeMapper groupeMapper; /** * 查询小组信息列表 * @@ -37,9 +40,22 @@ public class GroupeServiceImpl extends ServiceImpl implem queryWrapper.like(Groupe::getGroupName, groupe.getGroupName()); } + if (ObjUtils.notNull(groupe.getClasses())){ + queryWrapper.eq(Groupe::getClasses, groupe.getClasses()); + } + return list(queryWrapper); } + + @Override + public List findGroupByClassId(Long classeId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + + queryWrapper.eq(StringUtils.isNotNull(classeId),Groupe::getClasses,classeId); + + return groupeMapper.selectList(queryWrapper); + } } diff --git a/ruoyi-basic/ruoyi-groupe/src/main/resources/mapper/system/GroupeMapper.xml b/ruoyi-basic/ruoyi-groupe/src/main/resources/mapper/system/GroupeMapper.xml index 2f0dde0..3777c04 100644 --- a/ruoyi-basic/ruoyi-groupe/src/main/resources/mapper/system/GroupeMapper.xml +++ b/ruoyi-basic/ruoyi-groupe/src/main/resources/mapper/system/GroupeMapper.xml @@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -14,6 +15,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select group_id, group_name, create_by, create_time, update_by, update_time from groupe + select group_id, group_name, classes, create_by, create_time, update_by, update_time from groupe