From 1fffb97916064ef5348a9b2ca0b0e8e4e5b89325 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 10 八月 2025 00:10:19 +0800
Subject: [PATCH] 历史流程查询
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/MyFlowController.java | 12 +---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowMgrController.java | 3
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java | 115 +++++++++++++++++++++++++++++++++++--
3 files changed, 112 insertions(+), 18 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 e64ac6a..e43cc6a 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
@@ -38,6 +38,7 @@
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -143,7 +144,7 @@
@GetMapping("finished-list")
@ApiOperationSupport(order = 3)
@Operation(summary = "鍘嗗彶娴佺▼鏌ヨ", description = "鏌ヨ宸插畬缁撶殑鎵�鏈夋祦绋�")
- public R<IPage<FlowVO>> finishedList(@Parameter(description = "娴佺▼绫诲瀷")String processDefinitionKey,@Parameter(description = "浠诲姟鍒拌揪鏃堕棿寮�濮�") LocalDate createTimeBegin, @Parameter(description = "浠诲姟鍒拌揪鏃堕棿鎴")LocalDate createTimeEnd, @Parameter(description = "鍏抽敭瀛�") String keyword, Query query) {
+ public R<IPage<FlowVO>> finishedList(@Parameter(description = "娴佺▼绫诲瀷")String processDefinitionKey, @Parameter(description = "浠诲姟鍒拌揪鏃堕棿寮�濮�") LocalDateTime createTimeBegin, @Parameter(description = "浠诲姟鍒拌揪鏃堕棿鎴") LocalDateTime createTimeEnd, @Parameter(description = "鍏抽敭瀛�") String keyword, Query query) {
IPage<FlowVO> pages = businessService.selectFinishedPage(Condition.getPage(query), processDefinitionKey,createTimeBegin,createTimeEnd,keyword);
return R.data(pages);
}
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 34ad7f2..0b83eff 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
@@ -46,6 +46,9 @@
@Operation(summary = "寰呭姙浠诲姟", description = "浼犲叆娴佺▼淇℃伅")
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);
+
+ //pages = businessService.selectFinishedPage(Condition.getPage(query), "",createTimeBegin, createTimeEnd, keyword);
+
return R.data(pages);
}
@@ -64,15 +67,6 @@
@PostMapping("transferTask")
public R<Void> transferTask(String taskId,String newAssigneeId, String processInstanceId, String comment) {
// 澧炲姞璇勮
- /*
- if (StringUtil.isNoneBlank(processInstanceId, comment)) {
- taskService.addComment(taskId, processInstanceId, comment);
- }
-
- // 瀹屾垚浠诲姟
- taskService.setAssignee(taskId, newAssigneeId);
-
- */
try {
this.flowTransferService.transferTask(taskId, newAssigneeId, comment);
return R.success("娴佺▼杞淳鎴愬姛");
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 180c7f8..590d1c2 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
@@ -10,8 +10,10 @@
import org.flowable.engine.history.HistoricProcessInstanceQuery;
import org.flowable.engine.task.Comment;
import org.flowable.task.api.Task;
+import org.flowable.task.api.TaskInfoQuery;
import org.flowable.task.api.TaskQuery;
import org.flowable.task.api.history.HistoricTaskInstance;
+import org.flowable.task.api.history.HistoricTaskInstanceQuery;
import org.springblade.core.launch.constant.FlowConstant;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
@@ -30,10 +32,7 @@
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.*;
/**
* 娴佺▼涓氬姟瀹炵幇绫�
@@ -91,8 +90,9 @@
page.setRecords(flowList);
return page;
}
-
- void addKeywordCondition(TaskQuery todoQuery,String keyword) {
+ //TaskInfoQuery
+ //void addKeywordCondition(TaskQuery todoQuery,String keyword) {
+ void addKeywordCondition(TaskInfoQuery todoQuery, String keyword) {
if(Func.isNotEmpty(keyword)) {
String likeVal = "%" + keyword + "%";
todoQuery.or();
@@ -478,8 +478,8 @@
* @param keyword 鍏抽敭瀛�
* @return
*/
- public IPage<FlowVO> selectFinishedPage(IPage<FlowVO> page, String processDefinitionKey,LocalDate createTimeBegin, LocalDate createTimeEnd, String keyword) {
- HistoricProcessInstanceQuery query = this.historyService.createHistoricProcessInstanceQuery().includeProcessVariables();
+ public IPage<FlowVO> selectFinishedPage(IPage<FlowVO> page, String processDefinitionKey,LocalDateTime createTimeBegin, LocalDateTime createTimeEnd, String keyword) {
+ HistoricProcessInstanceQuery query = this.historyService.createHistoricProcessInstanceQuery().finished().includeProcessVariables();
//.finished() // 鍙煡璇㈠凡瀹屾垚鐨勬祦绋�.unfinished() // 鏌ヨ鏈畬鎴愮殑娴佺▼
if(Func.isNotEmpty(processDefinitionKey)) {
query.processDefinitionKey(processDefinitionKey);
@@ -528,4 +528,103 @@
return result;
}
+
+ /**
+ * 鏌ヨ宸插姙浠诲姟鍒嗛〉鏁版嵁
+ * @param page
+ * @param createTimeBegin
+ * @param createTimeEnd
+ * @param keyword
+ * @return
+ */
+ /*
+ public IPage<FlowVO> selectDonePage(IPage<FlowVO> page, LocalDateTime createTimeBegin, LocalDateTime createTimeEnd, String keyword) {
+ String userId = "" + AuthUtil.getUserId();
+ List<FlowVO> flowList = new LinkedList<>();
+
+ HistoricTaskInstanceQuery doneTaskQuery = historyService.createHistoricTaskInstanceQuery().taskAssignee(userId).finished().includeProcessVariables();
+ //TaskQuery todoQuery = historyService.createHistoricTaskInstanceQuery().taskAssignee(userId).finished().includeProcessVariables()
+ if (Func.isNotEmpty(createTimeBegin)) {
+ doneTaskQuery.taskCreatedAfter(DateUtil.toDate(createTimeBegin));
+ }
+ if (Func.isNotEmpty(createTimeEnd)) {
+ doneTaskQuery.taskCreatedBefore(DateUtil.toDate(createTimeEnd));
+ //todoQuery.taskInProgressStartTimeBefore(DateUtil.toDate(createTimeEnd));
+ }
+ if (Func.isNotEmpty(keyword)) {
+ addKeywordCondition(doneTaskQuery, keyword);
+ }
+
+ todoQuery.orderByTaskCreateTime().desc();
+
+ // 鏋勫缓鍒楄〃鏁版嵁
+ FlowVO bladeFlow = new FlowVO();
+ buildFlowTaskList(bladeFlow, flowList, todoQuery,page.getCurrent(),page.getSize());
+
+ // 璁＄畻鎬绘暟
+ long count = todoQuery.count();
+
+ // 璁剧疆鎬绘暟
+ page.setTotal(count);
+ // 璁剧疆鏁版嵁
+ page.setRecords(flowList);
+ return page;
+ }*/
+ public IPage<FlowVO> selectDonePage(IPage<FlowVO> page, String processDefinitionKey,LocalDateTime completeTimeBegin, LocalDateTime createTimeEnd, String keyword) {
+ String userId = "" + AuthUtil.getUserId();
+ HistoricTaskInstanceQuery doneTaskQuery = historyService.createHistoricTaskInstanceQuery().taskAssignee(userId).finished().includeProcessVariables();
+
+ //.finished() // 鍙煡璇㈠凡瀹屾垚鐨勬祦绋�.unfinished() // 鏌ヨ鏈畬鎴愮殑娴佺▼
+ if(Func.isNotEmpty(processDefinitionKey)) {
+ doneTaskQuery.processDefinitionKey(processDefinitionKey);
+ }
+ if(completeTimeBegin!=null) {
+ doneTaskQuery.taskCompletedAfter(DateUtil.toDate(completeTimeBegin));
+ }
+ if(createTimeEnd!=null) {
+ doneTaskQuery.taskCompletedBefore(DateUtil.toDate(createTimeEnd));
+ }
+ //QueryProperty
+ doneTaskQuery.orderByTaskCreateTime().desc(); // 鎸夌粨鏉熸椂闂撮檷搴忔帓鍒�
+ page.setTotal(doneTaskQuery.count());
+
+ long firstResult = (page.getCurrent()-1) * page.getSize();
+
+ List<HistoricTaskInstance> processes = doneTaskQuery
+ .listPage((int)firstResult, (int)page.getSize());
+
+ List<FlowVO> records = new LinkedList<>();
+ Map<String,String> processDefKeyMap = new HashMap<>();
+
+ for(HistoricTaskInstance hisTask : processes) {
+ FlowVO vo = new FlowVO();
+ HistoricProcessInstance processInstance = historyService
+ .createHistoricProcessInstanceQuery()
+ .processInstanceId(hisTask.getProcessInstanceId())
+ .singleResult();
+ vo.setProcessDefinitionKey(processInstance.getProcessDefinitionKey());
+ vo.setProcessInstanceId(hisTask.getProcessInstanceId());
+ //vo.setProcessDefinitionName(processInstance.getProcessDefinitionName());
+
+
+ vo.setVariables(hisTask.getProcessVariables());
+
+ //vo.setTaskDefinitionKey();
+ //hisTask.getCreateTime()
+ Date processStartTime = historyService.createHistoricProcessInstanceQuery()
+ .processInstanceId(hisTask.getProcessInstanceId())
+ .singleResult()
+ .getStartTime();
+
+ vo.setProcessCreateTime(processStartTime);
+ vo.setHistoryTaskEndTime(hisTask.getEndTime());
+
+ vo.setFile(getFileString(hisTask.getProcessInstanceId()));
+ records.add(vo);
+ }
+
+ page.setRecords(records);
+
+ return page;
+ }
}
--
Gitblit v1.9.3