xuhy
2025-03-31 4fea17a6adc9f67e3b3f51f6c59a6062025fcb7a
Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/xizang
1个文件已修改
6 ■■■■ 已修改文件
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ScreenController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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()));