From 7049a4f5f607eaad18ccbd1d9df03eadc5e8a8ff Mon Sep 17 00:00:00 2001 From: guoyuqi Date: Wed, 28 Feb 2024 16:09:20 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E7=94=A8=E4=BE=8B=E7=AE=A1=E7=90=86):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=84=E5=AE=A1=E8=AF=84=E8=AE=BA=E7=BC=BA?= =?UTF-8?q?=E5=B0=91=E5=86=85=E5=AE=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/metersphere/functional/dto/CaseReviewHistoryDTO.java | 6 ++++++ .../functional/mapper/ExtCaseReviewHistoryMapper.xml | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/dto/CaseReviewHistoryDTO.java b/backend/services/case-management/src/main/java/io/metersphere/functional/dto/CaseReviewHistoryDTO.java index 34e226a599..90d02479ac 100644 --- a/backend/services/case-management/src/main/java/io/metersphere/functional/dto/CaseReviewHistoryDTO.java +++ b/backend/services/case-management/src/main/java/io/metersphere/functional/dto/CaseReviewHistoryDTO.java @@ -13,7 +13,13 @@ public class CaseReviewHistoryDTO extends CaseReviewHistory { @Schema(description = "评审人名") private String userName; + @Schema(description = "评审人邮箱") + private String email; + @Schema(description = "评审解析内容") private String contentText; + @Schema(description = "评审名称") + private String reviewName; + } diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtCaseReviewHistoryMapper.xml b/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtCaseReviewHistoryMapper.xml index 2ccbdc540c..8183e922bf 100644 --- a/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtCaseReviewHistoryMapper.xml +++ b/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtCaseReviewHistoryMapper.xml @@ -36,11 +36,14 @@ ch.create_time, ch.content, u.name as userName, - ux.avatar as userLogo + ux.avatar as userLogo, + cr.name as reviewName, + u.email as email FROM case_review_history ch left join user u on ch.create_user = u.id left join user_extend ux on ch.create_user = ux.id + left join case_review cr on ch.review_id = cr.id where ch.case_id = #{caseId} and ch.review_id = #{reviewId}