接口修改，房型查看列表添加房间号展示

mhotel/src/com/happy/Model/House.java

@@ -79,6 +79,19 @@ public class House {
 	 */
 	private List<FileInfo> fileInfoList;
 
+	/**
+	 * 房间号
+	 */
+	private List<HouseNumber> houseNumbers;
+
+	public List<HouseNumber> getHouseNumbers() {
+		return houseNumbers;
+	}
+
+	public void setHouseNumbers(List<HouseNumber> houseNumbers) {
+		this.houseNumbers = houseNumbers;
+	}
+
 	public String getId() {
 		return id;
 	}

mhotel/src/com/happy/action/hotelCoupomAction.java

@@ -148,6 +148,9 @@ public class hotelCoupomAction extends BaseController implements ServletRequestA
         if (status != null){
             s1.append(" and status = ").append(status).append(" ");
         }
+        if(type != null){
+            s1.append(" and type = ").append(type).append(" ");
+        }
         if (grantStartDate != null && grantEndDate != null){
             s1.append(" and DATE_FORMAT(grant_start_date,'%Y-%m-%d') >= '").append(grantStartDate).append("' ");
             s1.append(" and DATE_FORMAT(grant_end_date,'%Y-%m-%d') <= '").append(grantEndDate).append("' ");
@@ -214,7 +217,6 @@ public class hotelCoupomAction extends BaseController implements ServletRequestA
                 return null;
             }
             int m = hotelCoupomService.updateLapse(ids);
-            //TODO 修改用户领取的优惠卷
             int n = hotelCoupomStatusService.updateLapse(ids);
             resultJson.put("message", "修改成功");
             resultJson.put("code", 200);

mhotel/src/com/happy/dao/HouseNumberDao.java

@@ -17,4 +17,6 @@ public interface HouseNumberDao {
      * 查询指定房型下的所有非删除状态的房间
      */
     List<HouseNumber> queryListByHouseIdList(List<String> houseIdList);
+
+    List<HouseNumber> queryByHouseId(String houseId);
 }

mhotel/src/com/happy/dao/impl/HouseNumberImplDao.java

@@ -99,4 +99,12 @@ public class HouseNumberImplDao  implements HouseNumberDao {
             addValue("houseIdList", houseIdList);
         }}, new BeanPropertyRowMapper<>(HouseNumber.class));
     }
+
+    @Override
+    public List<HouseNumber> queryByHouseId(String houseId) {
+        final String sql = "select id, house_id, number_name, create_id, create_date, modify_date, status from house_number where status != 0 and house_id = :houseId order by number_name";
+        return namedParameterJdbcTemplate.query(sql, new MapSqlParameterSource() {{
+            addValue("houseId", houseId);
+        }}, new BeanPropertyRowMapper<>(HouseNumber.class));
+    }
 }

mhotel/src/com/happy/service/HouseNumberService.java

@@ -26,4 +26,11 @@ public interface HouseNumberService {
      * @return 返回房间号 Status 为 3的房间表示不可预定
      */
     List<HouseNumber> queryHouseStatus(Booking book);
+
+    /**
+     * 描述：查询该房型下的房间号
+     * @param houseId 房型id
+     * @return 该房型的房间列表
+     */
+    List<HouseNumber> queryByHouseId(String houseId);
 }

mhotel/src/com/happy/service/impl/HouseImplService.java

@@ -3,7 +3,9 @@ package com.happy.service.impl;
 import com.happy.Model.Hotel;
 import com.happy.Model.House;
 import com.happy.Model.House;
+import com.happy.Model.HouseNumber;
 import com.happy.dao.HouseDao;
+import com.happy.dao.HouseNumberDao;
 import com.happy.dto.HouseSumEto;
 import com.happy.dto.IPage;
 import com.happy.service.HouseService;
@@ -18,6 +20,9 @@ public class HouseImplService implements HouseService {
     @Resource
     public HouseDao houseDao;
 
+    @Resource
+    public HouseNumberDao houseNumberDao;
+
     @Override
     public int insertHouse(House house) {
         return houseDao.insertHouse(house);
@@ -35,13 +40,18 @@ public class HouseImplService implements HouseService {
 
     @Override
     public House getById(int id) {
-        return houseDao.getById(id);
+        House house = houseDao.getById(id);
+        house.setHouseNumbers(houseNumberDao.queryByHouseId(String.valueOf(id)));
+        return house;
     }
 
     @Override
     public IPage<House> queryPage(String sqlx, int page, int rows) {
         IPage<House> iPage = new IPage();
         List<House> houseList = houseDao.queryPage(sqlx,page,rows);
+        houseList.forEach(house -> {
+            house.setHouseNumbers(houseNumberDao.queryByHouseId(String.valueOf(house.getId())));
+        });
         int total = houseDao.queryTotal(sqlx);
         iPage.setPageList(houseList);
         iPage.setPage(page);

mhotel/src/com/happy/service/impl/HouseNumberImplService.java

@@ -31,4 +31,9 @@ public class HouseNumberImplService implements HouseNumberService {
         return houseNumberDao.queryHouseStatus(book);
     }
 
+    @Override
+    public List<HouseNumber> queryByHouseId(String houseId) {
+        return houseNumberDao.queryByHouseId(houseId);
+    }
+
 }