diff --git a/framework/sdk-parent/frontend/src/i18n/lang/track/zh-CN.js b/framework/sdk-parent/frontend/src/i18n/lang/track/zh-CN.js index f07910cd29..f5efd68b8d 100644 --- a/framework/sdk-parent/frontend/src/i18n/lang/track/zh-CN.js +++ b/framework/sdk-parent/frontend/src/i18n/lang/track/zh-CN.js @@ -466,7 +466,7 @@ export default { status_active: '激活', status_delete: '删除', status_in_progress: '接受/处理', - status_rejected: '拒绝', + status_rejected: '已拒绝', status_upcoming: '待办', status_reopened: '重新打开', please_choose_current_owner: "请选择处理人", diff --git a/framework/sdk-parent/frontend/src/i18n/lang/track/zh-TW.js b/framework/sdk-parent/frontend/src/i18n/lang/track/zh-TW.js index 0bde64afca..a2bf36542c 100644 --- a/framework/sdk-parent/frontend/src/i18n/lang/track/zh-TW.js +++ b/framework/sdk-parent/frontend/src/i18n/lang/track/zh-TW.js @@ -466,7 +466,7 @@ export default { status_active: '激活', status_delete: '刪除', status_in_progress: '接受/處理', - status_rejected: '拒絕', + status_rejected: '已拒絕', status_upcoming: '待辦', status_reopened: '重新打開', please_choose_current_owner: "請選擇處理人", diff --git a/framework/sdk-parent/xpack-interface/src/main/java/io/metersphere/xpack/track/dto/request/IssuesRequest.java b/framework/sdk-parent/xpack-interface/src/main/java/io/metersphere/xpack/track/dto/request/IssuesRequest.java index e94d5a9447..fe38bc800a 100644 --- a/framework/sdk-parent/xpack-interface/src/main/java/io/metersphere/xpack/track/dto/request/IssuesRequest.java +++ b/framework/sdk-parent/xpack-interface/src/main/java/io/metersphere/xpack/track/dto/request/IssuesRequest.java @@ -64,4 +64,13 @@ public class IssuesRequest extends BaseQueryRequest { * 缺陷导出勾选ID */ private List exportIds; + + /** + * 本周遗留缺陷 + */ + private Boolean thisWeekUnClosedIssue = false; + /** + * 本周遗留缺陷ID + */ + private List thisWeekUncloseIds; } diff --git a/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.java b/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.java index cf555af1af..ce524b9248 100644 --- a/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.java +++ b/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.java @@ -44,4 +44,8 @@ public interface ExtIssuesMapper { List getIssueCustomFields(List ids); List getPlatformIssueByIds(@Param("ids") List ids, @Param("projectId") String projectId); + + Long getThisWeekIssueCount(@Param("ids") List ids, @Param("projectId") String projectId); + + List getTestPlanThisWeekIssue(String projectId); } diff --git a/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml b/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml index ddc1f1b25b..11c21c638e 100644 --- a/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml +++ b/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml @@ -161,6 +161,24 @@ #{value} + + + + +