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 | 309 ++++++++++++++++++++++++++++----------------------
1 files changed, 173 insertions(+), 136 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..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
@@ -1,57 +1,37 @@
-/**
- * BladeX Commercial License Agreement
- * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
- * <p>
- * Use of this software is governed by the Commercial License Agreement
- * obtained after purchasing a license from BladeX.
- * <p>
- * 1. This software is for development use only under a valid license
- * from BladeX.
- * <p>
- * 2. Redistribution of this software's source code to any third party
- * without a commercial license is strictly prohibited.
- * <p>
- * 3. Licensees may copyright their own code but cannot use segments
- * from this software for such purposes. Copyright of this software
- * remains with BladeX.
- * <p>
- * Using this software signifies agreement to this License, and the software
- * must not be used for illegal purposes.
- * <p>
- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
- * not liable for any claims arising from secondary or illegal development.
- * <p>
- * Author: Chill Zhuang (bladejava@qq.com)
- */
+
package org.springblade.mdm.flow.service;
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.history.HistoricProcessInstanceQuery;
+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.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.flow.core.constant.ProcessConstant;
-import org.springblade.flow.core.pojo.entity.BladeFlow;
-import org.springblade.flow.core.utils.TaskUtil;
+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.Map;
+import java.util.stream.Collectors;
/**
* 娴佺▼涓氬姟瀹炵幇绫�
@@ -61,48 +41,51 @@
@Service
@AllArgsConstructor
public class FlowBusinessService {
-
+ private final RuntimeService runtimeService;
private final TaskService taskService;
private final HistoryService historyService;
+ private final IUserClient userClient;
+ private final ProcessProgRefService processProgRefService;
+ private final ApproveRecordService approveRecordService;
-
- public IPage<BladeFlow> selectTodoPage(IPage<BladeFlow> page, 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<BladeFlow> flowList = new LinkedList<>();
+ String userId = "" + AuthUtil.getUserId();
+ List<FlowVO> flowList = new LinkedList<>();
TaskQuery todoQuery = taskService.createTaskQuery().taskAssignee(userId).active().includeProcessVariables();
+ if (Func.isNotEmpty(createTimeBegin)) {
+ todoQuery.taskCreatedAfter(DateUtil.toDate(createTimeBegin));
- if(Func.isNotEmpty(keyword)){
- todoQuery.or();
-
- todoQuery.processVariableValueLike("processNo",keyword);
- todoQuery.processVariableValueLike("machineCode",keyword);
- todoQuery.processVariableValueLike("machineMode",keyword);
-
- todoQuery.processVariableValueLike("processName",keyword);
- todoQuery.processVariableValueLike("processEdition",keyword);
-
- todoQuery.processVariableValueLike("craftEdition",keyword);
- //TODO 澶氫釜瀛楁閮借鍖归厤
-
- todoQuery.endOr();
+ ////濡傛灉鏌ヨ瀹炰緥鐨勫紑濮嬫椂闂达細鍙兘鐢ㄤ互涓嬭繖涓紝鍏堟煡鍑哄疄渚媔d鏉�
+ //todoQuery.processInstanceIdIn()
+ }
+ if (Func.isNotEmpty(createTimeEnd)) {
+ todoQuery.taskCreatedBefore(DateUtil.toDate(createTimeEnd));
+ //todoQuery.taskInProgressStartTimeBefore(DateUtil.toDate(createTimeEnd));
+ }
+ if (Func.isNotEmpty(keyword)) {
+ addKeywordCondition(todoQuery, keyword);
}
todoQuery.orderByTaskCreateTime().desc();
- //List<Task> listt = todoQuery.list();
-
- // 宸茬鏀剁殑浠诲姟.caseVariableValueLike("processNo",keyword)
- /*
- TaskQuery todoQuery = taskService.createTaskQuery().taskAssignee(userId).active()
- .includeProcessVariables().orderByTaskCreateTime().desc();
-
- */
// 鏋勫缓鍒楄〃鏁版嵁
- BladeFlow bladeFlow = new BladeFlow();
- buildFlowTaskList(bladeFlow, flowList, todoQuery, "todo");//FlowEngineConstant.STATUS_TODO
-
+ FlowVO bladeFlow = new FlowVO();
+ buildFlowTaskList(bladeFlow, flowList, todoQuery);//FlowEngineConstant.STATUS_TODO , "todo"
+ flowList.forEach(flowVO -> {
+ if(flowVO.getVariables().containsKey("machineCode")){
+ //Machine machinemachineService.getByCode((String)flowVO.getVariables().get("machineCode"))
+ }
+ });
// 璁＄畻鎬绘暟
long count = todoQuery.count();
// 璁剧疆椤垫暟
@@ -112,6 +95,21 @@
// 璁剧疆鏁版嵁
page.setRecords(flowList);
return page;
+ }
+
+ void addKeywordCondition(TaskQuery todoQuery,String keyword) {
+ if(Func.isNotEmpty(keyword)) {
+ todoQuery.or();
+
+ todoQuery.processVariableValueLike("processNo", "%" + keyword + "%");
+ todoQuery.processVariableValueLike("machineCode", "%" + keyword + "%");
+ todoQuery.processVariableValueLike("machineMode", "%" + keyword + "%");
+ todoQuery.processVariableValueLike("processName", "%" + keyword + "%");
+ todoQuery.processVariableValueLike("processEdition", "%" + keyword + "%");
+ todoQuery.processVariableValueLike("craftEdition", "%" + keyword + "%");
+
+ todoQuery.endOr();
+ }
}
/*
@Override
@@ -252,25 +250,6 @@
return page;
}
- @Override
- public boolean completeTask(BladeFlow flow) {
- String taskId = flow.getTaskId();
- String processInstanceId = flow.getProcessInstanceId();
- String comment = Func.toStr(flow.getComment(), ProcessConstant.PASS_COMMENT);
- // 澧炲姞璇勮
- if (StringUtil.isNoneBlank(processInstanceId, comment)) {
- taskService.addComment(taskId, processInstanceId, comment);
- }
- // 鍒涘缓鍙橀噺
- Map<String, Object> variables = flow.getVariables();
- if (variables == null) {
- variables = Kv.create();
- }
- variables.put(ProcessConstant.PASS_KEY, flow.isPass());
- // 瀹屾垚浠诲姟
- taskService.complete(taskId, variables);
- return true;
- }
*/
/**
* 鏋勫缓娴佺▼
@@ -278,9 +257,8 @@
* @param bladeFlow 娴佺▼閫氱敤绫�
* @param flowList 娴佺▼鍒楄〃
* @param taskQuery 浠诲姟鏌ヨ绫�
- * @param status 鐘舵��
*/
- private void buildFlowTaskList(BladeFlow bladeFlow, List<BladeFlow> flowList, TaskQuery taskQuery, String status) {
+ private void buildFlowTaskList(FlowVO bladeFlow, List<FlowVO> flowList, TaskQuery taskQuery) {
if (bladeFlow.getCategory() != null) {
taskQuery.processCategoryIn(Func.toStrList(bladeFlow.getCategory()));
}
@@ -293,9 +271,10 @@
if (bladeFlow.getEndDate() != null) {
taskQuery.taskCreatedBefore(bladeFlow.getEndDate());
}
+
List<Task> tasks = taskQuery.list();
tasks.forEach(task -> {
- BladeFlow flow = new BladeFlow();
+ FlowVO flow = new FlowVO();
flow.setTaskId(task.getId());
flow.setTaskDefinitionKey(task.getTaskDefinitionKey());
flow.setTaskName(task.getName());
@@ -304,20 +283,29 @@
flow.setClaimTime(task.getClaimTime());
flow.setExecutionId(task.getExecutionId());
flow.setVariables(task.getProcessVariables());
+ flow.setDueDate(task.getDueDate());
flow.setProcessDefinitionId(task.getProcessDefinitionId());
- //flow.setProcessDefinitionName(task.getprocessd);
//flow.setProcessDefinitionKey(processDefinition.getKey());
//flow.setProcessDefinitionVersion(processDefinition.getVersion());
flow.setProcessInstanceId(task.getProcessInstanceId());
- /*
- HistoricProcessInstance historicProcessInstance = getHistoricProcessInstance(task.getProcessInstanceId());
- if (Func.isNotEmpty(historicProcessInstance)) {
- String[] businessKey = Func.toStrArray(StringPool.COLON, historicProcessInstance.getBusinessKey());
- flow.setBusinessTable(businessKey[0]);
- flow.setBusinessId(businessKey[1]);
- }*/
+
+ // 鏌ヨ娴佺▼瀹炰緥鍒涘缓鏃堕棿
+ 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());
@@ -329,12 +317,37 @@
flow.setProcessDefinitionVersion(processDefinition.getVersion());
flow.setProcessInstanceId(task.getProcessInstanceId());
//flow.setStatus(status);
- /*
- */
+
flowList.add(flow);
});
}
+ 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();
+ }
+ }
/**
* 鑾峰彇鍘嗗彶娴佺▼
*
@@ -345,33 +358,20 @@
return historyService.createHistoricProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
}
- public IPage<BladeFlow> selectAllTaskPage(IPage<BladeFlow> page, String keyword) {
+ public IPage<FlowVO> selectAllTaskPage(IPage<FlowVO> page, String keyword) {
- List<BladeFlow> flowList = new LinkedList<>();
+ List<FlowVO> flowList = new LinkedList<>();
TaskQuery todoQuery = taskService.createTaskQuery().active().includeProcessVariables();
- if(Func.isNotEmpty(keyword)){
- todoQuery.or();
- todoQuery.processVariableValueLike("processNo",keyword);
- todoQuery.processVariableValueLike("machineCode",keyword);
- todoQuery.processVariableValueLike("machineMode",keyword);
-
- todoQuery.processVariableValueLike("processName",keyword);
- todoQuery.processVariableValueLike("processEdition",keyword);
-
- todoQuery.processVariableValueLike("craftEdition",keyword);
- //TODO 澶氫釜瀛楁閮借鍖归厤
-
- todoQuery.endOr();
- }
+ addKeywordCondition(todoQuery, keyword);
todoQuery.orderByTaskCreateTime().desc();
// 鏋勫缓鍒楄〃鏁版嵁
- BladeFlow bladeFlow = new BladeFlow();
- buildFlowTaskList(bladeFlow, flowList, todoQuery, "todo");//FlowEngineConstant.STATUS_TODO
+ FlowVO bladeFlow = new FlowVO();
+ buildFlowTaskList(bladeFlow, flowList, todoQuery);//FlowEngineConstant.STATUS_TODO
// 璁＄畻鎬绘暟
long count = todoQuery.count();
@@ -386,40 +386,33 @@
/**
* 瓒呮椂浠诲姟鏌ヨ
- * @param page
- * @param keyword
- * @return
+ * @param page 鍒嗛〉淇℃伅
+ * @param keyword 鍏抽敭瀛�
+ * @return 鍒嗛〉鏁版嵁
*/
- public IPage<BladeFlow> selectOvertimePage(IPage<BladeFlow> page, String assigneeName,String keyword) {
+ public IPage<FlowVO> selectOvertimePage(IPage<FlowVO> page, LocalDate createTimeBegin, LocalDate createTimeEnd, String assigneeName, String keyword) {
- List<BladeFlow> flowList = new LinkedList<>();
+ List<FlowVO> flowList = new LinkedList<>();
Date now = new Date();
TaskQuery todoQuery = taskService.createTaskQuery().taskDueBefore(now).active().includeProcessVariables();
+ if(Func.isNotEmpty(createTimeBegin)) {
+ todoQuery.taskCreatedAfter(DateUtil.toDate(createTimeBegin));
+ }
+ if(Func.isNotEmpty(createTimeEnd)) {
+ todoQuery.taskCreatedBefore(DateUtil.toDate(createTimeEnd.plusDays(1)));
+ }
if(Func.isNotEmpty(keyword)) {
todoQuery.taskVariableValueLike("assigneeName", "%"+assigneeName+"%");
}
- if(Func.isNotEmpty(keyword)){
- todoQuery.or();
- keyword = "%"+keyword+"%";
- todoQuery.processVariableValueLike("processNo",keyword);
- todoQuery.processVariableValueLike("machineCode",keyword);
- todoQuery.processVariableValueLike("machineMode",keyword);
- todoQuery.processVariableValueLike("processName",keyword);
- todoQuery.processVariableValueLike("processEdition",keyword);
-
- todoQuery.processVariableValueLike("craftEdition",keyword);
- //TODO 澶氫釜瀛楁閮借鍖归厤
-
- todoQuery.endOr();
- }
+ addKeywordCondition(todoQuery, keyword);
todoQuery.orderByTaskCreateTime().desc();
// 鏋勫缓鍒楄〃鏁版嵁
- BladeFlow bladeFlow = new BladeFlow();
- buildFlowTaskList(bladeFlow, flowList, todoQuery, "todo");//FlowEngineConstant.STATUS_TODO
+ FlowVO bladeFlow = new FlowVO();
+ buildFlowTaskList(bladeFlow, flowList, todoQuery);//FlowEngineConstant.STATUS_TODO
// 璁＄畻鎬绘暟
long count = todoQuery.count();
@@ -431,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