From b954f194459fa6673346a32dc0dbd56d34ee755e Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期五, 11 四月 2025 17:09:40 +0800 Subject: [PATCH] 合同导入 --- ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java | 8 ++++---- 1 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 6e8189f..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(); @@ -287,8 +286,9 @@ @ApiOperation(value = "管理员-房屋验收单列表") @PostMapping(value = "/admin/houseCheck") public R<PageInfo<TCheckAcceptRecordVO>> houseCheck(@RequestBody TCheckAcceptRecordAppletQuery query) { - LoginUserApplet loginUserApplet = tokenService.getLoginUserApplet(); - query.setSysUserId(loginUserApplet.getUserId()); + LoginUser loginUser = tokenService.getLoginUser(); + SysUser sysUser = sysUserService.selectUserById(loginUser.getUserId()); + query.setBusinessDeptId(sysUser.getBusinessDeptId()); return R.ok(checkAcceptRecordService.pageListApplet(query)); } -- Gitblit v1.7.1