|
|
@@ -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);
|