From 28d40a97ffa0acfda8e3766b0edd08e24c8dd21f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 04 四月 2025 00:55:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ScreenController.java | 136 ++++++++++++++++++++++++++++-----------------
1 files changed, 84 insertions(+), 52 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 d188bfe..1fec807 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
@@ -69,40 +69,11 @@
return R.ok(screenService.rentIncomeTrend());
}
+
@GetMapping("/getTenantCountTrend")
@ApiOperation(value = "租户数量趋势统计")
public R<List<TenantCountTrendVO>> getTenantCountTrend() {
-
- String businessDeptId = SecurityUtils.getBusinessDeptId();
- 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>()
- .eq(!"0".equals(businessDeptId),TContract::getBusinessDeptId, businessDeptId)
- .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();
}
@@ -143,6 +114,26 @@
return R.ok(result);
}
+
+ public static void main(String[] args) {
+ // 获取当前季度的开始和结束时间
+ // 获取当前季度的开始和结束时间的实现示例：
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+ LocalDate now = LocalDate.now();
+ int month = now.getMonthValue();
+ int year = now.getYear();
+
+ // 计算季度起始月份（1,4,7,10）
+ int quarterStartMonth = ((month - 1) / 3) * 3 + 1;
+ int quarterEndMonth = quarterStartMonth + 2;
+ // 构建季度起止日期
+ LocalDate quarterStart = YearMonth.of(year, quarterStartMonth).atDay(1);
+ LocalDate quarterEnd = YearMonth.of(year, quarterEndMonth).atEndOfMonth();
+
+ System.out.println("季度开始：" + quarterStart.format(formatter));
+ System.out.println("季度结束：" + quarterEnd.format(formatter));
+ }
+
/**
* 获取房屋地图分布
*/
@@ -151,9 +142,23 @@
public R<List<HouseMapDistributionVO>> getHouseMapDistribution() {
String businessDeptId = SecurityUtils.getBusinessDeptId();
+
+ List<TContract> tContracts = contractService.list(new LambdaQueryWrapper<TContract>()
+ .eq(!"0".equals(businessDeptId), TContract::getBusinessDeptId, businessDeptId)
+ .eq(TContract::getPayType, 2));
+ 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));
+ .and(wrapper -> wrapper.in(THouse::getId, houseIds)
+ .or()
+ .eq(THouse::getLeaseStatus, "1")
+ )
+ .eq(!"0".equals(businessDeptId),THouse::getBusinessDeptId, businessDeptId)
+ );
List<HouseMapDistributionVO> result = new ArrayList<>();
for (THouse house : houses) {
HouseMapDistributionVO houseMapDistributionVO = new HouseMapDistributionVO();
@@ -162,8 +167,12 @@
houseMapDistributionVO.setHouseStatus(house.getLeaseStatus());
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, 2)
.gt(TContract::getEndTime, LocalDate.now())
.eq(TContract::getHouseId, house.getId())
.eq(TContract::getStatus, 4)
@@ -175,18 +184,17 @@
.eq(TBill::getContractId, contract.getId())
.eq(TBill::getBillType, 1));
houseMapDistributionVO.setTenant(contract.getPartyTwoName());
- LocalDateTime startTime = contract.getStartTime();
- LocalDateTime endTime = contract.getEndTime();
- BigDecimal monthRent = contract.getMonthRent();
- // 计算相差月份
- long monthsBetween = ChronoUnit.MONTHS.between(startTime, endTime);
- BigDecimal payableFeesMoney = monthRent.multiply(new BigDecimal(monthsBetween));
- BigDecimal paidAlready = tBills.stream()
+ BigDecimal payFeesMoney = tBills.stream()
+ .map(TBill::getPayFeesMoney)
+ .reduce(BigDecimal::add)
+ .orElse(BigDecimal.ZERO);
+
+ BigDecimal payableFeesMoney = tBills.stream()
.map(TBill::getPayableFeesMoney)
.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);
@@ -196,31 +204,55 @@
// .eq(TBill::getBillType, 1)
// .eq(TBill::getContractId, contract.getId()));
+
+ // 获取当前季度的开始和结束时间
+ // 获取当前季度的开始和结束时间的实现示例：
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+ LocalDate now = LocalDate.now();
+ int month = now.getMonthValue();
+ int year = now.getYear();
+
+ // 计算季度起始月份（1,4,7,10）
+ int quarterStartMonth = ((month - 1) / 3) * 3 + 1;
+ int quarterEndMonth = quarterStartMonth + 2;
+ // 构建季度起止日期
+ LocalDate quarterStart = YearMonth.of(year, quarterStartMonth).atDay(1);
+ LocalDate quarterEnd = YearMonth.of(year, quarterEndMonth).atEndOfMonth();
+
+ System.out.println("季度开始：" + quarterStart.format(formatter));
+ System.out.println("季度结束：" + quarterEnd.format(formatter));
+
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())
+ .between(TBill::getStartTime, quarterStart, quarterEnd)
.eq(TBill::getBillType, 1)
.eq(TBill::getContractId, contract.getId()));
- TBill one = null;
if (!ones.isEmpty()){
- one = ones.get(0);
- }
- if (one != null){
- if ("4".equals(one.getPayFeesStatus())){
+ long count = ones.stream().filter(tBill -> "4".equals(tBill.getPayFeesStatus())).count();
+ if (count > 0){
houseMapDistributionVO.setHouseStatus("4");
}
- BigDecimal payFeesMoney = one.getPayFeesMoney();
- BigDecimal payableFeesMoney1 = one.getPayableFeesMoney();
- String rent = String.format("%.2f/%.2f", payFeesMoney, payableFeesMoney1);
+
+ BigDecimal payFeesMoney1 = ones.stream()
+ .map(TBill::getPayFeesMoney)
+ .reduce(BigDecimal::add)
+ .orElse(BigDecimal.ZERO);
+
+ BigDecimal payableFeesMoney1 = ones.stream()
+ .map(TBill::getPayableFeesMoney)
+ .reduce(BigDecimal::add)
+ .orElse(BigDecimal.ZERO);
+
+ String rent = String.format("%.2f/%.2f", payFeesMoney1, payableFeesMoney1);
houseMapDistributionVO.setRent(rent);
}else {
- houseMapDistributionVO.setRent("暂无");
+ houseMapDistributionVO.setRent("欠费");
}
+
}else {
houseMapDistributionVO.setTenant("暂无");
- houseMapDistributionVO.setRentStatus("暂无");
+ houseMapDistributionVO.setRentStatus("待出租");
houseMapDistributionVO.setRent("暂无");
}
result.add(houseMapDistributionVO);
--
Gitblit v1.7.1