From 3ecb68c427a627ad8e90d8c555655e7724be2d96 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 06 九月 2024 11:06:12 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 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 1d709b7..974d007 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
@@ -6,6 +6,7 @@
import com.zt.common.annotation.QueryParam;
import com.zt.common.db.query.QueryFilter;
import com.zt.common.servlet.Result;
+import com.zt.common.utils.UUIDUtil;
import com.zt.common.validator.AssertUtils;
import com.zt.common.validator.ValidatorUtils;
import com.zt.common.validator.group.AddGroup;
@@ -13,8 +14,10 @@
import com.zt.common.validator.group.UpdateGroup;
import com.zt.life.core.service.ZtProductService;
import com.zt.life.dto.ImportErrDto;
+import com.zt.life.modules.mainPart.basicInfo.model.ParamData;
import com.zt.life.modules.mainPart.basicInfo.model.ProductImg;
import com.zt.life.modules.mainPart.basicInfo.model.XhProductModel;
+import com.zt.life.modules.mainPart.basicInfo.service.ParamDataService;
import com.zt.life.modules.mainPart.basicInfo.service.XhProductModelService;
import com.zt.life.modules.mainPart.sysPictureBase.service.SysPictureBaseService;
import com.zt.life.util.ImportUtil;
@@ -49,6 +52,9 @@
@Autowired
private SysPictureBaseService sysPictureBaseService;
+ @Autowired
+ private ParamDataService paramDataService;
+
@GetMapping("page")
@ApiOperation("鍒嗛〉")
@ApiImplicitParams({
@@ -63,8 +69,8 @@
}
@GetMapping("tree")
- public Result<List<XhProductModel>> getTreeList(Boolean showXdy, Integer ztShow) {
- List<XhProductModel> list = xhProductModelService.getAllTree(showXdy, ztShow);
+ public Result<List<XhProductModel>> getTreeList(Boolean showXdy, Integer ztShow,Long productId) {
+ List<XhProductModel> list = xhProductModelService.getAllTree(showXdy, ztShow,productId);
return Result.ok(list);
}
@@ -126,6 +132,18 @@
if (xhProductModel.getSort() == null || xhProductModel.getSort() < no) {
xhProductModel.setSort(no + 1);
}
+ if (xhProductModel.getProductType().equals("2")){
+ Long id = UUIDUtil.generateId();
+ xhProductModel.setId(id);
+ xhProductModel.setShipId(id);
+
+ ParamData data =new ParamData();
+ data.setShipId(id);
+ data.setProductId(id);
+
+ paramDataService.insert(data);
+ }
+
xhProductModelService.insert(xhProductModel);
return Result.ok();
@@ -138,6 +156,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();
--
Gitblit v1.9.1