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

fix(工作台): 工作台功能用例数据展示有误 

--bug=1025573 --user=宋昌昌 【我的工作台】我的待办-功能用例数统计错误-用例状态是已完成，仍统计在我的待办中。 https://www.tapd.cn/55049933/s/1367288
This commit is contained in:
song-cc-rock 2023-04-26 18:41:49 +08:00 committed by fit2-zhao
parent d017b8a3bf
commit 24c569ff64
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
View File

@ -653,6 +653,9 @@
<if test="request.notEqStatus != null">
and test_case.status != #{request.notEqStatus}
</if>
<if test="request.unComing">
and (test_case.status is null or test_case.status not in ('Trash', 'Completed'))
</if>
<if test="request.casePublic != null and request.casePublic == true">
and test_case.case_public = true
</if>

5
test-track/backend/src/main/java/io/metersphere/request/testcase/QueryTestCaseRequest.java
View File

@ -68,4 +68,9 @@ public class QueryTestCaseRequest extends BaseQueryRequest {
* 是否查询UI
*/
private boolean queryUi;
/**
* 是否待办状态
*/
private boolean unComing;
}

1
workstation/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
View File

@ -202,7 +202,6 @@
<foreach collection="projectIds" item="projectId" separator="," open="(" close=")">
#{projectId}
</foreach>
and tc.review_status in ('Prepare','Pass','UnPass')
and tc.create_user = #{userId,jdbcType=VARCHAR}
and (tc.status is null or tc.status Not IN ('Trash','Completed'));
</select>

13
workstation/frontend/src/business/component/CaseTableList.vue
View File

@ -426,10 +426,10 @@ export default {
}
} else {
if (this.condition.filters) {
this.condition.filters.review_status = ["Prepare", "Pass", "UnPass"];
this.condition.filters.review_status = ["Prepare", "Underway", "Pass", "UnPass"];
} else {
this.condition.filters = {
review_status: ["Prepare", "Pass", "UnPass"],
review_status: ["Prepare", "Underway", "Pass", "UnPass"],
};
}
}
@ -446,14 +446,17 @@ export default {
activated() {
this.getTemplateField();
if (this.condition.filters) {
this.condition.filters.review_status = ["Prepare", "Pass", "UnPass"];
this.condition.filters.review_status = ["Prepare", "Underway", "Pass", "UnPass"];
} else {
this.condition.filters = { review_status: ["Prepare", "Pass", "UnPass"] };
this.condition.filters = { review_status: ["Prepare", "Underway", "Pass", "UnPass"]};
}
let ids = this.$route.params.ids;
if (ids) {
this.condition.ids = ids;
}
if (!this.isCreation && !this.isFocus) {
this.condition.unComing = true;
}
this.initTableData();
this.condition.ids = null;
},
@ -686,7 +689,7 @@ export default {
this.condition.selectThisWeedData = false;
this.condition.selectThisWeedRelevanceData = false;
this.condition.caseCoverage = null;
this.condition.filters.review_status = ["Prepare", "Pass", "UnPass"];
this.condition.filters.review_status = ["Prepare", "Underway", "Pass", "UnPass"];
switch (this.selectDataRange) {
case "thisWeekCount":
this.condition.selectThisWeedData = true;