feature: 工作流修改任务分支返回参数

approve-api/src/main/java/com/dragonsoft/dcuc/approve/model/resp/TaskOutgoingVo.java

@@ -13,31 +13,31 @@ public class TaskOutgoingVo {
     /**
      * 任务定义id
      */
-    @ApiModelProperty(value = "访问资源信息")
-    private String activitiId;
+    @ApiModelProperty(value = "任务定义id")
+    private String taskDefinitionKey;
     /**
      * 任务名称
      */
-    @ApiModelProperty(value = "访问资源信息")
-    private String activitiName;
+    @ApiModelProperty(value = "任务名称")
+    private String name;
 
     @ApiModelProperty(value = "任务标识码")
     private String taskCode;
 
-    public String getActivitiId() {
-        return activitiId;
+    public String getTaskDefinitionKey() {
+        return taskDefinitionKey;
     }
 
-    public void setActivitiId(String activitiId) {
-        this.activitiId = activitiId;
+    public void setTaskDefinitionKey(String taskDefinitionKey) {
+        this.taskDefinitionKey = taskDefinitionKey;
     }
 
-    public String getActivitiName() {
-        return activitiName;
+    public String getName() {
+        return name;
     }
 
-    public void setActivitiName(String activitiName) {
-        this.activitiName = activitiName;
+    public void setName(String name) {
+        this.name = name;
     }
 
     public String getTaskCode() {

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/service/impl/ApproveService.java

@@ -448,7 +448,7 @@ public class ApproveService implements IApproveService {
                 //通过任务id获取任务分支
                 List<TaskOutgoingVo> list = buildTaskOutgoingVoList(taskId);
                 for (ActivitiHolder activitiHolder: activitiHolderList){
-                    activitiHolder.setTaskDefinitionKey(list.get(0).getActivitiId());
+                    activitiHolder.setTaskDefinitionKey(list.get(0).getTaskDefinitionKey());
                 }
             }
             transMessage.setActivitiHolders(activitiHolderList);
@@ -1011,8 +1011,8 @@ public class ApproveService implements IApproveService {
         for (TaskDefinitionVo taskDefinitionVo: outgoingVo.getTaskDefinitionVoList()){
             if (!"end".equalsIgnoreCase(taskDefinitionVo.getTaskCode())){
                 TaskOutgoingVo taskOutgoingVo = new TaskOutgoingVo();
-                taskOutgoingVo.setActivitiId(taskDefinitionVo.getTaskDefinitionKey());
-                taskOutgoingVo.setActivitiName(taskDefinitionVo.getName());
+                taskOutgoingVo.setTaskDefinitionKey(taskDefinitionVo.getTaskDefinitionKey());
+                taskOutgoingVo.setName(taskDefinitionVo.getName());
                 taskOutgoingVo.setTaskCode(taskDefinitionVo.getTaskCode());
                 list.add(taskOutgoingVo);
             }