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 getHistoryListWidthAbandoned(@Param("caseId") String caseId, @Param("reviewId") String reviewId); + List getHistoryListWidthCaseId(@Param("caseId") String caseId, @Param("reviewId") String reviewId); + void updateDelete(@Param("caseIds") List 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 + + + + 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 getCaseReviewHistory(String caseId) { - List list = extCaseReviewHistoryMapper.getHistoryListWidthAbandoned(caseId, null); + List 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': '失败',