From a6818f86fd2931c2857534801b77ee2aaa836329 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 24 三月 2025 09:42:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 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 8a363c6..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
@@ -80,6 +80,8 @@
private StateProcessTemplateService stateProcessTemplateService;
@Autowired
private FlwTaskMapper flwTaskMapper;
+ @Autowired
+ private TTenantService tenantService;
@ApiOperation(value = "获取合同分页列表")
@PostMapping(value = "/contractList")
@@ -295,15 +297,33 @@
List<TContract> list = contractService.lambdaQuery().in(TContract::getId, dto.getIds()).list();
List<String> res = new ArrayList<>();
for (TContract contract : list) {
+ String templateFileName = "1_yzj_租赁合同_个人.docx";
TBill firstBill = billService.lambdaQuery().eq(TBill::getContractId, contract.getId())
.orderByDesc(TBill::getStartTime).last("limit 1").one();
-
+ TTenant tenant = tenantService.getById(contract.getTenantId());
THouse tHouse = houseService.getById(contract.getHouseId());
Map<String, Object> templateParam = new HashMap<>(5);
+ templateParam.put("${contractNumber}", contract.getContractNumber());
templateParam.put("${partyOneName}", contract.getPartyOneName());
templateParam.put("${partyTwoName}", contract.getPartyTwoName());
+ 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 (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";
+ }
+ }
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)));
@@ -339,7 +359,7 @@
templateParam.put("${checkTime}", "");
}
- String url = wordUtil.generatePdf("/usr/local/project/file/", "1_yzj_租赁合同.docx", templateParam, "租赁合同", "/usr/local/project/file/");
+ String url = wordUtil.generatePdf("/usr/local/project/file/", templateFileName, templateParam, "租赁合同", "/usr/local/project/file/");
res.add(url);
}
--
Gitblit v1.7.1