java/xizang.git

			@@ -1,6 +1,8 @@
			package com.ruoyi.system.service.impl;

			import com.ruoyi.common.enums.BillTypeEnum;
			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;
			@@ -16,7 +18,12 @@

			import java.math.BigDecimal;
			import java.math.RoundingMode;
			import java.util.*;
			import java.util.ArrayList;
			import java.util.Calendar;
			import java.util.Date;
			import java.util.List;
			import java.util.Map;
			import java.util.Objects;

			/**
			* @author mitao
			@@ -33,9 +40,12 @@
			* @return
			*/
			public ScreenTopStaticsDataVO getTopStaticsData() {
			String businessDeptId = SecurityUtils.getBusinessDeptId();
			ScreenTopStaticsDataVO vo = new ScreenTopStaticsDataVO();
			//房屋总面积
			List<THouse> houseList = tHouseService.list();
			List<THouse> houseList = tHouseService.lambdaQuery()
			.eq(!businessDeptId.equals("0"), THouse::getBusinessDeptId, businessDeptId)
			.list();
			Double totalArea = houseList.stream()
			.map(item -> Double.parseDouble(item.getHouseArea()))
			.reduce(0D, Double::sum);
			@@ -47,7 +57,10 @@
			.reduce(0D, Double::sum);
			vo.setHouseRentedArea(totalRentedArea);
			//总计应收租金
			List<TBill> billList = tBillService.list();
			List<TBill> billList = tBillService.lambdaQuery()
			.eq(!businessDeptId.equals("0"), TBill::getBusinessDeptId, businessDeptId)
			.eq(TBill::getBillType, BillTypeEnum.Zujin.getCode())
			.list();
			BigDecimal totalReceivableRent = billList.stream()
			.filter(item -> !item.getPayFeesStatus().equals("5"))
			.map(TBill::getPayableFeesMoney)
			@@ -61,11 +74,12 @@
			.divide(new BigDecimal("10000"),2, RoundingMode.HALF_UP);
			vo.setTotalReceivedRent(totalReceivedRent);
			//本月新增租户数
			Integer newTenantCount = tContractService.getCurrentMonthRentCount();
			Integer newTenantCount = tContractService.getCurrentMonthRentCount(businessDeptId);
			vo.setNewTenantCount(newTenantCount);
			//总计租户数系统租户列表里有生效合同绑定的租户总数。
			List<TContract> tContracts = tContractService.lambdaQuery()
			.in(TContract::getStatus, "4", "5", "6", "7", "8", "9")
			.eq(!businessDeptId.equals("0"), TContract::getBusinessDeptId, businessDeptId)
			.list();
			long count = tContracts.stream()
			.map(TContract::getTenantId)
			@@ -76,7 +90,10 @@
			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();
			//本季度已交租金
			BigDecimal totalRentPaid = currentQuarterBillList.stream()
			@@ -98,7 +115,11 @@
			.divide(BigDecimal.valueOf(10000L), 2, RoundingMode.HALF_UP);
			vo.setTotalRentOwe(totalRentOwe);
			//总计欠费
			List<TBill> allBillList = tBillService.lambdaQuery().le(TBill::getPayableFeesTime, last).list();
			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()
			.map(TBill::getOutstandingMoney)
			.reduce(BigDecimal.ZERO, BigDecimal::add)
			@@ -112,7 +133,8 @@
			* @return
			*/
			public List<ScreenRentRankVO> streetRentRank() {
			return tBillService.getStreetRentRank();
			String businessDeptId = SecurityUtils.getBusinessDeptId();
			return tBillService.getStreetRentRank(businessDeptId);
			}

			/**
			@@ -121,7 +143,7 @@
			*/
			public ScreenRentIncomeTrendVO rentIncomeTrend() {
			ScreenRentIncomeTrendVO vo = new ScreenRentIncomeTrendVO();

			String businessDeptId = SecurityUtils.getBusinessDeptId();
			// 获取当前日期
			Date currentDate = new Date();
			List<String> quarterLabels = new ArrayList<>(); // 季度标签列表
			@@ -139,6 +161,8 @@
			// 获取该季度的账单数据
			List<TBill> quarterBills = tBillService.lambdaQuery()
			.between(TBill::getPayableFeesTime, quarterStart, quarterEnd)
			.eq(TBill::getBillType, BillTypeEnum.Zujin.getCode())
			.eq(!businessDeptId.equals("0"), TBill::getBusinessDeptId, businessDeptId)
			.list();

			// 计算季度租金收入总和