1.task实体中添加关联实体id字段

2.修改同步任务逻辑

@@ -33,6 +33,10 @@ public class Task implements Serializable {
     @Column(name = "task_template_id", nullable = false)
     private Long taskTemplateId;
 
+    /** 关联实体id */
+    @Column(name = "entity_id", nullable = false)
+    private String entityId;
+
     @Transient
     private String taskTemplateCode;
 

@@ -19,6 +19,9 @@ public class TaskDTO implements Serializable {
     /** 任务模板id */
     private Long taskTemplateId;
 
+    /** 关联实体id */
+    private String entityId;
+
     /** 任务重复类型，-1：不限次；1：单次；>1：多次 */
     private Integer taskRepeatType;
 

 package com.topdraw.business.process.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.topdraw.business.module.task.attribute.domain.TaskAttr;
 import com.topdraw.business.module.task.attribute.service.TaskAttrService;
 import com.topdraw.business.module.task.attribute.service.dto.TaskAttrDTO;
@@ -50,10 +51,10 @@ public class TaskOperationServiceImpl implements TaskOperationService {
         TaskDTO taskDTO = this.findByCode(code);
         if (Objects.isNull(taskDTO.getId())) {
             TaskDTO taskDTO_ = this.taskService.create(task);
-            if (Objects.nonNull(taskDTO_.getId())) {
+            /*if (Objects.nonNull(taskDTO_.getId())) {
                 task.setId(taskDTO_.getId());
                 this.createTaskAttr(task);
-            }
+            }*/
         }
     }
 
@@ -72,17 +73,23 @@ public class TaskOperationServiceImpl implements TaskOperationService {
         String code = task.getCode();
         TaskDTO taskDTO = this.findByCode(code);
         if (Objects.nonNull(taskDTO.getId())) {
-            Long id = taskDTO.getId();
-            task.setId(id);
+            Task task1 = new Task();
+            BeanUtils.copyProperties(taskDTO, task1);
 
+            Long id = taskDTO.getId();
+            task1.setId(id);
             String taskTemplateCode = task.getTaskTemplateCode();
-            TaskTemplateDTO taskTemplateDTO = this.taskTemplateOperationService.findByCode(taskTemplateCode);
-            Long templateId = taskTemplateDTO.getId();
-            task.setTaskTemplateId(templateId);
-            TaskDTO update = this.update(task);
-            if (Objects.nonNull(update)) {
-                this.updateTaskAttr(task);
+            if (StringUtils.isNotBlank(taskTemplateCode)) {
+                TaskTemplateDTO taskTemplateDTO = this.taskTemplateOperationService.findByCode(taskTemplateCode);
+                Long templateId = taskTemplateDTO.getId();
+                task1.setTaskTemplateId(templateId);
             }
+
+            task1.copy(task);
+            TaskDTO update = this.update(task1);
+            /*if (Objects.nonNull(update)) {
+                this.updateTaskAttr(task);
+            }*/
         }
 
     }
@@ -129,8 +136,7 @@ public class TaskOperationServiceImpl implements TaskOperationService {
     }
 
     private TaskDTO findByCode(String code){
-        TaskDTO taskDTO = this.taskService.findByCode(code);
-        return taskDTO;
+        return this.taskService.findByCode(code);
     }
 
 }