From b606905fcaf748edfc4bafb236e388f3295f2899 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 07 四月 2025 09:16:46 +0800
Subject: [PATCH] Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang into dev
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCheckAcceptRecordController.java | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 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 95d749e..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('system:accept: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);
}
@@ -93,7 +94,7 @@
/**
* 添加验收记录管理
*/
- @PreAuthorize("@ss.hasPermi('system:accept:add')")
+ @PreAuthorize("@ss.hasPermi('houseManage:check:add')")
@Log(title = "验收记录信息-新增验收记录", businessType = BusinessType.INSERT)
@ApiOperation(value = "添加验收记录")
@PostMapping(value = "/add")
@@ -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);
}
@@ -126,7 +129,7 @@
/**
* 查看验收记录详情
*/
- @PreAuthorize("@ss.hasPermi('system:accept:detail')")
+ @PreAuthorize("@ss.hasPermi('houseManage:check:detail')")
@ApiOperation(value = "查看验收记录详情")
@GetMapping(value = "/getDetailById")
public R<TCheckAcceptRecordVO> getDetailById(@RequestParam String id) {
@@ -143,7 +146,7 @@
/**
* 删除验收记录
*/
- @PreAuthorize("@ss.hasPermi('system:accept:delete')")
+ @PreAuthorize("@ss.hasPermi('houseManage:check:delete')")
@Log(title = "验收记录信息-删除验收记录", businessType = BusinessType.DELETE)
@ApiOperation(value = "删除验收记录")
@DeleteMapping(value = "/deleteById")
@@ -154,7 +157,7 @@
/**
* 批量删除验收记录
*/
- @PreAuthorize("@ss.hasPermi('system:accept:delete')")
+ @PreAuthorize("@ss.hasPermi('houseManage:check:delete')")
@Log(title = "验收记录信息-删除验收记录", businessType = BusinessType.DELETE)
@ApiOperation(value = "批量删除验收记录")
@DeleteMapping(value = "/deleteByIds")
--
Gitblit v1.7.1