|
|
@@ -211,8 +211,8 @@ public class bookAction extends ActionSupport implements ServletRequestAware {
|
|
|
s1.append(" and order_status = ").append(orderStatus);
|
|
|
}
|
|
|
if(payStartTime!=null && payEndTime!=null){
|
|
|
- s1.append(" and pay_time >= '").append(payStartTime).append("'")
|
|
|
- .append(" and pay_time <= '").append(payEndTime).append("'");
|
|
|
+ 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("'");
|
|
|
}
|
|
|
IPage<Booking> bookIPage = bookService.queryPage(s1.toString(),page,rows);
|
|
|
//获取订单汇总信息
|
|
|
@@ -255,8 +255,8 @@ public class bookAction extends ActionSupport implements ServletRequestAware {
|
|
|
s1.append(" and order_status = ").append(orderStatus);
|
|
|
}
|
|
|
if(payStartTime!=null && payEndTime!=null){
|
|
|
- s1.append(" and pay_time >= '").append(payStartTime).append("'")
|
|
|
- .append(" and pay_time <= '").append(payEndTime).append("'");
|
|
|
+ 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("'");
|
|
|
}
|
|
|
|
|
|
List<Booking> list = bookService.queryList(s1.toString()); // 查询分页
|
|
|
@@ -326,8 +326,8 @@ public class bookAction extends ActionSupport implements ServletRequestAware {
|
|
|
.append(" or user_phone like '%").append(ledgerParam).append("%')");
|
|
|
}
|
|
|
if(payStartTime!=null && payEndTime!=null){
|
|
|
- s1.append(" and pay_time >= '").append(payStartTime).append("'")
|
|
|
- .append(" and pay_time <= '").append(payEndTime).append("'");
|
|
|
+ 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("'");
|
|
|
}
|
|
|
if(hotelTownship!=null){
|
|
|
s1.append(" and hotel_township = '").append(hotelTownship).append("'");
|
|
|
@@ -397,8 +397,8 @@ public class bookAction extends ActionSupport implements ServletRequestAware {
|
|
|
.append(" or user_phone like '%").append(ledgerParam).append("%')");
|
|
|
}
|
|
|
if(payStartTime!=null && payEndTime!=null){
|
|
|
- s1.append(" and pay_time >= '").append(payStartTime).append("'")
|
|
|
- .append(" and pay_time <= '").append(payEndTime).append("'");
|
|
|
+ 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("'");
|
|
|
}
|
|
|
if(hotelTownship!=null){
|
|
|
s1.append(" and hotel_township = '").append(payStartTime).append("'");
|
|
|
@@ -472,8 +472,8 @@ public class bookAction extends ActionSupport implements ServletRequestAware {
|
|
|
.append(" or user_phone like '%").append(ledgerParam).append("%')");
|
|
|
}
|
|
|
if(payStartTime!=null && payEndTime!=null){
|
|
|
- s1.append(" and pay_time >= '").append(payStartTime).append("'")
|
|
|
- .append(" and pay_time <= '").append(payEndTime).append("'");
|
|
|
+ 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("'");
|
|
|
}
|
|
|
if(hotelTownship!=null){
|
|
|
s1.append(" and hotel_township = '").append(payStartTime).append("'");
|