From 1426fbee6074c236002fbe0c11291ab2b16f70ae Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 21 三月 2025 10:55:20 +0800
Subject: [PATCH] 租户增加字段，合同生成增加字段
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java | 18 ++++++++++++++++--
ruoyi-system/src/main/java/com/ruoyi/system/model/TTenant.java | 18 +++++++++++-------
2 files changed, 27 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 8a363c6..514ee6f 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,13 +297,25 @@
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() : "");
+ //企业、政府机构、国有企业
+ if (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²");
long between = ChronoUnit.DAYS.between(contract.getStartTime(), contract.getStartPayTime())+1;
@@ -339,7 +353,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);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TTenant.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TTenant.java
index cca42c8..f9e80a7 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TTenant.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TTenant.java
@@ -1,14 +1,9 @@
package com.ruoyi.system.model;
import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
-
-import java.time.LocalDate;
-import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModel;
@@ -18,6 +13,7 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
+import java.time.LocalDate;
/**
* <p>
@@ -92,4 +88,12 @@
@TableField("open_id")
private String openId;
+ @ApiModelProperty(value = "法人")
+ @TableField("legal_person")
+ private String legalPerson;
+
+ @ApiModelProperty(value = "社会统一信用代码")
+ @TableField("credit_code")
+ private String creditCode;
+
}
--
Gitblit v1.7.1