diff --git a/src/main/java/com/jsl/oa/controllers/ReviewController.java b/src/main/java/com/jsl/oa/controllers/ReviewController.java index 6eb00cf..237cb1e 100644 --- a/src/main/java/com/jsl/oa/controllers/ReviewController.java +++ b/src/main/java/com/jsl/oa/controllers/ReviewController.java @@ -69,7 +69,7 @@ public class ReviewController { public BaseResponse addReview(@RequestBody @Validated ReviewAddVO reviewAddVO, @NotNull BindingResult bindingResult, HttpServletRequest request) { - log.info("请求接口[POST]: /review/add"); + if (bindingResult.hasErrors()) { return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR); @@ -83,7 +83,6 @@ public class ReviewController { public BaseResponse updateReview(@RequestBody @Validated ReviewUpdateResultVO reviewUpdateResultVOVO, @NotNull BindingResult bindingResult, HttpServletRequest request) { - log.info("请求接口[PUT]: /review/updateReview"); if (bindingResult.hasErrors()) { return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR); @@ -98,7 +97,7 @@ public class ReviewController { HttpServletRequest request, @RequestParam Integer page, @RequestParam Integer pageSize) { - log.info("请求接口[GET]: /review/searchMyReview"); + return reviewService.searchReview(content, request, page, pageSize); } @@ -108,7 +107,7 @@ public class ReviewController { 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/mapper/ProjectMapper.java b/src/main/java/com/jsl/oa/mapper/ProjectMapper.java index 089b87f..a675d3a 100644 --- a/src/main/java/com/jsl/oa/mapper/ProjectMapper.java +++ b/src/main/java/com/jsl/oa/mapper/ProjectMapper.java @@ -84,7 +84,6 @@ public interface ProjectMapper { //@Select("select * from organize_oa.oa_project_work where status=1 and principal_id=#{userId}") List workget1(Long userId, Integer is); - List tget(Integer id); List tgetByIsfinish(List isFinish); @@ -168,4 +167,7 @@ public interface ProjectMapper { + "and project_id = (select id from organize_oa.oa_project where name =#{projectName}))") List getModuleByName(String projectName, String childName); + void projectModuleUpdate(ProjectModuleDO projectModuleDO); + + void projectChildEdit(ProjectChildDO projectChildDO); } diff --git a/src/main/java/com/jsl/oa/services/impl/ProjectDailyServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/ProjectDailyServiceImpl.java index 03140f7..6a66cf9 100644 --- a/src/main/java/com/jsl/oa/services/impl/ProjectDailyServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/ProjectDailyServiceImpl.java @@ -51,12 +51,12 @@ public class ProjectDailyServiceImpl implements ProjectDailyService { public BaseResponse addDaily(ProjectDailyAddVO projectDailyAddVO, HttpServletRequest request) { // 获取用户id - Long userId = Processing.getAuthHeaderToUserId(request); + Long userId = Processing.getAuthHeaderToUserId(request); // 从请求体中获取项目id - Integer projectId = projectDailyAddVO.getProjectId(); + Integer projectId = projectDailyAddVO.getProjectId(); // 检查项目是否存在 - if (!projectDAO.isExistProjectById(Long.valueOf(projectId))) { - return ResultUtil.error(ErrorCode.PROJECT_NOT_EXIST); + if (!projectDAO.isExistProjectById(Long.valueOf(projectId))) { + return ResultUtil.error(ErrorCode.PROJECT_NOT_EXIST); } // 赋值数据库表实体类相关属性 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 1c8e34a..033532f 100644 --- a/src/main/java/com/jsl/oa/services/impl/ReviewServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/ReviewServiceImpl.java @@ -235,6 +235,32 @@ public class ReviewServiceImpl implements ReviewService { return ResultUtil.error(ErrorCode.REVIEW_NOT_EXIST); } + //修改对应项目负责人 + if (reviewUpdateResultVO.getResult() == ReviewConstants.APPROVED) { + + //如果为子系统,则添加子系统负责人为申请人 + if (reviewDO.getCategory() == 0) { + ProjectChildDO projectChildDO = projectMapper. + getProjectChildById(Math.toIntExact(reviewDO.getProjectChildId())); + if (projectChildDO == null) { + return ResultUtil.error(ErrorCode.PROJECT_CHILD_NOT_EXIST); + } + projectChildDO.setPrincipalId(Long.valueOf(reviewDO.getSenderId())); + projectMapper.projectChildEdit(projectChildDO); + } + //如果为子模块,则添加子模块负责人为申请人 + if (reviewDO.getCategory() == 1) { + ProjectModuleDO projectModuleDO = projectMapper. + getModuleById(Math.toIntExact(reviewDO.getProjectModuleId())); + if (projectModuleDO == null) { + return ResultUtil.error(ErrorCode.MODULE_NOT_EXIST); + } + projectModuleDO.setPrincipalId(Long.valueOf(reviewDO.getSenderId())); + projectMapper.projectModuleUpdate(projectModuleDO); + } + + } + //设置对应属性 reviewDO.setReviewTime(new Date()); reviewDO.setRecipientId(userId); diff --git a/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml b/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml index 08c2a43..d2f5a85 100644 --- a/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml +++ b/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml @@ -47,6 +47,28 @@ where id = #{id} + + update organize_oa.oa_project_child + + + principal_id = #{principalId}, + + + where id = #{id} + + + + + update organize_oa.oa_project_modules + + + principal_id = #{principalId}, + + + where id = #{id} + + + update organize_oa.oa_project_child set is_delete=true where id=#{id1}