From ffea930626dbf049d678e5abfa16edfdf5133dbf Mon Sep 17 00:00:00 2001
From: luqingyang <lqy5492@163.com>
Date: 星期二, 31 十月 2023 10:50:36 +0800
Subject: [PATCH] 调拨管理 相关代码
---
consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java | 57 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 45 insertions(+), 12 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 6e03ebd..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 鏂板鍒嗙被
@@ -86,11 +108,7 @@
if (baseCategory.getOrderNumber() == null) {
return ResponseValue.error("椤哄簭鍙蜂负绌�");
}
- //鍒ゆ柇鍚屼竴鐖剁被id涓嬪垎绫诲悕绉版槸鍚﹂噸澶�
- BaseCategory category = this.baseCategoryService.getByCategoryNameAndFatherCategoryId(baseCategory.getCategoryName(), baseCategory.getFatherCategoryId());
- if (category != null) {
- return ResponseValue.error("鍒嗙被鍚嶇О宸插瓨鍦�");
- }
+
S_user_core currentUser = this.getCurrentUser();
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
@@ -101,9 +119,8 @@
/**
* 淇敼鐘舵��
- *
* @author 鍗㈠簡闃�
- * @date 2023/9/27
+ * @date 2023/10/23
*/
//鍒嗙被涓嬫湁姝ｅ父鐘舵�佺殑鐗╁搧鏃讹紝涓嶅厑璁哥鐢�
@PostMapping("/updStatus")
@@ -122,7 +139,7 @@
}
/**
- * @Description 鏍规嵁鑺傜偣id鍒犻櫎鑺傜偣(閫昏緫鍒犻櫎)
+ * @Description 鏍规嵁id鍒犻櫎鐗╁搧鍒嗙被
* @Author 鍗㈠簡闃�
* @Date 2023/10/23
*/
@@ -137,10 +154,9 @@
}
/**
- * 鏍规嵁鑺傜偣id鏌ヨ鑺傜偣璇︽儏
- *
+ * 鏍规嵁鐗╁搧id鏌ヨ鑺傜偣璇︽儏
* @author 鍗㈠簡闃�
- * @date 2023/9/26
+ * @Date 2023/10/23
*/
@GetMapping("/detail")
public ResponseValue getById(Long id) {
@@ -151,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