From 2dc084ab3aa5f95cf8317c9d24b7611f8b85bcfa Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期一, 31 三月 2025 14:04:11 +0800
Subject: [PATCH] 1.租户数量趋势统计
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ScreenController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ScreenController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ScreenController.java
index d8d82e6..b426f37 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ScreenController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ScreenController.java
@@ -149,7 +149,7 @@
houseMapDistributionVO.setLongitude(house.getLongitude());
houseMapDistributionVO.setLatitude(house.getLatitude());
TContract contract = contractService.getOne(new LambdaQueryWrapper<TContract>()
- .gt(TContract::getEndTime, LocalDateTime.now())
+ .gt(TContract::getEndTime, LocalDate.now())
.eq(TContract::getHouseId, house.getId())
.eq(TContract::getStatus, 4)
.last("limit 1"));
@@ -175,12 +175,12 @@
TBill one = billService.getOne(new LambdaQueryWrapper<TBill>()
- .le(TBill::getStartTime, LocalDateTime.now())
- .gt(TBill::getEndTime, LocalDateTime.now())
+ .le(TBill::getStartTime, LocalDate.now())
+ .ge(TBill::getEndTime, LocalDate.now())
.eq(TBill::getBillType, 1)
.eq(TBill::getContractId, contract.getId()));
- if ("4".equals(one.getPayFeesStatus())){
+ if (one != null && "4".equals(one.getPayFeesStatus())){
houseMapDistributionVO.setHouseStatus("4");
}
--
Gitblit v1.7.1