From fcfe5c58abee6a2f3ea4bcbacad27c9255164363 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 02 八月 2024 15:36:48 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java | 37 ++++++++++++++++++++++++++++---------
1 files changed, 28 insertions(+), 9 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 1edde61..ffc5e7a 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
@@ -11,10 +11,13 @@
import com.zt.common.validator.group.AddGroup;
import com.zt.common.validator.group.DefaultGroup;
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.ProductImg;
import com.zt.life.modules.mainPart.basicInfo.model.XhProductModel;
import com.zt.life.modules.mainPart.basicInfo.service.XhProductModelService;
import com.zt.life.modules.mainPart.sysPictureBase.service.SysPictureBaseService;
+import com.zt.life.util.ImportUtil;
import com.zt.modules.oss.service.SysOssService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -22,9 +25,12 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import springfox.documentation.annotations.ApiIgnore;
+import javax.annotation.Resource;
import java.util.List;
+import java.util.Map;
/**
@@ -40,9 +46,6 @@
@Autowired
private XhProductModelService xhProductModelService;
-
- @Autowired
- private SysOssService sysOssService;
@Autowired
private SysPictureBaseService sysPictureBaseService;
@@ -60,17 +63,15 @@
}
@GetMapping("tree")
- public Result<List<XhProductModel>> getTreeList(Boolean showXdy) {
- List<XhProductModel> list = xhProductModelService.getAllTree(showXdy);
+ public Result<List<XhProductModel>> getTreeList(Boolean showXdy, Integer ztShow,Long productId) {
+ List<XhProductModel> list = xhProductModelService.getAllTree(showXdy, ztShow,productId);
return Result.ok(list);
}
@GetMapping("getProduct")
public Result<List<ProductImg>> getProduct(Long productId) {
-
List<ProductImg> list = xhProductModelService.getProduct(productId);
-
return Result.ok(list);
}
@@ -96,6 +97,24 @@
return Result.ok(list);
}
+ @PostMapping("importProductExcel")
+ @ApiOperation("瀵煎叆浜у搧妯″瀷")
+ @LogOperation("瀵煎叆浜у搧妯″瀷")
+ public Result importProductExcel(MultipartFile file, String progressId, Long pid) {
+ Result<List<ImportErrDto>> result = Result.ok();
+ try {
+ List<Map<String, Object>> importResults = xhProductModelService.importProductExcel(file, progressId, pid);
+ StringBuilder str = new StringBuilder();
+ ImportUtil.importResult(result, importResults, str);
+ ImportUtil.ImportErrResult(result, importResults, str);
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return result;
+ }
+
+
@PostMapping
@ApiOperation("鏂板")
@LogOperation("鏂板")
@@ -103,8 +122,8 @@
//鏁堥獙鏁版嵁
ValidatorUtils.validateEntity(xhProductModel, AddGroup.class, DefaultGroup.class);
- Integer no = xhProductModelService.getNo(xhProductModel.getPid());
- if (xhProductModel.getSort() < no) {
+ Integer no = xhProductModelService.getNo(xhProductModel.getPid(), xhProductModel.getProductType());
+ if (xhProductModel.getSort() == null || xhProductModel.getSort() < no) {
xhProductModel.setSort(no + 1);
}
xhProductModelService.insert(xhProductModel);
--
Gitblit v1.9.1