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 6a66cf9..cd1d202 100644 --- a/src/main/java/com/jsl/oa/services/impl/ProjectDailyServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/ProjectDailyServiceImpl.java @@ -12,6 +12,7 @@ import com.jsl.oa.model.vodata.ProjectDailyAddVO; import com.jsl.oa.model.vodata.ProjectDailyDataVO; import com.jsl.oa.model.vodata.ProjectDailyUpdateVO; import com.jsl.oa.model.vodata.ProjectDailyVO; +import com.jsl.oa.services.MessageService; import com.jsl.oa.services.ProjectDailyService; import com.jsl.oa.utils.BaseResponse; import com.jsl.oa.utils.ErrorCode; @@ -45,6 +46,7 @@ public class ProjectDailyServiceImpl implements ProjectDailyService { private final UserDAO userDAO; private final ProjectDailyDAO projectDailyDAO; private final ProjectDailyMapper projectDailyMapper; + private final MessageService messageService; @Override 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 033532f..caf91bd 100644 --- a/src/main/java/com/jsl/oa/services/impl/ReviewServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/ReviewServiceImpl.java @@ -15,6 +15,7 @@ import com.jsl.oa.model.vodata.ReviewAddVO; import com.jsl.oa.model.vodata.ReviewDataVO; import com.jsl.oa.model.vodata.ReviewUpdateResultVO; import com.jsl.oa.model.vodata.ReviewVO; +import com.jsl.oa.services.MessageService; import com.jsl.oa.services.ReviewService; import com.jsl.oa.utils.BaseResponse; import com.jsl.oa.utils.ErrorCode; @@ -40,6 +41,8 @@ public class ReviewServiceImpl implements ReviewService { private final UserMapper userMapper; private final ProjectMapper projectMapper; + private final MessageService messageService; + /** * @Description: 获取用户未审核的数据(只包括管理项目下未审核的数据) @@ -218,6 +221,7 @@ public class ReviewServiceImpl implements ReviewService { //添加数据 reviewDAO.addReview(reviewDO); + return ResultUtil.success("申请成功"); } @@ -266,6 +270,13 @@ public class ReviewServiceImpl implements ReviewService { reviewDO.setRecipientId(userId); reviewDO.setReviewResult(reviewUpdateResultVO.getResult()); + //发送消息 + messageService.messageAdd(Math.toIntExact(reviewDO.getProjectId()), + Math.toIntExact(reviewDO.getProjectChildId()), + Math.toIntExact(reviewDO.getProjectModuleId()), + Long.valueOf(reviewDO.getSenderId()), + Long.valueOf(reviewUpdateResultVO.getResult()), + request); //更新数据 reviewDAO.updateReview(reviewDO);