From 3f99f4f7a1f3140db1b775a5b094ab06b3944bf4 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 06 三月 2025 10:53:14 +0800
Subject: [PATCH] bug修改
---
ruoyi-system/src/main/resources/mapper/system/StateTaskCenterMapper.xml | 2 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java | 2 +-
ruoyi-system/src/main/java/com/ruoyi/system/vo/ProcessTaskListVO.java | 4 ++++
3 files changed, 6 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 5a0e81a..5e85735 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
@@ -201,7 +201,7 @@
payMoney = payMoney.add(tBill.getPayFeesMoney()).add(tBill.getPayableFeesPenalty());
}
TCheckAcceptRecord tCheckAcceptRecord = checkAcceptRecordService.lambdaQuery().eq(TCheckAcceptRecord::getContractId, id).one();
- res.setCheckResult(Objects.nonNull(tCheckAcceptRecord)?tCheckAcceptRecord.getCheckResult():false);
+ res.setCheckResult(Objects.nonNull(tCheckAcceptRecord)&&Objects.nonNull(tCheckAcceptRecord.getCheckResult())?tCheckAcceptRecord.getCheckResult():false);
res.setPayMoney(payMoney);
return R.ok(res);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/ProcessTaskListVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/ProcessTaskListVO.java
index cada03f..6d2af5c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/ProcessTaskListVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/ProcessTaskListVO.java
@@ -148,4 +148,8 @@
@ApiModelProperty(value = "合计年租金")
private BigDecimal totalYear;
+ @ApiModelProperty(value = "合同时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime contractTime;
+
}
diff --git a/ruoyi-system/src/main/resources/mapper/system/StateTaskCenterMapper.xml b/ruoyi-system/src/main/resources/mapper/system/StateTaskCenterMapper.xml
index 6d4fd63..de92a68 100644
--- a/ruoyi-system/src/main/resources/mapper/system/StateTaskCenterMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/StateTaskCenterMapper.xml
@@ -23,7 +23,7 @@
tc.id AS contractId, tc.contract_number, tc.contract_name, tc.start_time, tc.end_time,tc.deposit, tc.pay_type,
tc.first_pay_time, tc.isIncreasing,tc.isIncreasing_deposit,tc.proportion, tc.house_id, tc.party_one_name, tc.party_one_person,
tc.party_one_phone, tc.tenant_id, tc.party_two_name,tc.party_two_person, tc.party_two_phone,tc.memory, tc.contract_file_name,
- tc.signature, tc.terminate_remark, tc.total_year,tc.status AS contractStatus
+ tc.signature, tc.terminate_remark, tc.total_year,tc.status AS contractStatus,tc.create_time AS contractTime
from state_task_center stc
LEFT JOIN t_contract tc ON stc.project_id = tc.id
<where>
--
Gitblit v1.7.1