From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentCategoryController.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentCategoryController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentCategoryController.java
index c96e6f8..00e305e 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentCategoryController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentCategoryController.java
@@ -10,6 +10,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import org.jeecg.common.api.vo.CommonGenericTree;
@@ -25,6 +26,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
+import org.jeecg.modules.system.entity.SysDict;
+import org.jeecg.modules.system.entity.SysDictItem;
+import org.jeecg.modules.system.service.ISysDictItemService;
+import org.jeecg.modules.system.service.ISysDictService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -54,6 +59,10 @@
public class EquipmentCategoryController extends JeecgController<EquipmentCategory, IEquipmentCategoryService> {
@Autowired
private IEquipmentCategoryService equipmentCategoryService;
+ @Autowired
+ private ISysDictService sysDictService;
+ @Autowired
+ private ISysDictItemService sysDictItemService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -121,8 +130,19 @@
//@RequiresPermissions("org.jeecg.modules.demo:mom_eam_equipment_category:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody EquipmentCategory equipmentCategory) {
- if(!StringUtils.isNotBlank( equipmentCategory.getParentId())){
- equipmentCategory.setParentId("-1");
+ if(equipmentCategory.getParentId().equals("-1")){
+ SysDict sysDict = sysDictService.getOne(new QueryWrapper<SysDict>().eq("dict_code","equipment_category"),false);
+ if(ObjectUtils.isNotNull(sysDict)){
+ List<SysDictItem> sysDictItems = sysDictItemService.selectItemsByMainId(sysDict.getId());
+ for(SysDictItem sysDictItem:sysDictItems){
+ if(equipmentCategory.getName().equals(sysDictItem.getItemText())){
+ equipmentCategory.setEquipmentCategoryUda1(sysDictItem.getItemValue());
+ }
+ }
+ }
+ else {
+ return Result.error("娣诲姞澶辫触锛岄渶瑕佸幓缁存姢鏁版嵁瀛楀吀璁惧澶х被锛�");
+ }
}
equipmentCategoryService.save(equipmentCategory);
return Result.OK("娣诲姞鎴愬姛锛�");
--
Gitblit v1.9.3