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 5590471..a920e80 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 @@ -3,13 +3,17 @@ package org.springblade.plugin.workbench.service.impl; import lombok.AllArgsConstructor; import org.flowable.engine.TaskService; import org.flowable.task.api.Task; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; import org.springblade.plugin.workbench.service.IWorkBenchService; import org.springblade.plugin.workflow.core.utils.WfTaskUtil; import org.springframework.stereotype.Service; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * @Description @@ -23,11 +27,28 @@ public class WorkBenchServiceImpl implements IWorkBenchService { private final TaskService taskService; public void getTask(){ + //获取正在运行的任务 List list = taskService.createTaskQuery().taskTenantId(WfTaskUtil.getTenantId()).list(); Map> taskRemindMap = new HashMap<>(); - list.forEach(hi -> { + //筛选出到期的任务 + List collect = list.stream().filter(ts -> { + Map variableMap = ts.getProcessVariables(); + if(Func.isNotEmpty(variableMap.get("qiwangwanchengshijian")) && Func.isNotBlank(variableMap.get("qiwangwanchengshijian").toString())){ + Date qiwangwanchengshijian = DateUtil.parse(variableMap.get("qiwangwanchengshijian").toString(), "yyyy-MM-dd HH:mm:ss"); + if(DateUtil.between(DateUtil.now(), qiwangwanchengshijian).isNegative()){ + return true; + }else{ + return false; + } + }else{ + return false; + } + }).collect(Collectors.toList()); + + //将到期任务按照 + collect.forEach(cl ->{ }); } diff --git a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/workflow/process/controller/WfProcessController.java b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/workflow/process/controller/WfProcessController.java index 4712466..bb93010 100644 --- a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/workflow/process/controller/WfProcessController.java +++ b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/workflow/process/controller/WfProcessController.java @@ -315,6 +315,7 @@ public class WfProcessController { @ApiImplicitParam(name = "copyUser", value = "抄送人"), @ApiImplicitParam(name = "assignee", value = "指定审批人"), @ApiImplicitParam(name = "variables", value = "表单参数"), + @ApiImplicitParam(name = "uploadrecord", value = "上传的文件") }) public R completeTask(@ApiIgnore @RequestBody WfProcess process) { if (ObjectUtil.isAnyEmpty(process.getTaskId(), process.getProcessInstanceId())) { 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 da545fe..19b3bad 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 List> uploadrecord; + private String uploadrecord; } diff --git a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/workflow/process/service/impl/WfProcessService.java b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/workflow/process/service/impl/WfProcessService.java index 23cdd41..e43a878 100644 --- a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/workflow/process/service/impl/WfProcessService.java +++ b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/workflow/process/service/impl/WfProcessService.java @@ -579,7 +579,7 @@ public class WfProcessService implements IWfProcessService { runtimeService.setVariable(task.getProcessInstanceId(), "wf_latest_task_assignee", WfTaskUtil.getTaskUser()); //重新给上传附件赋值,把新增的上传加上 - if(!Func.isEmpty(process.getUploadrecord()) && process.getUploadrecord().toString() != ""){ + if(Func.isNotEmpty(process.getUploadrecord()) && process.getUploadrecord().toString() != "" ){ runtimeService.setVariable(task.getProcessInstanceId(), "uploadrecord", process.getUploadrecord()); }