From b67406b8a81a04e471273602a2410dd01040fad9 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 11 四月 2025 19:41:34 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/xizang into dev
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java | 61 ++++++++++++++++++++++++++++++
1 files changed, 61 insertions(+), 0 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 2a73ac5..6987379 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
@@ -799,6 +799,67 @@
@PostMapping("/generateContractPreview")
public R<String> generateContractPreview(@RequestBody TContractDTO dto)
{
+ String contractName = dto.getContractName();
+ if (StringUtils.isEmpty(contractName)){
+ return R.fail("合同名称不能为空");
+ }
+ LocalDateTime startTime = dto.getStartTime();
+ if (startTime == null){
+ return R.fail("合同生效日期不能为空");
+ }
+ LocalDateTime endTime = dto.getEndTime();
+ if (endTime == null){
+ return R.fail("合同生效日期不能为空");
+ }
+
+ BigDecimal monthRent = dto.getMonthRent();
+ if (monthRent == null){
+ return R.fail("月租金不能为空");
+ }
+
+ BigDecimal deposit = dto.getDeposit();
+ if (deposit == null){
+ return R.fail("押金不能为空");
+ }
+
+ String payType = dto.getPayType();
+ if (StringUtils.isEmpty(payType)){
+ return R.fail("租金支付方式不能为空");
+ }
+
+ LocalDateTime startPayTime = dto.getStartPayTime();
+ if (startPayTime == null){
+ return R.fail("开始计费日期不能为空");
+ }
+
+ String partyOneName = dto.getPartyOneName();
+ if (StringUtils.isEmpty(partyOneName)){
+ return R.fail("甲方名称不能为空");
+ }
+
+ String partyOnePerson = dto.getPartyOnePerson();
+ if (StringUtils.isEmpty(partyOnePerson)){
+ return R.fail("甲方联系人不能为空");
+ }
+
+ String partyOnePhone = dto.getPartyOnePhone();
+ if (StringUtils.isEmpty(partyOnePhone)){
+ return R.fail("甲方联系电话不能为空");
+ }
+
+ String partyTwoName = dto.getPartyTwoName();
+ if (StringUtils.isEmpty(partyTwoName)){
+ return R.fail("乙方名称不能为空");
+ }
+ String partyTwoPerson = dto.getPartyTwoPerson();
+ if (StringUtils.isEmpty(partyTwoPerson)){
+ return R.fail("乙方联系人不能为空");
+ }
+ String partyTwoPhone = dto.getPartyTwoPhone();
+ if (StringUtils.isEmpty(partyTwoPhone)){
+ return R.fail("乙方联系电话不能为空");
+ }
+
TContract contract = new TContract();
BeanUtil.copyProperties(dto,contract);
return R.ok(generateContract(contract,dto));
--
Gitblit v1.7.1