test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor(缺陷管理):缺陷管理详情查询添加支持关注人字段

This commit is contained in:
song-cc-rock 2024-02-06 23:06:37 +08:00 committed by Craftsman
parent 152ea72a4c
commit 16533c9237
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/services/bug-management/src/main/java/io/metersphere/bug/controller/BugController.java
View File

@ -119,7 +119,7 @@ public class BugController {
@Operation(summary = "缺陷管理-列表-查看缺陷(详情&&编辑&&复制)") @Operation(summary = "缺陷管理-列表-查看缺陷(详情&&编辑&&复制)")
@RequiresPermissions(PermissionConstants.PROJECT_BUG_READ) @RequiresPermissions(PermissionConstants.PROJECT_BUG_READ)
public BugDetailDTO get(@PathVariable String id) { public BugDetailDTO get(@PathVariable String id) {
return bugService.get(id); return bugService.get(id, SessionUtils.getUserId());
} }
@GetMapping("/delete/{id}") @GetMapping("/delete/{id}")

3
backend/services/bug-management/src/main/java/io/metersphere/bug/dto/response/BugDetailDTO.java
View File

@ -43,6 +43,9 @@ public class BugDetailDTO {
@Schema(description = "是否平台默认模板") @Schema(description = "是否平台默认模板")
private Boolean platformDefault; private Boolean platformDefault;
@Schema(description = "是否关注")
private Boolean followFlag;
@Schema(description = "附件集合") @Schema(description = "附件集合")
List<BugFileDTO> attachments; List<BugFileDTO> attachments;
} }

6
backend/services/bug-management/src/main/java/io/metersphere/bug/service/BugService.java
View File

@ -242,7 +242,7 @@ public class BugService {
* @param id 缺陷ID * @param id 缺陷ID
* @return 缺陷详情 * @return 缺陷详情
*/ */
public BugDetailDTO get(String id) { public BugDetailDTO get(String id, String currentUser) {
Bug bug = checkBugExist(id); Bug bug = checkBugExist(id);
TemplateDTO template = getTemplate(bug.getTemplateId(), bug.getProjectId(), null, null); TemplateDTO template = getTemplate(bug.getTemplateId(), bug.getProjectId(), null, null);
List<BugCustomFieldDTO> allCustomFields = extBugCustomFieldMapper.getBugAllCustomFields(List.of(id), bug.getProjectId()); List<BugCustomFieldDTO> allCustomFields = extBugCustomFieldMapper.getBugAllCustomFields(List.of(id), bug.getProjectId());
@ -288,6 +288,10 @@ public class BugService {
detail.setCustomFields(allCustomFields); detail.setCustomFields(allCustomFields);
// 缺陷附件信息 // 缺陷附件信息
detail.setAttachments(bugAttachmentService.getAllBugFiles(id)); detail.setAttachments(bugAttachmentService.getAllBugFiles(id));
// 当前登录人是否关注该缺陷
BugFollowerExample example = new BugFollowerExample();
example.createCriteria().andBugIdEqualTo(id).andUserIdEqualTo(currentUser);
detail.setFollowFlag(bugFollowerMapper.countByExample(example) > 0);
return detail; return detail;
} }