入住接口

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

@@ -80,7 +80,7 @@ public class HouseNumberImplDao implements HouseNumberDao {
     public List<HouseNumber> queryHouseStatus(Booking book) {
         String sql = "select `id`,`house_id`,`number_name`,`create_id`,`create_date`,`modify_date`,IF(b.number_id is not null, 3, `status`) as `status` from \n" +
                 "(select * from house_number where house_id = :house_id and status != 0) a\n" +
-                "left join (select number_id from house_number_status where DATE_FORMAT(set_date,'%Y-%m-%d') >= :order_start_time and DATE_FORMAT(set_date,'%Y-%m-%d') <= :order_end_time and booking_id != :booking_id and `status` != 1 group by number_id) b on a.id = b.number_id";
+                "left join (select number_id from house_number_status where DATE_FORMAT(set_date,'%Y-%m-%d') >= :order_start_time and DATE_FORMAT(set_date,'%Y-%m-%d') <= :order_end_time and booking_id != :booking_id and `status` > 1 group by number_id) b on a.id = b.number_id";
         MapSqlParameterSource sps = new MapSqlParameterSource();
         sps.addValue("house_id", book.getHouseId());
         sps.addValue("booking_id", book.getId());

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

@@ -38,8 +38,8 @@ public class HouseNumberStatusImplDao implements HouseNumberStatusDao {
     }
 
     /**
-     * ??????????
-     * @param year ??
+     * 按年份删除节假日数据
+     * @param year 年份
      * @return
      */
     @Override
@@ -58,7 +58,7 @@ public class HouseNumberStatusImplDao implements HouseNumberStatusDao {
     }
 
     /**
-     * 2023-09-20 a-jax ?????????
+     * 2023-09-20 a-jax 批量新增节假日数据
      * @param list
      * @return
      */