From cd3d553f88fb74f1b15eca9fd50b4318956fb01d Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期二, 15 四月 2025 10:51:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xizang-changyun
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 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 b7eb5cb..70c7101 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
@@ -581,7 +581,8 @@
stateTaskQuery.orderByDesc(BaseModel::getCreateTime);
}
// 查询合同信息
- List<TContract> tContracts = contractMapper.selectList(Wrappers.<TContract>lambdaQuery());
+ List<TContract> tContracts = contractMapper.selectList(Wrappers.<TContract>lambdaQuery()
+ .in(TContract::getStatus, 2,3,4));
List<String> contractIds = tContracts.stream().map(TContract::getId).collect(Collectors.toList());
if(CollectionUtils.isEmpty(contractIds)){
return new PageInfo<>();
@@ -810,6 +811,14 @@
if (processTaskListBO.getSortBy() == 2) {
stateTaskQuery.orderByDesc(BaseModel::getCreateTime);
}
+ // 查询合同信息
+ List<TContract> tContracts = contractMapper.selectList(Wrappers.<TContract>lambdaQuery()
+ .in(TContract::getStatus, 2,3,4));
+ List<String> contractIds = tContracts.stream().map(TContract::getId).collect(Collectors.toList());
+ if(CollectionUtils.isEmpty(contractIds)){
+ return new PageInfo<>();
+ }
+ stateTaskQuery.in(StateTaskCenter::getProjectId, contractIds);
stateTaskQuery.in(StateTaskCenter::getFlowId, instanceId);
PageInfo pageInfo = new PageInfo<>(processTaskListBO.getPageNum(), processTaskListBO.getPageSize());
PageInfo<StateTaskCenter> taskCenters = stateTaskCenterService.page(pageInfo,stateTaskQuery);
@@ -1342,6 +1351,17 @@
if (processTaskListBO.getSortBy() == 2) {
stateTaskQuery.orderByDesc(FlwHisTask::getCreateTime);
}
+ List<TContract> tContracts = contractMapper.selectList(Wrappers.<TContract>lambdaQuery()
+ .in(TContract::getStatus, 2,3,4));
+ List<String> contractIds = tContracts.stream().map(TContract::getId).collect(Collectors.toList());
+ if(CollectionUtils.isEmpty(contractIds)){
+ return new PageInfo<>();
+ }
+ List<StateTaskCenter> list = stateTaskCenterService.list(Wrappers.<StateTaskCenter>lambdaQuery().in(StateTaskCenter::getProjectId, contractIds));
+ if(!CollectionUtils.isEmpty(list)){
+ List<String> flowIds = list.stream().map(StateTaskCenter::getFlowId).collect(Collectors.toList());
+ stateTaskQuery.in(FlwHisTask::getInstanceId, flowIds);
+ }
stateTaskQuery.eq(FlwHisTask::getParentTaskId, 0L);
stateTaskQuery.like(FlwHisTask::getCreateId, userId);
PageInfo pageInfo = new PageInfo<>(processTaskListBO.getPageNum(), processTaskListBO.getPageSize());
--
Gitblit v1.7.1