From b4d30b66da35dcd6fe569bd2296a5cc6bbfaba6e Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 17 六月 2025 23:02:55 +0800
Subject: [PATCH] todo-list日期格式调整
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/MyFlowController.java | 4 +++-
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++---
2 files changed, 54 insertions(+), 4 deletions(-)
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 507da50..3ccbd66 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
@@ -19,9 +19,11 @@
import org.springblade.system.feign.IUserSearchClient;
import org.springblade.system.pojo.entity.User;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.*;
import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
@@ -42,7 +44,7 @@
@GetMapping("todo-list")
@ApiOperationSupport(order = 3)
@Operation(summary = "寰呭姙浠诲姟", description = "浼犲叆娴佺▼淇℃伅")
- public R<IPage<FlowVO>> todoList(@Parameter(description = "鍏抽敭瀛�") String keyword, @Parameter(description = "鍒涘缓鏃堕棿寮�濮�") LocalDate createTimeBegin, @Parameter(description = "鍒涘缓鏃堕棿鎴") LocalDate createTimeEnd, Query query) {
+ public R<IPage<FlowVO>> todoList(@Parameter(description = "鍏抽敭瀛�") String keyword, @Parameter(description = "鍒涘缓鏃堕棿寮�濮�") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime createTimeBegin, @Parameter(description = "鍒涘缓鏃堕棿鎴") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime createTimeEnd, Query query) {
IPage<FlowVO> pages = businessService.selectTodoPage(Condition.getPage(query), createTimeBegin,createTimeEnd,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 33bcb27..93fec5a 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
@@ -6,8 +6,10 @@
import org.flowable.engine.HistoryService;
import org.flowable.engine.TaskService;
import org.flowable.engine.history.HistoricProcessInstance;
+import org.flowable.engine.task.Comment;
import org.flowable.task.api.Task;
import org.flowable.task.api.TaskQuery;
+import org.flowable.task.api.history.HistoricTaskInstance;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.*;
@@ -21,9 +23,12 @@
import org.springframework.stereotype.Service;
import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Collections;
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
+import java.util.stream.Collectors;
/**
* 娴佺▼涓氬姟瀹炵幇绫�
@@ -38,7 +43,15 @@
private final HistoryService historyService;
private final IUserClient userClient;
- public IPage<FlowVO> selectTodoPage(IPage<FlowVO> page, LocalDate createTimeBegin, LocalDate createTimeEnd, String keyword) {
+ /**
+ * 鏌ヨ鎴戠殑娴佺▼(涓汉寰呭姙鍒楄〃)
+ * @param page
+ * @param createTimeBegin
+ * @param createTimeEnd
+ * @param keyword
+ * @return
+ */
+ public IPage<FlowVO> selectTodoPage(IPage<FlowVO> page, LocalDateTime createTimeBegin, LocalDateTime createTimeEnd, String keyword) {
//String taskUser = TaskUtil.getTaskUser();
String userId = "" + AuthUtil.getUserId();
List<FlowVO> flowList = new LinkedList<>();
@@ -46,11 +59,13 @@
TaskQuery todoQuery = taskService.createTaskQuery().taskAssignee(userId).active().includeProcessVariables();
if (Func.isNotEmpty(createTimeBegin)) {
todoQuery.taskCreatedAfter(DateUtil.toDate(createTimeBegin));
- //濡傛灉鏌ヨ瀹炰緥鐨勫紑濮嬫椂闂达細todoQuery.taskInProgressStartDueAfter()
+
+ ////濡傛灉鏌ヨ瀹炰緥鐨勫紑濮嬫椂闂达細鍙兘鐢ㄤ互涓嬭繖涓紝鍏堟煡鍑哄疄渚媔d鏉�
+ //todoQuery.processInstanceIdIn()
}
if (Func.isNotEmpty(createTimeEnd)) {
todoQuery.taskCreatedBefore(DateUtil.toDate(createTimeEnd));
-
+ //todoQuery.taskInProgressStartTimeBefore(DateUtil.toDate(createTimeEnd));
}
if (Func.isNotEmpty(keyword)) {
addKeywordCondition(todoQuery, keyword);
@@ -251,6 +266,7 @@
if (bladeFlow.getEndDate() != null) {
taskQuery.taskCreatedBefore(bladeFlow.getEndDate());
}
+
List<Task> tasks = taskQuery.list();
tasks.forEach(task -> {
FlowVO flow = new FlowVO();
@@ -280,6 +296,12 @@
if(ru.isSuccess()) {
flow.setStartUserName(ru.getData().getName());
}
+ ;
+ List<Comment> comments = lastStepComments(task);//taskService.getTaskComments(task.getId());
+ if(!comments.isEmpty()){
+ flow.setComment(comments.get(0).getFullMessage());
+ }
+
MdmFlowProcess processDefinition = MdmFlowCache.getProcessDefinition(task.getProcessDefinitionId());
flow.setCategory(processDefinition.getCategory());
@@ -295,6 +317,32 @@
});
}
+ List<Comment> lastStepComments(Task currentTask){
+ List<HistoricTaskInstance> previousTasks = historyService.createHistoricActivityInstanceQuery()
+ .processInstanceId(currentTask.getProcessInstanceId())
+ .activityType("userTask") // 鐩存帴鏌ヨ鐢ㄦ埛浠诲姟绫诲瀷
+ .orderByHistoricActivityInstanceEndTime()
+ .desc()
+ .list()
+ .stream()
+ .filter(activity -> !activity.getActivityId().equals(currentTask.getTaskDefinitionKey()))
+ .map(activity -> historyService.createHistoricTaskInstanceQuery()
+ .taskDefinitionKey(activity.getActivityId())
+ .processInstanceId(activity.getProcessInstanceId())
+ .orderByHistoricTaskInstanceEndTime()
+ .desc()
+ .list()
+ )
+ .flatMap(List::stream)
+ .toList();
+ List<Comment> comments;
+ if (!previousTasks.isEmpty()) {
+ return taskService.getTaskComments(previousTasks.get(0).getId());
+
+ }else{
+ return Collections.emptyList();
+ }
+ }
/**
* 鑾峰彇鍘嗗彶娴佺▼
*
--
Gitblit v1.9.3