java/xizang.git

			@@ -147,14 +147,12 @@
			.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>()
			.and(wrapper -> wrapper.in(THouse::getId, houseIds)
			.or()
			.and(wrapper -> wrapper.in(!houseIds.isEmpty(),THouse::getId, houseIds)
			.or(!houseIds.isEmpty())
			.eq(THouse::getLeaseStatus, "1")
			)
			.eq(!"0".equals(businessDeptId),THouse::getBusinessDeptId, businessDeptId)

			@@ -135,6 +135,8 @@
			if (Objects.isNull(house)) {
			throw new ServiceException("房产信息不存在");
			}
			house.setRentalReturnStatus("1");
			houseService.updateById(house);
			dto.setBusinessDeptId(house.getBusinessDeptId());
			contractService.save(dto);
			if (dto.getStatus().equals("2")){
			@@ -392,6 +394,7 @@
			if (StringUtils.isNotEmpty(contractId)) {
			firstBill = billService.lambdaQuery()
			.eq(TBill::getContractId, contractId)
			.eq(TBill::getBillType, 1)
			.orderByAsc(TBill::getStartTime)
			.ne(TBill::getManualAddition, DisabledEnum.YES.getCode())
			.last("limit 1")
			@@ -495,9 +498,17 @@
			// 其他财务字段
			fill(templateParam, "firstRentString", "人民币" + NumberToChineseUtils.numberToChinese(firstBill.getPayableFeesMoney().doubleValue()));
			} else {
			fill(templateParam, "firstRent", "");
			// fill(templateParam, "firstRent", "");
			}

			fill(templateParam, "firstRent",
			"￥"+(contract.getPayType().equals("1")
			? contract.getMonthRent()
			:contract.getPayType().equals("2")
			?contract.getMonthRent().multiply(new BigDecimal("3"))
			:contract.getMonthRent().multiply(new BigDecimal("12"))
			.setScale(2, RoundingMode.DOWN)).doubleValue()+"元");


			fill(templateParam, "firstRentString",
			"人民币"+NumberToChineseUtils.numberToChinese(

	ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ScreenController.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史