合并代码

src/main/java/com/uas/platform/b2c/prod/store/service/impl/StoreApplyServiceImpl.java

@@ -340,14 +340,15 @@ public class StoreApplyServiceImpl implements StoreApplyService {
 		if (pageable == null) {
 			return null;
 		}
+		// 统计数据
 		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) && StringUtils.isEmpty(startTime)) {
-			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) + "' ");
 		}
         if (!StringUtils.isEmpty(endTime) && !StringUtils.isEmpty(startTime)) {
             sql.append(" and pr_create_time <= '" + new java.sql.Date(endTime.getTime()) + "' ");
@@ -355,15 +356,13 @@ public class StoreApplyServiceImpl implements StoreApplyService {
 		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 ");
+        // 统计总数
+        StringBuilder totalSql = new StringBuilder("select count(1) from `store$apply` a left join (select pr_enuu, count(1) count from products where 1=1");
 		if (!StringUtils.isEmpty(startTime)) {
-			totalSql.append(" where pr_create_time >= '" + new java.sql.Date(startTime.getTime()) + "'");
-		}
-		if (!StringUtils.isEmpty(endTime) && !StringUtils.isEmpty(startTime)) {
-            totalSql.append(" and pr_create_time < '" + new java.sql.Date(endTime.getTime() + IntegerConstant.ONE_DAY_MILLISECONDS) + "' ");
+			totalSql.append(" and pr_create_time >= '" + new java.sql.Date(startTime.getTime()) + "'");
 		}
         if (!StringUtils.isEmpty(endTime) && StringUtils.isEmpty(startTime)) {
-            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) + "' ");
         }
 		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);