From 4fea17a6adc9f67e3b3f51f6c59a6062025fcb7a Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 31 三月 2025 12:36:16 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/xizang
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ScreenController.java | 6 +++---
1 files changed, 3 insertions(+), 3 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..3f2b3da 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,8 +175,8 @@
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()));
--
Gitblit v1.7.1