From 14b1e801322db00b6b0d8dd059b9720adeb21bd8 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期二, 29 八月 2023 11:58:44 +0800
Subject: [PATCH] 设备分类
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentCategoryController.java | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 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 976ede5..c96e6f8 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
@@ -54,7 +54,7 @@
public class EquipmentCategoryController extends JeecgController<EquipmentCategory, IEquipmentCategoryService> {
@Autowired
private IEquipmentCategoryService equipmentCategoryService;
-
+
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
@@ -108,7 +108,8 @@
}
return Result.OK(pageList);
}
-
+
+
/**
* 娣诲姞
*
@@ -126,7 +127,7 @@
equipmentCategoryService.save(equipmentCategory);
return Result.OK("娣诲姞鎴愬姛锛�");
}
-
+
/**
* 缂栬緫
*
@@ -138,10 +139,16 @@
//@RequiresPermissions("org.jeecg.modules.demo:mom_eam_equipment_category:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody EquipmentCategory equipmentCategory) {
+ List<EquipmentCategory> equipmentCategories = equipmentCategory.getEquipmentCategoryDtlList();
+ for(EquipmentCategory equipmentCategoryChild:equipmentCategories){
+ equipmentCategoryChild.setEquipmentCategoryUda1(equipmentCategory.getEquipmentCategoryUda1());
+ equipmentCategoryChild.setEquipmentCategoryUda2(equipmentCategory.getEquipmentCategoryUda2());
+ }
+ equipmentCategoryService.saveOrUpdateBatch(equipmentCategories);
equipmentCategoryService.updateById(equipmentCategory);
return Result.OK("缂栬緫鎴愬姛!");
}
-
+
/**
* 閫氳繃id鍒犻櫎
*
@@ -158,7 +165,7 @@
equipmentCategoryService.updateById(equipmentCategory);
return Result.OK("鍒犻櫎鎴愬姛!");
}
-
+
/**
* 鎵归噺鍒犻櫎
*
@@ -178,7 +185,7 @@
}
return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
}
-
+
/**
* 閫氳繃id鏌ヨ
*
@@ -205,7 +212,7 @@
//@RequiresPermissions("org.jeecg.modules.demo:mom_eam_equipment_category:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, EquipmentCategory equipmentCategory) {
- return super.exportXls(request, equipmentCategory, EquipmentCategory.class, "mom_eam_equipment_category");
+ return super.exportXls(request, equipmentCategory, EquipmentCategory.class, "璁惧鍒嗙被");
}
/**
@@ -227,8 +234,18 @@
*/
@GetMapping("/loadTree")
public Result<?> loadTree(HttpServletRequest httpServletRequest) {
- List<CommonGenericTree> list = equipmentCategoryService.loadTree();
+ List<CommonGenericTree> list = equipmentCategoryService.loadTreeByRecurrence();
return Result.ok(list);
}
+ @GetMapping(value = "/getAllChildren")
+ public Result<IPage<EquipmentCategory>> getAllChildren(EquipmentCategory equipmentCategory,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req){
+ QueryWrapper<EquipmentCategory> queryWrapper = Wrappers.query();
+ Page<EquipmentCategory> page = new Page<EquipmentCategory>(pageNo, pageSize);
+ IPage<EquipmentCategory> pageList = equipmentCategoryService.getAllChildren(page, equipmentCategory);
+ return Result.OK(pageList);
+ }
}
--
Gitblit v1.9.3