From 34420233ce62d53d24fe5c089e4bbcb068a5acaf Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 10 四月 2025 18:20:36 +0800
Subject: [PATCH] bug修改
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java | 2 +-
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java
index 3a70734..1a18915 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java
@@ -261,7 +261,7 @@
// long examineCount = contractService.count(new LambdaQueryWrapper<TContract>()
// .eq(TContract::getStatus, 2));
ProcessTaskListBO processTaskListBO = new ProcessTaskListBO();
- PageInfo<ProcessTaskListVO> processTaskListVOPageInfo = processTemplateService.waitTaskPage(processTaskListBO);
+ PageInfo<ProcessTaskListVO> processTaskListVOPageInfo = processTemplateService.dealAndWaitTaskPage(processTaskListBO);
myToDoVO.setExamineCount((int) processTaskListVOPageInfo.getTotal());
List<String> contractIds = billService.lambdaQuery().eq(TBill::getPayFeesStatus, 4).list()
.stream().map(TBill::getContractId).collect(Collectors.toList());
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 70c7101..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<>();
@@ -1352,7 +1352,7 @@
stateTaskQuery.orderByDesc(FlwHisTask::getCreateTime);
}
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<>();
--
Gitblit v1.7.1