From b1b5cf4b00ddc12f624f299174a6366d2cdb2617 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 26 十二月 2025 15:20:31 +0800
Subject: [PATCH] 提交相关代码
---
north-glass-erp/src/main/java/com/example/erp/service/sd/ProductService.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/ProductService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/ProductService.java
index 319c357..f809ab5 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/ProductService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/ProductService.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.parser.Feature;
+import com.aspose.cad.internal.I.S;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -93,12 +94,28 @@
Map<String,Object> getProductJson = updateProduct(productDetails,product);
Product getProduct = JSONObject.parseObject(JSONObject.toJSONString(getProductJson.get("title")), Product.class);
List<ProductDetail> getProductDetails = JSONArray.parseArray(JSONObject.toJSONString(getProductJson.get("detail")), ProductDetail.class);
- if(getProduct.getId()!=null){
- map.put("data",productMapper.selectProductId(productName,getProduct.getProductAbbreviation(), getProduct.getId()));
- }else{
- map.put("data",productMapper.selectProduct(productName,getProduct.getProductAbbreviation()));
+ String productNameVal = null;
+
+ //鍒ゆ柇浣跨敤鍝浜у搧鍚嶇О
+ switch (productName){
+ case "product_name":
+ productNameVal = getProduct.getProductName();
+ break;
+ case "product_abbreviation":
+ productNameVal = getProduct.getProductAbbreviation();
+ break;
}
+
+ if(!Objects.equals(productNameVal, "") && productNameVal!=null){
+ if(getProduct.getId()!=null ){
+ map.put("data",productMapper.selectProductId(productName,productNameVal, getProduct.getId()));
+ }else{
+ map.put("data",productMapper.selectProduct(productName,productNameVal));
+ }
+ }
+
+
return map;
}
--
Gitblit v1.8.0