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

feat：增加新业务功能获取我的审核 #13

Merged
XiaoLFeng merged 13 commits from feature-zrx into develop 2024-04-16 21:39:25 +08:00
Conversation 0 Commits 13 Files Changed 17 -26
3 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1a65d8ce8f - Show all commits

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

@ -54,7 +54,6 @@ public class ReviewController {
public BaseResponse getMyReview(@RequestParam Integer page, public BaseResponse getMyReview(@RequestParam Integer page,
@RequestParam Integer pageSize, @RequestParam Integer pageSize,
HttpServletRequest request) { HttpServletRequest request) {
log.info("请求接口[GET]: /review/getMyReview");
return reviewService.getUserPendingApprovalReview(page, pageSize, request); return reviewService.getUserPendingApprovalReview(page, pageSize, request);
} }

21
src/main/java/com/jsl/oa/dao/ReviewDAO.java
View File

@ -29,73 +29,52 @@ public class ReviewDAO {
public List<ReviewDO> selectAllReviewFromProject(Long projectId) { public List<ReviewDO> selectAllReviewFromProject(Long projectId) {
log.info("\t> 执行 DAO 层 ReviewDAO.selectAllReviewFromProject 方法");
log.info("\t\t> 从 MySQL 获取数据");
return reviewMapper.selectAllReviewFromProject(projectId); return reviewMapper.selectAllReviewFromProject(projectId);
} }
public List<ReviewDO> selectApprovedResultReviewFromProject(Long projectId, public List<ReviewDO> selectApprovedResultReviewFromProject(Long projectId,
short result) { short result) {
log.info("\t> 执行 DAO 层 ReviewDAO.selectApprovedResultReviewFromProject 方法");
log.info("\t\t> 从 MySQL 获取数据");
return reviewMapper.selectApprovedResultReviewFromProject(projectId, return reviewMapper.selectApprovedResultReviewFromProject(projectId,
result); result);
} }
public List<ReviewDO> selectReviewFromSubsystem(Long subsystemId) { public List<ReviewDO> selectReviewFromSubsystem(Long subsystemId) {
log.info("\t> 执行 DAO 层 ReviewDAO.selectReviewFromSubsystem 方法");
log.info("\t\t> 从 MySQL 获取数据");
return reviewMapper.selectReviewFromSubsystem(subsystemId); return reviewMapper.selectReviewFromSubsystem(subsystemId);
} }
public List<ReviewDO> selectApprovedResultReviewsFromSubsystem(Long subsystemId, public List<ReviewDO> selectApprovedResultReviewsFromSubsystem(Long subsystemId,
short result) { short result) {
log.info("\t> 执行 DAO 层 ReviewDAO.selectApprovedResultReviewsFromSubsystem 方法");
log.info("\t\t> 从 MySQL 获取数据");
return reviewMapper.selectApprovedResultReviewsFromSubsystem(subsystemId, return reviewMapper.selectApprovedResultReviewsFromSubsystem(subsystemId,
result); result);
} }
public List<ReviewDO> selectReviewFromSubmodule(Long submoduleId) { public List<ReviewDO> selectReviewFromSubmodule(Long submoduleId) {
log.info("\t> 执行 DAO 层 ReviewDAO.selectReviewFromSubmodule 方法");
log.info("\t\t> 从 MySQL 获取数据");
return reviewMapper.selectReviewFromSubmodule(submoduleId); return reviewMapper.selectReviewFromSubmodule(submoduleId);
} }
public List<ReviewDO> selectApprovedResultReviewsFromSubModule(Long id, public List<ReviewDO> selectApprovedResultReviewsFromSubModule(Long id,
short result) { short result) {
log.info("\t> 执行 DAO 层 ReviewDAO.selectApprovedResultReviewsFromSubModule 方法");
log.info("\t\t> 从 MySQL 获取数据");
return reviewMapper.selectApprovedResultReviewFromModule(id, return reviewMapper.selectApprovedResultReviewFromModule(id,
result); result);
} }
public void addReview(ReviewDO reviewDO) { public void addReview(ReviewDO reviewDO) {
log.info("\t> 执行 DAO 层 ReviewDAO.addReview 方法");
log.info("\t\t> 从 MySQL 插入数据");
reviewMapper.addReview(reviewDO); reviewMapper.addReview(reviewDO);
} }
public ReviewDO selectReviewById(Long id) { public ReviewDO selectReviewById(Long id) {
log.info("\t> 执行 DAO 层 ReviewDAO.selectReviewById 方法");
log.info("\t\t> 从 MySQL 获取数据");
return reviewMapper.selectReviewById(id); return reviewMapper.selectReviewById(id);
} }
public void updateReview(ReviewDO reviewDO) { public void updateReview(ReviewDO reviewDO) {
log.info("\t> 执行 DAO 层 ReviewDAO.updateReview 方法");
log.info("\t\t> 从 MySQL 更新数据");
reviewMapper.updateReview(reviewDO); reviewMapper.updateReview(reviewDO);
} }
public String getNameByModule(Integer subId) { public String getNameByModule(Integer subId) {
log.info("\t> 执行 DAO 层 ReviewDAO.getNameBySubproject 方法");
if (subId != null) { if (subId != null) {
log.info("\t\t> 从 MySQL 获取数据");
return projectMapper.getModuleById(subId).getName(); return projectMapper.getModuleById(subId).getName();
} }

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

@ -45,8 +45,6 @@ public class ReviewServiceImpl implements ReviewService {
public BaseResponse getUserPendingApprovalReview(Integer page, public BaseResponse getUserPendingApprovalReview(Integer page,
Integer pageSize, Integer pageSize,
HttpServletRequest request) { HttpServletRequest request) {
log.info("\t> 执行 Service 层 ReviewService.getUserPendingApprovalReview 方法");
//获取用户 //获取用户
Long userId = Processing.getAuthHeaderToUserId(request); Long userId = Processing.getAuthHeaderToUserId(request);
@ -119,7 +117,6 @@ public class ReviewServiceImpl implements ReviewService {
public BaseResponse getUserReview(Integer page, public BaseResponse getUserReview(Integer page,
Integer pageSize, Integer pageSize,
HttpServletRequest request) { HttpServletRequest request) {
log.info("\t> 执行 Service 层 ReviewService.getUserReview 方法");
//获取用户 //获取用户
Long userId = Processing.getAuthHeaderToUserId(request); Long userId = Processing.getAuthHeaderToUserId(request);
@ -185,7 +182,6 @@ public class ReviewServiceImpl implements ReviewService {
@Override @Override
public BaseResponse addReview(ReviewAddVO reviewAddVO, HttpServletRequest request) { public BaseResponse addReview(ReviewAddVO reviewAddVO, HttpServletRequest request) {
log.info("\t> 执行 Service 层 ReviewService.addReview 方法");
//获取用户 //获取用户
Long userId = Processing.getAuthHeaderToUserId(request); Long userId = Processing.getAuthHeaderToUserId(request);