patch: 审核模块

审批结果接口添加发送消息
This commit is contained in:
xiangZr-hhh 2024-04-20 02:31:49 +08:00
parent ec2a30075d
commit 1d588f4c2d
2 changed files with 13 additions and 0 deletions

View File

@ -12,6 +12,7 @@ import com.jsl.oa.model.vodata.ProjectDailyAddVO;
import com.jsl.oa.model.vodata.ProjectDailyDataVO; import com.jsl.oa.model.vodata.ProjectDailyDataVO;
import com.jsl.oa.model.vodata.ProjectDailyUpdateVO; import com.jsl.oa.model.vodata.ProjectDailyUpdateVO;
import com.jsl.oa.model.vodata.ProjectDailyVO; import com.jsl.oa.model.vodata.ProjectDailyVO;
import com.jsl.oa.services.MessageService;
import com.jsl.oa.services.ProjectDailyService; import com.jsl.oa.services.ProjectDailyService;
import com.jsl.oa.utils.BaseResponse; import com.jsl.oa.utils.BaseResponse;
import com.jsl.oa.utils.ErrorCode; import com.jsl.oa.utils.ErrorCode;
@ -45,6 +46,7 @@ public class ProjectDailyServiceImpl implements ProjectDailyService {
private final UserDAO userDAO; private final UserDAO userDAO;
private final ProjectDailyDAO projectDailyDAO; private final ProjectDailyDAO projectDailyDAO;
private final ProjectDailyMapper projectDailyMapper; private final ProjectDailyMapper projectDailyMapper;
private final MessageService messageService;
@Override @Override

View File

@ -15,6 +15,7 @@ import com.jsl.oa.model.vodata.ReviewAddVO;
import com.jsl.oa.model.vodata.ReviewDataVO; import com.jsl.oa.model.vodata.ReviewDataVO;
import com.jsl.oa.model.vodata.ReviewUpdateResultVO; import com.jsl.oa.model.vodata.ReviewUpdateResultVO;
import com.jsl.oa.model.vodata.ReviewVO; import com.jsl.oa.model.vodata.ReviewVO;
import com.jsl.oa.services.MessageService;
import com.jsl.oa.services.ReviewService; import com.jsl.oa.services.ReviewService;
import com.jsl.oa.utils.BaseResponse; import com.jsl.oa.utils.BaseResponse;
import com.jsl.oa.utils.ErrorCode; import com.jsl.oa.utils.ErrorCode;
@ -40,6 +41,8 @@ public class ReviewServiceImpl implements ReviewService {
private final UserMapper userMapper; private final UserMapper userMapper;
private final ProjectMapper projectMapper; private final ProjectMapper projectMapper;
private final MessageService messageService;
/** /**
* @Description: 获取用户未审核的数据(只包括管理项目下未审核的数据) * @Description: 获取用户未审核的数据(只包括管理项目下未审核的数据)
@ -218,6 +221,7 @@ public class ReviewServiceImpl implements ReviewService {
//添加数据 //添加数据
reviewDAO.addReview(reviewDO); reviewDAO.addReview(reviewDO);
return ResultUtil.success("申请成功"); return ResultUtil.success("申请成功");
} }
@ -266,6 +270,13 @@ public class ReviewServiceImpl implements ReviewService {
reviewDO.setRecipientId(userId); reviewDO.setRecipientId(userId);
reviewDO.setReviewResult(reviewUpdateResultVO.getResult()); 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); reviewDAO.updateReview(reviewDO);