Merge branch 'master' of https://e.coding.net/chuanghaikeji/smarCampus/backend_dormitory

src/main/java/com/template/api/WelcomeBuildControllerAPI.java

@@ -0,0 +1,40 @@
+package com.template.api;
+
+import com.template.model.pojo.WelcomeBuild;
+import com.template.model.result.CommonResult;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+@RequestMapping("/api/welcome-build")
+public interface WelcomeBuildControllerAPI {
+
+    @PostMapping(value = "/saveBuild")
+    @ApiOperation(value = "添加楼栋", notes = "添加楼栋", httpMethod = "POST")
+    CommonResult saveBuild(@RequestBody WelcomeBuild welcomeBuild);
+
+
+    @GetMapping(value = "/deleteBuild")
+    @ApiOperation(value = "删除楼栋", notes = "删除楼栋", httpMethod = "GET")
+    CommonResult deleteBuild(@RequestParam Integer buildId);
+
+
+    @PostMapping(value = "/updateBuild")
+    @ApiOperation(value = "修改楼栋", notes = "修改楼栋", httpMethod = "POST")
+    CommonResult updateBuild(@RequestBody WelcomeBuild welcomeBuild);
+
+
+    @GetMapping(value = "/listBuild")
+    @ApiOperation(value = "查询楼栋", notes = "查询楼栋", httpMethod = "GET")
+    CommonResult listBuild(@RequestParam int currentPage, @RequestParam int pageCount,String schoolName,String buildName,String sex);
+
+
+    @GetMapping(value = "/schoolGroup")
+    @ApiOperation(value = "校区分组", notes = "校区分组", httpMethod = "GET")
+    CommonResult schoolGroup();
+
+
+    @GetMapping(value = "/buildGroup")
+    @ApiOperation(value = "楼栋分组", notes = "楼栋分组", httpMethod = "GET")
+    CommonResult buildGroup(String schoolName);
+
+}

src/main/java/com/template/api/WelcomeDormitoryControllerAPI.java

@@ -1,19 +1,38 @@
 package com.template.api;
 
-import com.template.model.pojo.WelcomeStudentDormitory;
-import com.template.model.request.InsertStudentRequest;
+import com.template.model.pojo.WelcomeDormitory;
 import com.template.model.result.CommonResult;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.validation.BindingResult;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
 
 @RequestMapping("/api/welcome-dormitory")
 public interface WelcomeDormitoryControllerAPI {
 
+    @PostMapping(value = "/saveDormitory")
+    @ApiOperation(value = "添加寝室", notes = "添加寝室", httpMethod = "POST")
+    CommonResult saveDormitory(@RequestBody WelcomeDormitory welcomeDormitory);
+
+
+    @GetMapping(value = "/deleteDormitory")
+    @ApiOperation(value = "删除寝室", notes = "删除寝室", httpMethod = "GET")
+    CommonResult deleteDormitory(@RequestParam Integer dormitoryId);
+
+
+    @PostMapping(value = "/updateDormitory")
+    @ApiOperation(value = "修改寝室", notes = "修改寝室", httpMethod = "POST")
+    CommonResult updateDormitory(@RequestBody WelcomeDormitory welcomeDormitory);
+
+
+    @GetMapping(value = "/listDormitory")
+    @ApiOperation(value = "查询寝室", notes = "查询寝室", httpMethod = "GET")
+    CommonResult listDormitory(@RequestParam int currentPage, @RequestParam int pageCount,String schoolName,String buildName,String dormitory,String sex,Integer status,String major,String college);
+
+
+    @GetMapping(value = "/dormitoryGroup")
+    @ApiOperation(value = "管理端寝室分组", notes = "管理端寝室分组", httpMethod = "GET")
+    CommonResult dormitoryGroup(String schoolName,String buildName);
+
+
     @GetMapping(value = "/groupBuild")
     @ApiOperation(value = "楼栋分组", notes = "楼栋分组", httpMethod = "GET")
     CommonResult groupBuild(String sex,String college,String gradestr,String school);

src/main/java/com/template/api/WelcomeStudentDormitoryControllerAPI.java

@@ -11,6 +11,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
 @RequestMapping("/api/welcome-student-dormitory")
 public interface WelcomeStudentDormitoryControllerAPI {
 
+    @PostMapping(value = "/saveStudent")
+    @ApiOperation(value = "添加床位", notes = "添加床位", httpMethod = "POST")
+    CommonResult saveStudent(@RequestBody WelcomeStudentDormitory welcomeStudentDormitory);
+
+
     @PostMapping(value = "/submit")
     @ApiOperation(value = "提交床位信息", notes = "提交床位信息", httpMethod = "POST")
     CommonResult submit(@RequestBody WelcomeStudentDormitory welcomeStudentDormitory);

src/main/java/com/template/controller/WelcomeBuildController.java

@@ -1,20 +1,110 @@
 package com.template.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.template.api.WelcomeBuildControllerAPI;
+import com.template.model.pojo.WelcomeBuild;
+import com.template.model.result.CommonResult;
+import com.template.model.result.PageUtils;
+import com.template.services.WelcomeBuildService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author ceshi
  * @since 2025-06-13
  */
 @RestController
-public class WelcomeBuildController {
+public class WelcomeBuildController implements WelcomeBuildControllerAPI {
+
+    @Autowired
+    WelcomeBuildService welcomeBuildService;
+
+    @Override
+    public CommonResult saveBuild(WelcomeBuild welcomeBuild) {
+        String build = welcomeBuild.getBuild();
+        LambdaQueryWrapper<WelcomeBuild> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(WelcomeBuild::getBuild, build)
+                .eq(WelcomeBuild::getSchool,welcomeBuild.getSchool());
+        WelcomeBuild wb = welcomeBuildService.getOne(wrapper);
+
+        if (ObjectUtils.isNotEmpty(wb)) {
+            return CommonResult.fail("已存在该楼栋");
+        }
+
+        welcomeBuildService.save(welcomeBuild);
+
+        return CommonResult.ok();
+    }
+
+    @Override
+    public CommonResult deleteBuild(Integer buildId) {
+
+        welcomeBuildService.removeById(buildId);
+
+        return CommonResult.ok();
+    }
+
+    @Override
+    public CommonResult updateBuild(WelcomeBuild welcomeBuild) {
+
+//        先查询是否有当前楼栋信息
+        LambdaQueryWrapper<WelcomeBuild> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(WelcomeBuild::getBuild, welcomeBuild.getBuild())
+                .eq(WelcomeBuild::getSchool,welcomeBuild.getSchool());
+        WelcomeBuild one = welcomeBuildService.getOne(wrapper);
+
+        if (ObjectUtils.isNotEmpty(one)) {
+            Integer id = one.getId();
+            if (!id.equals(welcomeBuild.getId())) {
+                return CommonResult.fail("修改的楼栋已存在");
+            }
+        }
+
+        welcomeBuildService.updateById(welcomeBuild);
+
+        return CommonResult.ok();
+    }
+
+    @Override
+    public CommonResult listBuild(int currentPage, int pageCount, String schoolName, String buildName, String sex) {
+
+        PageUtils<WelcomeBuild> pageUtils =welcomeBuildService.listBuild(currentPage,pageCount,schoolName,buildName,sex);
+
+        return  CommonResult.ok(pageUtils);
+    }
+
+    @Override
+    public CommonResult schoolGroup() {
+
+        LambdaQueryWrapper<WelcomeBuild> wrapper=new LambdaQueryWrapper<>();
+        wrapper.groupBy(WelcomeBuild::getSchool);
+        List<WelcomeBuild> schoolGroup = welcomeBuildService.list(wrapper);
+
+        return CommonResult.ok(schoolGroup);
+    }
+
+    @Override
+    public CommonResult buildGroup(String schoolName) {
+
+        LambdaQueryWrapper<WelcomeBuild> wrapper=new LambdaQueryWrapper<>();
+        wrapper.eq(ObjectUtils.isNotEmpty(schoolName),WelcomeBuild::getSchool,schoolName)
+                .groupBy(WelcomeBuild::getSchool);
+        List<WelcomeBuild> schoolGroup = welcomeBuildService.list(wrapper);
+
+        return CommonResult.ok(schoolGroup);
+    }
+
 
 }
 

src/main/java/com/template/controller/WelcomeDormitoryController.java

@@ -3,12 +3,14 @@ package com.template.controller;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.template.api.WelcomeDormitoryControllerAPI;
 import com.template.api.WelcomeStudentControllerAPI;
 import com.template.model.pojo.WelcomeDormitory;
 import com.template.model.pojo.WelcomeStudent;
 import com.template.model.pojo.WelcomeStudentDormitory;
 import com.template.model.result.CommonResult;
+import com.template.model.result.PageUtils;
 import com.template.services.WelcomeDormitoryService;
 import com.template.services.WelcomeStudentDormitoryService;
 import com.template.services.WelcomeStudentService;
@@ -22,7 +24,7 @@ import java.util.List;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author ceshi
@@ -38,40 +40,106 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
     WelcomeStudentDormitoryService welcomeStudentDormitoryService;
 
     @Override
-    public CommonResult groupBuild(String sex,String college,String gradestr,String school) {
+    public CommonResult saveDormitory(WelcomeDormitory welcomeDormitory) {
+        LambdaQueryWrapper<WelcomeDormitory> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(WelcomeDormitory::getSchool, welcomeDormitory.getSchool())
+                .eq(WelcomeDormitory::getBuild, welcomeDormitory.getBuild())
+                .eq(WelcomeDormitory::getDormitory, welcomeDormitory.getDormitory());
+
+        WelcomeDormitory one = welcomeDormitoryService.getOne(wrapper);
+        if (ObjectUtils.isNotEmpty(one)) {
+            return CommonResult.fail("已存在该宿舍");
+        }
+
+//        添加时默认全空的
+        welcomeDormitory.setStatus(2);
+        welcomeDormitory.setFreeBedNumber(welcomeDormitory.getBedNumber());
+
+        welcomeDormitoryService.save(welcomeDormitory);
+        return CommonResult.ok();
+    }
+
+    @Override
+    public CommonResult deleteDormitory(Integer dormitoryId) {
+
+        welcomeDormitoryService.removeById(dormitoryId);
+
+        return CommonResult.ok();
+    }
+
+    @Override
+    public CommonResult updateDormitory(WelcomeDormitory welcomeDormitory) {
+
+        LambdaQueryWrapper<WelcomeDormitory> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(WelcomeDormitory::getSchool, welcomeDormitory.getSchool())
+                .eq(WelcomeDormitory::getBuild, welcomeDormitory.getBuild())
+                .eq(WelcomeDormitory::getDormitory, welcomeDormitory.getDormitory());
+
+        WelcomeDormitory one = welcomeDormitoryService.getOne(wrapper);
+        if (ObjectUtils.isNotEmpty(one)) {
+            if (!one.getId().equals(welcomeDormitory.getId())) {
+                return CommonResult.fail("已存在该宿舍");
+            }
+        }
+
+        welcomeDormitoryService.updateById(welcomeDormitory);
+
+        return CommonResult.ok();
+    }
+
+    @Override
+    public CommonResult listDormitory(int currentPage, int pageCount, String schoolName, String buildName, String dormitory, String sex, Integer status, String major, String college) {
+
+        PageUtils<WelcomeDormitory> pageUtils = welcomeDormitoryService.listDormitory(currentPage, pageCount, schoolName, buildName, dormitory, sex, status, major, college);
+
+        return CommonResult.ok(pageUtils);
+    }
+
+    @Override
+    public CommonResult dormitoryGroup(String schoolName, String buildName) {
+        LambdaQueryWrapper<WelcomeDormitory> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(ObjectUtils.isNotEmpty(schoolName), WelcomeDormitory::getSchool, schoolName)
+                .eq(ObjectUtils.isNotEmpty(buildName), WelcomeDormitory::getBuild, buildName);
+        List<WelcomeDormitory> list = welcomeDormitoryService.list(wrapper);
+
+        return CommonResult.ok(list);
+    }
+
+    @Override
+    public CommonResult groupBuild(String sex, String college, String gradestr, String school) {
 
-        List<String> list = welcomeDormitoryService.groupBuild(sex,college,gradestr,school);
+        List<String> list = welcomeDormitoryService.groupBuild(sex, college, gradestr, school);
 
         return CommonResult.ok(list);
     }
 
     @Override
-    public CommonResult groupDormitory(String sex,String college,String gradestr,String school,String buildName) {
+    public CommonResult groupDormitory(String sex, String college, String gradestr, String school, String buildName) {
 
-        List<String> list = welcomeDormitoryService.groupDormitory(sex,college,gradestr,buildName,school);
+        List<String> list = welcomeDormitoryService.groupDormitory(sex, college, gradestr, buildName, school);
 
         return CommonResult.ok(list);
     }
 
     @Override
-    public CommonResult groupBedNumber(String sex,String college,String gradestr,String school,String buildName, String dormitoryName) {
+    public CommonResult groupBedNumber(String sex, String college, String gradestr, String school, String buildName, String dormitoryName) {
 
 //        查询对应寝室
-        LambdaQueryWrapper<WelcomeDormitory> wrapper=new LambdaQueryWrapper<>();
-        wrapper.eq(WelcomeDormitory::getBuild,buildName)
-                .eq(WelcomeDormitory::getDormitory,dormitoryName)
-                .eq(WelcomeDormitory::getSex,sex)
-                .eq(WelcomeDormitory::getCollege,college)
-                .eq(WelcomeDormitory::getGradestr,gradestr)
-                .eq(WelcomeDormitory::getSchool,school);
+        LambdaQueryWrapper<WelcomeDormitory> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(WelcomeDormitory::getBuild, buildName)
+                .eq(WelcomeDormitory::getDormitory, dormitoryName)
+                .eq(WelcomeDormitory::getSex, sex)
+                .eq(WelcomeDormitory::getCollege, college)
+                .eq(WelcomeDormitory::getGradestr, gradestr)
+                .eq(WelcomeDormitory::getSchool, school);
         WelcomeDormitory welcomeDormitory = welcomeDormitoryService.getOne(wrapper);
 //        获取床位数
         Integer bedNumber = welcomeDormitory.getBedNumber();
 
 //        查找哪些已经入住了
-        LambdaQueryWrapper<WelcomeStudentDormitory> wrapperStudentDormitory=new LambdaQueryWrapper<>();
-        wrapperStudentDormitory.eq(WelcomeStudentDormitory::getBuilding,buildName)
-                        .eq(WelcomeStudentDormitory::getDormitory,dormitoryName);
+        LambdaQueryWrapper<WelcomeStudentDormitory> wrapperStudentDormitory = new LambdaQueryWrapper<>();
+        wrapperStudentDormitory.eq(WelcomeStudentDormitory::getBuilding, buildName)
+                .eq(WelcomeStudentDormitory::getDormitory, dormitoryName);
         List<WelcomeStudentDormitory> list1 = welcomeStudentDormitoryService.list(wrapperStudentDormitory);
 
         ArrayList<Integer> bedNums = new ArrayList<>();

src/main/java/com/template/controller/WelcomeStudentDormitoryController.java

@@ -47,6 +47,11 @@ public class WelcomeStudentDormitoryController implements WelcomeStudentDormitor
     WelcomeDormitoryService welcomeDormitoryService;
 
     @Override
+    public CommonResult saveStudent(WelcomeStudentDormitory welcomeStudentDormitory) {
+        return null;
+    }
+
+    @Override
     public CommonResult submit(WelcomeStudentDormitory welcomeStudentDormitory) {
         String studentCard = welcomeStudentDormitory.getStudentCard();
         LambdaQueryWrapper<WelcomeStudentDormitory> wrapper=new LambdaQueryWrapper<>();

src/main/java/com/template/core/JwtlnterceptorConfig.java

@@ -14,7 +14,7 @@ public class JwtlnterceptorConfig implements WebMvcConfigurer {
         //目前测试下来 使用 /**所有的话，response.sendError浏览器获取不到响应的信息
         //默认拦截所有路径
         registry.addInterceptor(authenticationInterceptor())
-                .addPathPatterns("/api/**");
+                .addPathPatterns("/api0/**");
         //endregion
     }
 

src/main/java/com/template/mapper/WelcomeBuildMapper.java

@@ -2,8 +2,11 @@ package com.template.mapper;
 
 import com.template.model.pojo.WelcomeBuild;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * <p>
  *  Mapper 接口
@@ -15,4 +18,7 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface WelcomeBuildMapper extends BaseMapper<WelcomeBuild> {
 
+    List<String> schoolGroup();
+
+    List<String> buildGroup(@Param("schoolName") String schoolName);
 }

src/main/java/com/template/model/pojo/WelcomeDormitory.java

@@ -70,6 +70,12 @@ public class WelcomeDormitory implements Serializable {
     @ApiModelProperty(value = "备注")
     private String remark;
 
+    @ApiModelProperty(value = "入住状态 1:满员，2.全空，3.缺额")
+    private Integer status;
+
+    @ApiModelProperty(value = "空闲床位数")
+    private Integer freeBedNumber;
+
     @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)
     private Date createTime;

src/main/java/com/template/services/WelcomeBuildService.java

@@ -5,6 +5,8 @@ import com.template.model.pojo.WelcomeBuild;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.template.model.result.PageUtils;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -23,4 +25,10 @@ public interface WelcomeBuildService extends IService<WelcomeBuild> {
     int deleteWelcomeBuildById(String id);
 
     WelcomeBuild getManageById(String id);
+
+    List<String> schoolGroup();
+
+    List<String> buildGroup(String schoolName);
+
+    PageUtils<WelcomeBuild> listBuild(int currentPage, int pageCount, String schoolName, String buildName, String sex);
 }

src/main/java/com/template/services/WelcomeDormitoryService.java

@@ -29,4 +29,6 @@ public interface WelcomeDormitoryService extends IService<WelcomeDormitory> {
     List<String> groupBuild(String sex,String college,String gradestr,String school);
 
     List<String> groupDormitory(String sex,String college,String gradestr,String school,String buildName);
+
+    PageUtils<WelcomeDormitory> listDormitory(int currentPage, int pageCount, String schoolName, String buildName, String dormitory, String sex, Integer status, String major, String college);
 }

src/main/java/com/template/services/impl/WelcomeBuildServiceImpl.java

@@ -1,7 +1,9 @@
 package com.template.services.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.template.mapper.WelcomeBuildMapper;
 import com.template.model.pojo.WelcomeBuild;
@@ -13,6 +15,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -59,4 +63,27 @@ public class WelcomeBuildServiceImpl extends ServiceImpl<WelcomeBuildMapper, Wel
         WelcomeBuild result = welcomeBuildMapper.selectById(id);
         return result;
     }
+
+    @Override
+    public List<String> schoolGroup() {
+        List<String> result = welcomeBuildMapper.schoolGroup();
+        return result;
+    }
+
+    @Override
+    public List<String> buildGroup(String schoolName) {
+        List<String> result = welcomeBuildMapper.buildGroup(schoolName);
+        return result;
+    }
+
+    @Override
+    public PageUtils<WelcomeBuild> listBuild(int currentPage, int pageCount, String schoolName, String buildName, String sex) {
+        Page<WelcomeBuild> page = new Page<>(currentPage, pageCount);
+        LambdaQueryWrapper<WelcomeBuild> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(ObjectUtils.isNotEmpty(schoolName),WelcomeBuild::getSchool,schoolName)
+                .eq(ObjectUtils.isNotEmpty(buildName),WelcomeBuild::getBuild,buildName)
+                .eq(ObjectUtils.isNotEmpty(sex),WelcomeBuild::getSex,sex);
+        IPage<WelcomeBuild> result = welcomeBuildMapper.selectPage(page,queryWrapper);
+        return new PageUtils<>(result);
+    }
 }

src/main/java/com/template/services/impl/WelcomeDormitoryServiceImpl.java

@@ -1,7 +1,9 @@
 package com.template.services.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.template.mapper.WelcomeDormitoryMapper;
 import com.template.model.pojo.WelcomeDormitory;
@@ -73,4 +75,20 @@ public class WelcomeDormitoryServiceImpl extends ServiceImpl<WelcomeDormitoryMap
         List<String> result = welcomeDormitoryMapper.groupDormitory(sex,college,gradestr,buildName,school);
         return result;
     }
+
+    @Override
+    public PageUtils<WelcomeDormitory> listDormitory(int currentPage, int pageCount, String schoolName, String buildName, String dormitory, String sex, Integer status, String major, String college) {
+        Page<WelcomeDormitory> page = new Page<>(currentPage, pageCount);
+        LambdaQueryWrapper<WelcomeDormitory> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(ObjectUtils.isNotEmpty(schoolName),WelcomeDormitory::getSchool,schoolName)
+                .eq(ObjectUtils.isNotEmpty(buildName),WelcomeDormitory::getBuild,buildName)
+                .eq(ObjectUtils.isNotEmpty(dormitory),WelcomeDormitory::getDormitory,dormitory)
+                .eq(ObjectUtils.isNotEmpty(sex),WelcomeDormitory::getSex,sex)
+                .eq(ObjectUtils.isNotEmpty(status),WelcomeDormitory::getStatus,status)
+                .eq(ObjectUtils.isNotEmpty(major),WelcomeDormitory::getMajor,major)
+                .eq(ObjectUtils.isNotEmpty(college),WelcomeDormitory::getCollege,college);
+
+        IPage<WelcomeDormitory> result = welcomeDormitoryMapper.selectPage(page,queryWrapper);
+        return new PageUtils<>(result);
+    }
 }

src/main/resources/mapper/template/WelcomeBuildMapper.xml

@@ -2,4 +2,23 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.template.mapper.WelcomeBuildMapper">
 
+    <select id="schoolGroup" resultType="java.lang.String">
+        SELECT school
+        FROM `welcome_build`
+        WHERE deleted = 0
+        GROUP BY school
+    </select>
+
+    <select id="buildGroup" resultType="java.lang.String">
+        SELECT
+        build
+        FROM
+        `welcome_build`
+        WHERE
+        deleted = 0
+        <if test="schoolName != null and schoolName != ''">
+            AND school= #{schoolName}
+        </if>
+        GROUP BY build
+    </select>
 </mapper>