WxxyDeveloper/JSL_OrganizeInternalOA
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 推送至业务 #17

Merged
XiaoLFeng merged 46 commits from develop into master 2024-04-17 00:55:37 +08:00
Conversation 0 Commits 46 Files Changed 116 +19 -25
1 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cb1d61da88 - Show all commits

44
src/main/java/com/jsl/oa/services/impl/ReviewServiceImpl.java
View File

@ -1,8 +1,6 @@
package com.jsl.oa.services.impl; package com.jsl.oa.services.impl;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.jsl.oa.common.constant.ReviewConstants; import com.jsl.oa.common.constant.ReviewConstants;
import com.jsl.oa.dao.ProjectDAO; import com.jsl.oa.dao.ProjectDAO;
import com.jsl.oa.dao.ReviewDAO; import com.jsl.oa.dao.ReviewDAO;
@ -111,10 +109,7 @@ public class ReviewServiceImpl implements ReviewService {
List<ReviewVO> result = encapsulateArrayClass(reviewData); List<ReviewVO> result = encapsulateArrayClass(reviewData);
//封装结果类与数据总数 //封装结果类与数据总数
int total = result.size(); ReviewDataVO reviewDataVO = getReviewsByPage(result, page, pageSize);
ReviewDataVO reviewDataVO = new ReviewDataVO();
reviewDataVO.setReviews(result);
reviewDataVO.setDataTotal(total);
return ResultUtil.success(reviewDataVO); return ResultUtil.success(reviewDataVO);
} }
@ -182,10 +177,7 @@ public class ReviewServiceImpl implements ReviewService {
List<ReviewVO> result = encapsulateArrayClass(reviewData); List<ReviewVO> result = encapsulateArrayClass(reviewData);
//封装结果类与数据总数 //封装结果类与数据总数
int total = result.size(); ReviewDataVO reviewDataVO = getReviewsByPage(result, page, pageSize);
ReviewDataVO reviewDataVO = new ReviewDataVO();
reviewDataVO.setReviews(result);
reviewDataVO.setDataTotal(total);
return ResultUtil.success(reviewDataVO); return ResultUtil.success(reviewDataVO);
} }
@ -264,13 +256,9 @@ public class ReviewServiceImpl implements ReviewService {
// 根据内容筛选 // 根据内容筛选
if (content == null || content.equals("")) { if (content == null || content.equals("")) {
// 使用PageHelper进行分页 //封装结果类与数据总数
PageHelper.startPage(page, pageSize); ReviewDataVO reviewDataVO = getReviewsByPage(reviewVOS, page, pageSize);
PageInfo<ReviewVO> pageInfo1 = new PageInfo<>(reviewVOS);
int total = reviewVOS.size();
ReviewDataVO reviewDataVO = new ReviewDataVO();
reviewDataVO.setReviews(pageInfo1.getList());
reviewDataVO.setDataTotal(total);
return ResultUtil.success(reviewDataVO); return ResultUtil.success(reviewDataVO);
} else { } else {
reviewVOS = reviewVOS.stream() reviewVOS = reviewVOS.stream()
@ -278,16 +266,9 @@ public class ReviewServiceImpl implements ReviewService {
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
// 使用PageHelper进行分页
PageHelper.startPage(page, pageSize);
PageInfo<ReviewVO> pageInfo = new PageInfo<>(reviewVOS);
//封装结果类与数据总数 //封装结果类与数据总数
int total = (int) pageInfo.getTotal(); ReviewDataVO reviewDataVO = getReviewsByPage(reviewVOS, page, pageSize);
ReviewDataVO reviewDataVO = new ReviewDataVO();
reviewDataVO.setReviews(pageInfo.getList());
reviewDataVO.setDataTotal(total);
return ResultUtil.success(reviewDataVO); return ResultUtil.success(reviewDataVO);
} }
@ -456,6 +437,19 @@ public class ReviewServiceImpl implements ReviewService {
return encapsulateArrayClass(reviewData); return encapsulateArrayClass(reviewData);
} }
public ReviewDataVO getReviewsByPage(List<ReviewVO> allReviews, int page, int pageSize) {
ReviewDataVO reviewDataVO = new ReviewDataVO();
int total = allReviews.size();
int startIndex = (page - 1) * pageSize;
int endIndex = Math.min(startIndex + pageSize, total);
List<ReviewVO> reviewsOnPage = allReviews.subList(startIndex, endIndex);
reviewDataVO.setReviews(reviewsOnPage);
reviewDataVO.setDataTotal(total);
return reviewDataVO;
}
} }