From 58a518f8bc23ed382f4da2a86b09024b063a620c Mon Sep 17 00:00:00 2001
From: 黎星凯 <13949086503@163.com>
Date: 星期一, 13 五月 2024 15:40:47 +0800
Subject: [PATCH] 20240511修改: 分发单优化， 分类，物品，分发单明细，采购单明细数据导入
---
consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsModelsServiceImpl.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsModelsServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsModelsServiceImpl.java
index 9266ab3..b118221 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsModelsServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsModelsServiceImpl.java
@@ -1,5 +1,6 @@
package com.consum.base.service.impl;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -110,7 +111,7 @@
public List<BaseGoodsModels> selectByModelsIdList(List<Long> idList) {
if (CollectionUtils.isEmpty(idList)) {
log.error("鍙傛暟閿欒");
- return null;
+ return Collections.emptyList();
}
StringBuilder sql = new StringBuilder("SELECT * FROM base_goods_models WHERE 1 = 1 ");
HashMap<String, Object> paramts = new HashMap<>();
@@ -127,9 +128,6 @@
return this.select(sql.toString(), paramts, new BaseGoodsModels());
}
- 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";
-
/**
* 鏍规嵁鐗╁搧鍨嬪彿id 鏌ヨ鐗╁搧淇℃伅
*
@@ -138,7 +136,10 @@
*/
@Override
public List<Map<String, Object>> queryGoodsModelInfo(Long baseGoodsModelsId) {
- StringBuilder sql = new StringBuilder(QUERY_GOODS_MODEL_INFO);
+ StringBuilder sql = new StringBuilder(
+ "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 ");
HashMap<String, Object> paramts = new HashMap<>();
sql.append(" where model.id=:baseGoodsModelsId");
paramts.put("baseGoodsModelsId", baseGoodsModelsId);
@@ -149,8 +150,10 @@
public List<BaseGoodsModels> queryGoodsModelByGoodsTemplatesId(Long baseGoodsModelsId) {
StringBuilder sql = new StringBuilder("select * from base_goods_models where states != 3 ");
HashMap<String, Object> param = new HashMap<>();
- sql.append("and goods_templates_id=:baseGoodsModelsId");
- param.put("baseGoodsModelsId", baseGoodsModelsId);
+ if (baseGoodsModelsId != null) {
+ sql.append("and goods_templates_id=:baseGoodsModelsId");
+ param.put("baseGoodsModelsId", baseGoodsModelsId);
+ }
return select(sql.toString(), param, new BaseGoodsModels());
}
--
Gitblit v1.9.1