新增工作流执行接口

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/BasicGridAcceptanceDto.java

@@ -37,15 +37,25 @@ public class BasicGridAcceptanceDto extends BaseDto {
     @ApiModelProperty(value = "验收时间")
     protected Date acceptanceRecDate;
 
-    @ApiModelProperty(value = "工作流实例ID")
+    /**
+     * 工作流实例ID
+     */
     private String instanceId;
 
-    @ApiModelProperty(value = "下一个节点节点标识")
+    ///	下一个节点角色权限
+    private String nextExecutorIds;
+
+    //	任务发起人id
+    private String promoter;
+
+    //	流程下一节点id
+    private String nextTaskId;
+    //下一节点可执行人逗号分割	0	0
+    private String nextExecuteUserIds;
+    //工作流发起人id
+    private String createUserId;
+    //下个节点名称
+    private String nextNodeName;
+    //下个节点key
     private String nextNodeKey;
-
-    @ApiModelProperty(value = "下一个节点角色权限")
-    private String nextNodeRolePermission;
-
-    @ApiModelProperty(value = "下一个节点小程序路由")
-    private String nextNodeRoute;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/ProcessDto.java

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2024/1/16
+ */
+@Data
+public class ProcessDto {
+    private  String businessKey;//业务id
+    private  String processDefinitionKey;//工作流key
+    private  String completeFirstTask;//是否执行第一个节点  false true
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/StandardDto.java

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2024/1/16
+ */
+@Data
+public class StandardDto {
+    private  String   comment;//审核备注
+    private  String   result;//审核状态值
+    private  String   resultCode;//审核状态key
+    private  String   taskId; //工作流任务id
+    private  VariableDto   variable;//提交表单值
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/StartProcessDto.java

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2024/1/16
+ */
+@Data
+public class StartProcessDto {
+    private ProcessDto process;
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/VariableDto.java

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2024/1/16
+ */
+@Data
+public class VariableDto {
+
+    private  String  approvalStatus;//审核结果,0,1
+    private  String  operator;//操作人
+    private  String  operationTime;//操作时间
+    private  String  comment;//审核意见
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/BasicGridAcceptance.java

@@ -62,21 +62,28 @@ public class BasicGridAcceptance extends BaseEntity {
     @TableField("instance_id")
     private String instanceId;
 
-    /**
-     * 下一个节点节点标识
-     */
+    ///	下一个节点角色权限
+    @TableField("next_executor_ids")
+    private String nextExecutorIds;
+
+    //	当前节点执行任务id
+    @TableField("promoter")
+    private String promoter;
+
+    //	流程下一节点id
+    @TableField("next_task_id")
+    private String nextTaskId;
+    //下一节点可执行人逗号分割	0	0
+    @TableField("next_execute_user_ids")
+    private String nextExecuteUserIds;
+    //工作流发起人id
+    @TableField("create_user_id")
+    private String createUserId;
+    //下个节点名称
+    @TableField("next_node_name")
+    private String nextNodeName;
+    //下个节点key
     @TableField("next_node_key")
     private String nextNodeKey;
 
-    /**
-     * 下一个节点角色权限
-     */
-    @TableField("next_node_role_permission")
-    private String nextNodeRolePermission;
-
-    /**
-     * 下一个节点小程序路由
-     */
-    @TableField("next_node_route")
-    private String nextNodeRoute;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/pom.xml

@@ -56,6 +56,12 @@
           <artifactId>sdk-java</artifactId>
           <version>3.6.3</version>
       </dependency>
+      <dependency>
+          <groupId>com.yeejoin</groupId>
+          <artifactId>amos-feign-workflow</artifactId>
+          <version>1.10.4</version>
+          <scope>compile</scope>
+      </dependency>
   </dependencies>
   
   <build>

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/feign/WorkflowFeignClient.java

 package com.yeejoin.amos.boot.module.hygf.biz.feign;
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.biz.common.feign.MultipartSupportConfig;
+import com.yeejoin.amos.boot.module.hygf.api.dto.StandardDto;
+import com.yeejoin.amos.boot.module.hygf.api.dto.StartProcessDto;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -69,7 +72,7 @@ public interface WorkflowFeignClient {
      *是否需要自定执行第一个任务节点
      * */
     @RequestMapping(value = "/v2/task/start/batch", method = RequestMethod.POST)
-    FeignClientResult<JSONObject> startProcess( @RequestBody List<Map<String,Object>> data);
+    FeignClientResult<ProcessTaskDTO> startProcess(@RequestBody StartProcessDto startProcessDto);
 
 
 
@@ -89,7 +92,7 @@ public interface WorkflowFeignClient {
      *
      * */
     @RequestMapping(value = "/v2/task/complete/standard/{taskId}", method = RequestMethod.POST)
-    FeignClientResult<JSONObject> standard( @PathVariable(value = "taskId") String taskId    ,@RequestBody  Map<String,Object> data);
+    FeignClientResult<ProcessTaskDTO> standard( @PathVariable(value = "taskId") String taskId    ,@RequestBody StandardDto standardDto);