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

feature-zrx #32

Merged
XiaoLFeng merged 12 commits from feature-zrx into develop 2024-04-19 22:41:30 +08:00
Conversation 0 Commits 12 Files Changed 19 +50 -17
3 changed files with 50 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 63619c389b - Show all commits

17
src/main/java/com/jsl/oa/controllers/ReviewController.java
View File

@ -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);
}
}

8
src/main/java/com/jsl/oa/services/ReviewService.java
View File

@ -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);
}

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

@ -257,20 +257,11 @@ public class ReviewServiceImpl implements ReviewService {
@Override
public BaseResponse searchReview(String content,
Short statue,
HttpServletRequest request,
Integer page, Integer pageSize) {
List<ReviewVO> reviewVOS = new ArrayList<>();
// 根据判断结果筛选
if (statue == null || statue.equals("")) {
List<ReviewVO> reviewVOs = getReview(request);
reviewVOS.addAll(reviewVOs);
} else {
List<ReviewVO> reviewVOs = getReviewsByResult(request, statue);
reviewVOS.addAll(reviewVOs);
}
// 获取我的审核数据
List<ReviewVO> 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<ReviewVO> 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<ReviewVO> getReview(HttpServletRequest request) {
@ -436,7 +454,7 @@ public class ReviewServiceImpl implements ReviewService {
reviewData.addAll(reviewDOS);
}
// 获取自己的审核记录
// 获取自己的审核记录
List<ReviewDO> myReviewDO = reviewDAO.getReviewByUser(userId);
reviewData.addAll(myReviewDO);