From 4ab2cb495ccece311bbd8d0ecb992c7de0bc8500 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 22 七月 2025 11:43:10 +0800
Subject: [PATCH] 审批表打印
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 114 insertions(+), 6 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 04904a4..99126f6 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
@@ -4,23 +4,34 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.AllArgsConstructor;
import org.flowable.engine.HistoryService;
+import org.flowable.engine.RuntimeService;
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.*;
import org.springblade.mdm.basesetting.machine.MachineService;
import org.springblade.mdm.flow.entity.MdmFlowProcess;
import org.springblade.mdm.flow.util.MdmFlowCache;
import org.springblade.mdm.flow.vo.FlowVO;
+import org.springblade.mdm.program.entity.ProcessProgRef;
+import org.springblade.mdm.program.service.ProcessProgRefService;
+import org.springblade.system.feign.IUserClient;
+import org.springblade.system.pojo.entity.User;
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;
/**
* 娴佺▼涓氬姟瀹炵幇绫�
@@ -30,12 +41,22 @@
@Service
@AllArgsConstructor
public class FlowBusinessService {
-
+ private final RuntimeService runtimeService;
private final TaskService taskService;
private final HistoryService historyService;
- private final MachineService machineService;
+ private final IUserClient userClient;
+ private final ProcessProgRefService processProgRefService;
+ private final ApproveRecordService approveRecordService;
- 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<>();
@@ -43,11 +64,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);
@@ -248,6 +271,7 @@
if (bladeFlow.getEndDate() != null) {
taskQuery.taskCreatedBefore(bladeFlow.getEndDate());
}
+
List<Task> tasks = taskQuery.list();
tasks.forEach(task -> {
FlowVO flow = new FlowVO();
@@ -263,11 +287,25 @@
flow.setProcessDefinitionId(task.getProcessDefinitionId());
-
//flow.setProcessDefinitionKey(processDefinition.getKey());
//flow.setProcessDefinitionVersion(processDefinition.getVersion());
flow.setProcessInstanceId(task.getProcessInstanceId());
+ // 鏌ヨ娴佺▼瀹炰緥鍒涘缓鏃堕棿
+ HistoricProcessInstance historicProcess = historyService.createHistoricProcessInstanceQuery()
+ .processInstanceId(task.getProcessInstanceId())
+ .singleResult();
+ flow.setProcessCreateTime(historicProcess.getStartTime());
+
+ R<User> ru = userClient.userInfoById(Long.valueOf(historicProcess.getStartUserId()));
+ 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());
@@ -284,6 +322,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();
+ }
+ }
/**
* 鑾峰彇鍘嗗彶娴佺▼
*
@@ -360,4 +424,48 @@
page.setRecords(flowList);
return page;
}
+
+ /**
+ * 娴佺▼鏌ヨ 鍔熻兘 鐨勫垎椤�
+ * @param page
+ * @param createTimeBegin
+ * @param createTimeEnd
+ * @param keyword
+ * @return
+ */
+ public IPage<FlowVO> selectSearchPage(IPage<FlowVO> page, LocalDate createTimeBegin, LocalDate createTimeEnd, String keyword) {
+
+ List<FlowVO> flowList = new LinkedList<>();
+ Date now = new Date();
+ TaskQuery taskQuery = taskService.createTaskQuery().active().includeProcessVariables();
+ if(Func.isNotEmpty(createTimeBegin)) {
+ taskQuery.taskCreatedAfter(DateUtil.toDate(createTimeBegin));
+ }
+ if(Func.isNotEmpty(createTimeEnd)) {
+ taskQuery.taskCreatedBefore(DateUtil.toDate(createTimeEnd.plusDays(1)));
+ }
+
+ addKeywordCondition(taskQuery, keyword);
+
+ taskQuery.orderByTaskCreateTime().desc();
+
+ // 鏋勫缓鍒楄〃鏁版嵁
+ FlowVO bladeFlow = new FlowVO();
+ buildFlowTaskList(bladeFlow, flowList, taskQuery);//FlowEngineConstant.STATUS_TODO
+
+ // 璁＄畻鎬绘暟
+ long count = taskQuery.count();
+ // 璁剧疆椤垫暟
+ page.setSize(count);
+ // 璁剧疆鎬绘暟
+ page.setTotal(count);
+ // 璁剧疆鏁版嵁
+ page.setRecords(flowList);
+ return page;
+ }
+
+ public void deleteProcessInstance(String processInstancesId) {
+ runtimeService.deleteProcessInstance(processInstancesId, "娴佺▼鏌ヨ-鍒犻櫎");
+ //TODO 鍒犻櫎鍑哄叧鑱斿瓧娈�
+ }
}
--
Gitblit v1.9.3