luofl
2025-03-31 2dc084ab3aa5f95cf8317c9d24b7611f8b85bcfa
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");
                }