java/xizang.git

			@@ -114,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));
			}

			/**
			* 获取房屋地图分布
			*/
			@@ -122,17 +142,21 @@
			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, 1));
			.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>()
			.and(wrapper -> wrapper.in(!houseIds.isEmpty(),THouse::getId, houseIds)
			.or(!houseIds.isEmpty())
			.eq(THouse::getLeaseStatus, "1")
			)
			.eq(!"0".equals(businessDeptId),THouse::getBusinessDeptId, businessDeptId)
			.in(THouse::getId, houseIds));
			);
			List<HouseMapDistributionVO> result = new ArrayList<>();
			for (THouse house : houses) {
			HouseMapDistributionVO houseMapDistributionVO = new HouseMapDistributionVO();
			@@ -141,9 +165,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, 1)
			.eq(TContract::getPayType, 2)
			.gt(TContract::getEndTime, LocalDate.now())
			.eq(TContract::getHouseId, house.getId())
			.eq(TContract::getStatus, 4)
			@@ -155,15 +182,14 @@
			.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 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", payFeesMoney, payableFeesMoney);
			@@ -176,32 +202,56 @@
			// .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 payFeesMoney1 = one.getPayFeesMoney();
			BigDecimal payableFeesMoney1 = one.getPayableFeesMoney();

			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.setRent("欠费");
			houseMapDistributionVO.setRentStatus("待出租");
			houseMapDistributionVO.setRent("暂无");
			}
			result.add(houseMapDistributionVO);
			}