From a420edd3d51f99165110b79e67636a90570263b6 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 20 Apr 2023 13:49:17 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=BE=85=E5=8A=9E=E5=B7=B2?= =?UTF-8?q?=E5=8A=9E=E6=B7=BB=E5=8A=A0=E6=B5=81=E7=A8=8B=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flowable/api/flowtask/FlowTaskDto.java | 3 ++ .../biz/flowtask/FlowTaskService.java | 29 ++----------------- .../portal/api/flow/app/FlowTaskDoVo.java | 3 ++ .../portal/api/flow/app/FlowTaskFinishVo.java | 3 ++ 4 files changed, 11 insertions(+), 27 deletions(-) diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTaskDto.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTaskDto.java index 17503c697b..b100f54aaf 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTaskDto.java +++ b/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; } diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java index d8af62359e..3da15e32c3 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java +++ b/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 userHisTaskList = Optional.ofNullable(hisTaskList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FlowTaskDto.class)).collect(Collectors.toList()); List 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 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 userHisTaskList = Optional.ofNullable(flowList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FlowTaskDto.class)).collect(Collectors.toList()); - List 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 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> rb = new ResultBean>(); return rb.success().setData(page); diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskDoVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskDoVo.java index 2bbef6e64c..45b0e30034 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskDoVo.java +++ b/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; } diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskFinishVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskFinishVo.java index f889fe27f2..75f58cc4c6 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskFinishVo.java +++ b/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; }