From 5cea5dff7f0d73c1b172252936b393fb390ab669 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期六, 12 十月 2024 09:31:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java | 42 ++++++++++++++++++++++++++++++++++++------
1 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java
index 0391dd7..9c43884 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java
@@ -69,8 +69,8 @@
}
@GetMapping("tree")
- public Result<List<XhProductModel>> getTreeList(Boolean showXdy, Integer ztShow,Long productId) {
- List<XhProductModel> list = xhProductModelService.getAllTree(showXdy, ztShow,productId);
+ public Result<List<XhProductModel>> getTreeList(Boolean showXdy, Integer ztShow, Long productId) {
+ List<XhProductModel> list = xhProductModelService.getAllTree(showXdy, ztShow, productId);
return Result.ok(list);
}
@@ -120,6 +120,15 @@
return result;
}
+ @GetMapping("exportData")
+ @ApiOperation("瀵煎嚭浜у搧妯″瀷")
+ @LogOperation("瀵煎嚭浜у搧妯″瀷")
+ public Result exportDataExcel(Long shipId) {
+ xhProductModelService.exportDataExcel(shipId);
+
+ return null;
+ }
+
@PostMapping
@ApiOperation("鏂板")
@@ -132,15 +141,15 @@
if (xhProductModel.getSort() == null || xhProductModel.getSort() < no) {
xhProductModel.setSort(no + 1);
}
- if (xhProductModel.getProductType().equals("2")){
+ if (xhProductModel.getProductType().equals("2")) {
Long id = UUIDUtil.generateId();
xhProductModel.setId(id);
xhProductModel.setShipId(id);
- ParamData data =new ParamData();
+ ParamData data = new ParamData();
data.setShipId(id);
data.setProductId(id);
- data.setPageCode("expect");
+
paramDataService.insert(data);
}
@@ -156,6 +165,11 @@
xhProductModel.setId(null);
xhProductModel.setSort(xhProductModel.getSort());
xhProductModel.setProductType(xhProductModel.getNodeType());
+ if (xhProductModel.getNamePath() == null) {
+ xhProductModel.setNamePath(xhProductModel.getName());
+ } else {
+ xhProductModel.setNamePath(xhProductModel.getNamePath() + "," + xhProductModel.getName());
+ }
this.insert(xhProductModel);
}
return Result.ok();
@@ -178,9 +192,25 @@
public Result delete(@RequestBody Long[] ids) {
//鏁堥獙鏁版嵁
AssertUtils.isArrayEmpty(ids, "id");
- xhProductModelService.delete(ids);
+ this.deleteByProduct(ids);
return Result.ok();
}
+ private void deleteByProduct(Long[] ids) {
+ for (Long id : ids) {
+ XhProductModel data = xhProductModelService.get(id);
+ if (data.getProductType().equals("1") || data.getProductType().equals("3") || data.getProductType().equals("4")) {
+ xhProductModelService.deleteLogic(id);
+ /* List<Long> list =xhProductModelService.getByPid(id);
+ Long[] L = list.stream().toArray(Long[]::new);*/
+ Long[] list = xhProductModelService.getByPid(id);
+ this.deleteByProduct(list);
+ } else if (data.getProductType().equals("2")) {
+ xhProductModelService.deleteByShipId(data.getShipId());
+ } else if (data.getProductType().equals("5")) {
+ xhProductModelService.deleteLogic(id);
+ }
+ }
+ }
}
--
Gitblit v1.9.1