This commit is contained in:
fit2-zhao 2020-10-19 10:49:52 +08:00
commit af127e45fe
6 changed files with 19 additions and 10 deletions

View File

@ -12,12 +12,13 @@ public interface ExtTestCaseReviewMapper {
List<TestCaseReviewDTO> list(@Param("request") QueryCaseReviewRequest params); List<TestCaseReviewDTO> list(@Param("request") QueryCaseReviewRequest params);
List<TestCaseReviewDTO> listByWorkspaceId(@Param("workspaceId") String workspaceId); List<TestCaseReviewDTO> listByWorkspaceId(@Param("workspaceId") String workspaceId, @Param("userId") String userId);
List<TestReviewDTOWithMetric> listRelate(@Param("request") QueryTestReviewRequest request); List<TestReviewDTOWithMetric> listRelate(@Param("request") QueryTestReviewRequest request);
/** /**
* 检查某工作空间下是否有某测试评审 * 检查某工作空间下是否有某测试评审
*
* @param reviewId * @param reviewId
* @param workspaceId * @param workspaceId
* @return Review ID * @return Review ID

View File

@ -27,11 +27,18 @@
<select id="listByWorkspaceId" resultType="io.metersphere.track.dto.TestCaseReviewDTO" <select id="listByWorkspaceId" resultType="io.metersphere.track.dto.TestCaseReviewDTO"
parameterType="io.metersphere.track.request.testreview.QueryCaseReviewRequest"> parameterType="io.metersphere.track.request.testreview.QueryCaseReviewRequest">
select distinct test_case_review.* select distinct test_case_review.*
from test_case_review, project, test_case_review_project from test_case_review, project, test_case_review_project, test_case_review_users
where test_case_review.id = test_case_review_project.review_id <where>
and test_case_review_project.project_id = project.id test_case_review.id = test_case_review_project.review_id
and project.workspace_id = #{workspaceId} and test_case_review_project.project_id = project.id
order by test_case_review.update_time desc and project.workspace_id = #{workspaceId}
and (
(test_case_review_users.review_id = test_case_review.id
and test_case_review_users.user_id = #{userId} )
or test_case_review.creator = #{userId}
)
</where>
order by test_case_review.update_time desc
</select> </select>
<select id="listRelate" resultType="io.metersphere.track.dto.TestReviewDTOWithMetric"> <select id="listRelate" resultType="io.metersphere.track.dto.TestReviewDTOWithMetric">

View File

@ -36,6 +36,7 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -150,7 +151,7 @@ public class TestCaseReviewService {
} }
public List<TestCaseReviewDTO> recent(String currentWorkspaceId) { public List<TestCaseReviewDTO> recent(String currentWorkspaceId) {
return extTestCaseReviewMapper.listByWorkspaceId(currentWorkspaceId); return extTestCaseReviewMapper.listByWorkspaceId(currentWorkspaceId, SessionUtils.getUserId());
} }
public void editCaseReview(SaveTestCaseReviewRequest testCaseReview) { public void editCaseReview(SaveTestCaseReviewRequest testCaseReview) {

View File

@ -654,7 +654,7 @@ export default {
length_less_than: "The length less than", length_less_than: "The length less than",
recent_plan: "My recent plan", recent_plan: "My recent plan",
recent_case: "My recent case", recent_case: "My recent case",
recent_review: "Recent review", recent_review: "My recent review",
pass_rate: "Pass rate", pass_rate: "Pass rate",
execution_result: ": Please select the execution result", execution_result: ": Please select the execution result",
actual_result: ": The actual result is empty", actual_result: ": The actual result is empty",

View File

@ -656,7 +656,7 @@ export default {
length_less_than: "长度必须小于", length_less_than: "长度必须小于",
recent_plan: "我最近的计划", recent_plan: "我最近的计划",
recent_case: "我最近的用例", recent_case: "我最近的用例",
recent_review: "最近的评审", recent_review: "最近的评审",
pass_rate: "通过率", pass_rate: "通过率",
execution_result: ": 请选择执行结果", execution_result: ": 请选择执行结果",
actual_result: ": 实际结果为空", actual_result: ": 实际结果为空",

View File

@ -656,7 +656,7 @@ export default {
length_less_than: "長度必須小於", length_less_than: "長度必須小於",
recent_plan: "我最近的計劃", recent_plan: "我最近的計劃",
recent_case: "我最近的用例", recent_case: "我最近的用例",
recent_review: "最近的評審", recent_review: "最近的評審",
pass_rate: "通過率", pass_rate: "通過率",
execution_result: ": 請選擇執行結果", execution_result: ": 請選擇執行結果",
actual_result: ": 實際結果為空", actual_result: ": 實際結果為空",