From 887195bcc218e1b3454ccf333e9b1b336103bb44 Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期二, 21 一月 2025 17:28:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xizang-changyun
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java | 70 ++++++++++++++++++++++-------------
1 files changed, 44 insertions(+), 26 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 175648d..4ae6b2b 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
@@ -1,19 +1,21 @@
package com.ruoyi.web.controller.api;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.system.model.TContract;
-import com.ruoyi.system.model.TTenant;
-import com.ruoyi.system.query.TTenantQuery;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.dto.THouseDTO;
+import com.ruoyi.system.model.THouse;
+import com.ruoyi.system.query.THouseQuery;
+import com.ruoyi.system.query.TUserHistoryQuery;
import com.ruoyi.system.service.TContractService;
-import io.swagger.annotations.Api;
+import com.ruoyi.system.service.THouseService;
+import com.ruoyi.system.vo.HouseVO;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
/**
* <p>
@@ -27,25 +29,41 @@
@RestController
@RequestMapping("/t-contract")
public class TContractController {
-
- private final TContractService contractService;
-
@Autowired
- public TContractController(TContractService contractService) {
- this.contractService = contractService;
- }
-
-
- /**
- * 查询用户合同列表
- */
- @ApiOperation(value = "查询用户合同列表")
- @GetMapping(value = "/queryListByTenantId")
- public AjaxResult<PageInfo<TTenant>> queryListByTenantId(@RequestParam String tenantId) {
- List<TContract> list = contractService.list(Wrappers.lambdaQuery(TContract.class)
- .eq(TContract::getTenantId, tenantId));
- return AjaxResult.success(list);
- }
-
+ private TContractService contractService;
+// @Log(title = "房屋基础信息管理-新增房屋", businessType = BusinessType.INSERT)
+// @ApiOperation(value = "新增房屋")
+// @PostMapping(value = "/addHouse")
+// public AjaxResult<Boolean> addHouse(@Validated @RequestBody THouseDTO dto) {
+// return AjaxResult.success(contractService.save(dto));
+// }
+// @Log(title = "房屋基础信息管理-编辑房屋", businessType = BusinessType.UPDATE)
+// @ApiOperation(value = "编辑房屋")
+// @PostMapping(value = "/updateHouse")
+// public AjaxResult<Boolean> updateHouse(@Validated @RequestBody THouseDTO dto) {
+// return AjaxResult.success(contractService.updateById(dto));
+// }
+// @Log(title = "房屋基础信息管理-查询房屋信息", businessType = BusinessType.DELETE)
+// @ApiOperation(value = "查询房屋信息")
+// @GetMapping(value = "/getHouseById")
+// public AjaxResult<THouse> getHouseById(@RequestParam Long id) {
+// return AjaxResult.success(contractService.getById(id));
+// }
+// @Log(title = "房屋基础信息管理-删除房屋", businessType = BusinessType.DELETE)
+// @ApiOperation(value = "删除房屋")
+// @DeleteMapping(value = "/deleteHouseById")
+// public AjaxResult<Boolean> deleteHouseById(@RequestParam Long id) {
+// return AjaxResult.success(contractService.removeById(id));
+// }
+// @ApiOperation(value = "获取房屋分页列表")
+// @PostMapping(value = "/houseList")
+// public AjaxResult<PageInfo<THouse>> houseList(@RequestBody THouseQuery query) {
+// return AjaxResult.success(contractService.houseList(query));
+// }
+// @ApiOperation(value = "历史租户列表")
+// @PostMapping(value = "/userHistoryList")
+// public AjaxResult<PageInfo<HouseVO>> userHistoryList(@RequestBody TUserHistoryQuery query) {
+// return AjaxResult.success(contractService.userHistoryList(query));
+// }
}
--
Gitblit v1.7.1