|
|
@@ -342,7 +342,7 @@ public class StoreApplyServiceImpl implements StoreApplyService {
|
|
|
if (!StringUtils.isEmpty(endTime) && StringUtils.isEmpty(startTime)) {
|
|
|
sql.append(" where date(pr_create_time) <= '" + new java.sql.Date(endTime.getTime()) + "' ");
|
|
|
}
|
|
|
- sql.append(" group by pr_enuu) p on p.pr_enuu = a.apply_store_enuu where a.apply_status='PASS' "
|
|
|
+ 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() + ","
|
|
|
+ pageable.getPageSize());
|
|
|
StringBuilder totalSql = new StringBuilder("select count(1) from `store$apply` a left join (select pr_enuu, count(1) count from products ");
|
|
|
@@ -355,7 +355,7 @@ public class StoreApplyServiceImpl implements StoreApplyService {
|
|
|
if (!StringUtils.isEmpty(endTime) && StringUtils.isEmpty(startTime)) {
|
|
|
totalSql.append(" where date(pr_create_time) <= '" + new java.sql.Date(endTime.getTime()) + "' ");
|
|
|
}
|
|
|
- totalSql.append(" group by pr_enuu) p on p.pr_enuu = a.apply_store_enuu where a.apply_status='PASS' ");
|
|
|
+ totalSql.append(" group by pr_enuu) p on p.pr_enuu = a.apply_store_enuu where a.apply_status='PASS' and count > 0 ");
|
|
|
Integer total = commonDao.queryForObject(totalSql.toString(), Integer.class);
|
|
|
List<StoreInfoAndProdExport> exports = commonDao.query(sql.toString(), StoreInfoAndProdExport.class);
|
|
|
return new com.uas.sso.support.Page<>(pageable.getPageNumber(), pageable.getPageSize(), exports, total);
|
|
|
@@ -375,7 +375,7 @@ public class StoreApplyServiceImpl implements StoreApplyService {
|
|
|
if (!StringUtils.isEmpty(endTime) && StringUtils.isEmpty(startTime)) {
|
|
|
sql.append(" where date(pr_create_time) <= '" + new java.sql.Date(endTime.getTime()) + "' ");
|
|
|
}
|
|
|
- sql.append(" group by pr_enuu) p on p.pr_enuu = a.apply_store_enuu where a.apply_status='PASS' "
|
|
|
+ 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 ");
|
|
|
return commonDao.query(sql.toString(), StoreInfoAndProdExport.class);
|
|
|
}
|