From fd1efdba56dbf07943b82c971694579af034fc5a Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 03 十一月 2026 20:10:12 +0800
Subject: [PATCH] feat: 新增废料管理并完善合同导出
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/CrmContractController.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/CrmContractController.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/CrmContractController.java
index bc20fe7..a03a34a 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/CrmContractController.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/CrmContractController.java
@@ -118,7 +118,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱鍚堝悓")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('crm:contract:query')")
public CommonResult<CrmContractRespVO> getContract(@RequestParam("id") Long id) {
CrmContractDO contract = contractService.getContract(id);
return success(buildContractDetail(contract));
@@ -153,6 +152,13 @@
// getContract 鍖呭惈鍚堝悓鏁版嵁鏉冮檺鏍￠獙锛涙部鐢ㄨ鎯呴〉鐨勪骇鍝併�佸崟浣嶅拰瀹㈡埛淇℃伅銆�
CrmContractRespVO contract = buildContractDetail(contractService.getContract(id));
Assert.notNull(contract, "鍚堝悓涓嶅瓨鍦�");
+ if (contract.getProducts() == null || contract.getProducts().isEmpty()) {
+ throw new cn.iocoder.yudao.framework.common.exception.ServiceException(400, "鍚堝悓娌℃湁浜у搧鏄庣粏锛岃鍏堢淮鎶や骇鍝佸悗瀵煎嚭");
+ }
+ if (contract.getTotalPrice() == null || contract.getProducts().stream()
+ .anyMatch(product -> product.getContractPrice() == null || product.getCount() == null)) {
+ throw new cn.iocoder.yudao.framework.common.exception.ServiceException(400, "鍚堝悓閲戦銆佷骇鍝佹暟閲忓拰鍗曚环涓嶈兘涓虹┖锛岃鍏堣ˉ鍏ㄥ悗瀵煎嚭");
+ }
byte[] content = cn.iocoder.yudao.module.crm.service.contract.CrmContractDocumentRenderer.render(contract);
String filename = "璐攢鍚堝悓-" + contract.getNo() + ".docx";
response.setContentType("application/vnd.openxmlformats-officedocument.wordprocessingml.document");
@@ -164,7 +170,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱鍚堝悓鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('crm:contract:query')")
public CommonResult<PageResult<CrmContractRespVO>> getContractPage(@Valid CrmContractPageReqVO pageVO) {
PageResult<CrmContractDO> pageResult = contractService.getContractPage(pageVO, getLoginUserId());
return success(BeanUtils.toBean(pageResult, CrmContractRespVO.class).setList(buildContractDetailList(pageResult.getList())));
@@ -252,7 +257,6 @@
@GetMapping("/approve-process-list")
@Operation(summary = "鑾峰彇鍚堝悓瀹℃壒娴佺▼鍒楄〃")
- @PreAuthorize("@ss.hasPermission('crm:contract:query')")
public CommonResult<List<Map<String, Object>>> getContractApproveProcessList() {
return success(contractService.getContractApproveProcessDefinitionList());
}
@@ -308,14 +312,12 @@
@GetMapping("/audit-count")
@Operation(summary = "鑾峰緱寰呭鏍稿悎鍚屾暟閲�")
- @PreAuthorize("@ss.hasPermission('crm:contract:query')")
public CommonResult<Long> getAuditContractCount() {
return success(contractService.getAuditContractCount(getLoginUserId()));
}
@GetMapping("/remind-count")
@Operation(summary = "鑾峰緱鍗冲皢鍒版湡锛堟彁閱掞級鐨勫悎鍚屾暟閲�")
- @PreAuthorize("@ss.hasPermission('crm:contract:query')")
public CommonResult<Long> getRemindContractCount() {
return success(contractService.getRemindContractCount(getLoginUserId()));
}
@@ -323,7 +325,6 @@
@GetMapping("/simple-list")
@Operation(summary = "鑾峰緱鍚堝悓绮剧畝鍒楄〃", description = "鍙寘鍚殑鍚堝悓锛屼富瑕佺敤浜庡墠绔殑涓嬫媺閫夐」")
@Parameter(name = "customerId", description = "瀹㈡埛缂栧彿", required = true)
- @PreAuthorize("@ss.hasPermission('crm:contract:query')")
public CommonResult<List<CrmContractRespVO>> getContractSimpleList(@RequestParam("customerId") Long customerId) {
CrmContractPageReqVO pageReqVO = new CrmContractPageReqVO().setCustomerId(customerId);
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); // 涓嶅垎椤�
--
Gitblit v1.9.3