From 0dc15775095a25797daf376e47999f0c11486e75 Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期一, 07 四月 2025 22:17:13 +0800
Subject: [PATCH] 修改bug
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java
index 3a887ff..a140353 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java
@@ -14,6 +14,7 @@
import com.ruoyi.common.constant.DictConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.enums.DisabledEnum;
import com.ruoyi.common.enums.ProcessCategoryEnum;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils;
@@ -134,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")){
@@ -391,7 +394,9 @@
if (StringUtils.isNotEmpty(contractId)) {
firstBill = billService.lambdaQuery()
.eq(TBill::getContractId, contractId)
- .orderByDesc(TBill::getStartTime)
+ .eq(TBill::getBillType, 1)
+ .orderByAsc(TBill::getStartTime)
+ .ne(TBill::getManualAddition, DisabledEnum.YES.getCode())
.last("limit 1")
.one();
tCheckAcceptRecord = checkAcceptRecordService.lambdaQuery()
@@ -419,6 +424,7 @@
fill(templateParam, "bankNumber", tenant.getBankNumber());
fill(templateParam, "bankName", tenant.getBankName());
fill(templateParam, "partyTwoName", tenant.getLessee());
+ fill(templateParam, "email", tenant.getEmail());
// 企业、政府机构、国有企业
if (Objects.nonNull(tenant.getTenantType())
@@ -482,19 +488,27 @@
// 首期租金处理
if (firstBill != null) {
+ double 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, "firstRent", "￥" + firstBill.getPayableFeesMoney() + "元");
+ // 其他财务字段
+ fill(templateParam, "firstRentString", "人民币" + NumberToChineseUtils.numberToChinese(firstBill.getPayableFeesMoney().doubleValue()));
} else {
- fill(templateParam, "firstRent", "");
+// fill(templateParam, "firstRent", "");
}
- // 其他财务字段
- fill(templateParam, "firstRentString", "人民币" + NumberToChineseUtils.numberToChinese(
- (contract.getPayType().equals("1")
+ 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()));
+ :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(
--
Gitblit v1.7.1