From 18d9c0bdc04e71cf3903c30c139f59dab744cf3f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 22 八月 2025 15:09:35 +0800
Subject: [PATCH] 偏离回传 流程改名
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java | 694 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 403 insertions(+), 291 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 24f3cd2..478b0da 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,56 +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.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.secure.utils.AuthUtil;
-import org.springblade.core.tool.support.Kv;
+import org.springblade.core.tool.api.R;
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;
+import org.springblade.mdm.flow.constants.FlowContants;
+import org.springblade.mdm.flow.entity.FlowProgramFile;
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.service.NcProgramService;
+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.util.Date;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
+import java.time.LocalDateTime;
+import java.util.*;
/**
* 娴佺▼涓氬姟瀹炵幇绫�
@@ -60,233 +41,77 @@
@Service
@AllArgsConstructor
public class FlowBusinessService {
-
+ private final RuntimeService runtimeService;
private final TaskService taskService;
private final HistoryService historyService;
-
-
- public IPage<BladeFlow> selectTodoPage(IPage<BladeFlow> page, LocalDate createTimeBegin,LocalDate createTimeEnd, String keyword) {
+ private final IUserClient userClient;
+ private final FlowProgramFileService flowProgramFileService;
+ /**
+ * 鏌ヨ鎴戠殑娴佺▼(涓汉寰呭姙鍒楄〃)
+ * @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)){
+ if (Func.isNotEmpty(createTimeBegin)) {
todoQuery.taskCreatedAfter(DateUtil.toDate(createTimeBegin));
- //濡傛灉鏌ヨ瀹炰緥鐨勫紑濮嬫椂闂达細todoQuery.taskInProgressStartDueAfter()
}
- if(Func.isNotEmpty(createTimeEnd)){
+ if (Func.isNotEmpty(createTimeEnd)) {
todoQuery.taskCreatedBefore(DateUtil.toDate(createTimeEnd));
-
+ //todoQuery.taskInProgressStartTimeBefore(DateUtil.toDate(createTimeEnd));
}
- 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();
+ 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,page.getCurrent(),page.getSize());
// 璁＄畻鎬绘暟
long count = todoQuery.count();
- // 璁剧疆椤垫暟
- page.setSize(count);
+
// 璁剧疆鎬绘暟
page.setTotal(count);
// 璁剧疆鏁版嵁
page.setRecords(flowList);
return page;
}
- /*
- @Override
- public IPage<BladeFlow> selectSendPage(IPage<BladeFlow> page, BladeFlow bladeFlow) {
- String taskUser = TaskUtil.getTaskUser();
- List<BladeFlow> flowList = new LinkedList<>();
+ //TaskInfoQuery
+ //void addKeywordCondition(TaskQuery todoQuery,String keyword) {
+ void addKeywordCondition(TaskInfoQuery todoQuery, String keyword) {
+ if(Func.isNotEmpty(keyword)) {
+ String likeVal = "%" + keyword + "%";
+ todoQuery.or();
+ todoQuery.processVariableValueLike(FlowContants.TITLE,likeVal);
+ todoQuery.processVariableValueLike(FlowContants.PROCESS_NO, likeVal);
+ todoQuery.processVariableValueLike(FlowContants.MACHINE_CODE, likeVal);
+ todoQuery.processVariableValueLike(FlowContants.MACHINE_MODE, likeVal);
+ todoQuery.processVariableValueLike(FlowContants.PROCESS_NAME, likeVal);
+ todoQuery.processVariableValueLike(FlowContants.PROCESS_EDITION, likeVal);
+ todoQuery.processVariableValueLike(FlowContants.CRAFT_EDITION, likeVal);
- HistoricProcessInstanceQuery historyQuery = historyService.createHistoricProcessInstanceQuery().startedBy(taskUser).orderByProcessInstanceStartTime().desc();
-
- if (bladeFlow.getCategory() != null) {
- historyQuery.processDefinitionCategory(bladeFlow.getCategory());
+ todoQuery.processDefinitionNameLike(likeVal);
+ todoQuery.endOr();
}
- if (bladeFlow.getProcessDefinitionName() != null) {
- historyQuery.processDefinitionName(bladeFlow.getProcessDefinitionName());
- }
- if (bladeFlow.getBeginDate() != null) {
- historyQuery.startedAfter(bladeFlow.getBeginDate());
- }
- if (bladeFlow.getEndDate() != null) {
- historyQuery.startedBefore(bladeFlow.getEndDate());
- }
-
- // 鏌ヨ鍒楄〃
- List<HistoricProcessInstance> historyList = historyQuery.listPage(Func.toInt((page.getCurrent() - 1) * page.getSize()), Func.toInt(page.getSize()));
-
- historyList.forEach(historicProcessInstance -> {
- BladeFlow flow = new BladeFlow();
- // historicProcessInstance
- flow.setCreateTime(historicProcessInstance.getStartTime());
- flow.setEndTime(historicProcessInstance.getEndTime());
- flow.setVariables(historicProcessInstance.getProcessVariables());
- String[] businessKey = Func.toStrArray(StringPool.COLON, historicProcessInstance.getBusinessKey());
- if (businessKey.length > 1) {
- flow.setBusinessTable(businessKey[0]);
- flow.setBusinessId(businessKey[1]);
- }
- flow.setHistoryActivityName(historicProcessInstance.getName());
- flow.setProcessInstanceId(historicProcessInstance.getId());
- flow.setHistoryProcessInstanceId(historicProcessInstance.getId());
- // ProcessDefinition
- FlowProcess processDefinition = FlowCache.getProcessDefinition(historicProcessInstance.getProcessDefinitionId());
- flow.setProcessDefinitionId(processDefinition.getId());
- flow.setProcessDefinitionName(processDefinition.getName());
- flow.setProcessDefinitionVersion(processDefinition.getVersion());
- flow.setProcessDefinitionKey(processDefinition.getKey());
- flow.setCategory(processDefinition.getCategory());
- flow.setCategoryName(FlowCache.getCategoryName(processDefinition.getCategory()));
- flow.setProcessInstanceId(historicProcessInstance.getId());
- // HistoricTaskInstance
- List<HistoricTaskInstance> historyTasks = historyService.createHistoricTaskInstanceQuery().processInstanceId(historicProcessInstance.getId()).orderByHistoricTaskInstanceEndTime().desc().list();
- if (Func.isNotEmpty(historyTasks)) {
- HistoricTaskInstance historyTask = historyTasks.iterator().next();
- flow.setTaskId(historyTask.getId());
- flow.setTaskName(historyTask.getName());
- flow.setTaskDefinitionKey(historyTask.getTaskDefinitionKey());
- }
- // Status
- if (historicProcessInstance.getEndActivityId() != null) {
- flow.setProcessIsFinished(FlowEngineConstant.STATUS_FINISHED);
- } else {
- flow.setProcessIsFinished(FlowEngineConstant.STATUS_UNFINISHED);
- }
- flow.setStatus(FlowEngineConstant.STATUS_FINISH);
- flowList.add(flow);
- });
-
- // 璁＄畻鎬绘暟
- long count = historyQuery.count();
- // 璁剧疆鎬绘暟
- page.setTotal(count);
- page.setRecords(flowList);
- return page;
}
-
- @Override
- public IPage<BladeFlow> selectDonePage(IPage<BladeFlow> page, BladeFlow bladeFlow) {
- String taskUser = TaskUtil.getTaskUser();
- List<BladeFlow> flowList = new LinkedList<>();
-
- HistoricTaskInstanceQuery doneQuery = historyService.createHistoricTaskInstanceQuery().taskAssignee(taskUser).finished()
- .includeProcessVariables().orderByHistoricTaskInstanceEndTime().desc();
-
- if (bladeFlow.getCategory() != null) {
- doneQuery.processCategoryIn(Func.toStrList(bladeFlow.getCategory()));
- }
- if (bladeFlow.getProcessDefinitionName() != null) {
- doneQuery.processDefinitionName(bladeFlow.getProcessDefinitionName());
- }
- if (bladeFlow.getBeginDate() != null) {
- doneQuery.taskCompletedAfter(bladeFlow.getBeginDate());
- }
- if (bladeFlow.getEndDate() != null) {
- doneQuery.taskCompletedBefore(bladeFlow.getEndDate());
- }
-
- // 鏌ヨ鍒楄〃
- List<HistoricTaskInstance> doneList = doneQuery.listPage(Func.toInt((page.getCurrent() - 1) * page.getSize()), Func.toInt(page.getSize()));
- doneList.forEach(historicTaskInstance -> {
- BladeFlow flow = new BladeFlow();
- flow.setTaskId(historicTaskInstance.getId());
- flow.setTaskDefinitionKey(historicTaskInstance.getTaskDefinitionKey());
- flow.setTaskName(historicTaskInstance.getName());
- flow.setAssignee(historicTaskInstance.getAssignee());
- flow.setCreateTime(historicTaskInstance.getCreateTime());
- flow.setExecutionId(historicTaskInstance.getExecutionId());
- flow.setHistoryTaskEndTime(historicTaskInstance.getEndTime());
- flow.setVariables(historicTaskInstance.getProcessVariables());
-
- FlowProcess processDefinition = FlowCache.getProcessDefinition(historicTaskInstance.getProcessDefinitionId());
- flow.setProcessDefinitionId(processDefinition.getId());
- flow.setProcessDefinitionName(processDefinition.getName());
- flow.setProcessDefinitionKey(processDefinition.getKey());
- flow.setProcessDefinitionVersion(processDefinition.getVersion());
- flow.setCategory(processDefinition.getCategory());
- flow.setCategoryName(FlowCache.getCategoryName(processDefinition.getCategory()));
-
- flow.setProcessInstanceId(historicTaskInstance.getProcessInstanceId());
- flow.setHistoryProcessInstanceId(historicTaskInstance.getProcessInstanceId());
- HistoricProcessInstance historicProcessInstance = getHistoricProcessInstance((historicTaskInstance.getProcessInstanceId()));
- if (Func.isNotEmpty(historicProcessInstance)) {
- String[] businessKey = Func.toStrArray(StringPool.COLON, historicProcessInstance.getBusinessKey());
- flow.setBusinessTable(businessKey[0]);
- flow.setBusinessId(businessKey[1]);
- if (historicProcessInstance.getEndActivityId() != null) {
- flow.setProcessIsFinished(FlowEngineConstant.STATUS_FINISHED);
- } else {
- flow.setProcessIsFinished(FlowEngineConstant.STATUS_UNFINISHED);
- }
- }
- flow.setStatus(FlowEngineConstant.STATUS_FINISH);
- flowList.add(flow);
- });
- // 璁＄畻鎬绘暟
- long count = doneQuery.count();
- // 璁剧疆鎬绘暟
- page.setTotal(count);
- page.setRecords(flowList);
- 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;
- }
- */
/**
* 鏋勫缓娴佺▼
*
* @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,Long currentPage,Long pageSize) {
if (bladeFlow.getCategory() != null) {
taskQuery.processCategoryIn(Func.toStrList(bladeFlow.getCategory()));
}
@@ -299,9 +124,13 @@
if (bladeFlow.getEndDate() != null) {
taskQuery.taskCreatedBefore(bladeFlow.getEndDate());
}
- List<Task> tasks = taskQuery.list();
+
+ //List<Task> tasks = taskQuery.list();
+ long total = taskQuery.count();
+ Long firstResult = (currentPage-1)*pageSize;
+ List<Task> tasks = taskQuery.listPage(Func.toInt(firstResult), Func.toInt(pageSize));
tasks.forEach(task -> {
- BladeFlow flow = new BladeFlow();
+ FlowVO flow = new FlowVO();
flow.setTaskId(task.getId());
flow.setTaskDefinitionKey(task.getTaskDefinitionKey());
flow.setTaskName(task.getName());
@@ -310,20 +139,27 @@
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.setFile(getFileString(task.getProcessInstanceId()));
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());
@@ -335,54 +171,58 @@
flow.setProcessDefinitionVersion(processDefinition.getVersion());
flow.setProcessInstanceId(task.getProcessInstanceId());
//flow.setStatus(status);
- /*
- */
+
flowList.add(flow);
});
}
- /**
- * 鑾峰彇鍘嗗彶娴佺▼
- *
- * @param processInstanceId 娴佺▼瀹炰緥id
- * @return HistoricProcessInstance
- */
- private HistoricProcessInstance getHistoricProcessInstance(String processInstanceId) {
- return historyService.createHistoricProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
+ 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();
+ }
}
- public IPage<BladeFlow> selectAllTaskPage(IPage<BladeFlow> page, String keyword) {
- List<BladeFlow> flowList = new LinkedList<>();
+ public IPage<FlowVO> selectAllTaskPage(IPage<FlowVO> page, String keyword) {
+
+ 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,page.getCurrent(),page.getSize());//FlowEngineConstant.STATUS_TODO
// 璁＄畻鎬绘暟
long count = todoQuery.count();
// 璁剧疆椤垫暟
- page.setSize(count);
+ //page.setSize(count);
// 璁剧疆鎬绘暟
page.setTotal(count);
// 璁剧疆鏁版嵁
@@ -392,49 +232,321 @@
/**
* 瓒呮椂浠诲姟鏌ヨ
- * @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,page.getCurrent(),page.getSize());//FlowEngineConstant.STATUS_TODO
// 璁＄畻鎬绘暟
long count = todoQuery.count();
- // 璁剧疆椤垫暟
- page.setSize(count);
+
// 璁剧疆鎬绘暟
page.setTotal(count);
// 璁剧疆鏁版嵁
page.setRecords(flowList);
return page;
}
+
+ /**
+ * 娴佺▼鏌ヨ 鍔熻兘 鐨勫垎椤�
+ * @param page
+ * @param createTimeBegin
+ * @param createTimeEnd
+ * @param keyword
+ * @return
+ */
+ public IPage<FlowVO> selectSearchPage(IPage<FlowVO> page,String myProcessName,String keyword, LocalDate createTimeBegin, LocalDate createTimeEnd) {
+
+ List<FlowVO> flowList = new LinkedList<>();
+ 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)));
+ }
+ if(Func.isNotEmpty(myProcessName)) {
+ taskQuery.processVariableValueEquals(FlowContants.MY_PROCESS_NAME, myProcessName);
+ }
+
+ addKeywordCondition(taskQuery, keyword);
+
+ taskQuery.orderByTaskCreateTime().desc();
+
+ // 鏋勫缓鍒楄〃鏁版嵁
+ FlowVO bladeFlow = new FlowVO();
+ buildFlowTaskList(bladeFlow, flowList, taskQuery,page.getCurrent(),page.getSize());//FlowEngineConstant.STATUS_TODO
+
+ // 璁＄畻鎬绘暟
+ long count = taskQuery.count();
+ // 璁剧疆鎬绘暟
+ page.setTotal(count);
+ // 璁剧疆鏁版嵁
+ page.setRecords(flowList);
+ return page;
+ }
+
+ public void deleteProcessInstance(String processInstancesId) {
+ runtimeService.deleteProcessInstance(processInstancesId, "娴佺▼鏌ヨ-鍒犻櫎");
+ //TODO 鍒犻櫎鍑哄叧鑱斿瓧娈�
+ }
+
+ /**
+ * 宸插畬缁撶殑娴佺▼鍒嗛〉鍒楄〃
+ * @param page 鍒嗛〉淇℃伅
+ * @param createTimeBegin
+ * @param createTimeEnd
+ * @param keyword 鍏抽敭瀛�
+ * @return
+ */
+ public IPage<FlowVO> selectFinishedPage(IPage<FlowVO> page, String myProcessName, String keyword,LocalDateTime createTimeBegin, LocalDateTime createTimeEnd) {
+ HistoricProcessInstanceQuery query = this.historyService.createHistoricProcessInstanceQuery().finished().includeProcessVariables();
+ //.finished() // 鍙煡璇㈠凡瀹屾垚鐨勬祦绋�.unfinished() // 鏌ヨ鏈畬鎴愮殑娴佺▼
+ if(Func.isNotEmpty(myProcessName)) {
+ query.variableValueEquals(FlowContants.MY_PROCESS_NAME, myProcessName);
+ }
+ if(createTimeBegin!=null) {
+ query.startedAfter(DateUtil.toDate(createTimeBegin));
+ }
+ if(createTimeEnd!=null) {
+ query.startedBefore(DateUtil.toDate(createTimeEnd));
+ }
+ if(Func.isNotEmpty(keyword)) {
+ String likeVal = "%" + keyword + "%";
+ query.or();
+ query.variableValueLike(FlowContants.TITLE,likeVal);
+ query.variableValueLike(FlowContants.PROCESS_NO, likeVal);
+ query.variableValueLike(FlowContants.MACHINE_CODE, likeVal);
+ query.variableValueLike(FlowContants.MACHINE_MODE, likeVal);
+ query.variableValueLike(FlowContants.PROCESS_NAME, likeVal);
+ query.variableValueLike(FlowContants.PROCESS_EDITION, likeVal);
+ query.variableValueLike(FlowContants.CRAFT_EDITION, likeVal);
+
+ query.endOr();
+ }
+
+
+ query.orderByProcessInstanceEndTime().desc(); // 鎸夌粨鏉熸椂闂撮檷搴忔帓鍒�
+ page.setTotal(query.count());
+
+ long firstResult = (page.getCurrent()-1) * page.getSize();
+ List<HistoricProcessInstance> processes = query
+ .listPage((int)firstResult, (int)page.getSize());
+
+ List<FlowVO> records = new LinkedList<>();
+
+ for(HistoricProcessInstance processInstance : processes) {
+ FlowVO vo = new FlowVO();
+ vo.setProcessDefinitionKey(processInstance.getProcessDefinitionKey());
+ vo.setProcessInstanceId(processInstance.getId());
+ vo.setProcessDefinitionName(processInstance.getProcessDefinitionName());
+ vo.setVariables(processInstance.getProcessVariables());
+
+ vo.setProcessCreateTime(processInstance.getStartTime());
+ vo.setHistoryTaskEndTime(processInstance.getEndTime());
+
+ R<User> ru = userClient.userInfoById(Long.valueOf(processInstance.getStartUserId()));
+ if(ru.isSuccess()) {
+ vo.setStartUserName(ru.getData().getName());
+ }
+
+ vo.setFile(getFileString(processInstance.getId()));
+ records.add(vo);
+ }
+
+ page.setRecords(records);
+
+ return page;
+ }
+
+ /**
+ * 寮傚父娴佺▼
+ * @param page
+ * @param myProcessName
+ * @param keyword
+ * @param createTimeBegin
+ * @param createTimeEnd
+ * @return
+ */
+ public IPage<FlowVO> selectExceptionPage(IPage<FlowVO> page, String myProcessName, String keyword,LocalDateTime createTimeBegin, LocalDateTime createTimeEnd) {
+ HistoricProcessInstanceQuery query = this.historyService.createHistoricProcessInstanceQuery().finished().includeProcessVariables();
+ //.finished() // 鍙煡璇㈠凡瀹屾垚鐨勬祦绋�.unfinished() // 鏌ヨ鏈畬鎴愮殑娴佺▼
+
+ query.variableValueEquals(FlowContants.EXCEPTION, "1");
+ if(Func.isNotEmpty(myProcessName)) {
+ query.variableValueEquals(FlowContants.MY_PROCESS_NAME, myProcessName);
+ }
+ if(createTimeBegin!=null) {
+ query.startedAfter(DateUtil.toDate(createTimeBegin));
+ }
+ if(createTimeEnd!=null) {
+ query.startedBefore(DateUtil.toDate(createTimeEnd));
+ }
+ if(Func.isNotEmpty(keyword)) {
+ String likeVal = "%" + keyword + "%";
+ query.or();
+ query.variableValueLike(FlowContants.TITLE,likeVal);
+ query.variableValueLike(FlowContants.PROCESS_NO, likeVal);
+ query.variableValueLike(FlowContants.MACHINE_CODE, likeVal);
+ query.variableValueLike(FlowContants.MACHINE_MODE, likeVal);
+ query.variableValueLike(FlowContants.PROCESS_NAME, likeVal);
+ query.variableValueLike(FlowContants.PROCESS_EDITION, likeVal);
+ query.variableValueLike(FlowContants.CRAFT_EDITION, likeVal);
+
+ query.endOr();
+ }
+
+
+ query.orderByProcessInstanceEndTime().desc(); // 鎸夌粨鏉熸椂闂撮檷搴忔帓鍒�
+ page.setTotal(query.count());
+
+ long firstResult = (page.getCurrent()-1) * page.getSize();
+ List<HistoricProcessInstance> processes = query
+ .listPage((int)firstResult, (int)page.getSize());
+
+ List<FlowVO> records = new LinkedList<>();
+
+ for(HistoricProcessInstance processInstance : processes) {
+ FlowVO vo = new FlowVO();
+ vo.setProcessDefinitionKey(processInstance.getProcessDefinitionKey());
+ vo.setProcessInstanceId(processInstance.getId());
+ vo.setProcessDefinitionName(processInstance.getProcessDefinitionName());
+ vo.setVariables(processInstance.getProcessVariables());
+
+ vo.setProcessCreateTime(processInstance.getStartTime());
+ vo.setHistoryTaskEndTime(processInstance.getEndTime());
+ R<User> ru = userClient.userInfoById(Long.valueOf(processInstance.getStartUserId()));
+ if(ru.isSuccess()) {
+ vo.setStartUserName(ru.getData().getName());
+ }
+ vo.setFile(getFileString(processInstance.getId()));
+ records.add(vo);
+ }
+
+ page.setRecords(records);
+
+ return page;
+ }
+ /*
+ 鑾峰彇鍒楄〃涓殑鏂囦欢鍚�
+ */
+ String getFileString(String processInstanceId){
+ String result = "";
+ List<FlowProgramFile> fileList = flowProgramFileService.lambdaQuery().eq(FlowProgramFile::getProcessInstanceId, processInstanceId).list();
+
+ result = String.join(",",fileList.stream().map(FlowProgramFile::getName).toList());
+
+ return result;
+ }
+
+ /**
+ * 涓汉宸插姙(宸插畬鎴愪换鍔�)
+ * @param page
+ * @param processDefinitionKey
+ * @param createTimeBegin
+ * @param createTimeEnd
+ * @param keyword
+ * @return
+ */
+ public IPage<FlowVO> selectDonePage(IPage<FlowVO> page, String processDefinitionKey,LocalDateTime createTimeBegin, 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(createTimeBegin!=null) {
+ Date after = DateUtil.toDate(createTimeBegin);
+
+ doneTaskQuery.taskCreatedAfter(after);
+
+ //doneTaskQuery.taskCreatedOn(after);
+ //doneTaskQuery.taskInProgressStartTimeAfter(after);
+ }
+ if(createTimeEnd!=null) {
+ Date before = DateUtil.toDate(createTimeEnd);
+
+ doneTaskQuery.taskCreatedBefore(before);
+
+ //doneTaskQuery.taskInProgressStartTimeBefore(before);
+ }
+
+ if (Func.isNotEmpty(keyword)) {
+ addKeywordCondition(doneTaskQuery, keyword);
+ }
+
+ 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> startUserMap = new HashMap<>();//浣跨敤userId缂撳瓨鍏跺鍚�
+ for(HistoricTaskInstance hisTask : processes) {
+ FlowVO vo = new FlowVO();
+
+ HistoricProcessInstance processInstance = historyService
+ .createHistoricProcessInstanceQuery()
+ .processInstanceId(hisTask.getProcessInstanceId())
+ .singleResult();
+
+ if(startUserMap.containsKey(processInstance.getStartUserId())) {
+ vo.setStartUserName(startUserMap.get(processInstance.getStartUserId()));
+ }else {
+ R<User> ru = userClient.userInfoById(Long.valueOf(processInstance.getStartUserId()));
+ if (ru.isSuccess()) {
+ vo.setStartUserName(ru.getData().getName());
+ startUserMap.put(processInstance.getStartUserId(),ru.getData().getName());
+ }
+ }
+ vo.setProcessCreateTime(processInstance.getStartTime());
+
+ vo.setProcessInstanceId(hisTask.getProcessInstanceId());
+ vo.setProcessDefinitionName(processInstance.getProcessDefinitionName());
+ vo.setProcessDefinitionKey(processInstance.getProcessDefinitionKey());
+ vo.setTaskName(hisTask.getName());
+ vo.setTaskDefinitionKey(hisTask.getTaskDefinitionKey());
+ vo.setCreateTime(hisTask.getCreateTime());
+ vo.setEndTime(hisTask.getEndTime());
+ vo.setVariables(hisTask.getProcessVariables());
+
+ vo.setProcessCreateTime(processInstance.getStartTime());
+ vo.setHistoryTaskEndTime(hisTask.getEndTime());
+
+ vo.setFile(getFileString(hisTask.getProcessInstanceId()));
+ records.add(vo);
+ }
+
+ page.setRecords(records);
+
+ return page;
+ }
}
--
Gitblit v1.9.3