From 7c2c6a5e5b3d9f96aef3c67573aa62bbd9a3aa7f Mon Sep 17 00:00:00 2001
From: p-honggang.li <p-honggang.li@pcitc.com>
Date: 星期四, 11 九月 2025 10:48:18 +0800
Subject: [PATCH] 修改产品类型，单位工程条偶见查询问题
---
src/main/java/com/webmanage/controller/ProductPricingController.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/webmanage/controller/ProductPricingController.java b/src/main/java/com/webmanage/controller/ProductPricingController.java
index 1ca6f19..fc59a67 100644
--- a/src/main/java/com/webmanage/controller/ProductPricingController.java
+++ b/src/main/java/com/webmanage/controller/ProductPricingController.java
@@ -10,6 +10,7 @@
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -107,9 +108,9 @@
*/
@GetMapping("/product/{productId}")
@ApiOperation("鏍规嵁浜у搧ID鏌ヨ瀹氫环鍒楄〃")
- public Result<List<ProductPricing>> getPricingByProductId(@ApiParam("浜у搧ID") @PathVariable Long productId) {
+ public Result<List<ProductPricing>> getPricingByProductId(@ApiParam("浜у搧ID") @PathVariable String productId) {
try {
- if (productId == null) {
+ if (!StringUtils.hasText(productId)) {
return Result.error("浜у搧ID涓嶈兘涓虹┖");
}
List<ProductPricing> result = productPricingService.getPricingByProductId(productId);
@@ -126,13 +127,14 @@
@GetMapping("/condition")
@ApiOperation("鏍规嵁鏉′欢鏌ヨ浜у搧瀹氫环")
public Result<List<ProductPricing>> getPricingByCondition(
+ @ApiParam("浜у搧ID") @RequestParam(required = false) String productId,
@ApiParam("濂椾欢鍚嶇О") @RequestParam(required = false) String suiteName,
@ApiParam("閿�鍞舰寮�") @RequestParam(required = false) String salesForm,
@ApiParam("瀹㈡埛瀵硅薄") @RequestParam(required = false) String customerType,
@ApiParam("浠锋牸绫诲瀷") @RequestParam(required = false) String priceType,
@ApiParam("鍚敤鐘舵��") @RequestParam(required = false) Boolean isActive) {
try {
- List<ProductPricing> result = productPricingService.getPricingByCondition(
+ List<ProductPricing> result = productPricingService.getPricingByCondition(productId,
suiteName, salesForm, customerType, priceType, isActive);
return Result.success("鏌ヨ鎴愬姛", result);
} catch (Exception e) {
--
Gitblit v1.8.0