From ca8c83c771495363c46b6cfe56a599dfbdbe70d2 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 07 三月 2025 14:23:34 +0800
Subject: [PATCH] Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 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 075b8de..b6939b8 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
@@ -14,6 +14,7 @@
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.system.bo.ProcessTaskListBO;
import com.ruoyi.system.dto.TBillDto;
import com.ruoyi.system.dto.TInvoiceDTO;
import com.ruoyi.system.model.*;
@@ -72,6 +73,8 @@
private ISysUserService sysUserService;
@Autowired
private TContractRentTypeService contractRentTypeService;
+ @Autowired
+ private StateProcessTemplateService processTemplateService;
/**
* 获取轮播图管理列表
*/
@@ -213,11 +216,13 @@
@PostMapping(value = "/admin/myToDo")
public R<MyToDoVO> adminMyToDo() {
MyToDoVO myToDoVO = new MyToDoVO();
- LoginUserApplet loginUserApplet = tokenService.getLoginUserApplet();
- if (loginUserApplet != null) {
- long examineCount = contractService.count(new LambdaQueryWrapper<TContract>()
- .eq(TContract::getStatus, 2));
- myToDoVO.setExamineCount((int) examineCount);
+ LoginUser loginUser = tokenService.getLoginUser();
+ if (loginUser != null) {
+// long examineCount = contractService.count(new LambdaQueryWrapper<TContract>()
+// .eq(TContract::getStatus, 2));
+ ProcessTaskListBO processTaskListBO = new ProcessTaskListBO();
+ PageInfo<ProcessTaskListVO> processTaskListVOPageInfo = processTemplateService.waitTaskPage(processTaskListBO);
+ myToDoVO.setExamineCount((int) processTaskListVOPageInfo.getTotal());
List<String> contractIds = billService.lambdaQuery().eq(TBill::getPayFeesStatus, 4).list()
.stream().map(TBill::getContractId).collect(Collectors.toList());
int overdueCount = contractService.lambdaQuery().in(TContract::getId, contractIds).list()
@@ -357,6 +362,7 @@
res.setPartyOnePhone(contract.getPartyOnePhone());
res.setPartyOnePerson(contract.getPartyTwoPerson());
res.setMonthRent(bill.getPayableFeesMoney());
+ res.setPayType(contract.getPayType());
return R.ok(res);
}
@ApiOperation(value = "管理员-我的审批分页列表")
--
Gitblit v1.7.1