From 2e1039b373bf2ad12f44e5fda0574cfd053b08ae Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期一, 21 四月 2025 10:42:06 +0800 Subject: [PATCH] Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang into dev --- ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java | 3 +-- 1 files changed, 1 insertions(+), 2 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 862a331..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,13 +261,12 @@ // 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()); if(contractIds.isEmpty()){ myToDoVO.setOverdueCount(0); - }else{ int overdueCount = contractService.lambdaQuery().in(TContract::getId, contractIds).list() .stream().map(TContract::getTenantId).distinct().collect(Collectors.toList()).size(); -- Gitblit v1.7.1