From c7804f4668bcfbb8d2ec3826682aba5e62b44758 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 24 三月 2025 09:42:19 +0800
Subject: [PATCH] 合同附件修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 514ee6f..0c72c9e 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
@@ -309,8 +309,11 @@
if (Objects.nonNull(tenant)) {
templateParam.put("${mailAddress}", StringUtils.isNotBlank(tenant.getMailAddress()) ? tenant.getMailAddress() : "");
templateParam.put("${idCard}", StringUtils.isNotBlank(tenant.getIdCard()) ? tenant.getIdCard() : "");
+ templateParam.put("${residentName}", tenant.getResidentName());
+ templateParam.put("${bankNumber}", StringUtils.isNotBlank(tenant.getBankNumber()) ? tenant.getBankNumber() : "");
+ templateParam.put("${bankName}", StringUtils.isNotBlank(tenant.getBankName()) ? tenant.getBankName() : "");
//企业、政府机构、国有企业
- if (tenant.getTenantType().equals("2") || tenant.getTenantType().equals("5") || tenant.getTenantType().equals("7")){
+ if (Objects.nonNull(tenant.getTenantType()) && (tenant.getTenantType().equals("2") || tenant.getTenantType().equals("5") || tenant.getTenantType().equals("7"))) {
templateParam.put("${creditCode}", StringUtils.isNotBlank(tenant.getCreditCode()) ? tenant.getCreditCode() : "");
templateParam.put("${legalPerson}", StringUtils.isNotBlank(tenant.getLegalPerson()) ? tenant.getLegalPerson() : "");
templateFileName = "1_yzj_租赁合同_企业.docx";
@@ -318,6 +321,9 @@
}
templateParam.put("${houseAddress}", tHouse.getHouseAddress());
templateParam.put("${houseArea}", tHouse.getHouseArea()+"m²");
+ templateParam.put("${remark}", StringUtils.isNotBlank(contract.getRemark()) ? contract.getRemark() : "");
+ templateParam.put("${houseUseScope}", StringUtils.isNotBlank(contract.getHouseUseScope()) ? contract.getHouseUseScope() : "");
+ templateParam.put("${days}", ChronoUnit.DAYS.between(contract.getStartTime(), contract.getEndTime()));
long between = ChronoUnit.DAYS.between(contract.getStartTime(), contract.getStartPayTime())+1;
templateParam.put("${day}", between);
templateParam.put("${endTimeFree}", DateUtils.localDateTimeToStringYear(contract.getStartPayTime().plusDays(1)));
--
Gitblit v1.7.1