From 33032d320cb75854def7391026b0401f1bfb8360 Mon Sep 17 00:00:00 2001
From: 黎星凯 <13949086503@163.com>
Date: 星期六, 11 五月 2024 17:26:02 +0800
Subject: [PATCH] 20240511修改: 分发单优化， 分类，物品，分发单明细，采购单明细数据导入
---
consum-base/src/main/java/com/consum/base/service/impl/BaseCategoryServiceImpl.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 58 insertions(+), 0 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/BaseCategoryServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/BaseCategoryServiceImpl.java
index 27616a7..80e0c8b 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/BaseCategoryServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/BaseCategoryServiceImpl.java
@@ -3,6 +3,7 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -102,6 +103,42 @@
if (!StringUtils.isEmpty(param.getCategoryName())) {
sql.append(" and category_name like:category_name ");
paramts.put("category_name", StringUtils.CHAR_PERCENT + param.getCategoryName() + StringUtils.CHAR_PERCENT);
+ }
+ // 绫诲埆
+ if (!StringUtils.isEmpty(param.getClassification())) {
+ sql.append(" and classification =:classification ");
+ paramts.put("classification", param.getClassification());
+ }
+ // 鐘舵��
+ if (param.getStates() != null) {
+ sql.append(" and states =:states ");
+ paramts.put("states", param.getStates());
+ } else {
+ sql.append(" and states !=3 ");
+ }
+ sql.append(" ORDER BY ORDER_NUMBER,CREATE_TIME DESC ");
+ return selectSplit(sql.toString(), paramts, new BaseCategory());
+ }
+
+ /**
+ * 鐗╁搧鍒嗙被鍒楄〃鏌ヨ绮剧‘鏌ヨ
+ * @param param
+ * @return
+ */
+ public GenericPager<BaseCategory> queryBaseCategoryList2(BaseCategoryParam param) {
+ StringBuilder sql = new StringBuilder("SELECT * FROM base_category WHERE 1 = 1 ");
+ HashMap<String, Object> paramts = new HashMap<>();
+ // 鍒嗙被鍚嶇О
+ if (param.getFatherCategoryId() != null) {
+ sql.append("and father_category_id =:fatherCategoryId ");
+ paramts.put("fatherCategoryId", param.getFatherCategoryId());
+ } else {
+ sql.append("and levels =1 ");
+ }
+ // 鍒嗙被鍚嶇О
+ if (!StringUtils.isEmpty(param.getCategoryName())) {
+ sql.append(" and category_name =:category_name ");
+ paramts.put("category_name", param.getCategoryName());
}
// 绫诲埆
if (!StringUtils.isEmpty(param.getClassification())) {
@@ -236,4 +273,25 @@
BaseCategory baseCategory = this.get(sql.toString(), paramts, new BaseCategory());
return baseCategory;
}
+
+ /**
+ * 鏌ヨ鍒嗙被鍚岀骇鍒殑鏈�澶ф帓搴忓彿
+ * @param id 鍒嗙被
+ * @return
+ */
+ @Override
+ public int selIndexByPid(Long id) {
+ StringBuilder sql = new StringBuilder("SELECT max(ORDER_NUMBER) maxNum FROM base_category WHERE 1 = 1 ");
+ HashMap<String, Object> paramts = new HashMap<>();
+ // 鍒嗙被鍚嶇О
+ sql.append(" and FATHER_CATEGORY_ID =:FATHER_CATEGORY_ID ");
+ paramts.put("FATHER_CATEGORY_ID", id);
+ Map getMap = this.get(sql.toString(), paramts);
+ Object obj = getMap.get("maxNum");
+ if(obj!=null){
+ return new Integer(obj.toString());
+ }
+ return 0;
+ }
+
}
--
Gitblit v1.9.1