From 70d2ac8e21669adb1d6ae560ac09bbfe2645de35 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 04 四月 2025 00:52:31 +0800
Subject: [PATCH] bug修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ScreenController.java | 64 ++++++++++++++------------------
1 files changed, 28 insertions(+), 36 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 7b53652..27aed4c 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
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.system.model.TBill;
import com.ruoyi.system.model.TContract;
import com.ruoyi.system.model.THouse;
@@ -68,37 +69,11 @@
return R.ok(screenService.rentIncomeTrend());
}
+
@GetMapping("/getTenantCountTrend")
@ApiOperation(value = "租户数量趋势统计")
public R<List<TenantCountTrendVO>> getTenantCountTrend() {
-
- Date currentDate = new Date();
- Date targetDate = DateUtils.addMonths(currentDate, -3 * 6);
- Map<String, Date> startQuarterDate = DateUtils.getQuarterDate(targetDate);
-
- Date targetDate2 = DateUtils.addMonths(currentDate, 0);
- Map<String, Date> endQuarterDate = DateUtils.getQuarterDate(targetDate2);
-
- List<TContract> contracts = contractService.list(new LambdaQueryWrapper<TContract>()
- .isNotNull(TContract::getSignTime)
- .between(TContract::getSignTime, startQuarterDate.get("first"), endQuarterDate.get("last"))
- .orderByAsc(TContract::getSignTime));
-
- DateTimeFormatter quarterFormatter = DateTimeFormatter.ofPattern("yyyy-MM");
-
- List<TenantCountTrendVO> trendData = contracts.stream()
- .collect(Collectors.groupingBy(contract -> {
- LocalDate date = contract.getSignTime().toLocalDate();
- int quarter = (date.getMonthValue() - 1) / 3 + 1;
- return YearQuarter.from(date.withMonth(quarter * 3 - 2));
- }, TreeMap::new, Collectors.counting()))
- .entrySet().stream()
- .map(entry -> new TenantCountTrendVO(
- entry.getKey().format(quarterFormatter),
- entry.getValue()))
- .collect(Collectors.toList());
-
- return R.ok(trendData);
+ return screenService.getTenantCountTrend();
}
@@ -109,7 +84,9 @@
@ApiOperation("获取实时租赁数据")
public R<List<RealTimeRentDataVO>> getRealTimeRentData() {
// 随机获取十条房源
+ String businessDeptId = SecurityUtils.getBusinessDeptId();
List<THouse> houses = houseService.list(new LambdaQueryWrapper<THouse>()
+ .eq(!"0".equals(businessDeptId),THouse::getBusinessDeptId, businessDeptId)
.last("ORDER BY RAND() LIMIT 10"));
if (CollectionUtil.isEmpty(houses)){
@@ -129,7 +106,7 @@
List<RealTimeRentDataVO> result = houses.stream().map(house -> {
RealTimeRentDataVO vo = new RealTimeRentDataVO();
vo.setStreetName(streetMap.getOrDefault(house.getStreetId(), "未知"));
- vo.setRoomName(house.getRoomNumber());
+ vo.setRoomName(house.getHouseName());
vo.setLeaseStatus(house.getLeaseStatus());
return vo;
}).collect(Collectors.toList());
@@ -143,8 +120,19 @@
@GetMapping("/getHouseMapDistribution")
@ApiOperation("获取房屋地图分布")
public R<List<HouseMapDistributionVO>> getHouseMapDistribution() {
+
+ String businessDeptId = SecurityUtils.getBusinessDeptId();
// 获取所有房屋信息
- List<THouse> houses = houseService.list();
+ List<TContract> tContracts = contractService.list(new LambdaQueryWrapper<TContract>()
+ .eq(!"0".equals(businessDeptId), TContract::getBusinessDeptId, businessDeptId)
+ .eq(TContract::getPayType, 1));
+ List<String> houseIds = tContracts.stream().map(TContract::getHouseId).collect(Collectors.toList());
+ if (houseIds.isEmpty()){
+ return R.ok(new ArrayList<>());
+ }
+ List<THouse> houses = houseService.list(new LambdaQueryWrapper<THouse>()
+ .eq(!"0".equals(businessDeptId),THouse::getBusinessDeptId, businessDeptId)
+ .in(THouse::getId, houseIds));
List<HouseMapDistributionVO> result = new ArrayList<>();
for (THouse house : houses) {
HouseMapDistributionVO houseMapDistributionVO = new HouseMapDistributionVO();
@@ -154,6 +142,8 @@
houseMapDistributionVO.setLongitude(house.getLongitude());
houseMapDistributionVO.setLatitude(house.getLatitude());
TContract contract = contractService.getOne(new LambdaQueryWrapper<TContract>()
+ .eq(!"0".equals(businessDeptId),TContract::getBusinessDeptId, businessDeptId)
+ .eq(TContract::getPayType, 1)
.gt(TContract::getEndTime, LocalDate.now())
.eq(TContract::getHouseId, house.getId())
.eq(TContract::getStatus, 4)
@@ -161,6 +151,7 @@
if (contract != null){
List<TBill> tBills = billService.list(new LambdaQueryWrapper<TBill>()
+ .eq(!"0".equals(businessDeptId),TBill::getBusinessDeptId, businessDeptId)
.eq(TBill::getContractId, contract.getId())
.eq(TBill::getBillType, 1));
houseMapDistributionVO.setTenant(contract.getPartyTwoName());
@@ -171,11 +162,11 @@
long monthsBetween = ChronoUnit.MONTHS.between(startTime, endTime);
BigDecimal payableFeesMoney = monthRent.multiply(new BigDecimal(monthsBetween));
- BigDecimal paidAlready = tBills.stream()
- .map(TBill::getPayableFeesMoney)
+ BigDecimal payFeesMoney = tBills.stream()
+ .map(TBill::getPayFeesMoney)
.reduce(BigDecimal::add)
.orElse(BigDecimal.ZERO);
- String rentStatus = String.format("%.2f/%.2f", paidAlready, payableFeesMoney);
+ String rentStatus = String.format("%.2f/%.2f", payFeesMoney, payableFeesMoney);
houseMapDistributionVO.setRentStatus(rentStatus);
@@ -186,6 +177,7 @@
// .eq(TBill::getContractId, contract.getId()));
List<TBill> ones = billService.list(new LambdaQueryWrapper<TBill>()
+ .eq(!"0".equals(businessDeptId),TBill::getBusinessDeptId, businessDeptId)
.le(TBill::getStartTime, LocalDate.now())
.ge(TBill::getEndTime, LocalDate.now())
.eq(TBill::getBillType, 1)
@@ -199,9 +191,9 @@
if ("4".equals(one.getPayFeesStatus())){
houseMapDistributionVO.setHouseStatus("4");
}
- BigDecimal payFeesMoney = one.getPayFeesMoney();
+ BigDecimal payFeesMoney1 = one.getPayFeesMoney();
BigDecimal payableFeesMoney1 = one.getPayableFeesMoney();
- String rent = String.format("%.2f/%.2f", payFeesMoney, payableFeesMoney1);
+ String rent = String.format("%.2f/%.2f", payFeesMoney1, payableFeesMoney1);
houseMapDistributionVO.setRent(rent);
}else {
houseMapDistributionVO.setRent("暂无");
@@ -209,7 +201,7 @@
}else {
houseMapDistributionVO.setTenant("暂无");
houseMapDistributionVO.setRentStatus("暂无");
- houseMapDistributionVO.setRent("暂无");
+ houseMapDistributionVO.setRent("欠费");
}
result.add(houseMapDistributionVO);
}
--
Gitblit v1.7.1