From 56a93a59b616b4846776ba5a23a8f46a9dc0c2a4 Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Wed, 6 Mar 2024 19:44:01 +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=E5=8F=96=E6=B6=88=E5=85=B3=E8=81=94=E8=AF=84?=
 =?UTF-8?q?=E5=AE=A1=E8=AF=84=E8=AE=BA=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1036196 --user=郭雨琦 https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001036196
--bug=1036861 --user=郭雨琦 https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001036861
---
 .../mapper/ExtCaseReviewHistoryMapper.java    |  2 ++
 .../mapper/ExtCaseReviewHistoryMapper.xml     | 28 +++++++++++++++++++
 .../service/FunctionalCaseReviewService.java  |  2 +-
 .../caseManagementFeature/locale/zh-CN.ts     |  2 +-
 4 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtCaseReviewHistoryMapper.java b/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtCaseReviewHistoryMapper.java
index f0e957d61b..f8ef1ab673 100644
--- a/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtCaseReviewHistoryMapper.java
+++ b/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtCaseReviewHistoryMapper.java
@@ -15,6 +15,8 @@ public interface ExtCaseReviewHistoryMapper {
 
     List<CaseReviewHistoryDTO> getHistoryListWidthAbandoned(@Param("caseId") String caseId, @Param("reviewId") String reviewId);
 
+    List<CaseReviewHistoryDTO> getHistoryListWidthCaseId(@Param("caseId") String caseId, @Param("reviewId") String reviewId);
+
     void updateDelete(@Param("caseIds") List<String> caseIds, @Param("reviewId") String reviewId, @Param("delete") boolean delete);
 
     void updateAbandoned(@Param("caseId") String caseId);
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 8183e922bf..e414e753ab 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
@@ -52,6 +52,34 @@
         order by ch.create_time desc
     </select>
 
+    <select id="getHistoryListWidthCaseId" resultType="io.metersphere.functional.dto.CaseReviewHistoryDTO">
+        SELECT
+        ch.id,
+        ch.review_id,
+        ch.case_id,
+        ch.status,
+        ch.notifier,
+        ch.create_user,
+        ch.create_time,
+        ch.content,
+        u.name as userName,
+        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}
+        <if test="reviewId != null and reviewId != ''">
+            and ch.review_id = #{reviewId}
+        </if>
+        order by ch.create_time desc
+    </select>
+
+
+
     <update id="updateDelete">
         update case_review_history
         set deleted = #{delete}
diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseReviewService.java b/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseReviewService.java
index a4b8091b56..70e0c1cb3a 100644
--- a/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseReviewService.java
+++ b/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseReviewService.java
@@ -37,7 +37,7 @@ public class FunctionalCaseReviewService {
     }
 
     public List<CaseReviewHistoryDTO> getCaseReviewHistory(String caseId) {
-        List<CaseReviewHistoryDTO> list = extCaseReviewHistoryMapper.getHistoryListWidthAbandoned(caseId, null);
+        List<CaseReviewHistoryDTO> list = extCaseReviewHistoryMapper.getHistoryListWidthCaseId(caseId, null);
         for (CaseReviewHistoryDTO caseReviewHistoryDTO : list) {
             if (StringUtils.equalsIgnoreCase(caseReviewHistoryDTO.getCreateUser(), UserRoleScope.SYSTEM)) {
                 caseReviewHistoryDTO.setUserName(Translator.get("case_review_history.system"));
diff --git a/frontend/src/views/case-management/caseManagementFeature/locale/zh-CN.ts b/frontend/src/views/case-management/caseManagementFeature/locale/zh-CN.ts
index e55d0f7b7e..bf7537de71 100644
--- a/frontend/src/views/case-management/caseManagementFeature/locale/zh-CN.ts
+++ b/frontend/src/views/case-management/caseManagementFeature/locale/zh-CN.ts
@@ -106,7 +106,7 @@ export default {
   'caseManagement.featureCase.notReviewed': '未评审',
   'caseManagement.featureCase.reviewing': '评审中',
   'caseManagement.featureCase.passed': '已通过',
-  'caseManagement.featureCase.notPass': '未通过',
+  'caseManagement.featureCase.notPass': '不通过',
   'caseManagement.featureCase.retrial': '重新提审',
   'caseManagement.featureCase.nonExecution': '未执行',
   'caseManagement.featureCase.failure': '失败',