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 | 326 ++++++++++++++++++++----------------------------------
1 files changed, 120 insertions(+), 206 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 35394e9..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
@@ -14,7 +14,6 @@
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;
import org.springblade.core.tool.utils.*;
@@ -46,9 +45,6 @@
private final TaskService taskService;
private final HistoryService historyService;
private final IUserClient userClient;
- private final ProcessProgRefService processProgRefService;
- private final ApproveRecordService approveRecordService;
- private final NcProgramService ncProgramService;
private final FlowProgramFileService flowProgramFileService;
/**
* 鏌ヨ鎴戠殑娴佺▼(涓汉寰呭姙鍒楄〃)
@@ -108,146 +104,6 @@
todoQuery.endOr();
}
}
- /*
- @Override
- public IPage<BladeFlow> selectSendPage(IPage<BladeFlow> page, BladeFlow bladeFlow) {
- String taskUser = TaskUtil.getTaskUser();
- List<BladeFlow> flowList = new LinkedList<>();
-
- HistoricProcessInstanceQuery historyQuery = historyService.createHistoricProcessInstanceQuery().startedBy(taskUser).orderByProcessInstanceStartTime().desc();
-
- if (bladeFlow.getCategory() != null) {
- historyQuery.processDefinitionCategory(bladeFlow.getCategory());
- }
- 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;
- }
-
- */
/**
* 鏋勫缓娴佺▼
*
@@ -288,8 +144,6 @@
flow.setProcessDefinitionId(task.getProcessDefinitionId());
flow.setFile(getFileString(task.getProcessInstanceId()));
- //flow.setProcessDefinitionKey(processDefinition.getKey());
- //flow.setProcessDefinitionVersion(processDefinition.getVersion());
flow.setProcessInstanceId(task.getProcessInstanceId());
// 鏌ヨ娴佺▼瀹炰緥鍒涘缓鏃堕棿
@@ -302,7 +156,6 @@
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());
@@ -349,15 +202,7 @@
return Collections.emptyList();
}
}
- /**
- * 鑾峰彇鍘嗗彶娴佺▼
- *
- * @param processInstanceId 娴佺▼瀹炰緥id
- * @return HistoricProcessInstance
- */
- private HistoricProcessInstance getHistoricProcessInstance(String processInstanceId) {
- return historyService.createHistoricProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
- }
+
public IPage<FlowVO> selectAllTaskPage(IPage<FlowVO> page, String keyword) {
@@ -433,10 +278,9 @@
* @param keyword
* @return
*/
- public IPage<FlowVO> selectSearchPage(IPage<FlowVO> page, LocalDate createTimeBegin, LocalDate createTimeEnd,String processDefinitionKey,String keyword) {
+ public IPage<FlowVO> selectSearchPage(IPage<FlowVO> page,String myProcessName,String keyword, LocalDate createTimeBegin, LocalDate createTimeEnd) {
List<FlowVO> flowList = new LinkedList<>();
- Date now = new Date();
TaskQuery taskQuery = taskService.createTaskQuery().active().includeProcessVariables();
if(Func.isNotEmpty(createTimeBegin)) {
taskQuery.taskCreatedAfter(DateUtil.toDate(createTimeBegin));
@@ -444,8 +288,8 @@
if(Func.isNotEmpty(createTimeEnd)) {
taskQuery.taskCreatedBefore(DateUtil.toDate(createTimeEnd.plusDays(1)));
}
- if(Func.isNotEmpty(processDefinitionKey)) {
- taskQuery.processDefinitionKey(processDefinitionKey);
+ if(Func.isNotEmpty(myProcessName)) {
+ taskQuery.processVariableValueEquals(FlowContants.MY_PROCESS_NAME, myProcessName);
}
addKeywordCondition(taskQuery, keyword);
@@ -478,11 +322,11 @@
* @param keyword 鍏抽敭瀛�
* @return
*/
- public IPage<FlowVO> selectFinishedPage(IPage<FlowVO> page, String processDefinitionKey,LocalDateTime createTimeBegin, LocalDateTime createTimeEnd, String keyword) {
+ 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(processDefinitionKey)) {
- query.processDefinitionKey(processDefinitionKey);
+ if(Func.isNotEmpty(myProcessName)) {
+ query.variableValueEquals(FlowContants.MY_PROCESS_NAME, myProcessName);
}
if(createTimeBegin!=null) {
query.startedAfter(DateUtil.toDate(createTimeBegin));
@@ -490,6 +334,21 @@
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());
@@ -509,6 +368,80 @@
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);
}
@@ -530,47 +463,15 @@
}
/**
- * 鏌ヨ宸插姙浠诲姟鍒嗛〉鏁版嵁
+ * 涓汉宸插姙(宸插畬鎴愪换鍔�)
* @param page
+ * @param processDefinitionKey
* @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) {
+ 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();
@@ -578,13 +479,26 @@
if(Func.isNotEmpty(processDefinitionKey)) {
doneTaskQuery.processDefinitionKey(processDefinitionKey);
}
- if(completeTimeBegin!=null) {
- doneTaskQuery.taskCompletedAfter(DateUtil.toDate(completeTimeBegin));
+ if(createTimeBegin!=null) {
+ Date after = DateUtil.toDate(createTimeBegin);
+
+ doneTaskQuery.taskCreatedAfter(after);
+
+ //doneTaskQuery.taskCreatedOn(after);
+ //doneTaskQuery.taskInProgressStartTimeAfter(after);
}
if(createTimeEnd!=null) {
- doneTaskQuery.taskCompletedBefore(DateUtil.toDate(createTimeEnd));
+ Date before = DateUtil.toDate(createTimeEnd);
+
+ doneTaskQuery.taskCreatedBefore(before);
+
+ //doneTaskQuery.taskInProgressStartTimeBefore(before);
}
- //QueryProperty
+
+ if (Func.isNotEmpty(keyword)) {
+ addKeywordCondition(doneTaskQuery, keyword);
+ }
+
doneTaskQuery.orderByTaskCreateTime().desc(); // 鎸夌粨鏉熸椂闂撮檷搴忔帓鍒�
page.setTotal(doneTaskQuery.count());
@@ -594,12 +508,10 @@
.listPage((int)firstResult, (int)page.getSize());
List<FlowVO> records = new LinkedList<>();
- //Map<String,String> processDefKeyMap = new HashMap<>();//浣跨敤TaskDefinitionKey缂撳瓨ProcessDefinitionKey
- //Map<String,String> processDefNameMap = new HashMap<>();//浣跨敤TaskDefinitionKey缂撳瓨ProcessDefinitionName
+
Map<String,String> startUserMap = new HashMap<>();//浣跨敤userId缂撳瓨鍏跺鍚�
for(HistoricTaskInstance hisTask : processes) {
FlowVO vo = new FlowVO();
-
HistoricProcessInstance processInstance = historyService
.createHistoricProcessInstanceQuery()
@@ -618,11 +530,13 @@
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());
--
Gitblit v1.9.3