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

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

@@ -30,7 +30,7 @@ public interface WelcomeBuildControllerAPI {
 
     @GetMapping(value = "/listBuild")
     @ApiOperation(value = "查询楼栋", notes = "查询楼栋", httpMethod = "GET")
-    CommonResult listBuild(@RequestParam int currentPage, @RequestParam int pageCount,String schoolName,String buildName,String sex);
+    CommonResult listBuild(@RequestParam int currentPage, @RequestParam int pageCount,Integer schoolId,String buildId,String sex);
 
 
     @GetMapping(value = "/schoolGroup")

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

@@ -30,22 +30,27 @@ public interface WelcomeDormitoryControllerAPI {
 
     @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);
+    CommonResult listDormitory(@RequestParam int currentPage, @RequestParam int pageCount,Integer schoolId,Integer buildId,Integer dormitoryId,String sex,Integer status,Integer majorId,Integer collegeId);
 
 
     @GetMapping(value = "/dormitoryGroup")
     @ApiOperation(value = "管理端寝室分组", notes = "管理端寝室分组", httpMethod = "GET")
-    CommonResult dormitoryGroup(String schoolName,String buildName);
+    CommonResult dormitoryGroup(Integer schoolId,Integer buildId);
+
+
+
+
+
 
 
     @GetMapping(value = "/groupBuild")
-    @ApiOperation(value = "寝室分组", notes = "寝室分组", httpMethod = "GET")
+    @ApiOperation(value = "楼栋分组", notes = "楼栋分组", httpMethod = "GET")
     CommonResult groupBuild(String sex,String college,String gradestr,String school);
 
 
     @GetMapping(value = "/groupDormitory")
     @ApiOperation(value = "寝室分组", notes = "寝室分组", httpMethod = "GET")
-    CommonResult groupDormitory(String sex,String college,String gradestr,String school,String buildName);
+    CommonResult groupDormitory(String sex,String collegeId,String gradestr,String school,String buildName);
 
 
     @GetMapping(value = "/groupBedNumber")

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

@@ -22,7 +22,6 @@ public interface WelcomeStudentDormitoryControllerAPI {
     @ApiOperation(value = "删除床位", notes = "删除床位", httpMethod = "GET")
     CommonResult deleteStudentDormitory(@RequestParam Integer studentDormitoryId);
 
-
     @PostMapping(value = "/submit")
     @ApiOperation(value = "提交床位信息", notes = "提交床位信息", httpMethod = "POST")
     CommonResult submit(@RequestBody WelcomeStudentDormitory welcomeStudentDormitory);

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

@@ -11,6 +11,7 @@ import com.template.model.pojo.*;
 import com.template.model.result.CommonResult;
 import com.template.model.result.PageUtils;
 import com.template.model.vo.StudentPageVo;
+import com.template.model.vo.WelcomeBuildVo;
 import com.template.services.WelcomeBuildService;
 import com.template.services.WelcomeSchoolService;
 import org.apache.poi.hssf.usermodel.HSSFRow;
@@ -102,9 +103,9 @@ public class WelcomeBuildController implements WelcomeBuildControllerAPI {
     }
 
     @Override
-    public CommonResult listBuild(int currentPage, int pageCount, String schoolName, String buildName, String sex) {
+    public CommonResult listBuild(int currentPage, int pageCount, Integer schoolId,String buildId, String sex) {
 
-        PageUtils<WelcomeBuild> pageUtils =welcomeBuildService.listBuild(currentPage,pageCount,schoolName,buildName,sex);
+        PageUtils<WelcomeBuildVo> pageUtils =welcomeBuildService.listBuild(currentPage,pageCount,schoolId,buildId,sex);
 
         return  CommonResult.ok(pageUtils);
     }

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

@@ -114,19 +114,16 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
     }
 
     @Override
-    public CommonResult listDormitory(int currentPage, int pageCount, String schoolName, String buildName, String dormitory, String sex, Integer status, String major, String college) {
+    public CommonResult listDormitory(int currentPage, int pageCount, Integer schoolId,Integer buildId,Integer dormitoryId,String sex,Integer status,Integer majorId,Integer collegeId) {
 
-        PageUtils<WelcomeDormitory> pageUtils = welcomeDormitoryService.listDormitory(currentPage, pageCount, schoolName, buildName, dormitory, sex, status, major, college);
+        PageUtils<WelcomeDormitory> pageUtils = welcomeDormitoryService.listDormitory(currentPage, pageCount, schoolId, buildId, dormitoryId, sex, status, majorId, collegeId);
 
         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);
+    public CommonResult dormitoryGroup(Integer schoolId, Integer buildId) {
+        List<WelcomeDormitory> list = welcomeDormitoryService.dormitoryGroup(schoolId,buildId);
 
         return CommonResult.ok(list);
     }
@@ -156,7 +153,6 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
                 .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);
 //        获取床位数

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

@@ -1,7 +1,10 @@
 package com.template.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.template.model.pojo.WelcomeBuild;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.template.model.vo.WelcomeBuildVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -18,4 +21,6 @@ import java.util.List;
 @Repository
 public interface WelcomeBuildMapper extends BaseMapper<WelcomeBuild> {
 
+    IPage<WelcomeBuildVo> listBuild(Page<WelcomeBuildVo> page, @Param("schoolId")  Integer schoolId, @Param("buildId")  String buildId, @Param("sex") String sex);
+
 }

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

@@ -1,5 +1,7 @@
 package com.template.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.template.model.pojo.WelcomeDormitory;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
@@ -22,4 +24,10 @@ public interface WelcomeDormitoryMapper extends BaseMapper<WelcomeDormitory> {
     List<String> groupBuild(@Param("sex") String sex,@Param("college") String college,@Param("gradestr") String gradestr,@Param("school")String school);
 
     List<String> groupDormitory(@Param("sex") String sex,@Param("college") String college,@Param("gradestr") String gradestr,@Param("school")String school, @Param("buildName") String buildName);
+
+    IPage<WelcomeDormitory> listDormitory(Page<WelcomeDormitory> page,@Param("schoolId") Integer schoolId,@Param("buildId") Integer buildId,
+                                          @Param("dormitoryId") Integer dormitoryId, @Param("sex") String sex,@Param("status") Integer status,
+                                          @Param("majorId") Integer majorId,@Param("collegeId") Integer collegeId);
+
+
 }

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

@@ -34,6 +34,9 @@ public class WelcomeDormitory implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
+    @ApiModelProperty(value = "校区id")
+    private Integer schoolId;
+
     @ApiModelProperty(value = "校区名称")
     private String school;
 
@@ -64,9 +67,6 @@ public class WelcomeDormitory implements Serializable {
     @ApiModelProperty(value = "床位数")
     private Integer bedNumber;
 
-    @ApiModelProperty(value = "所属年级")
-    private String gradestr;
-
     @ApiModelProperty(value = "备注")
     private String remark;
 

src/main/java/com/template/model/vo/WelcomeBuildVo.java

@@ -0,0 +1,30 @@
+package com.template.model.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class WelcomeBuildVo {
+    private Integer id;
+
+    @ApiModelProperty(value = "校区ID")
+    private String schoolId;
+
+    @ApiModelProperty(value = "校区名称")
+    private String schoolName;
+
+    @ApiModelProperty(value = "楼栋名称")
+    private String build;
+
+    @ApiModelProperty(value = "楼栋性别")
+    private String sex;
+
+    @ApiModelProperty(value = "楼栋层数")
+    private String floors;
+
+    @ApiModelProperty(value = "起始层数")
+    private Integer startFloor;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+}

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

@@ -4,6 +4,7 @@ import com.template.model.pojo.WelcomeBuild;
 import com.template.model.pojo.WelcomeBuild;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.template.model.result.PageUtils;
+import com.template.model.vo.WelcomeBuildVo;
 
 import java.util.List;
 
@@ -26,7 +27,7 @@ public interface WelcomeBuildService extends IService<WelcomeBuild> {
 
     WelcomeBuild getManageById(String id);
 
-    PageUtils<WelcomeBuild> listBuild(int currentPage, int pageCount, String schoolName, String buildName, String sex);
+    PageUtils<WelcomeBuildVo> listBuild(int currentPage, int pageCount, Integer schoolId, String buildId, String sex);
 
     List<WelcomeBuild> listBuild( String schoolName, String buildName, String sex);
 

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

@@ -30,7 +30,9 @@ public interface WelcomeDormitoryService extends IService<WelcomeDormitory> {
 
     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);
+    PageUtils<WelcomeDormitory> listDormitory(int currentPage, int pageCount,  Integer schoolId,Integer buildId,Integer dormitoryId,String sex,Integer status,Integer majorId,Integer collegeId);
 
     List<WelcomeDormitory> listDormitory( String schoolName, String buildName, String dormitory, String sex, Integer status, String major, String college);
+
+    List<WelcomeDormitory> dormitoryGroup(Integer schoolId, Integer buildId);
 }

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

@@ -10,6 +10,7 @@ import com.template.model.pojo.WelcomeBuild;
 import com.template.model.pojo.WelcomeBuild;
 import com.template.mapper.WelcomeBuildMapper;
 import com.template.model.result.PageUtils;
+import com.template.model.vo.WelcomeBuildVo;
 import com.template.services.WelcomeBuildService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -67,13 +68,9 @@ public class WelcomeBuildServiceImpl extends ServiceImpl<WelcomeBuildMapper, Wel
 
 
     @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);
+    public PageUtils<WelcomeBuildVo> listBuild(int currentPage, int pageCount, Integer schoolId, String buildId, String sex) {
+        Page<WelcomeBuildVo> page = new Page<>(currentPage, pageCount);
+        IPage<WelcomeBuildVo> result = welcomeBuildMapper.listBuild(page,schoolId,buildId,sex);
         return new PageUtils<>(result);
     }
 

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

@@ -77,18 +77,9 @@ public class WelcomeDormitoryServiceImpl extends ServiceImpl<WelcomeDormitoryMap
     }
 
     @Override
-    public PageUtils<WelcomeDormitory> listDormitory(int currentPage, int pageCount, String schoolName, String buildName, String dormitory, String sex, Integer status, String major, String college) {
+    public PageUtils<WelcomeDormitory> listDormitory(int currentPage, int pageCount,  Integer schoolId,Integer buildId,Integer dormitoryId,String sex,Integer status,Integer majorId,Integer collegeId) {
         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);
+        IPage<WelcomeDormitory> result = welcomeDormitoryMapper.listDormitory(page,schoolId,buildId,dormitoryId,sex,status,majorId,collegeId);
         return new PageUtils<>(result);
     }
 
@@ -107,4 +98,13 @@ public class WelcomeDormitoryServiceImpl extends ServiceImpl<WelcomeDormitoryMap
         List<WelcomeDormitory> result = welcomeDormitoryMapper.selectList(queryWrapper);
         return result;
     }
+
+    @Override
+    public List<WelcomeDormitory> dormitoryGroup(Integer schoolId, Integer buildId) {
+        LambdaQueryWrapper<WelcomeDormitory> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(ObjectUtils.isNotEmpty(schoolId), WelcomeDormitory::getSchoolId, schoolId)
+                .eq(ObjectUtils.isNotEmpty(buildId), WelcomeDormitory::getBuild, buildId);
+        List<WelcomeDormitory> welcomeDormitories = welcomeDormitoryMapper.selectList(wrapper);
+        return welcomeDormitories;
+    }
 }

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

@@ -2,4 +2,29 @@
 <!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="listBuild" resultType="com.template.model.vo.WelcomeBuildVo">
+        SELECT
+        wb.id,
+        wb.school_id as schoolId,
+        ws.`school` AS schoolName,
+        wb.build,
+        wb.sex,
+        wb.floors,
+        wb.start_floor as startFloor,
+        wb.remark
+        FROM
+        `welcome_build` wb
+        LEFT JOIN welcome_school ws ON ws.id = wb.school_id and ws.deleted=0
+        WHERE wb.deleted=0
+        <if test="schoolId != null and schoolId != ''">
+            and wb.school_id = #{schoolId}
+        </if>
+        <if test="buildId != null and buildId != ''">
+            and wb.id = #{buildId}
+        </if>
+        <if test="sex != null and sex != ''">
+            and wb.sex = #{sex}
+        </if>
+
+    </select>
 </mapper>

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

@@ -24,4 +24,51 @@
           AND build = #{buildName}
         GROUP BY dormitory
     </select>
+    <select id="listDormitory" resultType="com.template.model.pojo.WelcomeDormitory">
+        SELECT
+            wd.id,
+            wd.school_id as schoolId,
+            ws.school,
+            wd.build_id as buildId,
+            wb.build,
+            wd.dormitory,
+            wd.sex,
+            wd.college_id as collegeId,
+            wo.name as college,
+            wd.major_id as majorId,
+            wo2.name as major,
+            wd.bed_number as bedNumber,
+            wd.remark,
+            wd.status,
+            wd.free_bed_number as freeBedNumber
+        FROM
+            `welcome_dormitory` wd
+                LEFT JOIN welcome_school ws ON wd.school_id = ws.id and ws.deleted = 0
+                LEFT JOIN welcome_build wb ON wd.build_id = wb.id and wb.deleted = 0
+                LEFT JOIN welcome_org wo ON wd.college_id = wo.id and wo.deleted = 0
+                LEFT JOIN welcome_org wo2 ON wd.major_id = wo2.id and wo2.deleted = 0
+        WHERE
+            wd.deleted =0
+        <if test="schoolId != null and schoolId != ''">
+            and wd.school_id = #{schoolId}
+        </if>
+        <if test="buildId != null and buildId != ''">
+            and wd.build_id = #{buildId}
+        </if>
+        <if test="dormitoryId != null and dormitoryId != ''">
+            and wd.id = #{dormitoryId}
+        </if>
+        <if test="sex != null and sex != ''">
+            and wd.sex = #{sex}
+        </if>
+        <if test="status != null and status != ''">
+            and wd.status = #{status}
+        </if>
+        <if test="majorId != null and majorId != ''">
+            and wd.major_id = #{status}
+        </if>
+        <if test="collegeId != null and collegeId != ''">
+            and wd.college_id  = #{collegeId}
+        </if>
+    </select>
 </mapper>