From a7ad35b3e20867204cda9faa7bdf8a686264e906 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期四, 27 三月 2025 17:17:43 +0800
Subject: [PATCH] 合同及明细业务调整
---
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ContractController.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ContractController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ContractController.java
index 1d8bf4e..4bbec76 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ContractController.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ContractController.java
@@ -10,8 +10,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.log.annotation.SysLog;
+import com.by4cloud.platformx.device.constant.MaxSizeContant;
import com.by4cloud.platformx.device.entity.Contract;
import com.by4cloud.platformx.device.service.ContractService;
+import com.by4cloud.platformx.device.service.JcMaxSizeService;
import org.springframework.security.access.prepost.PreAuthorize;
import com.by4cloud.platformx.common.excel.annotation.ResponseExcel;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
@@ -39,6 +41,7 @@
public class ContractController {
private final ContractService contractService;
+ private final JcMaxSizeService maxSizeService;
/**
* 鍒嗛〉鏌ヨ
@@ -67,7 +70,7 @@
@GetMapping("/{id}" )
@PreAuthorize("@pms.hasPermission('platformx_contract_view')" )
public R getById(@PathVariable("id" ) Long id) {
- return R.ok(contractService.getById(id));
+ return R.ok(contractService.getDetailById(id));
}
/**
@@ -80,7 +83,8 @@
@PostMapping
@PreAuthorize("@pms.hasPermission('platformx_contract_add')" )
public R save(@RequestBody Contract contract) {
- return R.ok(contractService.save(contract));
+ contract.setNumber(maxSizeService.nextNo(MaxSizeContant.CONTRACT_NUM));
+ return R.ok(contractService.saveDeep(contract));
}
/**
@@ -93,7 +97,7 @@
@PutMapping
@PreAuthorize("@pms.hasPermission('platformx_contract_edit')" )
public R updateById(@RequestBody Contract contract) {
- return R.ok(contractService.updateById(contract));
+ return R.ok(contractService.updateDeep(contract));
}
/**
@@ -106,7 +110,7 @@
@DeleteMapping
@PreAuthorize("@pms.hasPermission('platformx_contract_del')" )
public R removeById(@RequestBody Long[] ids) {
- return R.ok(contractService.removeBatchByIds(CollUtil.toList(ids)));
+ return R.ok(contractService.removeDeep(ids));
}
--
Gitblit v1.9.1