From b73de095355012a4a48b3746e76a1e3e4949f02a Mon Sep 17 00:00:00 2001 From: chenjianxing Date: Tue, 20 Dec 2022 22:24:03 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E7=BC=BA=E9=99=B7=E4=BB=A3=E7=A0=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- framework/sdk-parent/frontend/src/i18n/lang/track/en-US.js | 2 +- framework/sdk-parent/frontend/src/i18n/lang/track/zh-CN.js | 2 +- framework/sdk-parent/frontend/src/i18n/lang/track/zh-TW.js | 2 +- project-management/frontend/src/business/home/EditProject.vue | 2 +- .../frontend/src/business/workspace/project/EditProject.vue | 2 +- .../java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml | 2 +- .../src/main/java/io/metersphere/service/IssuesService.java | 4 +++- 7 files changed, 9 insertions(+), 7 deletions(-) diff --git a/framework/sdk-parent/frontend/src/i18n/lang/track/en-US.js b/framework/sdk-parent/frontend/src/i18n/lang/track/en-US.js index 8c68d11d02..50533c66af 100644 --- a/framework/sdk-parent/frontend/src/i18n/lang/track/en-US.js +++ b/framework/sdk-parent/frontend/src/i18n/lang/track/en-US.js @@ -471,7 +471,7 @@ export default { zentao_bug_build: "Zentao Impact version", zentao_bug_assigned: "Zentao handler", third_party_integrated: "Third-party Platform", - use_third_party: "Enable Jira Issue Template", + use_third_party: "Enable {0} Issue Template", update_third_party_bugs: "Update the defects of third-party platforms", sync_bugs: "Synchronization Issue", sync_complete: "Synchronization complete", 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 0676d62a2d..b13ce93647 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 @@ -474,7 +474,7 @@ export default { zentao_bug_build: "禅道 影响版本", zentao_bug_assigned: "禅道 处理人", third_party_integrated: "集成第三方平台", - use_third_party: "使用 Jira 缺陷模板", + use_third_party: "使用 {0} 缺陷模板", update_third_party_bugs: "更新第三方平台的缺陷", sync_bugs: "同步缺陷", sync_complete: "同步完成", 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 eeb912e9d9..6691db0bcd 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 @@ -474,7 +474,7 @@ export default { zentao_bug_build: "禪道 影響版本", zentao_bug_assigned: "禪道 處理人", third_party_integrated: "集成第三方平臺", - use_third_party: "使用 Jira 缺陷模闆", + use_third_party: "使用 {0} 缺陷模闆", update_third_party_bugs: "更新第三方平臺的缺陷", sync_bugs: "同步缺陷", sync_complete: "同步完成", diff --git a/project-management/frontend/src/business/home/EditProject.vue b/project-management/frontend/src/business/home/EditProject.vue index 4ea939643b..2354f99b8e 100644 --- a/project-management/frontend/src/business/home/EditProject.vue +++ b/project-management/frontend/src/business/home/EditProject.vue @@ -31,7 +31,7 @@ - {{ $t('test_track.issue.use_third_party') }} + {{ $t('test_track.issue.use_third_party', [form.platform]) }} diff --git a/system-setting/frontend/src/business/workspace/project/EditProject.vue b/system-setting/frontend/src/business/workspace/project/EditProject.vue index fc265e19f2..4c4562053a 100644 --- a/system-setting/frontend/src/business/workspace/project/EditProject.vue +++ b/system-setting/frontend/src/business/workspace/project/EditProject.vue @@ -31,7 +31,7 @@ - {{ $t('test_track.issue.use_third_party') }} + {{ $t('test_track.issue.use_third_party', [form.platform]) }} 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 f33857437f..5c40607781 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 @@ -112,7 +112,7 @@ group by issues.id diff --git a/test-track/backend/src/main/java/io/metersphere/service/IssuesService.java b/test-track/backend/src/main/java/io/metersphere/service/IssuesService.java index 1460299e5d..8e09496cd0 100644 --- a/test-track/backend/src/main/java/io/metersphere/service/IssuesService.java +++ b/test-track/backend/src/main/java/io/metersphere/service/IssuesService.java @@ -292,7 +292,9 @@ public class IssuesService { issues.setId(UUID.randomUUID().toString()); } issues.setCreateTime(System.currentTimeMillis()); - issues.setUpdateTime(System.currentTimeMillis()); + if (issues.getUpdateTime() == null) { + issues.setUpdateTime(System.currentTimeMillis()); + } issues.setNum(getNextNum(issues.getProjectId())); issues.setCreator(SessionUtils.getUserId()); issuesMapper.insert(issues);