From fca21683e1b5b906d2514082ddfbae8eb820c9ea Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期五, 15 五月 2026 17:12:55 +0800
Subject: [PATCH] feat:合同模版、出库标的物、合同管理拆分
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java
index 41126ca..b88aa1e 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java
@@ -2,6 +2,7 @@
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -56,6 +57,7 @@
LambdaQueryWrapper<Contract> wrapper = Wrappers.lambdaQuery();
wrapper.like(StringUtils.isNotBlank(contract.getContractName()),Contract::getContractName,contract.getContractName());
wrapper.like(StringUtils.isNotBlank(contract.getPartyA()),Contract::getPartyA,contract.getPartyA());
+ wrapper.eq(ObjUtil.isNotNull(contract.getContractStatus()),Contract::getContractStatus,contract.getContractStatus());
wrapper.orderByDesc(BaseModel::getCreateTime);
return R.ok(contractService.pageByScope(page, wrapper));
}
@@ -127,15 +129,14 @@
}
/**
- * 閫氳繃id鍚堝悓鐢熸晥
+ * 鍚姩瀹℃牳娴佺▼
* @param id id
* @return R
*/
- @Operation(summary = "閫氳繃id鍚堝悓鐢熸晥" , description = "閫氳繃id鍚堝悓鐢熸晥" )
- @GetMapping("/takeEffect/{id}" )
- @PreAuthorize("@pms.hasPermission('business_contract_effect')" )
- public R takeEffect(@PathVariable("id" ) Long id) {
- return R.ok(contractService.takeEffect(id));
+ @Operation(summary = "閫氳繃id鍚姩瀹℃牳娴佺▼" , description = "閫氳繃id鍚堝悓鐢熸晥" )
+ @GetMapping("/startApproval/{id}" )
+ public R startApproval(@PathVariable("id" ) Long id) {
+ return contractService.startApproval(id);
}
@@ -148,4 +149,6 @@
public R genCurrentOverdue() {
return contractService.genCurrentOverdue();
}
+
+
}
\ No newline at end of file
--
Gitblit v1.9.1