|
|
@@ -342,12 +342,12 @@ public class StoreApplyServiceImpl implements StoreApplyService {
|
|
|
}
|
|
|
StringBuilder sql = new StringBuilder("select a.apply_create_time applyTime, a.apply_store_name storeName, "
|
|
|
+ "a.apply_store_enuu enuu,a.apply_auth_time agreeTime, a.apply_auth_person_name agreeName, "
|
|
|
- + "ifnull(p.count, 0) count from `store$apply` a left join (select pr_enuu, count(1) count from products");
|
|
|
+ + "ifnull(p.count, 0) count from `store$apply` a left join (select pr_enuu, count(1) count from products where 1=1 ");
|
|
|
if (!StringUtils.isEmpty(startTime)) {
|
|
|
- sql.append(" where pr_create_time >= '" + new java.sql.Date(startTime.getTime()) + "'");
|
|
|
+ sql.append(" and pr_create_time >= '" + new java.sql.Date(startTime.getTime()) + "'");
|
|
|
}
|
|
|
if (!StringUtils.isEmpty(endTime)) {
|
|
|
- sql.append(" where pr_create_time < '" + new java.sql.Date(endTime.getTime() + IntegerConstant.ONE_DAY_MILLISECONDS) + "' ");
|
|
|
+ sql.append(" and pr_create_time < '" + new java.sql.Date(endTime.getTime() + IntegerConstant.ONE_DAY_MILLISECONDS) + "' ");
|
|
|
}
|
|
|
sql.append(" group by pr_enuu) p on p.pr_enuu = a.apply_store_enuu where a.apply_status='PASS' and count > 0 "
|
|
|
+ "order by a.apply_create_time limit " + (pageable.getPageNumber() - 1) * pageable.getPageSize() + ","
|
hejq