feature-zrx #24
|
@ -58,6 +58,11 @@ public class ReviewDAO {
|
|||
result);
|
||||
}
|
||||
|
||||
public List<ReviewDO> getReviewByUser(Long uid) {
|
||||
return reviewMapper.selectReviewByUser(uid);
|
||||
}
|
||||
|
||||
|
||||
|
||||
public void addReview(ReviewDO reviewDO) {
|
||||
reviewMapper.addReview(reviewDO);
|
||||
|
|
|
@ -43,4 +43,8 @@ public interface ReviewMapper {
|
|||
|
||||
@Select("SELECT * FROM organize_oa.oa_review WHERE name = #{name} AND is_delete = 0")
|
||||
List<ReviewDO> selectReviewByName(String name);
|
||||
|
||||
@Select("SELECT * FROM organize_oa.oa_review WHERE sender_id = #{uid} AND "
|
||||
+ "is_delete = 0")
|
||||
List<ReviewDO> selectReviewByUser(Long uid);
|
||||
}
|
||||
|
|
|
@ -5,6 +5,7 @@ import com.jsl.oa.common.constant.ReviewConstants;
|
|||
import com.jsl.oa.dao.ProjectDAO;
|
||||
import com.jsl.oa.dao.ReviewDAO;
|
||||
import com.jsl.oa.dao.UserDAO;
|
||||
import com.jsl.oa.exception.BusinessException;
|
||||
import com.jsl.oa.mapper.ProjectMapper;
|
||||
import com.jsl.oa.mapper.UserMapper;
|
||||
import com.jsl.oa.model.dodata.ProjectChildDO;
|
||||
|
@ -155,6 +156,11 @@ public class ReviewServiceImpl implements ReviewService {
|
|||
reviewData.addAll(reviewDOS);
|
||||
}
|
||||
|
||||
// 获取自己的审核记录
|
||||
List<ReviewDO> myReviewDO = reviewDAO.getReviewByUser(userId);
|
||||
reviewData.addAll(myReviewDO);
|
||||
|
||||
|
||||
//根据id进行去重
|
||||
reviewData = reviewData.stream()
|
||||
.collect(Collectors.toMap(ReviewDO::getId, review -> review, (existing, replacement) -> existing))
|
||||
|
@ -186,6 +192,23 @@ public class ReviewServiceImpl implements ReviewService {
|
|||
//获取用户
|
||||
Long userId = Processing.getAuthHeaderToUserId(request);
|
||||
|
||||
//检查对应项目,子系统,子模块是否存在
|
||||
if (!projectDAO.isExistProjectById(reviewAddVO.getProjectId())) {
|
||||
throw new BusinessException(ErrorCode.PROJECT_NOT_EXIST);
|
||||
}
|
||||
if (projectMapper.getProjectChildById(
|
||||
Math.toIntExact(reviewAddVO.getProjectChildId())) != null) {
|
||||
throw new BusinessException(ErrorCode.PROJECT_CHILD_NOT_EXIST);
|
||||
}
|
||||
|
||||
// 子模块id不为空时查询,否则直接跳过
|
||||
if (reviewAddVO.getProjectModuleId() != null) {
|
||||
if (projectMapper.getModuleById(
|
||||
Math.toIntExact(reviewAddVO.getProjectModuleId())) != null) {
|
||||
throw new BusinessException(ErrorCode.MODULE_NOT_EXIST);
|
||||
}
|
||||
}
|
||||
|
||||
//定义要添加的审核实体类
|
||||
ReviewDO reviewDO = new ReviewDO();
|
||||
//现将属性相同的值拷贝
|
||||
|
|
|
@ -53,6 +53,8 @@ public enum ErrorCode {
|
|||
PROJECT_USER_NOT_EXIST("ProjectUserNotExist", 40018, "用户项目表无对应记录"),
|
||||
PROJECT_FILE_JSON_ERROR("ProjectFileJsonError", 40019, "项目文件json格式错误"),
|
||||
PROJECT_NOT_USER("ProjectNotUser", 40020, "项目无此用户"),
|
||||
PROJECT_CHILD_NOT_EXIST("ProjectChildNotExist", 40021, "子系统不存在"),
|
||||
MODULE_NOT_EXIST("ModuleNotExist", 40022, "模块不存在"),
|
||||
REVIEW_NOT_EXIST("ReviewNotExit", 40101, "未找到对应审核信息");
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user