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/controller/BaseCategoryController.java | 41 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 40 insertions(+), 1 deletions(-) diff --git a/consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java b/consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java index 2603a6b..ca157b1 100644 --- a/consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java +++ b/consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java @@ -2,18 +2,23 @@ import com.consum.base.BaseController; import com.consum.base.pojo.BaseCategoryParam; +import com.consum.base.pojo.ProjectTreeResult; import com.consum.base.service.BaseCategoryServiceImpl; import com.consum.base.service.BaseGoodsTemplateServiceImpl; +import com.consum.base.util.FinSysTenantUtils; import com.consum.model.po.BaseCategory; +import com.consum.model.po.FinSysTenant; +import com.consum.model.po.FinSysTenantUser; import com.iplatform.model.po.S_user_core; import com.walker.db.page.GenericPager; +import com.walker.infrastructure.tree.TreeNode; import com.walker.infrastructure.utils.StringUtils; import com.walker.web.ResponseValue; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; -import java.util.List; +import java.util.*; /** * @Description 鐗╁搧鍒嗙被 @@ -29,6 +34,23 @@ @Autowired private BaseGoodsTemplateServiceImpl baseGoodsTemplateService; + + private boolean multiRoot = true; + private TreeNode dummyRoot = null; + private Map<Long, TreeNode> rootMap = new TreeMap(); + private Map<Long, TreeNode> childMap = new TreeMap(); + private long defaultParentId = 0L; + + /** + * @Description 鑾峰彇鍒嗙被鏍� + * @Author 鍗㈠簡闃� + * @Date 2023/10/30 + */ + @GetMapping("/select/tree") + public ResponseValue tree(String categoryName) { + List<ProjectTreeResult> tree = this.baseCategoryService.tree(categoryName); + return ResponseValue.success(tree); + } /** * @Description 鏂板鍒嗙被 @@ -145,5 +167,22 @@ if (baseCategory == null) return ResponseValue.error("鏌ヨ澶辫触锛�"); return ResponseValue.success("鏌ヨ鎴愬姛!", baseCategory); } + + /** + * @Description 涓夌骇鍒嗙被鍒楄〃鏌ヨ + * @Author 鍗㈠簡闃� + * @Date 2023/10/24 + */ + @GetMapping("/select/lv3_tree") + public ResponseValue tree() { + S_user_core currentUser = this.getCurrentUser(); + if (currentUser == null) { + return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�"); + } + + List<BaseCategory> baseCategories = this.baseCategoryService.queryForLv3Tree(); + return ResponseValue.success(baseCategories); + } + } -- Gitblit v1.9.1