From a03a1a440e45f0b64f19640e48e9099b2b79d3b9 Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期二, 22 四月 2025 12:54:51 +0800
Subject: [PATCH] feat: 缴费的扣款金额，返回设置为支付金额
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 a287f97..162decb 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
@@ -582,7 +582,7 @@
}
// 查询合同信息
List<TContract> tContracts = contractMapper.selectList(Wrappers.<TContract>lambdaQuery()
- .in(TContract::getStatus, 2,3,4));
+ .in(TContract::getStatus, 2,3,4,9));
List<String> contractIds = tContracts.stream().map(TContract::getId).collect(Collectors.toList());
if(CollectionUtils.isEmpty(contractIds)){
return new PageInfo<>();
@@ -813,7 +813,7 @@
}
// 查询合同信息
List<TContract> tContracts = contractMapper.selectList(Wrappers.<TContract>lambdaQuery()
- .in(TContract::getStatus, 2,3,4));
+ .in(TContract::getStatus, 2,3,4,9));
List<String> contractIds = tContracts.stream().map(TContract::getId).collect(Collectors.toList());
if(CollectionUtils.isEmpty(contractIds)){
return new PageInfo<>();
@@ -1351,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,9));
+ 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