From b82ed8cbcc9e262f2bce2a662f8ce0d8c59b5d70 Mon Sep 17 00:00:00 2001
From: luqingyang <lqy5492@163.com>
Date: 星期一, 30 十月 2023 17:35:13 +0800
Subject: [PATCH] 调拨管理、物品管理、物品分类 相关代码

---
 consum-base/src/main/java/com/consum/base/service/BaseCategoryServiceImpl.java |   47 ++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/consum-base/src/main/java/com/consum/base/service/BaseCategoryServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/BaseCategoryServiceImpl.java
index f45ac8b..48d474f 100644
--- a/consum-base/src/main/java/com/consum/base/service/BaseCategoryServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/BaseCategoryServiceImpl.java
@@ -2,6 +2,7 @@
 
 import com.consum.base.Constants;
 import com.consum.base.pojo.BaseCategoryParam;
+import com.consum.base.pojo.ProjectTreeResult;
 import com.consum.base.util.IdUtil;
 import com.consum.model.po.BaseCategory;
 import com.iplatform.model.po.S_user_core;
@@ -12,7 +13,10 @@
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.Comparator;
 import java.util.HashMap;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Description 鐗╁搧鍒嗙被
@@ -21,6 +25,8 @@
  */
 @Service
 public class BaseCategoryServiceImpl extends BaseServiceImpl {
+
+    private static final String QUERY_TREE_ALL = "select * from base_category where states = 1  order by FATHER_CATEGORY_ID, LEVELS ASC";
 
     /**
      * @Description 鏂板鍒嗙被
@@ -94,8 +100,10 @@
         }
         //鐘舵��
         if (param.getStates() != null) {
-            sql.append(" and status =:status ");
-            paramts.put("status", param.getStates());
+            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());
@@ -120,7 +128,7 @@
     }
 
     /**
-     * @Description 鏍规嵁鑺傜偣id鍒犻櫎鑺傜偣(閫昏緫鍒犻櫎)
+     * @Description 鏍规嵁id鍒犻櫎鐗╁搧鍒嗙被
      * @Author 鍗㈠簡闃�
      * @Date 2023/10/23
      */
@@ -142,4 +150,37 @@
     public BaseCategory getById(Long id) {
         return this.get(new BaseCategory(id));
     }
+
+    /**
+     * @Description
+     * @Author 鍗㈠簡闃�
+     * @Date 2023/10/30
+     */
+    public List<BaseCategory> queryForTree() {
+        // 灞曠ず鍏ㄩ儴鑺傜偣
+        return this.select(QUERY_TREE_ALL, new Object[]{}, new BaseCategory());
+    }
+
+    public List<ProjectTreeResult> tree(String categoryName) {
+        BaseCategory categoryParam = new BaseCategory();
+        categoryParam.setStates(1);
+        List<BaseCategory> categories = select(categoryParam);
+        return categories.stream()
+                .filter(category -> Integer.valueOf(1).equals(category.getLevels()))
+                .sorted(Comparator.comparing(BaseCategory::getOrderNumber))
+                .map(ProjectTreeResult::new)
+                .peek(lv1TreeResult -> lv1TreeResult.setChildren(categories.stream().filter(categorie -> lv1TreeResult.getId().equals(categorie.getFatherCategoryId())).sorted(Comparator.comparing(BaseCategory::getOrderNumber)).map(ProjectTreeResult::new).collect(Collectors.toList())))
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * @Description  涓夌骇鍒嗙被鍒楄〃鏌ヨ
+     * @Author 鍗㈠簡闃�
+     * @Date 2023/10/30
+     * @return
+     */
+    public List<BaseCategory> queryForLv3Tree() {
+        StringBuilder sql = new StringBuilder("SELECT * FROM base_category WHERE states = 1 and levels = 3 order by ORDER_NUMBER,CREATE_TIME desc");
+        return this.select(sql.toString(), new Object[]{}, new BaseCategory());
+    }
 }

--
Gitblit v1.9.1