2023 09 22 bug修改

blade-service-api/blade-business-api/src/main/java/org/springblade/business/vo/BusinessTaskPageVO.java

@@ -47,4 +47,7 @@ public class BusinessTaskPageVO implements Serializable {
     @ApiModelProperty(value = "流程实例id")
     private String processInstanceId;
 
+    @ApiModelProperty(value = "流程分支实例id")
+    private String parallelProcessInstanceId;
+
 }

blade-service/blade-business/src/main/java/org/springblade/business/controller/TaskController.java

@@ -1223,7 +1223,7 @@ public class TaskController extends BladeController {
             String resultIds = processInstanceIds.stream()
                     .map(id -> "'" + id + "'")
                     .collect(Collectors.joining(","));
-            taskParallelGroupMap = jdbcTemplate.query("select process_instance_id,task_user,task_user_name,e_visa_status,e_visa_content from u_task_parallel where process_instance_id in(" + resultIds + ") order by id", new BeanPropertyRowMapper<>(TaskParallel.class)).stream().collect(Collectors.groupingBy(TaskParallel::getProcessInstanceId));
+            taskParallelGroupMap = jdbcTemplate.query("select process_instance_id,task_user,task_user_name,e_visa_status,e_visa_content,parallel_process_instance_id from u_task_parallel where process_instance_id in(" + resultIds + ") order by id", new BeanPropertyRowMapper<>(TaskParallel.class)).stream().collect(Collectors.groupingBy(TaskParallel::getProcessInstanceId));
         }
 
         Map<String, List<TaskParallel>> finalTaskParallelGroupMap = taskParallelGroupMap;
@@ -1258,6 +1258,7 @@ public class TaskController extends BladeController {
                         TaskParallel taskParallel = taskParallelList.stream().filter(f -> ObjectUtil.isNotEmpty(f.getTaskUser()) && f.getTaskUser().equals(SecureUtil.getUserId().toString())).findAny().orElse(null);
                         if (taskParallel != null) {
                             vo.setEVisaStatus(taskParallel.getEVisaContent() != null ? taskParallel.getEVisaContent() : "");
+                            vo.setParallelProcessInstanceId(taskParallel.getParallelProcessInstanceId());
                         }
                         if (vo.getTaskStatusName().equals("已废除")) {
                             vo.setEVisaStatus("废除成功");