From df1d9db9ee62cd95633739738bcc980194ab9ec1 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 03 四月 2025 18:27:20 +0800
Subject: [PATCH] 修改bug
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCheckAcceptRecordController.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCheckAcceptRecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCheckAcceptRecordController.java
index 695e91c..11f61d4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCheckAcceptRecordController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCheckAcceptRecordController.java
@@ -7,15 +7,9 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.system.model.TBill;
-import com.ruoyi.system.model.TCheckAcceptRecord;
-import com.ruoyi.system.model.TContract;
-import com.ruoyi.system.model.THouse;
+import com.ruoyi.system.model.*;
import com.ruoyi.system.query.TCheckAcceptRecordQuery;
-import com.ruoyi.system.service.TBillService;
-import com.ruoyi.system.service.TCheckAcceptRecordService;
-import com.ruoyi.system.service.TContractService;
-import com.ruoyi.system.service.THouseService;
+import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.TCheckAcceptRecordVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -29,6 +23,7 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
+import java.util.Objects;
/**
* <p>
@@ -48,6 +43,8 @@
private final THouseService houseService;
@Autowired
private TBillService billService;
+ @Autowired
+ private TTenantService tenantService;
@Autowired
public TCheckAcceptRecordController(TCheckAcceptRecordService checkAcceptRecordService, TContractService contractService, THouseService houseService) {
this.checkAcceptRecordService = checkAcceptRecordService;
@@ -73,6 +70,10 @@
public R<THouse> getHouseByContractId(@RequestParam String contractId) {
TContract contract = contractService.getById(contractId);
THouse house = houseService.getById(contract.getHouseId());
+ TTenant tenant = tenantService.getById(contract.getTenantId());
+ if(Objects.nonNull(tenant)){
+ house.setTenantType(tenant.getTenantType());
+ }
return R.ok(house);
}
--
Gitblit v1.7.1