From f0181cd4f035e8317d6f70b74192dcafd28f79fe Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期五, 07 二月 2025 10:59:30 +0800
Subject: [PATCH] 新增支付订单、定时任务
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 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 c0cda84..4476610 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
@@ -5,6 +5,7 @@
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.dto.TContractDTO;
@@ -19,6 +20,7 @@
import com.ruoyi.system.service.TContractService;
import com.ruoyi.system.service.THouseService;
import com.ruoyi.system.vo.HouseVO;
+import io.swagger.annotations.Api;
import com.ruoyi.system.vo.TContractVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -51,13 +53,13 @@
private THouseService houseService;
@ApiOperation(value = "获取合同分页列表")
@PostMapping(value = "/contractList")
- public AjaxResult<PageInfo<TContract>> contractList(@RequestBody TContractQuery query) {
- return AjaxResult.success(contractService.contractList(query));
+ public R<PageInfo<TContract>> contractList(@RequestBody TContractQuery query) {
+ return R.ok(contractService.contractList(query));
}
@Log(title = "合同管理-新增合同", businessType = BusinessType.INSERT)
@ApiOperation(value = "新增合同")
@PostMapping(value = "/addContract")
- public AjaxResult<Boolean> addContract(@Validated @RequestBody TContractDTO dto) {
+ public R<Boolean> addContract(@Validated @RequestBody TContractDTO dto) {
contractService.save(dto);
if (dto.getIsIncreasing()==1){
TContractRentType tContractRentType = new TContractRentType();
@@ -68,12 +70,12 @@
tContractRentType.setChangeTime(dto.getChangeTime());
contractRentTypeService.save(tContractRentType);
}
- return AjaxResult.success();
+ return R.ok();
}
- @Log(title = "合同管理-编辑合同", businessType = BusinessType.UPDATE)
+ @Log(title = "合同管理-编辑合同", businessType = BusinessType.UPDATE)
@ApiOperation(value = "编辑合同")
@PostMapping(value = "/updateContract")
- public AjaxResult<Boolean> updateContract(@Validated @RequestBody TContractDTO dto) {
+ public R<Boolean> updateContract(@Validated @RequestBody TContractDTO dto) {
contractService.updateById(dto);
contractRentTypeService.remove(new LambdaQueryWrapper<TContractRentType>()
.eq(TContractRentType::getContractId,dto.getId()));
@@ -86,22 +88,22 @@
tContractRentType.setChangeTime(dto.getChangeTime());
contractRentTypeService.save(tContractRentType);
}
- return AjaxResult.success();
+ return R.ok();
}
@Log(title = "合同管理-批量删除合同", businessType = BusinessType.DELETE)
@ApiOperation(value = "批量删除合同")
@DeleteMapping(value = "/deleteContractByIds")
- public AjaxResult<Boolean> deleteContractByIds3
+ public R<Boolean> deleteContractByIds3
(@RequestParam String ids) {
if (StringUtils.isNotEmpty(ids)){
contractService.removeBatchByIds(Arrays.asList(ids.split(",")));
}
- return AjaxResult.success();
+ return R.ok();
}
@ApiOperation(value = "查询合同信息信息")
@GetMapping(value = "/getContractById")
- public AjaxResult<TContractVO> getContractById(@RequestParam Long id) {
+ public R<TContractVO> getContractById(@RequestParam String id) {
TContractVO res = new TContractVO();
TContract contract = contractService.getById(id);
BeanUtils.copyProperties(contract,res);
@@ -119,7 +121,7 @@
house.setTenantType(oldContract.getPayType());
}
res.setHouse(house);
- return AjaxResult.success();
+ return R.ok(res);
}
}
--
Gitblit v1.7.1