夏文涛 2 lat temu
rodzic
commit
07f2cf353a

+ 8 - 11
mhotel/src/com/happy/action/bookComplainAction.java

@@ -43,30 +43,27 @@ public class bookComplainAction extends BaseController implements ServletRequest
         StringBuilder s1 = new StringBuilder("");
         StringBuilder s2 = new StringBuilder("");
         if (keywords != null){
-            s1.append(" and (a.id like '%").append(keywords).append("%'");
+            s1.append(" and (t.id like '%").append(keywords).append("%'");
             s2.append(" and (a.id like '%").append(keywords).append("%'");
-            s1.append(" or title like '%").append(keywords).append("%'");
+            s1.append(" or t.title like '%").append(keywords).append("%'");
             s2.append(" or a.title like '%").append(keywords).append("%'");
-            s1.append(" or content like '%").append(keywords).append("%'");
+            s1.append(" or t.content like '%").append(keywords).append("%'");
             s2.append(" or a.content like '%").append(keywords).append("%'");
-            s1.append(" or booking_id = '").append(keywords).append("' ");
+            s1.append(" or t.booking_id = '").append(keywords).append("' ");
             s2.append(" or a.booking_id = '").append(keywords).append("' ");
-            s1.append(" or h2.hname like '%").append(keywords).append("%')");
+            s1.append(" or t.hname like '%").append(keywords).append("%')");
             s2.append(" or a.hotel_name like '%").append(keywords).append("%')");
         }
         if (status != null){
-            s1.append(" and a.status = ").append(status).append(" ");
+            s1.append(" and t.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("' ");
+            s1.append(" and DATE_FORMAT(t.create_date, '%Y-%m-%d') >= '").append(complainStartTime).append("' ");
             s2.append(" and DATE_FORMAT(create_date, '%Y-%m-%d') >= '").append(complainStartTime).append("' ");
         }
         if (complainStartTime != null){
-            s1.append(" and DATE_FORMAT(a.create_date, '%Y-%m-%d') <= '").append(complainEndTime).append("' ");
+            s1.append(" and DATE_FORMAT(t.create_date, '%Y-%m-%d') <= '").append(complainEndTime).append("' ");
             s2.append(" and DATE_FORMAT(create_date, '%Y-%m-%d') <= '").append(complainEndTime).append("' ");
         }
         IPage<BookingComplaintVo> bookingComplaintIPage = bookingComplaintService.queryPage(s1.toString(),s2.toString(), page, rows);

+ 4 - 4
mhotel/src/com/happy/dao/impl/BookingComplainImplDao.java

@@ -54,21 +54,21 @@ public class BookingComplainImplDao implements BookingComplainDao {
             " where a.status != 0 ";
 
 
-    private String selectLeftSql1 = "select " +
+    private String selectLeftSql1 = "select * from (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 " +
+            " left join users u on a.create_id = u.id ) t" +
             " where 1=1 ";
 
     @Override
     public List<BookingComplaintVo> queryPage(String sqlx, int page, int rows) {
         SqlUtil.filterKeyword(sqlx);
         int start = (page - 1) * rows;// 每页的起始下标
-        String sql = selectLeftSql1 + sqlx +" ORDER BY a.create_date DESC limit :start,:rows ";
+        String sql = selectLeftSql1 + sqlx +" ORDER BY t.create_date DESC limit :start,:rows ";
         MapSqlParameterSource sps = new MapSqlParameterSource();
         sps.addValue("start", start);
         sps.addValue("rows", rows);
@@ -91,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 1=1 "+sqlx;
+        String sql = "SELECT count(*) FROM ("+ selectLeftSql1 +") a where 1=1 "+sqlx;
         MapSqlParameterSource sps = new MapSqlParameterSource();
         return namedParameterJdbcTemplate.queryForInt(sql, sps);
     }