From 099ea14bba367fd86f0dde37d908f07cc04c3d39 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 10 四月 2025 15:38:01 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/xizang
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCheckAcceptRecordController.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 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 ab20a9b..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>
@@ -49,6 +44,8 @@
@Autowired
private TBillService billService;
@Autowired
+ private TTenantService tenantService;
+ @Autowired
public TCheckAcceptRecordController(TCheckAcceptRecordService checkAcceptRecordService, TContractService contractService, THouseService houseService) {
this.checkAcceptRecordService = checkAcceptRecordService;
this.contractService = contractService;
@@ -58,7 +55,7 @@
/**
* 获取验收记录管理列表
*/
- @PreAuthorize("@ss.hasPermi('houseManage:check:list')")
+ @PreAuthorize("@ss.hasPermi('houseManage:check')")
@ApiOperation(value = "获取验收记录分页列表")
@PostMapping(value = "/pageList")
public R<PageInfo<TCheckAcceptRecordVO>> pageList(@RequestBody TCheckAcceptRecordQuery query) {
@@ -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);
}
@@ -113,10 +114,12 @@
tBill.setContractId(dto.getContractId());
tBill.setContractNumber(contract.getContractNumber());
tBill.setPayableFeesMoney(dto.getCheckMoney());
+ tBill.setOutstandingMoney(dto.getCheckMoney());
tBill.setPayableFeesTime(LocalDate.now());
tBill.setPayFeesStatus("1");
tBill.setBillType("4");
tBill.setSmsStatus(0);
+ tBill.setBusinessDeptId(contract.getBusinessDeptId());
billService.save(tBill);
}
--
Gitblit v1.7.1