diff --git a/ruoyi-application/src/main/java/com/ruoyi/web/controller/school/SysClassController.java b/ruoyi-application/src/main/java/com/ruoyi/web/controller/school/SysClassController.java index 9692765..f18b2b4 100644 --- a/ruoyi-application/src/main/java/com/ruoyi/web/controller/school/SysClassController.java +++ b/ruoyi-application/src/main/java/com/ruoyi/web/controller/school/SysClassController.java @@ -1,31 +1,36 @@ package com.ruoyi.web.controller.school; +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import io.swagger.annotations.*; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.Result; -import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.school.domain.SysClass; -import com.ruoyi.school.domain.req.SysClassEditReq; import com.ruoyi.school.domain.req.SysClassQueryReq; import com.ruoyi.school.domain.req.SysClassSaveReq; +import com.ruoyi.school.domain.req.SysClassEditReq; import com.ruoyi.school.service.SysClassService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -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.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; /** * 班级管理Controller * * @author ruoyi - * @date 2024-04-22 + * @date 2024-04-23 */ @Api(tags = "班级管理") @RestController @@ -46,6 +51,14 @@ public class SysClassController extends BaseController { return getDataTable(list); } + /** + * 无条件差查询班级管理 + */ + @GetMapping("/findUnconditional") + public Result findUnconditional(){ + return getDataTable(sysClassService.list()); + } + /** * 导出班级管理列表 */ diff --git a/ruoyi-application/src/main/java/com/ruoyi/web/controller/school/SysGroupController.java b/ruoyi-application/src/main/java/com/ruoyi/web/controller/school/SysGroupController.java new file mode 100644 index 0000000..935a112 --- /dev/null +++ b/ruoyi-application/src/main/java/com/ruoyi/web/controller/school/SysGroupController.java @@ -0,0 +1,83 @@ +package com.ruoyi.web.controller.school; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import io.swagger.annotations.*; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.Result; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.school.domain.SysGroup; +import com.ruoyi.school.domain.req.SysGroupQueryReq; +import com.ruoyi.school.domain.req.SysGroupSaveReq; +import com.ruoyi.school.domain.req.SysGroupEditReq; +import com.ruoyi.school.service.SysGroupService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 小组管理Controller + * + * @author ruoyi + * @date 2024-04-23 + */ +@Api(tags = "小组管理") +@RestController +@RequestMapping("/group/group") +public class SysGroupController extends BaseController { + + @Autowired + private SysGroupService sysGroupService; + + /** + * 查询小组管理列表 + */ + @ApiOperation("获取小组管理列表") + @GetMapping("/list") + public Result> list(SysGroupQueryReq sysGroupQueryReq) { + startPage(); + List list = sysGroupService.list(sysGroupQueryReq); + return getDataTable(list); + } + + /** + * 新增小组 + */ + @PostMapping("/saveGroup") + public Result add(@RequestBody SysGroupSaveReq sysGroupSaveReq) { + return toAjax(sysGroupService.save(SysGroup.saveBuild(sysGroupSaveReq))); + } + + /** + * 删除小组管理 + */ + @Log(title = "小组管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{groupIds}") + @ApiOperation("删除小组管理") + public Result remove(@PathVariable List groupIds) { + return toAjax(sysGroupService.removeBatchByIds(groupIds)); + } + + + + /** + * 修改小组管理 + */ + @Log(title = "小组管理", businessType = BusinessType.UPDATE) + @PutMapping("/{groupId}") + @ApiOperation("修改小组管理") + public Result edit(@PathVariable Long groupId, @RequestBody SysGroupEditReq sysGroupEditReq) { + return toAjax(sysGroupService.updateById(SysGroup.editBuild(groupId,sysGroupEditReq))); + } +} diff --git a/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/domain/SysClass.java b/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/domain/SysClass.java index 675c49b..157c93e 100644 --- a/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/domain/SysClass.java +++ b/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/domain/SysClass.java @@ -3,24 +3,23 @@ package com.ruoyi.school.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.school.domain.req.SysClassEditReq; -import com.ruoyi.school.domain.req.SysClassQueryReq; -import com.ruoyi.school.domain.req.SysClassSaveReq; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import lombok.AllArgsConstructor; import lombok.experimental.SuperBuilder; +import io.swagger.annotations.*; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.school.domain.req.SysClassQueryReq; +import com.ruoyi.school.domain.req.SysClassSaveReq; +import com.ruoyi.school.domain.req.SysClassEditReq; +import com.ruoyi.common.core.domain.BaseEntity; /** * 班级管理对象 sys_class * * @author ruoyi - * @date 2024-04-22 + * @date 2024-04-23 */ @Data @SuperBuilder diff --git a/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/domain/SysGroup.java b/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/domain/SysGroup.java new file mode 100644 index 0000000..e355941 --- /dev/null +++ b/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/domain/SysGroup.java @@ -0,0 +1,96 @@ +package com.ruoyi.school.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.AllArgsConstructor; +import lombok.experimental.SuperBuilder; +import io.swagger.annotations.*; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.school.domain.req.SysGroupQueryReq; +import com.ruoyi.school.domain.req.SysGroupSaveReq; +import com.ruoyi.school.domain.req.SysGroupEditReq; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 小组管理对象 sys_group + * + * @author ruoyi + * @date 2024-04-23 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@TableName("sys_group") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "SysGroup", description = "小组管理") +public class SysGroup extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 小组ID */ + @TableId(value = "group_id",type = IdType.AUTO) + @ApiModelProperty(name = "小组ID", value = "小组ID") + private Long groupId; + + /** 小组名称 */ + @Excel(name = "小组名称") + @ApiModelProperty(name = "小组名称", value = "小组名称") + private String groupName; + + /** 小组人数 */ + @Excel(name = "小组人数") + @ApiModelProperty(name = "小组人数", value = "小组人数") + private Long groupPeople; + + /** 小组人员 */ + @Excel(name = "小组人员") + @ApiModelProperty(name = "小组人员", value = "小组人员") + private String groupPersonnel; + + /** 班级ID */ + @Excel(name = "班级ID") + @ApiModelProperty(name = "班级ID", value = "班级ID") + private Long classId; + + /** + * 查询构造器 + */ + public static SysGroup queryBuild( SysGroupQueryReq sysGroupQueryReq){ + return SysGroup.builder() + .groupName(sysGroupQueryReq.getGroupName()) + .groupPeople(sysGroupQueryReq.getGroupPeople()) + .classId(sysGroupQueryReq.getClassId()) + .build(); + } + + /** + * 添加构造器 + */ + public static SysGroup saveBuild(SysGroupSaveReq sysGroupSaveReq){ + return SysGroup.builder() + .groupName(sysGroupSaveReq.getGroupName()) + .groupPeople(sysGroupSaveReq.getGroupPeople()) + .groupPersonnel(sysGroupSaveReq.getGroupPersonnel()) + .classId(sysGroupSaveReq.getClassId()) + .build(); + } + + /** + * 修改构造器 + */ + public static SysGroup editBuild(Long groupId, SysGroupEditReq sysGroupEditReq){ + return SysGroup.builder() + .groupId(groupId) + .groupName(sysGroupEditReq.getGroupName()) + .groupPeople(sysGroupEditReq.getGroupPeople()) + .groupPersonnel(sysGroupEditReq.getGroupPersonnel()) + .classId(sysGroupEditReq.getClassId()) + .build(); + } + +} diff --git a/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/domain/req/SysClassEditReq.java b/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/domain/req/SysClassEditReq.java index 5b4619e..a7830f8 100644 --- a/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/domain/req/SysClassEditReq.java +++ b/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/domain/req/SysClassEditReq.java @@ -1,18 +1,21 @@ package com.ruoyi.school.domain.req; -import com.ruoyi.common.core.domain.BaseEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import lombok.AllArgsConstructor; import lombok.experimental.SuperBuilder; +import io.swagger.annotations.*; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; /** * 班级管理对象 sys_class * * @author ruoyi - * @date 2024-04-22 + * @date 2024-04-23 */ @Data @SuperBuilder diff --git a/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/domain/req/SysClassQueryReq.java b/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/domain/req/SysClassQueryReq.java index c11ff8c..5637be8 100644 --- a/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/domain/req/SysClassQueryReq.java +++ b/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/domain/req/SysClassQueryReq.java @@ -1,18 +1,21 @@ package com.ruoyi.school.domain.req; -import com.ruoyi.common.core.domain.BaseEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import lombok.AllArgsConstructor; import lombok.experimental.SuperBuilder; +import io.swagger.annotations.*; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; /** * 班级管理对象 sys_class * * @author ruoyi - * @date 2024-04-22 + * @date 2024-04-23 */ @Data @SuperBuilder diff --git a/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/domain/req/SysClassSaveReq.java b/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/domain/req/SysClassSaveReq.java index 78da0ae..45f84dd 100644 --- a/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/domain/req/SysClassSaveReq.java +++ b/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/domain/req/SysClassSaveReq.java @@ -1,18 +1,21 @@ package com.ruoyi.school.domain.req; -import com.ruoyi.common.core.domain.BaseEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import lombok.AllArgsConstructor; import lombok.experimental.SuperBuilder; +import io.swagger.annotations.*; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; /** * 班级管理对象 sys_class * * @author ruoyi - * @date 2024-04-22 + * @date 2024-04-23 */ @Data @SuperBuilder diff --git a/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/domain/req/SysGroupEditReq.java b/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/domain/req/SysGroupEditReq.java new file mode 100644 index 0000000..b588ad4 --- /dev/null +++ b/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/domain/req/SysGroupEditReq.java @@ -0,0 +1,45 @@ +package com.ruoyi.school.domain.req; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.AllArgsConstructor; +import lombok.experimental.SuperBuilder; +import io.swagger.annotations.*; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 小组管理对象 sys_group + * + * @author ruoyi + * @date 2024-04-23 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value = "SysGroupEditReq", description = "小组管理") +public class SysGroupEditReq extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 小组名称 */ + @ApiModelProperty(name = "小组名称", value = "小组名称") + private String groupName; + + /** 小组人数 */ + @ApiModelProperty(name = "小组人数", value = "小组人数") + private Long groupPeople; + + /** 小组人员 */ + @ApiModelProperty(name = "小组人员", value = "小组人员") + private String groupPersonnel; + + /** 班级ID */ + @ApiModelProperty(name = "班级ID", value = "班级ID") + private Long classId; + +} diff --git a/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/domain/req/SysGroupQueryReq.java b/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/domain/req/SysGroupQueryReq.java new file mode 100644 index 0000000..c77d431 --- /dev/null +++ b/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/domain/req/SysGroupQueryReq.java @@ -0,0 +1,41 @@ +package com.ruoyi.school.domain.req; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.AllArgsConstructor; +import lombok.experimental.SuperBuilder; +import io.swagger.annotations.*; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 小组管理对象 sys_group + * + * @author ruoyi + * @date 2024-04-23 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value = "SysGroupQueryReq", description = "小组管理") +public class SysGroupQueryReq extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 小组名称 */ + @ApiModelProperty(name = "小组名称", value = "小组名称") + private String groupName; + + /** 小组人数 */ + @ApiModelProperty(name = "小组人数", value = "小组人数") + private Long groupPeople; + + /** 班级ID */ + @ApiModelProperty(name = "班级ID", value = "班级ID") + private Long classId; + +} diff --git a/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/domain/req/SysGroupSaveReq.java b/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/domain/req/SysGroupSaveReq.java new file mode 100644 index 0000000..743726b --- /dev/null +++ b/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/domain/req/SysGroupSaveReq.java @@ -0,0 +1,54 @@ +package com.ruoyi.school.domain.req; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.AllArgsConstructor; +import lombok.experimental.SuperBuilder; +import io.swagger.annotations.*; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 小组管理对象 sys_group + * + * @author ruoyi + * @date 2024-04-23 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value = "SysGroupSaveReq", description = "小组管理") +public class SysGroupSaveReq extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 小组ID */ + + @ApiModelProperty(name = "小组ID", value = "小组ID") + private Long groupId; + + /** 小组名称 */ + + @ApiModelProperty(name = "小组名称", value = "小组名称") + private String groupName; + + /** 小组人数 */ + + @ApiModelProperty(name = "小组人数", value = "小组人数") + private Long groupPeople; + + /** 小组人员 */ + + @ApiModelProperty(name = "小组人员", value = "小组人员") + private String groupPersonnel; + + /** 班级ID */ + + @ApiModelProperty(name = "班级ID", value = "班级ID") + private Long classId; + +} diff --git a/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/mapper/SysClassMapper.java b/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/mapper/SysClassMapper.java index de7734e..907aa40 100644 --- a/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/mapper/SysClassMapper.java +++ b/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/mapper/SysClassMapper.java @@ -1,6 +1,6 @@ package com.ruoyi.school.mapper; - +import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.school.domain.SysClass; @@ -8,7 +8,7 @@ import com.ruoyi.school.domain.SysClass; * 班级管理Mapper接口 * * @author ruoyi - * @date 2024-04-22 + * @date 2024-04-23 */ public interface SysClassMapper extends BaseMapper { diff --git a/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/mapper/SysGroupMapper.java b/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/mapper/SysGroupMapper.java new file mode 100644 index 0000000..152433b --- /dev/null +++ b/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/mapper/SysGroupMapper.java @@ -0,0 +1,15 @@ +package com.ruoyi.school.mapper; + +import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.school.domain.SysGroup; + +/** + * 小组管理Mapper接口 + * + * @author ruoyi + * @date 2024-04-23 + */ +public interface SysGroupMapper extends BaseMapper { + +} diff --git a/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/service/SysClassService.java b/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/service/SysClassService.java index 59ee5f2..944152b 100644 --- a/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/service/SysClassService.java +++ b/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/service/SysClassService.java @@ -1,16 +1,14 @@ package com.ruoyi.school.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.school.domain.SysClass; - import java.util.List; +import com.ruoyi.school.domain.SysClass; +import com.baomidou.mybatisplus.extension.service.IService; /** * 班级管理Service接口 * * @author ruoyi - * @date 2024-04-22 + * @date 2024-04-23 */ public interface SysClassService extends IService { /** diff --git a/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/service/SysGroupService.java b/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/service/SysGroupService.java new file mode 100644 index 0000000..e28691e --- /dev/null +++ b/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/service/SysGroupService.java @@ -0,0 +1,23 @@ +package com.ruoyi.school.service; + +import java.util.List; +import com.ruoyi.school.domain.SysGroup; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.school.domain.req.SysGroupQueryReq; + +/** + * 小组管理Service接口 + * + * @author ruoyi + * @date 2024-04-23 + */ +public interface SysGroupService extends IService { + /** + * 查询小组管理列表 + * + * @param sysGroupQueryReq 小组管理 + * @return 小组管理集合 + */ + public List list(SysGroupQueryReq sysGroupQueryReq); + +} diff --git a/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/service/impl/SysClassServiceImpl.java b/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/service/impl/SysClassServiceImpl.java index 3afc57e..b8b4ad1 100644 --- a/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/service/impl/SysClassServiceImpl.java +++ b/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/service/impl/SysClassServiceImpl.java @@ -1,22 +1,22 @@ package com.ruoyi.school.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.school.domain.SysClass; -import com.ruoyi.school.mapper.SysClassMapper; -import com.ruoyi.school.service.SysClassService; -import com.ruoyi.common.utils.ObjUtils; +import java.util.List; +import com.ruoyi.common.utils.ObjUtils; +import com.ruoyi.common.utils.StringUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; - -import java.util.List; +import com.ruoyi.school.mapper.SysClassMapper; +import com.ruoyi.school.domain.SysClass; +import com.ruoyi.school.service.SysClassService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; /** * 班级管理Service业务层处理 * * @author ruoyi - * @date 2024-04-22 + * @date 2024-04-23 */ @Slf4j @Service diff --git a/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/service/impl/SysGroupServiceImpl.java b/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/service/impl/SysGroupServiceImpl.java new file mode 100644 index 0000000..4ff5e43 --- /dev/null +++ b/ruoyi-basic/ruoyi-school/src/main/java/com/ruoyi/school/service/impl/SysGroupServiceImpl.java @@ -0,0 +1,41 @@ +package com.ruoyi.school.service.impl; + +import java.util.List; + +import com.ruoyi.common.utils.ObjUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.school.domain.req.SysGroupQueryReq; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import com.ruoyi.school.mapper.SysGroupMapper; +import com.ruoyi.school.domain.SysGroup; +import com.ruoyi.school.service.SysGroupService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; + +/** + * 小组管理Service业务层处理 + * + * @author ruoyi + * @date 2024-04-23 + */ +@Slf4j +@Service +public class SysGroupServiceImpl extends ServiceImpl implements SysGroupService { + + /** + * 查询小组管理列表 + * + * @param sysGroupQueryReq 小组管理 + * @return 小组管理 + */ + @Override + public List list(SysGroupQueryReq sysGroupQueryReq) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + + if (ObjUtils.notNull(sysGroupQueryReq.getClassId())){ + queryWrapper.eq(SysGroup::getClassId, sysGroupQueryReq.getClassId()); + } + return list(queryWrapper); + } +} diff --git a/ruoyi-basic/ruoyi-school/src/main/resources/mapper/system/SysClassMapper.xml b/ruoyi-basic/ruoyi-school/src/main/resources/mapper/school/SysClassMapper.xml similarity index 88% rename from ruoyi-basic/ruoyi-school/src/main/resources/mapper/system/SysClassMapper.xml rename to ruoyi-basic/ruoyi-school/src/main/resources/mapper/school/SysClassMapper.xml index e155cad..1e4ce3f 100644 --- a/ruoyi-basic/ruoyi-school/src/main/resources/mapper/system/SysClassMapper.xml +++ b/ruoyi-basic/ruoyi-school/src/main/resources/mapper/school/SysClassMapper.xml @@ -1,7 +1,7 @@ +PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> diff --git a/ruoyi-basic/ruoyi-school/src/main/resources/mapper/school/SysGroupMapper.xml b/ruoyi-basic/ruoyi-school/src/main/resources/mapper/school/SysGroupMapper.xml new file mode 100644 index 0000000..e7d84bd --- /dev/null +++ b/ruoyi-basic/ruoyi-school/src/main/resources/mapper/school/SysGroupMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + select group_id, group_name, group_people, group_personnel, class_id from sys_group + +