修改bug

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

@@ -227,7 +227,7 @@ public class BookImplDao implements BookDao {
 
     @Override
     public BookTypeEto getBookStatusSum(String sqlx){
-        String sql = "select ifnull(sum(case when order_status = 2 then 1 else 0 end),0) pendingOrderSum,count(1) orderSum,ifnull(sum(case when  order_status = 5 then 1 else 0 end),0) consumerOrderSum,ifnull(sum(case when  order_status = 5 then pay_account else 0 end),0) sumAccount from booking where 1=1"+sqlx;
+        String sql = "select ifnull(sum(case when order_status = 2 then 1 else 0 end),0) pendingOrderSum,count(1) orderSum,ifnull(sum(case when  order_status = 5 then 1 else 0 end),0) consumerOrderSum,ifnull(sum(case when  order_status = 5 then pay_account else 0 end),0) sumAccount from booking where is_delete=1"+sqlx;
         List<BookTypeEto> list = null;
         try{
             list = namedParameterJdbcTemplate.query(sql, new BeanPropertyRowMapper<>(BookTypeEto.class));

mhotel/src/com/happy/dto/HouseSumEto.java

@@ -12,6 +12,8 @@ public class HouseSumEto {
     private Integer houseLockNum;
     //预定房数
     private Integer houseDueNum;
+    //入住房数
+    private Integer houseCheckNum;
     //剩余房数
     private Integer houseResidueNum;
     //总房数
@@ -59,6 +61,14 @@ public class HouseSumEto {
         this.houseDueNum = houseDueNum;
     }
 
+    public Integer getHouseCheckNum() {
+        return houseCheckNum;
+    }
+
+    public void setHouseCheckNum(Integer houseCheckNum) {
+        this.houseCheckNum = houseCheckNum;
+    }
+
     public Integer getHouseResidueNum() {
         return houseResidueNum;
     }