From 203acef84d19ffc01bc8d5dd8ef85f90ba400f5c Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期日, 09 三月 2025 11:49:58 +0800
Subject: [PATCH] 容缺查询
---
business/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java | 199 +++++++++++++++++++++++++++++++------------------
1 files changed, 125 insertions(+), 74 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 c1585ec..b39a37e 100644
--- a/business/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ycl.common.base.Result;
import com.ycl.common.constant.ProcessConstants;
import com.ycl.common.core.domain.AjaxResult;
import com.ycl.common.core.domain.entity.SysDept;
@@ -23,14 +24,11 @@
import com.ycl.domain.dto.FlowTaskDto;
import com.ycl.domain.dto.FlowViewerDto;
import com.ycl.domain.entity.ProcessCoding;
-import com.ycl.domain.entity.ProcessLog;
import com.ycl.domain.entity.ProjectProcess;
import com.ycl.domain.entity.SysForm;
import com.ycl.domain.json.RejectData;
-import com.ycl.domain.vo.DoFormDetailVO;
-import com.ycl.domain.vo.FlowQueryVo;
-import com.ycl.domain.vo.FlowTaskVo;
-import com.ycl.domain.vo.FormDetailVO;
+import com.ycl.domain.query.ProcessLogQuery;
+import com.ycl.domain.vo.*;
import com.ycl.event.event.TaskLogEvent;
import com.ycl.factory.FlowServiceFactory;
import com.ycl.flow.CustomProcessDiagramGenerator;
@@ -77,7 +75,6 @@
import java.io.InputStream;
import java.lang.reflect.Field;
-import java.math.BigDecimal;
import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
@@ -138,11 +135,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("浠诲姟涓嶅瓨鍦�");
@@ -155,28 +153,18 @@
return AjaxResult.error("椤圭洰娴佺▼鏈粦瀹�");
}
- Map<String, Object> processVariables = new HashMap<>();
- //鏌ュ嚭瀛楀吀涓渶瑕佹敞鍏ョ殑瀛楁淇℃伅
+ // 鏌ュ嚭瀛楀吀涓渶瑕佹敞鍏ョ殑瀛楁淇℃伅
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)) {
- if ("money".equals(key)) {
- // 涓囧厓杞厓
- Object w = variables.get(key);
- BigDecimal y = new BigDecimal(w.toString()).multiply(new BigDecimal(10000));
- processVariables.put(key, y);
- } else {
- processVariables.put(key,variables.get(key));
- }
+ newV.put(key,variables.get(key));
}
}
}
- //娣诲姞娴佺▼鍙橀噺
- if(!processVariables.isEmpty()) taskService.setVariables(taskId,processVariables);
taskService.addComment(taskId, task.getProcessInstanceId(), FlowComment.SUBMIT.getType(), "瀹屾垚鎻愪氦");
if (DelegationState.PENDING.equals(task.getDelegationState())) {
taskService.resolveTask(taskId, newV);
@@ -186,15 +174,17 @@
taskService.complete(taskId, newV);
}
// 淇濆瓨鏃ュ織
- publisher.publishEvent(new TaskLogEvent(this, null,
- SecurityUtils.getUserId(),
- projectProcess.getProjectId(),
- projectProcess.getProcessInsId(),
- taskId,
- task.getTaskDefinitionKey(),
- task.getName(),
- ProcessLogEventTypeEnum.FINISHED,
- null));
+ 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("鎻愪氦鎴愬姛");
}
@@ -1278,31 +1268,47 @@
// 鍒ゆ柇鍓嶇疆浠诲姟鏄笉鏄拰褰撳墠浠诲姟涓哄悓涓�涓猠xecuteId
// 鍒ゆ柇褰撳墠浠诲姟鏄惁琚寕璧蜂腑
String finalProcessInsId = processInsId;
- beforeNodes = beforeNodes.stream().filter(node -> {
+ List<FormDetailVO> dataList = new ArrayList<>(2);
+ Map<String, List<FormDetailVO>> map = new HashMap<>(2);
+ beforeNodes.stream().forEach(node -> {
if (node.getCurrent()) {
- return Boolean.TRUE;
+ dataList.add(node);
+ } else {
+ List<HistoricTaskInstance> beforeTasks = historyService.createHistoricTaskInstanceQuery()
+ .processInstanceId(finalProcessInsId)
+ .finished()
+ .taskDefinitionKey(node.getBeforeNodeDefId())
+ .orderByTaskCreateTime()
+ .desc()
+ .list();
+ if (CollectionUtils.isNotEmpty(beforeTasks) && Objects.nonNull(beforeTasks.get(0))) {
+ List<FormDetailVO> l = map.get(beforeTasks.get(0));
+ if (CollectionUtils.isEmpty(l)) {
+ map.put(beforeTasks.get(0).getExecutionId(), Arrays.asList(node));
+ } else {
+ l.add(node);
+ }
+ }
}
- List<HistoricTaskInstance> beforeTasks = historyService.createHistoricTaskInstanceQuery()
- .processInstanceId(finalProcessInsId)
- .finished()
- .taskDefinitionKey(node.getBeforeNodeDefId())
- .orderByTaskCreateTime()
- .desc()
- .list();
- return CollectionUtils.isNotEmpty(beforeTasks) && Objects.nonNull(beforeTasks.get(0));
- }).collect(Collectors.toList());
- List<DoFormDetailVO> vos = beforeNodes.stream().map(node -> {
+ });
+ for (String key : map.keySet()) {
+ if (StringUtils.isNotBlank(key)) {
+ // 鍚屼竴鎵ц鍣ㄤ笂鍙彇鏈�杩戠殑涓�涓�
+ dataList.add(map.get(key).get(0));
+ }
+ }
+ List<DoFormDetailVO> vos = dataList.stream().map(node -> {
if (node.getCurrent()) {
if (processLogService.taskIsHangup(taskId, finalProcessInsId)) {
node.setTaskStatus(TaskStatusEnum.HANGUP);
}
}
// 鍒ゆ柇浠诲姟鏄惁瀛樺湪鐗规畩鎿嶄綔(濡傝烦杩囥�佽浆鍔炵瓑)锛岄渶瑕佸湪鍓嶇灞曠ず鍑烘潵
- List<ProcessLog> logList = new LambdaQueryChainWrapper<>(processLogService.getBaseMapper())
- .eq(ProcessLog::getTaskDefKey, node.getBeforeNodeDefId())
- .eq(ProcessLog::getProcessInsId, finalProcessInsId)
- .orderByDesc(ProcessLog::getGmtCreate)
- .list();
+ ProcessLogQuery query = new ProcessLogQuery();
+ query.setTaskDefKey(node.getUserTask().getId());
+ query.setProcessInsId(finalProcessInsId);
+ Result result = processLogService.projectProcessLogPage(query);
+ List<ProcessLogVO> logList = (List<ProcessLogVO>) result.get("data");
DoFormDetailVO vo = new DoFormDetailVO();
BeanUtils.copyProperties(node, vo);
if (CollectionUtils.isNotEmpty(logList)) {
@@ -1320,19 +1326,48 @@
Map<String, Object> parameters = new HashMap<>();
if (Objects.isNull(task)) {
// 濡傛灉涓虹┖锛屽彲鑳芥槸浠诲姟宸茬粡缁撴潫
- HistoricTaskInstance hisTask = historyService.createHistoricTaskInstanceQuery().taskId(taskId).includeProcessVariables().singleResult();
- if (Objects.isNull(hisTask)) {
+ List<HistoricTaskInstance> hisTasks = historyService.createHistoricTaskInstanceQuery()
+ .taskId(taskId)
+ .finished()
+ .includeProcessVariables()
+ .orderByTaskCreateTime()
+ .desc()
+ .list();
+ if (CollectionUtils.isNotEmpty(hisTasks) && Objects.isNull(hisTasks.get(0))) {
throw new RuntimeException("璇ヤ换鍔′笉瀛樺湪");
}
+ HistoricTaskInstance hisTask = hisTasks.get(0);
parameters = hisTask.getProcessVariables();
List<FormDetailVO> beforeNodes = this.getBeforeNodeForm(parameters, hisTask.getFormKey(), hisTask.getName(), hisTask.getProcessDefinitionId(), hisTask.getTaskDefinitionKey(), Boolean.TRUE);
- List<FormDetailVO> dataList = beforeNodes.stream().filter(node -> {
+ List<FormDetailVO> dataList = new ArrayList<>(2);
+ Map<String, List<FormDetailVO>> map = new HashMap<>(2);
+ beforeNodes.stream().forEach(node -> {
if (node.getCurrent()) {
- return Boolean.TRUE;
+ dataList.add(node);
+ } else {
+ List<HistoricTaskInstance> beforeTasks = historyService.createHistoricTaskInstanceQuery()
+ .processInstanceId(hisTask.getProcessInstanceId())
+ .finished()
+ .taskDefinitionKey(node.getBeforeNodeDefId())
+ .orderByTaskCreateTime()
+ .desc()
+ .list();
+ if (CollectionUtils.isNotEmpty(beforeTasks) && Objects.nonNull(beforeTasks.get(0))) {
+ List<FormDetailVO> l = map.get(beforeTasks.get(0));
+ if (CollectionUtils.isEmpty(l)) {
+ map.put(beforeTasks.get(0).getExecutionId(), Arrays.asList(node));
+ } else {
+ l.add(node);
+ }
+ }
}
- HistoricTaskInstance beforeTask = historyService.createHistoricTaskInstanceQuery().processInstanceId(hisTask.getProcessInstanceId()).finished().taskDefinitionKey(node.getBeforeNodeDefId()).singleResult();
- return Objects.nonNull(beforeTask);
- }).collect(Collectors.toList());
+ });
+ for (String key : map.keySet()) {
+ if (StringUtils.isNotBlank(key)) {
+ // 鍚屼竴鎵ц鍣ㄤ笂鍙彇鏈�杩戠殑涓�涓�
+ dataList.add(map.get(key).get(0));
+ }
+ }
List<DoFormDetailVO> vos = dataList.stream().map(node -> {
if (node.getCurrent()) {
if (processLogService.taskIsHangup(taskId, hisTask.getProcessInstanceId())) {
@@ -1340,11 +1375,11 @@
}
}
// 鍒ゆ柇浠诲姟鏄惁瀛樺湪鐗规畩鎿嶄綔(濡傝烦杩囥�佽浆鍔炵瓑)锛岄渶瑕佸湪鍓嶇灞曠ず鍑烘潵
- List<ProcessLog> logList = new LambdaQueryChainWrapper<>(processLogService.getBaseMapper())
- .eq(ProcessLog::getTaskId, hisTask.getId())
- .eq(ProcessLog::getProcessInsId, hisTask.getProcessInstanceId())
- .orderByDesc(ProcessLog::getGmtCreate)
- .list();
+ ProcessLogQuery query = new ProcessLogQuery();
+ query.setTaskDefKey(node.getUserTask().getId());
+ query.setProcessInsId(hisTask.getProcessInstanceId());
+ Result result = processLogService.projectProcessLogPage(query);
+ List<ProcessLogVO> logList = (List<ProcessLogVO>) result.get("data");
DoFormDetailVO vo = new DoFormDetailVO();
BeanUtils.copyProperties(node, vo);
if (CollectionUtils.isNotEmpty(logList)) {
@@ -1356,19 +1391,35 @@
} else {
parameters = taskService.getVariables(taskId);
List<FormDetailVO> beforeNodes = this.getBeforeNodeForm(parameters, task.getFormKey(), task.getName(), task.getProcessDefinitionId(), task.getTaskDefinitionKey(), Boolean.TRUE);
- List<FormDetailVO> dataList = beforeNodes.stream().filter(node -> {
+ List<FormDetailVO> dataList = new ArrayList<>(2);
+ Map<String, List<FormDetailVO>> map = new HashMap<>(2);
+ beforeNodes.stream().forEach(node -> {
if (node.getCurrent()) {
- return Boolean.TRUE;
+ dataList.add(node);
+ } else {
+ List<HistoricTaskInstance> beforeTasks = historyService.createHistoricTaskInstanceQuery()
+ .processInstanceId(task.getProcessInstanceId())
+ .finished()
+ .taskDefinitionKey(node.getBeforeNodeDefId())
+ .orderByTaskCreateTime()
+ .desc()
+ .list();
+ if (CollectionUtils.isNotEmpty(beforeTasks) && Objects.nonNull(beforeTasks.get(0))) {
+ List<FormDetailVO> l = map.get(beforeTasks.get(0));
+ if (CollectionUtils.isEmpty(l)) {
+ map.put(beforeTasks.get(0).getExecutionId(), Arrays.asList(node));
+ } else {
+ l.add(node);
+ }
+ }
}
- List<HistoricTaskInstance> beforeTaskList = historyService.createHistoricTaskInstanceQuery()
- .processInstanceId(task.getProcessInstanceId())
- .finished()
- .taskDefinitionKey(node.getBeforeNodeDefId())
- .orderByTaskCreateTime()
- .desc()
- .list();
- return CollectionUtils.isNotEmpty(beforeTaskList) && Objects.nonNull(beforeTaskList.get(0));
- }).collect(Collectors.toList());
+ });
+ for (String key : map.keySet()) {
+ if (StringUtils.isNotBlank(key)) {
+ // 鍚屼竴鎵ц鍣ㄤ笂鍙彇鏈�杩戠殑涓�涓�
+ dataList.add(map.get(key).get(0));
+ }
+ }
List<DoFormDetailVO> vos = dataList.stream().map(node -> {
if (node.getCurrent()) {
if (processLogService.taskIsHangup(taskId, task.getProcessInstanceId())) {
@@ -1376,11 +1427,11 @@
}
}
// 鍒ゆ柇浠诲姟鏄惁瀛樺湪鐗规畩鎿嶄綔(濡傝烦杩囥�佽浆鍔炵瓑)锛岄渶瑕佸湪鍓嶇灞曠ず鍑烘潵
- List<ProcessLog> logList = new LambdaQueryChainWrapper<>(processLogService.getBaseMapper())
- .eq(ProcessLog::getTaskId, task.getId())
- .eq(ProcessLog::getProcessInsId, task.getProcessInstanceId())
- .orderByDesc(ProcessLog::getGmtCreate)
- .list();
+ ProcessLogQuery query = new ProcessLogQuery();
+ query.setTaskDefKey(node.getUserTask().getId());
+ query.setProcessInsId(task.getProcessInstanceId());
+ Result result = processLogService.projectProcessLogPage(query);
+ List<ProcessLogVO> logList = (List<ProcessLogVO>) result.get("data");
DoFormDetailVO vo = new DoFormDetailVO();
BeanUtils.copyProperties(node, vo);
if (CollectionUtils.isNotEmpty(logList)) {
--
Gitblit v1.8.0