时间过滤更新

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

@@ -347,12 +347,9 @@ public class StoreApplyServiceImpl implements StoreApplyService {
 		if (!StringUtils.isEmpty(startTime)) {
 			sql.append(" and pr_create_time >= '" + new java.sql.Date(startTime.getTime()) + "'");
 		}
-		if (!StringUtils.isEmpty(endTime) && StringUtils.isEmpty(startTime)) {
+		if (!StringUtils.isEmpty(endTime)) {
 			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()) + "' ");
-        }
 		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());
@@ -361,7 +358,7 @@ public class StoreApplyServiceImpl implements StoreApplyService {
 		if (!StringUtils.isEmpty(startTime)) {
 			totalSql.append(" and pr_create_time >= '" + new java.sql.Date(startTime.getTime()) + "'");
 		}
-        if (!StringUtils.isEmpty(endTime) && StringUtils.isEmpty(startTime)) {
+        if (!StringUtils.isEmpty(endTime)) {
             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 ");