Ver código fonte

优化自定义外部表单支持

hubin 1 ano atrás
pai
commit
c2b399d28d

+ 3 - 0
src/main/java/com/aizuda/boot/modules/flw/entity/vo/FlwProcessVO.java

@@ -38,6 +38,9 @@ public class FlwProcessVO {
     @Schema(description = "流程定义版本")
     private Integer processVersion;
 
+    @Schema(description = "实例地址")
+    private String instanceUrl;
+
     @Schema(description = "备注说明")
     private String remark;
 

+ 3 - 0
src/main/java/com/aizuda/boot/modules/flw/entity/vo/TaskApprovalVO.java

@@ -29,6 +29,9 @@ public class TaskApprovalVO {
     @Schema(description = "任务ID")
     private Long taskId;
 
+    @Schema(description = "任务处理的url")
+    private String actionUrl;
+
     @Schema(description = "创建ID")
     private String createId;
 

+ 1 - 0
src/main/java/com/aizuda/boot/modules/flw/service/impl/ProcessTaskServiceImpl.java

@@ -120,6 +120,7 @@ public class ProcessTaskServiceImpl implements IProcessTaskService {
                     vo.setFormConfig(formConfig);
                 }
             }
+            vo.setActionUrl(nodeModel.getActionUrl());
             // 设置按钮控制参数
             vo.setAllowTransfer(nodeModel.getAllowTransfer());
             vo.setAllowAppendNode(nodeModel.getAllowAppendNode());

+ 2 - 2
src/main/resources/mapper/FlowlongMapper.xml

@@ -4,12 +4,12 @@
 <mapper namespace="com.aizuda.boot.modules.flw.mapper.FlowlongMapper">
 
     <select id="selectFlwProcessList" resultType="com.aizuda.boot.modules.flw.entity.vo.FlwProcessVO">
-        SELECT t2.category_id,t2.process_id,t1.process_key,t1.process_name,t1.process_icon,t1.process_version,t1.remark,t1.use_scope,
+        SELECT t2.category_id,t2.process_id,t1.process_key,t1.process_name,t1.process_icon,t1.process_version,t1.instance_url,t1.remark,t1.use_scope,
                t1.process_state,t1.sort AS process_sort,t1.create_time FROM flw_process t1 JOIN  flw_process_configure t2 ON t1.id=t2.process_id
     </select>
 
     <select id="selectLaunchProcessList" resultType="com.aizuda.boot.modules.flw.entity.vo.FlwProcessVO">
-        WITH tb AS (SELECT t2.category_id,t2.process_id,t1.process_key,t1.process_name,t1.process_icon,t1.process_version,
+        WITH tb AS (SELECT t2.category_id,t2.process_id,t1.process_key,t1.process_name,t1.process_icon,t1.process_version,t1.instance_url,
         t1.remark,t1.use_scope,t1.process_state,t1.sort AS process_sort,t1.create_time
         FROM flw_process t1 JOIN flw_process_configure t2 ON t1.ID = t2.process_id WHERE t1.process_state=1)
         SELECT tb.* FROM tb WHERE NOT EXISTS (SELECT 1 FROM flw_process_actor a WHERE tb.process_id=a.process_id) UNION ALL