From 870a9499eb65de0031ef8e8f70607e5dfb64b806 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期四, 30 十一月 2023 09:30:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/service/BaseGoodsModelsServiceImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/BaseGoodsModelsServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/BaseGoodsModelsServiceImpl.java
index 496f910..c2edf64 100644
--- a/consum-base/src/main/java/com/consum/base/service/BaseGoodsModelsServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/BaseGoodsModelsServiceImpl.java
@@ -54,6 +54,10 @@
//鐗╁搧妯℃澘id
sql.append(" and GOODS_TEMPLATES_ID =:GOODS_TEMPLATES_ID ");
paramts.put("GOODS_TEMPLATES_ID", models.getGoodsTemplatesId());
+ if (models.getStates() != null){
+ sql.append(" and STATES =:states ");
+ paramts.put("states", models.getStates());
+ }
return this.get(sql.toString(), paramts, new BaseGoodsModels());
}
@@ -132,7 +136,7 @@
* @param baseGoodsModelsId
* @return
*/
- private String QUERY_GOODS_MODEL_INFO = "SELECT goodsTemp.CATEGORY_ID,goodsTemp.CATEGORY_NAME,goodsTemp.id goods_Id,goodsTemp.GOODS_NAME,model.MODEL_NAME,model.id base_Goods_Models_Id,model.UNIT FROM BASE_GOODS_MODELS model LEFT JOIN BASE_GOODS_TEMPLATE goodsTemp ON model.GOODS_TEMPLATES_ID=goodsTemp.id";
+ private String QUERY_GOODS_MODEL_INFO = "SELECT CLASSIFICATION type, goodsTemp.CATEGORY_ID,goodsTemp.CATEGORY_NAME,goodsTemp.id goods_Id,goodsTemp.GOODS_NAME,model.MODEL_NAME,model.id base_Goods_Models_Id,model.UNIT FROM BASE_GOODS_MODELS model LEFT JOIN BASE_GOODS_TEMPLATE goodsTemp ON model.GOODS_TEMPLATES_ID=goodsTemp.id";
public List<Map<String, Object>> queryGoodsModelInfo(Long baseGoodsModelsId) {
StringBuilder sql = new StringBuilder(QUERY_GOODS_MODEL_INFO);
--
Gitblit v1.9.1