优化子流程逻辑

src/main/java/com/aizuda/boot/modules/flw/entity/vo/PendingApprovalTaskVO.java

@@ -24,6 +24,9 @@ public class PendingApprovalTaskVO {
     @Schema(description = "流程名称")
     private String processName;
 
+    @Schema(description = "流程类型")
+    private String processType;
+
     @Schema(description = "流程实例ID")
     private Long instanceId;
 

src/main/java/com/aizuda/boot/modules/flw/entity/vo/PendingClaimTaskVO.java

@@ -24,6 +24,9 @@ public class PendingClaimTaskVO {
     @Schema(description = "流程名称")
     private String processName;
 
+    @Schema(description = "流程类型")
+    private String processType;
+
     @Schema(description = "流程实例ID")
     private Long instanceId;
 

src/main/java/com/aizuda/boot/modules/flw/entity/vo/ProcessTaskVO.java

@@ -24,6 +24,9 @@ public class ProcessTaskVO {
     @Schema(description = "流程名称")
     private String processName;
 
+    @Schema(description = "流程类型")
+    private String processType;
+
     @Schema(description = "当前所在节点名称")
     private String currentNodeName;
 

src/main/resources/mapper/FlowlongMapper.xml

@@ -36,7 +36,7 @@
     </sql>
 
     <select id="selectPagePendingClaim" resultType="com.aizuda.boot.modules.flw.entity.vo.PendingClaimTaskVO">
-        SELECT i.process_id,p.process_name,i.id AS instance_id,i.instance_state,i.create_by AS launch_by,i.create_time AS launch_time,
+        SELECT i.process_id,p.process_name,p.process_type,i.id AS instance_id,i.instance_state,i.create_by AS launch_by,i.create_time AS launch_time,
         t."id" AS task_id,t.create_time,t.task_name,t.task_key,t.task_type,t.perform_type,t.expire_time,t.remind_time,t.remind_repeat
         FROM flw_task t JOIN flw_task_actor a ON t.id=a.task_id LEFT JOIN flw_his_instance i ON i.id=t.instance_id LEFT JOIN flw_process p ON i.process_id=p.id
         WHERE a.id IN (SELECT f.id FROM flw_task_actor f JOIN sys_user_role r ON r.role_id||''=f.actor_id WHERE f.actor_type=1 AND r.user_id=#{dto.userId}
@@ -45,7 +45,7 @@
     </select>
 
     <select id="selectPagePendingApproval" resultType="com.aizuda.boot.modules.flw.entity.vo.PendingApprovalTaskVO">
-        SELECT i.process_id,p.process_name,i.id AS instance_id,i.instance_state,i.create_by AS launch_by,i.create_time AS launch_time,
+        SELECT i.process_id,p.process_name,p.process_type,i.id AS instance_id,i.instance_state,i.create_by AS launch_by,i.create_time AS launch_time,
         t.id AS task_id,t.create_time,t.task_name,t.task_key,t.task_type,t.perform_type,t.assignor,t.expire_time,t.remind_time,t.remind_repeat
         FROM flw_task t JOIN flw_task_actor a ON t.id=a.task_id LEFT JOIN flw_his_instance i ON i.id=t.instance_id LEFT JOIN flw_process p ON i.process_id=p.id
         WHERE a.actor_type=0 AND a.actor_id=#{dto.createId}
@@ -53,21 +53,21 @@
     </select>
 
     <select id="selectPageMyApplication" resultType="com.aizuda.boot.modules.flw.entity.vo.ProcessTaskVO">
-        SELECT i.process_id,p.process_name,i.current_node_name,i.current_node_key,i.id AS instance_id,i.instance_state,i.create_id,i.create_by,i.create_time,i.expire_time,i.end_time,i.duration
+        SELECT i.process_id,p.process_name,p.process_type,i.current_node_name,i.current_node_key,i.id AS instance_id,i.instance_state,i.create_id,i.create_by,i.create_time,i.expire_time,i.end_time,i.duration
         FROM flw_his_instance i LEFT JOIN flw_process p ON i.process_id=p.id
         WHERE i.create_id=#{dto.createId}
         <include refid="sqlConditionProcessTask"></include>
     </select>
 
     <select id="selectPageMyReceived" resultType="com.aizuda.boot.modules.flw.entity.vo.ProcessTaskVO">
-        SELECT i.process_id,p.process_name,i.current_node_name,i.current_node_key,i.id AS instance_id,i.instance_state,i.create_id,i.create_by,i.create_time,i.expire_time,i.end_time,i.duration
+        SELECT i.process_id,p.process_name,p.process_type,i.current_node_name,i.current_node_key,i.id AS instance_id,i.instance_state,i.create_id,i.create_by,i.create_time,i.expire_time,i.end_time,i.duration
         FROM flw_his_instance i LEFT JOIN flw_process p ON i.process_id=p.id JOIN flw_his_task t ON i.id=t.instance_id JOIN flw_his_task_actor a ON t.id=a.task_id
         WHERE t.task_type=2 AND a.actor_id=#{dto.createId}
         <include refid="sqlConditionProcessTask"></include>
     </select>
 
     <select id="selectPageApproved" resultType="com.aizuda.boot.modules.flw.entity.vo.ProcessTaskVO">
-        SELECT i.process_id,p.process_name,i.current_node_name,i.current_node_key,i.id AS instance_id,i.instance_state,i.create_id,i.create_by,i.create_time,i.expire_time,i.end_time,i.duration
+        SELECT i.process_id,p.process_name,p.process_type,i.current_node_name,i.current_node_key,i.id AS instance_id,i.instance_state,i.create_id,i.create_by,i.create_time,i.expire_time,i.end_time,i.duration
         FROM flw_his_instance i LEFT JOIN flw_process p ON i.process_id=p.id
         WHERE EXISTS (SELECT 1 FROM flw_his_task c JOIN flw_his_task_actor a ON c.id=a.task_id WHERE i.id=c.instance_id AND a.actor_id=#{dto.createId})
         <include refid="sqlConditionProcessTask"></include>