[dolphinscheduler] branch dev updated: [Feature-10604] Task name in the copied and imported workflow without copy suffix (#10607)

[zihaoxiang]

This is an automated email from the ASF dual-hosted git repository.

zihaoxiang pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git


The following commit(s) were added to refs/heads/dev by this push:
     new 5ebd53893c [Feature-10604] Task name in the copied and imported 
workflow without copy suffix (#10607)
5ebd53893c is described below

commit 5ebd53893cce180e1af9fa6b067ca6c58d22a5d4
Author: zhuxt2015 <594754...@qq.com>
AuthorDate: Tue Jul 26 15:21:33 2022 +0800

    [Feature-10604] Task name in the copied and imported workflow without copy 
suffix (#10607)
    
    * fix
    
    * remove imported task suffix
---
 .../api/service/impl/ProcessDefinitionServiceImpl.java                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
 
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
index a33b7668e6..4b493c6025 100644
--- 
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
+++ 
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
@@ -1232,7 +1232,7 @@ public class ProcessDefinitionServiceImpl extends 
BaseServiceImpl implements Pro
         List<TaskDefinitionLog> taskDefinitionLogList = new ArrayList<>();
         for (TaskDefinition taskDefinition : taskDefinitionList) {
             TaskDefinitionLog taskDefinitionLog = new 
TaskDefinitionLog(taskDefinition);
-            taskDefinitionLog.setName(taskDefinitionLog.getName() + "_import_" 
+ DateUtils.getCurrentTimeStamp());
+            taskDefinitionLog.setName(taskDefinitionLog.getName());
             taskDefinitionLog.setProjectCode(projectCode);
             taskDefinitionLog.setUserId(loginUser.getId());
             taskDefinitionLog.setVersion(Constants.VERSION_FIRST);
@@ -1824,7 +1824,7 @@ public class ProcessDefinitionServiceImpl extends 
BaseServiceImpl implements Pro
                     }
                     taskDefinitionLog.setProjectCode(targetProjectCode);
                     taskDefinitionLog.setVersion(0);
-                    taskDefinitionLog.setName(taskDefinitionLog.getName() + 
"_copy_" + DateUtils.getCurrentTimeStamp());
+                    taskDefinitionLog.setName(taskDefinitionLog.getName());
                 }
                 for (ProcessTaskRelationLog processTaskRelationLog : 
taskRelationList) {
                     if (processTaskRelationLog.getPreTaskCode() > 0) {