移动待办已办添加流程名称

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTaskDto.java

@@ -115,4 +115,7 @@ public class FlowTaskDto implements Serializable {
     private boolean hasRevokeButton = false;
     @ApiModelProperty("办理的url")
     private SysProUrlVo sysProUrlVo ;
+
+    @ApiModelProperty("流程名称")
+    private String flowableName;
 }

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java

@@ -877,6 +877,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
             flowTask.setTaskName(histTask.get("NAME_") == null ? "" : histTask.get("NAME_").toString());
             flowTask.setDeployId(histTask.get("DEPLOYMENT_ID_") == null ? "" : histTask.get("DEPLOYMENT_ID_").toString());
             flowTask.setProcDefName(histTask.get("PROC_DEF_NAME_") == null ? "" : histTask.get("PROC_DEF_NAME_").toString());
+            flowTask.setFlowableName(histTask.get("PROC_DEF_NAME_") == null ? "" : histTask.get("PROC_DEF_NAME_").toString());
             flowTask.setProcDefVersion(histTask.get("PROC_DEF_VERSION_") == null ? 0 : Integer.parseInt(histTask.get("PROC_DEF_VERSION_").toString()));
             flowTask.setProcInsId(histTask.get("PROC_INST_ID_").toString());
             flowTask.setHisProcInsId(histTask.get("PROC_INST_ID_").toString());
@@ -937,19 +938,6 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
         }
         List<FlowTaskDto> userHisTaskList = Optional.ofNullable(hisTaskList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FlowTaskDto.class)).collect(Collectors.toList());
         List<FlowTaskDto> namesHisTaskList = Optional.ofNullable(hisTaskList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FlowTaskDto.class)).collect(Collectors.toList());
-        //对hisTaskList进行筛选发起人
-     /*   if (StringUtils.isNotBlank(names)) {
-            String finalStartUserNameParams = names;
-            userHisTaskList = userHisTaskList.stream().filter(v -> v.getStartUserName().contains(finalStartUserNameParams)).collect(Collectors.toList());
-            namesHisTaskList = namesHisTaskList.stream().filter(v -> v.getProcDefName().contains(finalStartUserNameParams)).collect(Collectors.toList());
-        }
-        List<FlowTaskDto> finallyList = new ArrayList<>();
-        finallyList.addAll(namesHisTaskList);
-        finallyList.addAll(userHisTaskList);
-        page.setTotal(finallyList.size());
-        finallyList = finallyList.stream().skip((pageNum - 1) * pageSize).limit(pageSize).
-                collect(Collectors.toList());
-        page.setRecords(finallyList);*/
         page.setTotal(count);
         page.setRecords(hisTaskList);
 
@@ -2011,6 +1999,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
                     .singleResult();
             flowTask.setDeployId(pd.getDeploymentId());
             flowTask.setProcDefName(pd.getName());
+            flowTask.setFlowableName(pd.getName());
             flowTask.setProcDefVersion(pd.getVersion());
             flowTask.setProcInsId(task.getProcessInstanceId());
             // 流程发起人信息
@@ -2060,20 +2049,6 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
             }
             flowList.add(flowTask);
         }
-        //对flowList进行筛选发起人======================
-        /*List<FlowTaskDto> userHisTaskList = Optional.ofNullable(flowList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FlowTaskDto.class)).collect(Collectors.toList());
-        List<FlowTaskDto> namesHisTaskList = Optional.ofNullable(flowList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FlowTaskDto.class)).collect(Collectors.toList());
-        if (StringUtils.isNotBlank(names)) {
-            String finalStartUserNameParams = names;
-            userHisTaskList = userHisTaskList.stream().filter(v -> v.getStartUserName().contains(finalStartUserNameParams)).collect(Collectors.toList());
-            namesHisTaskList = namesHisTaskList.stream().filter(v -> v.getProcDefName().contains(finalStartUserNameParams)).collect(Collectors.toList());
-        }
-        List<FlowTaskDto> finallyList = new ArrayList<>();
-        finallyList.addAll(namesHisTaskList);
-        finallyList.addAll(userHisTaskList);
-        page.setTotal(finallyList.size());
-        finallyList = finallyList.stream().skip((pageNum - 1) * pageSize).limit(pageSize).
-                collect(Collectors.toList());*/
         page.setRecords(flowList);
         ResultBean<Page<FlowTaskDto>> rb = new ResultBean<Page<FlowTaskDto>>();
         return rb.success().setData(page);

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskDoVo.java

@@ -50,4 +50,7 @@ public class FlowTaskDoVo implements Vo {
 
     @ApiModelProperty("流程ID")
     private String procDefId;
+
+    @ApiModelProperty("流程名称")
+    private String flowableName;
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskFinishVo.java

@@ -56,4 +56,7 @@ public class FlowTaskFinishVo implements Vo {
     @ApiModelProperty("任务执行人名称")
     @JsonProperty("currentHandle")
     private String assigneeName;
+
+    @ApiModelProperty("流程名称")
+    private String flowableName;
 }