Merge branch 'hotfix-yuj-1105' into dev

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

@@ -346,19 +346,25 @@ public class StoreApplyServiceImpl implements StoreApplyService {
 		if (!StringUtils.isEmpty(startTime)) {
 			sql.append(" where pr_create_time >= '" + new java.sql.Date(startTime.getTime()) + "'");
 		}
-		if (!StringUtils.isEmpty(endTime)) {
+		if (!StringUtils.isEmpty(endTime) && StringUtils.isEmpty(startTime)) {
 			sql.append(" where 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()) + "' ");
+        }
 		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 ");
 		if (!StringUtils.isEmpty(startTime)) {
 			totalSql.append(" where pr_create_time >= '" + new java.sql.Date(startTime.getTime()) + "'");
 		}
-		if (!StringUtils.isEmpty(endTime)) {
-			totalSql.append(" and pr_create_time < '" + new java.sql.Date(endTime.getTime() + IntegerConstant.ONE_DAY_MILLISECONDS) + "' ");
+		if (!StringUtils.isEmpty(endTime) && !StringUtils.isEmpty(startTime)) {
+            totalSql.append(" and pr_create_time < '" + new java.sql.Date(endTime.getTime() + IntegerConstant.ONE_DAY_MILLISECONDS) + "' ");
 		}
+        if (!StringUtils.isEmpty(endTime) && StringUtils.isEmpty(startTime)) {
+            sql.append(" where 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);
 		List<StoreInfoAndProdExport> exports = commonDao.query(sql.toString(), StoreInfoAndProdExport.class);