合作伙伴分页处理

sso-server/src/main/java/com/uas/sso/controller/PartnershipManagerController.java

@@ -45,9 +45,9 @@ public class PartnershipManagerController extends BaseController {
 	 * @return
 	 */
 	@RequestMapping(params = "_operate=getAllRequest")
-	public Page<PartnershipRecord> getAllRequest(String businessCode, Integer statusCode, String keyword,
-												 @RequestParam(defaultValue = "0") int pageNumber, @RequestParam(defaultValue = "20") int pageSize) {
-		return partnershipService.findByBusinessCodeAndStatusCode(businessCode, statusCode, keyword, pageNumber, pageSize);
+	public ModelMap getAllRequest(String businessCode, Integer statusCode, String keyword,
+												 @RequestParam(defaultValue = "1") int pageNumber, @RequestParam(defaultValue = "20") int pageSize) {
+        return success(partnershipService.findByBusinessCodeAndStatusCode(businessCode, statusCode, keyword, pageNumber, pageSize));
 	}
 
 //	/**

sso-server/src/main/java/com/uas/sso/service/impl/PartnershipServiceImpl.java

@@ -103,37 +103,38 @@ public class PartnershipServiceImpl implements PartnershipService {
 	}
 
 	@Override
-	public Page<PartnershipRecord> findAllSendUnAudit(String name, String businessCode, String custUserName,
-													  int pageNumber, int pageSize) {
+	public Page<PartnershipRecord> findAllSendUnAudit(final String name, final String businessCode, final String custUserName,
+                                                      int pageNumber, int pageSize) {
 		UserAccount loginUser = SystemSession.getUserAccount();
 		if (loginUser == null) {
 			throw new VisibleError("未检测到当前用户信息，请先通过UAS系统或商务平台登录");
 		}
-		Pageable pageable = new PageRequest(pageNumber, pageSize);
-		return partnershipRecordDao.findAll(new Specification<PartnershipRecord>() {
-			@Override
-			public Predicate toPredicate(Root<PartnershipRecord> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
-				List<Predicate> list = new ArrayList<>();
-				list.add(cb.equal(root.join("vendSpace", JoinType.INNER).get("spaceName").as(String.class), name));
-				list.add(cb.equal(root.join("vendSpace", JoinType.INNER).get("businessCode").as(String.class), businessCode));
-				list.add(cb.equal(root.join("custSpace", JoinType.INNER).get("spaceName").as(String.class), custUserName));
-				list.add(cb.equal(root.get("status").as(Short.class), Status.UNAUDIT.getCode()));
-				Predicate[] predicates = new Predicate[list.size()];
-				predicates = list.toArray(predicates);
-				return cb.and(predicates);
-			}
-		}, pageable);
-	}
+		Pageable pageable = PageInfo.pageRequest(pageNumber, pageSize);
+        Page<PartnershipRecord> pages = partnershipRecordDao.findAll(new Specification<PartnershipRecord>() {
+            @Override
+            public Predicate toPredicate(Root<PartnershipRecord> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
+                List<Predicate> list = new ArrayList<>();
+                list.add(cb.equal(root.join("vendSpace", JoinType.INNER).get("spaceName").as(String.class), name));
+                list.add(cb.equal(root.join("vendSpace", JoinType.INNER).get("businessCode").as(String.class), businessCode));
+                list.add(cb.equal(root.join("custSpace", JoinType.INNER).get("spaceName").as(String.class), custUserName));
+                list.add(cb.equal(root.get("status").as(Short.class), Status.UNAUDIT.getCode()));
+                Predicate[] predicates = new Predicate[list.size()];
+                predicates = list.toArray(predicates);
+                return cb.and(predicates);
+            }
+        }, pageable);
+        return new PageInfo<PartnershipRecord>(pages.getContent(), pageable, pages.getTotalElements());
+    }
 
 	@Override
-	public Page<PartnershipRecord> findAllSendEnable(String name, String businessCode, String custUserName,
-			int pageNumber, int pageSize) {
+	public Page<PartnershipRecord> findAllSendEnable(final String name, final String businessCode, final String custUserName,
+                                                     int pageNumber, int pageSize) {
 		UserAccount loginUser = SystemSession.getUserAccount();
 		if (loginUser == null) {
 			throw new VisibleError("未检测到当前用户信息，请先通过UAS系统或商务平台登录");
 		}
-		Pageable pageable = new PageRequest(pageNumber, pageSize);
-		return partnershipRecordDao.findAll(new Specification<PartnershipRecord>() {
+        Pageable pageable = PageInfo.pageRequest(pageNumber, pageSize);
+        Page<PartnershipRecord> pages = partnershipRecordDao.findAll(new Specification<PartnershipRecord>() {
 			@Override
 			public Predicate toPredicate(Root<PartnershipRecord> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
 				List<Predicate> list = new ArrayList<>();
@@ -146,40 +147,42 @@ public class PartnershipServiceImpl implements PartnershipService {
 				return cb.and(predicates);
 			}
 		}, pageable);
+        return new PageInfo<PartnershipRecord>(pages.getContent(), pageable, pages.getTotalElements());
 	}
 
 	@Override
-	public Page<PartnershipRecord> findAllSendUnApply(String name, String businessCode, String custUserName,
-			int pageNumber, int pageSize) {
+	public Page<PartnershipRecord> findAllSendUnApply(final String name, final String businessCode, final String custUserName,
+                                                      int pageNumber, int pageSize) {
 		UserAccount loginUser = SystemSession.getUserAccount();
 		if (loginUser == null) {
 			throw new VisibleError("未检测到当前用户信息，请先通过UAS系统或商务平台登录");
 		}
-		Pageable pageable = new PageRequest(pageNumber, pageSize);
-		return partnershipRecordDao.findAll(new Specification<PartnershipRecord>() {
-			@Override
-			public Predicate toPredicate(Root<PartnershipRecord> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
-				List<Predicate> list = new ArrayList<>();
-				list.add(cb.equal(root.join("vendSpace", JoinType.INNER).get("spaceName").as(String.class), name));
-				list.add(cb.equal(root.join("vendSpace", JoinType.INNER).get("businessCode").as(String.class), businessCode));
-				list.add(cb.equal(root.join("custSpace", JoinType.INNER).get("spaceName").as(String.class), custUserName));
-				list.add(cb.equal(root.get("status").as(Short.class), Status.UNAPPLY.getCode()));
-				Predicate[] predicates = new Predicate[list.size()];
-				predicates = list.toArray(predicates);
-				return cb.and(predicates);
-			}
-		}, pageable);
-	}
+		Pageable pageable = PageInfo.pageRequest(pageNumber, pageSize);
+        Page<PartnershipRecord> pages = partnershipRecordDao.findAll(new Specification<PartnershipRecord>() {
+            @Override
+            public Predicate toPredicate(Root<PartnershipRecord> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
+                List<Predicate> list = new ArrayList<>();
+                list.add(cb.equal(root.join("vendSpace", JoinType.INNER).get("spaceName").as(String.class), name));
+                list.add(cb.equal(root.join("vendSpace", JoinType.INNER).get("businessCode").as(String.class), businessCode));
+                list.add(cb.equal(root.join("custSpace", JoinType.INNER).get("spaceName").as(String.class), custUserName));
+                list.add(cb.equal(root.get("status").as(Short.class), Status.UNAPPLY.getCode()));
+                Predicate[] predicates = new Predicate[list.size()];
+                predicates = list.toArray(predicates);
+                return cb.and(predicates);
+            }
+        }, pageable);
+        return new PageInfo<PartnershipRecord>(pages.getContent(), pageable, pages.getTotalElements());
+    }
 
 	@Override
-	public Page<PartnershipRecord> findAllReceivedUnAudit(String name, String businessCode, String custUserName,
-			int pageNumber, int pageSize) {
+	public Page<PartnershipRecord> findAllReceivedUnAudit(final String name, final String businessCode, final String custUserName,
+                                                          int pageNumber, int pageSize) {
 		UserAccount loginUser = SystemSession.getUserAccount();
 		if (loginUser == null) {
 			throw new VisibleError("未检测到当前用户信息，请先通过UAS系统或商务平台登录");
 		}
-		Pageable pageable = new PageRequest(pageNumber, pageSize);
-		return partnershipRecordDao.findAll(new Specification<PartnershipRecord>() {
+        Pageable pageable = PageInfo.pageRequest(pageNumber, pageSize);
+        Page<PartnershipRecord> pages = partnershipRecordDao.findAll(new Specification<PartnershipRecord>() {
 			@Override
 			public Predicate toPredicate(Root<PartnershipRecord> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
 				List<Predicate> list = new ArrayList<>();
@@ -192,6 +195,7 @@ public class PartnershipServiceImpl implements PartnershipService {
 				return cb.and(predicates);
 			}
 		}, pageable);
+        return new PageInfo<PartnershipRecord>(pages.getContent(), pageable, pages.getTotalElements());
 	}
 
 	//
@@ -324,10 +328,10 @@ public class PartnershipServiceImpl implements PartnershipService {
 //	}
 //
 	@Override
-	public Page<PartnershipRecord> findByBusinessCodeAndStatusCode(String businessCode, Integer statusCode, String keyword,
-															   int pageNumber, int pageSize) {
-		Pageable pageable = new PageRequest(pageNumber, pageSize);
-		return partnershipRecordDao.findAll(new Specification<PartnershipRecord>() {
+	public Page<PartnershipRecord> findByBusinessCodeAndStatusCode(final String businessCode, final Integer statusCode, final String keyword,
+                                                                   int pageNumber, int pageSize) {
+		Pageable pageable = PageInfo.pageRequest(pageNumber, pageSize);
+		Page<PartnershipRecord> pages = partnershipRecordDao.findAll(new Specification<PartnershipRecord>() {
 			@Override
 			public Predicate toPredicate(Root<PartnershipRecord> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
 				// 添加排序
@@ -389,6 +393,7 @@ public class PartnershipServiceImpl implements PartnershipService {
 				return query.getRestriction();
 			}
 		}, pageable);
+        return new PageInfo<PartnershipRecord>(pages.getContent(), pageable, pages.getTotalElements());
 	}
 //
 //	@Override