From 85cd2c1d75f6c9c2c7f3d28a80ba3bbf11a38f52 Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期四, 10 四月 2025 11:03:25 +0800
Subject: [PATCH] feat: 1.修改支付回调返回营运部门ID
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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 e17245c..b7eb5cb 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
@@ -580,6 +580,13 @@
if (processTaskListBO.getSortBy() == 2) {
stateTaskQuery.orderByDesc(BaseModel::getCreateTime);
}
+ // 查询合同信息
+ List<TContract> tContracts = contractMapper.selectList(Wrappers.<TContract>lambdaQuery());
+ 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, instanceIds);
PageInfo pageInfo = new PageInfo(processTaskListBO.getPageNum(), processTaskListBO.getPageSize());
PageInfo<StateTaskCenter> taskCenters = stateTaskCenterService.page(pageInfo,stateTaskQuery);
@@ -1003,11 +1010,8 @@
Long taskId = Long.valueOf(processRefuseBO.getTaskId());
FlwTask flwTask = flwTaskMapper.selectById(taskId);
// 直接拒绝当前流程
- try{
-// flowLongEngine.runtimeService().reject(flwTask.getInstanceId(), currentFlowCreator());
- }catch (Exception e){
- System.out.println("拒绝流程");
- }
+ flowLongEngine.runtimeService().reject(flwTask.getInstanceId(), currentFlowCreator());
+ flwTaskMapper.deleteById(taskId);
// 动作执行记录
StateProcessInstanceAction record = new StateProcessInstanceAction();
record.setId(IdUtils.simpleUUID());
--
Gitblit v1.7.1