发货提醒条件过滤更新

src/main/java/com/uas/platform/b2b/controller/SaleNoticeController.java

@@ -129,6 +129,7 @@ public class SaleNoticeController {
 		}
 		pageParams.getFilters().put("pn_status", Status.NOT_REPLY.value());
 		pageParams.getFilters().put("is_waiting", (short) Constant.NO);
+		pageParams.getFilters().put("pn_end", (short) Constant.NO);
 		if (fromDate != null) {
 			pageParams.getFilters().put(SearchConstants.FROM_DATE_KEY, fromDate);
 		}

src/main/java/com/uas/platform/b2b/service/impl/PurchaseNoticeServiceImpl.java

@@ -13,6 +13,7 @@ import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.ProductUsersService;
 import com.uas.platform.b2b.service.PurchaseNoticeService;
+import com.uas.platform.b2b.support.SPageUtils;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.UsageBufferedLogger;
 import com.uas.platform.b2b.support.XingePusher;
@@ -213,16 +214,11 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
 						pageInfo.expression(PredicateUtils.lte("date", new Date(filter.getEndDate()), false));
 					}
 				}
+				pageInfo.expression(PredicateUtils.isNull("end"));
 				return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
 			}
 		}, pageInfo);
-		SPage<PurchaseNotice> noticeSpage = new SPage<>();
-		noticeSpage.setContent(notices.getContent());
-		noticeSpage.setPage(notices.getNumber());
-		noticeSpage.setSize(notices.getSize());
-		noticeSpage.setTotalElement(notices.getTotalElements());
-		noticeSpage.setTotalPage(notices.getTotalPages());
-		return noticeSpage;
+		return SPageUtils.covertSPage(notices);
 	}
 
 	@Override