酒店名称，改字段hotel_name

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

@@ -32,6 +32,11 @@ public class Hotel {
 	private String hname;
 
 	/**
+	 * 酒店名称
+	 */
+	private String hotel_name;
+
+	/**
 	 * 酒店位置
 	 */
 	private String hposition;
@@ -382,4 +387,12 @@ public class Hotel {
 	public void setHconfigList(List hconfigList) {
 		this.hconfigList = hconfigList;
 	}
+
+	public String getHotel_name() {
+		return hotel_name;
+	}
+
+	public void setHotel_name(String hotel_name) {
+		this.hotel_name = hotel_name;
+	}
 }

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

@@ -104,8 +104,8 @@ public class HotelImplDao implements HotelDao {
     @Override
     public Hotel getById(int id) {
 
-        String sql = " SELECT   a.*, c.manager_phone, b.hotel_township_name  FROM `hotel` a  " +
-                " LEFT JOIN (SELECT   manager_id, corpn_phone manager_phone, hotel_township FROM  admin_manager  GROUP BY  manager_id) c ON a.manager_id = c.manager_id " +
+        String sql = " SELECT   a.*, c.manager_phone, b.hotel_township_name,c.hotel_name  FROM `hotel` a  " +
+                " LEFT JOIN (SELECT   manager_id, corpn_phone manager_phone, hotel_township,hotel_name FROM  admin_manager  GROUP BY  manager_id) c ON a.manager_id = c.manager_id " +
                 " LEFT JOIN (  SELECT  id,name as hotel_township_name  FROM  hotel_dict GROUP BY  id) b ON b.id = c.hotel_township   "+
                 " WHERE  a.STATUS = 1  AND a.id =  :id ";
 //        String sql = "SELECT * FROM `hotel` WHERE id = :id ";
@@ -125,8 +125,8 @@ public class HotelImplDao implements HotelDao {
     @Override
     public Hotel getByManagerId(int id) {
 
-        String sql = " SELECT   a.*, c.manager_phone, b.hotel_township_name  FROM `hotel` a  " +
-                " LEFT JOIN (SELECT   manager_id, corpn_phone manager_phone, hotel_township FROM  admin_manager  GROUP BY  manager_id) c ON a.manager_id = c.manager_id " +
+        String sql = " SELECT   a.*, c.manager_phone, b.hotel_township_name,c.hotel_name  FROM `hotel` a  " +
+                " LEFT JOIN (SELECT   manager_id, corpn_phone manager_phone, hotel_township,hotel_name FROM  admin_manager  GROUP BY  manager_id) c ON a.manager_id = c.manager_id " +
                 " LEFT JOIN (  SELECT  id,name as hotel_township_name  FROM  hotel_dict GROUP BY  id) b ON b.id = c.hotel_township   "+
                 " WHERE  a.STATUS = 1  AND a.manager_id =  :manager_id ";
         MapSqlParameterSource sps = new MapSqlParameterSource();
@@ -160,9 +160,9 @@ public class HotelImplDao implements HotelDao {
     @Override
     public List<Hotel> queryPagePrice(String sqlx, int page, int rows) {
         int start = (page - 1) * rows;// 每页的起始下标
-        String sql = "SELECT a.*,b.min_price,c.hotel_township , d.hotel_township_name , e.h_type_name FROM `hotel` a " +
+        String sql = "SELECT a.*,b.min_price,c.hotel_township,d.hotel_township_name, e.h_type_name,c.hotel_name FROM `hotel` a " +
                 "left join (select manager_id,min(price) min_price from house group by manager_id) b on a.manager_id = b.manager_id " +
-                "left join (select manager_id,hotel_township hotel_township from admin_manager group by manager_id) c on a.manager_id = c.manager_id " +
+                "left join (select manager_id,hotel_township,hotel_name from admin_manager group by manager_id) c on a.manager_id = c.manager_id " +
                 "LEFT JOIN (  SELECT  id,name as hotel_township_name  FROM  hotel_dict GROUP BY  id) d ON d.id = c.hotel_township " +
                 "LEFT JOIN (  SELECT  id,name as h_type_name  FROM  hotel_dict GROUP BY  id) e ON e.id = a.htype      " +
                 " WHERE status=1 "+sqlx+" ORDER BY id DESC limit :start,:rows ";

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

@@ -61,7 +61,7 @@ public class AppBookImplService implements AppBookService {
 
         // 设置民宿信息
         booking.setHotelId(Func.parseStr(hotel.getId()));
-        booking.setHotelName(hotel.getHname());
+        booking.setHotelName(hotel.getHotel_name()); // 创建表单的时候，取酒店名称(数据来源于admin_manager中的hotel_name)
         booking.setHotelHposition(hotel.getHposition());
         booking.setHotelHpositionWens(hotel.getHpositionWens());
         booking.setHotelManagerId(hotel.getManagerId());