From 1f2697051a87a7ca54734ccbf04a4bc8b0110907 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 21 三月 2025 15:56:18 +0800
Subject: [PATCH] 建设内容
---
business/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java | 271 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 235 insertions(+), 36 deletions(-)
diff --git a/business/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java b/business/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java
index f943d23..47599e1 100644
--- a/business/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java
@@ -6,6 +6,7 @@
import com.alibaba.fastjson2.TypeReference;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.common.base.Result;
import com.ycl.common.constant.ProcessConstants;
@@ -52,6 +53,7 @@
import org.flowable.bpmn.model.*;
import org.flowable.common.engine.api.FlowableException;
import org.flowable.common.engine.api.FlowableObjectNotFoundException;
+import org.flowable.common.engine.impl.persistence.StrongUuidGenerator;
import org.flowable.engine.ProcessEngineConfiguration;
import org.flowable.engine.history.HistoricActivityInstance;
import org.flowable.engine.history.HistoricProcessInstance;
@@ -71,12 +73,12 @@
import org.flowable.task.api.history.HistoricTaskInstanceQuery;
import org.springframework.beans.BeanUtils;
import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.io.InputStream;
+import java.io.*;
import java.lang.reflect.Field;
-import java.math.BigDecimal;
import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
@@ -137,11 +139,12 @@
*
* @param taskId 浠诲姟id
* @param variables 琛ㄥ崟鏁版嵁
+ * @param addLog
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public AjaxResult completeSubmitForm(String taskId, Map<String, Object> variables) {
+ public AjaxResult completeSubmitForm(String taskId, Map<String, Object> variables, Boolean addLog) {
Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
if (Objects.isNull(task)) {
return AjaxResult.error("浠诲姟涓嶅瓨鍦�");
@@ -175,6 +178,122 @@
taskService.complete(taskId, newV);
}
// 淇濆瓨鏃ュ織
+ if (addLog) {
+ publisher.publishEvent(new TaskLogEvent(this, null,
+ SecurityUtils.getUserId(),
+ projectProcess.getProjectId(),
+ projectProcess.getProcessInsId(),
+ taskId,
+ task.getTaskDefinitionKey(),
+ task.getName(),
+ ProcessLogEventTypeEnum.FINISHED,
+ null));
+ }
+ return AjaxResult.success("鎻愪氦鎴愬姛");
+ }
+
+ /**
+ * 瀹圭己琛ヤ氦
+ *
+ * @param taskId 浠诲姟id
+ * @param variables 琛ㄥ崟鏁版嵁
+ * @param addLog
+ * @return
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public AjaxResult waitCompleteSubmitForm(String taskId, Map<String, Object> variables, Boolean addLog) throws IOException {
+ List<HistoricTaskInstance> hisTasks = historyService.createHistoricTaskInstanceQuery().taskId(taskId).orderByHistoricTaskInstanceStartTime().desc().list();
+ if (CollectionUtils.isEmpty(hisTasks) || Objects.isNull(hisTasks.get(0))) {
+ return AjaxResult.error("浠诲姟涓嶅瓨鍦�");
+ }
+ HistoricTaskInstance task = hisTasks.get(0);
+ ProjectProcess projectProcess = new LambdaQueryChainWrapper<>(projectProcessMapper)
+ .eq(ProjectProcess::getProcessInsId, task.getProcessInstanceId())
+ .eq(ProjectProcess::getProcessDefId, task.getProcessDefinitionId())
+ .one();
+ if (Objects.isNull(projectProcess)) {
+ return AjaxResult.error("椤圭洰娴佺▼鏈粦瀹�");
+ }
+ // 鏌ュ嚭瀛楀吀涓渶瑕佹敞鍏ョ殑瀛楁淇℃伅
+ List<String> dictList = sysDictDService.selectDictDataByType("flow_variables").stream().map(SysDictData::getDictValue).collect(Collectors.toList());
+ Map<String, Object> newV = new HashMap<>(2);
+ if (!org.springframework.util.CollectionUtils.isEmpty(variables)) {
+ for (String key : variables.keySet()) {
+ newV.put(task.getTaskDefinitionKey() + "&" + key, variables.get(key));
+ // 瀛楀吀閲屾湁灏变笉鍋氬鐞�
+ if (!CollectionUtils.isEmpty(dictList) && dictList.contains(key)) {
+ newV.put(key,variables.get(key));
+ }
+ }
+ }
+ ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(task.getProcessInstanceId()).singleResult();
+ Date now = new Date();
+ for (String key : newV.keySet()) {
+ FlowableVarVO var = null;
+ if (Objects.isNull(processInstance)) {
+ // 鏌ヨ鍘嗗彶娴佺▼鍙橀噺
+ var = projectProcessMapper.getHisByteId(projectProcess.getProcessInsId(), key);
+ } else {
+ // 鏌ヨ杩愯鏃舵祦绋嬪彉閲�
+ var = projectProcessMapper.getRuByteId(projectProcess.getProcessInsId(), key);
+ }
+
+ if (Objects.isNull(var)) {
+ // 娌℃湁杩欎釜鍙橀噺鏂板鍗冲彲
+ FlowableVarVO run = new FlowableVarVO();
+ FlowableVarVO v = new FlowableVarVO();
+ v.setNAME_(key);
+ v.setPROC_INST_ID_(task.getProcessInstanceId());
+ v.setEXECUTION_ID_(task.getProcessInstanceId());
+ v.setCREATE_TIME_(now);
+ v.setLAST_UPDATED_TIME_(now);
+ v.setID_(new StrongUuidGenerator().getNextId());
+
+ BeanUtils.copyProperties(v, run);
+ run.setID_(new StrongUuidGenerator().getNextId());
+ if (newV.get(key) instanceof String) {
+ v.setVAR_TYPE_("string");
+ v.setTEXT_((String) newV.get(key));
+ run.setVAR_TYPE_("string");
+ run.setTEXT_((String) newV.get(key));
+ } else if (newV.get(key) instanceof Integer) {
+ v.setVAR_TYPE_("integer");
+ v.setLONG_((Long) newV.get(key));
+ v.setTEXT_((String) newV.get(key));
+ run.setVAR_TYPE_("integer");
+ run.setLONG_((Long) newV.get(key));
+ run.setTEXT_((String) newV.get(key));
+ } else if (newV.get(key) instanceof Long) {
+ v.setVAR_TYPE_("long");
+ v.setLONG_((Long) newV.get(key));
+ v.setTEXT_((String) newV.get(key));
+ run.setVAR_TYPE_("long");
+ run.setLONG_((Long) newV.get(key));
+ run.setTEXT_((String) newV.get(key));
+ } else if (newV.get(key) instanceof Boolean) {
+ v.setVAR_TYPE_("boolean");
+ v.setLONG_((Long) newV.get(key));
+ v.setTEXT_((String) newV.get(key));
+ run.setVAR_TYPE_("boolean");
+ run.setLONG_((Long) newV.get(key));
+ run.setTEXT_((String) newV.get(key));
+ } else {
+ // 鍏跺畠绫诲瀷鐨勮〃鍗曟暟鎹細濡傚浘鐗囥�佹枃浠跺崟鐙瓨琛ㄧ殑銆傚巻鍙层�佽繍琛屼腑鐨勬祦绋嬮渶鍚勫瓨涓�浠�
+ v.setVAR_TYPE_("serializable");
+ v.setBYTEARRAY_ID_(new StrongUuidGenerator().getNextId());
+ projectProcessMapper.insertByteArray(v.getBYTEARRAY_ID_(), 1, "hist.var-" + key, newV.get(key));
+
+ run.setVAR_TYPE_("serializable");
+ run.setBYTEARRAY_ID_(new StrongUuidGenerator().getNextId());
+ projectProcessMapper.insertByteArray(run.getBYTEARRAY_ID_(), 1, "var-" + key, newV.get(key));
+ }
+
+ projectProcessMapper.insertHisFlowableVar(v);
+ projectProcessMapper.insertRunFlowableVar(run);
+ }
+ }
+ // 淇濆瓨鏃ュ織
publisher.publishEvent(new TaskLogEvent(this, null,
SecurityUtils.getUserId(),
projectProcess.getProjectId(),
@@ -184,7 +303,21 @@
task.getName(),
ProcessLogEventTypeEnum.FINISHED,
null));
+
return AjaxResult.success("鎻愪氦鎴愬姛");
+ }
+
+ // 灏嗗璞¤浆鎹负 byte[]
+ public static byte[] objectToBytes(Object obj) throws IOException {
+ if (Objects.isNull(obj)) {
+ return null;
+ }
+ try (ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ ObjectOutputStream oos = new ObjectOutputStream(bos)) {
+ oos.writeObject(obj); // 搴忓垪鍖栧璞�
+ oos.flush();
+ return bos.toByteArray(); // 杩斿洖瀛楄妭鏁扮粍
+ }
}
/**
@@ -198,8 +331,18 @@
if (taskService.createTaskQuery().taskId(flowTaskVo.getTaskId()).singleResult().isSuspended()) {
throw new CustomException("浠诲姟澶勪簬鎸傝捣鐘舵��!");
}
+
// 褰撳墠浠诲姟 task
Task task = taskService.createTaskQuery().taskId(flowTaskVo.getTaskId()).singleResult();
+
+ ProjectProcess projectProcess = new LambdaQueryChainWrapper<>(projectProcessMapper)
+ .eq(ProjectProcess::getProcessInsId, task.getProcessInstanceId())
+ .eq(ProjectProcess::getProcessDefId, task.getProcessDefinitionId())
+ .one();
+ if (Objects.isNull(projectProcess)) {
+ throw new CustomException("椤圭洰娴佺▼鏈粦瀹�");
+ }
+
// 鑾峰彇娴佺▼瀹氫箟淇℃伅
ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(task.getProcessDefinitionId()).singleResult();
// 鑾峰彇鎵�鏈夎妭鐐逛俊鎭�
@@ -292,6 +435,21 @@
try {
// 濡傛灉鐖剁骇浠诲姟澶氫簬 1 涓紝璇存槑褰撳墠鑺傜偣涓嶆槸骞惰鑺傜偣锛屽師鍥犱负涓嶈�冭檻澶氬澶氭儏鍐�
if (targetIds.size() > 1) {
+ // 鍒犻櫎琚┏鍥炰换鍔＄殑鎵�鏈夋棩蹇�
+ for (String targetId : targetIds) {
+ List<HistoricTaskInstance> rejectHisTaskList = historyService.createHistoricTaskInstanceQuery()
+ .taskDefinitionKey(targetId)
+ .processInstanceId(projectProcess.getProcessInsId())
+ .orderByHistoricTaskInstanceStartTime()
+ .desc()
+ .list();
+ if (CollectionUtils.isNotEmpty(rejectHisTaskList)) {
+ new LambdaUpdateChainWrapper<>(processLogService.getBaseMapper())
+ .eq(ProcessLog::getTaskId, rejectHisTaskList.get(0).getId())
+ .eq(ProcessLog::getProcessInsId, projectProcess.getProcessInsId())
+ .remove();
+ }
+ }
// 1 瀵� 澶氫换鍔¤烦杞紝currentIds 褰撳墠鑺傜偣(1)锛宼argetIds 璺宠浆鍒扮殑鑺傜偣(澶�)
runtimeService.createChangeActivityStateBuilder()
.processInstanceId(task.getProcessInstanceId()).
@@ -299,22 +457,30 @@
}
// 濡傛灉鐖剁骇浠诲姟鍙湁涓�涓紝鍥犳褰撳墠浠诲姟鍙兘涓虹綉鍏充腑鐨勪换鍔�
if (targetIds.size() == 1) {
+ // 鍒犻櫎琚┏鍥炰换鍔＄殑鎵�鏈夋棩蹇�
+ List<HistoricTaskInstance> rejectHisTaskList = historyService.createHistoricTaskInstanceQuery()
+ .taskDefinitionKey(targetIds.get(0))
+ .processInstanceId(projectProcess.getProcessInsId())
+ .orderByHistoricTaskInstanceStartTime()
+ .desc()
+ .list();
+ if (CollectionUtils.isNotEmpty(rejectHisTaskList)) {
+ new LambdaUpdateChainWrapper<>(processLogService.getBaseMapper())
+ .eq(ProcessLog::getTaskId, rejectHisTaskList.get(0).getId())
+ .eq(ProcessLog::getProcessInsId, projectProcess.getProcessInsId())
+ .remove();
+ }
+
// 1 瀵� 1 鎴� 澶� 瀵� 1 鎯呭喌锛宑urrentIds 褰撳墠瑕佽烦杞殑鑺傜偣鍒楄〃(1鎴栧)锛宼argetIds.get(0) 璺宠浆鍒扮殑鑺傜偣(1)
runtimeService.createChangeActivityStateBuilder()
.processInstanceId(task.getProcessInstanceId())
.moveActivityIdsToSingleActivityId(currentIds, targetIds.get(0)).changeState();
}
+ historyService.deleteHistoricTaskInstance(flowTaskVo.getTaskId());
} catch (FlowableObjectNotFoundException e) {
throw new CustomException("鏈壘鍒版祦绋嬪疄渚嬶紝娴佺▼鍙兘宸插彂鐢熷彉鍖�");
} catch (FlowableException e) {
throw new CustomException("鏃犳硶鍙栨秷鎴栧紑濮嬫椿鍔�");
- }
- ProjectProcess projectProcess = new LambdaQueryChainWrapper<>(projectProcessMapper)
- .eq(ProjectProcess::getProcessInsId, task.getProcessInstanceId())
- .eq(ProjectProcess::getProcessDefId, task.getProcessDefinitionId())
- .one();
- if (Objects.isNull(projectProcess)) {
- throw new CustomException("椤圭洰娴佺▼鏈粦瀹�");
}
// 淇濆瓨鏃ュ織
publisher.publishEvent(new TaskLogEvent(this, null,
@@ -847,17 +1013,17 @@
public AjaxResult flowRecord(String procInsId) {
Map<String, Object> map = new HashMap<String, Object>();
if (StringUtils.isNotBlank(procInsId)) {
- List<HistoricActivityInstance> list = historyService
- .createHistoricActivityInstanceQuery()
+ List<HistoricTaskInstance> list = historyService
+ .createHistoricTaskInstanceQuery()
.processInstanceId(procInsId)
- .orderByHistoricActivityInstanceStartTime()
+ .orderByHistoricTaskInstanceStartTime()
.desc().list();
//鎵╁睍 鑾峰彇杩欎釜娴佺▼瀹炰緥鐨勭洃鎺т俊鎭� key:TaskId value:瀹炰綋绫�
Map<String, ProcessCoding> processCodingMap = processCodingMapper.selectList(new QueryWrapper<ProcessCoding>().eq("process_ins_id", procInsId))
.stream()
.collect(Collectors.toMap(ProcessCoding::getTaskId, Function.identity()));
List<FlowTaskDto> hisFlowList = new ArrayList<>();
- for (HistoricActivityInstance histIns : list) {
+ for (HistoricTaskInstance histIns : list) {
// 灞曠ず寮�濮嬭妭鐐�
// if ("startEvent".equals(histIns.getActivityType())) {
// FlowTaskDto flowTask = new FlowTaskDto();
@@ -875,10 +1041,10 @@
// flowTask.setFinishTime(histIns.getEndTime());
// hisFlowList.add(flowTask);
// } else
- if (StringUtils.isNotBlank(histIns.getTaskId())) {
+ if (StringUtils.isNotBlank(histIns.getId())) {
FlowTaskDto flowTask = new FlowTaskDto();
- flowTask.setTaskId(histIns.getTaskId());
- flowTask.setTaskName(histIns.getActivityName());
+ flowTask.setTaskId(histIns.getId());
+ flowTask.setTaskName(histIns.getName());
flowTask.setCreateTime(histIns.getStartTime());
flowTask.setFinishTime(histIns.getEndTime());
if (StringUtils.isNotBlank(histIns.getAssignee())) {
@@ -888,7 +1054,7 @@
flowTask.setDeptName(Objects.nonNull(sysUser.getDept()) ? sysUser.getDept().getDeptName() : "");
}
// 灞曠ず瀹℃壒浜哄憳
- List<HistoricIdentityLink> linksForTask = historyService.getHistoricIdentityLinksForTask(histIns.getTaskId());
+ List<HistoricIdentityLink> linksForTask = historyService.getHistoricIdentityLinksForTask(histIns.getId());
StringBuilder stringBuilder = new StringBuilder();
for (HistoricIdentityLink identityLink : linksForTask) {
// 鑾烽�変汉,鍊欓�夌粍/瑙掕壊(澶氫釜)
@@ -915,7 +1081,7 @@
flowTask.setDuration(histIns.getDurationInMillis() == null || histIns.getDurationInMillis() == 0 ? null : getDate(histIns.getDurationInMillis()));
//鎵╁睍 鍒ゆ柇鏄惁瓒呮椂
- ProcessCoding processCoding = processCodingMap.get(histIns.getTaskId());
+ ProcessCoding processCoding = processCodingMap.get(histIns.getId());
if (processCoding != null) {
//閫氳繃鑰楁椂鍒ゆ柇鏄惁鏄唬鍔炶妭鐐�
//濡傛灉浠诲姟鏄唬鍔炶妭鐐�
@@ -934,7 +1100,7 @@
// 鑾峰彇鎰忚璇勮鍐呭
List<Comment> commentList = taskService.getProcessInstanceComments(histIns.getProcessInstanceId());
commentList.forEach(comment -> {
- if (histIns.getTaskId().equals(comment.getTaskId())) {
+ if (histIns.getId().equals(comment.getTaskId())) {
flowTask.setComment(FlowCommentDto.builder().type(comment.getType()).comment(comment.getFullMessage()).build());
}
});
@@ -1205,6 +1371,8 @@
if (StringUtils.isBlank(s.getDeleteReason())) {
flowViewerList.add(flowViewerDto);
}
+ flowViewerDto.setHasJump(processLogService.taskIsJump(s.getTaskId(), procInsId));
+ flowViewerDto.setHasWait(processLogService.taskIsWait(s.getTaskId(), procInsId));
});
// 鑾峰彇浠ｅ姙鑺傜偣
@@ -1222,8 +1390,10 @@
// 鎵╁睍鍐呭 浠ｅ姙鐨勯�氳繃褰撳墠鏃堕棿浣滀负endTime
ProcessCoding processCoding = processCodingMap.get(s.getTaskId());
//濡傛灉鏈夌洃鎺ф暟鎹� 涓嶅弽鐨勮瘽鍓嶇榛樿鏄繘琛屼腑(钃濊壊)
- if (processCoding != null && (RED.equals(processCoding.getStatus()) || YELLOW.equals(processCoding.getStatus()))) {
- flowViewerDto.setOvertime(processCoding.getStatus());
+ if (Objects.nonNull(processCoding)) {
+ if (RED.equals(processCoding.getStatus()) || YELLOW.equals(processCoding.getStatus())) {
+ flowViewerDto.setOvertime(processCoding.getStatus());
+ }
}
flowViewerList.add(flowViewerDto);
});
@@ -1271,6 +1441,7 @@
Map<String, List<FormDetailVO>> map = new HashMap<>(2);
beforeNodes.stream().forEach(node -> {
if (node.getCurrent()) {
+ node.setTaskId(taskId);
dataList.add(node);
} else {
List<HistoricTaskInstance> beforeTasks = historyService.createHistoricTaskInstanceQuery()
@@ -1281,6 +1452,7 @@
.desc()
.list();
if (CollectionUtils.isNotEmpty(beforeTasks) && Objects.nonNull(beforeTasks.get(0))) {
+ node.setTaskId(beforeTasks.get(0).getId());
List<FormDetailVO> l = map.get(beforeTasks.get(0));
if (CollectionUtils.isEmpty(l)) {
map.put(beforeTasks.get(0).getExecutionId(), Arrays.asList(node));
@@ -1304,7 +1476,7 @@
}
// 鍒ゆ柇浠诲姟鏄惁瀛樺湪鐗规畩鎿嶄綔(濡傝烦杩囥�佽浆鍔炵瓑)锛岄渶瑕佸湪鍓嶇灞曠ず鍑烘潵
ProcessLogQuery query = new ProcessLogQuery();
- query.setTaskId(taskId);
+ query.setTaskId(node.getTaskId());
query.setProcessInsId(finalProcessInsId);
Result result = processLogService.projectProcessLogPage(query);
List<ProcessLogVO> logList = (List<ProcessLogVO>) result.get("data");
@@ -1319,29 +1491,36 @@
}
@Override
- public AjaxResult detail(String taskId) {
- Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
+ public AjaxResult detail(String processInsId, String taskId) {
+ ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().includeProcessVariables().processInstanceId(processInsId).singleResult();
// 娴佺▼鍙橀噺
Map<String, Object> parameters = new HashMap<>();
- if (Objects.isNull(task)) {
- // 濡傛灉涓虹┖锛屽彲鑳芥槸浠诲姟宸茬粡缁撴潫
+ if (Objects.isNull(processInstance)) {
+
+ // 濡傛灉涓虹┖锛岃〃鏄庢祦绋嬪凡缁忕粨鏉�
+ HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery().includeProcessVariables().processInstanceId(processInsId).singleResult();
+ if (Objects.isNull(historicProcessInstance)) {
+ throw new RuntimeException("娴佺▼涓嶅瓨鍦�");
+ }
+
List<HistoricTaskInstance> hisTasks = historyService.createHistoricTaskInstanceQuery()
.taskId(taskId)
.finished()
.includeProcessVariables()
- .orderByTaskCreateTime()
+ .orderByHistoricTaskInstanceStartTime()
.desc()
.list();
if (CollectionUtils.isNotEmpty(hisTasks) && Objects.isNull(hisTasks.get(0))) {
throw new RuntimeException("璇ヤ换鍔′笉瀛樺湪");
}
HistoricTaskInstance hisTask = hisTasks.get(0);
- parameters = hisTask.getProcessVariables();
+ parameters = historicProcessInstance.getProcessVariables();
List<FormDetailVO> beforeNodes = this.getBeforeNodeForm(parameters, hisTask.getFormKey(), hisTask.getName(), hisTask.getProcessDefinitionId(), hisTask.getTaskDefinitionKey(), Boolean.TRUE);
List<FormDetailVO> dataList = new ArrayList<>(2);
Map<String, List<FormDetailVO>> map = new HashMap<>(2);
beforeNodes.stream().forEach(node -> {
if (node.getCurrent()) {
+ node.setTaskId(taskId);
dataList.add(node);
} else {
List<HistoricTaskInstance> beforeTasks = historyService.createHistoricTaskInstanceQuery()
@@ -1352,6 +1531,7 @@
.desc()
.list();
if (CollectionUtils.isNotEmpty(beforeTasks) && Objects.nonNull(beforeTasks.get(0))) {
+ node.setTaskId(beforeTasks.get(0).getId());
List<FormDetailVO> l = map.get(beforeTasks.get(0));
if (CollectionUtils.isEmpty(l)) {
map.put(beforeTasks.get(0).getExecutionId(), Arrays.asList(node));
@@ -1375,7 +1555,7 @@
}
// 鍒ゆ柇浠诲姟鏄惁瀛樺湪鐗规畩鎿嶄綔(濡傝烦杩囥�佽浆鍔炵瓑)锛岄渶瑕佸湪鍓嶇灞曠ず鍑烘潵
ProcessLogQuery query = new ProcessLogQuery();
- query.setTaskId(hisTask.getId());
+ query.setTaskId(node.getTaskId());
query.setProcessInsId(hisTask.getProcessInstanceId());
Result result = processLogService.projectProcessLogPage(query);
List<ProcessLogVO> logList = (List<ProcessLogVO>) result.get("data");
@@ -1388,22 +1568,41 @@
}).collect(Collectors.toList());
return AjaxResult.success(vos);
} else {
- parameters = taskService.getVariables(taskId);
- List<FormDetailVO> beforeNodes = this.getBeforeNodeForm(parameters, task.getFormKey(), task.getName(), task.getProcessDefinitionId(), task.getTaskDefinitionKey(), Boolean.TRUE);
+ parameters = processInstance.getProcessVariables();
+ Task task = taskService.createTaskQuery().taskId(taskId).processInstanceId(processInsId).singleResult();
+ List<FormDetailVO> beforeNodes = new ArrayList<>();
+ if (Objects.nonNull(task)) {
+ beforeNodes = this.getBeforeNodeForm(parameters, task.getFormKey(), task.getName(), task.getProcessDefinitionId(), task.getTaskDefinitionKey(), Boolean.TRUE);
+ } else {
+ List<HistoricTaskInstance> hisTasks = historyService.createHistoricTaskInstanceQuery()
+ .taskId(taskId)
+ .finished()
+ .includeProcessVariables()
+ .orderByHistoricTaskInstanceStartTime()
+ .desc()
+ .list();
+ if (CollectionUtils.isNotEmpty(hisTasks) && Objects.isNull(hisTasks.get(0))) {
+ throw new RuntimeException("璇ヤ换鍔′笉瀛樺湪");
+ }
+ HistoricTaskInstance hisTask = hisTasks.get(0);
+ beforeNodes = this.getBeforeNodeForm(parameters, hisTask.getFormKey(), hisTask.getName(), hisTask.getProcessDefinitionId(), hisTask.getTaskDefinitionKey(), Boolean.TRUE);
+ }
List<FormDetailVO> dataList = new ArrayList<>(2);
Map<String, List<FormDetailVO>> map = new HashMap<>(2);
beforeNodes.stream().forEach(node -> {
if (node.getCurrent()) {
+ node.setTaskId(taskId);
dataList.add(node);
} else {
List<HistoricTaskInstance> beforeTasks = historyService.createHistoricTaskInstanceQuery()
- .processInstanceId(task.getProcessInstanceId())
+ .processInstanceId(processInsId)
.finished()
.taskDefinitionKey(node.getBeforeNodeDefId())
.orderByTaskCreateTime()
.desc()
.list();
if (CollectionUtils.isNotEmpty(beforeTasks) && Objects.nonNull(beforeTasks.get(0))) {
+ node.setTaskId(beforeTasks.get(0).getId());
List<FormDetailVO> l = map.get(beforeTasks.get(0));
if (CollectionUtils.isEmpty(l)) {
map.put(beforeTasks.get(0).getExecutionId(), Arrays.asList(node));
@@ -1421,14 +1620,14 @@
}
List<DoFormDetailVO> vos = dataList.stream().map(node -> {
if (node.getCurrent()) {
- if (processLogService.taskIsHangup(taskId, task.getProcessInstanceId())) {
+ if (processLogService.taskIsHangup(taskId, processInsId)) {
node.setTaskStatus(TaskStatusEnum.HANGUP);
}
}
// 鍒ゆ柇浠诲姟鏄惁瀛樺湪鐗规畩鎿嶄綔(濡傝烦杩囥�佽浆鍔炵瓑)锛岄渶瑕佸湪鍓嶇灞曠ず鍑烘潵
ProcessLogQuery query = new ProcessLogQuery();
- query.setTaskId(task.getId());
- query.setProcessInsId(task.getProcessInstanceId());
+ query.setTaskId(node.getTaskId());
+ query.setProcessInsId(processInsId);
Result result = processLogService.projectProcessLogPage(query);
List<ProcessLogVO> logList = (List<ProcessLogVO>) result.get("data");
DoFormDetailVO vo = new DoFormDetailVO();
--
Gitblit v1.8.0