查询修改

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

@@ -462,12 +462,13 @@ public class bookAction extends ActionSupport implements ServletRequestAware {
         }
         if (ledgerParam!=null){
             s1.append(" and (order_num like '%").append(ledgerParam).append("%'")
+                .append(" or hotel_name like '%").append(ledgerParam).append("%'")//民宿名称
                 .append(" or user_name like '%").append(ledgerParam).append("%'")
                 .append(" or user_phone like '%").append(ledgerParam).append("%')");
         }
         if(payStartTime!=null && payEndTime!=null){
-            s1.append(" and DATE_FORMAT(pay_time,'%Y-%m-%d') >= '").append(payStartTime).append("'")
-                    .append(" and DATE_FORMAT(pay_time,'%Y-%m-%d') <= '").append(payEndTime).append("'");
+            s1.append(" and DATE_FORMAT(check_out_time,'%Y-%m-%d') >= '").append(payStartTime).append("'")
+                    .append(" and DATE_FORMAT(check_out_time,'%Y-%m-%d') <= '").append(payEndTime).append("'");
         }
         if(hotelTownship!=null){
             s1.append(" and hotel_township = '").append(hotelTownship).append("'");

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

@@ -57,6 +57,9 @@ public class bookComplainAction extends BaseController implements ServletRequest
         if (status != null){
             s1.append(" and a.status = ").append(status).append(" ");
             s2.append(" and a.status = ").append(status).append(" ");
+        }else{
+            s1.append(" and a.status != 0").append(" ");
+            s2.append(" and a.status != 0").append(" ");
         }
         if (complainStartTime != null){
             s1.append(" and DATE_FORMAT(a.create_date, '%Y-%m-%d') >= '").append(complainStartTime).append("' ");

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

@@ -221,7 +221,10 @@ public class BookImplDao implements BookDao {
         SqlUtil.filterKeyword(sqlx);
 
         int start = (page - 1) * rows;// 每页的起始下标
-        String sql = "SELECT a.*,b.name hotel_township_name,c.hstatus hstatus,c.status hotelStatus FROM (select "+selectCol+" from booking) a left join hotel_dict b on a.hotel_township = b.id left join hotel c on a.hotel_id = c.id WHERE 1=1 "+sqlx+" ORDER BY " +orderDesc+ " DESC limit :start,:rows ";
+        String sql = "SELECT a.*,b.name hotel_township_name,c.hstatus hstatus,c.status hotelStatus FROM (select "+selectCol+" from booking) a " +
+                     "left join hotel_dict b on a.hotel_township = b.id " + "" +
+                     "left join hotel c on a.hotel_id = c.id " +
+                     "WHERE 1=1 "+sqlx+" ORDER BY " +orderDesc+ " DESC limit :start,:rows ";
         MapSqlParameterSource sps = new MapSqlParameterSource();
         sps.addValue("start", start);
         sps.addValue("rows", rows);

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

@@ -53,11 +53,22 @@ public class BookingComplainImplDao implements BookingComplainDao {
             " left join users u on a.create_id = u.id " +
             " where a.status != 0 ";
 
+
+    private String selectLeftSql1 = "select " +
+            " bk.order_num,u.user_phone as complainPhone,m.corpn_phone as hotelPhone,a.id,a.booking_id,a.hotel_id,a.house_id,a.title,a.content,a.create_id,a.create_date,a.modify_date,/*a.status,*/h.h_name as house_name,h2.hname as hotel_name,(SELECT bcp.progress_type FROM booking_complaint_progress bcp WHERE bcp.complaint_id = a.id ORDER BY bcp.create_date DESC LIMIT 1 ) AS status" +
+            " from booking_complaint a " +
+            " left join house h on a.house_id = h.id " +
+            " left join hotel h2 on a.hotel_id = h2.id "+
+            " left join booking bk on a.booking_id = bk.id"+
+            " left join admin_manager m on h2.manager_id = m.id " +
+            " left join users u on a.create_id = u.id " +
+            " where 1=1 ";
+
     @Override
     public List<BookingComplaintVo> queryPage(String sqlx, int page, int rows) {
         SqlUtil.filterKeyword(sqlx);
         int start = (page - 1) * rows;// 每页的起始下标
-        String sql = selectLeftSql + sqlx + "and a.status != 0"  +" ORDER BY a.create_date DESC limit :start,:rows ";
+        String sql = selectLeftSql1 + sqlx +" ORDER BY a.create_date DESC limit :start,:rows ";
         MapSqlParameterSource sps = new MapSqlParameterSource();
         sps.addValue("start", start);
         sps.addValue("rows", rows);
@@ -80,7 +91,7 @@ public class BookingComplainImplDao implements BookingComplainDao {
     @Override
     public int queryTotal(String sqlx) {
         SqlUtil.filterKeyword(sqlx);
-        String sql = "SELECT count(*) FROM ("+ selectSql +") a where status != 0 "+sqlx;
+        String sql = "SELECT count(*) FROM ("+ selectSql +") a where 1=1 "+sqlx;
         MapSqlParameterSource sps = new MapSqlParameterSource();
         return namedParameterJdbcTemplate.queryForInt(sql, sps);
     }

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

@@ -97,7 +97,7 @@ public class HouseNumberImplDao implements HouseNumberDao {
     }
 
     /**
-     * »ñÈ¡Èëס·¿¼ä
+     * ??????
      */
     @Override
     public List<HouseNumber> queryCheckRoom(Booking book) {