Merge branch 'master' of https://e.coding.net/chuanghaikeji/smarCampus/iHotel_student_houtai into develop-wxl

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

@@ -51,5 +51,5 @@ public interface HouseAPI {
 
     @GetMapping("/displayBar")
     @ApiOperation(value = "房型下拉列表", notes = "房型下拉列表", httpMethod = "GET")
-    CommonResult displayBar();
+    CommonResult displayBar(Integer type);
 }

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

@@ -498,8 +498,8 @@ public class HouseController implements HouseAPI {
     }
 
     @Override
-    public CommonResult displayBar() {
-        List<HouseDisplayBarVo> list = houseService.displayBar();
+    public CommonResult displayBar(Integer type) {
+        List<HouseDisplayBarVo> list = houseService.displayBar(type);
 
         return CommonResult.ok(list);
 

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

@@ -30,6 +30,6 @@ public interface HouseMapper extends BaseMapper<House> {
 
     List<String> group();
 
-    List<HouseDisplayBarVo> displayBar();
+    List<HouseDisplayBarVo> displayBar(@Param("type") Integer type);
 
 }

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

@@ -32,5 +32,5 @@ public interface HouseService extends IService<House> {
 
     House getHouseName(String houseName,Integer roomType);
 
-    List<HouseDisplayBarVo> displayBar();
+    List<HouseDisplayBarVo> displayBar(Integer type);
 }

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

@@ -65,8 +65,8 @@ public class HouseServiceImpl extends ServiceImpl<HouseMapper, House> implements
     }
 
     @Override
-    public List<HouseDisplayBarVo> displayBar() {
-        return houseMapper.displayBar();
+    public List<HouseDisplayBarVo> displayBar(Integer type) {
+        return houseMapper.displayBar(type);
     }
 
 

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

@@ -77,6 +77,9 @@
             house
         WHERE
             deleted=0
+        <if test="type != null and type != ''">
+            and room_type=#{type}
+        </if>
     </select>