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/vo/TaskTraceVO.java | 22 ++++++++++++++++++++++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/MyFlowController.java | 7 ++++---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowMgrController.java | 10 +++++++++-
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java | 14 ++++++++++----
4 files changed, 45 insertions(+), 8 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowMgrController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowMgrController.java
index 9e39240..96fb795 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowMgrController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowMgrController.java
@@ -15,9 +15,12 @@
import org.springblade.core.tool.utils.StringUtil;
import org.springblade.flow.core.pojo.entity.BladeFlow;
import org.springblade.mdm.flow.service.FlowBusinessService;
+import org.springblade.mdm.flow.vo.TaskTraceVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.util.Collections;
+import java.util.List;
import java.util.Map;
@Slf4j
@@ -36,10 +39,15 @@
@GetMapping("overtime-list")
@ApiOperationSupport(order = 3)
@Operation(summary = "瓒呮椂鏌ヨ", description = "鏌ヨ鎵�鏈夎秴鏃朵换鍔�")
- public R<IPage<BladeFlow>> todoList(@Parameter(description = "鎵ц浜哄憳") String assigneeName, @Parameter(description = "鍏抽敭瀛�") String keyword, Query query) {
+ public R<IPage<BladeFlow>> overtimeList(@Parameter(description = "鎵ц浜哄憳") String assigneeName, @Parameter(description = "鍏抽敭瀛�") String keyword, Query query) {
IPage<BladeFlow> pages = businessService.selectOvertimePage(Condition.getPage(query), assigneeName,keyword);
return R.data(pages);
}
+ @GetMapping("process-trace")
+ public R<List<TaskTraceVO>> processTrace(long processInstanceId){
+ return R.data(Collections.emptyList());
+ }
+
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/MyFlowController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/MyFlowController.java
index 3532570..38da7f5 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/MyFlowController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/MyFlowController.java
@@ -20,6 +20,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.time.LocalDate;
import java.util.Map;
@Slf4j
@@ -38,8 +39,8 @@
@GetMapping("todo-list")
@ApiOperationSupport(order = 3)
@Operation(summary = "寰呭姙浠诲姟", description = "浼犲叆娴佺▼淇℃伅")
- public R<IPage<BladeFlow>> todoList(@Parameter(description = "鍏抽敭瀛�") String keyword, Query query) {
- IPage<BladeFlow> pages = businessService.selectTodoPage(Condition.getPage(query), keyword);
+ public R<IPage<BladeFlow>> todoList(@Parameter(description = "鍏抽敭瀛�") String keyword, @Parameter(description = "鍒涘缓鏃堕棿寮�濮�") LocalDate createTimeBegin, @Parameter(description = "鍒涘缓鏃堕棿鎴") LocalDate createTimeEnd, Query query) {
+ IPage<BladeFlow> pages = businessService.selectTodoPage(Condition.getPage(query), createTimeBegin,createTimeEnd,keyword);
return R.data(pages);
}
@@ -49,7 +50,7 @@
@GetMapping("alltask-list")
@ApiOperationSupport(order = 3)
@Operation(summary = "鎵�鏈変换鍔★紙fortest锛�", description = "浼犲叆娴佺▼淇℃伅")
- public R<IPage<BladeFlow>> alltaskList(@Parameter(description = "鍏抽敭瀛�") String keyword, Query query) {
+ public R<IPage<BladeFlow>> alltaskList(@Parameter(description = "鍏抽敭瀛�") String keyword,LocalDate createTimeBegin,LocalDate createTimeEnd, Query query) {
IPage<BladeFlow> pages = businessService.selectAllTaskPage(Condition.getPage(query), keyword);
return R.data(pages);
}
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();
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/vo/TaskTraceVO.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/vo/TaskTraceVO.java
new file mode 100644
index 0000000..e34c147
--- /dev/null
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/vo/TaskTraceVO.java
@@ -0,0 +1,22 @@
+package org.springblade.mdm.flow.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+@Data
+@Schema(description = "娴佺▼杞ㄨ抗鏁版嵁")
+public class TaskTraceVO {
+
+ @Schema(description = "鎵ц浜�")
+ private String assigneeName;
+ @Schema(description = "鎵规敞")
+ private String comment;
+ @Schema(description = "寮�濮嬫椂闂�")
+ private LocalDateTime startTime;
+ @Schema(description = "瀹屾垚鏃堕棿")
+ private LocalDateTime completeTime;
+
+}
--
Gitblit v1.9.3