From 7978162cac9730d0c8e7ad9016d28c65e5da69c6 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 16 六月 2025 23:11:26 +0800
Subject: [PATCH] 增加todolist接口的时间查询条件
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java
index d4113b7..24f3cd2 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java
@@ -37,9 +37,7 @@
import org.flowable.task.api.history.HistoricTaskInstanceQuery;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.support.Kv;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.core.tool.utils.StringPool;
-import org.springblade.core.tool.utils.StringUtil;
+import org.springblade.core.tool.utils.*;
import org.springblade.flow.core.constant.ProcessConstant;
import org.springblade.flow.core.pojo.entity.BladeFlow;
import org.springblade.flow.core.utils.TaskUtil;
@@ -48,6 +46,7 @@
import org.springblade.mdm.flow.util.MdmFlowCache;
import org.springframework.stereotype.Service;
+import java.time.LocalDate;
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
@@ -66,13 +65,20 @@
private final HistoryService historyService;
- public IPage<BladeFlow> selectTodoPage(IPage<BladeFlow> page, String keyword) {
+ public IPage<BladeFlow> selectTodoPage(IPage<BladeFlow> page, LocalDate createTimeBegin,LocalDate createTimeEnd, String keyword) {
//String taskUser = TaskUtil.getTaskUser();
String userId = ""+AuthUtil.getUserId();
List<BladeFlow> flowList = new LinkedList<>();
TaskQuery todoQuery = taskService.createTaskQuery().taskAssignee(userId).active().includeProcessVariables();
+ if(Func.isNotEmpty(createTimeBegin)){
+ todoQuery.taskCreatedAfter(DateUtil.toDate(createTimeBegin));
+ //濡傛灉鏌ヨ瀹炰緥鐨勫紑濮嬫椂闂达細todoQuery.taskInProgressStartDueAfter()
+ }
+ if(Func.isNotEmpty(createTimeEnd)){
+ todoQuery.taskCreatedBefore(DateUtil.toDate(createTimeEnd));
+ }
if(Func.isNotEmpty(keyword)){
todoQuery.or();
--
Gitblit v1.9.3