From 92565f842ed2e730d341815d80fbe6ebf3078bcb Mon Sep 17 00:00:00 2001 From: yitonglei Date: Sat, 18 Feb 2023 16:33:00 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9WfProcess=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/workbench/service/impl/WorkBenchServiceImpl.java | 5 ++++- .../springblade/plugin/workflow/process/model/WfProcess.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/workbench/service/impl/WorkBenchServiceImpl.java b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/workbench/service/impl/WorkBenchServiceImpl.java index a920e80..8090e6c 100644 --- a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/workbench/service/impl/WorkBenchServiceImpl.java +++ b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/workbench/service/impl/WorkBenchServiceImpl.java @@ -47,9 +47,12 @@ public class WorkBenchServiceImpl implements IWorkBenchService { } }).collect(Collectors.toList()); - //将到期任务按照 + //将到期任务按照提醒类型分类 collect.forEach(cl ->{ + Map variableMap = cl.getProcessVariables(); + if(Func.isNotEmpty(variableMap.get("tixingmoshi")) && Func.isNotBlank(variableMap.get("tixingmoshi").toString())){ + } }); } } diff --git a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/workflow/process/model/WfProcess.java b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/workflow/process/model/WfProcess.java index 19b3bad..da545fe 100644 --- a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/workflow/process/model/WfProcess.java +++ b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/workflow/process/model/WfProcess.java @@ -242,6 +242,6 @@ public class WfProcess implements Serializable { */ private String formSearch; - private String uploadrecord; + private List> uploadrecord; }