From b4adff68a07b783fc90da1c9370d8be5f383e700 Mon Sep 17 00:00:00 2001
From: 黎星凯 <13949086503@163.com>
Date: 星期三, 08 五月 2024 13:46:34 +0800
Subject: [PATCH] 20240528修改: bug41、42、43修改 领用单(分发单)，调拨单，流程优化
---
consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java | 46 +++++++++++++++++++++-------------------------
1 files changed, 21 insertions(+), 25 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 44f8030..f827446 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
@@ -1,25 +1,28 @@
package com.consum.base.controller;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
import com.consum.base.BaseController;
import com.consum.base.core.utils.CommonUtil;
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.service.BaseCategoryService;
+import com.consum.base.service.BaseGoodsTemplateService;
import com.consum.model.po.BaseCategory;
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 io.swagger.annotations.Api;
-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.Map;
-import java.util.TreeMap;
+import io.swagger.annotations.Api;
/**
* @Description 鐗╁搧鍒嗙被
@@ -32,16 +35,10 @@
public class BaseCategoryController extends BaseController {
@Autowired
- private BaseCategoryServiceImpl baseCategoryService;
+ private BaseCategoryService baseCategoryService;
@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;
+ private BaseGoodsTemplateService baseGoodsTemplateService;
/**
* @Description 鑾峰彇鍒嗙被鏍�
@@ -71,8 +68,9 @@
if (param.getOrderNumber() == null) {
return ResponseValue.error("椤哄簭鍙蜂负绌�");
}
- //鍒ゆ柇鍚屼竴鐖剁被id涓嬪垎绫诲悕绉版槸鍚﹂噸澶�
- BaseCategory category = this.baseCategoryService.getByCategoryNameAndFatherCategoryId(param.getCategoryName(), param.getFatherCategoryId());
+ // 鍒ゆ柇鍚屼竴鐖剁被id涓嬪垎绫诲悕绉版槸鍚﹂噸澶�
+ BaseCategory category = this.baseCategoryService.getByCategoryNameAndFatherCategoryId(param.getCategoryName(),
+ param.getFatherCategoryId());
if (category != null) {
return ResponseValue.error("鍒嗙被鍚嶇О宸插瓨鍦�");
}
@@ -103,7 +101,6 @@
GenericPager<BaseCategory> pager = this.baseCategoryService.queryBaseCategoryList(param);
return ResponseValue.success(pager);
}
-
/**
* @Description 缂栬緫
@@ -142,7 +139,7 @@
* @author 鍗㈠簡闃�
* @date 2023/10/23
*/
- //鍒嗙被涓嬫湁姝ｅ父鐘舵�佺殑鐗╁搧鏃讹紝涓嶅厑璁哥鐢�
+ // 鍒嗙被涓嬫湁姝ｅ父鐘舵�佺殑鐗╁搧鏃讹紝涓嶅厑璁哥鐢�
@PostMapping("/updStatus")
public ResponseValue updateStatus() {
BaseCategory baseCategory = CommonUtil.getObjFromReqBody(BaseCategory.class);
@@ -150,10 +147,10 @@
CommonUtil.copyProperties(baseCategory, param2);
baseCategory = param2;
- if (baseCategory == null || baseCategory.getId() == null || baseCategory.getStates() == null) {
+ if (baseCategory.getId() == null || baseCategory.getStates() == null) {
return ResponseValue.error("鍙傛暟閿欒");
}
- //鏍规嵁鍒嗙被id鍜岀姸鎬佹煡璇㈢墿鍝佹ā鐗�
+ // 鏍规嵁鍒嗙被id鍜岀姸鎬佹煡璇㈢墿鍝佹ā鐗�
List<BaseCategory> list = this.baseGoodsTemplateService.getByCategoryId(baseCategory.getId());
if (baseCategory.getStates() == 2 && !CollectionUtils.isEmpty(list)) {
return ResponseValue.error("鍒嗙被涓嬫湁姝ｅ父鐘舵�佺殑鐗╁搧锛屼笉鍏佽绂佺敤");
@@ -218,4 +215,3 @@
}
}
-
--
Gitblit v1.9.1