diff --git a/src/main/java/com/jsl/oa/controllers/ReviewController.java b/src/main/java/com/jsl/oa/controllers/ReviewController.java index 563249d..7432a56 100644 --- a/src/main/java/com/jsl/oa/controllers/ReviewController.java +++ b/src/main/java/com/jsl/oa/controllers/ReviewController.java @@ -91,14 +91,23 @@ public class ReviewController { } - @GetMapping("/review/search") + @GetMapping("/review/searchMyReview") public BaseResponse searchReview(String content, - Short statue, HttpServletRequest request, @RequestParam Integer page, @RequestParam Integer pageSize) { - log.info("请求接口[GET]: /review/search"); - return reviewService.searchReview(content, statue, request, page, pageSize); + log.info("请求接口[GET]: /review/searchMyReview"); + return reviewService.searchReview(content, request, page, pageSize); + } + + @GetMapping("/review/searchReviewRecords") + public BaseResponse searchReviewRecords(String content, + Short statue, + HttpServletRequest request, + @RequestParam Integer page, + @RequestParam Integer pageSize) { + log.info("请求接口[GET]: /review/searchReviewRecords"); + return reviewService.searchReviewRecords(content, statue, request, page, pageSize); } } diff --git a/src/main/java/com/jsl/oa/services/ReviewService.java b/src/main/java/com/jsl/oa/services/ReviewService.java index bbcfc39..11fb825 100644 --- a/src/main/java/com/jsl/oa/services/ReviewService.java +++ b/src/main/java/com/jsl/oa/services/ReviewService.java @@ -17,5 +17,11 @@ public interface ReviewService { BaseResponse updateReviewResult(ReviewUpdateResultVO reviewUpdateResultVOVO, HttpServletRequest request); - BaseResponse searchReview(String content, Short statue, HttpServletRequest request, Integer page, Integer pageSize); + BaseResponse searchReview(String content, HttpServletRequest request, Integer page, Integer pageSize); + + BaseResponse searchReviewRecords(String content, + Short statue, + HttpServletRequest request, + Integer page, + Integer pageSize); } diff --git a/src/main/java/com/jsl/oa/services/impl/ReviewServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/ReviewServiceImpl.java index c7b6700..d3a6abb 100644 --- a/src/main/java/com/jsl/oa/services/impl/ReviewServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/ReviewServiceImpl.java @@ -257,20 +257,11 @@ public class ReviewServiceImpl implements ReviewService { @Override public BaseResponse searchReview(String content, - Short statue, HttpServletRequest request, Integer page, Integer pageSize) { - List reviewVOS = new ArrayList<>(); - -// 根据判断结果筛选 - if (statue == null || statue.equals("")) { - List reviewVOs = getReview(request); - reviewVOS.addAll(reviewVOs); - } else { - List reviewVOs = getReviewsByResult(request, statue); - reviewVOS.addAll(reviewVOs); - } +// 获取我的审核数据 + List reviewVOS = getReview(request); // 根据内容筛选 if (content == null || content.equals("")) { @@ -291,6 +282,33 @@ public class ReviewServiceImpl implements ReviewService { return ResultUtil.success(reviewDataVO); } + @Override + public BaseResponse searchReviewRecords(String content, + Short statue, + HttpServletRequest request, + Integer page, + Integer pageSize) { + +// 获取审核记录数据 + List reviewVOS = getReviewsByResult(request, statue); + + +// 根据内容筛选 + if (content == null || content.equals("")) { + //封装结果类与数据总数 + ReviewDataVO reviewDataVO = getReviewsByPage(reviewVOS, page, pageSize); + return ResultUtil.success(reviewDataVO); + } else { + reviewVOS = reviewVOS.stream() + .filter(reviewVO -> reviewVO.getName().contains(content) || reviewVO.getContent().contains(content)) + .collect(Collectors.toList()); + } + + //封装结果类与数据总数 + ReviewDataVO reviewDataVO = getReviewsByPage(reviewVOS, page, pageSize); + + return ResultUtil.success(reviewDataVO); + } private List getReview(HttpServletRequest request) { @@ -436,7 +454,7 @@ public class ReviewServiceImpl implements ReviewService { reviewData.addAll(reviewDOS); } - // 获取自己的审核记录 +// 获取自己的审核记录 List myReviewDO = reviewDAO.getReviewByUser(userId); reviewData.addAll(myReviewDO);