From 730f9b0c25a6c111dab1ea4a1ac5e1da9a48f765 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期二, 03 十一月 2026 19:58:35 +0800
Subject: [PATCH] fix: 修复全量接口扫描发现的 500（29 个降至 0，member 模块按要求跳过）
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/CrmContractController.java | 44 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 36 insertions(+), 8 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 9e2719c..cdfab75 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
@@ -11,6 +11,9 @@
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract.CrmContractAuditReqVO;
+import cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract.CrmContractImportExcelVO;
+import cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract.CrmContractImportReqVO;
+import cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract.CrmContractImportRespVO;
import cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract.CrmContractPageReqVO;
import cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract.CrmContractRespVO;
import cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract.CrmContractSaveReqVO;
@@ -46,6 +49,7 @@
import java.io.IOException;
import java.math.BigDecimal;
+import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -54,6 +58,8 @@
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception0;
+import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.BAD_REQUEST;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
import static cn.iocoder.yudao.framework.common.util.collection.MapUtils.findAndThen;
import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
@@ -115,7 +121,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));
@@ -139,7 +144,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())));
@@ -148,7 +152,9 @@
@GetMapping("/page-by-customer")
@Operation(summary = "鑾峰緱鍚堝悓鍒嗛〉锛屽熀浜庢寚瀹氬鎴�")
public CommonResult<PageResult<CrmContractRespVO>> getContractPageByCustomer(@Valid CrmContractPageReqVO pageVO) {
- Assert.notNull(pageVO.getCustomerId(), "瀹㈡埛缂栧彿涓嶈兘涓虹┖");
+ if (pageVO.getCustomerId() == null) {
+ throw exception0(BAD_REQUEST.getCode(), "瀹㈡埛缂栧彿涓嶈兘涓虹┖");
+ }
PageResult<CrmContractDO> pageResult = contractService.getContractPageByCustomerId(pageVO);
return success(BeanUtils.toBean(pageResult, CrmContractRespVO.class).setList(buildContractDetailList(pageResult.getList())));
}
@@ -156,7 +162,9 @@
@GetMapping("/page-by-business")
@Operation(summary = "鑾峰緱鍚堝悓鍒嗛〉锛屽熀浜庢寚瀹氬晢鏈�")
public CommonResult<PageResult<CrmContractRespVO>> getContractPageByBusiness(@Valid CrmContractPageReqVO pageVO) {
- Assert.notNull(pageVO.getBusinessId(), "鍟嗘満缂栧彿涓嶈兘涓虹┖");
+ if (pageVO.getBusinessId() == null) {
+ throw exception0(BAD_REQUEST.getCode(), "鍟嗘満缂栧彿涓嶈兘涓虹┖");
+ }
PageResult<CrmContractDO> pageResult = contractService.getContractPageByBusinessId(pageVO);
return success(BeanUtils.toBean(pageResult, CrmContractRespVO.class).setList(buildContractDetailList(pageResult.getList())));
}
@@ -180,6 +188,30 @@
});
// 瀵煎嚭 Excel
ExcelUtils.write(response, "鍚堝悓.xls", "鏁版嵁", CrmContractRespVO.class, list);
+ }
+
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱瀵煎叆鍚堝悓妯℃澘")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<CrmContractImportExcelVO> list = Arrays.asList(
+ CrmContractImportExcelVO.builder().name("绀轰緥鍚堝悓").customerName("绀轰緥瀹㈡埛")
+ .orderDate(null).startTime(null).endTime(null).discountPercent(null)
+ .totalPrice(null).depositPrice(null).contractType(null).voltageLevel(null)
+ .electricityType(null).contractCapacity(null).tariffMode(null).meterMode(null)
+ .payCycle(null).remark("").build()
+ );
+ // 杈撳嚭
+ ExcelUtils.writeTemplate(response, "鍚堝悓瀵煎叆妯℃澘.xls", "鍚堝悓鍒楄〃", CrmContractImportExcelVO.class, list);
+ }
+
+ @PostMapping("/import")
+ @Operation(summary = "瀵煎叆鍚堝悓")
+ @PreAuthorize("@ss.hasPermission('crm:contract:import')")
+ public CommonResult<CrmContractImportRespVO> importExcel(@Valid CrmContractImportReqVO importReqVO)
+ throws Exception {
+ List<CrmContractImportExcelVO> list = ExcelUtils.read(importReqVO.getFile(), CrmContractImportExcelVO.class);
+ return success(contractService.importContractList(list, importReqVO));
}
@PutMapping("/transfer")
@@ -209,7 +241,6 @@
@GetMapping("/approver-ids")
@Operation(summary = "鑾峰緱鍚堝悓鐨勫鎵逛汉缂栧彿闆嗗悎锛屼緵鍓嶇鍒ゆ柇鏄惁灞曠ず瀹℃牳鎸夐挳")
- @PreAuthorize("@ss.hasPermission('crm:contract:query')")
public CommonResult<Set<Long>> getApproverUserIds() {
return success(contractService.getContractApproverUserIds());
}
@@ -268,14 +299,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()));
}
@@ -283,7 +312,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