字段添加

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgInstallationNoticeDto.java

@@ -264,4 +264,6 @@ public class JgInstallationNoticeDto extends BaseDto {
     @ApiModelProperty (value = "下一节点可执行人")
     private String nextExecuteUserIds;
 
+
+    private String transferToUserIds;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgTransferNoticeDto.java

@@ -232,4 +232,6 @@ public class JgTransferNoticeDto extends BaseDto {
     private String equAddress;
 
 
+    private String transferToUserIds;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgInstallationNotice.java

@@ -426,4 +426,7 @@ public class JgInstallationNotice extends BaseEntity {
     @TableField("\"next_execute_user_ids\"")
     private String nextExecuteUserIds;
 
+
+    @TableField(value = "transfer_to_user_ids")
+    private String transferToUserIds;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgTransferNotice.java

@@ -323,4 +323,7 @@ public class JgTransferNotice extends BaseEntity {
     private String equAddress;
 
 
+    @TableField(value = "transfer_to_user_ids")
+    private String transferToUserIds;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgInstallationNoticeServiceImpl.java

@@ -776,6 +776,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         // 执行工作流并返回组装好的工作流信息
         WorkflowResultDto workflowResultDto = getWorkflowResultDto(op, jgInstallationNotice);
         jgInstallationNotice.setPromoter(reginParams.getUserModel().getUserId());
+        jgInstallationNotice.setNextTaskId(workflowResultDto.getNextTaskId());
         TaskV2Model taskV2Model = new TaskV2Model();
         if ("0".equals(op)) {
             if (StringUtils.isEmpty(workflowResultDto.getNextExecutorRoleIds())) {
@@ -922,7 +923,6 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             taskModelDto.setModel(taskMessageDto);
             commonService.buildTaskModel(Collections.singletonList(taskModelDto));
         }
-        jgInstallationNotice.setNextTaskId(workflowResultDto.getNextTaskId());
         jgInstallationNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
         jgInstallationNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
         this.updateById(jgInstallationNotice);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgTransferNoticeServiceImpl.java

@@ -686,6 +686,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         WorkflowResultDto workflowResultDto = getWorkflowResultDto(op, opinion, jgTransferNotice);
 
         jgTransferNotice.setPromoter(reginParams.getUserModel().getUserId());
+        jgTransferNotice.setNextTaskId(workflowResultDto.getNextTaskId());
         TaskV2Model taskV2Model = new TaskV2Model();
         if ("0".equals(op)) {
             if (StringUtils.isEmpty(workflowResultDto.getNextExecutorRoleIds())) {
@@ -769,7 +770,6 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             taskModelDto.setModel(taskMessageDto);
             commonService.buildTaskModel(Collections.singletonList(taskModelDto));
         }
-        jgTransferNotice.setNextTaskId(workflowResultDto.getNextTaskId());
         jgTransferNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
         jgTransferNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
         jgTransferNoticeMapper.updateById(jgTransferNotice);