From b29b4008fcc85a8184d30af44dab540d50a14698 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 08 四月 2025 14:03:14 +0800
Subject: [PATCH] 查询流程图中的历史任务去重、修改任务相关完善
---
business/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java | 152 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 139 insertions(+), 13 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 af1da78..bf9dcf8 100644
--- a/business/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java
@@ -28,6 +28,7 @@
import com.ycl.domain.entity.ProcessLog;
import com.ycl.domain.entity.ProjectProcess;
import com.ycl.domain.entity.SysForm;
+import com.ycl.domain.form.EditFinishedTaskForm;
import com.ycl.domain.json.RejectData;
import com.ycl.domain.query.ProcessLogQuery;
import com.ycl.domain.vo.*;
@@ -190,6 +191,7 @@
}
return AjaxResult.success("鎻愪氦鎴愬姛");
}
+
/**
* 瀹圭己琛ヤ氦
@@ -1348,6 +1350,7 @@
.processInstanceId(procInsId)
.finished()
.list();
+ listFinished = this.distinctHisActivity(listFinished);
//鎵╁睍 鑾峰彇杩欎釜娴佺▼瀹炰緥鐨勭洃鎺т俊鎭� key:TaskId value:瀹炰綋绫�
Map<String, ProcessCoding> processCodingMap = new LambdaQueryChainWrapper<>(processCodingMapper)
@@ -1411,6 +1414,88 @@
}
/**
+ * 鏍规嵁浠诲姟key鍘婚噸鍘嗗彶浠诲姟锛岀浉鍚屾儏鍐典笅鍙栨渶鏂扮殑涓�鏉�
+ *
+ * @param hisTaskList
+ * @return
+ */
+ private List<HistoricActivityInstance> distinctHisActivity(List<HistoricActivityInstance> hisTaskList) {
+ Map<String, HistoricActivityInstance> uniqueTasks = new HashMap<>();
+ for (HistoricActivityInstance task : hisTaskList) {
+ String taskDefinitionKey = task.getActivityId();
+ HistoricActivityInstance existingTask = uniqueTasks.get(taskDefinitionKey);
+
+ // 濡傛灉浠诲姟key閲嶅锛堝彲鑳借椹冲洖杩囷紝閲嶆柊鎻愪氦瀵艰嚧key閲嶅锛夛紝鍙栨渶杩戠殑涓�鏉�
+ if (existingTask == null || task.getStartTime().after(existingTask.getStartTime())) {
+ uniqueTasks.put(taskDefinitionKey, task);
+ }
+ }
+ // 鏈�缁堝幓閲嶅悗鐨勪换鍔″垪琛�
+ return new ArrayList<>(uniqueTasks.values());
+ }
+
+ /**
+ * 鏌ヨ褰撳墠浠诲姟鐨勮〃鍗曟暟鎹�
+ *
+ * @param taskId
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public AjaxResult currentFlowTaskForm(String taskId) {
+ // 娴佺▼鍙橀噺
+ List<HistoricTaskInstance> hisTaskList = historyService.createHistoricTaskInstanceQuery()
+ .includeProcessVariables()
+ .finished()
+ .taskId(taskId)
+ .orderByHistoricTaskInstanceStartTime()
+ .desc()
+ .list();
+ if (CollectionUtils.isEmpty(hisTaskList) || Objects.isNull(hisTaskList.get(0))) {
+ return AjaxResult.error("鏈壘鍒拌浠诲姟淇℃伅");
+ }
+ HistoricTaskInstance historicTaskInstance = hisTaskList.get(0);
+ Map<String, Object> parameters = historicTaskInstance.getProcessVariables();
+ String processInsId = historicTaskInstance.getProcessInstanceId();
+ List<FormDetailVO> beforeNodes = this.getBeforeNodeForm(parameters,
+ historicTaskInstance.getFormKey(),
+ historicTaskInstance.getName(),
+ historicTaskInstance.getProcessDefinitionId(),
+ historicTaskInstance.getTaskDefinitionKey(),
+ Boolean.TRUE, Boolean.FALSE);
+
+
+ String finalProcessInsId = processInsId;
+ List<DoFormDetailVO> vos = beforeNodes.stream()
+ .filter(FormDetailVO::getCurrent)
+ .map(node -> {
+ // 鍒ゆ柇浠诲姟鏄惁瀛樺湪鐗规畩鎿嶄綔(濡傝烦杩囥�佽浆鍔炵瓑)锛岄渶瑕佸湪鍓嶇灞曠ず鍑烘潵
+ ProcessLogQuery query = new ProcessLogQuery();
+ query.setTaskId(taskId);
+ query.setProcessInsId(finalProcessInsId);
+ Result result = processLogService.projectProcessLogList(query);
+ List<ProcessLogVO> logList = (List<ProcessLogVO>) result.get("data");
+ DoFormDetailVO vo = new DoFormDetailVO();
+ BeanUtils.copyProperties(node, vo);
+ if (CollectionUtils.isNotEmpty(logList)) {
+ vo.setEvents(logList);
+ }
+ // 鏍规嵁鏃ュ織鍒ゆ柇褰撳墠浠诲姟鐨勭姸鎬�
+ if (logList.stream().anyMatch(log -> ProcessLogEventTypeEnum.FINISHED.equals(log.getEventType()))) {
+ vo.setTaskStatus(TaskStatusEnum.FINISHED);
+ } else if (logList.stream().anyMatch(log -> ProcessLogEventTypeEnum.JUMP.equals(log.getEventType()))) {
+ vo.setTaskStatus(TaskStatusEnum.JUMP);
+ } else if (processLogService.taskIsWait(taskId, processInsId)) {
+ vo.setTaskStatus(TaskStatusEnum.WAIT);
+ } else if (processLogService.taskIsHangup(taskId, processInsId)) {
+ vo.setTaskStatus(TaskStatusEnum.HANGUP);
+ }
+ return vo;
+ }).collect(Collectors.toList());
+ return AjaxResult.success(vos.get(0));
+ }
+
+ /**
* 娴佺▼鑺傜偣琛ㄥ崟
*
* @param taskId 娴佺▼浠诲姟缂栧彿
@@ -1423,15 +1508,31 @@
Map<String, Object> parameters = new HashMap<>();
List<FormDetailVO> beforeNodes = new ArrayList<>();
String processInsId = "";
- HistoricTaskInstance historicTaskInstance = historyService.createHistoricTaskInstanceQuery().includeProcessVariables().finished().taskId(taskId).singleResult();
- if (Objects.nonNull(historicTaskInstance)) {
- parameters = historicTaskInstance.getProcessVariables();
- processInsId = historicTaskInstance.getProcessInstanceId();
- beforeNodes = this.getBeforeNodeForm(parameters, historicTaskInstance.getFormKey(), historicTaskInstance.getName(), historicTaskInstance.getProcessDefinitionId(), historicTaskInstance.getTaskDefinitionKey(), Boolean.FALSE);
+ List<HistoricTaskInstance> hisTaskList = historyService.createHistoricTaskInstanceQuery()
+ .includeProcessVariables()
+ .finished()
+ .taskId(taskId)
+ .orderByHistoricTaskInstanceStartTime()
+ .desc()
+ .list();
+ if (CollectionUtils.isNotEmpty(hisTaskList) && Objects.nonNull(hisTaskList.get(0))) {
+ parameters = hisTaskList.get(0).getProcessVariables();
+ processInsId = hisTaskList.get(0).getProcessInstanceId();
+ beforeNodes = this.getBeforeNodeForm(parameters,
+ hisTaskList.get(0).getFormKey(),
+ hisTaskList.get(0).getName(),
+ hisTaskList.get(0).getProcessDefinitionId(),
+ hisTaskList.get(0).getTaskDefinitionKey(),
+ Boolean.FALSE, Boolean.TRUE);
} else {
parameters = taskService.getVariables(taskId);
processInsId = task.getProcessInstanceId();
- beforeNodes = this.getBeforeNodeForm(parameters, task.getFormKey(), task.getName(), task.getProcessDefinitionId(), task.getTaskDefinitionKey(), Boolean.FALSE);
+ beforeNodes = this.getBeforeNodeForm(parameters,
+ task.getFormKey(),
+ task.getName(),
+ task.getProcessDefinitionId(),
+ task.getTaskDefinitionKey(),
+ Boolean.FALSE, Boolean.TRUE);
}
// 鍒ゆ柇鍓嶇疆浠诲姟鏄笉鏄拰褰撳墠浠诲姟涓哄悓涓�涓猠xecuteId
// 鍒ゆ柇褰撳墠浠诲姟鏄惁琚寕璧蜂腑
@@ -1514,7 +1615,12 @@
}
HistoricTaskInstance hisTask = hisTasks.get(0);
parameters = historicProcessInstance.getProcessVariables();
- List<FormDetailVO> beforeNodes = this.getBeforeNodeForm(parameters, hisTask.getFormKey(), hisTask.getName(), hisTask.getProcessDefinitionId(), hisTask.getTaskDefinitionKey(), Boolean.TRUE);
+ List<FormDetailVO> beforeNodes = this.getBeforeNodeForm(parameters,
+ hisTask.getFormKey(),
+ hisTask.getName(),
+ hisTask.getProcessDefinitionId(),
+ hisTask.getTaskDefinitionKey(),
+ Boolean.TRUE, Boolean.TRUE);
List<FormDetailVO> dataList = new ArrayList<>(2);
Map<String, List<FormDetailVO>> map = new HashMap<>(2);
beforeNodes.stream().forEach(node -> {
@@ -1571,7 +1677,12 @@
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);
+ beforeNodes = this.getBeforeNodeForm(parameters,
+ task.getFormKey(),
+ task.getName(),
+ task.getProcessDefinitionId(),
+ task.getTaskDefinitionKey(),
+ Boolean.TRUE, Boolean.TRUE);
} else {
List<HistoricTaskInstance> hisTasks = historyService.createHistoricTaskInstanceQuery()
.taskId(taskId)
@@ -1584,7 +1695,12 @@
throw new RuntimeException("璇ヤ换鍔′笉瀛樺湪");
}
HistoricTaskInstance hisTask = hisTasks.get(0);
- beforeNodes = this.getBeforeNodeForm(parameters, hisTask.getFormKey(), hisTask.getName(), hisTask.getProcessDefinitionId(), hisTask.getTaskDefinitionKey(), Boolean.TRUE);
+ beforeNodes = this.getBeforeNodeForm(parameters,
+ hisTask.getFormKey(),
+ hisTask.getName(),
+ hisTask.getProcessDefinitionId(),
+ hisTask.getTaskDefinitionKey(),
+ Boolean.TRUE, Boolean.TRUE);
}
List<FormDetailVO> dataList = new ArrayList<>(2);
Map<String, List<FormDetailVO>> map = new HashMap<>(2);
@@ -1648,9 +1764,16 @@
* @param taskName 浠诲姟
* @param processDefId 娴佺▼瀹氫箟id
* @param processDefKey 娴佺▼瀹炰緥id
+ * @param disableInput 鏄惁绂佺敤宸茬粡鏈夊�肩殑杈撳叆椤�
* @return
*/
- private List<FormDetailVO> getBeforeNodeForm(Map<String, Object> parameters, String formKey, String taskName, String processDefId, String processDefKey, Boolean currentNeedData) {
+ private List<FormDetailVO> getBeforeNodeForm(Map<String, Object> parameters,
+ String formKey,
+ String taskName,
+ String processDefId,
+ String processDefKey,
+ Boolean currentNeedData,
+ Boolean disableInput) {
// 杩欓噷鍙渶瑕佹煡鑷韩浠ュ強涓婁竴涓妭鐐�(濡傛灉骞惰鐨勬湁澶氫釜)鐨勮〃鍗曟暟鎹�
List<FormDetailVO> beforeNodes = taskCommonService.getBeforeNodeDefInfo(processDefId, processDefKey, sysFormService, Boolean.TRUE);
@@ -1684,9 +1807,11 @@
if(CollectionUtils.isNotEmpty(oldFields)) {
// 璁剧疆宸插～鍐欑殑琛ㄥ崟涓虹鐢ㄧ姸鎬�
- for (JSONObject oldField : oldFields) {
- JSONObject options = oldField.getJSONObject("options");
- options.put("disabled", true);
+ if (disableInput) {
+ for (JSONObject oldField : oldFields) {
+ JSONObject options = oldField.getJSONObject("options");
+ options.put("disabled", true);
+ }
}
formJson.put(ProcessConstants.WIDGET_LIST, oldFields);
newP.put(ProcessConstants.TASK_FORM_KEY, formJson);
@@ -1717,6 +1842,7 @@
return beforeNodes;
}
+
/**
* 娴佺▼鑺傜偣淇℃伅
*
--
Gitblit v1.8.0