Commit 4dde1cc5 by 段启岩

项目-精简代码,项目评论-修复能引用其他项目父级ID的bug

parent 91ff60fe
package cn.meteor.beyondclouds.modules.project.entity; package cn.meteor.beyondclouds.modules.project.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import java.io.Serializable;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.io.Serializable;
/** /**
* <p> * <p>
* 项目扩展表 * 项目扩展表
...@@ -25,6 +25,7 @@ public class ProjectExt implements Serializable { ...@@ -25,6 +25,7 @@ public class ProjectExt implements Serializable {
private static final long serialVersionUID=1L; private static final long serialVersionUID=1L;
@TableId
private Integer projectId; private Integer projectId;
@ApiModelProperty(value = "项目详情") @ApiModelProperty(value = "项目详情")
......
...@@ -41,10 +41,14 @@ public class ProjectCommentServiceImpl extends ServiceImpl<ProjectCommentMapper, ...@@ -41,10 +41,14 @@ public class ProjectCommentServiceImpl extends ServiceImpl<ProjectCommentMapper,
throw new ProjectCommentServiceException(ProjectErrorCode.PROJECT_NOT_FOUND); throw new ProjectCommentServiceException(ProjectErrorCode.PROJECT_NOT_FOUND);
} }
// 2.如果有parentId,查询父级评论是否存在 // 2.如果有parentId,查询父级评论在该项目中是否存在
ProjectComment parentComment = null; ProjectComment parentComment = null;
if (null != parentId) { if (null != parentId) {
parentComment = getById(parentId); QueryWrapper<ProjectComment> projectCommentQueryWrapper = new QueryWrapper<>();
projectCommentQueryWrapper
.eq("project_id", projectId)
.eq("comment_id", parentId);
parentComment = getOne(projectCommentQueryWrapper);
if (null == parentComment) { if (null == parentComment) {
throw new ProjectCommentServiceException(ProjectCommentErrorCode.PARENT_COMMENT_NOT_FOUND); throw new ProjectCommentServiceException(ProjectCommentErrorCode.PARENT_COMMENT_NOT_FOUND);
} }
......
...@@ -95,9 +95,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl ...@@ -95,9 +95,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
// 3.删除项目本身 // 3.删除项目本身
// 删除项目详情 // 删除项目详情
QueryWrapper<ProjectExt> projectExtQueryWrapper = new QueryWrapper<>(); projectExtService.removeById(projectId);
projectExtQueryWrapper.eq("project_id", projectId);
projectExtService.remove(projectExtQueryWrapper);
// 删除项目 // 删除项目
removeById(projectId); removeById(projectId);
...@@ -115,9 +113,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl ...@@ -115,9 +113,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
} }
// 2.获取项目详情 // 2.获取项目详情
QueryWrapper<ProjectExt> projectExtQueryWrapper = new QueryWrapper<>(); ProjectExt projectExt = projectExtService.getById(projectId);
projectExtQueryWrapper.eq("project_id", projectId);
ProjectExt projectExt = projectExtService.getOne(projectExtQueryWrapper);
// 3.装配并返回查询到的信息 // 3.装配并返回查询到的信息
ProjectDetail projectDetail = new ProjectDetail(); ProjectDetail projectDetail = new ProjectDetail();
...@@ -149,9 +145,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl ...@@ -149,9 +145,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
ProjectExt projectExt = new ProjectExt(); ProjectExt projectExt = new ProjectExt();
projectExt.setProjectId(project.getProjectId()); projectExt.setProjectId(project.getProjectId());
projectExt.setProjectDetail(projectDetail); projectExt.setProjectDetail(projectDetail);
QueryWrapper<ProjectExt> projectExtQueryWrapper = new QueryWrapper<>(); projectExtService.updateById(projectExt);
projectExtQueryWrapper.eq("project_id", project.getProjectId());
projectExtService.update(projectExt, projectExtQueryWrapper);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment