更新

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

@@ -49,7 +49,6 @@ 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);
 
-<<<<<<< HEAD
     @PostMapping(value = "/submit")
     @ApiOperation(value = "提交床位信息", notes = "提交床位信息", httpMethod = "POST")
     CommonResult submit(@RequestBody WelcomeBed welcomeBed);
@@ -58,9 +57,8 @@ public interface WelcomeBedControllerAPI {
     @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);
->>>>>>> ef070cf7211abbe40011b67ef64058df21ab450a
+
 }

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

@@ -38,21 +38,7 @@ public interface WelcomeDormitoryControllerAPI {
     CommonResult dormitoryGroup(Integer schoolId,Integer buildId);
 
 
-<<<<<<< HEAD
-    @GetMapping(value = "/bedNumberGroup")
-=======
-    @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);
-
-
     @GetMapping(value = "/groupBedNumber")
->>>>>>> ef070cf7211abbe40011b67ef64058df21ab450a
     @ApiOperation(value = "床位分组", notes = "床位分组", httpMethod = "GET")
     CommonResult bedNumberGroup(Integer schoolId,Integer buildId,Integer dormitoryId);
 

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

@@ -605,7 +605,6 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
     }
 
     @Override
-<<<<<<< HEAD
     public CommonResult submit(WelcomeBed welcomeBed) {
         welcomeBedService.updateById(welcomeBed);
         return CommonResult.ok();
@@ -614,10 +613,13 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
     @Override
     public CommonResult bedDetails(Integer schoolId, Integer buildId, Integer dormitoryId, String studentCard) {
         //        获取未入住的床位
-        List<WelcomeBed> beds= welcomeBedService.getBedList(schoolId,buildId,dormitoryId,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<>();
@@ -628,7 +630,6 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
             datas.add(data);
         }
         return CommonResult.ok(datas);
->>>>>>> ef070cf7211abbe40011b67ef64058df21ab450a
     }
 }
 

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

@@ -34,11 +34,10 @@ public interface WelcomeBedService extends IService<WelcomeBed> {
 
     List<WelcomeBed> listWelcomeBed(Integer id);
 
-<<<<<<< HEAD
     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);
->>>>>>> ef070cf7211abbe40011b67ef64058df21ab450a
+
 }

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

@@ -115,7 +115,6 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
     }
 
     @Override
-<<<<<<< HEAD
     public List<WelcomeBed> bedNumberGroup(Integer schoolId, Integer buildId, Integer dormitoryId) {
         LambdaQueryWrapper<WelcomeBed> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(WelcomeBed::getSchoolId, schoolId)
@@ -130,28 +129,29 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
     @Override
     public List<WelcomeBed> getBedList(Integer schoolId, Integer buildId, Integer dormitoryId, String studentCard) {
         LambdaQueryWrapper<WelcomeBed> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.select(WelcomeBed::getNumber,WelcomeBed::getIsCheck)
+        queryWrapper.select(WelcomeBed::getNumber, WelcomeBed::getIsCheck)
                 .eq(WelcomeBed::getSchoolId, schoolId)
                 .eq(WelcomeBed::getBuildId, buildId)
                 .eq(WelcomeBed::getDormitoryId, dormitoryId)
-                .ne(WelcomeBed::getStudentCard,studentCard);
+                .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);
+                .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);
         List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
         return result;
->>>>>>> ef070cf7211abbe40011b67ef64058df21ab450a
     }
 
 }