From 01e640e494e50448e9fac58fe34026bcf1fc2d4c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 03 四月 2025 21:22:11 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/xizang into dev
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ScreenService.java | 107 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 73 insertions(+), 34 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ScreenService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ScreenService.java
index 1e3f955..805e13c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ScreenService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ScreenService.java
@@ -1,5 +1,7 @@
package com.ruoyi.system.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BillTypeEnum;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
@@ -12,18 +14,14 @@
import com.ruoyi.system.vo.ScreenRentIncomeTrendVO;
import com.ruoyi.system.vo.ScreenRentRankVO;
import com.ruoyi.system.vo.ScreenTopStaticsDataVO;
+import com.ruoyi.system.vo.TenantCountTrendVO;
import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.math.RoundingMode;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
/**
* @author mitao
@@ -35,12 +33,16 @@
private final THouseService tHouseService;
private final TContractService tContractService;
private final TBillService tBillService;
+ private final TContractService contractService;
/**
* 获取顶部统计数据
* @return
*/
public ScreenTopStaticsDataVO getTopStaticsData() {
String businessDeptId = SecurityUtils.getBusinessDeptId();
+ Map<String, Date> quarterDate = DateUtils.getQuarterDate(new Date());
+ Date first = quarterDate.get("first");
+ Date last = quarterDate.get("last");
ScreenTopStaticsDataVO vo = new ScreenTopStaticsDataVO();
//房屋总面积
List<THouse> houseList = tHouseService.lambdaQuery()
@@ -51,16 +53,10 @@
.reduce(0D, Double::sum);
vo.setHouseTotalArea(totalArea);
//已出租面积
- Double totalRentedArea = houseList.stream()
- .filter(item -> !item.getLeaseStatus().equals("1"))
- .map(item -> Double.parseDouble(item.getHouseArea()))
- .reduce(0D, Double::sum);
+ Double totalRentedArea = tHouseService.getRentedArea(businessDeptId);
vo.setHouseRentedArea(totalRentedArea);
//总计应收租金
- List<TBill> billList = tBillService.lambdaQuery()
- .eq(!businessDeptId.equals("0"), TBill::getBusinessDeptId, businessDeptId)
- .eq(TBill::getBillType, BillTypeEnum.Zujin.getCode())
- .list();
+ List<TBill> billList = tBillService.getJiFuBillList(businessDeptId);
BigDecimal totalReceivableRent = billList.stream()
.filter(item -> !item.getPayFeesStatus().equals("5"))
.map(TBill::getPayableFeesMoney)
@@ -78,6 +74,7 @@
vo.setNewTenantCount(newTenantCount);
//总计租户数 系统租户列表里有生效合同绑定的租户总数。
List<TContract> tContracts = tContractService.lambdaQuery()
+ .eq(TContract::getPayType,2) //季付
.in(TContract::getStatus, "4", "5", "6", "7", "8", "9")
.eq(!businessDeptId.equals("0"), TContract::getBusinessDeptId, businessDeptId)
.list();
@@ -86,15 +83,7 @@
.distinct()
.count();
vo.setTotalTenantCount((int) count);
- Map<String, Date> quarterDate = DateUtils.getQuarterDate(new Date());
- Date first = quarterDate.get("first");
- Date last = quarterDate.get("last");
- List<TBill> currentQuarterBillList = tBillService.lambdaQuery()
- .eq(!businessDeptId.equals("0"), TBill::getBusinessDeptId, businessDeptId)
- .between(TBill::getPayableFeesTime, first, last)
- .eq(TBill::getBillType, BillTypeEnum.Zujin.getCode())
- .ne(TBill::getPayFeesStatus, 5)
- .list();
+ List<TBill> currentQuarterBillList = tBillService.getJiFuBillListByTime(businessDeptId, first, last);
//本季度已交租金
BigDecimal totalRentPaid = currentQuarterBillList.stream()
.map(TBill::getPayFeesMoney)
@@ -115,12 +104,7 @@
.divide(BigDecimal.valueOf(10000L), 2, RoundingMode.HALF_UP);
vo.setTotalRentOwe(totalRentOwe);
//总计欠费
- List<TBill> allBillList = tBillService.lambdaQuery()
- .eq(TBill::getBillType, BillTypeEnum.Zujin.getCode())
- .eq(!businessDeptId.equals("0"), TBill::getBusinessDeptId, businessDeptId)
- //.le(TBill::getPayableFeesTime, last)
- .list();
- BigDecimal totalRentOweAll = allBillList.stream()
+ BigDecimal totalRentOweAll = billList.stream()
.map(TBill::getOutstandingMoney)
.reduce(BigDecimal.ZERO, BigDecimal::add)
.divide(BigDecimal.valueOf(10000L), 2, RoundingMode.HALF_UP);
@@ -159,11 +143,7 @@
Date quarterEnd = quarterDate.get("last");
// 获取该季度的账单数据
- List<TBill> quarterBills = tBillService.lambdaQuery()
- .between(TBill::getPayableFeesTime, quarterStart, quarterEnd)
- .eq(TBill::getBillType, BillTypeEnum.Zujin.getCode())
- .eq(!businessDeptId.equals("0"), TBill::getBusinessDeptId, businessDeptId)
- .list();
+ List<TBill> quarterBills = tBillService.getJiFuBillListByTime(businessDeptId, quarterStart, quarterEnd);
// 计算季度租金收入总和
BigDecimal quarterIncome = quarterBills.stream()
@@ -197,6 +177,65 @@
return vo;
}
+ public R<List<TenantCountTrendVO>> getTenantCountTrend() {
+
+ // 获取当前日期
+ Date currentDate = new Date();
+ String businessDeptId = SecurityUtils.getBusinessDeptId();
+ List<TenantCountTrendVO> list = new ArrayList<>();
+ for (int i = 6; i >= 0; i--) {
+ Date targetDate = DateUtils.addMonths(currentDate, -3 * i);
+ Map<String, Date> quarterDate = DateUtils.getQuarterDate(targetDate);
+ Date quarterStart = quarterDate.get("first");
+ Date quarterEnd = quarterDate.get("last");
+ System.out.println("第" + (i + 1) + "季度的起止时间：" + quarterStart + " - " + quarterEnd);
+
+ List<TContract> contracts = contractService.list(new LambdaQueryWrapper<TContract>()
+ .eq(!"0".equals(businessDeptId), TContract::getBusinessDeptId, businessDeptId)
+ .eq(TContract::getPayType, 1)
+ .isNotNull(TContract::getSignTime)
+ .between(TContract::getSignTime, quarterStart, quarterEnd)
+ .orderByAsc(TContract::getSignTime));
+
+
+ TenantCountTrendVO vo = new TenantCountTrendVO();
+ // 生成季度标签 (格式: YY-MM月)
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(quarterEnd);
+ String label = String.format("%02d-%d月",
+ cal.get(Calendar.YEAR) % 100,
+ cal.get(Calendar.MONTH) + 1);
+ vo.setDate(label);
+ long count = contracts.stream().map(TContract::getTenantId).distinct().count();
+ vo.setCount(count);
+ list.add(vo);
+ }
+ return R.ok(list);
+ }
+//
+//
+//
+//
+//
+//
+//
+// 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);
+// }
+
}
--
Gitblit v1.7.1