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

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

@@ -1,5 +1,7 @@
 package com.template.api;
 
+import com.template.model.pojo.WelcomeBed;
+import com.template.model.pojo.WelcomeStudentDormitory;
 import com.template.model.request.InfoCollectionRequest;
 import com.template.model.request.InsertWelcomeBedRequest;
 import com.template.model.request.UpdateWelcomeBedRequest;
@@ -47,7 +49,16 @@ public interface WelcomeBedControllerAPI {
     @ApiOperation(value = "导出床位信息数据", notes = "导出床位信息数据", httpMethod = "GET")
     void welcomeBedExport(HttpServletResponse response, Integer schoolId,Integer buildId,Integer dormitoryId,String sex, Integer isCheck,Integer collegeId, Integer majorId, Integer classstrId);
 
+    @PostMapping(value = "/submit")
+    @ApiOperation(value = "提交床位信息", notes = "提交床位信息", httpMethod = "POST")
+    CommonResult submit(@RequestBody WelcomeBed welcomeBed);
+
+    @GetMapping(value = "/bedDetails")
+    @ApiOperation(value = "宿舍详情", notes = "宿舍详情", httpMethod = "GET")
+    CommonResult bedDetails(Integer schoolId,Integer buildId,Integer dormitoryId,String studentCard);
+
     @GetMapping(value = "/queryBedDatas")
     @ApiOperation(value = "获取床位下拉数据", notes = "获取床位下拉数据", httpMethod = "GET")
     CommonResult queryBedDatas(@RequestParam int dormitoryId);
+
 }

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

@@ -34,23 +34,13 @@ public interface WelcomeDormitoryControllerAPI {
 
 
     @GetMapping(value = "/dormitoryGroup")
-    @ApiOperation(value = "管理端寝室分组", notes = "管理端寝室分组", httpMethod = "GET")
-    CommonResult dormitoryGroup(Integer schoolId,Integer buildId);
-
-
-    @GetMapping(value = "/groupBuild")
-    @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 collegeId,String gradestr,String school,String buildName);
+    CommonResult dormitoryGroup(Integer schoolId,Integer buildId);
 
 
     @GetMapping(value = "/groupBedNumber")
     @ApiOperation(value = "床位分组", notes = "床位分组", httpMethod = "GET")
-    CommonResult groupBedNumber(String sex,String college,String gradestr,String school,String buildName,String dormitoryName);
+    CommonResult bedNumberGroup(Integer schoolId,Integer buildId,Integer dormitoryId);
 
 
     @PostMapping(value = "/importDormitoryExcel")

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

@@ -605,6 +605,21 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
     }
 
     @Override
+    public CommonResult submit(WelcomeBed welcomeBed) {
+        welcomeBedService.updateById(welcomeBed);
+        return CommonResult.ok();
+    }
+
+    @Override
+    public CommonResult bedDetails(Integer schoolId, Integer buildId, Integer dormitoryId, String studentCard) {
+        //        获取未入住的床位
+        List<WelcomeBed> beds = welcomeBedService.getBedList(schoolId, buildId, dormitoryId, studentCard);
+
+        return CommonResult.ok(beds);
+
+    }
+
+    @Override
     public CommonResult queryBedDatas(int dormitoryId) {
         List<WelcomeBed> beds = welcomeBedService.queryDormitorys(dormitoryId);
         List<ListVo> datas = new ArrayList<>();

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

@@ -170,53 +170,14 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
         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);
-
-        return CommonResult.ok(list);
-    }
 
     @Override
-    public CommonResult groupDormitory(String sex, String college, String gradestr, String school, String buildName) {
+    public CommonResult bedNumberGroup(Integer schoolId,Integer buildId,Integer dormitoryId) {
 
-        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) {
-
-//        查询对应寝室
-        LambdaQueryWrapper<WelcomeDormitory> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(WelcomeDormitory::getBuild, buildName)
-                .eq(WelcomeDormitory::getDormitory, dormitoryName)
-                .eq(WelcomeDormitory::getSex, sex)
-                .eq(WelcomeDormitory::getCollege, college)
-                .eq(WelcomeDormitory::getSchool, school);
-        WelcomeDormitory welcomeDormitory = welcomeDormitoryService.getOne(wrapper);
-//        获取床位数
-        Integer bedNumber = welcomeDormitory.getBedNumber();
-
-//        查找哪些已经入住了
-        LambdaQueryWrapper<WelcomeBed> wrapperBed = new LambdaQueryWrapper<>();
-        wrapperBed.eq(WelcomeBed::getBuild, buildName)
-                .eq(WelcomeBed::getDormitory, dormitoryName);
-        List<WelcomeBed> list1 = welcomeBedService.list(wrapperBed);
-
-        ArrayList<Integer> bedNums = new ArrayList<>();
-        for (int i = 1; i <= bedNumber; i++) {
-            bedNums.add(i);
-        }
-
-        for (WelcomeBed welcomeBed : list1) {
-            Integer bedNum = welcomeBed.getNumber();
-            bedNums.remove(bedNum);
-        }
+//        获取未入住的床位
+        List<WelcomeBed> beds= welcomeBedService.bedNumberGroup(schoolId,buildId,dormitoryId);
 
-        return CommonResult.ok(bedNums);
+        return CommonResult.ok(beds);
     }
 
 

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

@@ -23,10 +23,6 @@ import java.util.List;
 @Repository
 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<WelcomeDormitoryVo> listDormitory(Page<WelcomeDormitoryVo> 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/services/WelcomeBedService.java

@@ -34,5 +34,10 @@ public interface WelcomeBedService extends IService<WelcomeBed> {
 
     List<WelcomeBed> listWelcomeBed(Integer id);
 
+    List<WelcomeBed> bedNumberGroup(Integer schoolId, Integer buildId, Integer dormitoryId);
+
+    List<WelcomeBed> getBedList(Integer schoolId, Integer buildId, Integer dormitoryId, String studentCard);
+
     List<WelcomeBed> queryDormitorys(Integer dormitory);
+
 }

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

@@ -28,9 +28,6 @@ public interface WelcomeDormitoryService extends IService<WelcomeDormitory> {
 
     WelcomeDormitory getManageById(String id);
 
-    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<WelcomeDormitoryVo> listDormitory(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer status, Integer majorId, Integer collegeId);
 

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

@@ -19,7 +19,7 @@ import java.util.List;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author ceshi
@@ -47,16 +47,16 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
     public PageUtils<WelcomeBed> queryPageWelcomeBeds(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, Integer collegeId, Integer majorId, Integer classstrId) {
         Page<WelcomeBed> page = new Page<>(currentPage, pageCount);
         QueryWrapper<WelcomeBed> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(schoolId != null ,"school_id",schoolId);
-        queryWrapper.eq(buildId != null,"build_id",buildId);
-        queryWrapper.eq(dormitoryId != null,"dormitory_id",dormitoryId);
-        queryWrapper.eq(StringUtils.hasText(sex),"sex",sex);
-        queryWrapper.eq(isCheck != null,"is_check",isCheck);
-        queryWrapper.eq(collegeId != null,"college_id",collegeId);
-        queryWrapper.eq(majorId != null,"major_id",majorId);
-        queryWrapper.eq(classstrId != null,"classstr_id",classstrId);
+        queryWrapper.eq(schoolId != null, "school_id", schoolId);
+        queryWrapper.eq(buildId != null, "build_id", buildId);
+        queryWrapper.eq(dormitoryId != null, "dormitory_id", dormitoryId);
+        queryWrapper.eq(StringUtils.hasText(sex), "sex", sex);
+        queryWrapper.eq(isCheck != null, "is_check", isCheck);
+        queryWrapper.eq(collegeId != null, "college_id", collegeId);
+        queryWrapper.eq(majorId != null, "major_id", majorId);
+        queryWrapper.eq(classstrId != null, "classstr_id", classstrId);
         queryWrapper.orderByDesc("update_time");
-        IPage<WelcomeBed> result = welcomeBedMapper.selectPage(page,queryWrapper);
+        IPage<WelcomeBed> result = welcomeBedMapper.selectPage(page, queryWrapper);
         return new PageUtils<>(result);
     }
 
@@ -75,10 +75,10 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
     @Override
     public WelcomeBed queryBedData(String school, Integer buildId, Integer dormitoryId, Integer number) {
         QueryWrapper<WelcomeBed> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("school",school);
-        queryWrapper.eq("build_id",buildId);
-        queryWrapper.eq("dormitory_id",dormitoryId);
-        queryWrapper.eq("number",number);
+        queryWrapper.eq("school", school);
+        queryWrapper.eq("build_id", buildId);
+        queryWrapper.eq("dormitory_id", dormitoryId);
+        queryWrapper.eq("number", number);
         List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
         return result != null && result.size() > 0 ? result.get(0) : null;
     }
@@ -86,14 +86,14 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
     @Override
     public List<WelcomeBed> queryPageWelcomeBeds(Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, Integer collegeId, Integer majorId, Integer classstrId) {
         QueryWrapper<WelcomeBed> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(schoolId != null ,"school_id",schoolId);
-        queryWrapper.eq(buildId != null,"build_id",buildId);
-        queryWrapper.eq(dormitoryId != null,"dormitory_id",dormitoryId);
-        queryWrapper.eq(StringUtils.hasText(sex),"sex",sex);
-        queryWrapper.eq(isCheck != null,"is_check",isCheck);
-        queryWrapper.eq(collegeId != null,"college_id",collegeId);
-        queryWrapper.eq(majorId != null,"major_id",majorId);
-        queryWrapper.eq(classstrId != null,"classstr_id",classstrId);
+        queryWrapper.eq(schoolId != null, "school_id", schoolId);
+        queryWrapper.eq(buildId != null, "build_id", buildId);
+        queryWrapper.eq(dormitoryId != null, "dormitory_id", dormitoryId);
+        queryWrapper.eq(StringUtils.hasText(sex), "sex", sex);
+        queryWrapper.eq(isCheck != null, "is_check", isCheck);
+        queryWrapper.eq(collegeId != null, "college_id", collegeId);
+        queryWrapper.eq(majorId != null, "major_id", majorId);
+        queryWrapper.eq(classstrId != null, "classstr_id", classstrId);
         List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
         return result;
     }
@@ -101,7 +101,7 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
     @Override
     public WelcomeBed getBedByCardId(String studentCard) {
         QueryWrapper<WelcomeBed> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("student_card",studentCard);
+        queryWrapper.eq("student_card", studentCard);
         List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
         return result != null && result.size() > 0 ? result.get(0) : null;
     }
@@ -109,12 +109,44 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
     @Override
     public List<WelcomeBed> listWelcomeBed(Integer id) {
         LambdaQueryWrapper<WelcomeBed> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(WelcomeBed::getDormitoryId,id);
+        queryWrapper.eq(WelcomeBed::getDormitoryId, id);
         List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
         return result;
     }
 
     @Override
+    public List<WelcomeBed> bedNumberGroup(Integer schoolId, Integer buildId, Integer dormitoryId) {
+        LambdaQueryWrapper<WelcomeBed> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(WelcomeBed::getSchoolId, schoolId)
+                .eq(WelcomeBed::getBuildId, buildId)
+                .eq(WelcomeBed::getDormitoryId, dormitoryId)
+                .eq(WelcomeBed::getIsCheck,0);
+        List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
+        return result;
+
+    }
+
+    @Override
+    public List<WelcomeBed> getBedList(Integer schoolId, Integer buildId, Integer dormitoryId, String studentCard) {
+        LambdaQueryWrapper<WelcomeBed> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.select(WelcomeBed::getNumber, WelcomeBed::getIsCheck)
+                .eq(WelcomeBed::getSchoolId, schoolId)
+                .eq(WelcomeBed::getBuildId, buildId)
+                .eq(WelcomeBed::getDormitoryId, dormitoryId)
+                .ne(WelcomeBed::getStudentCard, studentCard);
+        List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
+
+        LambdaQueryWrapper<WelcomeBed> queryWrapper2 = new LambdaQueryWrapper<>();
+        queryWrapper2.eq(WelcomeBed::getSchoolId, schoolId)
+                .eq(WelcomeBed::getBuildId, buildId)
+                .eq(WelcomeBed::getDormitoryId, dormitoryId)
+                .eq(WelcomeBed::getStudentCard, studentCard);
+        WelcomeBed welcomeBed = welcomeBedMapper.selectOne(queryWrapper2);
+        result.add(welcomeBed);
+        return result;
+    }
+
+    @Override
     public List<WelcomeBed> queryDormitorys(Integer dormitory) {
         QueryWrapper<WelcomeBed> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("dormitory_id",dormitory);

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

@@ -66,17 +66,6 @@ public class WelcomeDormitoryServiceImpl extends ServiceImpl<WelcomeDormitoryMap
         return result;
     }
 
-    @Override
-    public List<String> groupBuild(String sex,String college,String gradestr,String school) {
-        List<String> result = welcomeDormitoryMapper.groupBuild(sex,college,gradestr,school);
-        return result;
-    }
-
-    @Override
-    public List<String> groupDormitory(String sex,String college,String gradestr,String school,String buildName) {
-        List<String> result = welcomeDormitoryMapper.groupDormitory(sex,college,gradestr,buildName,school);
-        return result;
-    }
 
     @Override
     public PageUtils<WelcomeDormitoryVo> listDormitory(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer status, Integer majorId, Integer collegeId) {

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

@@ -2,28 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.template.mapper.WelcomeDormitoryMapper">
 
-    <select id="groupBuild" resultType="java.lang.String">
-        SELECT build
-        FROM `welcome_dormitory`
-        WHERE deleted = 0
-          AND sex = #{sex}
-          AND college = #{college}
-          AND gradestr = #{gradestr}
-          AND school = #{school}
-        GROUP BY build
-    </select>
-
-    <select id="groupDormitory" resultType="java.lang.String">
-        SELECT dormitory
-        FROM `welcome_dormitory`
-        WHERE deleted = 0
-          AND sex = #{sex}
-          AND college = #{college}
-          AND gradestr = #{gradestr}
-          AND school = #{school}
-          AND build = #{buildName}
-        GROUP BY dormitory
-    </select>
     <select id="listDormitory" resultType="com.template.model.vo.WelcomeDormitoryVo">
         SELECT
         wd.id,

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

@@ -51,7 +51,7 @@
         ON ws.college_id = wo.id AND wo.deleted = 0
         WHERE
             ws.deleted = 0
-            AND ws.iden_type=1
+          AND ws.iden_type=1
         GROUP BY
             college_id
     </select>
@@ -67,7 +67,7 @@
             traffic_method
     </select>
     <select id="studentSexRatio" resultType="com.template.model.vo.StudentSexRatioVo">
-        SELECT wo.`name` as collegeName,
+        SELECT wo.`name`  as collegeName,
                new.count  AS manCount,
                new2.count AS girlCount
         FROM `welcome_student` w
@@ -93,6 +93,8 @@
                                 college_id) new2 ON w.college_id = new2.collegeId
                  LEFT JOIN welcome_org wo ON w.college_id = wo.id
             AND wo.deleted = 0
+        WHERE w.deleted = 0
+          and w.iden_type = 1
         GROUP BY w.college_id
     </select>
 </mapper>