From 5fa6e6f8410ef9d057174bcff2a3c5038c54a551 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期日, 27 四月 2025 18:41:20 +0800
Subject: [PATCH] bug修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java
index 162decb..f1b831a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java
@@ -37,6 +37,7 @@
import com.ruoyi.system.bo.*;
import com.ruoyi.system.mapper.StateProcessTemplateMapper;
import com.ruoyi.system.mapper.TContractMapper;
+import com.ruoyi.system.mapper.TContractRentTypeMapper;
import com.ruoyi.system.model.*;
import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.ProcessDetailVO;
@@ -85,6 +86,8 @@
private ISysUserService sysUserService;
@Autowired
private TContractMapper contractMapper;
+ @Autowired
+ private TContractRentTypeMapper contractRentTypeMapper;
/**
* 流程模版分页
@@ -694,9 +697,12 @@
Map<Long, List<FlwHisTask>> flwHisTaskMap = flwHisTaskList.stream().collect(Collectors.groupingBy(FlwHisTask::getInstanceId));
//查询原因
List<String> taskIds = flwHisTaskList.stream().map(FlowEntity::getId).map(String::valueOf).collect(Collectors.toList());
- List<StateProcessInstanceAction> actions = stateProcessInstanceActionService.list(
- Wrappers.<StateProcessInstanceAction>lambdaQuery().in(StateProcessInstanceAction::getNodeId, taskIds));
- Map<String, StateProcessInstanceAction> actionMap = actions.stream().collect(Collectors.toMap(StateProcessInstanceAction::getNodeId, Function.identity()));
+ Map<String, StateProcessInstanceAction> actionMap = new HashMap<>();
+ if(!CollectionUtils.isEmpty(taskIds)){
+ List<StateProcessInstanceAction> actions = stateProcessInstanceActionService.list(
+ Wrappers.<StateProcessInstanceAction>lambdaQuery().in(StateProcessInstanceAction::getNodeId, taskIds));
+ actionMap = actions.stream().collect(Collectors.toMap(StateProcessInstanceAction::getNodeId, Function.identity()));
+ }
List<String> updateUserId = processTaskListVOS.getRecords().stream().map(ProcessTaskListVO::getCreateBy).collect(Collectors.toList());
Map<Long, SysUser> sysUserMap;
@@ -726,9 +732,11 @@
}
}
}
- StateProcessInstanceAction action = actionMap.get(processTaskListVO.getTaskId());
- if (ObjectUtil.isNotEmpty(action)) {
- processTaskListVO.setReason(action.getRemark());
+ if(!CollectionUtils.isEmpty(actionMap)){
+ StateProcessInstanceAction action = actionMap.get(processTaskListVO.getTaskId());
+ if (ObjectUtil.isNotEmpty(action)) {
+ processTaskListVO.setReason(action.getRemark());
+ }
}
SysUser sysUser = sysUserMap.get(processTaskListVO.getCreateBy());
if (Objects.nonNull(sysUser)) {
@@ -1296,6 +1304,12 @@
}
BeanUtil.copyProperties(contract, processDetailVO);
+ // 查询递增递减
+ TContractRentType tContractRentType = contractRentTypeMapper.selectOne(Wrappers.lambdaQuery(TContractRentType.class)
+ .eq(TContractRentType::getContractId, contract.getId())
+ .last("LIMIT 1"));
+ processDetailVO.setContractRentType(tContractRentType);
+
// 查询历史任务
List<FlwHisTask> flwHisTasks = flwHisTaskMapper.selectList(Wrappers.<FlwHisTask>lambdaQuery().eq(FlwHisTask::getInstanceId, instanceId));
processDetailVO.setInstanceId(String.valueOf(instanceId));
--
Gitblit v1.7.1